From 06e640532aa093902e81f09aa18de1b084fcc5ce Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 27 Aug 2011 20:42:11 +0200 Subject: [PATCH 001/381] Various changes which improve FreeBSD support. Patches by martymac, all credits go to him ;) --- CMakeLists.txt | 2 +- Source/Core/Common/Src/CPUDetect.cpp | 9 +++++ Source/Core/Common/Src/CommonFuncs.h | 6 ++++ Source/Core/Common/Src/MemoryUtil.cpp | 48 +++++++++++++++++++++---- Source/Core/Core/Src/MemTools.cpp | 2 +- Source/Core/DolphinWX/CMakeLists.txt | 3 ++ Source/Core/VideoCommon/Src/AVIDump.cpp | 4 +++ 7 files changed, 66 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d0d6a3ae8f..e870304dc4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -463,7 +463,7 @@ if(GETTEXT_FOUND AND NOT DISABLE_WX) file(GLOB LINGUAS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} Languages/po/*.po) GETTEXT_CREATE_TRANSLATIONS(Languages/po/dolphin-emu.pot ALL ${LINGUAS}) endif() -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux") +if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux") AND (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")) install(FILES Data/license.txt DESTINATION ${datadir}) endif() diff --git a/Source/Core/Common/Src/CPUDetect.cpp b/Source/Core/Common/Src/CPUDetect.cpp index 810c5d2a59..7c231b0a69 100644 --- a/Source/Core/Common/Src/CPUDetect.cpp +++ b/Source/Core/Common/Src/CPUDetect.cpp @@ -32,6 +32,10 @@ //#include #include +#if defined __FreeBSD__ +#include +#include +#else static inline void do_cpuid(unsigned int *eax, unsigned int *ebx, unsigned int *ecx, unsigned int *edx) { @@ -65,15 +69,20 @@ static inline void do_cpuid(unsigned int *eax, unsigned int *ebx, ); #endif } +#endif /* defined __FreeBSD__ */ static void __cpuid(int info[4], int x) { +#if defined __FreeBSD__ + do_cpuid((unsigned int)x, (unsigned int*)info); +#else unsigned int eax = x, ebx = 0, ecx = 0, edx = 0; do_cpuid(&eax, &ebx, &ecx, &edx); info[0] = eax; info[1] = ebx; info[2] = ecx; info[3] = edx; +#endif } #endif diff --git a/Source/Core/Common/Src/CommonFuncs.h b/Source/Core/Common/Src/CommonFuncs.h index 7dd156f42e..c79137780d 100644 --- a/Source/Core/Common/Src/CommonFuncs.h +++ b/Source/Core/Common/Src/CommonFuncs.h @@ -45,6 +45,8 @@ _mm_shuffle_epi8(__m128i a, __m128i mask) #include #ifdef __linux__ #include +#elif defined __FreeBSD__ +#include #endif // go to debugger mode @@ -137,6 +139,10 @@ inline __attribute__((always_inline)) u32 swap32(u32 _data) {return __builtin_bswap32(_data);} inline __attribute__((always_inline)) u64 swap64(u64 _data) {return __builtin_bswap64(_data);} +#elif __FreeBSD__ +inline u16 swap16(u16 _data) {return bswap16(_data);} +inline u32 swap32(u32 _data) {return bswap32(_data);} +inline u64 swap64(u64 _data) {return bswap64(_data);} #else // Slow generic implementation. inline u16 swap16(u16 data) {return (data >> 8) | (data << 8);} diff --git a/Source/Core/Common/Src/MemoryUtil.cpp b/Source/Core/Common/Src/MemoryUtil.cpp index bc65f856f4..65c70e0c5e 100644 --- a/Source/Core/Common/Src/MemoryUtil.cpp +++ b/Source/Core/Common/Src/MemoryUtil.cpp @@ -27,28 +27,64 @@ #include #endif +#if !defined(MAP_32BIT) +#include +#define PAGE_MASK (getpagesize() - 1) +#define round_page(x) ((((unsigned long)(x)) + PAGE_MASK) & ~(PAGE_MASK)) +#endif + // This is purposely not a full wrapper for virtualalloc/mmap, but it // provides exactly the primitive operations that Dolphin needs. void* AllocateExecutableMemory(size_t size, bool low) { -#ifdef _WIN32 + static char *map_hint = 0; +#if defined(__x86_64__) && !defined(MAP_32BIT) + if (low && (!map_hint)) + map_hint = (char*)round_page(512*1024*1024); /* 0.5 GB rounded up to the next page */ +#endif + +#if defined(_WIN32) void* ptr = VirtualAlloc(0, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE); #else - void* ptr = mmap(0, size, PROT_READ | PROT_WRITE | PROT_EXEC, + void* ptr = mmap(map_hint, size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_PRIVATE -#if defined __linux__ && defined __x86_64__ +#if defined(__x86_64__) +#if defined(MAP_32BIT) | (low ? MAP_32BIT : 0) -#endif +#else + | (low ? MAP_FIXED : 0) +#endif /* defined(MAP_32BIT) */ +#endif /* defined(__x86_64__) */ , -1, 0); -#endif +#endif /* defined(_WIN32) */ // printf("Mapped executable memory at %p (size %ld)\n", ptr, // (unsigned long)size); +#if defined(__FreeBSD__) + if (ptr == MAP_FAILED) + { + ptr = NULL; +#else if (ptr == NULL) + { +#endif PanicAlert("Failed to allocate executable memory"); -#ifdef _M_X64 + } +#if defined(__x86_64__) && !defined(MAP_32BIT) + else + { + if (low) + { + map_hint += size; + map_hint = (char*)round_page(map_hint); /* round up to the next page */ + // printf("Next map will (hopefully) be at %p\n", map_hint); + } + } +#endif + +#if defined(_M_X64) if ((u64)ptr >= 0x80000000 && low == true) PanicAlert("Executable memory ended up above 2GB!"); #endif diff --git a/Source/Core/Core/Src/MemTools.cpp b/Source/Core/Core/Src/MemTools.cpp index 469ae32684..bb6fef6439 100644 --- a/Source/Core/Core/Src/MemTools.cpp +++ b/Source/Core/Core/Src/MemTools.cpp @@ -160,7 +160,7 @@ void InstallExceptionHandler() #else // _WIN32 -#if defined __APPLE__ || defined __linux__ || defined _WIN32 +#if defined __APPLE__ || defined __linux__ || defined __FreeBSD__ || defined _WIN32 #ifndef _WIN32 #include #endif diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 7890c9fe96..5fc433009f 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -9,6 +9,9 @@ set(LIBS core sfml-network SDL GL + avcodec + avformat + swscale ${XRANDR_LIBRARIES} ${X11_LIBRARIES}) diff --git a/Source/Core/VideoCommon/Src/AVIDump.cpp b/Source/Core/VideoCommon/Src/AVIDump.cpp index cfd34e5cdb..a5a6098489 100644 --- a/Source/Core/VideoCommon/Src/AVIDump.cpp +++ b/Source/Core/VideoCommon/Src/AVIDump.cpp @@ -15,6 +15,10 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ +#if defined(__FreeBSD__) +#define __STDC_CONSTANT_MACROS 1 +#endif + #include "AVIDump.h" #include "HW/VideoInterface.h" //for TargetRefreshRate #include "VideoConfig.h" From 7812346c89738d37d6857a53b86470ac25f9ca69 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 30 Aug 2011 19:30:04 -0500 Subject: [PATCH 002/381] disable ltcg for release build --- Source/VSProps/CodeGen_Release.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/VSProps/CodeGen_Release.props b/Source/VSProps/CodeGen_Release.props index 78ed3b2238..45b6b64621 100644 --- a/Source/VSProps/CodeGen_Release.props +++ b/Source/VSProps/CodeGen_Release.props @@ -25,7 +25,7 @@ true true - UseLinkTimeCodeGeneration + Default From 8a17e159435f8c10e930c4bcf3f6f2ed9fd303de Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 30 Aug 2011 20:58:43 +0200 Subject: [PATCH 003/381] Various cleanups and TODOs. --- .../Core/VideoCommon/Src/PixelShaderGen.cpp | 110 +++++++----------- 1 file changed, 44 insertions(+), 66 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 530ecd54bb..d05997c0c4 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -333,12 +333,6 @@ static const char *tevRasTable[] = "float4(0.0f, 0.0f, 0.0f, 0.0f)", // zero }; -static const char *alphaRef[2] = -{ - I_ALPHA"[0].r", - I_ALPHA"[0].g" -}; - //static const char *tevTexFunc[] = { "tex2D", "texRECT" }; static const char *tevCOutputTable[] = { "prev.rgb", "c0.rgb", "c1.rgb", "c2.rgb" }; @@ -385,7 +379,7 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType setlocale(LC_NUMERIC, "C"); // Reset locale for compilation text[sizeof(text) - 1] = 0x7C; // canary - BuildSwapModeTable(); + BuildSwapModeTable(); // Needed for WriteStage int numStages = bpmem.genMode.numtevstages + 1; int numTexgen = bpmem.genMode.numtexgens; @@ -505,10 +499,6 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType { // 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"); @@ -626,6 +616,7 @@ 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: Why are we doing a second alpha pretest here? if (!WriteAlphaTest(p, ApiType, dstAlphaMode)) { // alpha test will always fail, so restart the shader and just make it an empty function @@ -740,10 +731,6 @@ static const char *TEVCMPAlphaOPTable[16] = static void WriteStage(char *&p, int n, API_TYPE ApiType) { - char *rasswap = swapModeTable[bpmem.combiners[n].alphaC.rswap]; - char *texswap = swapModeTable[bpmem.combiners[n].alphaC.tswap]; - - int texcoord = bpmem.tevorders[n/2].getTexCoord(n&1); bool bHasTexCoord = (u32)texcoord < bpmem.genMode.numtexgens; bool bHasIndStage = bpmem.tevind[n].IsActive() && bpmem.tevind[n].bt < bpmem.genMode.numindstages; @@ -780,11 +767,13 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType) } else if (bpmem.tevind[n].mid <= 7 && bHasTexCoord) { // s matrix + // TODO: Might become negative? int mtxidx = 2*(bpmem.tevind[n].mid-5); WRITE(p, "float2 indtevtrans%d = "I_INDTEXMTX"[%d].ww * uv%d.xy * indtevcrd%d.xx;\n", n, mtxidx, texcoord, n); } else if (bpmem.tevind[n].mid <= 11 && bHasTexCoord) { // t matrix + // TODO: Might become negative? int mtxidx = 2*(bpmem.tevind[n].mid-9); WRITE(p, "float2 indtevtrans%d = "I_INDTEXMTX"[%d].ww * uv%d.xy * indtevcrd%d.yy;\n", n, mtxidx, texcoord, n); } @@ -823,11 +812,14 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType) TevStageCombiner::ColorCombiner &cc = bpmem.combiners[n].colorC; TevStageCombiner::AlphaCombiner &ac = bpmem.combiners[n].alphaC; - bool bCRas = cc.a == TEVCOLORARG_RASA || cc.a == TEVCOLORARG_RASC || cc.b == TEVCOLORARG_RASA || cc.b == TEVCOLORARG_RASC || cc.c == TEVCOLORARG_RASA || cc.c == TEVCOLORARG_RASC || cc.d == TEVCOLORARG_RASA || cc.d == TEVCOLORARG_RASC; - bool bARas = ac.a == TEVALPHAARG_RASA || ac.b == TEVALPHAARG_RASA || ac.c == TEVALPHAARG_RASA || ac.d == TEVALPHAARG_RASA; - - if(bCRas || bARas) + 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 + || cc.d == TEVCOLORARG_RASA || cc.d == TEVCOLORARG_RASC + || ac.a == TEVALPHAARG_RASA || ac.b == TEVALPHAARG_RASA + || ac.c == TEVALPHAARG_RASA || ac.d == TEVALPHAARG_RASA) { + char *rasswap = swapModeTable[bpmem.combiners[n].alphaC.rswap]; WRITE(p, "rastemp = %s.%s;\n", tevRasTable[bpmem.tevorders[n / 2].getColorChan(n & 1)], rasswap); WRITE(p, "crastemp = frac(rastemp * (255.0f/256.0f)) * (256.0f/255.0f);\n"); } @@ -835,7 +827,6 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType) if (bpmem.tevorders[n/2].getEnable(n&1)) { - int texmap = bpmem.tevorders[n/2].getTexMap(n&1); if(!bHasIndStage) { // calc tevcord @@ -845,20 +836,19 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType) WRITE(p, "tevcoord.xy = float2(0.0f, 0.0f);\n"); } + char *texswap = swapModeTable[bpmem.combiners[n].alphaC.tswap]; + int texmap = bpmem.tevorders[n/2].getTexMap(n&1); SampleTexture(p, "textemp", "tevcoord", texswap, texmap, ApiType); } else WRITE(p, "textemp = float4(1.0f, 1.0f, 1.0f, 1.0f);\n"); - int kc = bpmem.tevksel[n / 2].getKC(n & 1); - int ka = bpmem.tevksel[n / 2].getKA(n & 1); - - - bool bCKonst = cc.a == TEVCOLORARG_KONST || cc.b == TEVCOLORARG_KONST || cc.c == TEVCOLORARG_KONST || cc.d == TEVCOLORARG_KONST; - bool bAKonst = ac.a == TEVALPHAARG_KONST || ac.b == TEVALPHAARG_KONST || ac.c == TEVALPHAARG_KONST || ac.d == TEVALPHAARG_KONST; - if (bCKonst || bAKonst ) + 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) { + int kc = bpmem.tevksel[n / 2].getKC(n & 1); + int ka = bpmem.tevksel[n / 2].getKA(n & 1); WRITE(p, "konsttemp = float4(%s, %s);\n", tevKSelTableC[kc], tevKSelTableA[ka]); if(kc > 7 || ka > 7) { @@ -870,15 +860,10 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType) } } - if(cc.a == TEVCOLORARG_CPREV - || cc.a == TEVCOLORARG_APREV - || 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) + if(cc.a == TEVCOLORARG_CPREV || cc.a == TEVCOLORARG_APREV + || 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) { if(RegisterStates[0].AlphaNeedOverflowControl || RegisterStates[0].ColorNeedOverflowControl) { @@ -893,15 +878,10 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType) 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) + 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) { if(RegisterStates[1].AlphaNeedOverflowControl || RegisterStates[1].ColorNeedOverflowControl) { @@ -916,15 +896,10 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType) 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) + 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) { if(RegisterStates[2].AlphaNeedOverflowControl || RegisterStates[2].ColorNeedOverflowControl) { @@ -939,15 +914,10 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType) 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(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) { @@ -994,7 +964,7 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType) WRITE(p, "%s", tevBiasTable[cc.bias]); - if (cc.shift > 0) + if (cc.shift > TEVSCALE_1) WRITE(p, ")"); } else @@ -1122,6 +1092,11 @@ static int AlphaPreTest() static bool WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode) { + static const char *alphaRef[2] = + { + I_ALPHA"[0].r", + I_ALPHA"[0].g" + }; int Pretest = AlphaPreTest(); if(Pretest >= 0) @@ -1139,7 +1114,10 @@ static bool WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode compindex = bpmem.alphaFunc.comp1 % 8; WRITE(p, tevAlphaFuncsTable[compindex],alphaRef[1]);//lookup the second component from the alpha function table - WRITE(p, ")){ocol0 = 0;%s%sdiscard;%s}\n",dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND ? "ocol1 = 0;" : "",DepthTextureEnable ? "depth = 1.f;" : "",(ApiType != API_D3D11)? "return;" : ""); + WRITE(p, ")){ocol0 = 0;%s%s discard;%s}\n", + dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND ? "ocol1 = 0;" : "", + DepthTextureEnable ? "depth = 1.f;" : "", + (ApiType != API_D3D11) ? "return;" : ""); return true; } @@ -1197,4 +1175,4 @@ static void WriteFog(char *&p) WRITE(p, " prev.rgb = lerp(prev.rgb,"I_FOG"[0].rgb,fog);\n"); -} +} \ No newline at end of file From 08e06b22937fa79db165e5a31dfd4ccf67ef57db Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Wed, 31 Aug 2011 16:09:54 +0200 Subject: [PATCH 004/381] Partially revert revision d511b506120c. Slightly slows down emulation, but deobfuscates the pixel shader gen greatly... --- .../Core/VideoCommon/Src/PixelShaderGen.cpp | 102 +++--------------- 1 file changed, 12 insertions(+), 90 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index d05997c0c4..ade8a0865e 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -353,15 +353,6 @@ 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() { for (int i = 0; i < 4; i++) @@ -582,16 +573,6 @@ 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 @@ -599,22 +580,11 @@ 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 - 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 unisgned 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"); + 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]); + } + // emulation of unsigned 8 overflow when casting + WRITE(p, "prev = frac(4.0f + prev * (255.0f/256.0f)) * (256.0f/255.0f);\n"); // TODO: Why are we doing a second alpha pretest here? if (!WriteAlphaTest(p, ApiType, dstAlphaMode)) @@ -864,76 +834,30 @@ 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) - { - 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; - } + WRITE(p, "cprev = frac(prev * (255.0f/256.0f)) * (256.0f/255.0f);\n"); + 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) - { - 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; - } + WRITE(p, "cc0 = frac(c0 * (255.0f/256.0f)) * (256.0f/255.0f);\n"); + 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) - { - 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; - } + WRITE(p, "cc1 = frac(c1 * (255.0f/256.0f)) * (256.0f/255.0f);\n"); + 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; + if (cc.clamp) WRITE(p, "%s = saturate(", tevCOutputTable[cc.dest]); else @@ -980,8 +904,6 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType) WRITE(p, ")"); WRITE(p,";\n"); - RegisterStates[ac.dest].AlphaNeedOverflowControl = (ac.clamp == 0); - RegisterStates[ac.dest].AuxStored = false; // combine the alpha channel if (ac.clamp) WRITE(p, "%s = saturate(", tevAOutputTable[ac.dest]); From 7f01139d13ad917d333548918492e92e2bcb436a Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Wed, 31 Aug 2011 03:18:19 +0200 Subject: [PATCH 005/381] Replace the pixel shader UID generation algorithm with a better one which reduces the number of redundant shader compilations by around 30% (can be optimized even further though). This should help some games which suffer from heavy stuttering like e.g. F-Zero GX or Red Steel 2. --- .../Core/VideoCommon/Src/PixelShaderGen.cpp | 2360 +++++++++-------- Source/Core/VideoCommon/Src/PixelShaderGen.h | 4 +- 2 files changed, 1267 insertions(+), 1097 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index ade8a0865e..6d0cc64964 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -1,1100 +1,1270 @@ -// 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 - -#include "LightingShaderGen.h" -#include "PixelShaderGen.h" -#include "XFMemory.h" // for texture projection mode -#include "BPMemory.h" -#include "VideoConfig.h" -#include "NativeVertexFormat.h" - -PIXELSHADERUID last_pixel_shader_uid; - -// Mash together all the inputs that contribute to the code of a generated pixel shader into -// a unique identifier, basically containing all the bits. Yup, it's a lot .... -// It would likely be a lot more efficient to build this incrementally as the attributes -// are set... -void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode) -{ - u32 numstages = bpmem.genMode.numtevstages + 1; - u32 projtexcoords = 0; - for (u32 i = 0; i < numstages; i++) - { - if (bpmem.tevorders[i/2].getEnable(i & 1)) - { - int texcoord = bpmem.tevorders[i / 2].getTexCoord(i & 1); - if (xfregs.texMtxInfo[i].projection) - projtexcoords |= 1 << texcoord; - } - } - uid->values[0] = (u32)bpmem.genMode.numtevstages | - ((u32)bpmem.genMode.numindstages << 4) | - ((u32)bpmem.genMode.numtexgens << 7) | - ((u32)dstAlphaMode << 11) | - ((u32)((bpmem.alphaFunc.hex >> 16) & 0xff) << 13) | - (projtexcoords << 21) | - ((u32)bpmem.ztex2.op << 29); - - // swap table - for (int i = 0; i < 8; i += 2) - ((u8*)&uid->values[1])[i / 2] = (bpmem.tevksel[i].hex & 0xf) | ((bpmem.tevksel[i + 1].hex & 0xf) << 4); - - u32 enableZTexture = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc && bpmem.zmode.testenable && bpmem.zmode.updateenable) || g_ActiveConfig.bEnablePerPixelDepth ? 1 : 0; - - uid->values[2] = (u32)bpmem.fog.c_proj_fsel.fsel | - ((u32)bpmem.fog.c_proj_fsel.proj << 3) | - ((u32)enableZTexture << 4) | ((u32)bpmem.fogRange.Base.Enabled << 5); - - if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) - { - for (int i = 0; i < 2; ++i) { - uid->values[3 + i] = xfregs.color[i].enablelighting ? - (u32)xfregs.color[i].hex : - (u32)xfregs.color[i].matsource; - uid->values[3 + i] |= (xfregs.alpha[i].enablelighting ? - (u32)xfregs.alpha[i].hex : - (u32)xfregs.alpha[i].matsource) << 15; - } - } - uid->values[4] |= (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) << 31; - - int hdr = 5; - u32 *pcurvalue = &uid->values[hdr]; - for (u32 i = 0; i < numstages; ++i) - { - TevStageCombiner::ColorCombiner &cc = bpmem.combiners[i].colorC; - TevStageCombiner::AlphaCombiner &ac = bpmem.combiners[i].alphaC; - - u32 val0 = cc.hex & 0xffffff; - u32 val1 = ac.hex & 0xffffff; - val0 |= bpmem.tevksel[i / 2].getKC(i & 1) << 24; - val1 |= bpmem.tevksel[i / 2].getKA(i & 1) << 24; - pcurvalue[0] = val0; - pcurvalue[1] = val1; - pcurvalue += 2; - } - - for (u32 i = 0; i < numstages / 2; ++i) - { - u32 val0, val1; - if (bpmem.tevorders[i].hex & 0x40) - val0 = bpmem.tevorders[i].hex & 0x3ff; - else - val0 = bpmem.tevorders[i].hex & 0x380; - if (bpmem.tevorders[i].hex & 0x40000) - val1 = (bpmem.tevorders[i].hex & 0x3ff000) >> 12; - else - val1 = (bpmem.tevorders[i].hex & 0x380000) >> 12; - - switch (i % 3) { - case 0: pcurvalue[0] = val0|(val1<<10); break; - case 1: pcurvalue[0] |= val0<<20; pcurvalue[1] = val1; pcurvalue++; break; - case 2: pcurvalue[1] |= (val0<<10)|(val1<<20); pcurvalue++; break; - default: PanicAlert("Unknown case for Tev Stages / 2: %08x", (i % 3)); - } - } - - if (numstages & 1) { // odd - u32 val0; - if (bpmem.tevorders[bpmem.genMode.numtevstages/2].hex & 0x40) - val0 = bpmem.tevorders[bpmem.genMode.numtevstages/2].hex & 0x3ff; - else - val0 = bpmem.tevorders[bpmem.genMode.numtevstages/2].hex & 0x380; - - switch (bpmem.genMode.numtevstages % 3) - { - case 0: pcurvalue[0] = val0; break; - case 1: pcurvalue[0] |= val0 << 20; break; - case 2: pcurvalue[1] |= val0 << 10; pcurvalue++; break; - default: PanicAlert("Unknown case for Tev Stages: %08x", bpmem.genMode.numtevstages % 3); - } - } - - if ((bpmem.genMode.numtevstages % 3) != 2) - ++pcurvalue; - - uid->tevstages = (u32)(pcurvalue - &uid->values[0] - hdr); - - for (u32 i = 0; i < bpmem.genMode.numindstages; ++i) - { - u32 val = bpmem.tevind[i].hex & 0x1fffff; // 21 bits - switch (i % 3) - { - case 0: pcurvalue[0] = val; break; - case 1: pcurvalue[0] |= val << 21; pcurvalue[1] = val >> 11; ++pcurvalue; break; - case 2: pcurvalue[0] |= val << 10; ++pcurvalue; break; - default: PanicAlert("Unknown case for Ind Stages: %08x", (i % 3)); - } - } - - // yeah, well .... - uid->indstages = (u32)(pcurvalue - &uid->values[0] - (hdr - 1) - uid->tevstages); - -} - -// old tev->pixelshader notes -// -// color for this stage (alpha, color) is given by bpmem.tevorders[0].colorchan0 -// konstant for this stage (alpha, color) is given by bpmem.tevksel -// inputs are given by bpmem.combiners[0].colorC.a/b/c/d << could be current chan color -// according to GXTevColorArg table above -// output is given by .outreg -// tevtemp is set according to swapmodetables and - -static void WriteStage(char *&p, int n, API_TYPE ApiType); -static void SampleTexture(char *&p, const char *destination, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType); -// static void WriteAlphaCompare(char *&p, int num, int comp); -static bool WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode); -static void WriteFog(char *&p); -static int AlphaPreTest(); - -static const char *tevKSelTableC[] = // KCSEL -{ - "1.0f,1.0f,1.0f", // 1 = 0x00 - "0.875f,0.875f,0.875f", // 7_8 = 0x01 - "0.75f,0.75f,0.75f", // 3_4 = 0x02 - "0.625f,0.625f,0.625f", // 5_8 = 0x03 - "0.5f,0.5f,0.5f", // 1_2 = 0x04 - "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 - I_KCOLORS"[0].rgb", // K0 = 0x0C - I_KCOLORS"[1].rgb", // K1 = 0x0D - I_KCOLORS"[2].rgb", // K2 = 0x0E - I_KCOLORS"[3].rgb", // K3 = 0x0F - I_KCOLORS"[0].rrr", // K0_R = 0x10 - I_KCOLORS"[1].rrr", // K1_R = 0x11 - I_KCOLORS"[2].rrr", // K2_R = 0x12 - I_KCOLORS"[3].rrr", // K3_R = 0x13 - I_KCOLORS"[0].ggg", // K0_G = 0x14 - I_KCOLORS"[1].ggg", // K1_G = 0x15 - I_KCOLORS"[2].ggg", // K2_G = 0x16 - I_KCOLORS"[3].ggg", // K3_G = 0x17 - I_KCOLORS"[0].bbb", // K0_B = 0x18 - I_KCOLORS"[1].bbb", // K1_B = 0x19 - I_KCOLORS"[2].bbb", // K2_B = 0x1A - I_KCOLORS"[3].bbb", // K3_B = 0x1B - I_KCOLORS"[0].aaa", // K0_A = 0x1C - I_KCOLORS"[1].aaa", // K1_A = 0x1D - I_KCOLORS"[2].aaa", // K2_A = 0x1E - I_KCOLORS"[3].aaa", // K3_A = 0x1F -}; - -static const char *tevKSelTableA[] = // KASEL -{ - "1.0f", // 1 = 0x00 - "0.875f",// 7_8 = 0x01 - "0.75f", // 3_4 = 0x02 - "0.625f",// 5_8 = 0x03 - "0.5f", // 1_2 = 0x04 - "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 - I_KCOLORS"[0].r", // K0_R = 0x10 - I_KCOLORS"[1].r", // K1_R = 0x11 - I_KCOLORS"[2].r", // K2_R = 0x12 - I_KCOLORS"[3].r", // K3_R = 0x13 - I_KCOLORS"[0].g", // K0_G = 0x14 - I_KCOLORS"[1].g", // K1_G = 0x15 - I_KCOLORS"[2].g", // K2_G = 0x16 - I_KCOLORS"[3].g", // K3_G = 0x17 - I_KCOLORS"[0].b", // K0_B = 0x18 - I_KCOLORS"[1].b", // K1_B = 0x19 - I_KCOLORS"[2].b", // K2_B = 0x1A - I_KCOLORS"[3].b", // K3_B = 0x1B - I_KCOLORS"[0].a", // K0_A = 0x1C - I_KCOLORS"[1].a", // K1_A = 0x1D - I_KCOLORS"[2].a", // K2_A = 0x1E - I_KCOLORS"[3].a", // K3_A = 0x1F -}; - -static const char *tevScaleTable[] = // CS -{ - "1.0f", // SCALE_1 - "2.0f", // SCALE_2 - "4.0f", // SCALE_4 - "0.5f", // DIVIDE_2 -}; - -static const char *tevBiasTable[] = // TB -{ - "", // ZERO, - "+0.5f", // ADDHALF, - "-0.5f", // SUBHALF, - "", -}; - -static const char *tevOpTable[] = { // TEV - "+", // TEVOP_ADD = 0, - "-", // TEVOP_SUB = 1, -}; - -static const char *tevCInputTable[] = // CC -{ - "(prev.rgb)", // CPREV, - "(prev.aaa)", // APREV, - "(c0.rgb)", // C0, - "(c0.aaa)", // A0, - "(c1.rgb)", // C1, - "(c1.aaa)", // A1, - "(c2.rgb)", // C2, - "(c2.aaa)", // A2, - "(textemp.rgb)", // TEXC, - "(textemp.aaa)", // TEXA, - "(rastemp.rgb)", // RASC, - "(rastemp.aaa)", // RASA, - "float3(1.0f, 1.0f, 1.0f)", // ONE - "float3(0.5f, 0.5f, 0.5f)", // HALF - "(konsttemp.rgb)", //"konsttemp.rgb", // KONST - "float3(0.0f, 0.0f, 0.0f)", // ZERO - ///aded extra values to map clamped values - "(cprev.rgb)", // CPREV, - "(cprev.aaa)", // APREV, - "(cc0.rgb)", // C0, - "(cc0.aaa)", // A0, - "(cc1.rgb)", // C1, - "(cc1.aaa)", // A1, - "(cc2.rgb)", // C2, - "(cc2.aaa)", // A2, - "(textemp.rgb)", // TEXC, - "(textemp.aaa)", // TEXA, - "(crastemp.rgb)", // RASC, - "(crastemp.aaa)", // RASA, - "float3(1.0f, 1.0f, 1.0f)", // ONE - "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" -}; - -static const char *tevAInputTable[] = // CA -{ - "prev", // APREV, - "c0", // A0, - "c1", // A1, - "c2", // A2, - "textemp", // TEXA, - "rastemp", // RASA, - "konsttemp", // KONST, (hw1 had quarter) - "float4(0.0f, 0.0f, 0.0f, 0.0f)", // ZERO - ///aded extra values to map clamped values - "cprev", // APREV, - "cc0", // A0, - "cc1", // A1, - "cc2", // A2, - "textemp", // TEXA, - "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", -}; - -static const char *tevRasTable[] = -{ - "colors_0", - "colors_1", - "ERROR", //2 - "ERROR", //3 - "ERROR", //4 - "alphabump", // use bump alpha - "(alphabump*(255.0f/248.0f))", //normalized - "float4(0.0f, 0.0f, 0.0f, 0.0f)", // zero -}; - -//static const char *tevTexFunc[] = { "tex2D", "texRECT" }; - -static const char *tevCOutputTable[] = { "prev.rgb", "c0.rgb", "c1.rgb", "c2.rgb" }; -static const char *tevAOutputTable[] = { "prev.a", "c0.a", "c1.a", "c2.a" }; -static const char *tevIndAlphaSel[] = {"", "x", "y", "z"}; -//static const char *tevIndAlphaScale[] = {"", "*32", "*16", "*8"}; -static const char *tevIndAlphaScale[] = {"*(248.0f/255.0f)", "*(224.0f/255.0f)", "*(240.0f/255.0f)", "*(248.0f/255.0f)"}; -static const char *tevIndBiasField[] = {"", "x", "y", "xy", "z", "xz", "yz", "xyz"}; // indexed by bias -static const char *tevIndBiasAdd[] = {"-128.0f", "1.0f", "1.0f", "1.0f" }; // indexed by fmt -static const char *tevIndWrapStart[] = {"0.0f", "256.0f", "128.0f", "64.0f", "32.0f", "16.0f", "0.001f" }; -static const char *tevIndFmtScale[] = {"255.0f", "31.0f", "15.0f", "7.0f" }; - -#define WRITE p+=sprintf - -static const char *swapColors = "rgba"; -static char swapModeTable[4][5]; - -static char text[16384]; -static bool DepthTextureEnable; - -static void BuildSwapModeTable() -{ - for (int i = 0; i < 4; i++) - { - swapModeTable[i][0] = swapColors[bpmem.tevksel[i*2].swap1]; - swapModeTable[i][1] = swapColors[bpmem.tevksel[i*2].swap2]; - swapModeTable[i][2] = swapColors[bpmem.tevksel[i*2+1].swap1]; - swapModeTable[i][3] = swapColors[bpmem.tevksel[i*2+1].swap2]; - swapModeTable[i][4] = 0; - } -} - -const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components) -{ - setlocale(LC_NUMERIC, "C"); // Reset locale for compilation - text[sizeof(text) - 1] = 0x7C; // canary - - BuildSwapModeTable(); // Needed for WriteStage - int numStages = bpmem.genMode.numtevstages + 1; - int numTexgen = bpmem.genMode.numtexgens; - - char *p = text; - WRITE(p, "//Pixel Shader for TEV stages\n"); - WRITE(p, "//%i TEV stages, %i texgens, %i IND stages\n", - numStages, numTexgen, bpmem.genMode.numindstages); - - int nIndirectStagesUsed = 0; - if (bpmem.genMode.numindstages > 0) - { - for (int i = 0; i < numStages; ++i) - { - if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages) - nIndirectStagesUsed |= 1 << bpmem.tevind[i].bt; - } - } - DepthTextureEnable = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc && bpmem.zmode.testenable && bpmem.zmode.updateenable) || g_ActiveConfig.bEnablePerPixelDepth ; - // Declare samplers - - if(ApiType != API_D3D11) - { - WRITE(p, "uniform sampler2D "); - } - else - { - WRITE(p, "sampler "); - } - - bool bfirst = true; - for (int i = 0; i < 8; ++i) - { - WRITE(p, "%s samp%d : register(s%d)", bfirst?"":",", i, i); - bfirst = false; - } - WRITE(p, ";\n"); - if(ApiType == API_D3D11) - { - WRITE(p, "Texture2D "); - bfirst = true; - for (int i = 0; i < 8; ++i) - { - WRITE(p, "%s Tex%d : register(t%d)", bfirst?"":",", i, i); - bfirst = false; - } - WRITE(p, ";\n"); - } - - WRITE(p, "\n"); - - WRITE(p, "uniform float4 "I_COLORS"[4] : register(c%d);\n", C_COLORS); - WRITE(p, "uniform float4 "I_KCOLORS"[4] : register(c%d);\n", C_KCOLORS); - WRITE(p, "uniform float4 "I_ALPHA"[1] : register(c%d);\n", C_ALPHA); - WRITE(p, "uniform float4 "I_TEXDIMS"[8] : register(c%d);\n", C_TEXDIMS); - WRITE(p, "uniform float4 "I_ZBIAS"[2] : register(c%d);\n", C_ZBIAS); - WRITE(p, "uniform float4 "I_INDTEXSCALE"[2] : register(c%d);\n", C_INDTEXSCALE); - WRITE(p, "uniform float4 "I_INDTEXMTX"[6] : register(c%d);\n", C_INDTEXMTX); - WRITE(p, "uniform float4 "I_FOG"[3] : register(c%d);\n", C_FOG); - - if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) - { - WRITE(p,"typedef struct { float4 col; float4 cosatt; float4 distatt; float4 pos; float4 dir; } Light;\n"); - WRITE(p,"typedef struct { Light lights[8]; } s_"I_PLIGHTS";\n"); - WRITE(p, "uniform s_"I_PLIGHTS" "I_PLIGHTS" : register(c%d);\n", C_PLIGHTS); - WRITE(p, "typedef struct { float4 C0, C1, C2, C3; } s_"I_PMATERIALS";\n"); - WRITE(p, "uniform s_"I_PMATERIALS" "I_PMATERIALS" : register(c%d);\n", C_PMATERIALS); - } - - WRITE(p, "void main(\n"); - if(ApiType != API_D3D11) - { - 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," : "", - 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," : ""); - } - - WRITE(p, " in float4 colors_0 : COLOR0,\n"); - WRITE(p, " in float4 colors_1 : COLOR1"); - - // compute window position if needed because binding semantic WPOS is not widely supported - if (numTexgen < 7) - { - for (int i = 0; i < numTexgen; ++i) - WRITE(p, ",\n in float3 uv%d : TEXCOORD%d", i, i); - WRITE(p, ",\n in float4 clipPos : TEXCOORD%d", numTexgen); - if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) - WRITE(p, ",\n in float4 Normal : TEXCOORD%d", numTexgen + 1); - } - else - { - // wpos is in w of first 4 texcoords - if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) - { - for (int i = 0; i < 8; ++i) - WRITE(p, ",\n in float4 uv%d : TEXCOORD%d", i, i); - } - else - { - for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) - WRITE(p, ",\n in float%d uv%d : TEXCOORD%d", i < 4 ? 4 : 3 , i, i); - } - } - WRITE(p, " ) {\n"); - - char* pmainstart = p; - int Pretest = AlphaPreTest(); - if (dstAlphaMode == DSTALPHA_ALPHA_PASS && !DepthTextureEnable && Pretest >= 0) - { - if (!Pretest) - { - // alpha test will always fail, so restart the shader and just make it an empty function - WRITE(p, "ocol0 = 0;\n"); - WRITE(p, "discard;\n"); - if(ApiType != API_D3D11) - WRITE(p, "return;\n"); - } - else - { - WRITE(p, " ocol0 = "I_ALPHA"[0].aaaa;\n"); - } - 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=0;\n" - " float3 tevcoord;\n" - " float2 wrappedcoord, tempcoord;\n" - " float4 cc0, cc1, cc2, cprev,crastemp,ckonsttemp;\n\n"); - - if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) - { - if (xfregs.numTexGen.numTexGens < 7) - { - WRITE(p,"float3 _norm0 = normalize(Normal.xyz);\n\n"); - WRITE(p,"float3 pos = float3(clipPos.x,clipPos.y,Normal.w);\n"); - } - else - { - WRITE(p," float3 _norm0 = normalize(float3(uv4.w,uv5.w,uv6.w));\n\n"); - WRITE(p,"float3 pos = float3(uv0.w,uv1.w,uv7.w);\n"); - } - - - WRITE(p, "float4 mat, lacc;\n" - "float3 ldir, h;\n" - "float dist, dist2, attn;\n"); - - p = GenerateLightingShader(p, components, I_PMATERIALS, I_PLIGHTS, "colors_", "colors_"); - } - - if (numTexgen < 7) - WRITE(p, "clipPos = float4(rawpos.x, rawpos.y, clipPos.z, clipPos.w);\n"); - else - WRITE(p, "float4 clipPos = float4(rawpos.x, rawpos.y, uv2.w, uv3.w);\n"); - - // HACK to handle cases where the tex gen is not enabled - if (numTexgen == 0) - { - WRITE(p, "float3 uv0 = float3(0.0f, 0.0f, 0.0f);\n"); - } - else - { - for (int i = 0; i < numTexgen; ++i) - { - // optional perspective divides - if (xfregs.texMtxInfo[i].projection == XF_TEXPROJ_STQ) - { - WRITE(p, "if (uv%d.z)", i); - WRITE(p, " uv%d.xy = uv%d.xy / uv%d.z;\n", i, i, i); - } - - WRITE(p, "uv%d.xy = uv%d.xy * "I_TEXDIMS"[%d].zw;\n", i, i, i); - } - } - - // indirect texture map lookup - for(u32 i = 0; i < bpmem.genMode.numindstages; ++i) - { - if (nIndirectStagesUsed & (1< +#include +#include +#include + +#include "LightingShaderGen.h" +#include "PixelShaderGen.h" +#include "XFMemory.h" // for texture projection mode +#include "BPMemory.h" +#include "VideoConfig.h" +#include "NativeVertexFormat.h" + +PIXELSHADERUID last_pixel_shader_uid; + +static int AlphaPreTest(); + +static void StageHash(int 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 + out[0] |= (alphaC&0xF0) << 24; // 8 + out[1] |= alphaC >> 8; // 16 + + // reserve 3 bits for bpmem.tevorders[stage/2].getTexMap + out[1] |= bpmem.tevorders[stage/2].getTexCoord(stage&1) << 19; // 3 + out[1] |= bpmem.tevorders[stage/2].getEnable(stage&1) << 22; // 1 + // reserve 3 bits for bpmem.tevorders[stage/2].getColorChan + + bool bHasIndStage = bpmem.tevind[stage].IsActive() && bpmem.tevind[stage].bt < bpmem.genMode.numindstages; + out[2] |= bHasIndStage << 2; // 1 + + bool needstexcoord = false; + + if (bHasIndStage) + { + out[2] |= (bpmem.tevind[stage].hex & 0x17FFFF) << 3; // 21, TODO: needs an explanation + needstexcoord = true; + } + + + TevStageCombiner::ColorCombiner& cc = bpmem.combiners[stage].colorC; + TevStageCombiner::AlphaCombiner& ac = bpmem.combiners[stage].alphaC; + + 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 + || cc.d == TEVCOLORARG_RASA || cc.d == TEVCOLORARG_RASC + || ac.a == TEVALPHAARG_RASA || ac.b == TEVALPHAARG_RASA + || ac.c == TEVALPHAARG_RASA || ac.d == TEVALPHAARG_RASA) + { + out[0] |= bpmem.combiners[stage].alphaC.rswap; + out[2] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.rswap*2].swap1 << 24; // 2 + out[2] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.rswap*2].swap2 << 26; // 2 + out[2] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.rswap*2+1].swap1 << 28; // 2 + out[2] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.rswap*2+1].swap2 << 30; // 2 + out[1] |= (bpmem.tevorders[stage/2].getColorChan(stage&1)&1) << 23; + out[2] |= (bpmem.tevorders[stage/2].getColorChan(stage&1)&0x6) >> 1; + } + + out[3] |= bpmem.tevorders[stage/2].getEnable(stage&1); + if (bpmem.tevorders[stage/2].getEnable(stage&1)) + { + if (bHasIndStage) needstexcoord = true; + + out[0] |= bpmem.combiners[stage].alphaC.tswap; + out[3] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.tswap*2].swap1 << 1; // 2 + out[3] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.tswap*2].swap2 << 3; // 2 + out[3] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.tswap*2+1].swap1 << 5; // 2 + out[3] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.tswap*2+1].swap2 << 7; // 2 + out[1] |= bpmem.tevorders[stage/2].getTexMap(stage&1) << 16; + } + + 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) + { + out[3] |= bpmem.tevksel[stage/2].getKC(stage&1) << 9; // 5 + out[3] |= bpmem.tevksel[stage/2].getKA(stage&1) << 14; // 5 + } + + if (needstexcoord) + { + out[1] |= bpmem.tevorders[stage/2].getTexCoord(stage&1) << 16; + } +} + +void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode) +{ + uid->values[0] |= bpmem.genMode.numtevstages; // 4 + uid->values[0] |= bpmem.genMode.numtexgens << 4; // 4 + uid->values[0] |= dstAlphaMode << 8; // 2 + + uid->tevstages = bpmem.genMode.numtevstages; + + bool DepthTextureEnable = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc && 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 + + if (!enablePL) uid->values[0] |= xfregs.numTexGen.numTexGens << 12; // 4 + u32 alphaPreTest = AlphaPreTest()+1; + + uid->values[0] |= alphaPreTest << 16; // 2 + + if (alphaPreTest == 1 || (alphaPreTest && !DepthTextureEnable && dstAlphaMode == DSTALPHA_ALPHA_PASS)) + { + // Courtesy of PreAlphaTest, we're done already ;) + // TODO: There's a comment including bpmem.genmode.numindstages.. shouldnt really bother about that though. + return; + } + + if (enablePL) + { + // TODO: Include register states for lighting shader + } + + for (unsigned int i = 0; i < bpmem.genMode.numtexgens; ++i) + { + 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->indstages = bpmem.genMode.numindstages; + + uid->values[1] = bpmem.genMode.numindstages << 2; // 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) + indirectStagesUsed |= (1 << bpmem.tevind[i].bt); + + assert(indirectStagesUsed == (indirectStagesUsed & 0xF)); + + uid->values[1] |= indirectStagesUsed << 5; // 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 + if (bpmem.tevindref.getTexCoord(i) < bpmem.genMode.numtexgens) + uid->values[1] |= bpmem.tevindref.getTexCoord(i) << (10 + 3*i); // 2 + } + } + + u32* ptr = &uid->values[2]; + for (unsigned int i = 0; i < bpmem.genMode.numtevstages+1; ++i) + { + StageHash(i, ptr); + ptr += 4; // max: ptr = &uid->values[66] + } + + if (alphaPreTest == 0 || alphaPreTest == 2) + { + ptr[0] |= bpmem.fog.c_proj_fsel.fsel; // 3 + if (DepthTextureEnable) + { + ptr[0] |= bpmem.ztex2.op << 3; // 2 + ptr[0] |= bpmem.zcontrol.zcomploc << 5; // 1 + ptr[0] |= bpmem.zmode.testenable << 6; // 1 + ptr[0] |= bpmem.zmode.updateenable << 7; // 1 + } + } + + if (dstAlphaMode != DSTALPHA_ALPHA_PASS) + { + if (bpmem.fog.c_proj_fsel.fsel != 0) + { + ptr[0] |= bpmem.fog.c_proj_fsel.proj << 8; // 1 + ptr[0] |= bpmem.fogRange.Base.Enabled << 9; // 1 + } + } + uid->tevstages = (ptr+1) - uid->values; +} + +// Mash together all the inputs that contribute to the code of a generated pixel shader into +// a unique identifier, basically containing all the bits. Yup, it's a lot .... +// It would likely be a lot more efficient to build this incrementally as the attributes +// are set... +void _GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode) +{ + u32 numstages = bpmem.genMode.numtevstages + 1; + u32 projtexcoords = 0; + for (u32 i = 0; i < numstages; i++) + { + if (bpmem.tevorders[i/2].getEnable(i & 1)) + { + int texcoord = bpmem.tevorders[i / 2].getTexCoord(i & 1); + if (xfregs.texMtxInfo[i].projection) + projtexcoords |= 1 << texcoord; + } + } + uid->values[0] = (u32)bpmem.genMode.numtevstages | + ((u32)bpmem.genMode.numindstages << 4) | + ((u32)bpmem.genMode.numtexgens << 7) | + ((u32)dstAlphaMode << 11) | + ((u32)((bpmem.alphaFunc.hex >> 16) & 0xff) << 13) | + (projtexcoords << 21) | + ((u32)bpmem.ztex2.op << 29); + + // swap table + for (int i = 0; i < 8; i += 2) + ((u8*)&uid->values[1])[i / 2] = (bpmem.tevksel[i].hex & 0xf) | ((bpmem.tevksel[i + 1].hex & 0xf) << 4); + + u32 enableZTexture = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc && bpmem.zmode.testenable && bpmem.zmode.updateenable) || g_ActiveConfig.bEnablePerPixelDepth ? 1 : 0; + + uid->values[2] = (u32)bpmem.fog.c_proj_fsel.fsel | + ((u32)bpmem.fog.c_proj_fsel.proj << 3) | + ((u32)enableZTexture << 4) | ((u32)bpmem.fogRange.Base.Enabled << 5); + + if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) + { + for (int i = 0; i < 2; ++i) { + uid->values[3 + i] = xfregs.color[i].enablelighting ? + (u32)xfregs.color[i].hex : + (u32)xfregs.color[i].matsource; + uid->values[3 + i] |= (xfregs.alpha[i].enablelighting ? + (u32)xfregs.alpha[i].hex : + (u32)xfregs.alpha[i].matsource) << 15; + } + } + uid->values[4] |= (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) << 31; + + int hdr = 5; + u32 *pcurvalue = &uid->values[hdr]; + for (u32 i = 0; i < numstages; ++i) + { + TevStageCombiner::ColorCombiner &cc = bpmem.combiners[i].colorC; + TevStageCombiner::AlphaCombiner &ac = bpmem.combiners[i].alphaC; + + u32 val0 = cc.hex & 0xffffff; + u32 val1 = ac.hex & 0xffffff; + val0 |= bpmem.tevksel[i / 2].getKC(i & 1) << 24; + val1 |= bpmem.tevksel[i / 2].getKA(i & 1) << 24; + pcurvalue[0] = val0; + pcurvalue[1] = val1; + pcurvalue += 2; + } + + for (u32 i = 0; i < numstages / 2; ++i) + { + u32 val0, val1; + if (bpmem.tevorders[i].hex & 0x40) + val0 = bpmem.tevorders[i].hex & 0x3ff; + else + val0 = bpmem.tevorders[i].hex & 0x380; + if (bpmem.tevorders[i].hex & 0x40000) + val1 = (bpmem.tevorders[i].hex & 0x3ff000) >> 12; + else + val1 = (bpmem.tevorders[i].hex & 0x380000) >> 12; + + switch (i % 3) { + case 0: pcurvalue[0] = val0|(val1<<10); break; + case 1: pcurvalue[0] |= val0<<20; pcurvalue[1] = val1; pcurvalue++; break; + case 2: pcurvalue[1] |= (val0<<10)|(val1<<20); pcurvalue++; break; + default: PanicAlert("Unknown case for Tev Stages / 2: %08x", (i % 3)); + } + } + + if (numstages & 1) { // odd + u32 val0; + if (bpmem.tevorders[bpmem.genMode.numtevstages/2].hex & 0x40) + val0 = bpmem.tevorders[bpmem.genMode.numtevstages/2].hex & 0x3ff; + else + val0 = bpmem.tevorders[bpmem.genMode.numtevstages/2].hex & 0x380; + + switch (bpmem.genMode.numtevstages % 3) + { + case 0: pcurvalue[0] = val0; break; + case 1: pcurvalue[0] |= val0 << 20; break; + case 2: pcurvalue[1] |= val0 << 10; pcurvalue++; break; + default: PanicAlert("Unknown case for Tev Stages: %08x", bpmem.genMode.numtevstages % 3); + } + } + + if ((bpmem.genMode.numtevstages % 3) != 2) + ++pcurvalue; + + uid->tevstages = (u32)(pcurvalue - &uid->values[0] - hdr); + + for (u32 i = 0; i < bpmem.genMode.numindstages; ++i) + { + u32 val = bpmem.tevind[i].hex & 0x1fffff; // 21 bits + switch (i % 3) + { + case 0: pcurvalue[0] = val; break; + case 1: pcurvalue[0] |= val << 21; pcurvalue[1] = val >> 11; ++pcurvalue; break; + case 2: pcurvalue[0] |= val << 10; ++pcurvalue; break; + default: PanicAlert("Unknown case for Ind Stages: %08x", (i % 3)); + } + } + + // yeah, well .... + uid->indstages = (u32)(pcurvalue - &uid->values[0] - (hdr - 1) - uid->tevstages); + +} + +// old tev->pixelshader notes +// +// color for this stage (alpha, color) is given by bpmem.tevorders[0].colorchan0 +// konstant for this stage (alpha, color) is given by bpmem.tevksel +// inputs are given by bpmem.combiners[0].colorC.a/b/c/d << could be current chan color +// according to GXTevColorArg table above +// output is given by .outreg +// tevtemp is set according to swapmodetables and + +static void WriteStage(char *&p, int n, API_TYPE ApiType); +static void SampleTexture(char *&p, const char *destination, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType); +// static void WriteAlphaCompare(char *&p, int num, int comp); +static bool WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode); +static void WriteFog(char *&p); + +static const char *tevKSelTableC[] = // KCSEL +{ + "1.0f,1.0f,1.0f", // 1 = 0x00 + "0.875f,0.875f,0.875f", // 7_8 = 0x01 + "0.75f,0.75f,0.75f", // 3_4 = 0x02 + "0.625f,0.625f,0.625f", // 5_8 = 0x03 + "0.5f,0.5f,0.5f", // 1_2 = 0x04 + "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 + I_KCOLORS"[0].rgb", // K0 = 0x0C + I_KCOLORS"[1].rgb", // K1 = 0x0D + I_KCOLORS"[2].rgb", // K2 = 0x0E + I_KCOLORS"[3].rgb", // K3 = 0x0F + I_KCOLORS"[0].rrr", // K0_R = 0x10 + I_KCOLORS"[1].rrr", // K1_R = 0x11 + I_KCOLORS"[2].rrr", // K2_R = 0x12 + I_KCOLORS"[3].rrr", // K3_R = 0x13 + I_KCOLORS"[0].ggg", // K0_G = 0x14 + I_KCOLORS"[1].ggg", // K1_G = 0x15 + I_KCOLORS"[2].ggg", // K2_G = 0x16 + I_KCOLORS"[3].ggg", // K3_G = 0x17 + I_KCOLORS"[0].bbb", // K0_B = 0x18 + I_KCOLORS"[1].bbb", // K1_B = 0x19 + I_KCOLORS"[2].bbb", // K2_B = 0x1A + I_KCOLORS"[3].bbb", // K3_B = 0x1B + I_KCOLORS"[0].aaa", // K0_A = 0x1C + I_KCOLORS"[1].aaa", // K1_A = 0x1D + I_KCOLORS"[2].aaa", // K2_A = 0x1E + I_KCOLORS"[3].aaa", // K3_A = 0x1F +}; + +static const char *tevKSelTableA[] = // KASEL +{ + "1.0f", // 1 = 0x00 + "0.875f",// 7_8 = 0x01 + "0.75f", // 3_4 = 0x02 + "0.625f",// 5_8 = 0x03 + "0.5f", // 1_2 = 0x04 + "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 + I_KCOLORS"[0].r", // K0_R = 0x10 + I_KCOLORS"[1].r", // K1_R = 0x11 + I_KCOLORS"[2].r", // K2_R = 0x12 + I_KCOLORS"[3].r", // K3_R = 0x13 + I_KCOLORS"[0].g", // K0_G = 0x14 + I_KCOLORS"[1].g", // K1_G = 0x15 + I_KCOLORS"[2].g", // K2_G = 0x16 + I_KCOLORS"[3].g", // K3_G = 0x17 + I_KCOLORS"[0].b", // K0_B = 0x18 + I_KCOLORS"[1].b", // K1_B = 0x19 + I_KCOLORS"[2].b", // K2_B = 0x1A + I_KCOLORS"[3].b", // K3_B = 0x1B + I_KCOLORS"[0].a", // K0_A = 0x1C + I_KCOLORS"[1].a", // K1_A = 0x1D + I_KCOLORS"[2].a", // K2_A = 0x1E + I_KCOLORS"[3].a", // K3_A = 0x1F +}; + +static const char *tevScaleTable[] = // CS +{ + "1.0f", // SCALE_1 + "2.0f", // SCALE_2 + "4.0f", // SCALE_4 + "0.5f", // DIVIDE_2 +}; + +static const char *tevBiasTable[] = // TB +{ + "", // ZERO, + "+0.5f", // ADDHALF, + "-0.5f", // SUBHALF, + "", +}; + +static const char *tevOpTable[] = { // TEV + "+", // TEVOP_ADD = 0, + "-", // TEVOP_SUB = 1, +}; + +static const char *tevCInputTable[] = // CC +{ + "(prev.rgb)", // CPREV, + "(prev.aaa)", // APREV, + "(c0.rgb)", // C0, + "(c0.aaa)", // A0, + "(c1.rgb)", // C1, + "(c1.aaa)", // A1, + "(c2.rgb)", // C2, + "(c2.aaa)", // A2, + "(textemp.rgb)", // TEXC, + "(textemp.aaa)", // TEXA, + "(rastemp.rgb)", // RASC, + "(rastemp.aaa)", // RASA, + "float3(1.0f, 1.0f, 1.0f)", // ONE + "float3(0.5f, 0.5f, 0.5f)", // HALF + "(konsttemp.rgb)", //"konsttemp.rgb", // KONST + "float3(0.0f, 0.0f, 0.0f)", // ZERO + ///aded extra values to map clamped values + "(cprev.rgb)", // CPREV, + "(cprev.aaa)", // APREV, + "(cc0.rgb)", // C0, + "(cc0.aaa)", // A0, + "(cc1.rgb)", // C1, + "(cc1.aaa)", // A1, + "(cc2.rgb)", // C2, + "(cc2.aaa)", // A2, + "(textemp.rgb)", // TEXC, + "(textemp.aaa)", // TEXA, + "(crastemp.rgb)", // RASC, + "(crastemp.aaa)", // RASA, + "float3(1.0f, 1.0f, 1.0f)", // ONE + "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" +}; + +static const char *tevAInputTable[] = // CA +{ + "prev", // APREV, + "c0", // A0, + "c1", // A1, + "c2", // A2, + "textemp", // TEXA, + "rastemp", // RASA, + "konsttemp", // KONST, (hw1 had quarter) + "float4(0.0f, 0.0f, 0.0f, 0.0f)", // ZERO + ///aded extra values to map clamped values + "cprev", // APREV, + "cc0", // A0, + "cc1", // A1, + "cc2", // A2, + "textemp", // TEXA, + "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", +}; + +static const char *tevRasTable[] = +{ + "colors_0", + "colors_1", + "ERROR", //2 + "ERROR", //3 + "ERROR", //4 + "alphabump", // use bump alpha + "(alphabump*(255.0f/248.0f))", //normalized + "float4(0.0f, 0.0f, 0.0f, 0.0f)", // zero +}; + +//static const char *tevTexFunc[] = { "tex2D", "texRECT" }; + +static const char *tevCOutputTable[] = { "prev.rgb", "c0.rgb", "c1.rgb", "c2.rgb" }; +static const char *tevAOutputTable[] = { "prev.a", "c0.a", "c1.a", "c2.a" }; +static const char *tevIndAlphaSel[] = {"", "x", "y", "z"}; +//static const char *tevIndAlphaScale[] = {"", "*32", "*16", "*8"}; +static const char *tevIndAlphaScale[] = {"*(248.0f/255.0f)", "*(224.0f/255.0f)", "*(240.0f/255.0f)", "*(248.0f/255.0f)"}; +static const char *tevIndBiasField[] = {"", "x", "y", "xy", "z", "xz", "yz", "xyz"}; // indexed by bias +static const char *tevIndBiasAdd[] = {"-128.0f", "1.0f", "1.0f", "1.0f" }; // indexed by fmt +static const char *tevIndWrapStart[] = {"0.0f", "256.0f", "128.0f", "64.0f", "32.0f", "16.0f", "0.001f" }; +static const char *tevIndFmtScale[] = {"255.0f", "31.0f", "15.0f", "7.0f" }; + +#define WRITE p+=sprintf + +static char swapModeTable[4][5]; + +static char text[16384]; +static bool DepthTextureEnable; + +static void BuildSwapModeTable() +{ + static const char *swapColors = "rgba"; + for (int i = 0; i < 4; i++) + { + swapModeTable[i][0] = swapColors[bpmem.tevksel[i*2].swap1]; + swapModeTable[i][1] = swapColors[bpmem.tevksel[i*2].swap2]; + swapModeTable[i][2] = swapColors[bpmem.tevksel[i*2+1].swap1]; + swapModeTable[i][3] = swapColors[bpmem.tevksel[i*2+1].swap2]; + swapModeTable[i][4] = 0; + } +} + +const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components) +{ + setlocale(LC_NUMERIC, "C"); // Reset locale for compilation + text[sizeof(text) - 1] = 0x7C; // canary + + BuildSwapModeTable(); // Needed for WriteStage + int numStages = bpmem.genMode.numtevstages + 1; + int numTexgen = bpmem.genMode.numtexgens; + + char *p = text; + WRITE(p, "//Pixel Shader for TEV stages\n"); + WRITE(p, "//%i TEV stages, %i texgens, %i IND stages\n", + numStages, numTexgen, bpmem.genMode.numindstages); + + int nIndirectStagesUsed = 0; + if (bpmem.genMode.numindstages > 0) + { + for (int i = 0; i < numStages; ++i) + { + if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages) + nIndirectStagesUsed |= 1 << bpmem.tevind[i].bt; + } + } + DepthTextureEnable = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc && bpmem.zmode.testenable && bpmem.zmode.updateenable) || g_ActiveConfig.bEnablePerPixelDepth ; + // Declare samplers + + if(ApiType != API_D3D11) + { + WRITE(p, "uniform sampler2D "); + } + else + { + WRITE(p, "sampler "); + } + + bool bfirst = true; + for (int i = 0; i < 8; ++i) + { + WRITE(p, "%s samp%d : register(s%d)", bfirst?"":",", i, i); + bfirst = false; + } + WRITE(p, ";\n"); + if(ApiType == API_D3D11) + { + WRITE(p, "Texture2D "); + bfirst = true; + for (int i = 0; i < 8; ++i) + { + WRITE(p, "%s Tex%d : register(t%d)", bfirst?"":",", i, i); + bfirst = false; + } + WRITE(p, ";\n"); + } + + WRITE(p, "\n"); + + WRITE(p, "uniform float4 "I_COLORS"[4] : register(c%d);\n", C_COLORS); + WRITE(p, "uniform float4 "I_KCOLORS"[4] : register(c%d);\n", C_KCOLORS); + WRITE(p, "uniform float4 "I_ALPHA"[1] : register(c%d);\n", C_ALPHA); + WRITE(p, "uniform float4 "I_TEXDIMS"[8] : register(c%d);\n", C_TEXDIMS); + WRITE(p, "uniform float4 "I_ZBIAS"[2] : register(c%d);\n", C_ZBIAS); + WRITE(p, "uniform float4 "I_INDTEXSCALE"[2] : register(c%d);\n", C_INDTEXSCALE); + WRITE(p, "uniform float4 "I_INDTEXMTX"[6] : register(c%d);\n", C_INDTEXMTX); + WRITE(p, "uniform float4 "I_FOG"[3] : register(c%d);\n", C_FOG); + + if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) + { + WRITE(p,"typedef struct { float4 col; float4 cosatt; float4 distatt; float4 pos; float4 dir; } Light;\n"); + WRITE(p,"typedef struct { Light lights[8]; } s_"I_PLIGHTS";\n"); + WRITE(p, "uniform s_"I_PLIGHTS" "I_PLIGHTS" : register(c%d);\n", C_PLIGHTS); + WRITE(p, "typedef struct { float4 C0, C1, C2, C3; } s_"I_PMATERIALS";\n"); + WRITE(p, "uniform s_"I_PMATERIALS" "I_PMATERIALS" : register(c%d);\n", C_PMATERIALS); + } + + WRITE(p, "void main(\n"); + if(ApiType != API_D3D11) + { + 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," : "", + 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," : ""); + } + + WRITE(p, " in float4 colors_0 : COLOR0,\n"); + WRITE(p, " in float4 colors_1 : COLOR1"); + + // compute window position if needed because binding semantic WPOS is not widely supported + if (numTexgen < 7) + { + for (int i = 0; i < numTexgen; ++i) + WRITE(p, ",\n in float3 uv%d : TEXCOORD%d", i, i); + WRITE(p, ",\n in float4 clipPos : TEXCOORD%d", numTexgen); + if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) + WRITE(p, ",\n in float4 Normal : TEXCOORD%d", numTexgen + 1); + } + else + { + // wpos is in w of first 4 texcoords + if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) + { + for (int i = 0; i < 8; ++i) + WRITE(p, ",\n in float4 uv%d : TEXCOORD%d", i, i); + } + else + { + for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) + WRITE(p, ",\n in float%d uv%d : TEXCOORD%d", i < 4 ? 4 : 3 , i, i); + } + } + WRITE(p, " ) {\n"); + + char* pmainstart = p; + int Pretest = AlphaPreTest(); + if (dstAlphaMode == DSTALPHA_ALPHA_PASS && !DepthTextureEnable && Pretest >= 0) + { + if (!Pretest) + { + // alpha test will always fail, so restart the shader and just make it an empty function + WRITE(p, "ocol0 = 0;\n"); + WRITE(p, "discard;\n"); + if(ApiType != API_D3D11) + WRITE(p, "return;\n"); + } + else + { + WRITE(p, " ocol0 = "I_ALPHA"[0].aaaa;\n"); + } + 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=0;\n" + " float3 tevcoord;\n" + " float2 wrappedcoord, tempcoord;\n" + " float4 cc0, cc1, cc2, cprev,crastemp,ckonsttemp;\n\n"); + + if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) + { + if (xfregs.numTexGen.numTexGens < 7) + { + WRITE(p,"float3 _norm0 = normalize(Normal.xyz);\n\n"); + WRITE(p,"float3 pos = float3(clipPos.x,clipPos.y,Normal.w);\n"); + } + else + { + WRITE(p," float3 _norm0 = normalize(float3(uv4.w,uv5.w,uv6.w));\n\n"); + WRITE(p,"float3 pos = float3(uv0.w,uv1.w,uv7.w);\n"); + } + + + WRITE(p, "float4 mat, lacc;\n" + "float3 ldir, h;\n" + "float dist, dist2, attn;\n"); + + p = GenerateLightingShader(p, components, I_PMATERIALS, I_PLIGHTS, "colors_", "colors_"); + } + + if (numTexgen < 7) + WRITE(p, "clipPos = float4(rawpos.x, rawpos.y, clipPos.z, clipPos.w);\n"); + else + WRITE(p, "float4 clipPos = float4(rawpos.x, rawpos.y, uv2.w, uv3.w);\n"); + + // HACK to handle cases where the tex gen is not enabled + if (numTexgen == 0) + { + WRITE(p, "float3 uv0 = float3(0.0f, 0.0f, 0.0f);\n"); + } + else + { + for (int i = 0; i < numTexgen; ++i) + { + // optional perspective divides + if (xfregs.texMtxInfo[i].projection == XF_TEXPROJ_STQ) + { + WRITE(p, "if (uv%d.z)", i); + WRITE(p, " uv%d.xy = uv%d.xy / uv%d.z;\n", i, i, i); + } + + WRITE(p, "uv%d.xy = uv%d.xy * "I_TEXDIMS"[%d].zw;\n", i, i, i); + } + } + + // indirect texture map lookup + for(u32 i = 0; i < bpmem.genMode.numindstages; ++i) + { + if (nIndirectStagesUsed & (1<= %s.r + (0.25f/255.0f)) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_R8_GT 8 - " %s + ((abs(%s.r - %s.r) < (0.5f/255.0f)) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_R8_EQ 9 - " %s + (( dot(%s.rgb, comp16) >= (dot(%s.rgb, comp16) + (0.25f/255.0f))) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_GR16_GT 10 - " %s + (abs(dot(%s.rgb, comp16) - dot(%s.rgb, comp16)) < (0.5f/255.0f) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_GR16_EQ 11 - " %s + (( dot(%s.rgb, comp24) >= (dot(%s.rgb, comp24) + (0.25f/255.0f))) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_BGR24_GT 12 - " %s + (abs(dot(%s.rgb, comp24) - dot(%s.rgb, comp24)) < (0.5f/255.0f) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_BGR24_EQ 13 - " %s + (max(sign(%s.rgb - %s.rgb - (0.25f/255.0f)), float3(0.0f, 0.0f, 0.0f)) * %s)",//#define TEVCMP_RGB8_GT 14 - " %s + ((float3(1.0f, 1.0f, 1.0f) - max(sign(abs(%s.rgb - %s.rgb) - (0.5f/255.0f)), float3(0.0f, 0.0f, 0.0f))) * %s)"//#define TEVCMP_RGB8_EQ 15 -}; - -//table with the alpha compare operations -static const char *TEVCMPAlphaOPTable[16] = -{ - "0.0f",//0 - "0.0f",//1 - "0.0f",//2 - "0.0f",//3 - "0.0f",//4 - "0.0f",//5 - "0.0f",//6 - "0.0f",//7 - " %s.a + ((%s.r >= (%s.r + (0.25f/255.0f))) ? %s.a : 0.0f)",//#define TEVCMP_R8_GT 8 - " %s.a + (abs(%s.r - %s.r) < (0.5f/255.0f) ? %s.a : 0.0f)",//#define TEVCMP_R8_EQ 9 - " %s.a + ((dot(%s.rgb, comp16) >= (dot(%s.rgb, comp16) + (0.25f/255.0f))) ? %s.a : 0.0f)",//#define TEVCMP_GR16_GT 10 - " %s.a + (abs(dot(%s.rgb, comp16) - dot(%s.rgb, comp16)) < (0.5f/255.0f) ? %s.a : 0.0f)",//#define TEVCMP_GR16_EQ 11 - " %s.a + ((dot(%s.rgb, comp24) >= (dot(%s.rgb, comp24) + (0.25f/255.0f))) ? %s.a : 0.0f)",//#define TEVCMP_BGR24_GT 12 - " %s.a + (abs(dot(%s.rgb, comp24) - dot(%s.rgb, comp24)) < (0.5f/255.0f) ? %s.a : 0.0f)",//#define TEVCMP_BGR24_EQ 13 - " %s.a + ((%s.a >= (%s.a + (0.25f/255.0f))) ? %s.a : 0.0f)",//#define TEVCMP_A8_GT 14 - " %s.a + (abs(%s.a - %s.a) < (0.5f/255.0f) ? %s.a : 0.0f)"//#define TEVCMP_A8_EQ 15 - -}; - - -static void WriteStage(char *&p, int n, API_TYPE ApiType) -{ - int texcoord = bpmem.tevorders[n/2].getTexCoord(n&1); - bool bHasTexCoord = (u32)texcoord < bpmem.genMode.numtexgens; - bool bHasIndStage = bpmem.tevind[n].IsActive() && bpmem.tevind[n].bt < bpmem.genMode.numindstages; - - // HACK to handle cases where the tex gen is not enabled - if (!bHasTexCoord) - texcoord = 0; - - if (bHasIndStage) - { - // perform the indirect op on the incoming regular coordinates using indtex%d as the offset coords - if (bpmem.tevind[n].bs != ITBA_OFF) - { - WRITE(p, "alphabump = indtex%d.%s %s;\n", - bpmem.tevind[n].bt, - tevIndAlphaSel[bpmem.tevind[n].bs], - tevIndAlphaScale[bpmem.tevind[n].fmt]); - } - // format - WRITE(p, "float3 indtevcrd%d = indtex%d * %s;\n", n, bpmem.tevind[n].bt, tevIndFmtScale[bpmem.tevind[n].fmt]); - - // bias - if (bpmem.tevind[n].bias != ITB_NONE ) - WRITE(p, "indtevcrd%d.%s += %s;\n", n, tevIndBiasField[bpmem.tevind[n].bias], tevIndBiasAdd[bpmem.tevind[n].fmt]); - - // multiply by offset matrix and scale - if (bpmem.tevind[n].mid != 0) - { - if (bpmem.tevind[n].mid <= 3) - { - int mtxidx = 2*(bpmem.tevind[n].mid-1); - WRITE(p, "float2 indtevtrans%d = float2(dot("I_INDTEXMTX"[%d].xyz, indtevcrd%d), dot("I_INDTEXMTX"[%d].xyz, indtevcrd%d));\n", - n, mtxidx, n, mtxidx+1, n); - } - else if (bpmem.tevind[n].mid <= 7 && bHasTexCoord) - { // s matrix - // TODO: Might become negative? - int mtxidx = 2*(bpmem.tevind[n].mid-5); - WRITE(p, "float2 indtevtrans%d = "I_INDTEXMTX"[%d].ww * uv%d.xy * indtevcrd%d.xx;\n", n, mtxidx, texcoord, n); - } - else if (bpmem.tevind[n].mid <= 11 && bHasTexCoord) - { // t matrix - // TODO: Might become negative? - int mtxidx = 2*(bpmem.tevind[n].mid-9); - WRITE(p, "float2 indtevtrans%d = "I_INDTEXMTX"[%d].ww * uv%d.xy * indtevcrd%d.yy;\n", n, mtxidx, texcoord, n); - } - else - WRITE(p, "float2 indtevtrans%d = 0;\n", n); - } - else - WRITE(p, "float2 indtevtrans%d = 0;\n", n); - - // --------- - // Wrapping - // --------- - - // wrap S - if (bpmem.tevind[n].sw == ITW_OFF) - WRITE(p, "wrappedcoord.x = uv%d.x;\n", texcoord); - else if (bpmem.tevind[n].sw == ITW_0) - WRITE(p, "wrappedcoord.x = 0.0f;\n"); - else - WRITE(p, "wrappedcoord.x = fmod( uv%d.x, %s );\n", texcoord, tevIndWrapStart[bpmem.tevind[n].sw]); - - // wrap T - if (bpmem.tevind[n].tw == ITW_OFF) - WRITE(p, "wrappedcoord.y = uv%d.y;\n", texcoord); - else if (bpmem.tevind[n].tw == ITW_0) - WRITE(p, "wrappedcoord.y = 0.0f;\n"); - else - WRITE(p, "wrappedcoord.y = fmod( uv%d.y, %s );\n", texcoord, tevIndWrapStart[bpmem.tevind[n].tw]); - - if (bpmem.tevind[n].fb_addprev) // add previous tevcoord - WRITE(p, "tevcoord.xy += wrappedcoord + indtevtrans%d;\n", n); - else - WRITE(p, "tevcoord.xy = wrappedcoord + indtevtrans%d;\n", n); - } - - TevStageCombiner::ColorCombiner &cc = bpmem.combiners[n].colorC; - TevStageCombiner::AlphaCombiner &ac = bpmem.combiners[n].alphaC; - - 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 - || cc.d == TEVCOLORARG_RASA || cc.d == TEVCOLORARG_RASC - || ac.a == TEVALPHAARG_RASA || ac.b == TEVALPHAARG_RASA - || ac.c == TEVALPHAARG_RASA || ac.d == TEVALPHAARG_RASA) - { - char *rasswap = swapModeTable[bpmem.combiners[n].alphaC.rswap]; - WRITE(p, "rastemp = %s.%s;\n", tevRasTable[bpmem.tevorders[n / 2].getColorChan(n & 1)], rasswap); - WRITE(p, "crastemp = frac(rastemp * (255.0f/256.0f)) * (256.0f/255.0f);\n"); - } - - - if (bpmem.tevorders[n/2].getEnable(n&1)) - { - if(!bHasIndStage) - { - // calc tevcord - if(bHasTexCoord) - WRITE(p, "tevcoord.xy = uv%d.xy;\n", texcoord); - else - WRITE(p, "tevcoord.xy = float2(0.0f, 0.0f);\n"); - } - - char *texswap = swapModeTable[bpmem.combiners[n].alphaC.tswap]; - int texmap = bpmem.tevorders[n/2].getTexMap(n&1); - SampleTexture(p, "textemp", "tevcoord", texswap, texmap, ApiType); - } - else - WRITE(p, "textemp = float4(1.0f, 1.0f, 1.0f, 1.0f);\n"); - - - 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) - { - int kc = bpmem.tevksel[n / 2].getKC(n & 1); - int ka = bpmem.tevksel[n / 2].getKA(n & 1); - WRITE(p, "konsttemp = float4(%s, %s);\n", tevKSelTableC[kc], tevKSelTableA[ka]); - if(kc > 7 || ka > 7) - { - WRITE(p, "ckonsttemp = frac(konsttemp * (255.0f/256.0f)) * (256.0f/255.0f);\n"); - } - else - { - WRITE(p, "ckonsttemp = konsttemp;\n"); - } - } - - if(cc.a == TEVCOLORARG_CPREV || cc.a == TEVCOLORARG_APREV - || 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(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(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(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) - WRITE(p, "cc2 = frac(c2 * (255.0f/256.0f)) * (256.0f/255.0f);\n"); - - - if (cc.clamp) - WRITE(p, "%s = saturate(", tevCOutputTable[cc.dest]); - else - WRITE(p, "%s = ", tevCOutputTable[cc.dest]); - - // combine the color channel - if (cc.bias != TevBias_COMPARE) // if not compare - { - //normal color combiner goes here - if (cc.shift > TEVSCALE_1) - WRITE(p, "%s*(", tevScaleTable[cc.shift]); - - if(!(cc.d == TEVCOLORARG_ZERO && cc.op == TEVOP_ADD)) - WRITE(p, "%s%s", tevCInputTable[cc.d], tevOpTable[cc.op]); - - if (cc.a == cc.b) - WRITE(p, "%s", tevCInputTable[cc.a + 16]); - else if (cc.c == TEVCOLORARG_ZERO) - WRITE(p, "%s", tevCInputTable[cc.a + 16]); - else if (cc.c == TEVCOLORARG_ONE) - WRITE(p, "%s", tevCInputTable[cc.b + 16]); - else if (cc.a == TEVCOLORARG_ZERO) - WRITE(p, "%s*%s", tevCInputTable[cc.b + 16], tevCInputTable[cc.c + 16]); - else if (cc.b == TEVCOLORARG_ZERO) - WRITE(p, "%s*(float3(1.0f, 1.0f, 1.0f)-%s)", tevCInputTable[cc.a + 16], tevCInputTable[cc.c + 16]); - else - WRITE(p, "lerp(%s, %s, %s)", tevCInputTable[cc.a + 16], tevCInputTable[cc.b + 16], tevCInputTable[cc.c + 16]); - - WRITE(p, "%s", tevBiasTable[cc.bias]); - - if (cc.shift > TEVSCALE_1) - WRITE(p, ")"); - } - else - { - int cmp = (cc.shift<<1)|cc.op|8; // comparemode stored here - WRITE(p, TEVCMPColorOPTable[cmp],//lookup the function from the op table - tevCInputTable[cc.d], - tevCInputTable[cc.a + 16], - tevCInputTable[cc.b + 16], - tevCInputTable[cc.c + 16]); - } - if (cc.clamp) - WRITE(p, ")"); - WRITE(p,";\n"); - - // combine the alpha channel - if (ac.clamp) - WRITE(p, "%s = saturate(", tevAOutputTable[ac.dest]); - else - WRITE(p, "%s = ", tevAOutputTable[ac.dest]); - - if (ac.bias != TevBias_COMPARE) // if not compare - { - //normal alpha combiner goes here - if (ac.shift > TEVSCALE_1) - WRITE(p, "%s*(", tevScaleTable[ac.shift]); - - if(!(ac.d == TEVALPHAARG_ZERO && ac.op == TEVOP_ADD)) - WRITE(p, "%s.a%s", tevAInputTable[ac.d], tevOpTable[ac.op]); - - if (ac.a == ac.b) - WRITE(p, "%s.a", tevAInputTable[ac.a + 8]); - else if (ac.c == TEVALPHAARG_ZERO) - WRITE(p, "%s.a", tevAInputTable[ac.a + 8]); - else if (ac.a == TEVALPHAARG_ZERO) - WRITE(p, "%s.a*%s.a", tevAInputTable[ac.b + 8], tevAInputTable[ac.c + 8]); - else if (ac.b == TEVALPHAARG_ZERO) - WRITE(p, "%s.a*(1.0f-%s.a)", tevAInputTable[ac.a + 8], tevAInputTable[ac.c + 8]); - else - WRITE(p, "lerp(%s.a, %s.a, %s.a)", tevAInputTable[ac.a + 8], tevAInputTable[ac.b + 8], tevAInputTable[ac.c + 8]); - - WRITE(p, "%s",tevBiasTable[ac.bias]); - - if (ac.shift>0) - WRITE(p, ")"); - - } - else - { - //compare alpha combiner goes here - int cmp = (ac.shift<<1)|ac.op|8; // comparemode stored here - WRITE(p, TEVCMPAlphaOPTable[cmp], - tevAInputTable[ac.d], - tevAInputTable[ac.a + 8], - tevAInputTable[ac.b + 8], - tevAInputTable[ac.c + 8]); - } - if (ac.clamp) - WRITE(p, ")"); - WRITE(p, ";\n\n"); -} - -void SampleTexture(char *&p, const char *destination, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType) -{ - if (ApiType == API_D3D11) - WRITE(p, "%s=Tex%d.Sample(samp%d,%s.xy * "I_TEXDIMS"[%d].xy).%s;\n", destination, texmap,texmap, texcoords, texmap, texswap); - else - WRITE(p, "%s=tex2D(samp%d,%s.xy * "I_TEXDIMS"[%d].xy).%s;\n", destination, texmap, texcoords, texmap, texswap); -} - -static const char *tevAlphaFuncsTable[] = -{ - "(false)", //ALPHACMP_NEVER 0 - "(prev.a <= %s - (0.25f/255.0f))", //ALPHACMP_LESS 1 - "(abs( prev.a - %s ) < (0.5f/255.0f))", //ALPHACMP_EQUAL 2 - "(prev.a < %s + (0.25f/255.0f))", //ALPHACMP_LEQUAL 3 - "(prev.a >= %s + (0.25f/255.0f))", //ALPHACMP_GREATER 4 - "(abs( prev.a - %s ) >= (0.5f/255.0f))", //ALPHACMP_NEQUAL 5 - "(prev.a > %s - (0.25f/255.0f))", //ALPHACMP_GEQUAL 6 - "(true)" //ALPHACMP_ALWAYS 7 -}; - -static const char *tevAlphaFunclogicTable[] = -{ - " && ", // and - " || ", // or - " != ", // xor - " == " // xnor -}; -static 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 true; - if (comp[0] == ALPHACMP_NEVER || comp[1] == ALPHACMP_NEVER) return false; - 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; - break; - case 2: // XOR - if ((comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_NEVER) || (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_ALWAYS)) - return true; - if ((comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_ALWAYS) || (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_NEVER)) - return false; - break; - case 3: // XNOR - if ((comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_NEVER) || (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_ALWAYS)) - return false; - if ((comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_ALWAYS) || (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_NEVER)) - return true; - break; - default: PanicAlert("bad logic for alpha test? %08x", op); - } - return -1; -} - - -static bool WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode) -{ - static const char *alphaRef[2] = - { - I_ALPHA"[0].r", - I_ALPHA"[0].g" - }; - - int Pretest = AlphaPreTest(); - if(Pretest >= 0) - { - return Pretest != 0; - } - - // using discard then return works the same in cg and dx9 but not in dx11 - WRITE(p, "if(!( "); - - int compindex = bpmem.alphaFunc.comp0 % 8; - 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 - - compindex = bpmem.alphaFunc.comp1 % 8; - WRITE(p, tevAlphaFuncsTable[compindex],alphaRef[1]);//lookup the second component from the alpha function table - WRITE(p, ")){ocol0 = 0;%s%s discard;%s}\n", - dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND ? "ocol1 = 0;" : "", - DepthTextureEnable ? "depth = 1.f;" : "", - (ApiType != API_D3D11) ? "return;" : ""); - return true; -} - -static const char *tevFogFuncsTable[] = -{ - "", //No Fog - "", //? - "", //Linear - "", //? - " fog = 1.0f - pow(2.0f, -8.0f * fog);\n", //exp - " fog = 1.0f - pow(2.0f, -8.0f * fog * fog);\n", //exp2 - " fog = pow(2.0f, -8.0f * (1.0f - fog));\n", //backward exp - " fog = 1.0f - fog;\n fog = pow(2.0f, -8.0f * fog * fog);\n" //backward exp2 -}; - -static void WriteFog(char *&p) -{ - if(bpmem.fog.c_proj_fsel.fsel == 0)return;//no Fog - - if (bpmem.fog.c_proj_fsel.proj == 0) - { - // perspective - // ze = A/(B - (Zs >> B_SHF) - WRITE (p, " float ze = "I_FOG"[1].x / ("I_FOG"[1].y - (zCoord / "I_FOG"[1].w));\n"); - } - else - { - // orthographic - // ze = a*Zs (here, no B_SHF) - WRITE (p, " float ze = "I_FOG"[1].x * zCoord;\n"); - } - - // x_adjust = sqrt((x-center)^2 + k^2)/k - // ze *= x_adjust - //this is complitly teorical as the real hard seems to use a table intead of calculate the values. - if(bpmem.fogRange.Base.Enabled) - { - WRITE (p, " float x_adjust = (2.0f * (clipPos.x / "I_FOG"[2].y)) - 1.0f - "I_FOG"[2].x;\n"); - WRITE (p, " x_adjust = sqrt(x_adjust * x_adjust + "I_FOG"[2].z * "I_FOG"[2].z) / "I_FOG"[2].z;\n"); - WRITE (p, " ze *= x_adjust;\n"); - } - - WRITE (p, " float fog = saturate(ze - "I_FOG"[1].z);\n"); - - if(bpmem.fog.c_proj_fsel.fsel > 3) - { - WRITE(p, "%s", tevFogFuncsTable[bpmem.fog.c_proj_fsel.fsel]); - } - else - { - if(bpmem.fog.c_proj_fsel.fsel != 2) - WARN_LOG(VIDEO, "Unknown Fog Type! %08x", bpmem.fog.c_proj_fsel.fsel); - } - - WRITE(p, " prev.rgb = lerp(prev.rgb,"I_FOG"[0].rgb,fog);\n"); - - + WRITE(p, "prev = frac(4.0f + prev * (255.0f/256.0f)) * (256.0f/255.0f);\n"); + + // TODO: Why are we doing a second alpha pretest here? + if (!WriteAlphaTest(p, ApiType, dstAlphaMode)) + { + // alpha test will always fail, so restart the shader and just make it an empty function + p = pmainstart; + 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((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"); + } + + 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) + { + 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"); + + // 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"); + else + { + WriteFog(p); + WRITE(p, " ocol0 = prev;\n"); + } + + // On D3D11, use dual-source color blending to perform dst alpha in a + // single pass + if (dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND) + { + // Colors will be blended against the alpha from ocol1... + WRITE(p, " ocol1 = ocol0;\n"); + // ...and the alpha from ocol0 will be written to the framebuffer. + WRITE(p, " ocol0.a = "I_ALPHA"[0].a;\n"); + } + } + WRITE(p, "}\n"); + if (text[sizeof(text) - 1] != 0x7C) + PanicAlert("PixelShader generator - buffer too small, canary has been eaten!"); + + setlocale(LC_NUMERIC, ""); // restore locale + return text; +} + + + +//table with the color compare operations +static const char *TEVCMPColorOPTable[16] = +{ + "float3(0.0f, 0.0f, 0.0f)",//0 + "float3(0.0f, 0.0f, 0.0f)",//1 + "float3(0.0f, 0.0f, 0.0f)",//2 + "float3(0.0f, 0.0f, 0.0f)",//3 + "float3(0.0f, 0.0f, 0.0f)",//4 + "float3(0.0f, 0.0f, 0.0f)",//5 + "float3(0.0f, 0.0f, 0.0f)",//6 + "float3(0.0f, 0.0f, 0.0f)",//7 + " %s + ((%s.r >= %s.r + (0.25f/255.0f)) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_R8_GT 8 + " %s + ((abs(%s.r - %s.r) < (0.5f/255.0f)) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_R8_EQ 9 + " %s + (( dot(%s.rgb, comp16) >= (dot(%s.rgb, comp16) + (0.25f/255.0f))) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_GR16_GT 10 + " %s + (abs(dot(%s.rgb, comp16) - dot(%s.rgb, comp16)) < (0.5f/255.0f) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_GR16_EQ 11 + " %s + (( dot(%s.rgb, comp24) >= (dot(%s.rgb, comp24) + (0.25f/255.0f))) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_BGR24_GT 12 + " %s + (abs(dot(%s.rgb, comp24) - dot(%s.rgb, comp24)) < (0.5f/255.0f) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_BGR24_EQ 13 + " %s + (max(sign(%s.rgb - %s.rgb - (0.25f/255.0f)), float3(0.0f, 0.0f, 0.0f)) * %s)",//#define TEVCMP_RGB8_GT 14 + " %s + ((float3(1.0f, 1.0f, 1.0f) - max(sign(abs(%s.rgb - %s.rgb) - (0.5f/255.0f)), float3(0.0f, 0.0f, 0.0f))) * %s)"//#define TEVCMP_RGB8_EQ 15 +}; + +//table with the alpha compare operations +static const char *TEVCMPAlphaOPTable[16] = +{ + "0.0f",//0 + "0.0f",//1 + "0.0f",//2 + "0.0f",//3 + "0.0f",//4 + "0.0f",//5 + "0.0f",//6 + "0.0f",//7 + " %s.a + ((%s.r >= (%s.r + (0.25f/255.0f))) ? %s.a : 0.0f)",//#define TEVCMP_R8_GT 8 + " %s.a + (abs(%s.r - %s.r) < (0.5f/255.0f) ? %s.a : 0.0f)",//#define TEVCMP_R8_EQ 9 + " %s.a + ((dot(%s.rgb, comp16) >= (dot(%s.rgb, comp16) + (0.25f/255.0f))) ? %s.a : 0.0f)",//#define TEVCMP_GR16_GT 10 + " %s.a + (abs(dot(%s.rgb, comp16) - dot(%s.rgb, comp16)) < (0.5f/255.0f) ? %s.a : 0.0f)",//#define TEVCMP_GR16_EQ 11 + " %s.a + ((dot(%s.rgb, comp24) >= (dot(%s.rgb, comp24) + (0.25f/255.0f))) ? %s.a : 0.0f)",//#define TEVCMP_BGR24_GT 12 + " %s.a + (abs(dot(%s.rgb, comp24) - dot(%s.rgb, comp24)) < (0.5f/255.0f) ? %s.a : 0.0f)",//#define TEVCMP_BGR24_EQ 13 + " %s.a + ((%s.a >= (%s.a + (0.25f/255.0f))) ? %s.a : 0.0f)",//#define TEVCMP_A8_GT 14 + " %s.a + (abs(%s.a - %s.a) < (0.5f/255.0f) ? %s.a : 0.0f)"//#define TEVCMP_A8_EQ 15 + +}; + + +static void WriteStage(char *&p, int n, API_TYPE ApiType) +{ + int texcoord = bpmem.tevorders[n/2].getTexCoord(n&1); + bool bHasTexCoord = (u32)texcoord < bpmem.genMode.numtexgens; + bool bHasIndStage = bpmem.tevind[n].IsActive() && bpmem.tevind[n].bt < bpmem.genMode.numindstages; + + // HACK to handle cases where the tex gen is not enabled + if (!bHasTexCoord) + texcoord = 0; + + WRITE(p, "// TEV stage %d\n", n); + + if (bHasIndStage) + { + WRITE(p, "// indirect op\n", n); + // perform the indirect op on the incoming regular coordinates using indtex%d as the offset coords + if (bpmem.tevind[n].bs != ITBA_OFF) + { + WRITE(p, "alphabump = indtex%d.%s %s;\n", + bpmem.tevind[n].bt, + tevIndAlphaSel[bpmem.tevind[n].bs], + tevIndAlphaScale[bpmem.tevind[n].fmt]); + } + // format + WRITE(p, "float3 indtevcrd%d = indtex%d * %s;\n", n, bpmem.tevind[n].bt, tevIndFmtScale[bpmem.tevind[n].fmt]); + + // bias + if (bpmem.tevind[n].bias != ITB_NONE ) + WRITE(p, "indtevcrd%d.%s += %s;\n", n, tevIndBiasField[bpmem.tevind[n].bias], tevIndBiasAdd[bpmem.tevind[n].fmt]); + + // multiply by offset matrix and scale + if (bpmem.tevind[n].mid != 0) + { + if (bpmem.tevind[n].mid <= 3) + { + int mtxidx = 2*(bpmem.tevind[n].mid-1); + WRITE(p, "float2 indtevtrans%d = float2(dot("I_INDTEXMTX"[%d].xyz, indtevcrd%d), dot("I_INDTEXMTX"[%d].xyz, indtevcrd%d));\n", + n, mtxidx, n, mtxidx+1, n); + } + else if (bpmem.tevind[n].mid <= 7 && bHasTexCoord) + { // s matrix + // TODO: Might become negative? + int mtxidx = 2*(bpmem.tevind[n].mid-5); + WRITE(p, "float2 indtevtrans%d = "I_INDTEXMTX"[%d].ww * uv%d.xy * indtevcrd%d.xx;\n", n, mtxidx, texcoord, n); + } + else if (bpmem.tevind[n].mid <= 11 && bHasTexCoord) + { // t matrix + // TODO: Might become negative? + int mtxidx = 2*(bpmem.tevind[n].mid-9); + WRITE(p, "float2 indtevtrans%d = "I_INDTEXMTX"[%d].ww * uv%d.xy * indtevcrd%d.yy;\n", n, mtxidx, texcoord, n); + } + else + WRITE(p, "float2 indtevtrans%d = 0;\n", n); + } + else + WRITE(p, "float2 indtevtrans%d = 0;\n", n); + + // --------- + // Wrapping + // --------- + + // wrap S + if (bpmem.tevind[n].sw == ITW_OFF) + WRITE(p, "wrappedcoord.x = uv%d.x;\n", texcoord); + else if (bpmem.tevind[n].sw == ITW_0) + WRITE(p, "wrappedcoord.x = 0.0f;\n"); + else + WRITE(p, "wrappedcoord.x = fmod( uv%d.x, %s );\n", texcoord, tevIndWrapStart[bpmem.tevind[n].sw]); + + // wrap T + if (bpmem.tevind[n].tw == ITW_OFF) + WRITE(p, "wrappedcoord.y = uv%d.y;\n", texcoord); + else if (bpmem.tevind[n].tw == ITW_0) + WRITE(p, "wrappedcoord.y = 0.0f;\n"); + else + WRITE(p, "wrappedcoord.y = fmod( uv%d.y, %s );\n", texcoord, tevIndWrapStart[bpmem.tevind[n].tw]); + + if (bpmem.tevind[n].fb_addprev) // add previous tevcoord + WRITE(p, "tevcoord.xy += wrappedcoord + indtevtrans%d;\n", n); + else + WRITE(p, "tevcoord.xy = wrappedcoord + indtevtrans%d;\n", n); + } + + 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 + || cc.d == TEVCOLORARG_RASA || cc.d == TEVCOLORARG_RASC + || ac.a == TEVALPHAARG_RASA || ac.b == TEVALPHAARG_RASA + || ac.c == TEVALPHAARG_RASA || ac.d == TEVALPHAARG_RASA) + { + char *rasswap = swapModeTable[bpmem.combiners[n].alphaC.rswap]; + WRITE(p, "rastemp = %s.%s;\n", tevRasTable[bpmem.tevorders[n / 2].getColorChan(n & 1)], rasswap); + WRITE(p, "crastemp = frac(rastemp * (255.0f/256.0f)) * (256.0f/255.0f);\n"); + } + + + if (bpmem.tevorders[n/2].getEnable(n&1)) + { + if(!bHasIndStage) + { + // calc tevcord + if(bHasTexCoord) + WRITE(p, "tevcoord.xy = uv%d.xy;\n", texcoord); + else + WRITE(p, "tevcoord.xy = float2(0.0f, 0.0f);\n"); + } + + char *texswap = swapModeTable[bpmem.combiners[n].alphaC.tswap]; + int texmap = bpmem.tevorders[n/2].getTexMap(n&1); + SampleTexture(p, "textemp", "tevcoord", texswap, texmap, ApiType); + } + else + 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) + { + int kc = bpmem.tevksel[n / 2].getKC(n & 1); + int ka = bpmem.tevksel[n / 2].getKA(n & 1); + WRITE(p, "konsttemp = float4(%s, %s);\n", tevKSelTableC[kc], tevKSelTableA[ka]); + if(kc > 7 || ka > 7) + { + WRITE(p, "ckonsttemp = frac(konsttemp * (255.0f/256.0f)) * (256.0f/255.0f);\n"); + } + else + { + WRITE(p, "ckonsttemp = konsttemp;\n"); + } + } + + if(cc.a == TEVCOLORARG_CPREV || cc.a == TEVCOLORARG_APREV + || 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(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(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(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) + WRITE(p, "cc2 = frac(c2 * (255.0f/256.0f)) * (256.0f/255.0f);\n"); + + + WRITE(p, "// color combine\n", n); + if (cc.clamp) + WRITE(p, "%s = saturate(", tevCOutputTable[cc.dest]); + else + WRITE(p, "%s = ", tevCOutputTable[cc.dest]); + + // combine the color channel + if (cc.bias != TevBias_COMPARE) // if not compare + { + //normal color combiner goes here + if (cc.shift > TEVSCALE_1) + WRITE(p, "%s*(", tevScaleTable[cc.shift]); + + if(!(cc.d == TEVCOLORARG_ZERO && cc.op == TEVOP_ADD)) + WRITE(p, "%s%s", tevCInputTable[cc.d], tevOpTable[cc.op]); + + if (cc.a == cc.b) + WRITE(p, "%s", tevCInputTable[cc.a + 16]); + else if (cc.c == TEVCOLORARG_ZERO) + WRITE(p, "%s", tevCInputTable[cc.a + 16]); + else if (cc.c == TEVCOLORARG_ONE) + WRITE(p, "%s", tevCInputTable[cc.b + 16]); + else if (cc.a == TEVCOLORARG_ZERO) + WRITE(p, "%s*%s", tevCInputTable[cc.b + 16], tevCInputTable[cc.c + 16]); + else if (cc.b == TEVCOLORARG_ZERO) + WRITE(p, "%s*(float3(1.0f, 1.0f, 1.0f)-%s)", tevCInputTable[cc.a + 16], tevCInputTable[cc.c + 16]); + else + WRITE(p, "lerp(%s, %s, %s)", tevCInputTable[cc.a + 16], tevCInputTable[cc.b + 16], tevCInputTable[cc.c + 16]); + + WRITE(p, "%s", tevBiasTable[cc.bias]); + + if (cc.shift > TEVSCALE_1) + WRITE(p, ")"); + } + else + { + int cmp = (cc.shift<<1)|cc.op|8; // comparemode stored here + WRITE(p, TEVCMPColorOPTable[cmp],//lookup the function from the op table + tevCInputTable[cc.d], + tevCInputTable[cc.a + 16], + tevCInputTable[cc.b + 16], + tevCInputTable[cc.c + 16]); + } + if (cc.clamp) + WRITE(p, ")"); + WRITE(p,";\n"); + + WRITE(p, "// alpha combine\n", n); + // combine the alpha channel + if (ac.clamp) + WRITE(p, "%s = saturate(", tevAOutputTable[ac.dest]); + else + WRITE(p, "%s = ", tevAOutputTable[ac.dest]); + + if (ac.bias != TevBias_COMPARE) // if not compare + { + //normal alpha combiner goes here + if (ac.shift > TEVSCALE_1) + WRITE(p, "%s*(", tevScaleTable[ac.shift]); + + if(!(ac.d == TEVALPHAARG_ZERO && ac.op == TEVOP_ADD)) + WRITE(p, "%s.a%s", tevAInputTable[ac.d], tevOpTable[ac.op]); + + if (ac.a == ac.b) + WRITE(p, "%s.a", tevAInputTable[ac.a + 8]); + else if (ac.c == TEVALPHAARG_ZERO) + WRITE(p, "%s.a", tevAInputTable[ac.a + 8]); + else if (ac.a == TEVALPHAARG_ZERO) + WRITE(p, "%s.a*%s.a", tevAInputTable[ac.b + 8], tevAInputTable[ac.c + 8]); + else if (ac.b == TEVALPHAARG_ZERO) + WRITE(p, "%s.a*(1.0f-%s.a)", tevAInputTable[ac.a + 8], tevAInputTable[ac.c + 8]); + else + WRITE(p, "lerp(%s.a, %s.a, %s.a)", tevAInputTable[ac.a + 8], tevAInputTable[ac.b + 8], tevAInputTable[ac.c + 8]); + + WRITE(p, "%s",tevBiasTable[ac.bias]); + + if (ac.shift>0) + WRITE(p, ")"); + + } + else + { + //compare alpha combiner goes here + int cmp = (ac.shift<<1)|ac.op|8; // comparemode stored here + WRITE(p, TEVCMPAlphaOPTable[cmp], + tevAInputTable[ac.d], + tevAInputTable[ac.a + 8], + tevAInputTable[ac.b + 8], + tevAInputTable[ac.c + 8]); + } + if (ac.clamp) + WRITE(p, ")"); + WRITE(p, ";\n\n"); + WRITE(p, "// TEV done\n", n); +} + +void SampleTexture(char *&p, const char *destination, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType) +{ + if (ApiType == API_D3D11) + WRITE(p, "%s=Tex%d.Sample(samp%d,%s.xy * "I_TEXDIMS"[%d].xy).%s;\n", destination, texmap,texmap, texcoords, texmap, texswap); + else + WRITE(p, "%s=tex2D(samp%d,%s.xy * "I_TEXDIMS"[%d].xy).%s;\n", destination, texmap, texcoords, texmap, texswap); +} + +static const char *tevAlphaFuncsTable[] = +{ + "(false)", //ALPHACMP_NEVER 0 + "(prev.a <= %s - (0.25f/255.0f))", //ALPHACMP_LESS 1 + "(abs( prev.a - %s ) < (0.5f/255.0f))", //ALPHACMP_EQUAL 2 + "(prev.a < %s + (0.25f/255.0f))", //ALPHACMP_LEQUAL 3 + "(prev.a >= %s + (0.25f/255.0f))", //ALPHACMP_GREATER 4 + "(abs( prev.a - %s ) >= (0.5f/255.0f))", //ALPHACMP_NEQUAL 5 + "(prev.a > %s - (0.25f/255.0f))", //ALPHACMP_GEQUAL 6 + "(true)" //ALPHACMP_ALWAYS 7 +}; + +static const char *tevAlphaFunclogicTable[] = +{ + " && ", // and + " || ", // or + " != ", // xor + " == " // xnor +}; +static 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 true; + if (comp[0] == ALPHACMP_NEVER || comp[1] == ALPHACMP_NEVER) return false; + 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; + break; + case 2: // XOR + if ((comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_NEVER) || (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_ALWAYS)) + return true; + if ((comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_ALWAYS) || (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_NEVER)) + return false; + break; + case 3: // XNOR + if ((comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_NEVER) || (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_ALWAYS)) + return false; + if ((comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_ALWAYS) || (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_NEVER)) + return true; + break; + default: PanicAlert("bad logic for alpha test? %08x", op); + } + return -1; +} + + +static bool WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode) +{ + static const char *alphaRef[2] = + { + I_ALPHA"[0].r", + I_ALPHA"[0].g" + }; + + int Pretest = AlphaPreTest(); + if(Pretest >= 0) + { + return Pretest != 0; + } + + // using discard then return works the same in cg and dx9 but not in dx11 + WRITE(p, "if(!( "); + + int compindex = bpmem.alphaFunc.comp0 % 8; + 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 + + compindex = bpmem.alphaFunc.comp1 % 8; + WRITE(p, tevAlphaFuncsTable[compindex],alphaRef[1]);//lookup the second component from the alpha function table + WRITE(p, ")){ocol0 = 0;%s%s discard;%s}\n", + dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND ? "ocol1 = 0;" : "", + DepthTextureEnable ? "depth = 1.f;" : "", + (ApiType != API_D3D11) ? "return;" : ""); + return true; +} + +static const char *tevFogFuncsTable[] = +{ + "", //No Fog + "", //? + "", //Linear + "", //? + " fog = 1.0f - pow(2.0f, -8.0f * fog);\n", //exp + " fog = 1.0f - pow(2.0f, -8.0f * fog * fog);\n", //exp2 + " fog = pow(2.0f, -8.0f * (1.0f - fog));\n", //backward exp + " fog = 1.0f - fog;\n fog = pow(2.0f, -8.0f * fog * fog);\n" //backward exp2 +}; + +static void WriteFog(char *&p) +{ + if(bpmem.fog.c_proj_fsel.fsel == 0)return;//no Fog + + if (bpmem.fog.c_proj_fsel.proj == 0) + { + // perspective + // ze = A/(B - (Zs >> B_SHF) + WRITE (p, " float ze = "I_FOG"[1].x / ("I_FOG"[1].y - (zCoord / "I_FOG"[1].w));\n"); + } + else + { + // orthographic + // ze = a*Zs (here, no B_SHF) + WRITE (p, " float ze = "I_FOG"[1].x * zCoord;\n"); + } + + // x_adjust = sqrt((x-center)^2 + k^2)/k + // ze *= x_adjust + //this is complitly teorical as the real hard seems to use a table intead of calculate the values. + if(bpmem.fogRange.Base.Enabled) + { + WRITE (p, " float x_adjust = (2.0f * (clipPos.x / "I_FOG"[2].y)) - 1.0f - "I_FOG"[2].x;\n"); + WRITE (p, " x_adjust = sqrt(x_adjust * x_adjust + "I_FOG"[2].z * "I_FOG"[2].z) / "I_FOG"[2].z;\n"); + WRITE (p, " ze *= x_adjust;\n"); + } + + WRITE (p, " float fog = saturate(ze - "I_FOG"[1].z);\n"); + + if(bpmem.fog.c_proj_fsel.fsel > 3) + { + WRITE(p, "%s", tevFogFuncsTable[bpmem.fog.c_proj_fsel.fsel]); + } + else + { + if(bpmem.fog.c_proj_fsel.fsel != 2) + WARN_LOG(VIDEO, "Unknown Fog Type! %08x", bpmem.fog.c_proj_fsel.fsel); + } + + WRITE(p, " prev.rgb = lerp(prev.rgb,"I_FOG"[0].rgb,fog);\n"); + + } \ No newline at end of file diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h index b495703a13..0ebdd0e42f 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.h +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h @@ -44,7 +44,7 @@ #define C_PLIGHTS (C_FOG + 3) #define C_PMATERIALS (C_PLIGHTS + 40) #define C_PENVCONST_END (C_PMATERIALS + 4) -#define PIXELSHADERUID_MAX_VALUES (5 + 32 + 6 + 11 + 2) +#define PIXELSHADERUID_MAX_VALUES 67 // DO NOT make anything in this class virtual. class PIXELSHADERUID @@ -71,7 +71,7 @@ public: int GetNumValues() const { - return tevstages + indstages + 4; + return tevstages; } bool operator <(const PIXELSHADERUID& _Right) const From 4137f287fd4d8778967bb8a82eafe5450687e2b7 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Wed, 31 Aug 2011 19:45:28 +0200 Subject: [PATCH 006/381] Fix a critical bug which caused shaders to be redundantly recompiled when disabling per-pixel depth. As a nice side effect, the number of redundant shader compilations is now next to zero ;) --- Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 6d0cc64964..ff82438305 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -124,6 +124,7 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode) { // Courtesy of PreAlphaTest, we're done already ;) // TODO: There's a comment including bpmem.genmode.numindstages.. shouldnt really bother about that though. + uid->tevstages = 1; return; } From bcb8d11c1b9f0493a29b4bc4ecf40ee75594e9df Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Wed, 31 Aug 2011 20:46:03 +0200 Subject: [PATCH 007/381] Reduced the number of redundant vertex shader compilations (possibly to zero). That one was almost too easy ;P --- Source/Core/VideoCommon/Src/VertexShaderGen.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp index 747b95c0da..7a1d5eb555 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp @@ -37,7 +37,7 @@ void GetVertexShaderId(VERTEXSHADERUID *uid, u32 components) (xfregs.numChan.numColorChans << 27) | (xfregs.dualTexTrans.enabled << 29); - for (int i = 0; i < 2; ++i) { + for (int i = 0; i < xfregs.numChan.numColorChans; ++i) { uid->values[1+i] = xfregs.color[i].enablelighting ? (u32)xfregs.color[i].hex : (u32)xfregs.color[i].matsource; From 931a31decae90efdd18b763030c9e07630339a47 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 31 Aug 2011 20:46:04 -0500 Subject: [PATCH 008/381] Untested attempt to fix real gcpad sticks not being detected by the input configuration dialogs. --- .../Src/ControllerInterface/ControllerInterface.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp index a995ae415a..e6f2f508d2 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp @@ -18,7 +18,10 @@ #include "Thread.h" -#define INPUT_DETECT_THRESHOLD 0.85f +namespace +{ +const float INPUT_DETECT_THRESHOLD = 0.65f; +} ControllerInterface g_controller_interface; From 95517a9741175f15124dc11e132620a23bec7a19 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Mon, 5 Sep 2011 09:43:23 -0700 Subject: [PATCH 009/381] vs2010: Disable LTCG for realz --- Externals/Bochs_disasm/Bochs_disasm.vcxproj | 2 -- Externals/CLRun/clrun/CLRun.vcxproj | 2 -- Externals/LZO/LZO.vcxproj | 2 -- Externals/SFML/build/vc2010/SFML_Network.vcxproj | 3 +-- Externals/SOIL/SOIL.vcxproj | 3 +-- Externals/wxWidgets/build/msw/wx_adv.vcxproj | 9 ++++----- Externals/wxWidgets/build/msw/wx_aui.vcxproj | 9 ++++----- Externals/wxWidgets/build/msw/wx_base.vcxproj | 3 +-- Externals/wxWidgets/build/msw/wx_core.vcxproj | 3 +-- Externals/zlib/zlib.vcxproj | 3 +-- Source/Core/AudioCommon/AudioCommon.vcxproj | 2 -- Source/Core/Common/Common.vcxproj | 2 -- Source/Core/Core/Core.vcxproj | 2 -- Source/Core/DiscIO/DiscIO.vcxproj | 2 -- Source/Core/DolphinWX/Dolphin.vcxproj | 3 +-- Source/Core/InputCommon/InputCommon.vcxproj | 2 -- Source/Core/VideoCommon/VideoCommon.vcxproj | 3 +-- Source/DSPTool/DSPTool.vcxproj | 2 -- Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj | 3 +-- Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj | 3 +-- Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj | 3 +-- .../Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj | 3 +-- Source/VSProps/CodeGen_Release.props | 2 -- 23 files changed, 19 insertions(+), 52 deletions(-) diff --git a/Externals/Bochs_disasm/Bochs_disasm.vcxproj b/Externals/Bochs_disasm/Bochs_disasm.vcxproj index 7103569843..f7110f2e9a 100644 --- a/Externals/Bochs_disasm/Bochs_disasm.vcxproj +++ b/Externals/Bochs_disasm/Bochs_disasm.vcxproj @@ -45,13 +45,11 @@ false StaticLibrary Unicode - true false StaticLibrary Unicode - true StaticLibrary diff --git a/Externals/CLRun/clrun/CLRun.vcxproj b/Externals/CLRun/clrun/CLRun.vcxproj index 7412e679c8..0b168991d0 100644 --- a/Externals/CLRun/clrun/CLRun.vcxproj +++ b/Externals/CLRun/clrun/CLRun.vcxproj @@ -45,13 +45,11 @@ false StaticLibrary Unicode - true false StaticLibrary Unicode - true StaticLibrary diff --git a/Externals/LZO/LZO.vcxproj b/Externals/LZO/LZO.vcxproj index a79c1cf5be..b29b9b2c84 100644 --- a/Externals/LZO/LZO.vcxproj +++ b/Externals/LZO/LZO.vcxproj @@ -45,13 +45,11 @@ StaticLibrary false Unicode - true StaticLibrary false Unicode - true StaticLibrary diff --git a/Externals/SFML/build/vc2010/SFML_Network.vcxproj b/Externals/SFML/build/vc2010/SFML_Network.vcxproj index a53a30feaf..aeb2df601f 100644 --- a/Externals/SFML/build/vc2010/SFML_Network.vcxproj +++ b/Externals/SFML/build/vc2010/SFML_Network.vcxproj @@ -45,7 +45,7 @@ StaticLibrary false Unicode - true + false StaticLibrary @@ -56,7 +56,6 @@ StaticLibrary false Unicode - true StaticLibrary diff --git a/Externals/SOIL/SOIL.vcxproj b/Externals/SOIL/SOIL.vcxproj index 3b2ed98370..eba92bad49 100644 --- a/Externals/SOIL/SOIL.vcxproj +++ b/Externals/SOIL/SOIL.vcxproj @@ -45,13 +45,12 @@ StaticLibrary false Unicode - true + false StaticLibrary false Unicode - true StaticLibrary diff --git a/Externals/wxWidgets/build/msw/wx_adv.vcxproj b/Externals/wxWidgets/build/msw/wx_adv.vcxproj index 0fc31d2893..81d688800e 100644 --- a/Externals/wxWidgets/build/msw/wx_adv.vcxproj +++ b/Externals/wxWidgets/build/msw/wx_adv.vcxproj @@ -17,7 +17,7 @@ Release x64 - + DebugFast Win32 @@ -35,7 +35,7 @@ StaticLibrary Unicode - true + false StaticLibrary @@ -44,7 +44,6 @@ StaticLibrary Unicode - true StaticLibrary @@ -180,7 +179,7 @@ Create Create - Create + Create Create Create Create @@ -214,7 +213,7 @@ true true - true + true true true true diff --git a/Externals/wxWidgets/build/msw/wx_aui.vcxproj b/Externals/wxWidgets/build/msw/wx_aui.vcxproj index 2cb385977c..d0e87bc93b 100644 --- a/Externals/wxWidgets/build/msw/wx_aui.vcxproj +++ b/Externals/wxWidgets/build/msw/wx_aui.vcxproj @@ -17,7 +17,7 @@ Release x64 - + DebugFast Win32 @@ -35,7 +35,7 @@ StaticLibrary Unicode - true + false StaticLibrary @@ -44,7 +44,6 @@ StaticLibrary Unicode - true StaticLibrary @@ -178,7 +177,7 @@ Create Create - Create + Create Create Create Create @@ -194,7 +193,7 @@ true true - true + true true true true diff --git a/Externals/wxWidgets/build/msw/wx_base.vcxproj b/Externals/wxWidgets/build/msw/wx_base.vcxproj index 5dad2793a6..03319b8737 100644 --- a/Externals/wxWidgets/build/msw/wx_base.vcxproj +++ b/Externals/wxWidgets/build/msw/wx_base.vcxproj @@ -39,7 +39,7 @@ StaticLibrary Unicode - true + false StaticLibrary @@ -48,7 +48,6 @@ StaticLibrary Unicode - true StaticLibrary diff --git a/Externals/wxWidgets/build/msw/wx_core.vcxproj b/Externals/wxWidgets/build/msw/wx_core.vcxproj index 5947f2d832..23b76adc6a 100644 --- a/Externals/wxWidgets/build/msw/wx_core.vcxproj +++ b/Externals/wxWidgets/build/msw/wx_core.vcxproj @@ -35,7 +35,7 @@ StaticLibrary Unicode - true + false StaticLibrary @@ -44,7 +44,6 @@ StaticLibrary Unicode - true StaticLibrary diff --git a/Externals/zlib/zlib.vcxproj b/Externals/zlib/zlib.vcxproj index b964068e1a..9fdde8c277 100644 --- a/Externals/zlib/zlib.vcxproj +++ b/Externals/zlib/zlib.vcxproj @@ -45,13 +45,12 @@ StaticLibrary false Unicode - true + false StaticLibrary false Unicode - true StaticLibrary diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj b/Source/Core/AudioCommon/AudioCommon.vcxproj index b37cbf4ce7..a82ab9aecc 100644 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj +++ b/Source/Core/AudioCommon/AudioCommon.vcxproj @@ -45,7 +45,6 @@ false StaticLibrary Unicode - true StaticLibrary @@ -56,7 +55,6 @@ false StaticLibrary Unicode - true StaticLibrary diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj index d29043eb7d..732fc7258c 100644 --- a/Source/Core/Common/Common.vcxproj +++ b/Source/Core/Common/Common.vcxproj @@ -45,7 +45,6 @@ false StaticLibrary MultiByte - true StaticLibrary @@ -56,7 +55,6 @@ false StaticLibrary MultiByte - true StaticLibrary diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index a9b0176a33..cc6d673f29 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -45,7 +45,6 @@ false StaticLibrary MultiByte - true StaticLibrary @@ -56,7 +55,6 @@ false StaticLibrary MultiByte - true StaticLibrary diff --git a/Source/Core/DiscIO/DiscIO.vcxproj b/Source/Core/DiscIO/DiscIO.vcxproj index 8c1f684213..d94ac13212 100644 --- a/Source/Core/DiscIO/DiscIO.vcxproj +++ b/Source/Core/DiscIO/DiscIO.vcxproj @@ -45,7 +45,6 @@ false StaticLibrary MultiByte - true StaticLibrary @@ -56,7 +55,6 @@ false StaticLibrary MultiByte - true StaticLibrary diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj b/Source/Core/DolphinWX/Dolphin.vcxproj index 534f61b70e..fc232ea77f 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj +++ b/Source/Core/DolphinWX/Dolphin.vcxproj @@ -45,7 +45,7 @@ Application false Unicode - true + false Application @@ -56,7 +56,6 @@ Application false Unicode - true Application diff --git a/Source/Core/InputCommon/InputCommon.vcxproj b/Source/Core/InputCommon/InputCommon.vcxproj index 80aaeaa140..8eed835b2d 100644 --- a/Source/Core/InputCommon/InputCommon.vcxproj +++ b/Source/Core/InputCommon/InputCommon.vcxproj @@ -45,7 +45,6 @@ StaticLibrary false Unicode - true StaticLibrary @@ -56,7 +55,6 @@ StaticLibrary false Unicode - true StaticLibrary diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj index cf6d8c28a6..dd29d29ccb 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj @@ -45,7 +45,7 @@ StaticLibrary false Unicode - true + false StaticLibrary @@ -56,7 +56,6 @@ StaticLibrary false Unicode - true StaticLibrary diff --git a/Source/DSPTool/DSPTool.vcxproj b/Source/DSPTool/DSPTool.vcxproj index 9173c3e166..af68266d2f 100644 --- a/Source/DSPTool/DSPTool.vcxproj +++ b/Source/DSPTool/DSPTool.vcxproj @@ -40,7 +40,6 @@ Application Unicode - true Application @@ -55,7 +54,6 @@ Application Unicode - true Application diff --git a/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj b/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj index f1f4d40457..2903bd0550 100644 --- a/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj +++ b/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj @@ -46,7 +46,7 @@ StaticLibrary false Unicode - true + false StaticLibrary @@ -57,7 +57,6 @@ StaticLibrary false Unicode - true StaticLibrary diff --git a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj index 838004a605..604fea8a2b 100644 --- a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj +++ b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj @@ -46,7 +46,7 @@ StaticLibrary false Unicode - true + false StaticLibrary @@ -57,7 +57,6 @@ StaticLibrary false Unicode - true StaticLibrary diff --git a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj index d12f779d53..f782fd2c93 100644 --- a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj +++ b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj @@ -46,7 +46,7 @@ StaticLibrary false Unicode - true + false StaticLibrary @@ -57,7 +57,6 @@ StaticLibrary false Unicode - true StaticLibrary diff --git a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj index 26ccad4175..db6f072f20 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj +++ b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj @@ -46,13 +46,12 @@ StaticLibrary false Unicode - true + false StaticLibrary false Unicode - true StaticLibrary diff --git a/Source/VSProps/CodeGen_Release.props b/Source/VSProps/CodeGen_Release.props index 45b6b64621..74770b6910 100644 --- a/Source/VSProps/CodeGen_Release.props +++ b/Source/VSProps/CodeGen_Release.props @@ -12,7 +12,6 @@ Speed true true - true true false MultiThreaded @@ -25,7 +24,6 @@ true true - Default From 6845a1596c04ec37ffb734b4e14b908deb4b3088 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 3 Sep 2011 23:37:05 +0200 Subject: [PATCH 010/381] Fix various cases in scissor rect emulation. Patch by delroth. --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 40 ++++--------------- 1 file changed, 8 insertions(+), 32 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 0c9d904cad..a54e1dd3f5 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -652,39 +652,15 @@ bool Renderer::SetScissorRect() if (rc.right > EFB_WIDTH) rc.right = EFB_WIDTH; if (rc.bottom > EFB_HEIGHT) rc.bottom = EFB_HEIGHT; - if (rc.left > rc.right) - { - int temp = rc.right; - rc.right = rc.left; - rc.left = temp; - } - if (rc.top > rc.bottom) - { - int temp = rc.bottom; - rc.bottom = rc.top; - rc.top = temp; - } + if (rc.left > rc.right) rc.right = rc.left; + if (rc.top > rc.bottom) rc.bottom = rc.top; - // Check that the coordinates are good - if (rc.right != rc.left && rc.bottom != rc.top) - { - glScissor( - EFBToScaledX(rc.left), // x = 0 for example - EFBToScaledY(EFB_HEIGHT - rc.bottom), // y = 0 for example - EFBToScaledX(rc.right - rc.left), // width = 640 for example - EFBToScaledY(rc.bottom - rc.top)); // height = 480 for example - return true; - } - else - { - glScissor( - 0, - 0, - Renderer::GetTargetWidth(), - Renderer::GetTargetHeight() - ); - } - return false; + glScissor( + EFBToScaledX(rc.left), // x = 0 for example + EFBToScaledY(EFB_HEIGHT - rc.bottom), // y = 0 for example + EFBToScaledX(rc.right - rc.left), // width = 640 for example + EFBToScaledY(rc.bottom - rc.top)); // height = 480 for example + return true; } void Renderer::SetColorMask() From b867c21fea6401c0f9886129621bb0dbae962a4a Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Mon, 5 Sep 2011 12:19:11 -0700 Subject: [PATCH 011/381] apply to dx9 and dx11 backends as well --- Source/Core/VideoCommon/Src/RenderBase.h | 2 +- .../Plugins/Plugin_VideoDX11/Src/Render.cpp | 42 +++-------------- Source/Plugins/Plugin_VideoDX11/Src/Render.h | 2 +- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 46 +++---------------- Source/Plugins/Plugin_VideoDX9/Src/Render.h | 2 +- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 12 ++--- Source/Plugins/Plugin_VideoOGL/Src/Render.h | 2 +- 7 files changed, 20 insertions(+), 88 deletions(-) diff --git a/Source/Core/VideoCommon/Src/RenderBase.h b/Source/Core/VideoCommon/Src/RenderBase.h index 17132ebb8c..7e5c0dc8fe 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.h +++ b/Source/Core/VideoCommon/Src/RenderBase.h @@ -54,7 +54,7 @@ public: virtual void SetColorMask() = 0; virtual void SetBlendMode(bool forceUpdate) = 0; - virtual bool SetScissorRect() = 0; + virtual void SetScissorRect() = 0; virtual void SetGenerationMode() = 0; virtual void SetDepthMode() = 0; virtual void SetLogicOpMode() = 0; diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index d0756bfa98..2c2f3037f6 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -444,51 +444,21 @@ bool Renderer::CheckForResize() return false; } -bool Renderer::SetScissorRect() +void Renderer::SetScissorRect() { - TargetRectangle rc; + EFBRectangle rc; GetScissorRect(rc); if (rc.left < 0) rc.left = 0; - if (rc.right < 0) rc.right = 0; if (rc.top < 0) rc.top = 0; - if (rc.bottom < 0) rc.bottom = 0; - - if (rc.left > EFB_WIDTH) rc.left = EFB_WIDTH; if (rc.right > EFB_WIDTH) rc.right = EFB_WIDTH; - if (rc.top > EFB_HEIGHT) rc.top = EFB_HEIGHT; if (rc.bottom > EFB_HEIGHT) rc.bottom = EFB_HEIGHT; - rc.left = EFBToScaledX(rc.left); - rc.right = EFBToScaledX(rc.right); - rc.top = EFBToScaledY(rc.top); - rc.bottom = EFBToScaledY(rc.bottom); + if (rc.left > rc.right) rc.right = rc.left; + if (rc.top > rc.bottom) rc.bottom = rc.top; - if (rc.left > rc.right) - { - int temp = rc.right; - rc.right = rc.left; - rc.left = temp; - } - if (rc.top > rc.bottom) - { - int temp = rc.bottom; - rc.bottom = rc.top; - rc.top = temp; - } - - if (rc.right >= rc.left && rc.bottom >= rc.top) - { - D3D::context->RSSetScissorRects(1, rc.AsRECT()); - return true; - } - else - { - //WARN_LOG(VIDEO, "Bad scissor rectangle: %i %i %i %i", rc.left, rc.top, rc.right, rc.bottom); - *rc.AsRECT() = CD3D11_RECT(0.f, 0.f, s_target_width, s_target_height); - D3D::context->RSSetScissorRects(1, rc.AsRECT()); - return false; - } + TargetRectangle trc = ConvertEFBRectangle(rc); + D3D::context->RSSetScissorRects(1, trc.AsRECT()); } void Renderer::SetColorMask() diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.h b/Source/Plugins/Plugin_VideoDX11/Src/Render.h index 5d1c24bc23..bc6dcba2bd 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.h +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.h @@ -15,7 +15,7 @@ public: void SetColorMask(); void SetBlendMode(bool forceUpdate); - bool SetScissorRect(); + void SetScissorRect(); void SetGenerationMode(); void SetDepthMode(); void SetLogicOpMode(); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index e333cbc168..59af978107 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -426,55 +426,21 @@ bool Renderer::CheckForResize() return false; } -bool Renderer::SetScissorRect() +void Renderer::SetScissorRect() { - TargetRectangle rc; + EFBRectangle rc; GetScissorRect(rc); if (rc.left < 0) rc.left = 0; - if (rc.right < 0) rc.right = 0; if (rc.top < 0) rc.top = 0; - if (rc.bottom < 0) rc.bottom = 0; - - if (rc.left > EFB_WIDTH) rc.left = EFB_WIDTH; if (rc.right > EFB_WIDTH) rc.right = EFB_WIDTH; - if (rc.top > EFB_HEIGHT) rc.top = EFB_HEIGHT; if (rc.bottom > EFB_HEIGHT) rc.bottom = EFB_HEIGHT; - if (rc.left > rc.right) - { - int temp = rc.right; - rc.right = rc.left; - rc.left = temp; - } - if (rc.top > rc.bottom) - { - int temp = rc.bottom; - rc.bottom = rc.top; - rc.top = temp; - } + if (rc.left > rc.right) rc.right = rc.left; + if (rc.top > rc.bottom) rc.bottom = rc.top; - rc.left = EFBToScaledX(rc.left); - rc.top = EFBToScaledY(rc.top); - rc.right = EFBToScaledX(rc.right); - rc.bottom = EFBToScaledY(rc.bottom); - - // Check that the coordinates are good - if (rc.right != rc.left && rc.bottom != rc.top) - { - D3D::dev->SetScissorRect(rc.AsRECT()); - return true; - } - else - { - //WARN_LOG(VIDEO, "Bad scissor rectangle: %i %i %i %i", rc.left, rc.top, rc.right, rc.bottom); - rc.left = 0; - rc.top = 0; - rc.right = s_target_width; - rc.bottom = s_target_height; - D3D::dev->SetScissorRect(rc.AsRECT()); - } - return false; + TargetRectangle trc = ConvertEFBRectangle(rc); + D3D::dev->SetScissorRect(trc.AsRECT()); } void Renderer::SetColorMask() diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.h b/Source/Plugins/Plugin_VideoDX9/Src/Render.h index b3c89f82f9..6ba40de063 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.h +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.h @@ -15,7 +15,7 @@ public: void SetColorMask(); void SetBlendMode(bool forceUpdate); - bool SetScissorRect(); + void SetScissorRect(); void SetGenerationMode(); void SetDepthMode(); void SetLogicOpMode(); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index a54e1dd3f5..1567c9825b 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -642,9 +642,9 @@ TargetRectangle Renderer::ConvertEFBRectangle(const EFBRectangle& rc) // Renderer::GetTargetHeight() = the fixed ini file setting // donkopunchstania - it appears scissorBR is the bottom right pixel inside the scissor box // therefore the width and height are (scissorBR + 1) - scissorTL -bool Renderer::SetScissorRect() +void Renderer::SetScissorRect() { - MathUtil::Rectangle rc; + EFBRectangle rc; GetScissorRect(rc); if (rc.left < 0) rc.left = 0; @@ -655,12 +655,8 @@ bool Renderer::SetScissorRect() if (rc.left > rc.right) rc.right = rc.left; if (rc.top > rc.bottom) rc.bottom = rc.top; - glScissor( - EFBToScaledX(rc.left), // x = 0 for example - EFBToScaledY(EFB_HEIGHT - rc.bottom), // y = 0 for example - EFBToScaledX(rc.right - rc.left), // width = 640 for example - EFBToScaledY(rc.bottom - rc.top)); // height = 480 for example - return true; + TargetRectangle trc = ConvertEFBRectangle(rc); + glScissor(trc.left, trc.bottom, trc.GetWidth(), trc.GetHeight()); } void Renderer::SetColorMask() diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.h b/Source/Plugins/Plugin_VideoOGL/Src/Render.h index 5805c524ae..b14617bed6 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.h @@ -15,7 +15,7 @@ public: void SetColorMask(); void SetBlendMode(bool forceUpdate); - bool SetScissorRect(); + void SetScissorRect(); void SetGenerationMode(); void SetDepthMode(); void SetLogicOpMode(); From 17fcd406fcf68059ee5c0e940d42e9bcdcd32842 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 5 Sep 2011 22:04:28 +0200 Subject: [PATCH 012/381] Merge some scissor rect related code to VideoCommon. --- Source/Core/VideoCommon/Src/BPFunctions.cpp | 19 +++++++++++++++++-- Source/Core/VideoCommon/Src/BPFunctions.h | 2 +- Source/Core/VideoCommon/Src/BPStructs.cpp | 2 +- Source/Core/VideoCommon/Src/RenderBase.h | 14 +------------- Source/Core/VideoCommon/Src/VideoCommon.h | 3 +-- .../Plugins/Plugin_VideoDX11/Src/Render.cpp | 19 ++++--------------- Source/Plugins/Plugin_VideoDX11/Src/Render.h | 2 +- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 19 ++++--------------- Source/Plugins/Plugin_VideoDX9/Src/Render.h | 2 +- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 19 ++++--------------- Source/Plugins/Plugin_VideoOGL/Src/Render.h | 2 +- 11 files changed, 36 insertions(+), 67 deletions(-) diff --git a/Source/Core/VideoCommon/Src/BPFunctions.cpp b/Source/Core/VideoCommon/Src/BPFunctions.cpp index f323f03142..4f7315e832 100644 --- a/Source/Core/VideoCommon/Src/BPFunctions.cpp +++ b/Source/Core/VideoCommon/Src/BPFunctions.cpp @@ -44,9 +44,24 @@ void SetGenerationMode(const BPCmd &bp) g_renderer->SetGenerationMode(); } -void SetScissor(const BPCmd &bp) +void SetScissor() { - g_renderer->SetScissorRect(); + const int xoff = bpmem.scissorOffset.x * 2 - 342; + const int yoff = bpmem.scissorOffset.y * 2 - 342; + + EFBRectangle rc (bpmem.scissorTL.x - xoff - 342, bpmem.scissorTL.y - yoff - 342, + bpmem.scissorBR.x - xoff - 341, bpmem.scissorBR.y - yoff - 341); + + if (rc.left < 0) rc.left = 0; + if (rc.top < 0) rc.top = 0; + if (rc.right > EFB_WIDTH) rc.right = EFB_WIDTH; + if (rc.bottom > EFB_HEIGHT) rc.bottom = EFB_HEIGHT; + + if (rc.left > rc.right) rc.right = rc.left; + if (rc.top > rc.bottom) rc.bottom = rc.top; + + TargetRectangle trc = g_renderer->ConvertEFBRectangle(rc); + g_renderer->SetScissorRect(trc); } void SetLineWidth(const BPCmd &bp) diff --git a/Source/Core/VideoCommon/Src/BPFunctions.h b/Source/Core/VideoCommon/Src/BPFunctions.h index d104b12751..2b86523687 100644 --- a/Source/Core/VideoCommon/Src/BPFunctions.h +++ b/Source/Core/VideoCommon/Src/BPFunctions.h @@ -38,7 +38,7 @@ enum void FlushPipeline(); void SetGenerationMode(const BPCmd &bp); -void SetScissor(const BPCmd &bp); +void SetScissor(); void SetLineWidth(const BPCmd &bp); void SetDepthMode(const BPCmd &bp); void SetBlendMode(const BPCmd &bp); diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp index 42b5b2212a..cee68327f5 100644 --- a/Source/Core/VideoCommon/Src/BPStructs.cpp +++ b/Source/Core/VideoCommon/Src/BPStructs.cpp @@ -162,7 +162,7 @@ void BPWritten(const BPCmd& bp) case BPMEM_SCISSORTL: // Scissor Rectable Top, Left case BPMEM_SCISSORBR: // Scissor Rectable Bottom, Right case BPMEM_SCISSOROFFSET: // Scissor Offset - SetScissor(bp); + SetScissor(); break; case BPMEM_LINEPTWIDTH: // Line Width SetLineWidth(bp); diff --git a/Source/Core/VideoCommon/Src/RenderBase.h b/Source/Core/VideoCommon/Src/RenderBase.h index 7e5c0dc8fe..b2c2c7ecfb 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.h +++ b/Source/Core/VideoCommon/Src/RenderBase.h @@ -54,7 +54,7 @@ public: virtual void SetColorMask() = 0; virtual void SetBlendMode(bool forceUpdate) = 0; - virtual void SetScissorRect() = 0; + virtual void SetScissorRect(const TargetRectangle& rc) = 0; virtual void SetGenerationMode() = 0; virtual void SetDepthMode() = 0; virtual void SetLogicOpMode() = 0; @@ -175,16 +175,4 @@ extern Renderer *g_renderer; void UpdateViewport(Matrix44& vpCorrection); -template -void GetScissorRect(MathUtil::Rectangle &rect) -{ - const int xoff = bpmem.scissorOffset.x * 2 - 342; - const int yoff = bpmem.scissorOffset.y * 2 - 342; - - rect.left = (R)(bpmem.scissorTL.x - xoff - 342); - rect.top = (R)(bpmem.scissorTL.y - yoff - 342); - rect.right = (R)(bpmem.scissorBR.x - xoff - 341); - rect.bottom = (R)(bpmem.scissorBR.y - yoff - 341); -} - #endif // _COMMON_RENDERBASE_H_ diff --git a/Source/Core/VideoCommon/Src/VideoCommon.h b/Source/Core/VideoCommon/Src/VideoCommon.h index 030c1f0b32..80c0937884 100644 --- a/Source/Core/VideoCommon/Src/VideoCommon.h +++ b/Source/Core/VideoCommon/Src/VideoCommon.h @@ -70,8 +70,7 @@ void HandleGLError(); // This structure should only be used to represent a rectangle in EFB // coordinates, where the origin is at the upper left and the frame dimensions // are 640 x 528. -struct EFBRectangle : public MathUtil::Rectangle -{}; +typedef MathUtil::Rectangle EFBRectangle; // This structure should only be used to represent a rectangle in standard target // coordinates, where the origin is at the lower left and the frame dimensions diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index 2c2f3037f6..bbf2a966dd 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -42,6 +42,7 @@ #include "Movie.h" #include "Television.h" #include "Host.h" +#include "BPFunctions.h" namespace DX11 { @@ -444,21 +445,9 @@ bool Renderer::CheckForResize() return false; } -void Renderer::SetScissorRect() +void Renderer::SetScissorRect(const TargetRectangle& rc) { - EFBRectangle rc; - GetScissorRect(rc); - - if (rc.left < 0) rc.left = 0; - if (rc.top < 0) rc.top = 0; - if (rc.right > EFB_WIDTH) rc.right = EFB_WIDTH; - if (rc.bottom > EFB_HEIGHT) rc.bottom = EFB_HEIGHT; - - if (rc.left > rc.right) rc.right = rc.left; - if (rc.top > rc.bottom) rc.bottom = rc.top; - - TargetRectangle trc = ConvertEFBRectangle(rc); - D3D::context->RSSetScissorRects(1, trc.AsRECT()); + D3D::context->RSSetScissorRects(1, rc.AsRECT()); } void Renderer::SetColorMask() @@ -1133,7 +1122,7 @@ void Renderer::RestoreAPIState() D3D::stateman->PopDepthState(); D3D::stateman->PopRasterizerState(); VertexShaderManager::SetViewportChanged(); - SetScissorRect(); + BPFunctions::SetScissor(); } void Renderer::ApplyState(bool bUseDstAlpha) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.h b/Source/Plugins/Plugin_VideoDX11/Src/Render.h index bc6dcba2bd..8f6c78fae1 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.h +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.h @@ -15,7 +15,7 @@ public: void SetColorMask(); void SetBlendMode(bool forceUpdate); - void SetScissorRect(); + void SetScissorRect(const TargetRectangle& rc); void SetGenerationMode(); void SetDepthMode(); void SetLogicOpMode(); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index 59af978107..15b592e800 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -53,6 +53,7 @@ #include "Debugger.h" #include "Core.h" #include "Movie.h" +#include "BPFunctions.h" namespace DX9 { @@ -426,21 +427,9 @@ bool Renderer::CheckForResize() return false; } -void Renderer::SetScissorRect() +void Renderer::SetScissorRect(const TargetRectangle& rc) { - EFBRectangle rc; - GetScissorRect(rc); - - if (rc.left < 0) rc.left = 0; - if (rc.top < 0) rc.top = 0; - if (rc.right > EFB_WIDTH) rc.right = EFB_WIDTH; - if (rc.bottom > EFB_HEIGHT) rc.bottom = EFB_HEIGHT; - - if (rc.left > rc.right) rc.right = rc.left; - if (rc.top > rc.bottom) rc.bottom = rc.top; - - TargetRectangle trc = ConvertEFBRectangle(rc); - D3D::dev->SetScissorRect(trc.AsRECT()); + D3D::dev->SetScissorRect(rc.AsRECT()); } void Renderer::SetColorMask() @@ -1259,7 +1248,7 @@ void Renderer::RestoreAPIState() D3D::SetRenderState(D3DRS_FILLMODE, g_ActiveConfig.bWireFrame ? D3DFILL_WIREFRAME : D3DFILL_SOLID); D3D::SetRenderState(D3DRS_SCISSORTESTENABLE, TRUE); VertexShaderManager::SetViewportChanged(); - SetScissorRect(); + BPFunctions::SetScissor(); if (bpmem.zmode.testenable) { D3D::SetRenderState(D3DRS_ZENABLE, TRUE); if (bpmem.zmode.updateenable) diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.h b/Source/Plugins/Plugin_VideoDX9/Src/Render.h index 6ba40de063..6e5198b3cd 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.h +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.h @@ -15,7 +15,7 @@ public: void SetColorMask(); void SetBlendMode(bool forceUpdate); - void SetScissorRect(); + void SetScissorRect(const TargetRectangle& rc); void SetGenerationMode(); void SetDepthMode(); void SetLogicOpMode(); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 1567c9825b..ca3280673e 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -60,6 +60,7 @@ #include "Core.h" #include "Movie.h" #include "Host.h" +#include "BPFunctions.h" #include "main.h" // Local #ifdef _WIN32 @@ -642,21 +643,9 @@ TargetRectangle Renderer::ConvertEFBRectangle(const EFBRectangle& rc) // Renderer::GetTargetHeight() = the fixed ini file setting // donkopunchstania - it appears scissorBR is the bottom right pixel inside the scissor box // therefore the width and height are (scissorBR + 1) - scissorTL -void Renderer::SetScissorRect() +void Renderer::SetScissorRect(const TargetRectangle& rc) { - EFBRectangle rc; - GetScissorRect(rc); - - if (rc.left < 0) rc.left = 0; - if (rc.top < 0) rc.top = 0; - if (rc.right > EFB_WIDTH) rc.right = EFB_WIDTH; - if (rc.bottom > EFB_HEIGHT) rc.bottom = EFB_HEIGHT; - - if (rc.left > rc.right) rc.right = rc.left; - if (rc.top > rc.bottom) rc.bottom = rc.top; - - TargetRectangle trc = ConvertEFBRectangle(rc); - glScissor(trc.left, trc.bottom, trc.GetWidth(), trc.GetHeight()); + glScissor(rc.left, rc.bottom, rc.GetWidth(), rc.GetHeight()); } void Renderer::SetColorMask() @@ -1404,7 +1393,7 @@ void Renderer::RestoreAPIState() // Gets us back into a more game-like state. glEnable(GL_SCISSOR_TEST); SetGenerationMode(); - SetScissorRect(); + BPFunctions::SetScissor(); SetColorMask(); SetDepthMode(); SetBlendMode(true); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.h b/Source/Plugins/Plugin_VideoOGL/Src/Render.h index b14617bed6..032a9a222c 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.h @@ -15,7 +15,7 @@ public: void SetColorMask(); void SetBlendMode(bool forceUpdate); - void SetScissorRect(); + void SetScissorRect(const TargetRectangle& rc); void SetGenerationMode(); void SetDepthMode(); void SetLogicOpMode(); From ee1dc962bfd01a6ce7908496897cf46073155412 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 6 Sep 2011 14:45:05 +0200 Subject: [PATCH 013/381] Fix Windows build. --- Source/Core/Common/Src/MemoryUtil.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Source/Core/Common/Src/MemoryUtil.cpp b/Source/Core/Common/Src/MemoryUtil.cpp index 65c70e0c5e..2d64a434f1 100644 --- a/Source/Core/Common/Src/MemoryUtil.cpp +++ b/Source/Core/Common/Src/MemoryUtil.cpp @@ -27,7 +27,7 @@ #include #endif -#if !defined(MAP_32BIT) +#if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT) #include #define PAGE_MASK (getpagesize() - 1) #define round_page(x) ((((unsigned long)(x)) + PAGE_MASK) & ~(PAGE_MASK)) @@ -38,15 +38,14 @@ void* AllocateExecutableMemory(size_t size, bool low) { +#if defined(_WIN32) + void* ptr = VirtualAlloc(0, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE); +#else static char *map_hint = 0; #if defined(__x86_64__) && !defined(MAP_32BIT) if (low && (!map_hint)) map_hint = (char*)round_page(512*1024*1024); /* 0.5 GB rounded up to the next page */ #endif - -#if defined(_WIN32) - void* ptr = VirtualAlloc(0, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE); -#else void* ptr = mmap(map_hint, size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_PRIVATE #if defined(__x86_64__) @@ -72,7 +71,7 @@ void* AllocateExecutableMemory(size_t size, bool low) #endif PanicAlert("Failed to allocate executable memory"); } -#if defined(__x86_64__) && !defined(MAP_32BIT) +#if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT) else { if (low) From df4e337ac99b9fdb72bbc244bd437032c6109a3b Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 6 Aug 2011 21:35:16 +0000 Subject: [PATCH 014/381] Fix various pixel shader compilation errors caused by the Direct3D shader compiler going nuts due to uninitialized (and unused) shader variables. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7693 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 530ecd54bb..6c709084e4 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -523,10 +523,12 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType 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=0;\n" - " float3 tevcoord;\n" - " float2 wrappedcoord, tempcoord;\n" - " float4 cc0, cc1, cc2, cprev,crastemp,ckonsttemp;\n\n"); + " float4 alphabump=float4(0.0f,0.0f,0.0f,0.0f);\n" + " float3 tevcoord=float3(0.0f, 0.0f, 0.0f);\n" + " float2 wrappedcoord=float2(0.0f,0.0f), tempcoord=float2(0.0f,0.0f);\n" + " float4 cc0=float4(0.0f,0.0f,0.0f,0.0f), cc1=float4(0.0f,0.0f,0.0f,0.0f);\n" + " float4 cc2=float4(0.0f,0.0f,0.0f,0.0f), cprev=float4(0.0f,0.0f,0.0f,0.0f);\n" + " float4 crastemp=float4(0.0f,0.0f,0.0f,0.0f),ckonsttemp=float4(0.0f,0.0f,0.0f,0.0f);\n\n"); if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) { From 8b8e60c2767d2d21b3aeea7e938bdd64e3a2a61b Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Wed, 7 Sep 2011 01:22:24 +0300 Subject: [PATCH 015/381] Gameini database update. Addition of cheats for a couple of games, compatibility fixes/updates for F-zero GX, WAVE RACE / BLUE STORM, 1080: Avalanche, Dragon Ball: RKP, Fire Emblem: Radiant Dawn, NO MORE HEROES 1&2, Another Code R, Xenoblade Chronicles (fixes some random crashes/glitches), Mystery Case Files: The Malgrave Incident (fixes Issue 4723). Also update for Greek language. --- Data/User/GameConfig/GBZP08.ini | 62 +- Data/User/GameConfig/GFZE01.ini | 3 +- Data/User/GameConfig/GFZP01.ini | 3 +- Data/User/GameConfig/GGSPA4.ini | 109 ++- Data/User/GameConfig/GTEE01.ini | 10 +- Data/User/GameConfig/GTEP01.ini | 2 + Data/User/GameConfig/GWRE01.ini | 8 +- Data/User/GameConfig/GWRP01.ini | 2 +- Data/User/GameConfig/GWWP01.ini | 40 + Data/User/GameConfig/R7GEAF.ini | 5 +- Data/User/GameConfig/R7GJAF.ini | 9 +- Data/User/GameConfig/R7GPAF.ini | 9 +- Data/User/GameConfig/RFEE01.ini | 11 +- Data/User/GameConfig/RFEJ01.ini | 10 +- Data/User/GameConfig/RFEP01.ini | 10 +- Data/User/GameConfig/RNHE41.ini | 10 +- Data/User/GameConfig/RNOJ01.ini | 4 +- Data/User/GameConfig/RNOP01.ini | 5 +- Data/User/GameConfig/RUYE41.ini | 8 +- Data/User/GameConfig/SFIE01.ini | 22 + Data/User/GameConfig/SX4J01.ini | 11 +- Data/User/GameConfig/SX4P01.ini | 9 +- Languages/po/el.po | 1454 +++++-------------------------- 23 files changed, 537 insertions(+), 1279 deletions(-) create mode 100644 Data/User/GameConfig/SFIE01.ini diff --git a/Data/User/GameConfig/GBZP08.ini b/Data/User/GameConfig/GBZP08.ini index b974a476b0..d03534d7bf 100644 --- a/Data/User/GameConfig/GBZP08.ini +++ b/Data/User/GameConfig/GBZP08.ini @@ -5,6 +5,66 @@ EmulationStateId = 5 EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +$Can always save +04153E00 38000037 +04153A50 60000000 +$Zero saves +0233B832 00000000 +$Have all maps +022961C2 0000FFFF +$Have all files +022961C0 0000FFFB +022961C6 0000FFFF +$Timers don't decrease +043835C0 00015F91 +$Infinite Ammo (All slots) +04152D34 3BC00063 +04152D60 60000000 +$Infinite health (REBECCA) +0431CA4C 00000100 +$Infinite Ammo [All Slots] (R) +023272EA 00000063 +023272EE 00000063 +023272F2 00000063 +023272F6 00000063 +023272FA 00000063 +023272FE 00000063 +$Slot 1/2: Hunting gun (R) +023272E8 00000005 +$Slot 1/2: Shotgun (R) +023272E8 00000006 +$Slot 1/2: Grenade Launcher (R) +023272E8 00000007 +$Slot 1/2: Sub-machine gun (R) +023272E8 0000000B +$Slot 1/2: Rocket Launcher (R) +023272E8 00000017 +$Slot 3: Magnum Revolver (R) +023272F0 00000016 +$Slot 4: Moltov cocktails (R) +023272F4 0000000E +$Infinite health (BILLY) +0231CC76 00000100 +$Slot 1/2: Hunting gun (B) +02327308 00000005 +$Slot 1/2: Shotgun (B) +02327308 00000006 +$Slot 1/2: Grenade Launcher (B) +02327308 00000007 +$Slot 1/2: Sub-machine gun (B) +02327308 0000000B +$Slot 1/2: Rocket Launcher (B) +02327308 00000017 +$Slot 3: Magnum Revolver (B) +02327310 00000016 +$Infinite Ammo [All Slots] (B) +0232730A 00000063 +0232730E 00000063 +02327312 00000063 +02327316 00000063 +0232731A 00000063 +0232731E 00000063 +$Slot 4: Moltov cocktails (B) +02327214 0000000E [Video] -Hack = -1 ProjectionHack = 0 diff --git a/Data/User/GameConfig/GFZE01.ini b/Data/User/GameConfig/GFZE01.ini index 76ffc168b4..94821a5ff1 100644 --- a/Data/User/GameConfig/GFZE01.ini +++ b/Data/User/GameConfig/GFZE01.ini @@ -2,9 +2,10 @@ [Core] Values set here will override the main dolphin settings. EnableFPRF = True TLBHack = 1 +CPUThread = 0 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use direct 3d 9 plugin otherwise disable dual core. Needs to boot a couple of times at the beginning to run with direct 3d 9 plugin in dual core.(r7446) +EmulationIssues = Dual core is very unstable/doesn't even boot with most video plugins. Efb to ram is needed for proper shadows. Because of the things mentioned, the game runs slow. [OnFrame] Add memory patches to be applied every frame here. [Video] ProjectionHack = 1 diff --git a/Data/User/GameConfig/GFZP01.ini b/Data/User/GameConfig/GFZP01.ini index 0c9e96aafe..9dce5345c8 100644 --- a/Data/User/GameConfig/GFZP01.ini +++ b/Data/User/GameConfig/GFZP01.ini @@ -2,9 +2,10 @@ [Core] Values set here will override the main dolphin settings. EnableFPRF = True TLBHack = 1 +CPUThread = 0 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use direct 3d 9 plugin otherwise disable dual core. Needs to boot a couple of times at the beginning to run with direct 3d 9 plugin in dual core.(r7446) +EmulationIssues = Dual core is very unstable/doesn't even boot with most video plugins. Efb to ram is needed for proper shadows. Because of the things mentioned, the game runs slow. [OnFrame] Add memory patches to be applied every frame here. [Video] ProjectionHack = 1 diff --git a/Data/User/GameConfig/GGSPA4.ini b/Data/User/GameConfig/GGSPA4.ini index 30375b69c0..8ae868a615 100644 --- a/Data/User/GameConfig/GGSPA4.ini +++ b/Data/User/GameConfig/GGSPA4.ini @@ -8,7 +8,114 @@ EmulationStateId = 4 EmulationIssues = [OnFrame] [ActionReplay] +$Infinite Health +425577DC 02D90064 +6C5577DC 81000000 +425577DC 015C0064 +425577DC 02310064 +$Infinite Oxygen +025666B6 00000DAC +$No Reload +325B08F6 0000000F +025B08FA 00000019 +2A5B08F6 00000010 +025B08FA 0000000F +$Max Grip Level +025666E8 0000012C +$Have Infinite Rations +025668FA 00000005 +$Have Infinite Medicine +025668FE 00000001 +$Have Infinite Bandages +02566900 0000000A +$Have Infinite Pentazem +02566902 0000000A +$Have Body Armor +02566906 00000001 +$Have Mine Detector +0256690A 00000001 +$Have RP Sensor +0256692A 00000001 +$Have Gas Mask +0256690E 00000001 +$Have Night Vision Goggles +02566910 00000001 +$Have Thermal Goggles +02566912 00000001 +$Have Scope +02566914 00000001 +$Have Digital Camera +02566916 00000001 +$Have Rope +02566920 00000001 +$Have Handkerchief +0256694A 00000001 +$Have Box 1 +02566918 00000001 +$Have Box 2 +02566924 00000001 +$Have Box 3 +02566926 00000001 +$Have Ketchup +02566928 00000001 +$Have SOCOM Suppressor +02566932 00000001 +$Have MO Disc +0256693C 00000001 +$Have Level 99 Keycard +0256691C 00000063 +$Have Bandana +02566938 00000001 +$Have Stealth Suit +02566908 00000001 +$Have M9 (Infinite Ammo) +0256686A 0000002E +$Have SOCOM (Infinite Ammo) +0256686E 0000003D +$Have PSG1 (Infinite Ammo) +02566870 0000003D +$Have Nikita (Infinite Ammo) +02566874 00000028 +$Have Stinger (Infinite Ammo) +02566876 00000028 +$Have Claymore (Infinite Ammo) +02566878 00000010 +$Have C4 (Infinite Ammo) +0256687A 00000010 +$Have Chaff Grenade (Infinite Ammo) +0256687C 00000014 +$Have Stun Grenade (Infinite Ammo) +0256687E 00000014 +$Have Grenade (Infinite Ammo) +0256688A 00000014 +$Have FAMAS (Infinite Ammo) +0256688C 000000D3 +$Have PSG1-T (Infinite Ammo) +0256688E 0000003D +$Have Book (Infinite Ammo) +02566892 00000005 +$Have Magazine (Infinite Ammo) +02566888 00000064 +$Have No PAL Key +0256694C 00000000 +$Have Warm (Yellow) PAL Key +0256694C 00000001 +$Have Cold (Blue) PAL Key +0256694C 00000002 +$Have Hot (Red) PAL Key +0256694C 00000003 +$Low Total Game Time +045666F4 000000A0 +$Saved 0 Times +025666F2 00000000 +$Continued 0 Times +025666EC 00000000 +$999 Kills +02566700 000003E7 +$0 Rations Used +02567B4C 00000000 [Video] ProjectionHack = 0 [Video_Settings] -SafeTextureCache = True \ No newline at end of file +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 \ No newline at end of file diff --git a/Data/User/GameConfig/GTEE01.ini b/Data/User/GameConfig/GTEE01.ini index ca07a84656..d9746e96e4 100644 --- a/Data/User/GameConfig/GTEE01.ini +++ b/Data/User/GameConfig/GTEE01.ini @@ -39,7 +39,7 @@ $Huge Score 0427293C 000F423F $Everything Unlocked 0426DEB8 0004FFFF -0426DEBC FFFFFFFF +0426DEBC 0004FFFF $All Gate Challenges Complete 0226DEC8 0003FFFF $All Time Trials Complete @@ -49,5 +49,11 @@ $Moon Jump (Press Z) 042723E4 43000000 [Video] ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = [Gecko] - +[Video_Hacks] +DlistCachingEnable = False diff --git a/Data/User/GameConfig/GTEP01.ini b/Data/User/GameConfig/GTEP01.ini index a998043441..e408698c5d 100644 --- a/Data/User/GameConfig/GTEP01.ini +++ b/Data/User/GameConfig/GTEP01.ini @@ -22,3 +22,5 @@ XCV7-0RNZ-8ZPV6 $Time Trial: Found 5 Coin Pieces GZ5T-HADH-NGPBM BAF8-QT5K-5N9WC +[Video_Hacks] +DlistCachingEnable = False \ No newline at end of file diff --git a/Data/User/GameConfig/GWRE01.ini b/Data/User/GameConfig/GWRE01.ini index 022f2706aa..0e9d759f37 100644 --- a/Data/User/GameConfig/GWRE01.ini +++ b/Data/User/GameConfig/GWRE01.ini @@ -1,7 +1,7 @@ # GWRE01 - WAVE RACE / BLUE STORM [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 +EmulationStateId = 4 EmulationIssues = needs the frame cheats from ini [OnFrame] Add memory patches to be applied every frame here. +$Patches @@ -26,5 +26,9 @@ $Have 99 Points (1P Mode) 00632B43 00000063 [Video] ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = [Gecko] - diff --git a/Data/User/GameConfig/GWRP01.ini b/Data/User/GameConfig/GWRP01.ini index 6c8cc198c6..218585bb63 100644 --- a/Data/User/GameConfig/GWRP01.ini +++ b/Data/User/GameConfig/GWRP01.ini @@ -1,7 +1,7 @@ # GWRP01 - WAVE RACE / BLUE STORM [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 +EmulationStateId = 4 EmulationIssues = goes to before race with framepatch [OnFrame] Add memory patches to be applied every frame here. +$Patches diff --git a/Data/User/GameConfig/GWWP01.ini b/Data/User/GameConfig/GWWP01.ini index 2dc578d4bd..2d5feff27e 100644 --- a/Data/User/GameConfig/GWWP01.ini +++ b/Data/User/GameConfig/GWWP01.ini @@ -5,3 +5,43 @@ EmulationStateId = 5 EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +$Infinite/max health +04114244 3800000E +$Lots of coins +04030764 38007FFF +$All levels open +041D8BEC FFFFFFFF +$Moon Jump (Hold A) +04111B74 3D803E00 +04111B78 618C01CE +0A439104 00000100 +04111B7C 919E0208 +0A439104 00000000 +04111B7C 60000000 +$All levels open and complete GBA games +041D8BEC FFFFFFFF +041D8BF4 FFFFFFFF +041D8BF8 FFFFFFFF +021D8BFC 0000FFFF +041D8C04 FFFFFFFF +041D8C08 FFFFFFFF +021D8C0C 0000FFFF +041D8C24 FFFFFFFF +041D8C28 FFFFFFFF +021D8C2C 0000FFFF +041D8C34 FFFFFFFF +041D8C38 FFFFFFFF +021D8C3C 0000FFFF +041D8C54 FFFFFFFF +041D8C58 FFFFFFFF +021D8C5C 0000FFFF +041D8C64 FFFFFFFF +041D8C68 FFFFFFFF +021D8C6C 0000FFFF +041D8C84 FFFFFFFF +041D8C88 FFFFFFFF +021D8C8C 0000FFFF +041D8C94 FFFFFFFF +041D8C98 FFFFFFFF +021D8C9C 0000FFFF + diff --git a/Data/User/GameConfig/R7GEAF.ini b/Data/User/GameConfig/R7GEAF.ini index eb78d55b10..1bd73accd9 100644 --- a/Data/User/GameConfig/R7GEAF.ini +++ b/Data/User/GameConfig/R7GEAF.ini @@ -1,7 +1,7 @@ # R7GEAF - DragonBall [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 = For a real wiimote to work you need to disable the gamecube controller in the settings. EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. @@ -16,5 +16,4 @@ PH_ZFar = [Video_Settings] UseXFB = True UseRealXFB = False -[Video_Enhancements] -PostProcessingShader = +[Wii] diff --git a/Data/User/GameConfig/R7GJAF.ini b/Data/User/GameConfig/R7GJAF.ini index cf1afd3837..ac975e9d69 100644 --- a/Data/User/GameConfig/R7GJAF.ini +++ b/Data/User/GameConfig/R7GJAF.ini @@ -1,12 +1,19 @@ # R7GJAF - Dragon Ball Tenkaichi Daibouken [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 = For a real wiimote to work you need to disable the gamecube controller in the settings. 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/R7GPAF.ini b/Data/User/GameConfig/R7GPAF.ini index fdd56cec53..037790dfd1 100644 --- a/Data/User/GameConfig/R7GPAF.ini +++ b/Data/User/GameConfig/R7GPAF.ini @@ -1,12 +1,19 @@ # R7GPAF - DragonBall [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 = For a real wiimote to work you need to disable the gamecube controller in the settings. 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/RFEE01.ini b/Data/User/GameConfig/RFEE01.ini index de33b6ef5e..2f56c30834 100644 --- a/Data/User/GameConfig/RFEE01.ini +++ b/Data/User/GameConfig/RFEE01.ini @@ -1,13 +1,18 @@ # RFEE01 - FIRE EMBLEM 10 USA [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 = Disable gamecube controller or wiimote to not have conflicts(r6651) +EmulationIssues = Disable gamecube controller or wiimote to not have conflicts. Fog appears black ingame in recent builds(issue 4475). EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Wii] -ProgressiveScan = 0 [Video] ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = [Gecko] - +[Video_Settings] +DisableFog = True diff --git a/Data/User/GameConfig/RFEJ01.ini b/Data/User/GameConfig/RFEJ01.ini index 5d21978b37..0158eab486 100644 --- a/Data/User/GameConfig/RFEJ01.ini +++ b/Data/User/GameConfig/RFEJ01.ini @@ -1,12 +1,18 @@ # RFEJ01 - Fire Emblem Akatsuki No Megami [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 = Disable gamecube controller or wiimote to not have conflicts(r6651) +EmulationIssues = Disable gamecube controller or wiimote to not have conflicts. Fog appears black ingame in recent builds(issue 4475). EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Wii] -ProgressiveScan = 0 [Video] ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = [Gecko] +[Video_Settings] +DisableFog = True diff --git a/Data/User/GameConfig/RFEP01.ini b/Data/User/GameConfig/RFEP01.ini index 165a4cebe8..a854eb9c45 100644 --- a/Data/User/GameConfig/RFEP01.ini +++ b/Data/User/GameConfig/RFEP01.ini @@ -3,12 +3,18 @@ [Speedhacks] 0x80006e00=800 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Disable gamecube controller or wiimote to not have conflicts(r6651) +EmulationIssues = Disable gamecube controller or wiimote to not have conflicts. Fog appears black ingame in recent builds(issue 4475). EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Wii] -ProgressiveScan = 0 [Video] ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = [Gecko] +[Video_Settings] +DisableFog = True diff --git a/Data/User/GameConfig/RNHE41.ini b/Data/User/GameConfig/RNHE41.ini index 3bf35d5aed..05054cd297 100644 --- a/Data/User/GameConfig/RNHE41.ini +++ b/Data/User/GameConfig/RNHE41.ini @@ -1,13 +1,17 @@ # RNHE41 - NO MORE HEROES [Core] Values set here will override the main dolphin settings. -SkipIdle = 0 [Speedhacks] 0x8035bc9c=700 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 2 -EmulationIssues = +EmulationStateId = 4 +EmulationIssues = Small graphical glitch with light saber (light stays at the same place for a second when you move) [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] [Video] ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = [Gecko] diff --git a/Data/User/GameConfig/RNOJ01.ini b/Data/User/GameConfig/RNOJ01.ini index cf8e7b7dd9..f5b790de88 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 = -EmulationStateId = 4 +EmulationIssues = You can't interact with some objects ingame. Efb to Ram is needed for proper scene transition effect. +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/RNOP01.ini b/Data/User/GameConfig/RNOP01.ini index 1216832ac3..a90f6378be 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 = -EmulationStateId = 4 +EmulationIssues = You can't interact with some objects ingame. Efb to Ram is needed for proper scene transition effect. +EmulationStateId = 3 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -19,4 +19,3 @@ UseRealXFB = False [Video_Hacks] EFBToTextureEnable = False EFBCopyEnable = True - diff --git a/Data/User/GameConfig/RUYE41.ini b/Data/User/GameConfig/RUYE41.ini index b2757b44c5..46b97142e5 100644 --- a/Data/User/GameConfig/RUYE41.ini +++ b/Data/User/GameConfig/RUYE41.ini @@ -2,10 +2,14 @@ [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 = Small graphical glitch with light saber (light stays at the same place for a second when you move) [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/SFIE01.ini b/Data/User/GameConfig/SFIE01.ini new file mode 100644 index 0000000000..6fe71784be --- /dev/null +++ b/Data/User/GameConfig/SFIE01.ini @@ -0,0 +1,22 @@ +# SFIE01 - Mystery Case Files: The Malgrave Incident +[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 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 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/SX4J01.ini b/Data/User/GameConfig/SX4J01.ini index f0cbfef562..1add4f0579 100644 --- a/Data/User/GameConfig/SX4J01.ini +++ b/Data/User/GameConfig/SX4J01.ini @@ -1,10 +1,11 @@ # SX4J01 - Xenoblade [Core] Values set here will override the main dolphin settings. -BlockMerging = 1 SkipIdle = 0 +BlockMerging = 1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Disable idle skipping to solve sound issues or use LLE audio. +EmulationIssues = Disable idle skipping to solve sound issues or use LLE audio. Per pixel lighting creates a glitch in ether cave with direct 3d 9. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -14,4 +15,8 @@ PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = PH_ZFar = -[Gecko] \ No newline at end of file +[Gecko] +[Video_Hacks] +DlistCachingEnable = False +[Video_Settings] +EnablePixelLighting = False diff --git a/Data/User/GameConfig/SX4P01.ini b/Data/User/GameConfig/SX4P01.ini index b1154a7041..d649b00050 100644 --- a/Data/User/GameConfig/SX4P01.ini +++ b/Data/User/GameConfig/SX4P01.ini @@ -1,10 +1,11 @@ # SX4P01 - Xenoblade Chronicles [Core] Values set here will override the main dolphin settings. -BlockMerging = 1 SkipIdle = 0 +BlockMerging = 1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Disable idle skipping to solve sound issues or use LLE audio. +EmulationIssues = Disable idle skipping to solve sound issues or use LLE audio. Per pixel lighting creates a glitch in ether cave with direct 3d 9. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -15,3 +16,7 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Gecko] +[Video_Hacks] +DlistCachingEnable = False +[Video_Settings] +EnablePixelLighting = False diff --git a/Languages/po/el.po b/Languages/po/el.po index 22db159782..3f93e7d65a 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-08-10 08:30-0500\n" -"PO-Revision-Date: 2011-07-06 22:40-0500\n" -"Last-Translator: Link_to_the_past \n" +"PO-Revision-Date: 2011-08-25 20:16+0200\n" +"Last-Translator: Linktothepast \n" "Language-Team: Gpower2 \n" "Language: Greek\n" "MIME-Version: 1.0\n" @@ -44,8 +44,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\" είναι ένα μη έγκυÏο αÏχείο GCM/ISO, ή δεν είναι ένα ISO GC/Wii." +msgstr "Το \"%s\" είναι ένα μη έγκυÏο αÏχείο GCM/ISO, ή δεν είναι ένα ISO GC/Wii." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:193 #, c-format @@ -60,9 +59,9 @@ msgid "%d Hz" msgstr "%d Hz" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 -#, fuzzy, c-format +#, c-format msgid "%i connected" -msgstr "Μη Συνδεδεμένο" +msgstr "%i Συνδεδεμένο" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296 @@ -73,26 +72,25 @@ 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/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 -#, fuzzy, c-format +#, c-format msgid "" "%s failed to load as a memorycard \n" " Card file size is invalid (0x%x bytes)" msgstr "" -"Η κάÏτα μνήμης απέτυχε να φοÏτώσει\n" -" Το μέγεθος της κάÏτας δεν είναι έγκυÏο (%04X)" +"%s απέτυχε να φοÏτώσει ως κάÏτα μνήμης\n" +" Το μέγεθος του αÏχείου της κάÏτας δεν είναι έγκυÏο (0x%x bytes)" #: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 -#, fuzzy, c-format +#, c-format msgid "" "%s failed to load as a memorycard \n" " Card size is invalid (0x%x bytes)" msgstr "" -"Η κάÏτα μνήμης απέτυχε να φοÏτώσει\n" -" Το μέγεθος της κάÏτας δεν είναι έγκυÏο (%04X)" +"%s απέτυχε να φοÏτώσει ως κάÏτα μνήμης\n" +" Το μέγεθος της κάÏτας δεν είναι έγκυÏο (0x%x bytes)" #: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 #, c-format @@ -100,6 +98,8 @@ 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 bytes)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -130,9 +130,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:199 #, c-format @@ -372,13 +370,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" @@ -392,12 +388,10 @@ msgstr "" " - ΔÏο ΠυÏήνες [ΑÎΕÎΕΡΓΟ]\n" " - Throttle Ήχου [ΑÎΕÎΕΡΓΟ]\n" " - DSP-HLE με \"Null Audio\" ή DSP-LLE\n" -" - ΧειÏοκίνητη εισαγωγή του ακÏιβοÏÏ‚ αÏÎ¹Î¸Î¼Î¿Ï Ï„Ï‰Î½ ελεγκτών που θα " -"χÏησιμοποιηθοÏν σαν [Τυπικός Ελεγκτής]\n" +" - ΧειÏοκίνητη εισαγωγή του ακÏιβοÏÏ‚ αÏÎ¹Î¸Î¼Î¿Ï Ï„Ï‰Î½ ελεγκτών που θα χÏησιμοποιηθοÏν σαν [Τυπικός Ελεγκτής]\n" "\n" "Όλοι οι παίκτες Ï€Ïέπει να έχουν την ίδια έκδοση και Ïυθμίσεις του Dolphin.\n" -"ΑπενεÏγοποιήστε όλες τις κάÏτες μνήμης ή στείλτε τες σε όλους τους παίκτες " -"Ï€Ïιν την εκκίνηση.\n" +"ΑπενεÏγοποιήστε όλες τις κάÏτες μνήμης ή στείλτε τες σε όλους τους παίκτες Ï€Ïιν την εκκίνηση.\n" "Η υποστήÏιξη Wiimote δεν έχει ακόμα υλοποιηθεί.\n" "\n" "Θα Ï€Ïέπει να έχετε κάνει Ï€Ïοώθηση της πόÏτας TCP στον host!!" @@ -427,14 +421,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, leave this checked." msgstr "" "Εξομοιώνει με ακÏίβεια τα EFB αντίγÏαφα.\n" -"Κάποια παιχνίδια βασίζονται σε αυτό για οÏισμένα εφέ γÏαφικών ή λειτουÏγίες " -"του gameplay.\n" +"Κάποια παιχνίδια βασίζονται σε αυτό για οÏισμένα εφέ γÏαφικών ή λειτουÏγίες του gameplay.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -459,38 +451,23 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, 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:756 #, 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:549 #, 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:609 #, 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:803 #, c-format @@ -499,11 +476,8 @@ msgstr "Σφάλμα Action Replay: Μη έγκυÏη τιμή (%08x) σε Memor #: Source/Core/Core/Src/ActionReplay.cpp:684 #, 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 @@ -565,8 +539,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." @@ -576,8 +549,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." @@ -585,9 +557,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:486 msgid "Advanced" @@ -628,13 +598,11 @@ msgstr "Όλα τα αÏχεία (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕπιτÏέπει την εναλλαγή οÏισμένων επιλογών με τα πλήκτÏα συντόμευσης 3, 4, 5, " -"6 και 7 μέσα από το παÏάθυÏο εξομοίωσης.\n" +"ΕπιτÏέπει την εναλλαγή οÏισμένων επιλογών με τα πλήκτÏα συντόμευσης 3, 4, 5, 6 και 7 μέσα από το παÏάθυÏο εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -691,9 +659,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 msgid "Are you sure you want to delete this file? It will be gone forever!" -msgstr "" -"Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για " -"πάντα!" +msgstr "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για πάντα!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 @@ -739,8 +705,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΠÏοσαÏμόζει αυτόματα το μέγεθος του παÏαθÏÏου σÏμφωνα με την εσωτεÏική " -"ανάλυση.\n" +"ΠÏοσαÏμόζει αυτόματα το μέγεθος του παÏαθÏÏου σÏμφωνα με την εσωτεÏική ανάλυση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -878,16 +843,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" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -901,8 +862,7 @@ msgid "" msgstr "" "Υπολογίζει τον φωτισμό των 3D γÏαφικών ανά pixel αντί ανά vertex.\n" "Μειώνει την ταχÏτητα εξομοίωσης κατά κάποιο ποσοστό (ανάλογα με την GPU).\n" -"Αυτή είναι συνήθως μια ασφαλής βελτίωση, αλλά μποÏεί να Ï€Ïοκαλέσει " -"Ï€Ïοβλήματα οÏισμένες φοÏές.\n" +"Αυτή είναι συνήθως μια ασφαλής βελτίωση, αλλά μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα οÏισμένες φοÏές.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -920,21 +880,22 @@ msgstr "Αποτυχία ανοίγματος %s" #: Source/Core/DolphinWX/Src/FrameTools.cpp:721 msgid "Cannot record movies in read-only mode." -msgstr "" +msgstr "Δεν μποÏεί να γίνει εγγÏαφή ταινιών σε λειτουÏγία μόνο για ανάγνωση." #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 -#, fuzzy, c-format +#, c-format msgid "" "Cannot use that file as a memory card.\n" "%s\n" "is not a valid gamecube memory card file" msgstr "" -"Αδυναμία χÏήσης Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… αÏχείου σαν κάÏτα μνήμης.\n" -"ΠÏοσπαθείτε να χÏησιμοποιήσετε το ίδιο αÏχείο σε δÏο slot;" +"Αδυναμία χÏήσης Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… αÏχείου ως κάÏτα μνήμης.\n" +"%s\n" +"δεν είναι έγκυÏο αÏχείο κάÏτας μνήμης gamecube" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 msgid "" @@ -1059,12 +1020,8 @@ msgid "Choose a memory card:" msgstr "Επιλέξτε μια κάÏτα μνήμης:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 -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:764 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 @@ -1091,12 +1048,8 @@ msgid "Clear failed." 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/VideoConfigDiag.cpp:558 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 @@ -1246,15 +1199,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 @@ -1271,23 +1219,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:118 #, 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:1044 msgid "Couldn't find open command for extension 'ini'!" @@ -1325,11 +1269,8 @@ msgid "Created by KDE-Look.org" msgstr "ΔημιουÏγήθηκε από KDE-Look.org" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 -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:492 msgid "Created by VistaIcons.com" @@ -1337,9 +1278,7 @@ msgstr "ΔημιουÏγήθηκε από VistaIcons.com" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 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:15 msgid "Creator: " @@ -1347,7 +1286,7 @@ msgstr "ΔημιουÏγός: " #: Source/Core/Common/Src/MsgHandler.cpp:68 msgid "Critical" -msgstr "" +msgstr "ΚÏίσιμο" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Crop" @@ -1507,12 +1446,8 @@ msgstr "Ανίχνευση" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -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 @@ -1572,30 +1507,24 @@ msgstr "ΑπενεÏγοποίηση Ηχείου Wiimote" #: 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -1683,20 +1612,12 @@ msgid "Dolphin at &Google Code" msgstr "Dolphin στο &Google Code" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 -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:307 -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/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 @@ -1742,8 +1663,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Εξαγωγή όλων των απεικονισμένων καÏέ σε ένα AVI αÏχείο στο User/Dump/" -"Frames/\n" +"Εξαγωγή όλων των απεικονισμένων καÏέ σε ένα AVI αÏχείο στο User/Dump/Frames/\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -1753,8 +1673,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Εξαγωγή των αποκωδικοποιημένων υφών του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï ÏƒÏ„Î¿ User/Dump/Textures/" -"/\n" +"Εξαγωγή των αποκωδικοποιημένων υφών του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï ÏƒÏ„Î¿ User/Dump/Textures//\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -1784,16 +1703,8 @@ msgstr "EFB ΑντίγÏαφα" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, 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:162 msgid "EUROPE" @@ -1843,31 +1754,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" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -1885,15 +1789,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" @@ -1973,19 +1875,14 @@ msgid "" "If unsure, select 1x." msgstr "" "ΕνεÏγοποιεί το ανισοτÏοπικό φιλτÏάÏισμα.\n" -"Βελτιώνει την ποιότητα απεικόνισης των υφών που βÏίσκονται σε οξείες οπτικές " -"γωνίες.\n" +"Βελτιώνει την ποιότητα απεικόνισης των υφών που βÏίσκονται σε οξείες οπτικές γωνίες.\n" "ΜποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα σε έναν μικÏÏŒ αÏιθμό παιχνιδιών.\n" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -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:799 msgid "Enable pages" @@ -1998,41 +1895,28 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιήστε το αν θέλετε ολόκληÏη η οθόνη να χÏησιμοποιηθεί για την " -"απεικόνιση.\n" +"ΕνεÏγοποιήστε το αν θέλετε ολόκληÏη η οθόνη να χÏησιμοποιηθεί για την απεικόνιση.\n" "Αν αυτό είναι απενεÏγοποιημένο, θα δημιουÏγηθεί ένα παÏάθυÏο απεικόνισης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 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:329 -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:311 -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:334 msgid "Enables Custom Projection Hack" @@ -2045,18 +1929,13 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιεί την Ï€Ïοοδευτική σάÏωση αν υποστηÏίζεται από το εξομοιωμένο " -"λογισμικό. Τα πεÏισσότεÏα παιχνίδια δεν την χÏειάζονται αυτήν την ÏÏθμιση.\n" +"ΕνεÏγοποιεί την Ï€Ïοοδευτική σάÏωση αν υποστηÏίζεται από το εξομοιωμένο λογισμικό. Τα πεÏισσότεÏα παιχνίδια δεν την χÏειάζονται αυτήν την ÏÏθμιση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -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 "" @@ -2109,19 +1988,12 @@ msgstr "Σφάλμα" #: Source/Core/DolphinWX/Src/Main.cpp:356 msgid "Error loading selected language. Falling back to system default." -msgstr "" -"Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή " -"συστήματος." +msgstr "Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή συστήματος." #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 #, 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" @@ -2134,8 +2006,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:58 msgid "Execute" @@ -2286,12 +2157,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 @@ -2472,8 +2341,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Επιβάλλει φιλτÏάÏισμα υφών ακόμα κι αν το παιχνίδι το έχει απενεÏγοποιήσει.\n" -"Βελτιώνει ελαφÏÏŽÏ‚ την ποιότητα των υφών αλλά μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα " -"σε οÏισμένα παιχνίδια.\n" +"Βελτιώνει ελαφÏÏŽÏ‚ την ποιότητα των υφών αλλά μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα σε οÏισμένα παιχνίδια.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -2492,13 +2360,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 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/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 msgid "" @@ -2654,9 +2519,7 @@ msgstr "ΓεÏμανικά" #: Source/Core/Core/Src/ActionReplay.cpp:451 #, 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:443 msgid "Graphics" @@ -2672,14 +2535,12 @@ msgstr "ΜεγαλÏτεÏο από" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 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" "\n" "If unsure, leave this checked." msgstr "" -"Βελτιώνει Ï€Î¿Î»Ï Ï„Î·Î½ ποιότητα των υφών που παÏάγονται χÏησιμοποιώντας render " -"to texture εφέ.\n" +"Βελτιώνει Ï€Î¿Î»Ï Ï„Î·Î½ ποιότητα των υφών που παÏάγονται χÏησιμοποιώντας render to texture εφέ.\n" "Μία αÏξηση της εσωτεÏικής ανάλυσης θα βελτιώσει το εφέ αυτής της ÏÏθμισης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -2758,8 +2619,7 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"ΑποκÏÏπτει τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î±Î½ βÏίσκεται πάνω από το παÏάθυÏο " -"εξομοίωσης.\n" +"ΑποκÏÏπτει τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î±Î½ βÏίσκεται πάνω από το παÏάθυÏο εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -2792,20 +2652,16 @@ msgstr "ΥβÏιδικό Wiimote" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 #, 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:795 #, 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 πιθανότατα θα κολλήσει Ï„ÏŽÏα." @@ -2846,21 +2702,14 @@ msgid "Icon" msgstr "Εικονίδιο" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -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:481 -msgid "" -"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." +msgid "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." msgstr "" -"Αν θέσετε τον πεÏιοÏισμό καÏέ υψηλότεÏα από ότι την πλήÏη ταχÏτητα του " -"Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, PAL:50),\n" -"θα Ï€Ïέπει επίσης να απενεÏγοποιήσετε το Throttle Ήχου στο DSP για να έχει " -"αποτέλεσμα. " +"Αν θέσετε τον πεÏιοÏισμό καÏέ υψηλότεÏα από ότι την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, PAL:50),\n" +"θα Ï€Ïέπει επίσης να απενεÏγοποιήσετε το Throttle Ήχου στο DSP για να έχει αποτέλεσμα. " #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 msgid "Ignore Format Changes" @@ -2869,29 +2718,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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -2925,13 +2769,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -2941,8 +2783,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί την εξαφάνιση του Ï†Ï‰Ï„Î¹ÏƒÎ¼Î¿Ï ÏƒÏ„Î± " -"πεÏισσότεÏα παιχνίδια.\n" +"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί την εξαφάνιση του Ï†Ï‰Ï„Î¹ÏƒÎ¼Î¿Ï ÏƒÏ„Î± πεÏισσότεÏα παιχνίδια.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -2992,11 +2833,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:1361 msgid "Installing WAD..." @@ -3352,12 +3190,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 @@ -3378,7 +3212,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" -msgstr "" +msgstr "Το μέγεθος του αÏχείου της κάÏτας μνήμης δεν ταιÏιάζει με το μέγεθος της κεφαλίδας." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:47 msgid "Menu" @@ -3408,13 +3242,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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -3442,8 +3274,7 @@ msgid "" "\n" "\n" msgstr "" -"Μετακινήστε τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Ï€Î¬Î½Ï‰ από μία επιλογή για να εμφανιστεί " -"μία λεπτομεÏής πεÏιγÏαφή.\n" +"Μετακινήστε τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Ï€Î¬Î½Ï‰ από μία επιλογή για να εμφανιστεί μία λεπτομεÏής πεÏιγÏαφή.\n" "\n" "\n" "\n" @@ -3454,12 +3285,8 @@ msgid "Multiply" msgstr "Multiply" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -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/WXInputBase.cpp:126 msgid "NP Add" @@ -3753,8 +3580,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" @@ -3764,12 +3590,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" @@ -3999,9 +3821,8 @@ msgid "Real Wiimote" msgstr "ΠÏαγματικό Wiimote" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 -#, fuzzy msgid "Real Wiimotes" -msgstr "ΠÏαγματικό Wiimote" +msgstr "ΠÏαγματικά Wiimotes" #: Source/Core/DolphinWX/Src/Frame.cpp:163 msgid "Reconnect Wiimote Confirm" @@ -4195,9 +4016,7 @@ msgstr "Αποθήκευση αποσυμπιεσμένου GCM/ISO" #: Source/Core/Core/Src/Movie.cpp:428 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." -msgstr "" -"Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της " -"εγγÏαφής της ταινίας..." +msgstr "Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της εγγÏαφής της ταινίας..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format @@ -4206,7 +4025,7 @@ msgstr "Ανίχνευση %s" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 msgid "Scanning for ISOs" -msgstr "Ανίχνευση για ISO" +msgstr "Αναζήτηση για ISOs" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 msgid "Scanning..." @@ -4228,8 +4047,10 @@ msgstr "ΦίλτÏο Αναζήτησης" msgid "Search Subfolders" msgstr "Αναζήτηση σε Υποφακέλους" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:104 +#: Source/Core/Common/Src/SysConf.h:127 +#: Source/Core/Common/Src/SysConf.h:147 +#: Source/Core/Common/Src/SysConf.h:168 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Η ενότητα %s δε βÏέθηκε στο SYSCONF" @@ -4296,8 +4117,7 @@ msgstr "" "Αυτόματα: ΧÏήση της τοπικής αναλογίας οθόνης (4:3)\n" "Επιβολή 16:9: ΠÏοσαÏμόζει την εικόνα σε αναλογία οθόνης 16:9.\n" "Επιβολή 4:3: ΠÏοσαÏμόζει την εικόνα σε αναλογία οθόνης 4:3.\n" -"ΠÏοσαÏμογή στο παÏάθυÏο: ΠÏοσαÏμόζει την εικόνα στην αναλογία του " -"παÏαθÏÏου.\n" +"ΠÏοσαÏμογή στο παÏάθυÏο: ΠÏοσαÏμόζει την εικόνα στην αναλογία του παÏαθÏÏου.\n" "\n" "Αν δεν είστε σίγουÏοι επιλέξτε Αυτόματα." @@ -4308,32 +4128,26 @@ msgstr "Επιλεγμένη γÏαμματοσειÏά" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 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:73 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." @@ -4355,11 +4169,8 @@ msgid "Serbian" msgstr "ΣεÏβικά" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -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" @@ -4377,9 +4188,7 @@ msgstr "ΟÏισμός ως Ï€Ïοεπιλεγμένη ΚάÏτα Μνήμης % #: Source/Core/Core/Src/ActionReplay.cpp:462 #, 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:335 msgid "Settings..." @@ -4500,12 +4309,10 @@ msgstr "Εμφάνιση επιβεβαίωσης Ï€Ïιν τη διακοπή #: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 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:812 @@ -4530,13 +4337,11 @@ msgstr "Εμφάνιση αποθηκευμένου τίτλου" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -4584,13 +4389,11 @@ msgstr "ΠαÏάλειψη EFB ΠÏόσβασης από τη CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -4618,16 +4421,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" -"Θέλετε όντως να χÏησιμοπποιήσετε την απεικόνιση λογισμικοÏ; Αν δεν είστε " -"σίγουÏοι, επιλέξτε 'No'." +"Θέλετε όντως να χÏησιμοπποιήσετε την απεικόνιση λογισμικοÏ; Αν δεν είστε σίγουÏοι, επιλέξτε 'No'." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 msgid "Sound Settings" @@ -4659,22 +4459,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." @@ -4829,12 +4620,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 @@ -4856,21 +4643,15 @@ 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/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" -msgstr "" -"Το σημείο αποθήκευσης που Ï€Ïοσπαθείτε να αντιγÏάψετε έχει μη έγκυÏο μέγεθος" +msgstr "Το σημείο αποθήκευσης που Ï€Ïοσπαθείτε να αντιγÏάψετε έχει μη έγκυÏο μέγεθος" #: Source/Core/DolphinWX/Src/Main.cpp:363 -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!" @@ -4906,12 +4687,8 @@ msgid "Theme selection went wrong" msgstr "Η επιλογή θέματος απέτυχε" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 -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:304 msgid "" @@ -4919,40 +4696,25 @@ msgid "" "Undetermined means the game uses Dolphin's setting." msgstr "" "Αυτές οι Ïυθμίσεις υπεÏισχÏουν των γενικών Ïυθμίσεων του Dolphin.\n" -"Αν είναι ακαθόÏιστη η επιλογή το παιχνίδι χÏησιμοποιεί τις γενικές Ïυθμίσεις " -"του Dolphin. " +"Αν είναι ακαθόÏιστη η επιλογή το παιχνίδι χÏησιμοποιεί τις γενικές Ïυθμίσεις του Dolphin. " #: Source/Core/Core/Src/ActionReplay.cpp:356 -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:509 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -4964,14 +4726,11 @@ msgid "" "\n" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" -"ΧÏησιμοποιείται για τον έλεγχο της ταχÏτητας του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î¼Îµ throttle " -"ήχου.\n" -"ΑπενεÏγοποίησή της μποÏεί να Ï€Ïοκαλέσει μη φυσιολογική ταχÏτητα παιχνιδιοÏ, " -"όπως Ï€Î¿Î»Ï Î³ÏήγοÏη.\n" +"ΧÏησιμοποιείται για τον έλεγχο της ταχÏτητας του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î¼Îµ throttle ήχου.\n" +"ΑπενεÏγοποίησή της μποÏεί να Ï€Ïοκαλέσει μη φυσιολογική ταχÏτητα παιχνιδιοÏ, όπως Ï€Î¿Î»Ï Î³ÏήγοÏη.\n" "Αλλά μεÏικές φοÏές η ενεÏγοποίησή της μποÏεί να Ï€Ïοκαλέσει μόνιμο θόÏυβο.\n" "\n" -"Συντόμευση πληκτÏολογίου : ΚÏατήστε το πατημένο για να απενεÏγοποιηθεί " -"η λειτουÏγία Throttle." +"Συντόμευση πληκτÏολογίου : ΚÏατήστε το πατημένο για να απενεÏγοποιηθεί η λειτουÏγία Throttle." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "This is used to play music tracks, like BGM." @@ -4979,20 +4738,16 @@ msgstr "ΧÏησιμοποιείται για την αναπαÏαγωγή μο #: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 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:283 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 @@ -5039,7 +4794,8 @@ msgstr "ΠÏοσπάθεια φόÏτωσης ενός άγνωστου Ï„Ïπο msgid "Triggers" msgstr "Σκανδάλες" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:92 +#: Source/Core/Common/Src/SysConf.h:115 msgid "Trying to read from invalid SYSCONF" msgstr "ΠÏοσπάθεια ανάγνωσης από ένα μη έγκυÏο SYSCONF" @@ -5085,17 +4841,16 @@ msgid "" "Unable to create patch from given values.\n" "Entry not modified." msgstr "" +"Αδυναμία δημιουÏγίας patch από τις δοθείσες τιμές.\n" +"Η entry δεν μεταβλήθηκε." #: 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:404 @@ -5178,23 +4933,19 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "ΧÏησιμοποίηση πολλαπλών νημάτων για την αποκωδικοποίηση υφών.\n" -"ΜποÏεί να βελτιώσει την ταχÏτητα (ειδικά σε CPUs με πεÏισσότεÏους από δÏο " -"πυÏήνες).\n" +"ΜποÏεί να βελτιώσει την ταχÏτητα (ειδικά σε CPUs με πεÏισσότεÏους από δÏο πυÏήνες).\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -5249,8 +5000,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Αναμονή για την κάθετη ανανέωση της οθόνης ώστε να μειωθεί το σπάσιμο της " -"εικόνας.\n" +"Αναμονή για την κάθετη ανανέωση της οθόνης ώστε να μειωθεί το σπάσιμο της εικόνας.\n" "Μειώνει τις επιδόσεις αν η ταχÏτητα εξομοίωσης είναι μικÏότεÏη από 100%.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -5280,8 +5030,7 @@ msgid "" "%s\n" "Do you wish to continue?" msgstr "" -"ΠÏοειδοποίηση! Συστήνεται η δημιουÏγία αντιγÏάφου ασφαλείας όλων των αÏχείων " -"στον φάκελο:\n" +"ΠÏοειδοποίηση! Συστήνεται η δημιουÏγία αντιγÏάφου ασφαλείας όλων των αÏχείων στον φάκελο:\n" "%s\n" "Θέλετε να συνεχίσετε;" @@ -5293,8 +5042,7 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" -"ΠÏοειδοποίηση: Αυτό θα αντικαταστήσει όλα τα υπάÏχοντα σημεία αποθήκευσης " -"που υπάÏχουν στον φάκελο:\n" +"ΠÏοειδοποίηση: Αυτό θα αντικαταστήσει όλα τα υπάÏχοντα σημεία αποθήκευσης που υπάÏχουν στον φάκελο:\n" "%s\n" "κι έχουν το ίδιο όνομα με αÏχεία στη memcard\n" "Συνέχεια;" @@ -5346,9 +5094,9 @@ msgid "Wiimote" msgstr "Wiimote" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 -#, fuzzy, c-format +#, c-format msgid "Wiimote %i" -msgstr "Wiimote " +msgstr "Wiimote %i" #: Source/Core/DolphinWX/Src/Frame.cpp:162 #, c-format @@ -5376,9 +5124,8 @@ msgid "Wiimote settings" msgstr "Ρυθμίσεις Wiimote" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 -#, fuzzy msgid "Wiimotes" -msgstr "Wiimote" +msgstr "Wiimotes" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:131 msgid "Windows Left" @@ -5438,6 +5185,8 @@ msgid "" "You are using free dsp roms made by Dolphin Team.\n" "Only Zelda ucode games will work correctly with them.\n" msgstr "" +"ΧÏησιμοποιείτε ελεÏθεÏα dsp roms που φτιάχτηκαν από την ομάδα του Dolphin.\n" +"Μόνο Zelda ucode παιχνίδια θα δουλέψουν σωστά με αυτά.\n" #: Source/Core/DolphinWX/Src/FrameAui.cpp:72 msgid "You can't close panes that have pages in them." @@ -5461,8 +5210,7 @@ msgstr "ΠÏέπει να εισάγετε ένα έγκυÏο όνομα Ï€Ïο #: Source/Core/DolphinWX/Src/ConfigMain.cpp:877 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 "" @@ -5520,19 +5268,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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -5579,9 +5322,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:461 msgid "s" @@ -5608,776 +5349,3 @@ msgstr "zNear ΔιόÏθωση: " msgid "| OR" msgstr "| OR" -#~ msgid "%d %%" -#~ msgstr "%d %%" - -#, fuzzy -#~ msgid "&Frame Stepping" -#~ msgstr "ΠαÏάλειψη Κ&αÏέ" - -#, fuzzy -#~ msgid "(Default)" -#~ msgstr "ΠÏοεπιλ." - -#~ msgid "32,000 Hz" -#~ msgstr "32,000 Hz" - -#~ msgid "32-bit platforms do not support fastmem yet. Report this bug." -#~ msgstr "" -#~ "Οι πλατφόÏμες 32-bit δενυποστηÏίζουν ακόμα τη λειτουÏγία fastmem. " -#~ "ΑναφέÏετε αυτό το bug." - -#~ msgid "3D Vision (Requires Fullscreen)" -#~ msgstr "3D Vision (ΠÏοϋποθέτει ΠλήÏη Οθόνη)" - -#~ msgid "48,000 Hz" -#~ msgstr "48,000 Hz" - -#~ msgid "< as Default Profile >" -#~ msgstr "<όπως το ΠÏοεπιλεγμένο ΠÏοφίλ>" - -#~ msgid "ALSA" -#~ msgstr "ALSA" - -#, fuzzy -#~ msgid "AOSound" -#~ msgstr "&Ήχος" - -#~ msgid "Accuracy:" -#~ msgstr "ΑκÏίβεια:" - -#, fuzzy -#~ msgid "Accurate Texture Cache" -#~ msgstr "Cache Υφών" - -#, fuzzy -#~ msgid "Adjust window size" -#~ msgstr "Αυτόματη ΠÏοσαÏμογή Μεγέθους ΠαÏαθÏÏου" - -#~ msgid "" -#~ "Allows the CPU to read or write to the EFB (render buffer).\n" -#~ "This is needed for certain gameplay functionality (e.g. star pointer in " -#~ "Super Mario Galaxy) as well as for certain visual effects (e.g. Monster " -#~ "Hunter Tri),\n" -#~ "but enabling this option can also have a huge negative impact on " -#~ "performance if the game uses this functionality heavily." -#~ msgstr "" -#~ "ΕπιτÏέπει στη CPU να διαβάζει ή να γÏάφει στον EFB (render buffer).\n" -#~ "Αυτό χÏειάζεται για οÏισμένες λειτουÏγίες παιχνιδιών (Ï€.χ. star pointer " -#~ "στο Super Mario Galaxy) όπως και για οÏισμένα οπτικά εφέ (Ï€.χ. Monster " -#~ "Hunter Tri),\n" -#~ "αλλά η ενεÏγοποίηση αυτής της επιλογής μποÏεί να έχει και τεÏάστια " -#~ "αÏνητική επίδÏαση στις επιδόσεις, αν το παιχνίδι χÏησιμοποιεί Ï€Î¿Î»Ï Î±Ï…Ï„Î® " -#~ "τη λειτουÏγία." - -#~ msgid "Alternate RFI" -#~ msgstr "Εναλλακτικό RFI" - -#~ msgid "Auto [recommended]" -#~ msgstr "Αυτόματα [Ï€Ïοτείνεται]" - -#~ msgid "" -#~ "Auto size the window to match the game's output resolution adjusted by " -#~ "the EFB scale.\n" -#~ "It is best to set the aspect ratio to stretch when using this." -#~ msgstr "" -#~ "ΠÏοσαÏμόζει το παÏάθυÏο ώστε να ταιÏιάζει με την ανάλυση εξόδου του " -#~ "Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï ÏŒÏ€Ï‰Ï‚ Ï€ÏοκÏπτει από το EFB σε Κλίμακα.\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 "" -#~ "Αυτόματη δημιουÏγία mipmaps αντί να γίνεται αποκωδικοποίησή τους από την " -#~ "μνήμη.\n" -#~ "Αυξάνει λίγο τις επιδόσεις αλλά μποÏεί να δημιουÏγήσει μικÏά ελαττώματα " -#~ "στις υφές.\n" -#~ "\n" -#~ "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." - -#~ msgid "Bad gameini filename" -#~ msgstr "ΠÏοβληματικό αÏχείο gameini" - -#~ msgid "Bleach Versus Crusade" -#~ msgstr "Bleach Versus Crusade" - -#~ msgid "" -#~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " -#~ "vertex.\n" -#~ "This is the more accurate behavior but reduces performance." -#~ msgstr "" -#~ "Υπολογίζει τον φωτισμό των γÏαφικών 3D ανά pixel και όχι ανά vertex.\n" -#~ "Αυτή είναι πιο ακÏιβής συμπεÏιφοÏά αλλά μειώνει τις επιδόσεις." - -#~ msgid "Can't find plugin %s" -#~ msgstr "Δε βÏέθηκε το plugin %s" - -#~ msgid "Can't init DSP Plugin" -#~ msgstr "Δεν μπόÏεσε να εκκινήσει το DSP Plugin" - -#~ msgid "Can't init Video Plugin" -#~ msgstr "Δεν μπόÏεσε να εκκινήσει το Video Plugin" - -#~ msgid "Can't open %s, it has a missing function" -#~ msgstr "Αδυναμία ανοίγματος του %s, απουσιάζει μία λειτουÏγία" - -#, fuzzy -#~ msgid "Config..." -#~ msgstr "Γενικές Ρυθμίσεις......" - -#, fuzzy -#~ msgid "Configuration profile" -#~ msgstr "Ρυθμίσεις ΚαταγÏαφής" - -#, fuzzy -#~ msgid "Configuration profile:" -#~ msgstr "Ρυθμίσεις ΚαταγÏαφής" - -#, fuzzy -#~ msgid "Connected" -#~ msgstr "ΣÏνδεση" - -#~ msgid "Connected to %i Wiimotes" -#~ msgstr "Συνδεδεμένα %i Wiimote" - -#~ msgid "Copy" -#~ msgstr "ΑντιγÏαφή" - -#, fuzzy -#~ msgid "CoreAudio" -#~ msgstr "Ήχος" - -#, fuzzy -#~ msgid "Could not copy %s to %s" -#~ msgstr "Αποτυχία δημιουÏγίας %s" - -#, fuzzy -#~ msgid "Could not get info about plugin %s" -#~ msgstr "Αποτυχία δημιουÏγίας %s" - -#~ msgid "DList Cache" -#~ msgstr "DList Cache" - -#, fuzzy -#~ msgid "DSound" -#~ msgstr "&Ήχος" - -#, fuzzy -#~ msgid "Danish" -#~ msgstr "Ισπανικά" - -#~ msgid "" -#~ "Disable texturing.\n" -#~ "This is only useful for debugging purposes." -#~ msgstr "" -#~ "ΑπενεÏγοποίηση Υφών.\n" -#~ "Αυτό είναι χÏήσιμο μόνο για debugging σκοποÏÏ‚." - -#~ msgid "" -#~ "Disables an alpha-setting pass.\n" -#~ "Breaks certain effects but might help performance." -#~ msgstr "" -#~ "ΑπενεÏγοποιεί το alpha-setting pass.\n" -#~ "Χαλάει κάποια εφφέ αλλά μποÏεί να βοηθήσει στις επιδόσεις." - -#, fuzzy -#~ msgid "Distance Alpha Pass" -#~ msgstr "ΠαÏάλειψη Dest. Alpha Pass" - -#~ msgid "Dolphin DSP-HLE Plugin" -#~ msgstr "Dolphin Plugin DSP-HLE" - -#~ msgid "Dolphin DSP-HLE Plugin Settings" -#~ msgstr "Ρυθμίσεις Dolphin Plugin DSP-HLE" - -#~ msgid "Dolphin DSP-LLE Plugin" -#~ msgstr "Dolphin Plugin DSP-LLE" - -#~ msgid "Dolphin DSP-LLE Plugin Settings" -#~ msgstr "Ρυθμίσεις Dolphin Plugin DSP-LLE" - -#, fuzzy -#~ msgid "Dolphin Direct3D11" -#~ msgstr "Direct3D11" - -#, fuzzy -#~ msgid "Dolphin Direct3D9" -#~ msgstr "Direct3D9" - -#, fuzzy -#~ msgid "Dolphin OpenGL" -#~ msgstr "Dolphin FIFO" - -#~ msgid "" -#~ "Dolphin has not been configured with an install location,\n" -#~ "Keep Dolphin portable?" -#~ msgstr "" -#~ "Το Dolphin δεν έχει Ïυθμιστεί με τοποθεσία εγκατάστασης,\n" -#~ "ΔιατήÏηση του Dolphin με φοÏητή εγκατάσταση;" - -#~ msgid "EFB" -#~ msgstr "EFB" - -#~ msgid "" -#~ "Emulate frame buffer copies directly to textures.\n" -#~ "This is not so accurate, but it's good enough for the way many games use " -#~ "framebuffer copies." -#~ msgstr "" -#~ "Εξομοιώνει αντιγÏαφές του frame buffer απευθείας στις υφές.\n" -#~ "Αυτό δεν είναι και τόσο ακÏιβές, αλλά είναι αÏκετά καλό για τα παιχνίδια " -#~ "που χÏησιμοποιοÏν αντιγÏαφές του framebuffer." - -#~ msgid "Emulator Display Settings" -#~ msgstr "Ρυθμίσεις Οθόνης Εξομοιωτή" - -#, fuzzy -#~ msgid "Enable CPU Access" -#~ msgstr "ΕνεÏγοποίηση Cheat" - -#, fuzzy -#~ msgid "Enable Cache" -#~ msgstr "ΕνεÏγοποίηση Cheat" - -#~ msgid "Enable Copy to EFB" -#~ msgstr "ΕνεÏγοποίηση ΑντιγÏαφή στον EFB" - -#, fuzzy -#~ msgid "Enable EFB To Texture" -#~ msgstr "ΑπενεÏγοποίηση Υφών" - -#, fuzzy -#~ msgid "Enable HLE Audio" -#~ msgstr "ΕνεÏγοποίηση Throttle Ήχου" - -#, fuzzy -#~ msgid "Enable JIT Dynarec" -#~ msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα" - -#, fuzzy -#~ msgid "Enable OpenCL" -#~ msgstr "ΕνεÏγοποίηση σελίδων" - -#, fuzzy -#~ msgid "Enable Screen Saver (burn-in reduction)" -#~ msgstr "ΕνεÏγοποίηση ΠÏοφÏλαξης Οθόνης" - -#, fuzzy -#~ msgid "" -#~ "Enables dynamic recompilation of DSP code.\n" -#~ "Changing this will have no effect while the emulator is running!" -#~ msgstr "Αυτή η αλλαγή δε θα έχει επίπτωση όσο ο εξομοιωτής εκτελείται!" - -#~ msgid "" -#~ "Enables emulation of Embedded Frame Buffer copies, if the game uses " -#~ "them.\n" -#~ "Games often need this for post-processing or other things, but if you can " -#~ "live without it, you can sometimes get a big speedup." -#~ msgstr "" -#~ "ΕνεÏγοποιεί την εξομοίωση για αντιγÏαφές Embedded Frame Buffer, εάν το " -#~ "παιχνίδι τις χÏησιμοποιεί.\n" -#~ "Τα παιχνίδια συχνά χÏειάζονται αυτή τη λειτουÏγία για το post-processing " -#~ "ή άλλες λειτουÏγίες, αλλά αν μποÏείτε χωÏίς αυτή, μποÏείτε πολλές φοÏές " -#~ "να δείτε μια μεγάλη επιτάχυνση." - -#~ msgid "" -#~ "Enables reinterpreting the data inside the EFB when the pixel format " -#~ "changes.\n" -#~ "Some games depend on this function for certain effects, so enable it if " -#~ "you're having glitches.\n" -#~ "Depending on how the game uses this function, the speed hits caused by " -#~ "this option range from none to critical." -#~ msgstr "" -#~ "ΕνεÏγοποιεί την επαναμεταγλώττιση των δεδομένων μέσα στον EFB όταν το " -#~ "pixel format αλλάζει.\n" -#~ "ΜεÏικά παιχνίδια εξαÏτώνται σε αυτή τη λειτουÏγία για μεÏικά εφφέ, οπότε " -#~ "ενεÏγοποιήστε το αν αντιμετωπίζετε Ï€Ïοβλήματα.\n" -#~ "Ανάλογα με το πώς το παιχνίδι χÏησιμοποιεί αυτή τη λειτουÏγία, η " -#~ "επιτάχυνση κυμαίνεται από καμία μέχÏι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î·." - -#~ msgid "Error allocating buffer" -#~ msgstr "Σφάλμα κατά τη δέσμευση buffer" - -#~ msgid "Error loading %s: can't read info" -#~ msgstr "Αποτυχία φόÏτωσης %s: αδυναμία ανάγνωσης πληÏοφοÏιών" - -#~ msgid "" -#~ "Error loading plugin %s: can't find file. Please re-select your plugins." -#~ msgstr "" -#~ "Αποτυχία φόÏτωσης του plugin %s: αδυναμία εÏÏεσης του αÏχείου. ΠαÏακαλώ " -#~ "επιλέξτε ξανα τα plugin σας." - -#~ msgid "Error opening file %s for recording" -#~ msgstr "Σφάλμα κατά το άνοιγμα του αÏχείου %s για εγγÏαφή" - -#~ msgid "" -#~ "Failed to load DSP ROM:\n" -#~ "%s\n" -#~ "This file is required to use DSP LLE" -#~ msgstr "" -#~ "Αποτυχία φόÏτωσης DSP ROM:\n" -#~ "%s\n" -#~ "Αυτό το αÏχείο απαιτείται για να χÏησιμοποιηθεί το DSP LLE" - -#, fuzzy -#~ msgid "Failed to load DSP ROM: %s" -#~ msgstr "Αποτυχία μεταφόÏτωσης κωδικών." - -#~ msgid "Fast" -#~ msgstr "ΓÏήγοÏη" - -#~ msgid "Fast Mipmaps" -#~ msgstr "ΓÏήγοÏα Mipmaps" - -#~ msgid "" -#~ "Faster variants look at fewer pixels and thus have more potential for " -#~ "errors.\n" -#~ "Slower variants look at more pixels and thus are safer." -#~ msgstr "" -#~ "Οι γÏήγοÏες επιλογές ελέγχουν λιγότεÏα pixel κι έτσι έχουν μεγαλÏτεÏη " -#~ "πιθανότητα για σφάλματα.\n" -#~ "Οι αÏγότεÏες επιλογές ελέγχουν πεÏισσότεÏα pixel κι έτσι είναι " -#~ "ασφαλέστεÏες." - -#, fuzzy -#~ msgid "Force Bi/Trilinear Filtering" -#~ msgstr "Επιβολή ΦιλτÏαÏίσματος Υφών" - -#, fuzzy -#~ msgid "Fractional" -#~ msgstr "ΕνέÏγεια" - -#~ msgid "" -#~ "Fully emulate embedded frame buffer copies.\n" -#~ "This is more accurate than EFB Copy to Texture, and some games need this " -#~ "to work properly, but it can also be very slow." -#~ msgstr "" -#~ "ΠλήÏης εξομοίωση αντιγÏαφών του Embedded Frame Buffer.\n" -#~ "Αυτό είναι πιο ασφαλές από την ΑντιγÏαφή EFB σε Υφή, αλλά μεÏικά " -#~ "παιχνίδια το απαιτοÏν για να λειτουÏγήσουν πιο σωστά, αλλά μποÏεί να " -#~ "είναι και Ï€Î¿Î»Ï Î±Ïγό." - -#, fuzzy -#~ msgid "GFX Config" -#~ msgstr "Ρυθμίσεις" - -#, fuzzy -#~ msgid "Graphics Plugin" -#~ msgstr "ΓÏαφικά" - -#~ msgid "Hide Shader Errors" -#~ msgstr "ΑπόκÏυψη Σφαλμάτων Shader" - -#~ msgid "" -#~ "Hide the cursor when it is over the rendering window and the rendering " -#~ "window has focus." -#~ msgstr "" -#~ "ΑπόκÏυψη του δείκτη όταν είναι πάνω από το παÏάθυÏο αναπαÏαγωγής\n" -#~ " και το παÏάθυÏο αναπαÏαγωγής είναι επιλεγμένο. " - -#~ msgid "" -#~ "If a game hangs, works only in the Interpreter or Dolphin crashes, this " -#~ "option may fix the game." -#~ msgstr "" -#~ "Εάν ένα παιχνίδι κολλήσει, δουλεÏει μόνο στον Interpreter ή το Dolphin " -#~ "κÏασάÏει, αυτή η επιλογή μποÏεί να φτιάξει το παιχνίδι." - -#~ msgid "Input Source" -#~ msgstr "Πηγή Εισόδου" - -#~ msgid "Install directory could not be saved" -#~ msgstr "Αδυναμία αποθήκευσης του φακέλου εγκατάστασης" - -#, fuzzy -#~ msgid "Installing WAD to Wii Menu..." -#~ msgstr "Εγκατάσταση στο ÎœÎµÎ½Î¿Ï Wii" - -#, fuzzy -#~ msgid "Integral [recommended]" -#~ msgstr "JIT Recompiler (Ï€Ïοτείνεται)" - -#, fuzzy -#~ msgid "" -#~ "Internal LZO Error - decompression failed (%d) (%ld, %ld) \n" -#~ "Try verifying the state again" -#~ msgstr "" -#~ "ΕσωτεÏικό Σφάλμα LZO - αποτυχία αποσυμπίεσης (%d) (%ld, %ld) \n" -#~ "Δοκιμάστε να φοÏτώσετε ξανά το σημείο αποθήκευσης" - -#~ msgid "" -#~ "Keeps track of textures based on looking at the actual pixels in the " -#~ "texture.\n" -#~ "Can cause slowdown, but some games need this option enabled to work " -#~ "properly." -#~ msgstr "" -#~ "ΠαÏακολουθεί τις υφές με βάση τον έλεγχο των Ï€Ïαγματικών pixel στην υφή.\n" -#~ "ΜποÏεί να Ï€Ïοκαλέσει επιβÏάδυνση, αλλά μεÏικά παιχνίδια απαιτοÏν αυτήν " -#~ "την επιλογή ενεÏγοποιημένη για να παίξουν σωστά." - -#, fuzzy -#~ msgid "Load Script..." -#~ msgstr "ΦόÏτωση Σημείου Αποθήκευσης..." - -#~ msgid "" -#~ "Loads native mipmaps instead of generating them.\n" -#~ "Loading native mipmaps is the more accurate behavior, but might also " -#~ "decrease performance (your mileage might vary though)." -#~ msgstr "" -#~ "ΦόÏτωση των native mipmap αντί για τη δημιουÏγία τους.\n" -#~ "Η φόÏτωση των native mipmap είναι η πιο ακÏιβής συμπεÏιφοÏά, αλλά μποÏεί " -#~ "και να μειώσει τις επιδόσεις (το αποτέλεσμα μποÏεί να διαφέÏει όμως)." - -#, fuzzy -#~ msgid "Lua Script Console" -#~ msgstr "ΕγγÏαφή στην Κονσόλα" - -#~ msgid "Metroid Other M" -#~ msgstr "Metroid Other M" - -#~ msgid "Mixer: Unsupported sample rate." -#~ msgstr "Mixer: Μη υποστηÏιζόμενος Ïυθμός δειγματοληψίας." - -#~ msgid "" -#~ "Modify textures to show the format they're using.\n" -#~ "This is only useful for debugging purposes." -#~ msgstr "" -#~ "ΜετατÏοπή των υφών ώστε να δείχνουν ποιο format χÏησιμοποιοÏν.\n" -#~ "Αυτό είναι χÏήσιμο μόνο για debugging." - -#, fuzzy -#~ msgid "New &Lua Console" -#~ msgstr "Εμφάνιση &Κονσόλας" - -#~ msgid "No audio output" -#~ msgstr "Δεν υπάÏχει έξοδος ήχου" - -#~ msgid "Normal" -#~ msgstr "Κανονική" - -#~ msgid "OK" -#~ msgstr "Εντάξει" - -#, fuzzy -#~ msgid "OpenAL" -#~ msgstr "Άνοιγμα" - -#, fuzzy -#~ msgid "OpenGL" -#~ msgstr "Άνοιγμα" - -#~ msgid "Plugins" -#~ msgstr "Plugins" - -#~ msgid "" -#~ "Portable Setting could not be saved\n" -#~ " Are you running Dolphin from read only media or from a directory that " -#~ "dolphin is not located in?" -#~ msgstr "" -#~ "Οι Ïυθμίσεις φοÏητότητας δεν μπόÏεσαν να αποθηκευτοÏν.\n" -#~ " Μήπως Ï„Ïέχετε το Dolphin από μονάδες πολυμέσων που είναι μόνο για " -#~ "ανάγνωση ή από φάκελο που δεν βÏίσκονται τα αÏχεία του Dolphin;" - -#, fuzzy -#~ msgid "Projection Stats" -#~ msgstr "Ρυθμίσεις ΠÏοσαÏμοζόμενου Projection Hack" - -#~ msgid "Pulse" -#~ msgstr "Pulse" - -#~ msgid "Relaunch Dolphin from the install directory and save from there" -#~ msgstr "" -#~ "Επανεκκινήστε το Dolphin από τον φάκελο εγκατάστασης και αποθηκεÏστε από " -#~ "εκεί" - -#, fuzzy -#~ msgid "Render to main window." -#~ msgstr "ΑναπαÏαγωγή στο ΚεντÏικό ΠαÏάθυÏο" - -#~ msgid "Rendering" -#~ msgstr "ΑναπαÏαγωγή" - -#~ msgid "Required for using the Japanese ROM font." -#~ msgstr "Απαιτείται για τη χÏήση της Ιαπωνικής γÏαμματοσειÏάς ROM." - -#, fuzzy -#~ msgid "Run" -#~ msgstr "Return" - -#~ msgid "Running script...\n" -#~ msgstr "Εκτέλεση script...\n" - -#~ msgid "Safe" -#~ msgstr "Ασφαλής" - -#~ msgid "Scale:" -#~ msgstr "Κλίμακα:" - -#~ msgid "Scaled EFB Copy" -#~ msgstr "EFB ΑντίγÏαφα σε Κλίμακα" - -#~ msgid "Select resolution for fullscreen mode" -#~ msgstr "Επιλέξτε ανάλυση για τη λειτουÏγία πλήÏης οθόνης" - -#~ msgid "" -#~ "Select the System Menu wad extracted from the update partition of a disc" -#~ msgstr "" -#~ "Επιλέξτε το wad ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ που θα εξήχθει από την κατάτμηση " -#~ "ενημέÏωσης του δίσκου" - -#, fuzzy -#~ msgid "Select the script to load" -#~ msgstr "Επιλέξτε το σημείο φόÏτωσης" - -#~ msgid "" -#~ "Selects which game should be affected by the configuration changes done " -#~ "in this dialog.\n" -#~ "The (Default) profile affects the standard settings used for every game." -#~ msgstr "" -#~ "Επιλέγει πιο παιχνίδι θα επηÏεαστεί από τις αλλαγές Ïυθμίσεων που " -#~ "γίνονται σε αυτό το παÏάθυÏο διαλόγου.\n" -#~ "Το (ΠÏοεπιλεγμένο) Ï€Ïοφίλ επηÏεάζει τις Ï€ÏοκαθοÏισμένες Ïυθμίσεις που " -#~ "χÏησιμοποιοÏνται για όλα τα παιχνίδια." - -#~ msgid "Set All to Default" -#~ msgstr "ΟÏισμός Όλων ως ΠÏοεπιλογή" - -#~ msgid "" -#~ "Set install location to:\n" -#~ " %s ?" -#~ msgstr "" -#~ "ΟÏισμός τοποθεσίας εγκατάστασης σε:\n" -#~ " %s ;" - -#~ msgid "" -#~ "Show projection statistics.\n" -#~ "This is only useful for debugging purposes." -#~ msgstr "" -#~ "Εμφάνιση στατιστικών projection.\n" -#~ "Αυτό είναι χÏήσιμο μόνο για debugging." - -#, fuzzy -#~ msgid "Show save banner" -#~ msgstr "Εμφάνιση αποθηκευμένου εικονιδίου" - -#~ msgid "Show the number of frames rendered per second." -#~ msgstr "Εμφάνιση του αÏÎ¹Î¸Î¼Î¿Ï Ï„Ï‰Î½ καÏέ ανά δευτεÏόλεπτο." - -#~ msgid "" -#~ "Show various statistics.\n" -#~ "This is only useful for debugging purposes." -#~ msgstr "" -#~ "Εμφάνιση διαφόÏων στατιστικών.\n" -#~ "Αυτό είναι χÏήσιμο μόνο για debugging." - -#~ msgid "Skies of Arcadia" -#~ msgstr "Skies of Arcadia" - -#~ 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" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "ΕλαφÏÏŽÏ‚ επιταχÏνει τα αντίγÏαφα EFB σε RAM θυσιάζοντας την ακÏίβεια της " -#~ "εξομοίωσης.\n" -#~ "ΟÏισμένες φοÏές επίσης βελτιώνει την οπτική ποιότητα.\n" -#~ "Αν αντιμετωπίζετε Ï€Ïοβλήματα, δοκιμάστε να αυξήσετε την ασφάλεια της " -#~ "cache υφών ή απενεÏγοποιήστε αυτήν την επιλογή.\n" -#~ "\n" -#~ "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." - -#, fuzzy -#~ msgid "Slot" -#~ msgstr "Θέση Α" - -#~ msgid "Sonic and the Black Knight" -#~ msgstr "Sonic and the Black Knight" - -#~ msgid "" -#~ "Specifies the resolution used to render at. A high resolution will " -#~ "improve visual quality but is also quite heavy on performance and might " -#~ "cause glitches in certain games.\n" -#~ "Fractional: Uses your display resolution directly instead of the native " -#~ "resolution. The quality scales with your display/window size, as does the " -#~ "performance impact.\n" -#~ "Integral: This is like Fractional, but rounds up to an integer multiple " -#~ "of the native resolution. Should give a more accurate look but is usually " -#~ "slower.\n" -#~ "The other options are fixed resolutions for choosing a visual quality " -#~ "independent of your display size." -#~ msgstr "" -#~ "ΟÏίζει την ανάλυση για την απεικόνιση. Μια υψηλή ανάλυση θα βελτιώσει την " -#~ "ποιότητα εικόνας αλλά απαιτεί μεγαλÏτεÏη Î¹ÏƒÏ‡Ï ÎºÎ±Î¹ μποÏεί να Ï€Ïοκαλέσει " -#~ "Ï€Ïοβλήματα σε διάφοÏα παιχνίδια.\n" -#~ "Κλασματική: ΧÏησιμοποιεί απευθείας την ανάλυση της οθόνης αντί για την " -#~ "native ανάλυση. Η ποιότητα αλλάζει με την ανάλυση της οθόνης/παÏαθÏÏου, " -#~ "όπως και η επίπτωση στις επιδόσεις.\n" -#~ "ΑκέÏαια: Αυτή είναι σαν την Κλασματική, αλλά στÏογγυλοποιεί σε ένα " -#~ "ακέÏαιο πολλαπλάσιο της native ανάλυσης. Δίνει μία πιο ακÏιβή απεικόνιση " -#~ "αλλά συνήθως είναι λίγο πιο αÏγή.\n" -#~ "Οι υπόλοιπες επιλογές είναι έτοιμες αναλÏσεις για την επιλογή της " -#~ "ποιότητας εικόνας ανεξάÏτητα από το μέγεθος της οθόνης/παÏαθÏÏου." - -#, fuzzy -#~ msgid "Specify an audio plugin" -#~ msgstr "Επιλέξτε ένα backend βίντεο" - -#~ msgid "Start Renderer in Fullscreen" -#~ msgstr "Εκκίνηση σε ΠλήÏη Οθόνη" - -#~ msgid "Start the rendering window in fullscreen mode." -#~ msgstr "Εκκίνηση της αναπαÏαγωγής σε λειτουÏγία πλήÏους οθόνης." - -#~ 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" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "Αποθήκευση των EFB ΑντιγÏαφών ως GPU αντικείμενα υφής.\n" -#~ "Αυτό δεν είναι τόσο ακÏιβές, αλλά δουλεÏει αÏκετά καλά για τα πεÏισσότεÏα " -#~ "παιχνίδια και βελτιώνει κατά Ï€Î¿Î»Ï Ï„Î·Î½ ταχÏτητα σε σχέση με EFB ΑντίγÏαφα " -#~ "σε RAM.\n" -#~ "\n" -#~ "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." - -#, fuzzy -#~ msgid "Texture" -#~ msgstr "Εξαγωγή Υφών" - -#, fuzzy -#~ msgid "Texture Cache" -#~ msgstr "ΚαθαÏισμός Cache" - -#~ msgid "The file " -#~ msgstr "Το αÏχείο " - -#~ msgid "" -#~ "The safer you adjust this, the less likely the emulator will be missing " -#~ "any texture updates from RAM.\n" -#~ "\n" -#~ "If unsure, use the second-fastest value from the right." -#~ msgstr "" -#~ "Όσο πιο ασφαλής είναι αυτή η ÏÏθμιση, τόσο πιο απίθανο είναι ο εξομοιωτής " -#~ "να χάσει ενημεÏώσεις των υφών από την RAM.\n" -#~ "\n" -#~ "Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την δεÏτεÏη-γÏηγοÏότεÏη τιμή από " -#~ "δεξιά." - -#~ msgid "This is usually used to play voice and sound effects." -#~ msgstr "ΧÏησιμοποιείται συνήθως για την αναπαÏαγωγή φωνής και ηχητικών εφέ." - -#, fuzzy -#~ msgid "Trying to load unsupported type %d" -#~ msgstr "ΠÏοσπάθεια φόÏτωσης ενός άγνωστου Ï„Ïπου αÏχείο." - -#~ msgid "Type %d config not supported in plugin %s" -#~ msgstr "Ο Ï„Ïπος ÏÏθμισης %d δεν υποστηÏίζεται στο plugin %s" - -#~ msgid "Use FPS For Limiting" -#~ msgstr "ΧÏήση FPS για τον πεÏιοÏισμό " - -#~ msgid "Use XFB" -#~ msgstr "ΧÏήση XFB" - -#~ msgid "Uses multiple threads to decode the textures in the game." -#~ msgstr "" -#~ "ΧÏησιμοποιεί πολλαπλά νήματα επεξεÏγασίας για αποκωδικοποίηση των υφών " -#~ "στο παιχνίδι." - -#~ msgid "" -#~ "Uses the high-resolution render buffer for EFB copies instead of scaling " -#~ "them down to native resolution.\n" -#~ "Vastly improves visual quality in games which use EFB copies but might " -#~ "cause glitches in some games." -#~ msgstr "" -#~ "ΧÏησιμοποιεί τον render buffer υψηλής ανάλυσης για τις αντιγÏαφές EFB " -#~ "αντί για αλλαγή μεγέθους στην native ανάλυση.\n" -#~ "Βελτιώνει σημαντικά την ποιότητα εικόνας στα παιχνίδια που χÏησιμοποιοÏν " -#~ "αντιγÏαφές EFB αλλά μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα σε μεÏικά παιχνίδια." - -#, fuzzy -#~ msgid "Video Backend:" -#~ msgstr "Backend Ήχου:" - -#~ msgid "" -#~ "Wait for vertical blanks.\n" -#~ "Reduces tearing but might also decrease performance" -#~ msgstr "" -#~ "Αναμονή της κάθετης ανανέωσης της οθόνης.\n" -#~ "Μειώνει τα σπάσίματα της εικόνας αλλά μποÏεί να μειώσει και τις επιδόσεις." - -#~ msgid "" -#~ "When using EFB to RAM we very often need to decode RAM data to a VRAM " -#~ "texture, which is a very time-consuming task.\n" -#~ "With this option enabled, we'll skip decoding a texture if it didn't " -#~ "change.\n" -#~ "This results in a nice speedup, but possibly causes glitches.\n" -#~ "If you have any problems with this option enabled you should either try " -#~ "increasing the safety of the texture cache or disable this option.\n" -#~ "(NOTE: The safer the texture cache is adjusted the lower the speedup will " -#~ "be; accurate texture cache set to \"safe\" might actually be slower!)" -#~ msgstr "" -#~ "Όταν χÏησιμοποιείται η αντιγÏαφή EFB στη RAM Ï€Î¿Î»Ï ÏƒÏ…Ï‡Î½Î¬ απαιτείται η " -#~ "αποκωδικοποίηση δεδομένων της RAM σε μια υφή της VRAM, που είναι μια Ï€Î¿Î»Ï " -#~ "χÏονοβόÏα διαδικασία.\n" -#~ "Με ενεÏγή αυτήν την επιλογή, δε θα χÏειαστεί να αποκωδικοποιήσουμε μια " -#~ "υφή αν αυτή δεν έχει αλλάξει.\n" -#~ "Αυτό έχει σαν αποτέλεσμα μια ωÏαία επιτάχυνση, αλλά πιθανότατα να " -#~ "δημιουÏγηθοÏν Ï€Ïοβλήματα.\n" -#~ "Εάν αντιμετωπίζετε Ï€Ïοβλήματα με ενεÏγή αυτήν την επιλογή θα Ï€Ïέπει είτε " -#~ "να δοκιμάστε να αυξήσετε την ασφάλεια της cache υφής ή να " -#~ "απενεÏγοποιήσετε αυτήν την επιλογή.\n" -#~ "(ΣΗΜΕΙΩΣΗ: Όσο μεγαλÏτεÏη ασφάλεια έχει η cache υφής, τόσο μικÏότεÏη θα " -#~ "είναι η επιτάχυνση. Η ακÏιβής cache υφής σε κατάσταση \"ασφαλής\" μποÏεί " -#~ "να είναι πιο αÏγή!) " - -#, fuzzy -#~ msgid "Wiimote %i %s" -#~ msgstr "Wiimote " - -#, fuzzy -#~ msgid "Wiimote Settings" -#~ msgstr "&Ρυθμίσεις Wiimote" - -#~ msgid "Will enable progressive scan option if supported by software." -#~ msgstr "" -#~ "Θα ενεÏγοποιήσει την Ï€Ïοοδευτική σάÏωση αν υποστηÏίζεται από το λογισμικό." - -#, fuzzy -#~ msgid "Window Size:" -#~ msgstr "Αυτόματα (Μέγεθος ΠαÏαθÏÏου)" - -#~ msgid "Window height for windowed mode" -#~ msgstr "Ύψος παÏαθÏÏου για παÏαθυÏική λειτουÏγία" - -#~ msgid "Window width for windowed mode" -#~ msgstr "Πλάτος παÏαθÏÏου για παÏαθυÏική λειτουÏγία" - -#~ msgid "XFB" -#~ msgstr "XFB" - -#~ msgid "Zelda Twilight Princess Bloom hack" -#~ msgstr "Zelda Twilight Princess Bloom hack" - -#, fuzzy -#~ msgid "audio_plugin" -#~ msgstr "Επιλέξτε ένα plugin ήχου" - -#, fuzzy -#~ msgid "batch" -#~ msgstr "Patches" - -#, fuzzy -#~ msgid "debugger" -#~ msgstr "Άνοιγμα του debugger" - -#, fuzzy -#~ msgid "video_plugin" -#~ msgstr "Επιλέξτε ένα plugin βίντεο" From 231c13d6cec11c1326ab21f567ab6a58a521043d Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sun, 4 Sep 2011 00:47:45 +0200 Subject: [PATCH 016/381] Added safe vertex shader UIDs for debugging purposes. --- .../Core/VideoCommon/Src/VertexShaderGen.cpp | 21 +++++++++++++++++++ Source/Core/VideoCommon/Src/VertexShaderGen.h | 21 ++++++++++++------- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp index 7a1d5eb555..d15cef0c70 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp @@ -69,6 +69,27 @@ void GetVertexShaderId(VERTEXSHADERUID *uid, u32 components) } } +void GetSafeVertexShaderId(VERTEXSHADERUIDSAFE *uid, u32 components) +{ + // Just store all used registers here without caring whether we need all bits or less. + u32* ptr = uid->values; + *ptr++ = components; + *ptr++ = xfregs.numTexGen.hex; + *ptr++ = xfregs.numChan.hex; + *ptr++ = xfregs.dualTexTrans.hex; + + for (int i = 0; i < 2; ++i) { + *ptr++ = xfregs.color[i].hex; + *ptr++ = xfregs.alpha[i].hex; + } + *ptr++ = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting; + for (unsigned int i = 0; i < 8; ++i) { + *ptr++ = xfregs.texMtxInfo[i].hex; + *ptr++ = xfregs.postMtxInfo[i].hex; + } + _assert_((ptr - uid->values) == uid->GetNumValues()); +} + static char text[16384]; #define WRITE p+=sprintf diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.h b/Source/Core/VideoCommon/Src/VertexShaderGen.h index d7bf362213..50e9c5fc3b 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderGen.h +++ b/Source/Core/VideoCommon/Src/VertexShaderGen.h @@ -48,17 +48,19 @@ #define C_DEPTHPARAMS (C_POSTTRANSFORMMATRICES + 64) #define C_VENVCONST_END (C_DEPTHPARAMS + 4) -class VERTEXSHADERUID +template +class _VERTEXSHADERUID { +#define NUM_VSUID_VALUES_SAFE 25 public: - u32 values[9]; + u32 values[safe ? NUM_VSUID_VALUES_SAFE : 9]; - VERTEXSHADERUID() + _VERTEXSHADERUID() { memset(values, 0, sizeof(values)); } - VERTEXSHADERUID(const VERTEXSHADERUID& r) + _VERTEXSHADERUID(const _VERTEXSHADERUID& r) { for (size_t i = 0; i < sizeof(values) / sizeof(u32); ++i) values[i] = r.values[i]; @@ -66,10 +68,11 @@ public: int GetNumValues() const { - return (((values[0] >> 23) & 0xf) * 3 + 3) / 4 + 3; // numTexGens*3/4+1 + if (safe) return NUM_VSUID_VALUES_SAFE; + else return (((values[0] >> 23) & 0xf) * 3 + 3) / 4 + 3; // numTexGens*3/4+1 } - bool operator <(const VERTEXSHADERUID& _Right) const + bool operator <(const _VERTEXSHADERUID& _Right) const { if (values[0] < _Right.values[0]) return true; @@ -86,7 +89,7 @@ public: return false; } - bool operator ==(const VERTEXSHADERUID& _Right) const + bool operator ==(const _VERTEXSHADERUID& _Right) const { if (values[0] != _Right.values[0]) return false; @@ -99,13 +102,15 @@ public: return true; } }; - +typedef _VERTEXSHADERUID VERTEXSHADERUID; +typedef _VERTEXSHADERUID VERTEXSHADERUIDSAFE; // components is included in the uid. char* GenerateVSOutputStruct(char* p, u32 components, API_TYPE api_type); const char *GenerateVertexShaderCode(u32 components, API_TYPE api_type); void GetVertexShaderId(VERTEXSHADERUID *uid, u32 components); +void GetSafeVertexShaderId(VERTEXSHADERUIDSAFE *uid, u32 components); extern VERTEXSHADERUID last_vertex_shader_uid; From 4702de591eb69e815398b21c5b4321b1ac133552 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sun, 4 Sep 2011 02:10:07 +0200 Subject: [PATCH 017/381] Added safe pixel shader UIDs for debugging purposes. --- .../Core/VideoCommon/Src/PixelShaderGen.cpp | 54 ++++++++++++++++--- Source/Core/VideoCommon/Src/PixelShaderGen.h | 24 +++++---- Source/Core/VideoCommon/Src/VertexShaderGen.h | 2 +- 3 files changed, 63 insertions(+), 17 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index ff82438305..9913ea7c5a 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -164,7 +164,7 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode) } 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] @@ -315,6 +315,46 @@ void _GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode) } +void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode) +{ + u32* ptr = uid->values; + *ptr++ = dstAlphaMode; + *ptr++ = bpmem.genMode.hex; + *ptr++ = bpmem.ztex2.hex; + *ptr++ = bpmem.zcontrol.hex; + *ptr++ = bpmem.zmode.hex; + *ptr++ = g_ActiveConfig.bEnablePerPixelDepth; + *ptr++ = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting; + *ptr++ = xfregs.numTexGen.hex; + + if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) + { + // TODO: Include register states for lighting shader + } + + for (unsigned int i = 0; i < 8; ++i) + *ptr++ = xfregs.texMtxInfo[i].hex; + + for (unsigned int i = 0; i < 16; ++i) + *ptr++ = bpmem.tevind[i].hex; + + *ptr++ = bpmem.tevindref.hex; + + for (int i = 0; i < bpmem.genMode.numtevstages+1; ++i) + { + // TODO ... + StageHash(i, ptr); + ptr += 4; // max: ptr = &uid->values[66] + } + + *ptr++ = bpmem.fog.c_proj_fsel.hex; + + *ptr++ = bpmem.fogRange.Base.hex; + + _assert_((ptr - uid->values) == uid->GetNumValues()); +} + + // old tev->pixelshader notes // // color for this stage (alpha, color) is given by bpmem.tevorders[0].colorchan0 @@ -539,8 +579,8 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType char *p = text; WRITE(p, "//Pixel Shader for TEV stages\n"); - WRITE(p, "//%i TEV stages, %i texgens, %i IND stages\n", - numStages, numTexgen, bpmem.genMode.numindstages); + WRITE(p, "//%i TEV stages, %i texgens, XXX IND stages\n", + numStages, numTexgen/*, bpmem.genMode.numindstages*/); int nIndirectStagesUsed = 0; if (bpmem.genMode.numindstages > 0) @@ -876,7 +916,7 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType) if (bHasIndStage) { - WRITE(p, "// indirect op\n", n); + WRITE(p, "// indirect op\n"); // perform the indirect op on the incoming regular coordinates using indtex%d as the offset coords if (bpmem.tevind[n].bs != ITBA_OFF) { @@ -1026,7 +1066,7 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType) WRITE(p, "cc2 = frac(c2 * (255.0f/256.0f)) * (256.0f/255.0f);\n"); - WRITE(p, "// color combine\n", n); + WRITE(p, "// color combine\n"); if (cc.clamp) WRITE(p, "%s = saturate(", tevCOutputTable[cc.dest]); else @@ -1073,7 +1113,7 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType) WRITE(p, ")"); WRITE(p,";\n"); - WRITE(p, "// alpha combine\n", n); + WRITE(p, "// alpha combine\n"); // combine the alpha channel if (ac.clamp) WRITE(p, "%s = saturate(", tevAOutputTable[ac.dest]); @@ -1119,7 +1159,7 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType) if (ac.clamp) WRITE(p, ")"); WRITE(p, ";\n\n"); - WRITE(p, "// TEV done\n", n); + WRITE(p, "// TEV done\n"); } void SampleTexture(char *&p, const char *destination, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h index 0ebdd0e42f..6ed39e7e74 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.h +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h @@ -45,36 +45,39 @@ #define C_PMATERIALS (C_PLIGHTS + 40) #define C_PENVCONST_END (C_PMATERIALS + 4) #define PIXELSHADERUID_MAX_VALUES 67 +#define PIXELSHADERUID_MAX_VALUES_SAFE 100 // DO NOT make anything in this class virtual. -class PIXELSHADERUID +template +class _PIXELSHADERUID { public: - u32 values[PIXELSHADERUID_MAX_VALUES]; + u32 values[safe ? PIXELSHADERUID_MAX_VALUES_SAFE : PIXELSHADERUID_MAX_VALUES]; u16 tevstages, indstages; - PIXELSHADERUID() + _PIXELSHADERUID() { - memset(values, 0, PIXELSHADERUID_MAX_VALUES * 4); + memset(values, 0, sizeof(values)); tevstages = indstages = 0; } - PIXELSHADERUID(const PIXELSHADERUID& r) + _PIXELSHADERUID(const _PIXELSHADERUID& r) { tevstages = r.tevstages; indstages = r.indstages; int N = GetNumValues(); - _assert_(N <= PIXELSHADERUID_MAX_VALUES); + _assert_(N <= GetNumValues()); for (int i = 0; i < N; ++i) values[i] = r.values[i]; } int GetNumValues() const { - return tevstages; + if (safe) return (sizeof(values) / sizeof(u32)); + else return tevstages; } - bool operator <(const PIXELSHADERUID& _Right) const + bool operator <(const _PIXELSHADERUID& _Right) const { if (values[0] < _Right.values[0]) return true; @@ -91,7 +94,7 @@ public: return false; } - bool operator ==(const PIXELSHADERUID& _Right) const + bool operator ==(const _PIXELSHADERUID& _Right) const { if (values[0] != _Right.values[0]) return false; @@ -104,6 +107,8 @@ public: return true; } }; +typedef _PIXELSHADERUID PIXELSHADERUID; +typedef _PIXELSHADERUID PIXELSHADERUIDSAFE; // Different ways to achieve rendering with destination alpha enum DSTALPHA_MODE @@ -115,6 +120,7 @@ enum DSTALPHA_MODE const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components); void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode); +void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode); extern PIXELSHADERUID last_pixel_shader_uid; diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.h b/Source/Core/VideoCommon/Src/VertexShaderGen.h index 50e9c5fc3b..1ab696acc2 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderGen.h +++ b/Source/Core/VideoCommon/Src/VertexShaderGen.h @@ -57,7 +57,7 @@ public: _VERTEXSHADERUID() { - memset(values, 0, sizeof(values)); + memset(values, 0, sizeof(values)); } _VERTEXSHADERUID(const _VERTEXSHADERUID& r) From 3939f9595a87393482df617465888f4ed46b6d94 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Wed, 7 Sep 2011 20:20:29 +0200 Subject: [PATCH 018/381] Add runtime checks to make sure we aren't overoptimizing the pixel shader cache. --- Source/Core/Common/Src/MsgHandler.cpp | 4 +- .../Core/VideoCommon/Src/PixelShaderGen.cpp | 49 ++++++++++--------- Source/Core/VideoCommon/Src/PixelShaderGen.h | 2 + .../Plugin_VideoOGL/Src/PixelShaderCache.cpp | 37 +++++++++++++- .../Plugin_VideoOGL/Src/PixelShaderCache.h | 2 + 5 files changed, 68 insertions(+), 26 deletions(-) diff --git a/Source/Core/Common/Src/MsgHandler.cpp b/Source/Core/Common/Src/MsgHandler.cpp index 3f68e1d29a..17c40d76f8 100644 --- a/Source/Core/Common/Src/MsgHandler.cpp +++ b/Source/Core/Common/Src/MsgHandler.cpp @@ -53,7 +53,7 @@ bool MsgAlert(bool yes_no, int Style, const char* format, ...) { // Read message and write it to the log std::string caption; - char buffer[2048]; + char buffer[4096]; static std::string info_caption; static std::string warn_caption; @@ -86,7 +86,7 @@ bool MsgAlert(bool yes_no, int Style, const char* format, ...) va_list args; va_start(args, format); - CharArrayFromFormatV(buffer, 2047, str_translator(format).c_str(), args); + CharArrayFromFormatV(buffer, sizeof(buffer)-1, str_translator(format).c_str(), args); va_end(args); ERROR_LOG(MASTER_LOG, "%s: %s", caption.c_str(), buffer); diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 9913ea7c5a..8bdfc3db28 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -172,13 +172,13 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode) if (alphaPreTest == 0 || alphaPreTest == 2) { - ptr[0] |= bpmem.fog.c_proj_fsel.fsel; // 3 + ptr[0] |= bpmem.fog.c_proj_fsel.fsel << 8; // 3 if (DepthTextureEnable) { - ptr[0] |= bpmem.ztex2.op << 3; // 2 - ptr[0] |= bpmem.zcontrol.zcomploc << 5; // 1 - ptr[0] |= bpmem.zmode.testenable << 6; // 1 - ptr[0] |= bpmem.zmode.updateenable << 7; // 1 + ptr[0] |= bpmem.ztex2.op << 11; // 2 + ptr[0] |= bpmem.zcontrol.zcomploc << 13; // 1 + ptr[0] |= bpmem.zmode.testenable << 14; // 1 + ptr[0] |= bpmem.zmode.updateenable << 15; // 1 } } @@ -186,8 +186,8 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode) { if (bpmem.fog.c_proj_fsel.fsel != 0) { - ptr[0] |= bpmem.fog.c_proj_fsel.proj << 8; // 1 - ptr[0] |= bpmem.fogRange.Base.Enabled << 9; // 1 + ptr[0] |= bpmem.fog.c_proj_fsel.proj << 16; // 1 + ptr[0] |= bpmem.fogRange.Base.Enabled << 17; // 1 } } uid->tevstages = (ptr+1) - uid->values; @@ -318,14 +318,14 @@ void _GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode) void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode) { u32* ptr = uid->values; - *ptr++ = dstAlphaMode; - *ptr++ = bpmem.genMode.hex; - *ptr++ = bpmem.ztex2.hex; - *ptr++ = bpmem.zcontrol.hex; - *ptr++ = bpmem.zmode.hex; - *ptr++ = g_ActiveConfig.bEnablePerPixelDepth; - *ptr++ = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting; - *ptr++ = xfregs.numTexGen.hex; + *ptr++ = dstAlphaMode; // 0 + *ptr++ = bpmem.genMode.hex; // 1 + *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 if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) { @@ -333,25 +333,28 @@ void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode) } for (unsigned int i = 0; i < 8; ++i) - *ptr++ = xfregs.texMtxInfo[i].hex; + *ptr++ = xfregs.texMtxInfo[i].hex; // 8-15 for (unsigned int i = 0; i < 16; ++i) - *ptr++ = bpmem.tevind[i].hex; + *ptr++ = bpmem.tevind[i].hex; // 16-31 - *ptr++ = bpmem.tevindref.hex; + *ptr++ = bpmem.tevindref.hex; // 32 - for (int i = 0; i < bpmem.genMode.numtevstages+1; ++i) + for (int i = 0; i < bpmem.genMode.numtevstages+1; ++i) // up to 16 times { // TODO ... StageHash(i, ptr); - ptr += 4; // max: ptr = &uid->values[66] + ptr += 4; // max: ptr = &uid->values[33+63] } - *ptr++ = bpmem.fog.c_proj_fsel.hex; + ptr = &uid->values[97]; - *ptr++ = bpmem.fogRange.Base.hex; + *ptr++ = bpmem.alphaFunc.hex; // 97 - _assert_((ptr - uid->values) == uid->GetNumValues()); + *ptr++ = bpmem.fog.c_proj_fsel.hex; // 98 + *ptr++ = bpmem.fogRange.Base.hex; // 99 + + _assert_((ptr - uid->values) <= uid->GetNumValues()); } diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h index 6ed39e7e74..c66635e12b 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.h +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h @@ -119,6 +119,8 @@ enum DSTALPHA_MODE }; const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components); + +// TODO: Wtf, those need components as well! -.- void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode); void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp index fb4c226f77..f0a640a114 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp @@ -184,12 +184,30 @@ void PixelShaderCache::Shutdown() FRAGMENTSHADER* PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) { PIXELSHADERUID uid; + PIXELSHADERUIDSAFE safe_uid; GetPixelShaderId(&uid, dstAlphaMode); + GetSafePixelShaderId(&safe_uid, dstAlphaMode); - // Check if the shader is already set + // Check if the shader is already set - TODO: Use pShaderLast instead of PixelShaders[uid]? if (uid == last_pixel_shader_uid && PixelShaders[uid].frameCount == frameCount) { GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true); + + if (!(safe_uid == PixelShaders[uid].safe_uid)) + { + std::string code(GeneratePixelShaderCode(dstAlphaMode, API_OPENGL, components)); + if (code != PixelShaders[uid].code) + { + char msg[4096]; + char* ptr = msg; + ptr += sprintf(ptr, "Mismatch!\nUnique IDs:\n"); + for (int i = 0; i < PixelShaders[uid].safe_uid.GetNumValues()/2; ++i) + ptr += sprintf(ptr, "%02d, %08X %08X | %08X %08X\n", 2*i, PixelShaders[uid].safe_uid.values[2*i], PixelShaders[uid].safe_uid.values[2*i+1], + safe_uid.values[2*i], safe_uid.values[2*i+1]); + PanicAlert(msg); + } + } + return pShaderLast; } @@ -207,14 +225,31 @@ FRAGMENTSHADER* PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 comp } GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true); + if (!(safe_uid == entry.safe_uid)) + { + std::string code(GeneratePixelShaderCode(dstAlphaMode, API_OPENGL, components)); + if (code != entry.code) + { + char msg[4096]; + char *ptr = msg; + ptr += sprintf(ptr, "Mismatch!\nUnique IDs:\n"); + for (int i = 0; i < entry.safe_uid.GetNumValues()/2; ++i) + ptr += sprintf(ptr, "%02d\t%08X %08X | %08X %08X\n", 2*i, entry.safe_uid.values[2*i], entry.safe_uid.values[2*i+1], + safe_uid.values[2*i], safe_uid.values[2*i+1]); + PanicAlert(msg); + } + } + return pShaderLast; } // Make an entry in the table PSCacheEntry& newentry = PixelShaders[uid]; newentry.frameCount = frameCount; + newentry.safe_uid = safe_uid; pShaderLast = &newentry.shader; const char *code = GeneratePixelShaderCode(dstAlphaMode, API_OPENGL, components); + newentry.code = code; #if defined(_DEBUG) || defined(DEBUGFAST) if (g_ActiveConfig.iLog & CONF_SAVESHADERS && code) { diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h index f404b206a2..63f71ddc13 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h @@ -56,6 +56,8 @@ class PixelShaderCache { shader.Destroy(); } + PIXELSHADERUIDSAFE safe_uid; + std::string code; }; typedef std::map PSCache; From 98b62d836290ff0ea46f73a6f6bdb0d3c91df923 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Wed, 7 Sep 2011 21:12:17 +0200 Subject: [PATCH 019/381] Track alpha blending paramaters in the pixel shader UID. --- Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 8bdfc3db28..46f139f105 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -170,6 +170,10 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode) 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 + if (alphaPreTest == 0 || alphaPreTest == 2) { ptr[0] |= bpmem.fog.c_proj_fsel.fsel << 8; // 3 From 6c7bda6851b39d358f9b951739156e07345ccfa4 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Thu, 8 Sep 2011 02:09:44 +0200 Subject: [PATCH 020/381] Various fixes and cleanups. --- Source/Core/Common/Src/LinearDiskCache.h | 6 +- .../Core/VideoCommon/Src/PixelShaderGen.cpp | 152 ++---------------- Source/Core/VideoCommon/Src/PixelShaderGen.h | 35 ++-- .../Plugin_VideoDX11/Src/PixelShaderCache.h | 5 +- .../Plugin_VideoDX11/Src/VertexShaderCache.h | 4 +- 5 files changed, 40 insertions(+), 162 deletions(-) diff --git a/Source/Core/Common/Src/LinearDiskCache.h b/Source/Core/Common/Src/LinearDiskCache.h index 7a124aaa7b..a2f758b416 100644 --- a/Source/Core/Common/Src/LinearDiskCache.h +++ b/Source/Core/Common/Src/LinearDiskCache.h @@ -21,12 +21,10 @@ #include "Common.h" #include -// Update this to the current SVN revision every time you change shader generation code. -// We don't automatically get this from SVN_REV because that would mean regenerating the -// shader cache for every revision, graphics-related or not, which is simply annoying. +// Increment this every time you change shader generation code. enum { - LINEAR_DISKCACHE_VER = 6964 + LINEAR_DISKCACHE_VER = 6965 }; // On disk format: diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 46f139f105..464c16fa58 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -100,14 +100,16 @@ static void StageHash(int stage, u32* out) } } +// Mash together all the inputs that contribute to the code of a generated pixel shader into +// a unique identifier, basically containing all the bits. Yup, it's a lot .... +// It would likely be a lot more efficient to build this incrementally as the attributes +// are set... void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode) { uid->values[0] |= bpmem.genMode.numtevstages; // 4 uid->values[0] |= bpmem.genMode.numtexgens << 4; // 4 uid->values[0] |= dstAlphaMode << 8; // 2 - uid->tevstages = bpmem.genMode.numtevstages; - bool DepthTextureEnable = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc && bpmem.zmode.testenable && bpmem.zmode.updateenable) || g_ActiveConfig.bEnablePerPixelDepth; uid->values[0] |= DepthTextureEnable << 10; // 1 @@ -124,7 +126,7 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode) { // Courtesy of PreAlphaTest, we're done already ;) // TODO: There's a comment including bpmem.genmode.numindstages.. shouldnt really bother about that though. - uid->tevstages = 1; + uid->num_values = 1; return; } @@ -141,8 +143,6 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode) uid->values[1] |= xfregs.texMtxInfo[i].projection << (i - 14); // 1 } - uid->indstages = bpmem.genMode.numindstages; - uid->values[1] = bpmem.genMode.numindstages << 2; // 3 u32 indirectStagesUsed = 0; for (unsigned int i = 0; i < bpmem.genMode.numindstages; ++i) @@ -194,129 +194,7 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode) ptr[0] |= bpmem.fogRange.Base.Enabled << 17; // 1 } } - uid->tevstages = (ptr+1) - uid->values; -} - -// Mash together all the inputs that contribute to the code of a generated pixel shader into -// a unique identifier, basically containing all the bits. Yup, it's a lot .... -// It would likely be a lot more efficient to build this incrementally as the attributes -// are set... -void _GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode) -{ - u32 numstages = bpmem.genMode.numtevstages + 1; - u32 projtexcoords = 0; - for (u32 i = 0; i < numstages; i++) - { - if (bpmem.tevorders[i/2].getEnable(i & 1)) - { - int texcoord = bpmem.tevorders[i / 2].getTexCoord(i & 1); - if (xfregs.texMtxInfo[i].projection) - projtexcoords |= 1 << texcoord; - } - } - uid->values[0] = (u32)bpmem.genMode.numtevstages | - ((u32)bpmem.genMode.numindstages << 4) | - ((u32)bpmem.genMode.numtexgens << 7) | - ((u32)dstAlphaMode << 11) | - ((u32)((bpmem.alphaFunc.hex >> 16) & 0xff) << 13) | - (projtexcoords << 21) | - ((u32)bpmem.ztex2.op << 29); - - // swap table - for (int i = 0; i < 8; i += 2) - ((u8*)&uid->values[1])[i / 2] = (bpmem.tevksel[i].hex & 0xf) | ((bpmem.tevksel[i + 1].hex & 0xf) << 4); - - u32 enableZTexture = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc && bpmem.zmode.testenable && bpmem.zmode.updateenable) || g_ActiveConfig.bEnablePerPixelDepth ? 1 : 0; - - uid->values[2] = (u32)bpmem.fog.c_proj_fsel.fsel | - ((u32)bpmem.fog.c_proj_fsel.proj << 3) | - ((u32)enableZTexture << 4) | ((u32)bpmem.fogRange.Base.Enabled << 5); - - if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) - { - for (int i = 0; i < 2; ++i) { - uid->values[3 + i] = xfregs.color[i].enablelighting ? - (u32)xfregs.color[i].hex : - (u32)xfregs.color[i].matsource; - uid->values[3 + i] |= (xfregs.alpha[i].enablelighting ? - (u32)xfregs.alpha[i].hex : - (u32)xfregs.alpha[i].matsource) << 15; - } - } - uid->values[4] |= (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) << 31; - - int hdr = 5; - u32 *pcurvalue = &uid->values[hdr]; - for (u32 i = 0; i < numstages; ++i) - { - TevStageCombiner::ColorCombiner &cc = bpmem.combiners[i].colorC; - TevStageCombiner::AlphaCombiner &ac = bpmem.combiners[i].alphaC; - - u32 val0 = cc.hex & 0xffffff; - u32 val1 = ac.hex & 0xffffff; - val0 |= bpmem.tevksel[i / 2].getKC(i & 1) << 24; - val1 |= bpmem.tevksel[i / 2].getKA(i & 1) << 24; - pcurvalue[0] = val0; - pcurvalue[1] = val1; - pcurvalue += 2; - } - - for (u32 i = 0; i < numstages / 2; ++i) - { - u32 val0, val1; - if (bpmem.tevorders[i].hex & 0x40) - val0 = bpmem.tevorders[i].hex & 0x3ff; - else - val0 = bpmem.tevorders[i].hex & 0x380; - if (bpmem.tevorders[i].hex & 0x40000) - val1 = (bpmem.tevorders[i].hex & 0x3ff000) >> 12; - else - val1 = (bpmem.tevorders[i].hex & 0x380000) >> 12; - - switch (i % 3) { - case 0: pcurvalue[0] = val0|(val1<<10); break; - case 1: pcurvalue[0] |= val0<<20; pcurvalue[1] = val1; pcurvalue++; break; - case 2: pcurvalue[1] |= (val0<<10)|(val1<<20); pcurvalue++; break; - default: PanicAlert("Unknown case for Tev Stages / 2: %08x", (i % 3)); - } - } - - if (numstages & 1) { // odd - u32 val0; - if (bpmem.tevorders[bpmem.genMode.numtevstages/2].hex & 0x40) - val0 = bpmem.tevorders[bpmem.genMode.numtevstages/2].hex & 0x3ff; - else - val0 = bpmem.tevorders[bpmem.genMode.numtevstages/2].hex & 0x380; - - switch (bpmem.genMode.numtevstages % 3) - { - case 0: pcurvalue[0] = val0; break; - case 1: pcurvalue[0] |= val0 << 20; break; - case 2: pcurvalue[1] |= val0 << 10; pcurvalue++; break; - default: PanicAlert("Unknown case for Tev Stages: %08x", bpmem.genMode.numtevstages % 3); - } - } - - if ((bpmem.genMode.numtevstages % 3) != 2) - ++pcurvalue; - - uid->tevstages = (u32)(pcurvalue - &uid->values[0] - hdr); - - for (u32 i = 0; i < bpmem.genMode.numindstages; ++i) - { - u32 val = bpmem.tevind[i].hex & 0x1fffff; // 21 bits - switch (i % 3) - { - case 0: pcurvalue[0] = val; break; - case 1: pcurvalue[0] |= val << 21; pcurvalue[1] = val >> 11; ++pcurvalue; break; - case 2: pcurvalue[0] |= val << 10; ++pcurvalue; break; - default: PanicAlert("Unknown case for Ind Stages: %08x", (i % 3)); - } - } - - // yeah, well .... - uid->indstages = (u32)(pcurvalue - &uid->values[0] - (hdr - 1) - uid->tevstages); - + uid->num_values = (ptr+1) - uid->values; } void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode) @@ -346,19 +224,21 @@ void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode) for (int i = 0; i < bpmem.genMode.numtevstages+1; ++i) // up to 16 times { - // TODO ... - StageHash(i, ptr); - ptr += 4; // max: ptr = &uid->values[33+63] + *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 = &uid->values[97]; + ptr = &uid->values[113]; - *ptr++ = bpmem.alphaFunc.hex; // 97 + *ptr++ = bpmem.alphaFunc.hex; // 113 - *ptr++ = bpmem.fog.c_proj_fsel.hex; // 98 - *ptr++ = bpmem.fogRange.Base.hex; // 99 + *ptr++ = bpmem.fog.c_proj_fsel.hex; // 114 + *ptr++ = bpmem.fogRange.Base.hex; // 115 - _assert_((ptr - uid->values) <= uid->GetNumValues()); + _assert_((ptr - uid->values) == uid->GetNumValues()); } diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h index c66635e12b..d20f43c711 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 67 -#define PIXELSHADERUID_MAX_VALUES_SAFE 100 +#define PIXELSHADERUID_MAX_VALUES_SAFE 115 // DO NOT make anything in this class virtual. template @@ -53,38 +53,37 @@ class _PIXELSHADERUID { public: u32 values[safe ? PIXELSHADERUID_MAX_VALUES_SAFE : PIXELSHADERUID_MAX_VALUES]; - u16 tevstages, indstages; + u16 num_values; _PIXELSHADERUID() { memset(values, 0, sizeof(values)); - tevstages = indstages = 0; + + if (safe) num_values = sizeof(values) / sizeof(values[0]); + else num_values = 0; } _PIXELSHADERUID(const _PIXELSHADERUID& r) { - tevstages = r.tevstages; - indstages = r.indstages; - int N = GetNumValues(); - _assert_(N <= GetNumValues()); - for (int i = 0; i < N; ++i) - values[i] = r.values[i]; + num_values = r.num_values; + if (safe) memcpy(values, r.values, PIXELSHADERUID_MAX_VALUES_SAFE); + else memcpy(values, r.values, r.GetNumValues() * sizeof(values[0])); } int GetNumValues() const { if (safe) return (sizeof(values) / sizeof(u32)); - else return tevstages; + else return num_values; } bool operator <(const _PIXELSHADERUID& _Right) const { - if (values[0] < _Right.values[0]) - return true; - else if (values[0] > _Right.values[0]) - return false; int N = GetNumValues(); - for (int i = 1; i < N; ++i) + if (N < _Right.GetNumValues()) + return true; + else if (N > _Right.GetNumValues()) + return false; + for (int i = 0; i < N; ++i) { if (values[i] < _Right.values[i]) return true; @@ -96,10 +95,10 @@ public: bool operator ==(const _PIXELSHADERUID& _Right) const { - if (values[0] != _Right.values[0]) - return false; int N = GetNumValues(); - for (int i = 1; i < N; ++i) + if (N != _Right.GetNumValues()) + return false; + for (int i = 0; i < N; ++i) { if (values[i] != _Right.values[i]) return false; diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h index 046f551657..3b9c537a7a 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h +++ b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h @@ -17,11 +17,12 @@ #pragma once -#include +#include "PixelShaderGen.h" #include -class PIXELSHADERUID; +#include + enum DSTALPHA_MODE; namespace DX11 diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h index 3c7dadd3e7..24be4e6c1c 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h +++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h @@ -18,12 +18,12 @@ #ifndef _VERTEXSHADERCACHE_H #define _VERTEXSHADERCACHE_H -#include +#include "VertexShaderGen.h" #include "D3DBase.h" #include "D3DBlob.h" -class VERTEXSHADERUID; +#include namespace DX11 { From 1c85be8625b343c6301a0241d83beee33c1c470e Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Thu, 8 Sep 2011 15:39:03 +0200 Subject: [PATCH 021/381] Implement frame dumping in D3D11. Fixes issue 4831. --- Source/Core/VideoCommon/Src/RenderBase.cpp | 2 +- Source/Core/VideoCommon/Src/RenderBase.h | 2 +- .../Plugins/Plugin_VideoDX11/Src/Render.cpp | 115 ++++++++++++++++-- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 28 +++-- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 18 +-- 5 files changed, 133 insertions(+), 32 deletions(-) diff --git a/Source/Core/VideoCommon/Src/RenderBase.cpp b/Source/Core/VideoCommon/Src/RenderBase.cpp index d89e582860..06f4c81ab6 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.cpp +++ b/Source/Core/VideoCommon/Src/RenderBase.cpp @@ -52,7 +52,7 @@ int OSDChoice, OSDTime; Renderer *g_renderer = NULL; -bool s_bLastFrameDumped = false; +bool bLastFrameDumped = false; std::mutex Renderer::s_criticalScreenshot; std::string Renderer::s_sScreenshotName; diff --git a/Source/Core/VideoCommon/Src/RenderBase.h b/Source/Core/VideoCommon/Src/RenderBase.h index b2c2c7ecfb..48f096851f 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.h +++ b/Source/Core/VideoCommon/Src/RenderBase.h @@ -41,7 +41,7 @@ extern int frameCount; extern int OSDChoice, OSDTime; -extern bool s_bLastFrameDumped; +extern bool bLastFrameDumped; // Renderer really isn't a very good name for this class - it's more like "Misc". // The long term goal is to get rid of this class and replace it with others that make diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index bbf2a966dd..368fec357c 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -43,6 +43,7 @@ #include "Television.h" #include "Host.h" #include "BPFunctions.h" +#include "AVIDump.h" namespace DX11 { @@ -62,6 +63,10 @@ ID3D11BlendState* resetblendstate = NULL; ID3D11DepthStencilState* resetdepthstate = NULL; ID3D11RasterizerState* resetraststate = NULL; +static ID3D11Texture2D* s_screenshot_texture = NULL; +static bool s_bAVIDumping; +static char *s_frame_data = NULL; + // GX pipeline state struct { @@ -296,9 +301,14 @@ void SetupDeviceObjects() hr = D3D::device->CreateRasterizerState(&rastdesc, &resetraststate); CHECK(hr==S_OK, "Create rasterizer state for Renderer::ResetAPIState"); D3D::SetDebugObjectName((ID3D11DeviceChild*)resetraststate, "rasterizer state for Renderer::ResetAPIState"); + + D3D11_TEXTURE2D_DESC scrtex_desc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, D3D::GetBackBufferWidth(), D3D::GetBackBufferHeight(), 1, 1, 0, D3D11_USAGE_STAGING, D3D11_CPU_ACCESS_READ|D3D11_CPU_ACCESS_WRITE); + hr = D3D::device->CreateTexture2D(&scrtex_desc, NULL, &s_screenshot_texture); + CHECK(hr==S_OK, "Create screenshot staging texture"); + D3D::SetDebugObjectName((ID3D11DeviceChild*)s_screenshot_texture, "staging screenshot texture"); } -// Kill off all POOL_DEFAULT device objects. +// Kill off all device objects void TeardownDeviceObjects() { delete g_framebuffer_manager; @@ -314,6 +324,7 @@ void TeardownDeviceObjects() SAFE_RELEASE(resetblendstate); SAFE_RELEASE(resetdepthstate); SAFE_RELEASE(resetraststate); + SAFE_RELEASE(s_screenshot_texture); s_television.Shutdown(); } @@ -344,6 +355,10 @@ Renderer::Renderer() SetupDeviceObjects(); + bLastFrameDumped = false; + s_bAVIDumping = false; + + // Setup GX pipeline state memset(&gx_state.blenddc, 0, sizeof(gx_state.blenddc)); gx_state.blenddc.AlphaToCoverageEnable = FALSE; @@ -391,6 +406,15 @@ Renderer::Renderer() Renderer::~Renderer() { + if (g_ActiveConfig.bDumpFrames && bLastFrameDumped && s_bAVIDumping) + { + SAFE_DELETE_ARRAY(s_frame_data); + + AVIDump::Stop(); + s_bAVIDumping = false; + bLastFrameDumped = false; + } + TeardownDeviceObjects(); D3D::EndFrame(); D3D::Present(); @@ -835,15 +859,11 @@ void Renderer::SetBlendMode(bool forceUpdate) bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle &rc) { // copy back buffer to system memory - ID3D11Texture2D* buftex; - D3D11_TEXTURE2D_DESC tex_desc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, D3D::GetBackBufferWidth(), D3D::GetBackBufferHeight(), 1, 1, 0, D3D11_USAGE_STAGING, D3D11_CPU_ACCESS_READ|D3D11_CPU_ACCESS_WRITE); - HRESULT hr = D3D::device->CreateTexture2D(&tex_desc, NULL, &buftex); - if (FAILED(hr)) PanicAlert("Failed to create screenshot buffer texture"); - D3D::context->CopyResource(buftex, (ID3D11Resource*)D3D::GetBackBuffer()->GetTex()); + D3D::context->CopyResource(s_screenshot_texture, (ID3D11Resource*)D3D::GetBackBuffer()->GetTex()); // D3DX11SaveTextureToFileA doesn't allow us to ignore the alpha channel, so we need to strip it out ourselves D3D11_MAPPED_SUBRESOURCE map; - D3D::context->Map(buftex, 0, D3D11_MAP_READ_WRITE, 0, &map); + D3D::context->Map(s_screenshot_texture, 0, D3D11_MAP_READ_WRITE, 0, &map); for (unsigned int y = 0; y < D3D::GetBackBufferHeight(); ++y) { u8* ptr = (u8*)map.pData + y * map.RowPitch + 3; @@ -853,21 +873,36 @@ bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle ptr += 4; } } - D3D::context->Unmap(buftex, 0); + D3D::context->Unmap(s_screenshot_texture, 0); // ready to be saved - hr = PD3DX11SaveTextureToFileA(D3D::context, buftex, D3DX11_IFF_PNG, filename.c_str()); - buftex->Release(); + HRESULT hr = PD3DX11SaveTextureToFileA(D3D::context, s_screenshot_texture, D3DX11_IFF_PNG, filename.c_str()); return SUCCEEDED(hr); } +void formatBufferDump(const char *in, char *out, int w, int h, int p) +{ + for (int y = 0; y < h; ++y) + { + const u32 *line = (u32*)(in + (h - y - 1) * p); + for (int x = 0; x < w; ++x) + { + memcpy(out, line, 3); + out += 3; + line += 4; + } + } +} // 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_ActiveConfig.bDumpFrames) + AVIDump::AddFrame(s_frame_data); + Core::Callback_VideoCopiedToXFB(false); return; } @@ -879,6 +914,9 @@ 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) + AVIDump::AddFrame(s_frame_data); + Core::Callback_VideoCopiedToXFB(false); return; } @@ -984,6 +1022,63 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons s_bScreenshot = false; } + // Dump frames + static int w = 0, h = 0; + if (g_ActiveConfig.bDumpFrames) + { + static int s_recordWidth; + static int s_recordHeight; + + D3D::context->CopyResource(s_screenshot_texture, (ID3D11Resource*)D3D::GetBackBuffer()->GetTex()); + if (!bLastFrameDumped) + { + s_recordWidth = dst_rect.GetWidth(); + s_recordHeight = dst_rect.GetHeight(); + s_bAVIDumping = AVIDump::Start(EmuWindow::GetParentWnd(), s_recordWidth, s_recordHeight); + if (!s_bAVIDumping) + { + PanicAlert("Error dumping frames to AVI."); + } + else + { + char msg [255]; + sprintf_s(msg,255, "Dumping Frames to \"%sframedump0.avi\" (%dx%d RGB24)", + File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), s_recordWidth, s_recordHeight); + OSD::AddMessage(msg, 2000); + } + } + if (s_bAVIDumping) + { + D3D11_MAPPED_SUBRESOURCE map; + D3D::context->Map(s_screenshot_texture, 0, D3D11_MAP_READ, 0, &map); + + if (!s_frame_data || w != s_recordWidth || h != s_recordHeight) + { + delete[] s_frame_data; + s_frame_data = new char[3 * s_recordWidth * s_recordHeight]; + w = s_recordWidth; + h = s_recordHeight; + } + formatBufferDump((char*)map.pData, s_frame_data, s_recordWidth, s_recordHeight, map.RowPitch); + AVIDump::AddFrame(s_frame_data); + D3D::context->Unmap(s_screenshot_texture, 0); + } + bLastFrameDumped = true; + } + else + { + if (bLastFrameDumped && s_bAVIDumping) + { + SAFE_DELETE_ARRAY(s_frame_data); + w = h = 0; + + AVIDump::Stop(); + s_bAVIDumping = false; + OSD::AddMessage("Stop dumping frames to AVI", 2000); + } + bLastFrameDumped = false; + } + // Finish up the current frame, print some stats if (g_ActiveConfig.bShowFPS) { diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index 15b592e800..e7177be396 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -60,12 +60,6 @@ namespace DX9 static int s_fps = 0; -static int s_recordWidth; -static int s_recordHeight; - -static bool s_bLastFrameDumped; -static bool s_bAVIDumping; - static u32 s_blendMode; static u32 s_LastAA; static bool IS_AMD; @@ -73,6 +67,7 @@ static bool IS_AMD; static char *st; static LPDIRECT3DSURFACE9 ScreenShootMEMSurface = NULL; +static bool s_bAVIDumping; // State translation lookup tables @@ -297,7 +292,7 @@ Renderer::Renderer() // Make sure to use valid texture sizes D3D::FixTextureSize(s_target_width, s_target_height); - s_bLastFrameDumped = false; + bLastFrameDumped = false; s_bAVIDumping = false; // We're not using fixed function. @@ -845,11 +840,11 @@ bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,const EFBRectangle& rc,float Gamma) { static char* data = 0; - static int w = 0, h = 0; if (g_bSkipCurrentFrame || (!XFBWrited && (!g_ActiveConfig.bUseXFB || !g_ActiveConfig.bUseRealXFB)) || !fbWidth || !fbHeight) { if (g_ActiveConfig.bDumpFrames && data) AVIDump::AddFrame(data); + Core::Callback_VideoCopiedToXFB(false); return; } @@ -862,6 +857,9 @@ 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 && data) + AVIDump::AddFrame(data); + Core::Callback_VideoCopiedToXFB(false); return; } @@ -1027,10 +1025,16 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons SaveScreenshot(s_sScreenshotName, dst_rect); s_bScreenshot = false; } + + // Dump frames + static int w = 0, h = 0; if (g_ActiveConfig.bDumpFrames) { + static int s_recordWidth; + static int s_recordHeight; + HRESULT hr = D3D::dev->GetRenderTargetData(D3D::GetBackBufferSurface(),ScreenShootMEMSurface); - if (!s_bLastFrameDumped) + if (!bLastFrameDumped) { s_recordWidth = dst_rect.GetWidth(); s_recordHeight = dst_rect.GetHeight(); @@ -1064,11 +1068,11 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons ScreenShootMEMSurface->UnlockRect(); } } - s_bLastFrameDumped = true; + bLastFrameDumped = true; } else { - if (s_bLastFrameDumped && s_bAVIDumping) + if (bLastFrameDumped && s_bAVIDumping) { if (data) { @@ -1080,7 +1084,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons s_bAVIDumping = false; OSD::AddMessage("Stop dumping frames to AVI", 2000); } - s_bLastFrameDumped = false; + bLastFrameDumped = false; } // Finish up the current frame, print some stats diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index ca3280673e..8b2d08eecc 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -521,7 +521,7 @@ Renderer::~Renderer() if(s_bAVIDumping) { AVIDump::Stop(); - s_bLastFrameDumped = false; + bLastFrameDumped = false; s_bAVIDumping = false; } #else @@ -970,11 +970,13 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons if ((!xfbSourceList || xfbCount == 0) && g_ActiveConfig.bUseXFB && !g_ActiveConfig.bUseRealXFB) { if (g_ActiveConfig.bDumpFrames && data) - #ifdef _WIN32 + { +#ifdef _WIN32 AVIDump::AddFrame((char *) data); - #elif defined HAVE_LIBAV +#elif defined HAVE_LIBAV AVIDump::AddFrame(data, w, h); - #endif +#endif + } Core::Callback_VideoCopiedToXFB(false); return; } @@ -1145,7 +1147,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons glReadPixels(dst_rect.left, dst_rect.bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, data); if (GL_REPORT_ERROR() == GL_NO_ERROR && w > 0 && h > 0) { - if (!s_bLastFrameDumped) + if (!bLastFrameDumped) { #ifdef _WIN32 s_bAVIDumping = AVIDump::Start(EmuWindow::GetParentWnd(), w, h); @@ -1171,14 +1173,14 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons #endif } - s_bLastFrameDumped = true; + bLastFrameDumped = true; } else NOTICE_LOG(VIDEO, "Error reading framebuffer"); } else { - if (s_bLastFrameDumped && s_bAVIDumping) + if (bLastFrameDumped && s_bAVIDumping) { if (data) { @@ -1190,7 +1192,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons s_bAVIDumping = false; OSD::AddMessage("Stop dumping frames", 2000); } - s_bLastFrameDumped = false; + bLastFrameDumped = false; } #else if (g_ActiveConfig.bDumpFrames) From 5eb1e55f80a5c49270a7c7a5dfd625216a13abe2 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Thu, 8 Sep 2011 17:09:24 +0200 Subject: [PATCH 022/381] Merge some frame dumping code to VideoCommon, fixes a memory leak in D3D9 and OpenGL if emulation is stopped while dumping frames. Breaks D3D11 frame dumping for some weird reason (memory corruption or whatever?). --- Source/Core/VideoCommon/Src/RenderBase.cpp | 17 +++- Source/Core/VideoCommon/Src/RenderBase.h | 13 ++- .../Plugins/Plugin_VideoDX11/Src/Render.cpp | 44 +++------ Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 43 ++++----- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 95 +++++++------------ 5 files changed, 93 insertions(+), 119 deletions(-) diff --git a/Source/Core/VideoCommon/Src/RenderBase.cpp b/Source/Core/VideoCommon/Src/RenderBase.cpp index 06f4c81ab6..fa6ba018c7 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.cpp +++ b/Source/Core/VideoCommon/Src/RenderBase.cpp @@ -42,6 +42,7 @@ #include "Host.h" #include "XFMemory.h" #include "FifoPlayer/FifoRecorder.h" +#include "AVIDump.h" #include #include @@ -52,7 +53,6 @@ int OSDChoice, OSDTime; Renderer *g_renderer = NULL; -bool bLastFrameDumped = false; std::mutex Renderer::s_criticalScreenshot; std::string Renderer::s_sScreenshotName; @@ -81,15 +81,28 @@ bool Renderer::s_EnableDLCachingAfterRecording; unsigned int Renderer::prev_efb_format = (unsigned int)-1; -Renderer::Renderer() +Renderer::Renderer() : frame_data(NULL), bLastFrameDumped(false) { UpdateActiveConfig(); + +#if defined _WIN32 || defined HAVE_LIBAV + bAVIDumping = false; +#endif } Renderer::~Renderer() { // invalidate previous efb format prev_efb_format = (unsigned int)-1; + +#if defined _WIN32 || defined HAVE_LIBAV + if (g_ActiveConfig.bDumpFrames && bLastFrameDumped && bAVIDumping) + AVIDump::Stop(); +#else + if (f_pFrameDump.IsOpen()) + f_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 48f096851f..e8d4c55a20 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.h +++ b/Source/Core/VideoCommon/Src/RenderBase.h @@ -132,9 +132,6 @@ public: protected: - static std::mutex s_criticalScreenshot; - static std::string s_sScreenshotName; - static void CalculateTargetScale(int x, int y, int &scaledX, int &scaledY); static bool CalculateTargetSize(int multiplier = 1); static void CalculateXYScale(const TargetRectangle& dst_rect); @@ -143,6 +140,16 @@ protected: static void RecordVideoMemory(); static volatile bool s_bScreenshot; + static std::mutex s_criticalScreenshot; + static std::string s_sScreenshotName; + +#if defined _WIN32 || defined HAVE_LIBAV + bool bAVIDumping; +#else + File::IOFile pFrameDump; +#endif + char* frame_data; + bool bLastFrameDumped; // The framebuffer size static int s_target_width; diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index 368fec357c..9de763bf37 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -64,8 +64,6 @@ ID3D11DepthStencilState* resetdepthstate = NULL; ID3D11RasterizerState* resetraststate = NULL; static ID3D11Texture2D* s_screenshot_texture = NULL; -static bool s_bAVIDumping; -static char *s_frame_data = NULL; // GX pipeline state struct @@ -355,9 +353,6 @@ Renderer::Renderer() SetupDeviceObjects(); - bLastFrameDumped = false; - s_bAVIDumping = false; - // Setup GX pipeline state memset(&gx_state.blenddc, 0, sizeof(gx_state.blenddc)); @@ -406,15 +401,6 @@ Renderer::Renderer() Renderer::~Renderer() { - if (g_ActiveConfig.bDumpFrames && bLastFrameDumped && s_bAVIDumping) - { - SAFE_DELETE_ARRAY(s_frame_data); - - AVIDump::Stop(); - s_bAVIDumping = false; - bLastFrameDumped = false; - } - TeardownDeviceObjects(); D3D::EndFrame(); D3D::Present(); @@ -900,8 +886,8 @@ 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) - AVIDump::AddFrame(s_frame_data); + if (g_ActiveConfig.bDumpFrames && frame_data) + AVIDump::AddFrame(frame_data); Core::Callback_VideoCopiedToXFB(false); return; @@ -914,8 +900,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) - AVIDump::AddFrame(s_frame_data); + if (g_ActiveConfig.bDumpFrames && frame_data) + AVIDump::AddFrame(frame_data); Core::Callback_VideoCopiedToXFB(false); return; @@ -1034,8 +1020,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons { s_recordWidth = dst_rect.GetWidth(); s_recordHeight = dst_rect.GetHeight(); - s_bAVIDumping = AVIDump::Start(EmuWindow::GetParentWnd(), s_recordWidth, s_recordHeight); - if (!s_bAVIDumping) + bAVIDumping = AVIDump::Start(EmuWindow::GetParentWnd(), s_recordWidth, s_recordHeight); + if (!bAVIDumping) { PanicAlert("Error dumping frames to AVI."); } @@ -1047,33 +1033,33 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons OSD::AddMessage(msg, 2000); } } - if (s_bAVIDumping) + if (bAVIDumping) { D3D11_MAPPED_SUBRESOURCE map; D3D::context->Map(s_screenshot_texture, 0, D3D11_MAP_READ, 0, &map); - if (!s_frame_data || w != s_recordWidth || h != s_recordHeight) + if (!frame_data || w != s_recordWidth || h != s_recordHeight) { - delete[] s_frame_data; - s_frame_data = new char[3 * s_recordWidth * s_recordHeight]; + delete[] frame_data; + frame_data = new char[3 * s_recordWidth * s_recordHeight]; w = s_recordWidth; h = s_recordHeight; } - formatBufferDump((char*)map.pData, s_frame_data, s_recordWidth, s_recordHeight, map.RowPitch); - AVIDump::AddFrame(s_frame_data); + formatBufferDump((char*)map.pData, frame_data, s_recordWidth, s_recordHeight, map.RowPitch); + AVIDump::AddFrame(frame_data); D3D::context->Unmap(s_screenshot_texture, 0); } bLastFrameDumped = true; } else { - if (bLastFrameDumped && s_bAVIDumping) + if (bLastFrameDumped && bAVIDumping) { - SAFE_DELETE_ARRAY(s_frame_data); + SAFE_DELETE_ARRAY(frame_data); w = h = 0; AVIDump::Stop(); - s_bAVIDumping = false; + bAVIDumping = false; OSD::AddMessage("Stop dumping frames to AVI", 2000); } bLastFrameDumped = false; diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index e7177be396..93b37e211a 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -67,7 +67,6 @@ static bool IS_AMD; static char *st; static LPDIRECT3DSURFACE9 ScreenShootMEMSurface = NULL; -static bool s_bAVIDumping; // State translation lookup tables @@ -292,9 +291,6 @@ Renderer::Renderer() // Make sure to use valid texture sizes D3D::FixTextureSize(s_target_width, s_target_height); - bLastFrameDumped = false; - s_bAVIDumping = false; - // We're not using fixed function. // Let's just set the matrices to identity to be sure. D3DXMATRIX mtx; @@ -337,10 +333,6 @@ Renderer::~Renderer() D3D::Present(); D3D::Close(); - if (s_bAVIDumping) - { - AVIDump::Stop(); - } delete[] st; } @@ -839,11 +831,10 @@ 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) { - static char* data = 0; if (g_bSkipCurrentFrame || (!XFBWrited && (!g_ActiveConfig.bUseXFB || !g_ActiveConfig.bUseRealXFB)) || !fbWidth || !fbHeight) { - if (g_ActiveConfig.bDumpFrames && data) - AVIDump::AddFrame(data); + if (g_ActiveConfig.bDumpFrames && frame_data) + AVIDump::AddFrame(frame_data); Core::Callback_VideoCopiedToXFB(false); return; @@ -857,8 +848,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 && data) - AVIDump::AddFrame(data); + if (g_ActiveConfig.bDumpFrames && frame_data) + AVIDump::AddFrame(frame_data); Core::Callback_VideoCopiedToXFB(false); return; @@ -1038,8 +1029,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons { s_recordWidth = dst_rect.GetWidth(); s_recordHeight = dst_rect.GetHeight(); - s_bAVIDumping = AVIDump::Start(EmuWindow::GetParentWnd(), s_recordWidth, s_recordHeight); - if (!s_bAVIDumping) + bAVIDumping = AVIDump::Start(EmuWindow::GetParentWnd(), s_recordWidth, s_recordHeight); + if (!bAVIDumping) { PanicAlert("Error dumping frames to AVI."); } @@ -1051,20 +1042,20 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons OSD::AddMessage(msg, 2000); } } - if (s_bAVIDumping) + if (bAVIDumping) { D3DLOCKED_RECT rect; if (SUCCEEDED(ScreenShootMEMSurface->LockRect(&rect, dst_rect.AsRECT(), D3DLOCK_NO_DIRTY_UPDATE | D3DLOCK_NOSYSLOCK | D3DLOCK_READONLY))) { - if (!data || w != s_recordWidth || h != s_recordHeight) + if (!frame_data || w != s_recordWidth || h != s_recordHeight) { - free(data); - data = (char*)malloc(3 * s_recordWidth * s_recordHeight); + delete[] frame_data; + frame_data = new char[3 * s_recordWidth * s_recordHeight]; w = s_recordWidth; h = s_recordHeight; } - formatBufferDump((const char*)rect.pBits, data, s_recordWidth, s_recordHeight, rect.Pitch); - AVIDump::AddFrame(data); + formatBufferDump((const char*)rect.pBits, frame_data, s_recordWidth, s_recordHeight, rect.Pitch); + AVIDump::AddFrame(frame_data); ScreenShootMEMSurface->UnlockRect(); } } @@ -1072,16 +1063,16 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons } else { - if (bLastFrameDumped && s_bAVIDumping) + if (bLastFrameDumped && bAVIDumping) { - if (data) + if (frame_data) { - free(data); - data = 0; + delete[] frame_data; + frame_data = 0; w = h = 0; } AVIDump::Stop(); - s_bAVIDumping = false; + bAVIDumping = false; OSD::AddMessage("Stop dumping frames to AVI", 2000); } bLastFrameDumped = false; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 8b2d08eecc..415d1986b3 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -110,12 +110,6 @@ int s_fps=0; RasterFont* s_pfont = NULL; -#if defined _WIN32 || defined HAVE_LIBAV -static bool s_bAVIDumping = false; -#else -static File::IOFile f_pFrameDump; -#endif - // 1 for no MSAA. Use s_MSAASamples > 1 to check for MSAA. static int s_MSAASamples = 1; static int s_MSAACoverageSamples = 0; @@ -250,9 +244,6 @@ Renderer::Renderer() s_fps=0; s_blendMode = 0; -#if defined _WIN32 || defined HAVE_LIBAV - s_bAVIDumping = false; -#endif #if defined HAVE_CG && HAVE_CG g_cgcontext = cgCreateContext(); @@ -516,19 +507,6 @@ Renderer::~Renderer() #endif delete g_framebuffer_manager; - -#if defined _WIN32 || defined HAVE_LIBAV - if(s_bAVIDumping) - { - AVIDump::Stop(); - bLastFrameDumped = false; - s_bAVIDumping = false; - } -#else - if (f_pFrameDump.IsOpen()) - f_pFrameDump.Close(); - s_bLastFrameDumped = false; -#endif } // Create On-Screen-Messages @@ -947,15 +925,14 @@ void Renderer::SetBlendMode(bool forceUpdate) // 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 u8 *data = NULL; static int w = 0, h = 0; if (g_bSkipCurrentFrame || (!XFBWrited && (!g_ActiveConfig.bUseXFB || !g_ActiveConfig.bUseRealXFB)) || !fbWidth || !fbHeight) { - if (g_ActiveConfig.bDumpFrames && data) + if (g_ActiveConfig.bDumpFrames && frame_data) #ifdef _WIN32 - AVIDump::AddFrame((char *) data); + AVIDump::AddFrame(frame_data); #elif defined HAVE_LIBAV - AVIDump::AddFrame(data, w, h); + AVIDump::AddFrame(frame_data, w, h); #endif Core::Callback_VideoCopiedToXFB(false); return; @@ -969,12 +946,12 @@ 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 && data) + if (g_ActiveConfig.bDumpFrames && frame_data) { #ifdef _WIN32 - AVIDump::AddFrame((char *) data); + AVIDump::AddFrame(frame_data); #elif defined HAVE_LIBAV - AVIDump::AddFrame(data, w, h); + AVIDump::AddFrame(frame_data, w, h); #endif } Core::Callback_VideoCopiedToXFB(false); @@ -1135,26 +1112,26 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons if (g_ActiveConfig.bDumpFrames) { std::lock_guard lk(s_criticalScreenshot); - if (!data || w != dst_rect.GetWidth() || + if (!frame_data || w != dst_rect.GetWidth() || h != dst_rect.GetHeight()) { - if (data) delete[] data; + if (frame_data) delete[] frame_data; w = dst_rect.GetWidth(); h = dst_rect.GetHeight(); - data = new u8[3 * w * h]; + 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, data); + glReadPixels(dst_rect.left, dst_rect.bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, frame_data); if (GL_REPORT_ERROR() == GL_NO_ERROR && w > 0 && h > 0) { if (!bLastFrameDumped) { #ifdef _WIN32 - s_bAVIDumping = AVIDump::Start(EmuWindow::GetParentWnd(), w, h); + bAVIDumping = AVIDump::Start(EmuWindow::GetParentWnd(), w, h); #else - s_bAVIDumping = AVIDump::Start(w, h); + bAVIDumping = AVIDump::Start(w, h); #endif - if (!s_bAVIDumping) + if (!bAVIDumping) OSD::AddMessage("AVIDump Start failed", 2000); else { @@ -1163,13 +1140,13 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), w, h).c_str(), 2000); } } - if (s_bAVIDumping) + if (bAVIDumping) { #ifdef _WIN32 - AVIDump::AddFrame((char *) data); + AVIDump::AddFrame(frame_data); #else - FlipImageData(data, w, h); - AVIDump::AddFrame(data, w, h); + FlipImageData(frame_data, w, h); + AVIDump::AddFrame(frame_data, w, h); #endif } @@ -1180,16 +1157,16 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons } else { - if (bLastFrameDumped && s_bAVIDumping) + if (bLastFrameDumped && bAVIDumping) { - if (data) + if (frame_data) { - delete[] data; - data = NULL; + delete[] frame_data; + frame_data = NULL; w = h = 0; } AVIDump::Stop(); - s_bAVIDumping = false; + bAVIDumping = false; OSD::AddMessage("Stop dumping frames", 2000); } bLastFrameDumped = false; @@ -1201,16 +1178,16 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons std::string movie_file_name; w = dst_rect.GetWidth(); h = dst_rect.GetHeight(); - data = new u8[3 * w * h]; + frame_data = new u8[3 * w * h]; glPixelStorei(GL_PACK_ALIGNMENT, 1); - glReadPixels(dst_rect.left, dst_rect.bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, data); + glReadPixels(dst_rect.left, dst_rect.bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, frame_data); if (GL_REPORT_ERROR() == GL_NO_ERROR) { - if (!s_bLastFrameDumped) + if (!bLastFrameDumped) { movie_file_name = File::GetUserPath(D_DUMPFRAMES_IDX) + "framedump.raw"; - f_pFrameDump.Open(movie_file_name, "wb"); - if (!f_pFrameDump) + pFrameDump.Open(movie_file_name, "wb"); + if (!pFrameDump) OSD::AddMessage("Error opening framedump.raw for writing.", 2000); else { @@ -1219,22 +1196,22 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons OSD::AddMessage(msg, 2000); } } - if (f_pFrameDump) + if (pFrameDump) { - FlipImageData(data, w, h); - f_pFrameDump.WriteBytes(data, w * 3 * h); - f_pFrameDump.Flush(); + FlipImageData(frame_data, w, h); + pFrameDump.WriteBytes(frame_data, w * 3 * h); + pFrameDump.Flush(); } - s_bLastFrameDumped = true; + bLastFrameDumped = true; } - delete[] data; + delete[] frame_data; } else { - if (s_bLastFrameDumped) - f_pFrameDump.Close(); - s_bLastFrameDumped = false; + if (bLastFrameDumped) + pFrameDump.Close(); + bLastFrameDumped = false; } #endif From 3802201fb7ae6defb3614973ff01e1cfa8c38d6c Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Thu, 8 Sep 2011 17:52:01 +0200 Subject: [PATCH 023/381] Fix D3D11 frame dumping. --- Source/Plugins/Plugin_VideoDX11/Src/Render.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index 9de763bf37..53cf9fd4d9 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -871,13 +871,15 @@ void formatBufferDump(const char *in, char *out, int w, int h, int p) { for (int y = 0; y < h; ++y) { - const u32 *line = (u32*)(in + (h - y - 1) * p); + const u8 *line = (u8*)(in + (h - y - 1) * p); for (int x = 0; x < w; ++x) { - memcpy(out, line, 3); + out[0] = line[2]; + out[1] = line[1]; + out[2] = line[0]; out += 3; line += 4; - } + } } } @@ -1045,7 +1047,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons w = s_recordWidth; h = s_recordHeight; } - formatBufferDump((char*)map.pData, frame_data, s_recordWidth, s_recordHeight, map.RowPitch); + char* source_ptr = (char*)map.pData + dst_rect.left*4 + dst_rect.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); } From ded938bbe7b94676d19124ce64d79dd3f673639a Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Thu, 8 Sep 2011 22:59:34 +0200 Subject: [PATCH 024/381] D3D11: Disable some redundant shader compilation errors. --- Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp | 5 +---- Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp index 5418923bf8..95b0938098 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp @@ -485,7 +485,6 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) D3DBlob* pbytecode; if (!D3D::CompilePixelShader(code, (unsigned int)strlen(code), &pbytecode)) { - PanicAlert("Failed to compile Pixel Shader:\n\n%s", code); GFX_DEBUGGER_PAUSE_AT(NEXT_ERROR, true); return false; } @@ -504,10 +503,8 @@ bool PixelShaderCache::InsertByteCode(const PIXELSHADERUID &uid, const void* byt { ID3D11PixelShader* shader = D3D::CreatePixelShaderFromByteCode(bytecode, bytecodelen); if (shader == NULL) - { - PanicAlert("Failed to create pixel shader at %s %d\n", __FILE__, __LINE__); return false; - } + // TODO: Somehow make the debug name a bit more specific D3D::SetDebugObjectName((ID3D11DeviceChild*)shader, "a pixel shader of PixelShaderCache"); diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp index 041caba28c..58f61b95dc 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp @@ -228,7 +228,6 @@ bool VertexShaderCache::SetShader(u32 components) if (pbytecode == NULL) { - PanicAlert("Failed to compile Vertex Shader %s %d:\n\n%s", __FILE__, __LINE__, code); GFX_DEBUGGER_PAUSE_AT(NEXT_ERROR, true); return false; } @@ -245,10 +244,8 @@ bool VertexShaderCache::InsertByteCode(const VERTEXSHADERUID &uid, D3DBlob* bcod { ID3D11VertexShader* shader = D3D::CreateVertexShaderFromByteCode(bcodeblob); if (shader == NULL) - { - PanicAlert("Failed to create vertex shader from %p size %d at %s %d\n", bcodeblob->Data(), bcodeblob->Size(), __FILE__, __LINE__); return false; - } + // TODO: Somehow make the debug name a bit more specific D3D::SetDebugObjectName((ID3D11DeviceChild*)shader, "a vertex shader of VertexShaderCache"); From b28348066e083d532d5ab62c93ce0f1dc5c217ed Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 9 Sep 2011 00:32:04 +0200 Subject: [PATCH 025/381] Improve the shader UID debugging stuff and merge it to VideoCommon, effectively enabling it in D3D9 and D3D11 as well. --- Source/Core/Common/Src/MsgHandler.cpp | 2 +- .../Core/VideoCommon/Src/PixelShaderGen.cpp | 45 +- Source/Core/VideoCommon/Src/PixelShaderGen.h | 3 + .../Core/VideoCommon/Src/VertexShaderGen.cpp | 968 +++++++++--------- Source/Core/VideoCommon/Src/VertexShaderGen.h | 4 + .../Plugin_VideoDX11/Src/PixelShaderCache.cpp | 13 +- .../Plugin_VideoDX11/Src/PixelShaderCache.h | 3 + .../Src/VertexShaderCache.cpp | 13 +- .../Plugin_VideoDX11/Src/VertexShaderCache.h | 3 + .../Plugin_VideoDX9/Src/PixelShaderCache.cpp | 13 +- .../Plugin_VideoDX9/Src/PixelShaderCache.h | 3 + .../Plugin_VideoDX9/Src/VertexShaderCache.cpp | 11 +- .../Plugin_VideoDX9/Src/VertexShaderCache.h | 5 +- .../Plugin_VideoOGL/Src/PixelShaderCache.cpp | 41 +- .../Plugin_VideoOGL/Src/VertexShaderCache.cpp | 9 +- .../Plugin_VideoOGL/Src/VertexShaderCache.h | 5 +- 16 files changed, 614 insertions(+), 527 deletions(-) diff --git a/Source/Core/Common/Src/MsgHandler.cpp b/Source/Core/Common/Src/MsgHandler.cpp index 17c40d76f8..7c666227aa 100644 --- a/Source/Core/Common/Src/MsgHandler.cpp +++ b/Source/Core/Common/Src/MsgHandler.cpp @@ -53,7 +53,7 @@ bool MsgAlert(bool yes_no, int Style, const char* format, ...) { // Read message and write it to the log std::string caption; - char buffer[4096]; + char buffer[2048]; static std::string info_caption; static std::string warn_caption; diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 8aa3a0a56e..25007be93b 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -241,6 +241,39 @@ void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode) _assert_((ptr - uid->values) == uid->GetNumValues()); } +void ValidatePixelShaderIDs(API_TYPE api, PIXELSHADERUIDSAFE old_id, const std::string& old_code, DSTALPHA_MODE dstAlphaMode, u32 components) +{ + PIXELSHADERUIDSAFE new_id; + GetSafePixelShaderId(&new_id, dstAlphaMode); + + if (!(old_id == new_id)) + { + std::string new_code(GeneratePixelShaderCode(dstAlphaMode, api, components)); + if (old_code != new_code) + { + _assert_(old_id.GetNumValues() == new_id.GetNumValues()); + + char msg[8192]; + char* ptr = msg; + ptr += sprintf(ptr, "Pixel shader IDs matched but unique IDs did not!\nUnique IDs (old <-> new):\n"); + const int N = new_id.GetNumValues(); + for (int i = 0; i < N/2; ++i) + ptr += sprintf(ptr, "%02d, %08X %08X | %08X %08X\n", 2*i, old_id.values[2*i], old_id.values[2*i+1], + new_id.values[2*i], new_id.values[2*i+1]); + if (N % 2) + ptr += sprintf(ptr, "%02d, %08X | %08X\n", N-1, old_id.values[N-1], new_id.values[N-1]); + + static int num_failures = 0; + char szTemp[MAX_PATH]; + sprintf(szTemp, "%spsuid_mismatch_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++); + std::ofstream file(szTemp); + file << msg; + file.close(); + + PanicAlert("Unique pixel shader ID mismatch!\n\nReport this to the devs, along with the contents of %s.", szTemp); + } + } +} // old tev->pixelshader notes // @@ -594,12 +627,12 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType 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" - " float3 tevcoord=float3(0.0f, 0.0f, 0.0f);\n" - " float2 wrappedcoord=float2(0.0f,0.0f), tempcoord=float2(0.0f,0.0f);\n" - " float4 cc0=float4(0.0f,0.0f,0.0f,0.0f), cc1=float4(0.0f,0.0f,0.0f,0.0f);\n" - " float4 cc2=float4(0.0f,0.0f,0.0f,0.0f), cprev=float4(0.0f,0.0f,0.0f,0.0f);\n" - " float4 crastemp=float4(0.0f,0.0f,0.0f,0.0f),ckonsttemp=float4(0.0f,0.0f,0.0f,0.0f);\n\n"); + " float4 alphabump=float4(0.0f,0.0f,0.0f,0.0f);\n" + " float3 tevcoord=float3(0.0f, 0.0f, 0.0f);\n" + " float2 wrappedcoord=float2(0.0f,0.0f), tempcoord=float2(0.0f,0.0f);\n" + " float4 cc0=float4(0.0f,0.0f,0.0f,0.0f), cc1=float4(0.0f,0.0f,0.0f,0.0f);\n" + " float4 cc2=float4(0.0f,0.0f,0.0f,0.0f), cprev=float4(0.0f,0.0f,0.0f,0.0f);\n" + " float4 crastemp=float4(0.0f,0.0f,0.0f,0.0f),ckonsttemp=float4(0.0f,0.0f,0.0f,0.0f);\n\n"); if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) { diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h index d20f43c711..8031fdfbb2 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.h +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h @@ -123,6 +123,9 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode); void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode); +// Used to make sure that our optimized pixel shader IDs don't lose any possible shader code changes +void ValidatePixelShaderIDs(API_TYPE api, PIXELSHADERUIDSAFE old_id, const std::string& old_code, DSTALPHA_MODE dstAlphaMode, u32 components); + extern PIXELSHADERUID last_pixel_shader_uid; #endif // GCOGL_PIXELSHADER_H diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp index d15cef0c70..902f645bec 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp @@ -1,466 +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 -#include - -#include "NativeVertexFormat.h" - -#include "BPMemory.h" -#include "CPMemory.h" -#include "LightingShaderGen.h" -#include "VertexShaderGen.h" -#include "VideoConfig.h" - -VERTEXSHADERUID last_vertex_shader_uid; - -// Mash together all the inputs that contribute to the code of a generated vertex shader into -// a unique identifier, basically containing all the bits. Yup, it's a lot .... -void GetVertexShaderId(VERTEXSHADERUID *uid, u32 components) -{ - uid->values[0] = components | - (xfregs.numTexGen.numTexGens << 23) | - (xfregs.numChan.numColorChans << 27) | - (xfregs.dualTexTrans.enabled << 29); - - for (int i = 0; i < xfregs.numChan.numColorChans; ++i) { - uid->values[1+i] = xfregs.color[i].enablelighting ? - (u32)xfregs.color[i].hex : - (u32)xfregs.color[i].matsource; - uid->values[1+i] |= (xfregs.alpha[i].enablelighting ? - (u32)xfregs.alpha[i].hex : - (u32)xfregs.alpha[i].matsource) << 15; - } - uid->values[2] |= (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) << 31; - u32 *pcurvalue = &uid->values[3]; - for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) { - TexMtxInfo tinfo = xfregs.texMtxInfo[i]; - if (tinfo.texgentype != XF_TEXGEN_EMBOSS_MAP) - tinfo.hex &= 0x7ff; - if (tinfo.texgentype != XF_TEXGEN_REGULAR) - tinfo.projection = 0; - - u32 val = ((tinfo.hex >> 1) & 0x1ffff); - if (xfregs.dualTexTrans.enabled && tinfo.texgentype == XF_TEXGEN_REGULAR) { - // rewrite normalization and post index - val |= ((u32)xfregs.postMtxInfo[i].index << 17) | ((u32)xfregs.postMtxInfo[i].normalize << 23); - } - - switch (i & 3) { - case 0: pcurvalue[0] |= val; break; - case 1: pcurvalue[0] |= val << 24; pcurvalue[1] = val >> 8; ++pcurvalue; break; - case 2: pcurvalue[0] |= val << 16; pcurvalue[1] = val >> 16; ++pcurvalue; break; - case 3: pcurvalue[0] |= val << 8; ++pcurvalue; break; - } - } -} - -void GetSafeVertexShaderId(VERTEXSHADERUIDSAFE *uid, u32 components) -{ - // Just store all used registers here without caring whether we need all bits or less. - u32* ptr = uid->values; - *ptr++ = components; - *ptr++ = xfregs.numTexGen.hex; - *ptr++ = xfregs.numChan.hex; - *ptr++ = xfregs.dualTexTrans.hex; - - for (int i = 0; i < 2; ++i) { - *ptr++ = xfregs.color[i].hex; - *ptr++ = xfregs.alpha[i].hex; - } - *ptr++ = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting; - for (unsigned int i = 0; i < 8; ++i) { - *ptr++ = xfregs.texMtxInfo[i].hex; - *ptr++ = xfregs.postMtxInfo[i].hex; - } - _assert_((ptr - uid->values) == uid->GetNumValues()); -} - -static char text[16384]; - -#define WRITE p+=sprintf - -char* GenerateVSOutputStruct(char* p, u32 components, API_TYPE api_type) -{ - WRITE(p, "struct VS_OUTPUT {\n"); - WRITE(p, " float4 pos : POSITION;\n"); - WRITE(p, " float4 colors_0 : COLOR0;\n"); - WRITE(p, " float4 colors_1 : COLOR1;\n"); - - if (xfregs.numTexGen.numTexGens < 7) { - for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) - WRITE(p, " float3 tex%d : TEXCOORD%d;\n", i, i); - WRITE(p, " float4 clipPos : TEXCOORD%d;\n", xfregs.numTexGen.numTexGens); - if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) - WRITE(p, " float4 Normal : TEXCOORD%d;\n", xfregs.numTexGen.numTexGens + 1); - } else { - // clip position is in w of first 4 texcoords - if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) - { - for (int i = 0; i < 8; ++i) - WRITE(p, " float4 tex%d : TEXCOORD%d;\n", i, i); - } - else - { - for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) - WRITE(p, " float%d tex%d : TEXCOORD%d;\n", i < 4 ? 4 : 3 , i, i); - } - } - WRITE(p, "};\n"); - - return p; -} - -const char *GenerateVertexShaderCode(u32 components, API_TYPE api_type) -{ - setlocale(LC_NUMERIC, "C"); // Reset locale for compilation - text[sizeof(text) - 1] = 0x7C; // canary - - _assert_(bpmem.genMode.numtexgens == xfregs.numTexGen.numTexGens); - _assert_(bpmem.genMode.numcolchans == xfregs.numChan.numColorChans); - - bool is_d3d = (api_type & API_D3D9 || api_type == API_D3D11); - u32 lightMask = 0; - if (xfregs.numChan.numColorChans > 0) - lightMask |= xfregs.color[0].GetFullLightMask() | xfregs.alpha[0].GetFullLightMask(); - if (xfregs.numChan.numColorChans > 1) - lightMask |= xfregs.color[1].GetFullLightMask() | xfregs.alpha[1].GetFullLightMask(); - - char *p = text; - WRITE(p, "//Vertex Shader: comp:%x, \n", components); - WRITE(p, "typedef struct { float4 T0, T1, T2; float4 N0, N1, N2; } s_"I_POSNORMALMATRIX";\n" - "typedef struct { float4 t; } FLT4;\n" - "typedef struct { FLT4 T[24]; } s_"I_TEXMATRICES";\n" - "typedef struct { FLT4 T[64]; } s_"I_TRANSFORMMATRICES";\n" - "typedef struct { FLT4 T[32]; } s_"I_NORMALMATRICES";\n" - "typedef struct { FLT4 T[64]; } s_"I_POSTTRANSFORMMATRICES";\n" - "typedef struct { float4 col; float4 cosatt; float4 distatt; float4 pos; float4 dir; } Light;\n" - "typedef struct { Light lights[8]; } s_"I_LIGHTS";\n" - "typedef struct { float4 C0, C1, C2, C3; } s_"I_MATERIALS";\n" - "typedef struct { float4 T0, T1, T2, T3; } s_"I_PROJECTION";\n" - ); - - p = GenerateVSOutputStruct(p, components, api_type); - - // uniforms - - WRITE(p, "uniform s_"I_TRANSFORMMATRICES" "I_TRANSFORMMATRICES" : register(c%d);\n", C_TRANSFORMMATRICES); - WRITE(p, "uniform s_"I_TEXMATRICES" "I_TEXMATRICES" : register(c%d);\n", C_TEXMATRICES); // also using tex matrices - WRITE(p, "uniform s_"I_NORMALMATRICES" "I_NORMALMATRICES" : register(c%d);\n", C_NORMALMATRICES); - WRITE(p, "uniform s_"I_POSNORMALMATRIX" "I_POSNORMALMATRIX" : register(c%d);\n", C_POSNORMALMATRIX); - WRITE(p, "uniform s_"I_POSTTRANSFORMMATRICES" "I_POSTTRANSFORMMATRICES" : register(c%d);\n", C_POSTTRANSFORMMATRICES); - WRITE(p, "uniform s_"I_LIGHTS" "I_LIGHTS" : register(c%d);\n", C_LIGHTS); - WRITE(p, "uniform s_"I_MATERIALS" "I_MATERIALS" : register(c%d);\n", C_MATERIALS); - WRITE(p, "uniform s_"I_PROJECTION" "I_PROJECTION" : register(c%d);\n", C_PROJECTION); - WRITE(p, "uniform float4 "I_DEPTHPARAMS" : register(c%d);\n", C_DEPTHPARAMS); - - WRITE(p, "VS_OUTPUT main(\n"); - - // inputs - if (components & VB_HAS_NRM0) - WRITE(p, " float3 rawnorm0 : NORMAL0,\n"); - if (components & VB_HAS_NRM1) { - if (is_d3d) - WRITE(p, " float3 rawnorm1 : NORMAL1,\n"); - else - WRITE(p, " float3 rawnorm1 : ATTR%d,\n", SHADER_NORM1_ATTRIB); - } - if (components & VB_HAS_NRM2) { - if (is_d3d) - WRITE(p, " float3 rawnorm2 : NORMAL2,\n"); - else - WRITE(p, " float3 rawnorm2 : ATTR%d,\n", SHADER_NORM2_ATTRIB); - } - if (components & VB_HAS_COL0) - WRITE(p, " float4 color0 : COLOR0,\n"); - if (components & VB_HAS_COL1) - WRITE(p, " float4 color1 : COLOR1,\n"); - for (int i = 0; i < 8; ++i) { - u32 hastexmtx = (components & (VB_HAS_TEXMTXIDX0<= 32 ? (posmtx-32) : posmtx;\n"); - WRITE(p, "float3 N0 = "I_NORMALMATRICES".T[normidx].t.xyz, N1 = "I_NORMALMATRICES".T[normidx+1].t.xyz, N2 = "I_NORMALMATRICES".T[normidx+2].t.xyz;\n"); - } - - if (components & VB_HAS_NRM0) - WRITE(p, "float3 _norm0 = normalize(float3(dot(N0, rawnorm0), dot(N1, rawnorm0), dot(N2, rawnorm0)));\n"); - if (components & VB_HAS_NRM1) - WRITE(p, "float3 _norm1 = float3(dot(N0, rawnorm1), dot(N1, rawnorm1), dot(N2, rawnorm1));\n"); - if (components & VB_HAS_NRM2) - WRITE(p, "float3 _norm2 = float3(dot(N0, rawnorm2), dot(N1, rawnorm2), dot(N2, rawnorm2));\n"); - } - else - { - WRITE(p, "float4 pos = float4(dot("I_POSNORMALMATRIX".T0, rawpos), dot("I_POSNORMALMATRIX".T1, rawpos), dot("I_POSNORMALMATRIX".T2, rawpos), 1.0f);\n"); - if (components & VB_HAS_NRM0) - WRITE(p, "float3 _norm0 = normalize(float3(dot("I_POSNORMALMATRIX".N0.xyz, rawnorm0), dot("I_POSNORMALMATRIX".N1.xyz, rawnorm0), dot("I_POSNORMALMATRIX".N2.xyz, rawnorm0)));\n"); - if (components & VB_HAS_NRM1) - WRITE(p, "float3 _norm1 = float3(dot("I_POSNORMALMATRIX".N0.xyz, rawnorm1), dot("I_POSNORMALMATRIX".N1.xyz, rawnorm1), dot("I_POSNORMALMATRIX".N2.xyz, rawnorm1));\n"); - if (components & VB_HAS_NRM2) - WRITE(p, "float3 _norm2 = float3(dot("I_POSNORMALMATRIX".N0.xyz, rawnorm2), dot("I_POSNORMALMATRIX".N1.xyz, rawnorm2), dot("I_POSNORMALMATRIX".N2.xyz, rawnorm2));\n"); - } - - if (!(components & VB_HAS_NRM0)) - WRITE(p, "float3 _norm0 = float3(0.0f, 0.0f, 0.0f);\n"); - - - - WRITE(p, "o.pos = float4(dot("I_PROJECTION".T0, pos), dot("I_PROJECTION".T1, pos), dot("I_PROJECTION".T2, pos), dot("I_PROJECTION".T3, pos));\n"); - - WRITE(p, "float4 mat, lacc;\n" - "float3 ldir, h;\n" - "float dist, dist2, attn;\n"); - - if(xfregs.numChan.numColorChans == 0) - { - if (components & VB_HAS_COL0) - WRITE(p, "o.colors_0 = color0;\n"); - else - WRITE(p, "o.colors_0 = float4(1.0f, 1.0f, 1.0f, 1.0f);\n"); - } - - p = GenerateLightingShader(p, components, I_MATERIALS, I_LIGHTS, "color", "o.colors_"); - - if(xfregs.numChan.numColorChans < 2) - { - if (components & VB_HAS_COL1) - WRITE(p, "o.colors_1 = color1;\n"); - else - WRITE(p, "o.colors_1 = o.colors_0;\n"); - } - // special case if only pos and tex coord 0 and tex coord input is AB11 - // donko - this has caused problems in some games. removed for now. - bool texGenSpecialCase = false; - /*bool texGenSpecialCase = - ((g_VtxDesc.Hex & 0x60600L) == g_VtxDesc.Hex) && // only pos and tex coord 0 - (g_VtxDesc.Tex0Coord != NOT_PRESENT) && - (xfregs.texcoords[0].texmtxinfo.inputform == XF_TEXINPUT_AB11); - */ - - // transform texcoords - WRITE(p, "float4 coord = float4(0.0f, 0.0f, 1.0f, 1.0f);\n"); - for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) { - TexMtxInfo& texinfo = xfregs.texMtxInfo[i]; - - WRITE(p, "{\n"); - WRITE(p, "coord = float4(0.0f, 0.0f, 1.0f, 1.0f);\n"); - switch (texinfo.sourcerow) { - case XF_SRCGEOM_INROW: - _assert_( texinfo.inputform == XF_TEXINPUT_ABC1 ); - WRITE(p, "coord = rawpos;\n"); // pos.w is 1 - break; - case XF_SRCNORMAL_INROW: - if (components & VB_HAS_NRM0) { - _assert_( texinfo.inputform == XF_TEXINPUT_ABC1 ); - WRITE(p, "coord = float4(rawnorm0.xyz, 1.0f);\n"); - } - break; - case XF_SRCCOLORS_INROW: - _assert_( texinfo.texgentype == XF_TEXGEN_COLOR_STRGBC0 || texinfo.texgentype == XF_TEXGEN_COLOR_STRGBC1 ); - break; - case XF_SRCBINORMAL_T_INROW: - if (components & VB_HAS_NRM1) { - _assert_( texinfo.inputform == XF_TEXINPUT_ABC1 ); - WRITE(p, "coord = float4(rawnorm1.xyz, 1.0f);\n"); - } - break; - case XF_SRCBINORMAL_B_INROW: - if (components & VB_HAS_NRM2) { - _assert_( texinfo.inputform == XF_TEXINPUT_ABC1 ); - WRITE(p, "coord = float4(rawnorm2.xyz, 1.0f);\n"); - } - break; - 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); - break; - } - - // first transformation - switch (texinfo.texgentype) { - case XF_TEXGEN_EMBOSS_MAP: // calculate tex coords into bump map - - if (components & (VB_HAS_NRM1|VB_HAS_NRM2)) { - // transform the light dir into tangent space - WRITE(p, "ldir = normalize("I_LIGHTS".lights[%d].pos.xyz - pos.xyz);\n", texinfo.embosslightshift); - WRITE(p, "o.tex%d.xyz = o.tex%d.xyz + float3(dot(ldir, _norm1), dot(ldir, _norm2), 0.0f);\n", i, texinfo.embosssourceshift); - } - else - { - _assert_(0); // should have normals - WRITE(p, "o.tex%d.xyz = o.tex%d.xyz;\n", i, texinfo.embosssourceshift); - } - - break; - case XF_TEXGEN_COLOR_STRGBC0: - _assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW); - WRITE(p, "o.tex%d.xyz = float3(o.colors_0.x, o.colors_0.y, 1);\n", i); - break; - case XF_TEXGEN_COLOR_STRGBC1: - _assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW); - WRITE(p, "o.tex%d.xyz = float3(o.colors_1.x, o.colors_1.y, 1);\n", i); - break; - case XF_TEXGEN_REGULAR: - default: - if (components & (VB_HAS_TEXMTXIDX0< +#include + +#include "NativeVertexFormat.h" + +#include "BPMemory.h" +#include "CPMemory.h" +#include "LightingShaderGen.h" +#include "VertexShaderGen.h" +#include "VideoConfig.h" + +VERTEXSHADERUID last_vertex_shader_uid; + +// Mash together all the inputs that contribute to the code of a generated vertex shader into +// a unique identifier, basically containing all the bits. Yup, it's a lot .... +void GetVertexShaderId(VERTEXSHADERUID *uid, u32 components) +{ + uid->values[0] = components | + (xfregs.numTexGen.numTexGens << 23) | + (xfregs.numChan.numColorChans << 27) | + (xfregs.dualTexTrans.enabled << 29); + + for (int i = 0; i < xfregs.numChan.numColorChans; ++i) { + uid->values[1+i] = xfregs.color[i].enablelighting ? + (u32)xfregs.color[i].hex : + (u32)xfregs.color[i].matsource; + uid->values[1+i] |= (xfregs.alpha[i].enablelighting ? + (u32)xfregs.alpha[i].hex : + (u32)xfregs.alpha[i].matsource) << 15; + } + uid->values[2] |= (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) << 31; + u32 *pcurvalue = &uid->values[3]; + for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) { + TexMtxInfo tinfo = xfregs.texMtxInfo[i]; + if (tinfo.texgentype != XF_TEXGEN_EMBOSS_MAP) + tinfo.hex &= 0x7ff; + if (tinfo.texgentype != XF_TEXGEN_REGULAR) + tinfo.projection = 0; + + u32 val = ((tinfo.hex >> 1) & 0x1ffff); + if (xfregs.dualTexTrans.enabled && tinfo.texgentype == XF_TEXGEN_REGULAR) { + // rewrite normalization and post index + val |= ((u32)xfregs.postMtxInfo[i].index << 17) | ((u32)xfregs.postMtxInfo[i].normalize << 23); + } + + switch (i & 3) { + case 0: pcurvalue[0] |= val; break; + case 1: pcurvalue[0] |= val << 24; pcurvalue[1] = val >> 8; ++pcurvalue; break; + case 2: pcurvalue[0] |= val << 16; pcurvalue[1] = val >> 16; ++pcurvalue; break; + case 3: pcurvalue[0] |= val << 8; ++pcurvalue; break; + } + } +} + +void GetSafeVertexShaderId(VERTEXSHADERUIDSAFE *uid, u32 components) +{ + // Just store all used registers here without caring whether we need all bits or less. + u32* ptr = uid->values; + *ptr++ = components; + *ptr++ = xfregs.numTexGen.hex; + *ptr++ = xfregs.numChan.hex; + *ptr++ = xfregs.dualTexTrans.hex; + + for (int i = 0; i < 2; ++i) { + *ptr++ = xfregs.color[i].hex; + *ptr++ = xfregs.alpha[i].hex; + } + *ptr++ = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting; + for (unsigned int i = 0; i < 8; ++i) { + *ptr++ = xfregs.texMtxInfo[i].hex; + *ptr++ = xfregs.postMtxInfo[i].hex; + } + _assert_((ptr - uid->values) == uid->GetNumValues()); +} + + +void ValidateVertexShaderIDs(API_TYPE api, VERTEXSHADERUIDSAFE old_id, const std::string& old_code, u32 components) +{ + VERTEXSHADERUIDSAFE new_id; + GetSafeVertexShaderId(&new_id, components); + + if (!(old_id == new_id)) + { + std::string new_code(GenerateVertexShaderCode(components, api)); + if (old_code != new_code) + { + _assert_(old_id.GetNumValues() == new_id.GetNumValues()); + + char msg[8192]; + char* ptr = msg; + ptr += sprintf(ptr, "Vertex shader IDs matched but unique IDs did not!\nUnique IDs (old <-> new):\n"); + const int N = new_id.GetNumValues(); + for (int i = 0; i < N/2; ++i) + ptr += sprintf(ptr, "%02d, %08X %08X | %08X %08X\n", 2*i, old_id.values[2*i], old_id.values[2*i+1], + new_id.values[2*i], new_id.values[2*i+1]); + if (N % 2) + ptr += sprintf(ptr, "%02d, %08X | %08X\n", N-1, old_id.values[N-1], new_id.values[N-1]); + + static int num_failures = 0; + char szTemp[MAX_PATH]; + sprintf(szTemp, "%svsuid_mismatch_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++); + std::ofstream file(szTemp); + file << msg; + file.close(); + + PanicAlert("Unique pixel shader ID mismatch!\n\nReport this to the devs, along with the contents of %s.", szTemp); + } + } +} + + +static char text[16384]; + +#define WRITE p+=sprintf + +char* GenerateVSOutputStruct(char* p, u32 components, API_TYPE api_type) +{ + WRITE(p, "struct VS_OUTPUT {\n"); + WRITE(p, " float4 pos : POSITION;\n"); + WRITE(p, " float4 colors_0 : COLOR0;\n"); + WRITE(p, " float4 colors_1 : COLOR1;\n"); + + if (xfregs.numTexGen.numTexGens < 7) { + for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) + WRITE(p, " float3 tex%d : TEXCOORD%d;\n", i, i); + WRITE(p, " float4 clipPos : TEXCOORD%d;\n", xfregs.numTexGen.numTexGens); + if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) + WRITE(p, " float4 Normal : TEXCOORD%d;\n", xfregs.numTexGen.numTexGens + 1); + } else { + // clip position is in w of first 4 texcoords + if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) + { + for (int i = 0; i < 8; ++i) + WRITE(p, " float4 tex%d : TEXCOORD%d;\n", i, i); + } + else + { + for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) + WRITE(p, " float%d tex%d : TEXCOORD%d;\n", i < 4 ? 4 : 3 , i, i); + } + } + WRITE(p, "};\n"); + + return p; +} + +const char *GenerateVertexShaderCode(u32 components, API_TYPE api_type) +{ + setlocale(LC_NUMERIC, "C"); // Reset locale for compilation + text[sizeof(text) - 1] = 0x7C; // canary + + _assert_(bpmem.genMode.numtexgens == xfregs.numTexGen.numTexGens); + _assert_(bpmem.genMode.numcolchans == xfregs.numChan.numColorChans); + + bool is_d3d = (api_type & API_D3D9 || api_type == API_D3D11); + u32 lightMask = 0; + if (xfregs.numChan.numColorChans > 0) + lightMask |= xfregs.color[0].GetFullLightMask() | xfregs.alpha[0].GetFullLightMask(); + if (xfregs.numChan.numColorChans > 1) + lightMask |= xfregs.color[1].GetFullLightMask() | xfregs.alpha[1].GetFullLightMask(); + + char *p = text; + WRITE(p, "//Vertex Shader: comp:%x, \n", components); + WRITE(p, "typedef struct { float4 T0, T1, T2; float4 N0, N1, N2; } s_"I_POSNORMALMATRIX";\n" + "typedef struct { float4 t; } FLT4;\n" + "typedef struct { FLT4 T[24]; } s_"I_TEXMATRICES";\n" + "typedef struct { FLT4 T[64]; } s_"I_TRANSFORMMATRICES";\n" + "typedef struct { FLT4 T[32]; } s_"I_NORMALMATRICES";\n" + "typedef struct { FLT4 T[64]; } s_"I_POSTTRANSFORMMATRICES";\n" + "typedef struct { float4 col; float4 cosatt; float4 distatt; float4 pos; float4 dir; } Light;\n" + "typedef struct { Light lights[8]; } s_"I_LIGHTS";\n" + "typedef struct { float4 C0, C1, C2, C3; } s_"I_MATERIALS";\n" + "typedef struct { float4 T0, T1, T2, T3; } s_"I_PROJECTION";\n" + ); + + p = GenerateVSOutputStruct(p, components, api_type); + + // uniforms + + WRITE(p, "uniform s_"I_TRANSFORMMATRICES" "I_TRANSFORMMATRICES" : register(c%d);\n", C_TRANSFORMMATRICES); + WRITE(p, "uniform s_"I_TEXMATRICES" "I_TEXMATRICES" : register(c%d);\n", C_TEXMATRICES); // also using tex matrices + WRITE(p, "uniform s_"I_NORMALMATRICES" "I_NORMALMATRICES" : register(c%d);\n", C_NORMALMATRICES); + WRITE(p, "uniform s_"I_POSNORMALMATRIX" "I_POSNORMALMATRIX" : register(c%d);\n", C_POSNORMALMATRIX); + WRITE(p, "uniform s_"I_POSTTRANSFORMMATRICES" "I_POSTTRANSFORMMATRICES" : register(c%d);\n", C_POSTTRANSFORMMATRICES); + WRITE(p, "uniform s_"I_LIGHTS" "I_LIGHTS" : register(c%d);\n", C_LIGHTS); + WRITE(p, "uniform s_"I_MATERIALS" "I_MATERIALS" : register(c%d);\n", C_MATERIALS); + WRITE(p, "uniform s_"I_PROJECTION" "I_PROJECTION" : register(c%d);\n", C_PROJECTION); + WRITE(p, "uniform float4 "I_DEPTHPARAMS" : register(c%d);\n", C_DEPTHPARAMS); + + WRITE(p, "VS_OUTPUT main(\n"); + + // inputs + if (components & VB_HAS_NRM0) + WRITE(p, " float3 rawnorm0 : NORMAL0,\n"); + if (components & VB_HAS_NRM1) { + if (is_d3d) + WRITE(p, " float3 rawnorm1 : NORMAL1,\n"); + else + WRITE(p, " float3 rawnorm1 : ATTR%d,\n", SHADER_NORM1_ATTRIB); + } + if (components & VB_HAS_NRM2) { + if (is_d3d) + WRITE(p, " float3 rawnorm2 : NORMAL2,\n"); + else + WRITE(p, " float3 rawnorm2 : ATTR%d,\n", SHADER_NORM2_ATTRIB); + } + if (components & VB_HAS_COL0) + WRITE(p, " float4 color0 : COLOR0,\n"); + if (components & VB_HAS_COL1) + WRITE(p, " float4 color1 : COLOR1,\n"); + for (int i = 0; i < 8; ++i) { + u32 hastexmtx = (components & (VB_HAS_TEXMTXIDX0<= 32 ? (posmtx-32) : posmtx;\n"); + WRITE(p, "float3 N0 = "I_NORMALMATRICES".T[normidx].t.xyz, N1 = "I_NORMALMATRICES".T[normidx+1].t.xyz, N2 = "I_NORMALMATRICES".T[normidx+2].t.xyz;\n"); + } + + if (components & VB_HAS_NRM0) + WRITE(p, "float3 _norm0 = normalize(float3(dot(N0, rawnorm0), dot(N1, rawnorm0), dot(N2, rawnorm0)));\n"); + if (components & VB_HAS_NRM1) + WRITE(p, "float3 _norm1 = float3(dot(N0, rawnorm1), dot(N1, rawnorm1), dot(N2, rawnorm1));\n"); + if (components & VB_HAS_NRM2) + WRITE(p, "float3 _norm2 = float3(dot(N0, rawnorm2), dot(N1, rawnorm2), dot(N2, rawnorm2));\n"); + } + else + { + WRITE(p, "float4 pos = float4(dot("I_POSNORMALMATRIX".T0, rawpos), dot("I_POSNORMALMATRIX".T1, rawpos), dot("I_POSNORMALMATRIX".T2, rawpos), 1.0f);\n"); + if (components & VB_HAS_NRM0) + WRITE(p, "float3 _norm0 = normalize(float3(dot("I_POSNORMALMATRIX".N0.xyz, rawnorm0), dot("I_POSNORMALMATRIX".N1.xyz, rawnorm0), dot("I_POSNORMALMATRIX".N2.xyz, rawnorm0)));\n"); + if (components & VB_HAS_NRM1) + WRITE(p, "float3 _norm1 = float3(dot("I_POSNORMALMATRIX".N0.xyz, rawnorm1), dot("I_POSNORMALMATRIX".N1.xyz, rawnorm1), dot("I_POSNORMALMATRIX".N2.xyz, rawnorm1));\n"); + if (components & VB_HAS_NRM2) + WRITE(p, "float3 _norm2 = float3(dot("I_POSNORMALMATRIX".N0.xyz, rawnorm2), dot("I_POSNORMALMATRIX".N1.xyz, rawnorm2), dot("I_POSNORMALMATRIX".N2.xyz, rawnorm2));\n"); + } + + if (!(components & VB_HAS_NRM0)) + WRITE(p, "float3 _norm0 = float3(0.0f, 0.0f, 0.0f);\n"); + + + + WRITE(p, "o.pos = float4(dot("I_PROJECTION".T0, pos), dot("I_PROJECTION".T1, pos), dot("I_PROJECTION".T2, pos), dot("I_PROJECTION".T3, pos));\n"); + + WRITE(p, "float4 mat, lacc;\n" + "float3 ldir, h;\n" + "float dist, dist2, attn;\n"); + + if(xfregs.numChan.numColorChans == 0) + { + if (components & VB_HAS_COL0) + WRITE(p, "o.colors_0 = color0;\n"); + else + WRITE(p, "o.colors_0 = float4(1.0f, 1.0f, 1.0f, 1.0f);\n"); + } + + p = GenerateLightingShader(p, components, I_MATERIALS, I_LIGHTS, "color", "o.colors_"); + + if(xfregs.numChan.numColorChans < 2) + { + if (components & VB_HAS_COL1) + WRITE(p, "o.colors_1 = color1;\n"); + else + WRITE(p, "o.colors_1 = o.colors_0;\n"); + } + // special case if only pos and tex coord 0 and tex coord input is AB11 + // donko - this has caused problems in some games. removed for now. + bool texGenSpecialCase = false; + /*bool texGenSpecialCase = + ((g_VtxDesc.Hex & 0x60600L) == g_VtxDesc.Hex) && // only pos and tex coord 0 + (g_VtxDesc.Tex0Coord != NOT_PRESENT) && + (xfregs.texcoords[0].texmtxinfo.inputform == XF_TEXINPUT_AB11); + */ + + // transform texcoords + WRITE(p, "float4 coord = float4(0.0f, 0.0f, 1.0f, 1.0f);\n"); + for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) { + TexMtxInfo& texinfo = xfregs.texMtxInfo[i]; + + WRITE(p, "{\n"); + WRITE(p, "coord = float4(0.0f, 0.0f, 1.0f, 1.0f);\n"); + switch (texinfo.sourcerow) { + case XF_SRCGEOM_INROW: + _assert_( texinfo.inputform == XF_TEXINPUT_ABC1 ); + WRITE(p, "coord = rawpos;\n"); // pos.w is 1 + break; + case XF_SRCNORMAL_INROW: + if (components & VB_HAS_NRM0) { + _assert_( texinfo.inputform == XF_TEXINPUT_ABC1 ); + WRITE(p, "coord = float4(rawnorm0.xyz, 1.0f);\n"); + } + break; + case XF_SRCCOLORS_INROW: + _assert_( texinfo.texgentype == XF_TEXGEN_COLOR_STRGBC0 || texinfo.texgentype == XF_TEXGEN_COLOR_STRGBC1 ); + break; + case XF_SRCBINORMAL_T_INROW: + if (components & VB_HAS_NRM1) { + _assert_( texinfo.inputform == XF_TEXINPUT_ABC1 ); + WRITE(p, "coord = float4(rawnorm1.xyz, 1.0f);\n"); + } + break; + case XF_SRCBINORMAL_B_INROW: + if (components & VB_HAS_NRM2) { + _assert_( texinfo.inputform == XF_TEXINPUT_ABC1 ); + WRITE(p, "coord = float4(rawnorm2.xyz, 1.0f);\n"); + } + break; + 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); + break; + } + + // first transformation + switch (texinfo.texgentype) { + case XF_TEXGEN_EMBOSS_MAP: // calculate tex coords into bump map + + if (components & (VB_HAS_NRM1|VB_HAS_NRM2)) { + // transform the light dir into tangent space + WRITE(p, "ldir = normalize("I_LIGHTS".lights[%d].pos.xyz - pos.xyz);\n", texinfo.embosslightshift); + WRITE(p, "o.tex%d.xyz = o.tex%d.xyz + float3(dot(ldir, _norm1), dot(ldir, _norm2), 0.0f);\n", i, texinfo.embosssourceshift); + } + else + { + _assert_(0); // should have normals + WRITE(p, "o.tex%d.xyz = o.tex%d.xyz;\n", i, texinfo.embosssourceshift); + } + + break; + case XF_TEXGEN_COLOR_STRGBC0: + _assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW); + WRITE(p, "o.tex%d.xyz = float3(o.colors_0.x, o.colors_0.y, 1);\n", i); + break; + case XF_TEXGEN_COLOR_STRGBC1: + _assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW); + WRITE(p, "o.tex%d.xyz = float3(o.colors_1.x, o.colors_1.y, 1);\n", i); + break; + case XF_TEXGEN_REGULAR: + default: + if (components & (VB_HAS_TEXMTXIDX0< VERTEXSHADERUIDSAFE; // components is included in the uid. char* GenerateVSOutputStruct(char* p, u32 components, API_TYPE api_type); const char *GenerateVertexShaderCode(u32 components, API_TYPE api_type); + void GetVertexShaderId(VERTEXSHADERUID *uid, u32 components); void GetSafeVertexShaderId(VERTEXSHADERUIDSAFE *uid, u32 components); +// Used to make sure that our optimized vertex shader IDs don't lose any possible shader code changes +void ValidateVertexShaderIDs(API_TYPE api, VERTEXSHADERUIDSAFE old_id, const std::string& old_code, u32 components); + extern VERTEXSHADERUID last_vertex_shader_uid; #endif // GCOGL_VERTEXSHADER_H diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp index 5418923bf8..950aaf5ef1 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp @@ -461,6 +461,7 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) { PSCache::const_iterator iter = PixelShaders.find(uid); GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE,true); + ValidatePixelShaderIDs(API_D3D11, PixelShaders[uid].safe_uid, PixelShaders[uid].code, dstAlphaMode, components); return (iter != PixelShaders.end() && iter->second.shader); } @@ -476,6 +477,7 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) last_entry = &entry; GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE,true); + ValidatePixelShaderIDs(API_D3D11, entry.safe_uid, entry.code, dstAlphaMode, components); return (entry.shader != NULL); } @@ -494,10 +496,17 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) g_ps_disk_cache.Append(uid, pbytecode->Data(), pbytecode->Size()); g_ps_disk_cache.Sync(); - bool result = InsertByteCode(uid, pbytecode->Data(), pbytecode->Size()); + bool success = InsertByteCode(uid, pbytecode->Data(), pbytecode->Size()); pbytecode->Release(); + + if (success) + { + PixelShaders[uid].code = code; + GetSafePixelShaderId(&PixelShaders[uid].safe_uid, dstAlphaMode); + } + GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true); - return result; + return success; } bool PixelShaderCache::InsertByteCode(const PIXELSHADERUID &uid, const void* bytecode, unsigned int bytecodelen) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h index 3b9c537a7a..f5a9cf34b8 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h +++ b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h @@ -55,6 +55,9 @@ private: ID3D11PixelShader* shader; int frameCount; + PIXELSHADERUIDSAFE safe_uid; + std::string code; + PSCacheEntry() : shader(NULL), frameCount(0) {} void Destroy() { SAFE_RELEASE(shader); } }; diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp index 041caba28c..68326e1c60 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp @@ -205,6 +205,7 @@ bool VertexShaderCache::SetShader(u32 components) if (uid == last_vertex_shader_uid && vshaders[uid].frameCount == frameCount) { GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true); + ValidateVertexShaderIDs(API_D3D11, vshaders[uid].safe_uid, vshaders[uid].code, components); return (vshaders[uid].shader != NULL); } @@ -218,6 +219,7 @@ bool VertexShaderCache::SetShader(u32 components) last_entry = &entry; GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true); + ValidateVertexShaderIDs(API_D3D11, entry.safe_uid, entry.code, components); return (entry.shader != NULL); } @@ -235,10 +237,17 @@ bool VertexShaderCache::SetShader(u32 components) g_vs_disk_cache.Append(uid, pbytecode->Data(), pbytecode->Size()); g_vs_disk_cache.Sync(); - bool result = InsertByteCode(uid, pbytecode); + bool success = InsertByteCode(uid, pbytecode); pbytecode->Release(); + + if (success) + { + vshaders[uid].code = code; + GetSafeVertexShaderId(&vshaders[uid].safe_uid, components); + } + GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true); - return result; + return success; } bool VertexShaderCache::InsertByteCode(const VERTEXSHADERUID &uid, D3DBlob* bcodeblob) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h index 24be4e6c1c..d614989b0a 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h +++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h @@ -53,6 +53,9 @@ private: D3DBlob* bytecode; // needed to initialize the input layout int frameCount; + VERTEXSHADERUIDSAFE safe_uid; + std::string code; + VSCacheEntry() : shader(NULL), bytecode(NULL), frameCount(0) {} void SetByteCode(D3DBlob* blob) { diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp index f76837837d..d69f943546 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp @@ -334,6 +334,7 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) { PSCache::const_iterator iter = PixelShaders.find(uid); GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true); + ValidatePixelShaderIDs(API_D3D9, PixelShaders[uid].safe_uid, PixelShaders[uid].code, dstAlphaMode, components); return (iter != PixelShaders.end() && iter->second.shader); } @@ -350,11 +351,11 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) if (entry.shader) D3D::SetPixelShader(entry.shader); GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true); + ValidatePixelShaderIDs(API_D3D9, entry.safe_uid, entry.code, dstAlphaMode, components); return (entry.shader != NULL); } - // Need to compile a new shader const char *code = GeneratePixelShaderCode(dstAlphaMode, ((D3D::GetCaps().PixelShaderVersion >> 8) & 0xFF) < 3 ? API_D3D9_SM20 : API_D3D9_SM30, components); @@ -384,11 +385,17 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) g_ps_disk_cache.Sync(); // And insert it into the shader cache. - bool result = InsertByteCode(uid, bytecode, bytecodelen, true); + bool success = InsertByteCode(uid, bytecode, bytecodelen, true); delete [] bytecode; + if (success) + { + PixelShaders[uid].code = code; + GetSafePixelShaderId(&PixelShaders[uid].safe_uid, dstAlphaMode); + } + GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true); - return result; + return success; } bool PixelShaderCache::InsertByteCode(const PIXELSHADERUID &uid, const u8 *bytecode, int bytecodelen, bool activate) diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.h b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.h index 2f3c552e2a..d323311fe0 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.h +++ b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.h @@ -42,6 +42,9 @@ private: bool owns_shader; int frameCount; + PIXELSHADERUIDSAFE safe_uid; + std::string code; + PSCacheEntry() : shader(NULL), owns_shader(true), frameCount(0) {} void Destroy() { diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp index 5fc2b6dee2..854da9d4c2 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp @@ -187,6 +187,7 @@ bool VertexShaderCache::SetShader(u32 components) if (uid == last_vertex_shader_uid && vshaders[uid].frameCount == frameCount) { GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true); + ValidateVertexShaderIDs(API_D3D9, vshaders[uid].safe_uid, vshaders[uid].code, components); return (vshaders[uid].shader != NULL); } @@ -201,6 +202,7 @@ bool VertexShaderCache::SetShader(u32 components) if (entry.shader) D3D::SetVertexShader(entry.shader); GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true); + ValidateVertexShaderIDs(API_D3D9, entry.safe_uid, entry.code, components); return (entry.shader != NULL); } @@ -215,10 +217,15 @@ bool VertexShaderCache::SetShader(u32 components) g_vs_disk_cache.Append(uid, bytecode, bytecodelen); g_vs_disk_cache.Sync(); - bool result = InsertByteCode(uid, bytecode, bytecodelen, true); + bool success = InsertByteCode(uid, bytecode, bytecodelen, true); + if (success) + { + vshaders[uid].code = code; + GetSafeVertexShaderId(&vshaders[uid].safe_uid, components); + } delete [] bytecode; GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true); - return result; + return success; } bool VertexShaderCache::InsertByteCode(const VERTEXSHADERUID &uid, const u8 *bytecode, int bytecodelen, bool activate) { diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.h b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.h index b516f46f9a..686f8b7c6d 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.h +++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.h @@ -35,9 +35,10 @@ private: { LPDIRECT3DVERTEXSHADER9 shader; int frameCount; -#if defined(_DEBUG) || defined(DEBUGFAST) +//#if defined(_DEBUG) || defined(DEBUGFAST) std::string code; -#endif + VERTEXSHADERUIDSAFE safe_uid; +//#endif VSCacheEntry() : shader(NULL), frameCount(0) {} void Destroy() { diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp index f0a640a114..25099d4793 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp @@ -184,30 +184,13 @@ void PixelShaderCache::Shutdown() FRAGMENTSHADER* PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) { PIXELSHADERUID uid; - PIXELSHADERUIDSAFE safe_uid; GetPixelShaderId(&uid, dstAlphaMode); - GetSafePixelShaderId(&safe_uid, dstAlphaMode); - + // Check if the shader is already set - TODO: Use pShaderLast instead of PixelShaders[uid]? if (uid == last_pixel_shader_uid && PixelShaders[uid].frameCount == frameCount) { GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true); - - if (!(safe_uid == PixelShaders[uid].safe_uid)) - { - std::string code(GeneratePixelShaderCode(dstAlphaMode, API_OPENGL, components)); - if (code != PixelShaders[uid].code) - { - char msg[4096]; - char* ptr = msg; - ptr += sprintf(ptr, "Mismatch!\nUnique IDs:\n"); - for (int i = 0; i < PixelShaders[uid].safe_uid.GetNumValues()/2; ++i) - ptr += sprintf(ptr, "%02d, %08X %08X | %08X %08X\n", 2*i, PixelShaders[uid].safe_uid.values[2*i], PixelShaders[uid].safe_uid.values[2*i+1], - safe_uid.values[2*i], safe_uid.values[2*i+1]); - PanicAlert(msg); - } - } - + ValidatePixelShaderIDs(API_OPENGL, PixelShaders[uid].safe_uid, PixelShaders[uid].code, dstAlphaMode, components); return pShaderLast; } @@ -220,35 +203,19 @@ FRAGMENTSHADER* PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 comp iter->second.frameCount = frameCount; PSCacheEntry &entry = iter->second; if (&entry.shader != pShaderLast) - { pShaderLast = &entry.shader; - } GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true); - if (!(safe_uid == entry.safe_uid)) - { - std::string code(GeneratePixelShaderCode(dstAlphaMode, API_OPENGL, components)); - if (code != entry.code) - { - char msg[4096]; - char *ptr = msg; - ptr += sprintf(ptr, "Mismatch!\nUnique IDs:\n"); - for (int i = 0; i < entry.safe_uid.GetNumValues()/2; ++i) - ptr += sprintf(ptr, "%02d\t%08X %08X | %08X %08X\n", 2*i, entry.safe_uid.values[2*i], entry.safe_uid.values[2*i+1], - safe_uid.values[2*i], safe_uid.values[2*i+1]); - PanicAlert(msg); - } - } - + ValidatePixelShaderIDs(API_OPENGL, entry.safe_uid, entry.code, dstAlphaMode, components); return pShaderLast; } // Make an entry in the table PSCacheEntry& newentry = PixelShaders[uid]; newentry.frameCount = frameCount; - newentry.safe_uid = safe_uid; pShaderLast = &newentry.shader; const char *code = GeneratePixelShaderCode(dstAlphaMode, API_OPENGL, components); + GetSafePixelShaderId(&newentry.safe_uid, dstAlphaMode); newentry.code = code; #if defined(_DEBUG) || defined(DEBUGFAST) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp index 96f2d5a2ae..82455a84e1 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp @@ -77,6 +77,7 @@ VERTEXSHADER* VertexShaderCache::SetShader(u32 components) if (uid == last_vertex_shader_uid && vshaders[uid].frameCount == frameCount) { GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true); + ValidateVertexShaderIDs(API_OPENGL, vshaders[uid].safe_uid, vshaders[uid].shader.strprog, components); return pShaderLast; } memcpy(&last_vertex_shader_uid, &uid, sizeof(VERTEXSHADERUID)); @@ -86,11 +87,11 @@ VERTEXSHADER* VertexShaderCache::SetShader(u32 components) { iter->second.frameCount = frameCount; VSCacheEntry &entry = iter->second; - if (&entry.shader != pShaderLast) { + if (&entry.shader != pShaderLast) pShaderLast = &entry.shader; - } GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true); + ValidateVertexShaderIDs(API_OPENGL, entry.safe_uid, entry.shader.strprog, components); return pShaderLast; } @@ -182,9 +183,9 @@ bool VertexShaderCache::CompileVertexShader(VERTEXSHADER& vs, const char* pstrpr cgDestroyProgram(tempprog); #endif -#if defined(_DEBUG) || defined(DEBUGFAST) +//#if defined(_DEBUG) || defined(DEBUGFAST) vs.strprog = pstrprogram; -#endif +//#endif return true; } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h index e311fde77b..1711d42a63 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h @@ -32,9 +32,9 @@ struct VERTEXSHADER VERTEXSHADER() : glprogid(0) {} GLuint glprogid; // opengl program id -#if defined(_DEBUG) || defined(DEBUGFAST) +//#if defined(_DEBUG) || defined(DEBUGFAST) std::string strprog; -#endif +//#endif }; class VertexShaderCache @@ -42,6 +42,7 @@ class VertexShaderCache struct VSCacheEntry { VERTEXSHADER shader; + VERTEXSHADERUIDSAFE safe_uid; int frameCount; VSCacheEntry() : frameCount(0) {} void Destroy() { From e4b358d0a7ea703ed485c5767469da9f27b0e93a Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Thu, 8 Sep 2011 22:24:11 -0500 Subject: [PATCH 026/381] Build fix for the linux libav build. --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 415d1986b3..1870a64f8b 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -932,7 +932,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons #ifdef _WIN32 AVIDump::AddFrame(frame_data); #elif defined HAVE_LIBAV - AVIDump::AddFrame(frame_data, w, h); + AVIDump::AddFrame((u8*)frame_data, w, h); #endif Core::Callback_VideoCopiedToXFB(false); return; @@ -951,7 +951,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons #ifdef _WIN32 AVIDump::AddFrame(frame_data); #elif defined HAVE_LIBAV - AVIDump::AddFrame(frame_data, w, h); + AVIDump::AddFrame((u8*)frame_data, w, h); #endif } Core::Callback_VideoCopiedToXFB(false); @@ -1145,8 +1145,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons #ifdef _WIN32 AVIDump::AddFrame(frame_data); #else - FlipImageData(frame_data, w, h); - AVIDump::AddFrame(frame_data, w, h); + FlipImageData((u8*)frame_data, w, h); + AVIDump::AddFrame((u8*)frame_data, w, h); #endif } From 125c11cce98a80a2885f54cae7fb58b81063e068 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 9 Sep 2011 16:30:29 +0200 Subject: [PATCH 027/381] Compile fix. --- Source/Core/VideoCommon/Src/RenderBase.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/VideoCommon/Src/RenderBase.cpp b/Source/Core/VideoCommon/Src/RenderBase.cpp index fa6ba018c7..3b06bbb1c0 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.cpp +++ b/Source/Core/VideoCommon/Src/RenderBase.cpp @@ -99,8 +99,8 @@ Renderer::~Renderer() if (g_ActiveConfig.bDumpFrames && bLastFrameDumped && bAVIDumping) AVIDump::Stop(); #else - if (f_pFrameDump.IsOpen()) - f_pFrameDump.Close(); + if (pFrameDump.IsOpen()) + pFrameDump.Close(); #endif delete[] frame_data; } From 5c14a24ce115a85d9edfdd11bbf6d78ccd9eddaa Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 9 Sep 2011 21:34:46 +0200 Subject: [PATCH 028/381] Make shader ID validation optional by adding a gfx setting called "EnableShaderDebugging". Setting this to True will enable additional checks if the shader cache misses any relevant register changes. --- Source/Core/VideoCommon/Src/VideoConfig.cpp | 4 ++++ Source/Core/VideoCommon/Src/VideoConfig.h | 3 +++ .../Plugin_VideoDX11/Src/PixelShaderCache.cpp | 2 +- .../Plugin_VideoDX11/Src/VertexShaderCache.cpp | 2 +- .../Plugin_VideoDX9/Src/PixelShaderCache.cpp | 11 +++++++---- .../Plugin_VideoDX9/Src/VertexShaderCache.cpp | 2 +- .../Plugin_VideoOGL/Src/PixelShaderCache.cpp | 15 ++++++++------- .../Plugin_VideoOGL/Src/PixelShaderCache.h | 3 --- .../Plugin_VideoOGL/Src/VertexShaderCache.cpp | 6 +++--- 9 files changed, 28 insertions(+), 20 deletions(-) diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp index 8bad7b005a..2c7788c9cc 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.cpp +++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp @@ -96,6 +96,8 @@ void VideoConfig::Load(const char *ini_file) iniFile.Get("Settings", "EnableOpenCL", &bEnableOpenCL, false); iniFile.Get("Settings", "OMPDecoder", &bOMPDecoder, false); + iniFile.Get("Settings", "EnableShaderDebugging", &bEnableShaderDebugging, false); + iniFile.Get("Enhancements", "ForceFiltering", &bForceFiltering, 0); iniFile.Get("Enhancements", "MaxAnisotropy", &iMaxAnisotropy, 0); // NOTE - this is x in (1 << x) iniFile.Get("Enhancements", "PostProcessingShader", &sPostProcessingShader, ""); @@ -231,6 +233,8 @@ void VideoConfig::Save(const char *ini_file) iniFile.Set("Settings", "EnableOpenCL", bEnableOpenCL); iniFile.Set("Settings", "OMPDecoder", bOMPDecoder); + iniFile.Set("Settings", "EnableShaderDebugging", bEnableShaderDebugging); + iniFile.Set("Enhancements", "ForceFiltering", bForceFiltering); iniFile.Set("Enhancements", "MaxAnisotropy", iMaxAnisotropy); iniFile.Set("Enhancements", "PostProcessingShader", sPostProcessingShader); diff --git a/Source/Core/VideoCommon/Src/VideoConfig.h b/Source/Core/VideoCommon/Src/VideoConfig.h index 92a8b67741..83ec08784d 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.h +++ b/Source/Core/VideoCommon/Src/VideoConfig.h @@ -147,6 +147,9 @@ struct VideoConfig // D3D only config, mostly to be merged into the above int iAdapter; + // Debugging + bool bEnableShaderDebugging; + // Static config per API // TODO: Move this out of VideoConfig struct diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp index 950aaf5ef1..6dec1977b1 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp @@ -499,7 +499,7 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) bool success = InsertByteCode(uid, pbytecode->Data(), pbytecode->Size()); pbytecode->Release(); - if (success) + if (g_ActiveConfig.bEnableShaderDebugging && success) { PixelShaders[uid].code = code; GetSafePixelShaderId(&PixelShaders[uid].safe_uid, dstAlphaMode); diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp index 68326e1c60..bbddd21bb1 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp @@ -240,7 +240,7 @@ bool VertexShaderCache::SetShader(u32 components) bool success = InsertByteCode(uid, pbytecode); pbytecode->Release(); - if (success) + if (g_ActiveConfig.bEnableShaderDebugging && success) { vshaders[uid].code = code; GetSafeVertexShaderId(&vshaders[uid].safe_uid, components); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp index d69f943546..712bbadfb7 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp @@ -359,9 +359,12 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) // Need to compile a new shader const char *code = GeneratePixelShaderCode(dstAlphaMode, ((D3D::GetCaps().PixelShaderVersion >> 8) & 0xFF) < 3 ? API_D3D9_SM20 : API_D3D9_SM30, components); - u32 code_hash = HashAdler32((const u8 *)code, strlen(code)); - unique_shaders.insert(code_hash); - SETSTAT(stats.numUniquePixelShaders, unique_shaders.size()); + if (g_ActiveConfig.bEnableShaderDebugging) + { + u32 code_hash = HashAdler32((const u8 *)code, strlen(code)); + unique_shaders.insert(code_hash); + SETSTAT(stats.numUniquePixelShaders, unique_shaders.size()); + } #if defined(_DEBUG) || defined(DEBUGFAST) if (g_ActiveConfig.iLog & CONF_SAVESHADERS && code) { @@ -388,7 +391,7 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) bool success = InsertByteCode(uid, bytecode, bytecodelen, true); delete [] bytecode; - if (success) + if (g_ActiveConfig.bEnableShaderDebugging && success) { PixelShaders[uid].code = code; GetSafePixelShaderId(&PixelShaders[uid].safe_uid, dstAlphaMode); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp index 854da9d4c2..81f4af0392 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp @@ -218,7 +218,7 @@ bool VertexShaderCache::SetShader(u32 components) g_vs_disk_cache.Sync(); bool success = InsertByteCode(uid, bytecode, bytecodelen, true); - if (success) + if (g_ActiveConfig.bEnableShaderDebugging && success) { vshaders[uid].code = code; GetSafeVertexShaderId(&vshaders[uid].safe_uid, components); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp index 25099d4793..b76ce4ca9a 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp @@ -190,7 +190,7 @@ FRAGMENTSHADER* PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 comp if (uid == last_pixel_shader_uid && PixelShaders[uid].frameCount == frameCount) { GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true); - ValidatePixelShaderIDs(API_OPENGL, PixelShaders[uid].safe_uid, PixelShaders[uid].code, dstAlphaMode, components); + ValidatePixelShaderIDs(API_OPENGL, PixelShaders[uid].safe_uid, PixelShaders[uid].shader.strprog, dstAlphaMode, components); return pShaderLast; } @@ -206,7 +206,7 @@ FRAGMENTSHADER* PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 comp pShaderLast = &entry.shader; GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true); - ValidatePixelShaderIDs(API_OPENGL, entry.safe_uid, entry.code, dstAlphaMode, components); + ValidatePixelShaderIDs(API_OPENGL, entry.safe_uid, entry.shader.strprog, dstAlphaMode, components); return pShaderLast; } @@ -215,8 +215,12 @@ FRAGMENTSHADER* PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 comp newentry.frameCount = frameCount; pShaderLast = &newentry.shader; const char *code = GeneratePixelShaderCode(dstAlphaMode, API_OPENGL, components); - GetSafePixelShaderId(&newentry.safe_uid, dstAlphaMode); - newentry.code = code; + + if (g_ActiveConfig.bEnableShaderDebugging && code) + { + GetSafePixelShaderId(&newentry.safe_uid, dstAlphaMode); + newentry.shader.strprog = code; + } #if defined(_DEBUG) || defined(DEBUGFAST) if (g_ActiveConfig.iLog & CONF_SAVESHADERS && code) { @@ -320,9 +324,6 @@ bool PixelShaderCache::CompilePixelShader(FRAGMENTSHADER& ps, const char* pstrpr cgDestroyProgram(tempprog); #endif -#if defined(_DEBUG) || defined(DEBUGFAST) - ps.strprog = pstrprogram; -#endif return true; } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h index 63f71ddc13..2aac23a7e5 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h @@ -39,9 +39,7 @@ struct FRAGMENTSHADER } } GLuint glprogid; // opengl program id -#if defined(_DEBUG) || defined(DEBUGFAST) std::string strprog; -#endif }; class PixelShaderCache @@ -57,7 +55,6 @@ class PixelShaderCache shader.Destroy(); } PIXELSHADERUIDSAFE safe_uid; - std::string code; }; typedef std::map PSCache; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp index 82455a84e1..d922ef63db 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp @@ -100,6 +100,7 @@ VERTEXSHADER* VertexShaderCache::SetShader(u32 components) entry.frameCount = frameCount; pShaderLast = &entry.shader; const char *code = GenerateVertexShaderCode(components, API_OPENGL); + GetSafeVertexShaderId(&entry.safe_uid, components); #if defined(_DEBUG) || defined(DEBUGFAST) if (g_ActiveConfig.iLog & CONF_SAVESHADERS && code) { @@ -183,9 +184,8 @@ bool VertexShaderCache::CompileVertexShader(VERTEXSHADER& vs, const char* pstrpr cgDestroyProgram(tempprog); #endif -//#if defined(_DEBUG) || defined(DEBUGFAST) - vs.strprog = pstrprogram; -//#endif + if (g_ActiveConfig.bEnableShaderDebugging) + vs.strprog = pstrprogram; return true; } From a021dd7b79062d20552852d32387cf6b36ab06e6 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 9 Sep 2011 21:45:11 +0200 Subject: [PATCH 029/381] Small fix to the previous commit. --- Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 3 +++ Source/Core/VideoCommon/Src/VertexShaderGen.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 25007be93b..1ea7479990 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -243,6 +243,9 @@ void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode) void ValidatePixelShaderIDs(API_TYPE api, PIXELSHADERUIDSAFE old_id, const std::string& old_code, DSTALPHA_MODE dstAlphaMode, u32 components) { + if (!g_ActiveConfig.bEnableShaderDebugging) + return; + PIXELSHADERUIDSAFE new_id; GetSafePixelShaderId(&new_id, dstAlphaMode); diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp index 902f645bec..f3dab89173 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp @@ -93,6 +93,9 @@ void GetSafeVertexShaderId(VERTEXSHADERUIDSAFE *uid, u32 components) void ValidateVertexShaderIDs(API_TYPE api, VERTEXSHADERUIDSAFE old_id, const std::string& old_code, u32 components) { + if (!g_ActiveConfig.bEnableShaderDebugging) + return; + VERTEXSHADERUIDSAFE new_id; GetSafeVertexShaderId(&new_id, components); From 5d075ce507c180dc89b9731eaa2f52e729caf8f6 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 10 Sep 2011 03:10:28 +0200 Subject: [PATCH 030/381] - D3D9: pass the correct API type to ValidatePixelShaderIDs - don't load shader cache from disk in d3d9/11 if shader debugging is enabled (we won't have any info about the source shader code otherwise, etc) - dump shader source codes on safe UIDs mismatch Thanks to LordMark and [SS] for reporting those to me ;) --- Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 2 ++ Source/Core/VideoCommon/Src/VertexShaderGen.cpp | 2 ++ .../Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp | 3 +++ .../Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp | 3 +++ .../Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp | 10 +++++++--- .../Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp | 3 +++ 6 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 1ea7479990..7937c695ce 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -271,6 +271,8 @@ void ValidatePixelShaderIDs(API_TYPE api, PIXELSHADERUIDSAFE old_id, const std:: sprintf(szTemp, "%spsuid_mismatch_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++); std::ofstream file(szTemp); file << msg; + file << "\n\nOld shader code:\n" << old_code; + file << "\n\nNew shader code:\n" << new_code; file.close(); PanicAlert("Unique pixel shader ID mismatch!\n\nReport this to the devs, along with the contents of %s.", szTemp); diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp index f3dab89173..5c6c12887a 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp @@ -121,6 +121,8 @@ void ValidateVertexShaderIDs(API_TYPE api, VERTEXSHADERUIDSAFE old_id, const std sprintf(szTemp, "%svsuid_mismatch_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++); std::ofstream file(szTemp); file << msg; + file << "\n\nOld shader code:\n" << old_code; + file << "\n\nNew shader code:\n" << new_code; file.close(); PanicAlert("Unique pixel shader ID mismatch!\n\nReport this to the devs, along with the contents of %s.", szTemp); diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp index 6dec1977b1..c278ae1d81 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp @@ -412,6 +412,9 @@ void PixelShaderCache::Init() SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str()); PixelShaderCacheInserter inserter; g_ps_disk_cache.OpenAndRead(cache_filename, inserter); + + if (g_Config.bEnableShaderDebugging) // TODO: Hacks.. + Clear(); } // ONLY to be used during shutdown. diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp index bbddd21bb1..f46881b16b 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp @@ -174,6 +174,9 @@ void VertexShaderCache::Init() SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str()); VertexShaderCacheInserter inserter; g_vs_disk_cache.OpenAndRead(cache_filename, inserter); + + if (g_Config.bEnableShaderDebugging) // TODO: Hacks.. + Clear(); } void VertexShaderCache::Clear() diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp index 712bbadfb7..7f2cdfceee 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp @@ -283,6 +283,9 @@ void PixelShaderCache::Init() SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str()); PixelShaderCacheInserter inserter; g_ps_disk_cache.OpenAndRead(cache_filename, inserter); + + if (g_Config.bEnableShaderDebugging) // TODO: Hacks.. + Clear(); } // ONLY to be used during shutdown. @@ -326,6 +329,7 @@ void PixelShaderCache::Shutdown() bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) { + const API_TYPE api = ((D3D::GetCaps().PixelShaderVersion >> 8) & 0xFF) < 3 ? API_D3D9_SM20 : API_D3D9_SM30; PIXELSHADERUID uid; GetPixelShaderId(&uid, dstAlphaMode); @@ -334,7 +338,7 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) { PSCache::const_iterator iter = PixelShaders.find(uid); GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true); - ValidatePixelShaderIDs(API_D3D9, PixelShaders[uid].safe_uid, PixelShaders[uid].code, dstAlphaMode, components); + ValidatePixelShaderIDs(api, PixelShaders[uid].safe_uid, PixelShaders[uid].code, dstAlphaMode, components); return (iter != PixelShaders.end() && iter->second.shader); } @@ -351,13 +355,13 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) if (entry.shader) D3D::SetPixelShader(entry.shader); GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true); - ValidatePixelShaderIDs(API_D3D9, entry.safe_uid, entry.code, dstAlphaMode, components); + ValidatePixelShaderIDs(api, entry.safe_uid, entry.code, dstAlphaMode, components); return (entry.shader != NULL); } // Need to compile a new shader - const char *code = GeneratePixelShaderCode(dstAlphaMode, ((D3D::GetCaps().PixelShaderVersion >> 8) & 0xFF) < 3 ? API_D3D9_SM20 : API_D3D9_SM30, components); + const char *code = GeneratePixelShaderCode(dstAlphaMode, api, components); if (g_ActiveConfig.bEnableShaderDebugging) { diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp index 81f4af0392..3ef18ffba8 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp @@ -151,6 +151,9 @@ void VertexShaderCache::Init() SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str()); VertexShaderCacheInserter inserter; g_vs_disk_cache.OpenAndRead(cache_filename, inserter); + + if (g_Config.bEnableShaderDebugging) // TODO: Hacks.. + Clear(); } void VertexShaderCache::Clear() From 2df4811807ab4a90c3871b8c9f361799adb98f9c Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 12 Sep 2011 17:58:05 +0200 Subject: [PATCH 031/381] More buildfixes.. --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 1870a64f8b..19142e44bb 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -1178,7 +1178,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons std::string movie_file_name; w = dst_rect.GetWidth(); h = dst_rect.GetHeight(); - frame_data = new u8[3 * w * h]; + 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); if (GL_REPORT_ERROR() == GL_NO_ERROR) @@ -1198,7 +1198,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons } if (pFrameDump) { - FlipImageData(frame_data, w, h); + FlipImageData((u8*)frame_data, w, h); pFrameDump.WriteBytes(frame_data, w * 3 * h); pFrameDump.Flush(); } From 854c4903ebf7e5236775699616629cc954f75d32 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 12 Sep 2011 18:01:45 +0200 Subject: [PATCH 032/381] Only link against libav if it's available. --- Source/Core/DolphinWX/CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 5fc433009f..f38e791cd0 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -9,12 +9,13 @@ set(LIBS core sfml-network SDL GL - avcodec - avformat - swscale ${XRANDR_LIBRARIES} ${X11_LIBRARIES}) +if(LIBAV_FOUND) + set(LIBS ${LIBS} ${LIBAV_LIBRARIES}) +endif() + if(wxWidgets_FOUND) set(SRCS Src/ARCodeAddEdit.cpp Src/AboutDolphin.cpp From 743253a6e3654279df9453e967d8da12b5df0777 Mon Sep 17 00:00:00 2001 From: Runo Date: Mon, 12 Sep 2011 22:44:03 -0300 Subject: [PATCH 033/381] Update Pt_BR Translation to POT file revision 60. This is also a testing commit, as this is my first one on this repository ^^ --- Languages/po/pt_BR.po | 610 +++++++++++++----------------------------- 1 file changed, 191 insertions(+), 419 deletions(-) diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index 1ac0c7a002..d7d782547c 100644 --- a/Languages/po/pt_BR.po +++ b/Languages/po/pt_BR.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-08-10 08:30-0500\n" -"PO-Revision-Date: 2011-07-09 19:12-0300\n" +"PO-Revision-Date: 2011-09-11 23:35-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" +"Language: \n" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" @@ -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\" é um arquivo GCM/ISO inválido, ou não é um arquivo ISO de GC/Wii." +msgstr "\"%s\" é um arquivo GCM/ISO inválido, ou não é um arquivo ISO de GC/Wii." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:193 #, c-format @@ -58,9 +57,9 @@ msgid "%d Hz" msgstr "%d Hz" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 -#, fuzzy, c-format +#, c-format msgid "%i connected" -msgstr "Desconectado" +msgstr "%i conectado" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296 @@ -74,22 +73,22 @@ msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s não pôde ser \"limpo\". A imagem provavelmente está corrompida." #: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 -#, fuzzy, c-format +#, c-format msgid "" "%s failed to load as a memorycard \n" " Card file size is invalid (0x%x bytes)" msgstr "" -"Falha ao carregar o Memory Card\n" -" O tamanho é inválido (%04X)" +"%s falhou ao ser carregado como Memory Card\n" +" O tamanho é inválido (0x%x bytes)" #: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 -#, fuzzy, c-format +#, c-format msgid "" "%s failed to load as a memorycard \n" " Card size is invalid (0x%x bytes)" msgstr "" -"Falha ao carregar o Memory Card\n" -" O tamanho é inválido (%04X)" +"%s falhou ao ser carregado como Memory Card\n" +" O tamanho é inválido (0x%x bytes)" #: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 #, c-format @@ -97,6 +96,8 @@ 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ão pôde ser carregado como um MemoryCard \n" +"o arquivo não é grande o bastante para ser um arquivo de Memory Card (0x%x bytes)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -367,13 +368,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" @@ -383,18 +382,14 @@ msgid "" msgstr "" "ALERTA:\n" "\n" -"O NetPlay atualmente irá funcionar corretamente apenas usando as " -"configurações a seguir:\n" +"O NetPlay atualmente irá funcionar corretamente apenas usando as configurações a seguir:\n" " - Dual Core [DESLIGADO]\n" " - Aceleração de Audio [Desligado]\n" " - DSP-HLE com \"Audio Nulo\" ou DSP-LLE\n" -" - Manualmente configurar o número exato de controles a serem usados para " -"[Controle Padrão]\n" +" - Manualmente configurar o número exato de controles a serem usados para [Controle Padrão]\n" "\n" -"Todos os jogadores devem tentar usar a mesma versão e configuração do " -"Dolphin.\n" -"Desative todos os cartões de memórias ou mande eles para todos os jogadores " -"antes de começar .\n" +"Todos os jogadores devem tentar usar a mesma versão e configuração do Dolphin.\n" +"Desative todos os cartões de memórias ou mande eles para todos os jogadores antes de começar .\n" "Suport ao wiimote não foi implementado.\n" "\n" "Você deve redirecionar as portas TCP para ser o Host!!" @@ -424,14 +419,12 @@ msgstr "Emulção precisa de 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, leave this checked." msgstr "" "Emula as Cópias do EFB com precisão.\n" -"Alguns jogos dependem disso para certos efeitos visuais ou funções de " -"jogabilidade.\n" +"Alguns jogos dependem disso para certos efeitos visuais ou funções de jogabilidade.\n" "\n" "Se estiver em dúvida, deixe isto ativado." @@ -456,38 +449,23 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" -msgstr "" -"Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Add Code " -"(%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +msgstr "Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Add Code (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:756 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " -"(%s)" -msgstr "" -"Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Fill e " -"Slide (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)" +msgstr "Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Fill e Slide (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:549 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " -"Fill (%s)" -msgstr "" -"Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em RAM Write " -"e Fill (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)" +msgstr "Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em RAM Write e Fill (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:609 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Write To " -"Pointer (%s)" -msgstr "" -"Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Write to " -"Pointer (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Write To Pointer (%s)" +msgstr "Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Write to Pointer (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:803 #, c-format @@ -496,11 +474,8 @@ msgstr "Erro no Action Replay: Valor inválido (%08x) na Cópia de Memória (%s) #: Source/Core/Core/Src/ActionReplay.cpp:684 #, c-format -msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "" -"Erro no Action Replay: Master Code e Write To CCXXXXXX não está implementado " -"(%s)" +msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgstr "Erro no Action Replay: Master Code e Write To CCXXXXXX não está implementado (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -562,16 +537,14 @@ msgstr "Endereço:" 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 "" "Adiciona o valor especificado ao Parâmetro do zFar.\n" "Duas formas de expressar os valores flutuantes do ponteiro.\n" -"Exemplo: Digitar ''200'' ou ''0.0002'' diretamente, isso vai produzir " -"efeitos iguais, o valor adquirido será ''0.0002''.\n" +"Exemplo: Digitar ''200'' ou ''0.0002'' diretamente, isso vai produzir efeitos iguais, o valor adquirido será ''0.0002''.\n" "Valores: (0->+/-Inteiro) ou (0->+/-FP[6 dígitos precisos])\n" "\n" "NOTA: Confira a Janela de Log/Console para ver os valores adquiridos." @@ -580,16 +553,14 @@ 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 "" "Adiciona o valor especificado ao Parâmetro do zNear.\n" "Duas formas de expressar os valores flutuantes do ponteiro.\n" -"Exemplo: Digitar ''200'' ou ''0.0002'' diretamente, isso vai produzir " -"efeitos iguais, o valor adquirido será ''0.0002''.\n" +"Exemplo: Digitar ''200'' ou ''0.0002'' diretamente, isso vai produzir efeitos iguais, o valor adquirido será ''0.0002''.\n" "Valores: (0->+/-Inteiro) ou (0->+/-FP[6 dígitos precisos])\n" "\n" "NOTA: Confira a Janela de Log/Console para ver os valores adquiridos." @@ -637,13 +608,11 @@ msgstr "Todos os arquivos (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 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, 6 e 7 enquanto o emulador está funcionando.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -700,9 +669,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 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!" +msgstr "Você tem certeza que quer deletar este arquivo? Ele ficará perdido para sempre!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 @@ -886,17 +853,12 @@ 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" +"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" +"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." @@ -928,21 +890,22 @@ msgstr "Não é possível abrir %s" #: Source/Core/DolphinWX/Src/FrameTools.cpp:721 msgid "Cannot record movies in read-only mode." -msgstr "" +msgstr "Não é possível gravar vídeos no modo Apenas Leitura" #: Source/Core/Core/Src/CoreTiming.cpp:122 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:1016 -#, fuzzy, c-format +#, c-format msgid "" "Cannot use that file as a memory card.\n" "%s\n" "is not a valid gamecube memory card file" msgstr "" "Não é possível usar aquele arquivo como um Memory Card.\n" -"Você está tentando usar o mesmo arquivo nos dois slots?" +"%s\n" +"não é um arquivo de Memory Card válido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 msgid "" @@ -955,14 +918,12 @@ msgstr "" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858 #, 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" +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:1872 #, 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" +msgstr "Não foi possível encontrar o Wiimote pelo identificador de conexão %02x" #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 @@ -1069,12 +1030,8 @@ msgid "Choose a memory card:" msgstr "Escolher um cartão de memória:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 -msgid "" -"Choose file to use as apploader: (applies to discs constructed from " -"directories only)" -msgstr "" -"Escolher um arquivo para ser usado como apploader: (aplicável somente para " -"discos construídos de diretórios)" +msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" +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:764 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 @@ -1101,12 +1058,8 @@ msgid "Clear failed." msgstr "Falha na liberação." #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "" -"Client disconnect while game is running!! NetPlay is disabled. You must " -"manually stop the game." -msgstr "" -"O Client desconectou-se enquanto o jogo rodava!! O NetPlay foi desativado. " -"Você deve parar o jogo manualmente." +msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." +msgstr "O Client desconectou-se enquanto o jogo rodava!! O NetPlay foi desativado. Você deve parar o jogo manualmente." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 @@ -1256,14 +1209,8 @@ msgstr "Não foi possível inicializar o Backend 5s. %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 "" -"Não foi possível ler \"%s\". Não há nenhum disco no leitor, ou não é uma " -"cópia de GC/Wii. Note que os discos originais de Gamecube e Wii não podem " -"ser lidos pela maioria dos leitores de DVD dos PCs." +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 "Não foi possível ler \"%s\". Não há nenhum disco no leitor, ou não é uma cópia de GC/Wii. Note que os discos originais de Gamecube e Wii não podem ser lidos pela maioria dos leitores de DVD dos PCs." #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format @@ -1280,8 +1227,7 @@ 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ão foi possível definir os controles. O jogador saiu ou o jogo está rodando " -"no momento!\n" +"Não foi possível definir os controles. O jogador saiu ou o jogo está rodando no momento!\n" "(Definir os controles durante o jogo ainda não é suportado)" #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 @@ -1289,13 +1235,11 @@ msgstr "" 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 "" "Não foi possível escrever no arquivo de Memory Card %s.\n" "\n" -"Você está executando o Dolphin de um CD/DVD, ou talvez o arquivo de salva " -"seja somente-leitura?" +"Você está executando o Dolphin de um CD/DVD, ou talvez o arquivo de salva seja somente-leitura?" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 msgid "Couldn't find open command for extension 'ini'!" @@ -1333,10 +1277,8 @@ msgid "Created by KDE-Look.org" msgstr "Criado por KDE-Look.org" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 -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 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:492 msgid "Created by VistaIcons.com" @@ -1352,7 +1294,7 @@ msgstr "Criador:" #: Source/Core/Common/Src/MsgHandler.cpp:68 msgid "Critical" -msgstr "" +msgstr "Crítico" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Crop" @@ -1512,12 +1454,8 @@ msgstr "Detectar" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -msgid "" -"Detected attempt to read more data from the DVD than fit inside the out " -"buffer. Clamp." -msgstr "" -"Foi detectada a tentativa de ler mais dados do DVD do que cabem no buffer de " -"saída. Segurando." +msgid "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp." +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 @@ -1577,30 +1515,24 @@ msgstr "Desabilitar o Auto-Falante do Wiimote" #: 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 "" "Desativa a emulação do XFB.\n" -"Aumenta bastante a performance mas pode causar problemas em vários jogos que " -"precisam dela (especialmente aplicativos amadores/homebrew).\n" +"Aumenta bastante a performance mas pode causar problemas em vários jogos que precisam dela (especialmente aplicativos amadores/homebrew).\n" "\n" "Se estiver em dúvida, deixe isto ativado." #: 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 "" "Desativa a emulação de cópias do EFB.\n" -"Elas são usadas com frequência para efeitos pós-processamento ou efeitos de " -"textura, portanto apesar de esta opção aumentar bastante a velocidade, ela " -"quase sempre causa problemas.\n" +"Elas são usadas com frequência para efeitos pós-processamento ou efeitos de textura, portanto apesar de esta opção aumentar bastante a velocidade, ela quase sempre causa problemas.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -1688,20 +1620,12 @@ msgid "Dolphin at &Google Code" msgstr "Dolphin no &Google Code" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 -msgid "" -"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " -"files..." -msgstr "" -"Dolphin não pôde encontrar ISOs GC/Wii. Duplo-clique aqui para procurar por " -"arquivos..." +msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." +msgstr "Dolphin não pôde encontrar ISOs GC/Wii. Duplo-clique aqui para procurar por arquivos..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 -msgid "" -"Dolphin is currently set to hide all games. Doubleclick here to show all " -"games..." -msgstr "" -"Dolphin atualmente está configurado para esconder todos os jogos. Duplo-" -"clique aqui para mostrar todos os jogos..." +msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." +msgstr "Dolphin atualmente está configurado para esconder todos os jogos. Duplo-clique aqui para mostrar todos os jogos..." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 @@ -1747,8 +1671,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Transfere todos os quadros renderizados para um arquivo AVI em User/Dump/" -"Frames/\n" +"Transfere todos os quadros renderizados para um arquivo AVI em User/Dump/Frames/\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -1787,16 +1710,8 @@ msgstr "Cópias de EFB" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, 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 " -"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." +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 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." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 msgid "EUROPE" @@ -1846,30 +1761,24 @@ msgstr "Este Segmento de Emulação já está rodando" #: 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 "" "Emula os XFBs com precisão.\n" -"Diminui muito a performance e impossibilita a renderização em resoluções " -"altas mas é necessário para emular corretamente um certo número de jogos.\n" +"Diminui muito a performance e impossibilita a renderização em resoluções altas mas é necessário para emular corretamente um certo número de jogos.\n" "\n" "Se estiver em dúvida, selecione Virtual." #: 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 "" "Emula os XFBs usando objetos de textura da GPU.\n" -"Corrige vários jogos que dependem da emulação do XFB e é bem mais rápido que " -"o XFB real. No entanto, ele ainda não funciona para muitos outros jogos (em " -"especial aplicativos homebrew/amadores).\n" +"Corrige vários jogos que dependem da emulação do XFB e é bem mais rápido que o XFB real. No entanto, ele ainda não funciona para muitos outros jogos (em especial aplicativos homebrew/amadores).\n" "\n" "Se estiver em dúvida, deixe isto ativado." @@ -1887,15 +1796,13 @@ msgstr "Ativar" #: 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 "" -"Ativa efeitos 3D através de estereoscopia usando a tecnologia Nvidia 3D " -"Vision se isto for suportado pela sua GPU.\n" +"Ativa efeitos 3D através de estereoscopia usando a tecnologia Nvidia 3D Vision se isto for suportado pela sua GPU.\n" "Pode causar problemas.\n" "Pecisa estar em Tela Cheia para funcionar.\n" "\n" @@ -1975,19 +1882,14 @@ msgid "" "If unsure, select 1x." msgstr "" "Ativar Filtro Anisotrópico.\n" -"Melhora a qualidade visual das texturas quando são vistas de ângulos " -"oblíquos.\n" +"Melhora a qualidade visual das texturas quando são vistas de ângulos oblíquos.\n" "Pode causar problemas em um número pequeno de jogos. \n" "\n" "Se estiver em dúvida, selecione 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -msgid "" -"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " -"Compatible)" -msgstr "" -"Ativar acesso rápido de disco. Necessário para alguns jogos.(ON = Rapido, " -"OFF = Compativel)" +msgid "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)" +msgstr "Ativar acesso rápido de disco. Necessário para alguns jogos.(ON = Rapido, OFF = Compativel)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Enable pages" @@ -2007,33 +1909,21 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 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 "" -"Tive esta opção se você quiser usar a janela principal do Dolphin para " -"mostrar o jogo em vez de uma janela separada para a renderização.\n" +"Tive esta opção se você quiser usar a janela principal do Dolphin para mostrar o jogo em vez de uma janela separada para a renderização.\n" "\n" "Se estiver em dúvida, deixe isto desativado." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 -msgid "" -"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " -"ANY other game." -msgstr "" -"Ative isso para ter ganho de velocidade em The legend of Zelda: Twilight " -"Princess. Disative para QUALQUER UM outro jogo." +msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." +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:311 -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 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:334 msgid "Enables Custom Projection Hack" @@ -2052,12 +1942,8 @@ msgstr "" "Se estiver em dúvida, deixe isto desativado" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -msgid "" -"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " -"OFF = Fast)" -msgstr "" -"Ativar unidade de gerenciamento de memoria, necessário para alguns jogos. " -"(ON = Compativel, OFF = Rapido)" +msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" +msgstr "Ativar unidade de gerenciamento de memoria, necessário para alguns jogos. (ON = Compativel, OFF = Rapido)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" @@ -2114,12 +2000,8 @@ msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema." #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 #, c-format -msgid "" -"Error: Trying to access %s fonts but they are not loaded. Games may not show " -"fonts correctly, or crash." -msgstr "" -"Erro: Tentando acessar as fontes %s mas elas não estão carregadas. Os jogos " -"podem não mostrar as fontes corretamente, ou travar." +msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." +msgstr "Erro: Tentando acessar as fontes %s mas elas não estão carregadas. Os jogos podem não mostrar as fontes corretamente, ou travar." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2132,8 +2014,7 @@ msgstr "Euphoria" #: Source/Core/Core/Src/MemTools.cpp:214 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" -msgstr "" -"Manipulador de Exceções - Acesso abaixo do espaço da memória. %08llx%08llx" +msgstr "Manipulador de Exceções - Acesso abaixo do espaço da memória. %08llx%08llx" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Execute" @@ -2262,7 +2143,7 @@ msgstr "Não foi possível Ouvir!!" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 msgid "Failed to download codes." -msgstr "Fa" +msgstr "Falha ao dazer o download de códigos." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 #, c-format @@ -2470,8 +2351,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Força filtro de texturas mesmo que o jogo tenha desativado-o " -"explicitamente.\n" +"Força filtro de texturas mesmo que o jogo tenha desativado-o explicitamente.\n" "Melhora um pouco a qualidade das texturas mas causa erros em certos jogos.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -2491,12 +2371,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 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 "" "Força o modo NTSC-J para usar a fonte da ROM Japonesa.\n" -"Se isto ficar desativado, o Dolphin usa NTSC-U e ativa esta opção " -"automaticamente quando você jogar jogos japoneses." +"Se isto ficar desativado, o Dolphin usa NTSC-U e ativa esta opção automaticamente quando você jogar jogos japoneses." #: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 msgid "" @@ -2641,7 +2519,7 @@ msgstr "Geral" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 msgid "General Settings" -msgstr "Opções Gerais" +msgstr "Configurações Gerais" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 @@ -2668,14 +2546,12 @@ msgstr "Maior do que" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 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" "\n" "If unsure, leave this checked." msgstr "" -"Aumenta muito a qualidade das texturas geradas usando efeitos de " -"renderização.\n" +"Aumenta muito a qualidade das texturas geradas usando efeitos de renderização.\n" "Aumentar a Resolução Interna vai melhorar o efeito desta opção.\n" "\n" "Se estiver em dúvida, deixe isto ativado." @@ -2736,8 +2612,7 @@ msgstr "" "Olá\n" "\n" "O Dolphin precisa que a sua CPU tenha suporte a extensões SSE2. \n" -"Infelizmente a sua CPU não tem este suporte, e portanto o Dolphin não " -"funcionará.\n" +"Infelizmente a sua CPU não tem este suporte, e portanto o Dolphin não funcionará.\n" "\n" "Sayonara!\n" @@ -2788,19 +2663,16 @@ msgstr "Wiimote Hibrido" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 #, 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" +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:795 #, 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: O jogo tentou recarregar a ios ou um título que não está " -"disponível no dump do seu NAND\n" +"IOCTL_ES_LAUNCH: O jogo tentou recarregar a ios ou um título que não está disponível no dump do seu NAND\n" "TitleID %016llx.\n" " O Dolphin vai provavelmente travar agora" @@ -2841,20 +2713,12 @@ msgid "Icon" msgstr "Icone" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -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)" +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:481 -msgid "" -"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." -msgstr "" -"Se você colocar o Limitador de FPS em um valor maior que a velocidade máxima " -"do jogo (NTSC:60, PAL:50), você também vai precisar desativar o Throttle de " -"Ãudio no DSP para que funcione." +msgid "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." +msgstr "Se você colocar o Limitador de FPS em um valor maior que a velocidade máxima do jogo (NTSC:60, PAL:50), você também vai precisar desativar o Throttle de Ãudio no DSP para que funcione." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 msgid "Ignore Format Changes" @@ -2863,28 +2727,24 @@ msgstr "Ignorar Mudanças de Formato" #: 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 "" "Ignora qualquer mudança no formato do EFB.\n" -"Melhora a Performance em vários jogos sem qualquer efeito negativo. Causa " -"defeitos gráficos em um pequeno número de jogos, no entanto.\n" +"Melhora a Performance em vários jogos sem qualquer efeito negativo. Causa defeitos gráficos em um pequeno número de jogos, no entanto.\n" "\n" "Se estiver em dúvida, deixe isto ativado." #: 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 "" "Ignora quaisquer pedidos da CPU de ler ou escrever no EFB.\n" -"Melhora a performance em alguns jogos, mas pode desativar algumas funções " -"dos jogos ou efeitos gráficos.\n" +"Melhora a performance em alguns jogos, mas pode desativar algumas funções dos jogos ou efeitos gráficos.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -2918,13 +2778,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 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 "" -"Aumenta a performance mas causa problemas em jogos que dependem da emulação " -"apropriada da névoa.\n" +"Aumenta a performance mas causa problemas em jogos que dependem da emulação apropriada da névoa.\n" "\n" "Se estiver em dúvida, deixe esta opção desativada." @@ -2934,8 +2792,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Melhora a performance mas faz a iluminação desaparecer na maioria dos " -"jogos.\n" +"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." @@ -2985,11 +2842,8 @@ msgid "Install to Wii Menu" msgstr "Instalar para o menu do WII" #: Source/Core/Core/Src/MemTools.cpp:248 -msgid "" -"InstallExceptionHandler called, but this platform does not yet support it." -msgstr "" -"InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem " -"suporte a ele." +msgid "InstallExceptionHandler called, but this platform does not yet support it." +msgstr "InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem suporte a ele." #: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 msgid "Installing WAD..." @@ -3238,8 +3092,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Carrega texturas de alta definição do diretório User/Load/Textures//\n" +"Carrega texturas de alta definição do diretório User/Load/Textures//\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -3346,12 +3199,8 @@ msgid "Memory Card" msgstr "Cartão de memoria" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "" -"Memory Card Manager WARNING-Make backups before using, should be fixed but " -"could mangle stuff!" -msgstr "" -"AVISO do Gerenciador de- Memory Card - Faça backupsantes de usar, deve estar " -"funcionando mas pode corromper coisas!" +msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" +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 #, c-format @@ -3372,7 +3221,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" -msgstr "" +msgstr "O tamanho do arquivo do Memory Card é diferente do tamanho do header" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:47 msgid "Menu" @@ -3402,14 +3251,11 @@ msgstr "Modificador" #: 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 "" -"Modifica as texturas para que elas mostrem o formato em que elas estão " -"codificadas. Ao ativar isto, é preciso reiniciar a emulação na maioria das " -"vezes.\n" +"Modifica as texturas para que elas mostrem o formato em que elas estão codificadas. Ao ativar isto, é preciso reiniciar a emulação na maioria das vezes.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -3449,12 +3295,8 @@ msgid "Multiply" msgstr "Multiplicar" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -msgid "" -"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " -"effect on emulated wiimotes." -msgstr "" -"Desliga o som que sai do Wiimote. Corrige desconexões imprevisíveis em " -"Wiimotes Reais. Não faz efeito em Wiimotes Emulados." +msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." +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/WXInputBase.cpp:126 msgid "NP Add" @@ -3758,12 +3600,8 @@ msgid "Other" msgstr "Outros" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "" -"Other client disconnected while game is running!! NetPlay is disabled. You " -"manually stop the game." -msgstr "" -"Outro Client desconectou enquanto o jogo rodava!! O Netplay foi " -"desabilitado. Você deve parar o jogo manualmente." +msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." +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 msgid "Output" @@ -3993,9 +3831,8 @@ msgid "Real Wiimote" msgstr "Wiimote Real" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 -#, fuzzy msgid "Real Wiimotes" -msgstr "Wiimote Real" +msgstr "Wiimotes Reais" #: Source/Core/DolphinWX/Src/Frame.cpp:163 msgid "Reconnect Wiimote Confirm" @@ -4220,8 +4057,10 @@ msgstr "Filtro de Busca" msgid "Search Subfolders" msgstr "Procurar em sub-pastas" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:104 +#: Source/Core/Common/Src/SysConf.h:127 +#: Source/Core/Common/Src/SysConf.h:147 +#: Source/Core/Common/Src/SysConf.h:168 #, c-format msgid "Section %s not found in SYSCONF" msgstr "A seção %s não foi encontrada no SYSCONF" @@ -4298,15 +4137,13 @@ msgstr "Fonte Selecionada" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 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 "" "Seleciona que resolução será usada no modo Tela Cheia.\n" -"Isto deve ser sempre maior ou igual à Resolução Interna. O impacto na " -"performance é insignificante.\n" +"Isto deve ser sempre maior ou igual à Resolução Interna. O impacto na performance é insignificante.\n" "\n" "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.." @@ -4314,15 +4151,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 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 "" "Seleciona qual API gráfico será usado internamente.\n" -"Direct3D 9 é geralmente o mais rápido. O OpenGL tem menos erros, no entanto. " -"O Direct3D 11 está entre os dois.\n" +"Direct3D 9 é geralmente o mais rápido. O OpenGL tem menos erros, no entanto. O Direct3D 11 está entre os dois.\n" "Note que os Backends Direct3D só podem ser usados no Windows.\n" "\n" "Se estiver em dúvida, use o Direct3D 9." @@ -4344,11 +4179,8 @@ msgid "Serbian" msgstr "Sérvio" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -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" +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 msgid "Set" @@ -4366,8 +4198,7 @@ msgstr "Definir como Memory Card padrão%c" #: Source/Core/Core/Src/ActionReplay.cpp:462 #, c-format 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" +msgstr "SetARCode_IsActive: O índice é maior que a lista de códigos AR de tamanho %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Settings..." @@ -4488,12 +4319,10 @@ msgstr "Mostrar uma janela de confirmação antes de parar um jogo." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 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 "" "Mostra uma menssagem 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." +"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:812 msgid "Show first block" @@ -4517,13 +4346,11 @@ msgstr "Mostrar título do salva" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 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 "" -"Mostra o número de quadros renderizados por segundo como uma forma de medir " -"a velocidade da emulação.\n" +"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." @@ -4571,13 +4398,11 @@ msgstr "Não permite o acesso da CPU ao EFB" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 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 "" -"Não faz o passe de destino Alfa usado em muitos jogos para vários efeitos " -"gráficos.\n" +"Não faz o passe de destino Alfa usado em muitos jogos para vários efeitos gráficos.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -4605,15 +4430,13 @@ msgstr "Renderizador por Software" #: 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 "" "O Renderizador por Software é bem mais lento que os outros backends.\n" "É útil apenas para a depuração de problemas.\n" -"Você realmente quer utilizar o Renderizador por Software? Se estiver em " -"dúvida, pressione 'Não'." +"Você realmente quer utilizar o Renderizador por Software? Se estiver em dúvida, pressione 'Não'." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 msgid "Sound Settings" @@ -4645,21 +4468,13 @@ msgstr "Volume do Auto-Falante:" #: 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 "" -"Especifica a resolução a renderizar. Uma resolução mais alta aumenta a " -"qualidade visual mas é bastante pesada e pode causar problemas em alguns " -"jogos.\n" -"\"Múltiplo de 640x528\" é um pouco mais lento que \"Window Size\" mas causa " -"menos problemas. De forma geral, quanto menor for a resolução interna, maior " -"será a performance.\n" +"Especifica a resolução a renderizar. Uma resolução mais alta aumenta a qualidade visual mas é bastante pesada e pode causar problemas em alguns jogos.\n" +"\"Múltiplo de 640x528\" é um pouco mais lento que \"Window Size\" mas causa menos problemas. De forma geral, quanto menor for a resolução interna, maior será a performance.\n" "\n" "Se estiver em dúvida, selecione 640x528." @@ -4814,12 +4629,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 "" -"O arquivo %s não pôde ser aberto para escrita. Por favor cheque se ele não " -"está aberto em outro programa." +msgid "The file %s could not be opened for writing. Please check if it's already opened by another program." +msgstr "O arquivo %s não pôde ser aberto para escrita. Por favor cheque se ele não está aberto em outro programa." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format @@ -4845,16 +4656,11 @@ msgstr "O código AR resultante da derciptação não contém nenhuma linha." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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" +msgstr "O Salva que você está tentando copiar tem um tamanho de arquivo inválido" #: Source/Core/DolphinWX/Src/Main.cpp:363 -msgid "" -"The selected language is not supported by your system. Falling back to " -"system default." -msgstr "" -"O idioma selecionado não é suportado pelo seu sistema. Voltando ao padrão do " -"sistema." +msgid "The selected language is not supported by your system. Falling back to system default." +msgstr "O idioma selecionado não é suportado pelo seu sistema. Voltando ao padrão do sistema." #: Source/Core/Core/Src/NetPlayClient.cpp:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -4890,12 +4696,8 @@ 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:467 -msgid "" -"There must be a ticket for 00000001/00000002. Your NAND dump is probably " -"incomplete." -msgstr "" -"É necessário um ticket para 00000001/00000002. O seu Dump do NAND está " -"provavelmente incompleto." +msgid "There must be a ticket for 00000001/00000002. Your NAND dump is probably incomplete." +msgstr "É necessário um ticket para 00000001/00000002. O seu Dump do NAND está provavelmente incompleto." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "" @@ -4906,34 +4708,23 @@ msgstr "" "Indeterminado significa que o jogo usa as configurações do Dolphin." #: Source/Core/Core/Src/ActionReplay.cpp:356 -msgid "" -"This action replay simulator does not support codes that modify Action " -"Replay itself." -msgstr "" -"Este simulador de Action Replay não suporta códigos que modifiquem o Action " -"Replay em si." +msgid "This action replay simulator does not support codes that modify Action Replay itself." +msgstr "Este simulador de Action Replay não suporta códigos que modifiquem o Action Replay em si." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 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." +msgstr "Isto pode causar diminuição da performance no Wii Menu e em alguns jogos." #: 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 "" "Este recurso permite mexer na câmera do jogo.\n" "\n" -"Segure o botão direito e mova o mouse para mover a câmera em qualquer " -"direção. Segure SHIFT e pressione uma das teclas WASD para mover a câmera em " -"uma certa distância (SHIFT+0 para movê-la mais rápido e SHIFT+9 para movê-la " -"mais devagar). Pressione SHIFT+R para voltar a câmera à posição inicial.\n" +"Segure o botão direito e mova o mouse para mover a câmera em qualquer direção. Segure SHIFT e pressione uma das teclas WASD para mover a câmera em uma certa distância (SHIFT+0 para movê-la mais rápido e SHIFT+9 para movê-la mais devagar). Pressione SHIFT+R para voltar a câmera à posição inicial.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -4946,8 +4737,7 @@ msgid "" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" "Isto é usado para controlar a velocidade do jogo por throttle de som.\n" -"Desativar isso pode causar velocidade de jogo anormal, ás vezes muito " -"rápido.\n" +"Desativar isso pode causar velocidade de jogo anormal, ás vezes muito rápido.\n" "Mas algumas vezes ativar isso pode causar ruído constante.\n" "\n" "Atalho de Teclado : Segure para instantaneamente desativar o Throttle." @@ -4958,15 +4748,11 @@ msgstr "Isto é usado para tocar trilhas sonoras de jogos, como BGM" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 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 "" -"Isto separa os segmentos de Ãudio e Vídeo, para que eles possam ser rodados " -"em núcleos diferentes.\n" -"Dá um grande aumento de velocidade para PCs com mais de um núcleo, mas " -"também pode causar travamentos/erros ocasionais." +"Isto separa os segmentos de Ãudio e Vídeo, para que eles possam ser rodados em núcleos diferentes.\n" +"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:283 msgid "This will let you Manually Edit the INI config file" @@ -5017,7 +4803,8 @@ msgstr "Houve a tentativa de carregar um tipo de arquivo desconhecido." msgid "Triggers" msgstr "Gatilhos" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:92 +#: Source/Core/Common/Src/SysConf.h:115 msgid "Trying to read from invalid SYSCONF" msgstr "Tentando ler de um SYSCONF inválido" @@ -5063,17 +4850,16 @@ msgid "" "Unable to create patch from given values.\n" "Entry not modified." msgstr "" +"Impossível criar patch com os valores dados. \n" +"Nada modificado." #: 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 "" -"Não foi possível analisar a linha %lu do código AR digitado como código " -"válido encriptado ou decriptad. Certifique-se de que você digitou " -"corretamente.\n" +"Não foi possível analisar a linha %lu do código AR digitado como código válido encriptado ou decriptad. Certifique-se de que você digitou corretamente.\n" "Você gostaria de ignorar esta linha e continuar a análise?" #: Source/Core/DolphinWX/Src/FrameTools.cpp:404 @@ -5107,8 +4893,7 @@ msgstr "Menssagem desconhecida recebida com identificação: %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" -msgstr "" -"Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!" +msgstr "Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!" #: Source/Core/Core/Src/HW/Memmap.cpp:633 #, c-format @@ -5157,23 +4942,19 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Usa múltiplos segmentos para decodificar texturas.\n" -"Pode resultar em um aumento de velocidade (especialmente em CPUs com mais de " -"dois núcleos).\n" +"Pode resultar em um aumento de velocidade (especialmente em CPUs com mais de dois núcleos).\n" "\n" "Se estiver em dúvida, deixe isto desativado." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 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 "" -"Normalmente se a compilação dos Shaders falha, uma mensagem de erro é " -"mostrada.\n" -"No entanto, é possível impedir estas mensagens de interromperem o jogo " -"ativando esta opção.\n" +"Normalmente se a compilação dos Shaders falha, uma mensagem de erro é mostrada.\n" +"No entanto, é possível impedir estas mensagens de interromperem o jogo ativando esta opção.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -5258,8 +5039,7 @@ msgid "" "%s\n" "Do you wish to continue?" msgstr "" -"Aviso! É recomendado que você tenha um backup de todos os arquivos na " -"pasta:\n" +"Aviso! É recomendado que você tenha um backup de todos os arquivos na pasta:\n" "%s\n" "Deseja continuar?" @@ -5271,8 +5051,7 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" -"Aviso: Isso vai substituir quaisquer arquivos de salva existentes na " -"pasta :\n" +"Aviso: Isso vai substituir quaisquer arquivos de salva existentes na pasta :\n" "%s\n" "que tenham o mesmo nome de um arquivo do Memory Card\n" "Continuar?" @@ -5324,9 +5103,9 @@ msgid "Wiimote" msgstr "Wiimote" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 -#, fuzzy, c-format +#, c-format msgid "Wiimote %i" -msgstr "Wiimote" +msgstr "Wiimote %i" #: Source/Core/DolphinWX/Src/Frame.cpp:162 #, c-format @@ -5354,9 +5133,8 @@ msgid "Wiimote settings" msgstr "Configurações do Wiimote" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 -#, fuzzy msgid "Wiimotes" -msgstr "Wiimote" +msgstr "Wiimotes" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:131 msgid "Windows Left" @@ -5416,6 +5194,8 @@ msgid "" "You are using free dsp roms made by Dolphin Team.\n" "Only Zelda ucode games will work correctly with them.\n" msgstr "" +"Você está usando roms do DSP grátis feitas pela Equipe do Dolphin.\n" +"Apenas o ucode dos jogos da série Zelda irão funcionar corretamente com elas. \n" #: Source/Core/DolphinWX/Src/FrameAui.cpp:72 msgid "You can't close panes that have pages in them." @@ -5497,19 +5277,14 @@ msgstr "[Personalizado]" #: 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 "" "[EXPERIMENTAL]\n" -"Tenta aumentar a velocidade de emulação dando o trabalho de decodificação de " -"texturas para a GPU usando o Framework OpenCL.\n" -"No entanto, em seu estado atual ele causa defeitos nas texturas em vários " -"jogos. Além disso, na maioria dos casos ele é mais lento que a decodificação " -"usual da CPU.\n" +"Tenta aumentar a velocidade de emulação dando o trabalho de decodificação de texturas para a GPU usando o Framework OpenCL.\n" +"No entanto, em seu estado atual ele causa defeitos nas texturas em vários jogos. Além disso, na maioria dos casos ele é mais lento que a decodificação usual da CPU.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -5522,8 +5297,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "[EXPERIMENTAL]\n" -"Aumenta a velocidade da emulação fazendo um reservatório temporário de " -"Dysplay Lists.\n" +"Aumenta a velocidade da emulação fazendo um reservatório temporário de Dysplay Lists.\n" "Pode causar problemas.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -5557,9 +5331,7 @@ msgstr "iCacheJIT: Lendo Opcode de %x. Favor reportar." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108 #, c-format msgid "not a wii save or read failure for file header size %x" -msgstr "" -"Não é um salva de Wii ou houve erro de leitura no tamanho do header do " -"arquivo %x" +msgstr "Não é um salva de Wii ou houve erro de leitura no tamanho do header do arquivo %x" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:461 msgid "s" From 09244a66e09f3669ca3b8858f4e987392da1b78f Mon Sep 17 00:00:00 2001 From: Runo Date: Mon, 12 Sep 2011 22:56:10 -0300 Subject: [PATCH 034/381] PT_BR Translation Update to revision 60. --- Languages/po/pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index d7d782547c..0e55fbbb5e 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: 2011-08-10 08:30-0500\n" -"PO-Revision-Date: 2011-09-11 23:35-0300\n" +"PO-Revision-Date: 2011-09-12 22:54-0300\n" "Last-Translator: Runo \n" "Language-Team: Portuguese (BR) \n" "MIME-Version: 1.0\n" @@ -739,7 +739,7 @@ msgstr "Input em Background" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:279 msgid "Backward" -msgstr "Para trás" +msgstr "Para Trás" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264 msgid "Bad File Header" From 83d02eb69e610cfeffcbe8b6bed8fbbf123ff1a6 Mon Sep 17 00:00:00 2001 From: Runo Date: Mon, 12 Sep 2011 23:16:26 -0300 Subject: [PATCH 035/381] Last attempt to update PT_BR.po --- Languages/po/pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index 0e55fbbb5e..d7d782547c 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: 2011-08-10 08:30-0500\n" -"PO-Revision-Date: 2011-09-12 22:54-0300\n" +"PO-Revision-Date: 2011-09-11 23:35-0300\n" "Last-Translator: Runo \n" "Language-Team: Portuguese (BR) \n" "MIME-Version: 1.0\n" @@ -739,7 +739,7 @@ msgstr "Input em Background" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:279 msgid "Backward" -msgstr "Para Trás" +msgstr "Para trás" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264 msgid "Bad File Header" From 25d19216a91592da043e82ba44238f3cb1132a05 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 13 Sep 2011 16:39:28 +0200 Subject: [PATCH 036/381] Add libav headers to the include directories. Fixes issue 4811. --- CMakeTests/CheckLib.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeTests/CheckLib.cmake b/CMakeTests/CheckLib.cmake index c1174ecb58..affc92ae8f 100644 --- a/CMakeTests/CheckLib.cmake +++ b/CMakeTests/CheckLib.cmake @@ -63,6 +63,7 @@ macro(check_libav) if(LIBAV_FOUND) message("libav found, enabling AVI frame dumps") add_definitions(-DHAVE_LIBAV) + include_directories(${LIBAV_INCLUDE_DIRS}) else() message("libav not found, disabling AVI frame dumps") endif() From 5ea2b1b519f02bd485a5c24a1db1145c48982be5 Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Thu, 15 Sep 2011 23:11:40 +0300 Subject: [PATCH 037/381] Gameini database update. Fight Night Round 2 boots properly now, Mystery Case Files: The Malgrave Incident (PAL) addition with proper settings, fix a mistake in Xenoblade and addition/updates to emulation state for a couple of games. Also update for the Greek language. --- Data/User/GameConfig/G8FE8P.ini | 15 +++++++++++++ Data/User/GameConfig/GEYE69.ini | 12 +++++++++- Data/User/GameConfig/GKUE9G.ini | 2 +- Data/User/GameConfig/GNOE78.ini | 2 +- Data/User/GameConfig/RM6EEB.ini | 15 +++++++++++++ Data/User/GameConfig/SFIP01.ini | 22 ++++++++++++++++++ Data/User/GameConfig/SX4J01.ini | 6 ++--- Data/User/GameConfig/SX4P01.ini | 5 ++--- Languages/po/el.po | 40 ++++++++++++++++----------------- 9 files changed, 90 insertions(+), 29 deletions(-) create mode 100644 Data/User/GameConfig/G8FE8P.ini create mode 100644 Data/User/GameConfig/RM6EEB.ini create mode 100644 Data/User/GameConfig/SFIP01.ini diff --git a/Data/User/GameConfig/G8FE8P.ini b/Data/User/GameConfig/G8FE8P.ini new file mode 100644 index 0000000000..43eef9a46e --- /dev/null +++ b/Data/User/GameConfig/G8FE8P.ini @@ -0,0 +1,15 @@ +# G8FE8P - VIRTUA QUEST +[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] diff --git a/Data/User/GameConfig/GEYE69.ini b/Data/User/GameConfig/GEYE69.ini index 8c96330c60..ebf5159b27 100644 --- a/Data/User/GameConfig/GEYE69.ini +++ b/Data/User/GameConfig/GEYE69.ini @@ -1,6 +1,16 @@ # GEYE69 - EA SPORTS(TM) Fight Night Round 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 = 1 +EmulationStateId = 4 +EmulationIssues = Videos are messed up, 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] diff --git a/Data/User/GameConfig/GKUE9G.ini b/Data/User/GameConfig/GKUE9G.ini index 4fce1959df..3a0d9b7c08 100644 --- a/Data/User/GameConfig/GKUE9G.ini +++ b/Data/User/GameConfig/GKUE9G.ini @@ -2,7 +2,7 @@ [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 = 0 +EmulationStateId = 4 EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. diff --git a/Data/User/GameConfig/GNOE78.ini b/Data/User/GameConfig/GNOE78.ini index cd8c06fa53..bf0d3f3f1f 100644 --- a/Data/User/GameConfig/GNOE78.ini +++ b/Data/User/GameConfig/GNOE78.ini @@ -3,7 +3,7 @@ TLBHack = 1 FastDiscSpeed = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 0 +EmulationStateId = 4 EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. diff --git a/Data/User/GameConfig/RM6EEB.ini b/Data/User/GameConfig/RM6EEB.ini new file mode 100644 index 0000000000..8f78ac8ffa --- /dev/null +++ b/Data/User/GameConfig/RM6EEB.ini @@ -0,0 +1,15 @@ +# RM6EEB - BAROQUE +[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] diff --git a/Data/User/GameConfig/SFIP01.ini b/Data/User/GameConfig/SFIP01.ini new file mode 100644 index 0000000000..d655f59141 --- /dev/null +++ b/Data/User/GameConfig/SFIP01.ini @@ -0,0 +1,22 @@ +# SFIP01 - Mystery Case Files: The Malgrave Incident +[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 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 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/SX4J01.ini b/Data/User/GameConfig/SX4J01.ini index 1add4f0579..2e2169a190 100644 --- a/Data/User/GameConfig/SX4J01.ini +++ b/Data/User/GameConfig/SX4J01.ini @@ -1,11 +1,10 @@ # SX4J01 - Xenoblade [Core] Values set here will override the main dolphin settings. -SkipIdle = 0 BlockMerging = 1 -TLBHack = 1 +SkipIdle = 0 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Disable idle skipping to solve sound issues or use LLE audio. Per pixel lighting creates a glitch in ether cave with direct 3d 9. +EmulationIssues = Disable idle skipping to solve sound issues or use LLE audio. Per pixel lighting creates a glitch in ether cave with direct 3d 9. The game randomly freezes. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -20,3 +19,4 @@ PH_ZFar = DlistCachingEnable = False [Video_Settings] EnablePixelLighting = False + diff --git a/Data/User/GameConfig/SX4P01.ini b/Data/User/GameConfig/SX4P01.ini index d649b00050..b374dab682 100644 --- a/Data/User/GameConfig/SX4P01.ini +++ b/Data/User/GameConfig/SX4P01.ini @@ -1,11 +1,10 @@ # SX4P01 - Xenoblade Chronicles [Core] Values set here will override the main dolphin settings. -SkipIdle = 0 BlockMerging = 1 -TLBHack = 1 +SkipIdle = 0 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Disable idle skipping to solve sound issues or use LLE audio. Per pixel lighting creates a glitch in ether cave with direct 3d 9. +EmulationIssues = Disable idle skipping to solve sound issues or use LLE audio. Per pixel lighting creates a glitch in ether cave with direct 3d 9. The game randomly freezes. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Languages/po/el.po b/Languages/po/el.po index 3f93e7d65a..9a746c96f1 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-08-10 08:30-0500\n" -"PO-Revision-Date: 2011-08-25 20:16+0200\n" +"PO-Revision-Date: 2011-09-13 17:28+0200\n" "Last-Translator: Linktothepast \n" "Language-Team: Gpower2 \n" -"Language: Greek\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: Greek\n" "X-Poedit-Language: Greek\n" "X-Poedit-Country: GREECE\n" @@ -862,7 +862,7 @@ msgid "" msgstr "" "Υπολογίζει τον φωτισμό των 3D γÏαφικών ανά pixel αντί ανά vertex.\n" "Μειώνει την ταχÏτητα εξομοίωσης κατά κάποιο ποσοστό (ανάλογα με την GPU).\n" -"Αυτή είναι συνήθως μια ασφαλής βελτίωση, αλλά μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα οÏισμένες φοÏές.\n" +"Αυτή συνήθως είναι μια ασφαλής βελτίωση, αλλά μποÏεί να Ï€Ïοκαλέσει οÏισμένες φοÏές Ï€Ïοβλήματα.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -1116,7 +1116,7 @@ msgstr "Ρυθμίσεις ΧειÏιστηÏίων" #: Source/Core/DolphinWX/Src/FrameTools.cpp:442 msgid "Configure..." -msgstr "Γενικές Ρυθμίσεις......" +msgstr "Γενικές Ρυθμίσεις..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 @@ -1741,7 +1741,7 @@ msgstr "ΕπεξεÏγασία..." #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44 msgid "Effect" -msgstr "Εφφέ" +msgstr "Εφέ" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Embedded Frame Buffer" @@ -1759,7 +1759,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" "Εξομοιώνει τα XFBs με ακÏίβεια.\n" -"ΕπιβÏαδÏνει την εξομοίωση αÏκετά και αποτÏέπει την απόδοση γÏαφικών υψηλής ανάλυσης, αλλά είναι απαÏαίτητο για την σωστή εξομοίωση οÏισμένου αÏÎ¹Î¸Î¼Î¿Ï Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹ÏŽÎ½.\n" +"ΕπιβÏαδÏνει αÏκετά την εξομοίωση και αποτÏέπει την απόδοση γÏαφικών υψηλής ανάλυσης, αλλά είναι απαÏαίτητο για την σωστή εξομοίωση οÏισμένου αÏÎ¹Î¸Î¼Î¿Ï Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹ÏŽÎ½.\n" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε εικονική XFB εξομοίωση." @@ -2634,12 +2634,12 @@ msgstr "Host" #: Source/Core/DolphinWX/Src/HotkeyDlg.h:44 msgid "Hotkey Configuration" -msgstr "Ρυθμίσεις ΠλήκτÏων ΣυντομεÏσεως" +msgstr "Ρυθμίσεις ΠλήκτÏων Συντόμευσης" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 msgid "Hotkeys" -msgstr "ΠλήκτÏα ΣυντομεÏσεως" +msgstr "ΠλήκτÏα Συντόμευσης" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hungarian" @@ -2708,7 +2708,7 @@ msgstr "Αν τα FPS διακυμαίνονται, αυτή η επιλογή #: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 msgid "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." msgstr "" -"Αν θέσετε τον πεÏιοÏισμό καÏέ υψηλότεÏα από ότι την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, PAL:50),\n" +"Αν θέσετε τιμή υψηλότεÏη από την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, PAL:50),\n" "θα Ï€Ïέπει επίσης να απενεÏγοποιήσετε το Throttle Ήχου στο DSP για να έχει αποτέλεσμα. " #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 @@ -2773,7 +2773,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί Ï€Ïοβλήματα σε παιχνίδια που βασίζονται στη σωστή εξομοίωση ομίχλης.\n" +"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί Ï€Ïοβλήματα σε παιχνίδια που βασίζονται στη σωστή εξομοίωση της ομίχλης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -3022,7 +3022,7 @@ msgstr "ΜικÏότεÏο από" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Limit by FPS" -msgstr "ΠεÏιοÏισμός με βάση τα FPS" +msgstr "ΠεÏιοÏισμός με βάση τα ΚαÏέ" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Load" @@ -4312,8 +4312,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 "" "Εμφάνιση μηνÏματος όταν Ï€ÏοκÏψει ένα πιθανά σοβαÏÏŒ σφάλμα.\n" -"ΑπενεÏγοποιώντας αυτήν την επιλογή μποÏεί να σας γλιτώσει από ενοχλητικά μη κÏίσιμα σφάλματα, αλλά επίσης σημαίνει\n" -"ότι το Dolphin μποÏεί να κÏασάÏει ξαφνικά χωÏίς καμία εξήγηση. " +"ΑπενεÏγοποιώντας αυτήν την επιλογή μποÏεί να γλιτώσετε από ενοχλητικά μη κÏίσιμα σφάλματα, αλλά \n" +"το Dolphin μποÏεί να κÏασάÏει ξαφνικά χωÏίς καμία εξήγηση. " #: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Show first block" @@ -4393,7 +4393,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΠαÏάλειψη του destination alpha pass που χÏησιμοποιείται σε πολλά παιχνίδια για ποικίλα γÏαφικά εφέ.\n" +"ΠαÏάλειψη του destination alpha pass που χÏησιμοποιείται από πολλά παιχνίδια σε διάφοÏα γÏαφικά εφέ.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -4427,7 +4427,7 @@ msgid "" msgstr "" "Η απεικόνιση Î»Î¿Î³Î¹ÏƒÎ¼Î¹ÎºÎ¿Ï ÎµÎ¯Î½Î±Î¹ αÏκετές βαθμίδες πιο αÏγή απ' ότι τα υπόλοιπα backends.\n" "Είναι μόνο χÏήσιμη για debugging σκοποÏÏ‚.\n" -"Θέλετε όντως να χÏησιμοπποιήσετε την απεικόνιση λογισμικοÏ; Αν δεν είστε σίγουÏοι, επιλέξτε 'No'." +"Θέλετε όντως να χÏησιμοποιήσετε την απεικόνιση λογισμικοÏ; Αν δεν είστε σίγουÏοι, επιλέξτε 'Όχι'." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 msgid "Sound Settings" @@ -4727,8 +4727,8 @@ msgid "" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" "ΧÏησιμοποιείται για τον έλεγχο της ταχÏτητας του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î¼Îµ throttle ήχου.\n" -"ΑπενεÏγοποίησή της μποÏεί να Ï€Ïοκαλέσει μη φυσιολογική ταχÏτητα παιχνιδιοÏ, όπως Ï€Î¿Î»Ï Î³ÏήγοÏη.\n" -"Αλλά μεÏικές φοÏές η ενεÏγοποίησή της μποÏεί να Ï€Ïοκαλέσει μόνιμο θόÏυβο.\n" +"ΑπενεÏγοποιώντας το μποÏεί να Ï€Ïοκλήθει αφÏσικη ταχÏτητα σε παιχνίδια, Ï€.χ. Ï€Î¿Î»Ï Î³ÏήγοÏη.\n" +"Όμως οÏισμένες φοÏές η ενεÏγοποίησή της μποÏεί να Ï€Ïοκαλέσει μόνιμο θόÏυβο.\n" "\n" "Συντόμευση πληκτÏολογίου : ΚÏατήστε το πατημένο για να απενεÏγοποιηθεί η λειτουÏγία Throttle." @@ -4747,7 +4747,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 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 @@ -5044,7 +5044,7 @@ msgid "" msgstr "" "ΠÏοειδοποίηση: Αυτό θα αντικαταστήσει όλα τα υπάÏχοντα σημεία αποθήκευσης που υπάÏχουν στον φάκελο:\n" "%s\n" -"κι έχουν το ίδιο όνομα με αÏχεία στη memcard\n" +"και έχουν το ίδιο όνομα με αÏχεία στη memcard\n" "Συνέχεια;" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 @@ -5257,7 +5257,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "[ΧΑΛΑΣΜΕÎΟ]\n" -"Τονίζει τις πεÏιοχές από όπου το EFB αντιγÏάφηκε.\n" +"Τονίζει τις πεÏιοχές από όπου έγινε αντιγÏαφή του EFB.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." From 175ade74d74d9b4e33878b80c7134b9cbf3ea207 Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Fri, 23 Sep 2011 02:27:30 +0300 Subject: [PATCH 038/381] Another gameini database update. This makes playable by default games such as The Urbz (GC), Chicken Blaster, Wild West Shootout, Phineas and Ferb Across the 2nd Dimension (PAL), along with proper settings for METAL SLUG Anthology. --- Data/User/GameConfig/GUBE69.ini | 19 +++++++++++++++++++ Data/User/GameConfig/GUBP69.ini | 19 +++++++++++++++++++ Data/User/GameConfig/R8LE20.ini | 18 ++++++++++++++++++ Data/User/GameConfig/R8LP7J.ini | 18 ++++++++++++++++++ Data/User/GameConfig/RMLEH4.ini | 16 ++++++++++++++-- Data/User/GameConfig/RMLJH4.ini | 19 +++++++++++++++++++ Data/User/GameConfig/RMLK52.ini | 19 +++++++++++++++++++ Data/User/GameConfig/RMLP7U.ini | 19 +++++++++++++++++++ Data/User/GameConfig/RMLPH4.ini | 19 +++++++++++++++++++ Data/User/GameConfig/SMFP4Q.ini | 22 ++++++++++++++++++++++ Data/User/GameConfig/SSRE20.ini | 18 ++++++++++++++++++ Data/User/GameConfig/SSRPXT.ini | 18 ++++++++++++++++++ 12 files changed, 222 insertions(+), 2 deletions(-) create mode 100644 Data/User/GameConfig/GUBE69.ini create mode 100644 Data/User/GameConfig/GUBP69.ini create mode 100644 Data/User/GameConfig/R8LE20.ini create mode 100644 Data/User/GameConfig/R8LP7J.ini create mode 100644 Data/User/GameConfig/RMLJH4.ini create mode 100644 Data/User/GameConfig/RMLK52.ini create mode 100644 Data/User/GameConfig/RMLP7U.ini create mode 100644 Data/User/GameConfig/RMLPH4.ini create mode 100644 Data/User/GameConfig/SMFP4Q.ini create mode 100644 Data/User/GameConfig/SSRE20.ini create mode 100644 Data/User/GameConfig/SSRPXT.ini diff --git a/Data/User/GameConfig/GUBE69.ini b/Data/User/GameConfig/GUBE69.ini new file mode 100644 index 0000000000..a7fb26674a --- /dev/null +++ b/Data/User/GameConfig/GUBE69.ini @@ -0,0 +1,19 @@ +# GUBE69 - The Urbz GameCube +[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 = LLE audio is needed to fix some 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] +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/GUBP69.ini b/Data/User/GameConfig/GUBP69.ini new file mode 100644 index 0000000000..1ac1ed9c1d --- /dev/null +++ b/Data/User/GameConfig/GUBP69.ini @@ -0,0 +1,19 @@ +# GUBP69 - The Urbz GameCube +[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 = LLE audio is needed to fix some 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] +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/R8LE20.ini b/Data/User/GameConfig/R8LE20.ini new file mode 100644 index 0000000000..a38514bc43 --- /dev/null +++ b/Data/User/GameConfig/R8LE20.ini @@ -0,0 +1,18 @@ +# R8LE20 - Chicken Blaster +[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 = True diff --git a/Data/User/GameConfig/R8LP7J.ini b/Data/User/GameConfig/R8LP7J.ini new file mode 100644 index 0000000000..532178c53b --- /dev/null +++ b/Data/User/GameConfig/R8LP7J.ini @@ -0,0 +1,18 @@ +# R8LP7J - Chicken Blaster +[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 = True diff --git a/Data/User/GameConfig/RMLEH4.ini b/Data/User/GameConfig/RMLEH4.ini index e1444f1498..6bf280dc75 100644 --- a/Data/User/GameConfig/RMLEH4.ini +++ b/Data/User/GameConfig/RMLEH4.ini @@ -1,7 +1,19 @@ # RMLEH4 - METAL SLUG Anthology [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 = +EmulationStateId = 4 +EmulationIssues = Use LLE audio to solve some 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] +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RMLJH4.ini b/Data/User/GameConfig/RMLJH4.ini new file mode 100644 index 0000000000..cc6422800d --- /dev/null +++ b/Data/User/GameConfig/RMLJH4.ini @@ -0,0 +1,19 @@ +# RMLJH4 - Metal Slug Complete +[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 = Use LLE audio to solve some 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] +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RMLK52.ini b/Data/User/GameConfig/RMLK52.ini new file mode 100644 index 0000000000..12a6d1c800 --- /dev/null +++ b/Data/User/GameConfig/RMLK52.ini @@ -0,0 +1,19 @@ +# RMLK52 - Metal Slug Complete +[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 = Use LLE audio to solve some 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] +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RMLP7U.ini b/Data/User/GameConfig/RMLP7U.ini new file mode 100644 index 0000000000..0666be4c4a --- /dev/null +++ b/Data/User/GameConfig/RMLP7U.ini @@ -0,0 +1,19 @@ +# RMLP7U - METAL SLUG Anthology +[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 = Use LLE audio to solve some 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] +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RMLPH4.ini b/Data/User/GameConfig/RMLPH4.ini new file mode 100644 index 0000000000..9c062079f2 --- /dev/null +++ b/Data/User/GameConfig/RMLPH4.ini @@ -0,0 +1,19 @@ +# RMLPH4 - METAL SLUG Anthology +[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 = Use LLE audio to solve some 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] +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/SMFP4Q.ini b/Data/User/GameConfig/SMFP4Q.ini new file mode 100644 index 0000000000..ee1358c1c8 --- /dev/null +++ b/Data/User/GameConfig/SMFP4Q.ini @@ -0,0 +1,22 @@ +# SMFP4Q - Phineas and Ferb Across the 2nd Dimension +[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] +SafeTextureCache = True +SafeTextureCacheColorSamples = 0 +UseXFB = True +UseRealXFB = False +[Video_Hacks] +EFBEmulateFormatChanges = False diff --git a/Data/User/GameConfig/SSRE20.ini b/Data/User/GameConfig/SSRE20.ini new file mode 100644 index 0000000000..20edfda0c0 --- /dev/null +++ b/Data/User/GameConfig/SSRE20.ini @@ -0,0 +1,18 @@ +# SSRE20 - Wild West Shootout +[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 = True diff --git a/Data/User/GameConfig/SSRPXT.ini b/Data/User/GameConfig/SSRPXT.ini new file mode 100644 index 0000000000..880617b35c --- /dev/null +++ b/Data/User/GameConfig/SSRPXT.ini @@ -0,0 +1,18 @@ +# SSRPXT - Wild West Shootout +[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 = True From 8c691767da71d041580d362b3b822d50e85d46da Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 27 Aug 2011 20:42:11 +0200 Subject: [PATCH 039/381] Various changes which improve FreeBSD support. Patches by martymac, all credits go to him ;) --- CMakeLists.txt | 2 +- Source/Core/Common/Src/CPUDetect.cpp | 9 +++++ Source/Core/Common/Src/CommonFuncs.h | 6 ++++ Source/Core/Common/Src/MemoryUtil.cpp | 48 +++++++++++++++++++++---- Source/Core/Core/Src/MemTools.cpp | 2 +- Source/Core/DolphinWX/CMakeLists.txt | 3 ++ Source/Core/VideoCommon/Src/AVIDump.cpp | 4 +++ 7 files changed, 66 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d0d6a3ae8f..e870304dc4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -463,7 +463,7 @@ if(GETTEXT_FOUND AND NOT DISABLE_WX) file(GLOB LINGUAS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} Languages/po/*.po) GETTEXT_CREATE_TRANSLATIONS(Languages/po/dolphin-emu.pot ALL ${LINGUAS}) endif() -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux") +if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux") AND (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")) install(FILES Data/license.txt DESTINATION ${datadir}) endif() diff --git a/Source/Core/Common/Src/CPUDetect.cpp b/Source/Core/Common/Src/CPUDetect.cpp index 810c5d2a59..7c231b0a69 100644 --- a/Source/Core/Common/Src/CPUDetect.cpp +++ b/Source/Core/Common/Src/CPUDetect.cpp @@ -32,6 +32,10 @@ //#include #include +#if defined __FreeBSD__ +#include +#include +#else static inline void do_cpuid(unsigned int *eax, unsigned int *ebx, unsigned int *ecx, unsigned int *edx) { @@ -65,15 +69,20 @@ static inline void do_cpuid(unsigned int *eax, unsigned int *ebx, ); #endif } +#endif /* defined __FreeBSD__ */ static void __cpuid(int info[4], int x) { +#if defined __FreeBSD__ + do_cpuid((unsigned int)x, (unsigned int*)info); +#else unsigned int eax = x, ebx = 0, ecx = 0, edx = 0; do_cpuid(&eax, &ebx, &ecx, &edx); info[0] = eax; info[1] = ebx; info[2] = ecx; info[3] = edx; +#endif } #endif diff --git a/Source/Core/Common/Src/CommonFuncs.h b/Source/Core/Common/Src/CommonFuncs.h index 7dd156f42e..c79137780d 100644 --- a/Source/Core/Common/Src/CommonFuncs.h +++ b/Source/Core/Common/Src/CommonFuncs.h @@ -45,6 +45,8 @@ _mm_shuffle_epi8(__m128i a, __m128i mask) #include #ifdef __linux__ #include +#elif defined __FreeBSD__ +#include #endif // go to debugger mode @@ -137,6 +139,10 @@ inline __attribute__((always_inline)) u32 swap32(u32 _data) {return __builtin_bswap32(_data);} inline __attribute__((always_inline)) u64 swap64(u64 _data) {return __builtin_bswap64(_data);} +#elif __FreeBSD__ +inline u16 swap16(u16 _data) {return bswap16(_data);} +inline u32 swap32(u32 _data) {return bswap32(_data);} +inline u64 swap64(u64 _data) {return bswap64(_data);} #else // Slow generic implementation. inline u16 swap16(u16 data) {return (data >> 8) | (data << 8);} diff --git a/Source/Core/Common/Src/MemoryUtil.cpp b/Source/Core/Common/Src/MemoryUtil.cpp index bc65f856f4..65c70e0c5e 100644 --- a/Source/Core/Common/Src/MemoryUtil.cpp +++ b/Source/Core/Common/Src/MemoryUtil.cpp @@ -27,28 +27,64 @@ #include #endif +#if !defined(MAP_32BIT) +#include +#define PAGE_MASK (getpagesize() - 1) +#define round_page(x) ((((unsigned long)(x)) + PAGE_MASK) & ~(PAGE_MASK)) +#endif + // This is purposely not a full wrapper for virtualalloc/mmap, but it // provides exactly the primitive operations that Dolphin needs. void* AllocateExecutableMemory(size_t size, bool low) { -#ifdef _WIN32 + static char *map_hint = 0; +#if defined(__x86_64__) && !defined(MAP_32BIT) + if (low && (!map_hint)) + map_hint = (char*)round_page(512*1024*1024); /* 0.5 GB rounded up to the next page */ +#endif + +#if defined(_WIN32) void* ptr = VirtualAlloc(0, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE); #else - void* ptr = mmap(0, size, PROT_READ | PROT_WRITE | PROT_EXEC, + void* ptr = mmap(map_hint, size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_PRIVATE -#if defined __linux__ && defined __x86_64__ +#if defined(__x86_64__) +#if defined(MAP_32BIT) | (low ? MAP_32BIT : 0) -#endif +#else + | (low ? MAP_FIXED : 0) +#endif /* defined(MAP_32BIT) */ +#endif /* defined(__x86_64__) */ , -1, 0); -#endif +#endif /* defined(_WIN32) */ // printf("Mapped executable memory at %p (size %ld)\n", ptr, // (unsigned long)size); +#if defined(__FreeBSD__) + if (ptr == MAP_FAILED) + { + ptr = NULL; +#else if (ptr == NULL) + { +#endif PanicAlert("Failed to allocate executable memory"); -#ifdef _M_X64 + } +#if defined(__x86_64__) && !defined(MAP_32BIT) + else + { + if (low) + { + map_hint += size; + map_hint = (char*)round_page(map_hint); /* round up to the next page */ + // printf("Next map will (hopefully) be at %p\n", map_hint); + } + } +#endif + +#if defined(_M_X64) if ((u64)ptr >= 0x80000000 && low == true) PanicAlert("Executable memory ended up above 2GB!"); #endif diff --git a/Source/Core/Core/Src/MemTools.cpp b/Source/Core/Core/Src/MemTools.cpp index 469ae32684..bb6fef6439 100644 --- a/Source/Core/Core/Src/MemTools.cpp +++ b/Source/Core/Core/Src/MemTools.cpp @@ -160,7 +160,7 @@ void InstallExceptionHandler() #else // _WIN32 -#if defined __APPLE__ || defined __linux__ || defined _WIN32 +#if defined __APPLE__ || defined __linux__ || defined __FreeBSD__ || defined _WIN32 #ifndef _WIN32 #include #endif diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 7890c9fe96..5fc433009f 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -9,6 +9,9 @@ set(LIBS core sfml-network SDL GL + avcodec + avformat + swscale ${XRANDR_LIBRARIES} ${X11_LIBRARIES}) diff --git a/Source/Core/VideoCommon/Src/AVIDump.cpp b/Source/Core/VideoCommon/Src/AVIDump.cpp index cfd34e5cdb..a5a6098489 100644 --- a/Source/Core/VideoCommon/Src/AVIDump.cpp +++ b/Source/Core/VideoCommon/Src/AVIDump.cpp @@ -15,6 +15,10 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ +#if defined(__FreeBSD__) +#define __STDC_CONSTANT_MACROS 1 +#endif + #include "AVIDump.h" #include "HW/VideoInterface.h" //for TargetRefreshRate #include "VideoConfig.h" From 5dcb212fc7b65dcc25829b1ee42ef03898023f1e Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 6 Sep 2011 14:45:05 +0200 Subject: [PATCH 040/381] Fix Windows build. --- Source/Core/Common/Src/MemoryUtil.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Source/Core/Common/Src/MemoryUtil.cpp b/Source/Core/Common/Src/MemoryUtil.cpp index 65c70e0c5e..2d64a434f1 100644 --- a/Source/Core/Common/Src/MemoryUtil.cpp +++ b/Source/Core/Common/Src/MemoryUtil.cpp @@ -27,7 +27,7 @@ #include #endif -#if !defined(MAP_32BIT) +#if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT) #include #define PAGE_MASK (getpagesize() - 1) #define round_page(x) ((((unsigned long)(x)) + PAGE_MASK) & ~(PAGE_MASK)) @@ -38,15 +38,14 @@ void* AllocateExecutableMemory(size_t size, bool low) { +#if defined(_WIN32) + void* ptr = VirtualAlloc(0, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE); +#else static char *map_hint = 0; #if defined(__x86_64__) && !defined(MAP_32BIT) if (low && (!map_hint)) map_hint = (char*)round_page(512*1024*1024); /* 0.5 GB rounded up to the next page */ #endif - -#if defined(_WIN32) - void* ptr = VirtualAlloc(0, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE); -#else void* ptr = mmap(map_hint, size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_PRIVATE #if defined(__x86_64__) @@ -72,7 +71,7 @@ void* AllocateExecutableMemory(size_t size, bool low) #endif PanicAlert("Failed to allocate executable memory"); } -#if defined(__x86_64__) && !defined(MAP_32BIT) +#if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT) else { if (low) From bd4a5b5ef692bce25dcfc60e13df3f08edc84bf8 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Thu, 8 Sep 2011 15:39:03 +0200 Subject: [PATCH 041/381] Implement frame dumping in D3D11. Fixes issue 4831. --- Source/Core/VideoCommon/Src/RenderBase.cpp | 2 +- Source/Core/VideoCommon/Src/RenderBase.h | 2 +- .../Plugins/Plugin_VideoDX11/Src/Render.cpp | 115 ++++++++++++++++-- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 28 +++-- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 18 +-- 5 files changed, 133 insertions(+), 32 deletions(-) diff --git a/Source/Core/VideoCommon/Src/RenderBase.cpp b/Source/Core/VideoCommon/Src/RenderBase.cpp index d89e582860..06f4c81ab6 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.cpp +++ b/Source/Core/VideoCommon/Src/RenderBase.cpp @@ -52,7 +52,7 @@ int OSDChoice, OSDTime; Renderer *g_renderer = NULL; -bool s_bLastFrameDumped = false; +bool bLastFrameDumped = false; std::mutex Renderer::s_criticalScreenshot; std::string Renderer::s_sScreenshotName; diff --git a/Source/Core/VideoCommon/Src/RenderBase.h b/Source/Core/VideoCommon/Src/RenderBase.h index b2c2c7ecfb..48f096851f 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.h +++ b/Source/Core/VideoCommon/Src/RenderBase.h @@ -41,7 +41,7 @@ extern int frameCount; extern int OSDChoice, OSDTime; -extern bool s_bLastFrameDumped; +extern bool bLastFrameDumped; // Renderer really isn't a very good name for this class - it's more like "Misc". // The long term goal is to get rid of this class and replace it with others that make diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index bbf2a966dd..368fec357c 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -43,6 +43,7 @@ #include "Television.h" #include "Host.h" #include "BPFunctions.h" +#include "AVIDump.h" namespace DX11 { @@ -62,6 +63,10 @@ ID3D11BlendState* resetblendstate = NULL; ID3D11DepthStencilState* resetdepthstate = NULL; ID3D11RasterizerState* resetraststate = NULL; +static ID3D11Texture2D* s_screenshot_texture = NULL; +static bool s_bAVIDumping; +static char *s_frame_data = NULL; + // GX pipeline state struct { @@ -296,9 +301,14 @@ void SetupDeviceObjects() hr = D3D::device->CreateRasterizerState(&rastdesc, &resetraststate); CHECK(hr==S_OK, "Create rasterizer state for Renderer::ResetAPIState"); D3D::SetDebugObjectName((ID3D11DeviceChild*)resetraststate, "rasterizer state for Renderer::ResetAPIState"); + + D3D11_TEXTURE2D_DESC scrtex_desc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, D3D::GetBackBufferWidth(), D3D::GetBackBufferHeight(), 1, 1, 0, D3D11_USAGE_STAGING, D3D11_CPU_ACCESS_READ|D3D11_CPU_ACCESS_WRITE); + hr = D3D::device->CreateTexture2D(&scrtex_desc, NULL, &s_screenshot_texture); + CHECK(hr==S_OK, "Create screenshot staging texture"); + D3D::SetDebugObjectName((ID3D11DeviceChild*)s_screenshot_texture, "staging screenshot texture"); } -// Kill off all POOL_DEFAULT device objects. +// Kill off all device objects void TeardownDeviceObjects() { delete g_framebuffer_manager; @@ -314,6 +324,7 @@ void TeardownDeviceObjects() SAFE_RELEASE(resetblendstate); SAFE_RELEASE(resetdepthstate); SAFE_RELEASE(resetraststate); + SAFE_RELEASE(s_screenshot_texture); s_television.Shutdown(); } @@ -344,6 +355,10 @@ Renderer::Renderer() SetupDeviceObjects(); + bLastFrameDumped = false; + s_bAVIDumping = false; + + // Setup GX pipeline state memset(&gx_state.blenddc, 0, sizeof(gx_state.blenddc)); gx_state.blenddc.AlphaToCoverageEnable = FALSE; @@ -391,6 +406,15 @@ Renderer::Renderer() Renderer::~Renderer() { + if (g_ActiveConfig.bDumpFrames && bLastFrameDumped && s_bAVIDumping) + { + SAFE_DELETE_ARRAY(s_frame_data); + + AVIDump::Stop(); + s_bAVIDumping = false; + bLastFrameDumped = false; + } + TeardownDeviceObjects(); D3D::EndFrame(); D3D::Present(); @@ -835,15 +859,11 @@ void Renderer::SetBlendMode(bool forceUpdate) bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle &rc) { // copy back buffer to system memory - ID3D11Texture2D* buftex; - D3D11_TEXTURE2D_DESC tex_desc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, D3D::GetBackBufferWidth(), D3D::GetBackBufferHeight(), 1, 1, 0, D3D11_USAGE_STAGING, D3D11_CPU_ACCESS_READ|D3D11_CPU_ACCESS_WRITE); - HRESULT hr = D3D::device->CreateTexture2D(&tex_desc, NULL, &buftex); - if (FAILED(hr)) PanicAlert("Failed to create screenshot buffer texture"); - D3D::context->CopyResource(buftex, (ID3D11Resource*)D3D::GetBackBuffer()->GetTex()); + D3D::context->CopyResource(s_screenshot_texture, (ID3D11Resource*)D3D::GetBackBuffer()->GetTex()); // D3DX11SaveTextureToFileA doesn't allow us to ignore the alpha channel, so we need to strip it out ourselves D3D11_MAPPED_SUBRESOURCE map; - D3D::context->Map(buftex, 0, D3D11_MAP_READ_WRITE, 0, &map); + D3D::context->Map(s_screenshot_texture, 0, D3D11_MAP_READ_WRITE, 0, &map); for (unsigned int y = 0; y < D3D::GetBackBufferHeight(); ++y) { u8* ptr = (u8*)map.pData + y * map.RowPitch + 3; @@ -853,21 +873,36 @@ bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle ptr += 4; } } - D3D::context->Unmap(buftex, 0); + D3D::context->Unmap(s_screenshot_texture, 0); // ready to be saved - hr = PD3DX11SaveTextureToFileA(D3D::context, buftex, D3DX11_IFF_PNG, filename.c_str()); - buftex->Release(); + HRESULT hr = PD3DX11SaveTextureToFileA(D3D::context, s_screenshot_texture, D3DX11_IFF_PNG, filename.c_str()); return SUCCEEDED(hr); } +void formatBufferDump(const char *in, char *out, int w, int h, int p) +{ + for (int y = 0; y < h; ++y) + { + const u32 *line = (u32*)(in + (h - y - 1) * p); + for (int x = 0; x < w; ++x) + { + memcpy(out, line, 3); + out += 3; + line += 4; + } + } +} // 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_ActiveConfig.bDumpFrames) + AVIDump::AddFrame(s_frame_data); + Core::Callback_VideoCopiedToXFB(false); return; } @@ -879,6 +914,9 @@ 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) + AVIDump::AddFrame(s_frame_data); + Core::Callback_VideoCopiedToXFB(false); return; } @@ -984,6 +1022,63 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons s_bScreenshot = false; } + // Dump frames + static int w = 0, h = 0; + if (g_ActiveConfig.bDumpFrames) + { + static int s_recordWidth; + static int s_recordHeight; + + D3D::context->CopyResource(s_screenshot_texture, (ID3D11Resource*)D3D::GetBackBuffer()->GetTex()); + if (!bLastFrameDumped) + { + s_recordWidth = dst_rect.GetWidth(); + s_recordHeight = dst_rect.GetHeight(); + s_bAVIDumping = AVIDump::Start(EmuWindow::GetParentWnd(), s_recordWidth, s_recordHeight); + if (!s_bAVIDumping) + { + PanicAlert("Error dumping frames to AVI."); + } + else + { + char msg [255]; + sprintf_s(msg,255, "Dumping Frames to \"%sframedump0.avi\" (%dx%d RGB24)", + File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), s_recordWidth, s_recordHeight); + OSD::AddMessage(msg, 2000); + } + } + if (s_bAVIDumping) + { + D3D11_MAPPED_SUBRESOURCE map; + D3D::context->Map(s_screenshot_texture, 0, D3D11_MAP_READ, 0, &map); + + if (!s_frame_data || w != s_recordWidth || h != s_recordHeight) + { + delete[] s_frame_data; + s_frame_data = new char[3 * s_recordWidth * s_recordHeight]; + w = s_recordWidth; + h = s_recordHeight; + } + formatBufferDump((char*)map.pData, s_frame_data, s_recordWidth, s_recordHeight, map.RowPitch); + AVIDump::AddFrame(s_frame_data); + D3D::context->Unmap(s_screenshot_texture, 0); + } + bLastFrameDumped = true; + } + else + { + if (bLastFrameDumped && s_bAVIDumping) + { + SAFE_DELETE_ARRAY(s_frame_data); + w = h = 0; + + AVIDump::Stop(); + s_bAVIDumping = false; + OSD::AddMessage("Stop dumping frames to AVI", 2000); + } + bLastFrameDumped = false; + } + // Finish up the current frame, print some stats if (g_ActiveConfig.bShowFPS) { diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index 15b592e800..e7177be396 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -60,12 +60,6 @@ namespace DX9 static int s_fps = 0; -static int s_recordWidth; -static int s_recordHeight; - -static bool s_bLastFrameDumped; -static bool s_bAVIDumping; - static u32 s_blendMode; static u32 s_LastAA; static bool IS_AMD; @@ -73,6 +67,7 @@ static bool IS_AMD; static char *st; static LPDIRECT3DSURFACE9 ScreenShootMEMSurface = NULL; +static bool s_bAVIDumping; // State translation lookup tables @@ -297,7 +292,7 @@ Renderer::Renderer() // Make sure to use valid texture sizes D3D::FixTextureSize(s_target_width, s_target_height); - s_bLastFrameDumped = false; + bLastFrameDumped = false; s_bAVIDumping = false; // We're not using fixed function. @@ -845,11 +840,11 @@ bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,const EFBRectangle& rc,float Gamma) { static char* data = 0; - static int w = 0, h = 0; if (g_bSkipCurrentFrame || (!XFBWrited && (!g_ActiveConfig.bUseXFB || !g_ActiveConfig.bUseRealXFB)) || !fbWidth || !fbHeight) { if (g_ActiveConfig.bDumpFrames && data) AVIDump::AddFrame(data); + Core::Callback_VideoCopiedToXFB(false); return; } @@ -862,6 +857,9 @@ 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 && data) + AVIDump::AddFrame(data); + Core::Callback_VideoCopiedToXFB(false); return; } @@ -1027,10 +1025,16 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons SaveScreenshot(s_sScreenshotName, dst_rect); s_bScreenshot = false; } + + // Dump frames + static int w = 0, h = 0; if (g_ActiveConfig.bDumpFrames) { + static int s_recordWidth; + static int s_recordHeight; + HRESULT hr = D3D::dev->GetRenderTargetData(D3D::GetBackBufferSurface(),ScreenShootMEMSurface); - if (!s_bLastFrameDumped) + if (!bLastFrameDumped) { s_recordWidth = dst_rect.GetWidth(); s_recordHeight = dst_rect.GetHeight(); @@ -1064,11 +1068,11 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons ScreenShootMEMSurface->UnlockRect(); } } - s_bLastFrameDumped = true; + bLastFrameDumped = true; } else { - if (s_bLastFrameDumped && s_bAVIDumping) + if (bLastFrameDumped && s_bAVIDumping) { if (data) { @@ -1080,7 +1084,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons s_bAVIDumping = false; OSD::AddMessage("Stop dumping frames to AVI", 2000); } - s_bLastFrameDumped = false; + bLastFrameDumped = false; } // Finish up the current frame, print some stats diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index ca3280673e..8b2d08eecc 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -521,7 +521,7 @@ Renderer::~Renderer() if(s_bAVIDumping) { AVIDump::Stop(); - s_bLastFrameDumped = false; + bLastFrameDumped = false; s_bAVIDumping = false; } #else @@ -970,11 +970,13 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons if ((!xfbSourceList || xfbCount == 0) && g_ActiveConfig.bUseXFB && !g_ActiveConfig.bUseRealXFB) { if (g_ActiveConfig.bDumpFrames && data) - #ifdef _WIN32 + { +#ifdef _WIN32 AVIDump::AddFrame((char *) data); - #elif defined HAVE_LIBAV +#elif defined HAVE_LIBAV AVIDump::AddFrame(data, w, h); - #endif +#endif + } Core::Callback_VideoCopiedToXFB(false); return; } @@ -1145,7 +1147,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons glReadPixels(dst_rect.left, dst_rect.bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, data); if (GL_REPORT_ERROR() == GL_NO_ERROR && w > 0 && h > 0) { - if (!s_bLastFrameDumped) + if (!bLastFrameDumped) { #ifdef _WIN32 s_bAVIDumping = AVIDump::Start(EmuWindow::GetParentWnd(), w, h); @@ -1171,14 +1173,14 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons #endif } - s_bLastFrameDumped = true; + bLastFrameDumped = true; } else NOTICE_LOG(VIDEO, "Error reading framebuffer"); } else { - if (s_bLastFrameDumped && s_bAVIDumping) + if (bLastFrameDumped && s_bAVIDumping) { if (data) { @@ -1190,7 +1192,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons s_bAVIDumping = false; OSD::AddMessage("Stop dumping frames", 2000); } - s_bLastFrameDumped = false; + bLastFrameDumped = false; } #else if (g_ActiveConfig.bDumpFrames) From c710ea33f97b5b64eef1c56c2f67a666146d41f6 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Thu, 8 Sep 2011 17:09:24 +0200 Subject: [PATCH 042/381] Merge some frame dumping code to VideoCommon, fixes a memory leak in D3D9 and OpenGL if emulation is stopped while dumping frames. Breaks D3D11 frame dumping for some weird reason (memory corruption or whatever?). --- Source/Core/VideoCommon/Src/RenderBase.cpp | 17 +++- Source/Core/VideoCommon/Src/RenderBase.h | 13 ++- .../Plugins/Plugin_VideoDX11/Src/Render.cpp | 44 +++------ Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 43 ++++----- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 95 +++++++------------ 5 files changed, 93 insertions(+), 119 deletions(-) diff --git a/Source/Core/VideoCommon/Src/RenderBase.cpp b/Source/Core/VideoCommon/Src/RenderBase.cpp index 06f4c81ab6..fa6ba018c7 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.cpp +++ b/Source/Core/VideoCommon/Src/RenderBase.cpp @@ -42,6 +42,7 @@ #include "Host.h" #include "XFMemory.h" #include "FifoPlayer/FifoRecorder.h" +#include "AVIDump.h" #include #include @@ -52,7 +53,6 @@ int OSDChoice, OSDTime; Renderer *g_renderer = NULL; -bool bLastFrameDumped = false; std::mutex Renderer::s_criticalScreenshot; std::string Renderer::s_sScreenshotName; @@ -81,15 +81,28 @@ bool Renderer::s_EnableDLCachingAfterRecording; unsigned int Renderer::prev_efb_format = (unsigned int)-1; -Renderer::Renderer() +Renderer::Renderer() : frame_data(NULL), bLastFrameDumped(false) { UpdateActiveConfig(); + +#if defined _WIN32 || defined HAVE_LIBAV + bAVIDumping = false; +#endif } Renderer::~Renderer() { // invalidate previous efb format prev_efb_format = (unsigned int)-1; + +#if defined _WIN32 || defined HAVE_LIBAV + if (g_ActiveConfig.bDumpFrames && bLastFrameDumped && bAVIDumping) + AVIDump::Stop(); +#else + if (f_pFrameDump.IsOpen()) + f_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 48f096851f..e8d4c55a20 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.h +++ b/Source/Core/VideoCommon/Src/RenderBase.h @@ -132,9 +132,6 @@ public: protected: - static std::mutex s_criticalScreenshot; - static std::string s_sScreenshotName; - static void CalculateTargetScale(int x, int y, int &scaledX, int &scaledY); static bool CalculateTargetSize(int multiplier = 1); static void CalculateXYScale(const TargetRectangle& dst_rect); @@ -143,6 +140,16 @@ protected: static void RecordVideoMemory(); static volatile bool s_bScreenshot; + static std::mutex s_criticalScreenshot; + static std::string s_sScreenshotName; + +#if defined _WIN32 || defined HAVE_LIBAV + bool bAVIDumping; +#else + File::IOFile pFrameDump; +#endif + char* frame_data; + bool bLastFrameDumped; // The framebuffer size static int s_target_width; diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index 368fec357c..9de763bf37 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -64,8 +64,6 @@ ID3D11DepthStencilState* resetdepthstate = NULL; ID3D11RasterizerState* resetraststate = NULL; static ID3D11Texture2D* s_screenshot_texture = NULL; -static bool s_bAVIDumping; -static char *s_frame_data = NULL; // GX pipeline state struct @@ -355,9 +353,6 @@ Renderer::Renderer() SetupDeviceObjects(); - bLastFrameDumped = false; - s_bAVIDumping = false; - // Setup GX pipeline state memset(&gx_state.blenddc, 0, sizeof(gx_state.blenddc)); @@ -406,15 +401,6 @@ Renderer::Renderer() Renderer::~Renderer() { - if (g_ActiveConfig.bDumpFrames && bLastFrameDumped && s_bAVIDumping) - { - SAFE_DELETE_ARRAY(s_frame_data); - - AVIDump::Stop(); - s_bAVIDumping = false; - bLastFrameDumped = false; - } - TeardownDeviceObjects(); D3D::EndFrame(); D3D::Present(); @@ -900,8 +886,8 @@ 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) - AVIDump::AddFrame(s_frame_data); + if (g_ActiveConfig.bDumpFrames && frame_data) + AVIDump::AddFrame(frame_data); Core::Callback_VideoCopiedToXFB(false); return; @@ -914,8 +900,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) - AVIDump::AddFrame(s_frame_data); + if (g_ActiveConfig.bDumpFrames && frame_data) + AVIDump::AddFrame(frame_data); Core::Callback_VideoCopiedToXFB(false); return; @@ -1034,8 +1020,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons { s_recordWidth = dst_rect.GetWidth(); s_recordHeight = dst_rect.GetHeight(); - s_bAVIDumping = AVIDump::Start(EmuWindow::GetParentWnd(), s_recordWidth, s_recordHeight); - if (!s_bAVIDumping) + bAVIDumping = AVIDump::Start(EmuWindow::GetParentWnd(), s_recordWidth, s_recordHeight); + if (!bAVIDumping) { PanicAlert("Error dumping frames to AVI."); } @@ -1047,33 +1033,33 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons OSD::AddMessage(msg, 2000); } } - if (s_bAVIDumping) + if (bAVIDumping) { D3D11_MAPPED_SUBRESOURCE map; D3D::context->Map(s_screenshot_texture, 0, D3D11_MAP_READ, 0, &map); - if (!s_frame_data || w != s_recordWidth || h != s_recordHeight) + if (!frame_data || w != s_recordWidth || h != s_recordHeight) { - delete[] s_frame_data; - s_frame_data = new char[3 * s_recordWidth * s_recordHeight]; + delete[] frame_data; + frame_data = new char[3 * s_recordWidth * s_recordHeight]; w = s_recordWidth; h = s_recordHeight; } - formatBufferDump((char*)map.pData, s_frame_data, s_recordWidth, s_recordHeight, map.RowPitch); - AVIDump::AddFrame(s_frame_data); + formatBufferDump((char*)map.pData, frame_data, s_recordWidth, s_recordHeight, map.RowPitch); + AVIDump::AddFrame(frame_data); D3D::context->Unmap(s_screenshot_texture, 0); } bLastFrameDumped = true; } else { - if (bLastFrameDumped && s_bAVIDumping) + if (bLastFrameDumped && bAVIDumping) { - SAFE_DELETE_ARRAY(s_frame_data); + SAFE_DELETE_ARRAY(frame_data); w = h = 0; AVIDump::Stop(); - s_bAVIDumping = false; + bAVIDumping = false; OSD::AddMessage("Stop dumping frames to AVI", 2000); } bLastFrameDumped = false; diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index e7177be396..93b37e211a 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -67,7 +67,6 @@ static bool IS_AMD; static char *st; static LPDIRECT3DSURFACE9 ScreenShootMEMSurface = NULL; -static bool s_bAVIDumping; // State translation lookup tables @@ -292,9 +291,6 @@ Renderer::Renderer() // Make sure to use valid texture sizes D3D::FixTextureSize(s_target_width, s_target_height); - bLastFrameDumped = false; - s_bAVIDumping = false; - // We're not using fixed function. // Let's just set the matrices to identity to be sure. D3DXMATRIX mtx; @@ -337,10 +333,6 @@ Renderer::~Renderer() D3D::Present(); D3D::Close(); - if (s_bAVIDumping) - { - AVIDump::Stop(); - } delete[] st; } @@ -839,11 +831,10 @@ 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) { - static char* data = 0; if (g_bSkipCurrentFrame || (!XFBWrited && (!g_ActiveConfig.bUseXFB || !g_ActiveConfig.bUseRealXFB)) || !fbWidth || !fbHeight) { - if (g_ActiveConfig.bDumpFrames && data) - AVIDump::AddFrame(data); + if (g_ActiveConfig.bDumpFrames && frame_data) + AVIDump::AddFrame(frame_data); Core::Callback_VideoCopiedToXFB(false); return; @@ -857,8 +848,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 && data) - AVIDump::AddFrame(data); + if (g_ActiveConfig.bDumpFrames && frame_data) + AVIDump::AddFrame(frame_data); Core::Callback_VideoCopiedToXFB(false); return; @@ -1038,8 +1029,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons { s_recordWidth = dst_rect.GetWidth(); s_recordHeight = dst_rect.GetHeight(); - s_bAVIDumping = AVIDump::Start(EmuWindow::GetParentWnd(), s_recordWidth, s_recordHeight); - if (!s_bAVIDumping) + bAVIDumping = AVIDump::Start(EmuWindow::GetParentWnd(), s_recordWidth, s_recordHeight); + if (!bAVIDumping) { PanicAlert("Error dumping frames to AVI."); } @@ -1051,20 +1042,20 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons OSD::AddMessage(msg, 2000); } } - if (s_bAVIDumping) + if (bAVIDumping) { D3DLOCKED_RECT rect; if (SUCCEEDED(ScreenShootMEMSurface->LockRect(&rect, dst_rect.AsRECT(), D3DLOCK_NO_DIRTY_UPDATE | D3DLOCK_NOSYSLOCK | D3DLOCK_READONLY))) { - if (!data || w != s_recordWidth || h != s_recordHeight) + if (!frame_data || w != s_recordWidth || h != s_recordHeight) { - free(data); - data = (char*)malloc(3 * s_recordWidth * s_recordHeight); + delete[] frame_data; + frame_data = new char[3 * s_recordWidth * s_recordHeight]; w = s_recordWidth; h = s_recordHeight; } - formatBufferDump((const char*)rect.pBits, data, s_recordWidth, s_recordHeight, rect.Pitch); - AVIDump::AddFrame(data); + formatBufferDump((const char*)rect.pBits, frame_data, s_recordWidth, s_recordHeight, rect.Pitch); + AVIDump::AddFrame(frame_data); ScreenShootMEMSurface->UnlockRect(); } } @@ -1072,16 +1063,16 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons } else { - if (bLastFrameDumped && s_bAVIDumping) + if (bLastFrameDumped && bAVIDumping) { - if (data) + if (frame_data) { - free(data); - data = 0; + delete[] frame_data; + frame_data = 0; w = h = 0; } AVIDump::Stop(); - s_bAVIDumping = false; + bAVIDumping = false; OSD::AddMessage("Stop dumping frames to AVI", 2000); } bLastFrameDumped = false; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 8b2d08eecc..415d1986b3 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -110,12 +110,6 @@ int s_fps=0; RasterFont* s_pfont = NULL; -#if defined _WIN32 || defined HAVE_LIBAV -static bool s_bAVIDumping = false; -#else -static File::IOFile f_pFrameDump; -#endif - // 1 for no MSAA. Use s_MSAASamples > 1 to check for MSAA. static int s_MSAASamples = 1; static int s_MSAACoverageSamples = 0; @@ -250,9 +244,6 @@ Renderer::Renderer() s_fps=0; s_blendMode = 0; -#if defined _WIN32 || defined HAVE_LIBAV - s_bAVIDumping = false; -#endif #if defined HAVE_CG && HAVE_CG g_cgcontext = cgCreateContext(); @@ -516,19 +507,6 @@ Renderer::~Renderer() #endif delete g_framebuffer_manager; - -#if defined _WIN32 || defined HAVE_LIBAV - if(s_bAVIDumping) - { - AVIDump::Stop(); - bLastFrameDumped = false; - s_bAVIDumping = false; - } -#else - if (f_pFrameDump.IsOpen()) - f_pFrameDump.Close(); - s_bLastFrameDumped = false; -#endif } // Create On-Screen-Messages @@ -947,15 +925,14 @@ void Renderer::SetBlendMode(bool forceUpdate) // 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 u8 *data = NULL; static int w = 0, h = 0; if (g_bSkipCurrentFrame || (!XFBWrited && (!g_ActiveConfig.bUseXFB || !g_ActiveConfig.bUseRealXFB)) || !fbWidth || !fbHeight) { - if (g_ActiveConfig.bDumpFrames && data) + if (g_ActiveConfig.bDumpFrames && frame_data) #ifdef _WIN32 - AVIDump::AddFrame((char *) data); + AVIDump::AddFrame(frame_data); #elif defined HAVE_LIBAV - AVIDump::AddFrame(data, w, h); + AVIDump::AddFrame(frame_data, w, h); #endif Core::Callback_VideoCopiedToXFB(false); return; @@ -969,12 +946,12 @@ 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 && data) + if (g_ActiveConfig.bDumpFrames && frame_data) { #ifdef _WIN32 - AVIDump::AddFrame((char *) data); + AVIDump::AddFrame(frame_data); #elif defined HAVE_LIBAV - AVIDump::AddFrame(data, w, h); + AVIDump::AddFrame(frame_data, w, h); #endif } Core::Callback_VideoCopiedToXFB(false); @@ -1135,26 +1112,26 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons if (g_ActiveConfig.bDumpFrames) { std::lock_guard lk(s_criticalScreenshot); - if (!data || w != dst_rect.GetWidth() || + if (!frame_data || w != dst_rect.GetWidth() || h != dst_rect.GetHeight()) { - if (data) delete[] data; + if (frame_data) delete[] frame_data; w = dst_rect.GetWidth(); h = dst_rect.GetHeight(); - data = new u8[3 * w * h]; + 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, data); + glReadPixels(dst_rect.left, dst_rect.bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, frame_data); if (GL_REPORT_ERROR() == GL_NO_ERROR && w > 0 && h > 0) { if (!bLastFrameDumped) { #ifdef _WIN32 - s_bAVIDumping = AVIDump::Start(EmuWindow::GetParentWnd(), w, h); + bAVIDumping = AVIDump::Start(EmuWindow::GetParentWnd(), w, h); #else - s_bAVIDumping = AVIDump::Start(w, h); + bAVIDumping = AVIDump::Start(w, h); #endif - if (!s_bAVIDumping) + if (!bAVIDumping) OSD::AddMessage("AVIDump Start failed", 2000); else { @@ -1163,13 +1140,13 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), w, h).c_str(), 2000); } } - if (s_bAVIDumping) + if (bAVIDumping) { #ifdef _WIN32 - AVIDump::AddFrame((char *) data); + AVIDump::AddFrame(frame_data); #else - FlipImageData(data, w, h); - AVIDump::AddFrame(data, w, h); + FlipImageData(frame_data, w, h); + AVIDump::AddFrame(frame_data, w, h); #endif } @@ -1180,16 +1157,16 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons } else { - if (bLastFrameDumped && s_bAVIDumping) + if (bLastFrameDumped && bAVIDumping) { - if (data) + if (frame_data) { - delete[] data; - data = NULL; + delete[] frame_data; + frame_data = NULL; w = h = 0; } AVIDump::Stop(); - s_bAVIDumping = false; + bAVIDumping = false; OSD::AddMessage("Stop dumping frames", 2000); } bLastFrameDumped = false; @@ -1201,16 +1178,16 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons std::string movie_file_name; w = dst_rect.GetWidth(); h = dst_rect.GetHeight(); - data = new u8[3 * w * h]; + frame_data = new u8[3 * w * h]; glPixelStorei(GL_PACK_ALIGNMENT, 1); - glReadPixels(dst_rect.left, dst_rect.bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, data); + glReadPixels(dst_rect.left, dst_rect.bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, frame_data); if (GL_REPORT_ERROR() == GL_NO_ERROR) { - if (!s_bLastFrameDumped) + if (!bLastFrameDumped) { movie_file_name = File::GetUserPath(D_DUMPFRAMES_IDX) + "framedump.raw"; - f_pFrameDump.Open(movie_file_name, "wb"); - if (!f_pFrameDump) + pFrameDump.Open(movie_file_name, "wb"); + if (!pFrameDump) OSD::AddMessage("Error opening framedump.raw for writing.", 2000); else { @@ -1219,22 +1196,22 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons OSD::AddMessage(msg, 2000); } } - if (f_pFrameDump) + if (pFrameDump) { - FlipImageData(data, w, h); - f_pFrameDump.WriteBytes(data, w * 3 * h); - f_pFrameDump.Flush(); + FlipImageData(frame_data, w, h); + pFrameDump.WriteBytes(frame_data, w * 3 * h); + pFrameDump.Flush(); } - s_bLastFrameDumped = true; + bLastFrameDumped = true; } - delete[] data; + delete[] frame_data; } else { - if (s_bLastFrameDumped) - f_pFrameDump.Close(); - s_bLastFrameDumped = false; + if (bLastFrameDumped) + pFrameDump.Close(); + bLastFrameDumped = false; } #endif From 6d8f641cc901fd82b053f18cca43a3f940d35b1a Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Thu, 8 Sep 2011 17:52:01 +0200 Subject: [PATCH 043/381] Fix D3D11 frame dumping. --- Source/Plugins/Plugin_VideoDX11/Src/Render.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index 9de763bf37..53cf9fd4d9 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -871,13 +871,15 @@ void formatBufferDump(const char *in, char *out, int w, int h, int p) { for (int y = 0; y < h; ++y) { - const u32 *line = (u32*)(in + (h - y - 1) * p); + const u8 *line = (u8*)(in + (h - y - 1) * p); for (int x = 0; x < w; ++x) { - memcpy(out, line, 3); + out[0] = line[2]; + out[1] = line[1]; + out[2] = line[0]; out += 3; line += 4; - } + } } } @@ -1045,7 +1047,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons w = s_recordWidth; h = s_recordHeight; } - formatBufferDump((char*)map.pData, frame_data, s_recordWidth, s_recordHeight, map.RowPitch); + char* source_ptr = (char*)map.pData + dst_rect.left*4 + dst_rect.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); } From 913bc6d15f3ddc91a8f924227490f7b9e4b6d0cf Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Thu, 8 Sep 2011 22:59:34 +0200 Subject: [PATCH 044/381] D3D11: Disable some redundant shader compilation errors. --- Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp | 5 +---- Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp index c278ae1d81..0a67584409 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp @@ -490,7 +490,6 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) D3DBlob* pbytecode; if (!D3D::CompilePixelShader(code, (unsigned int)strlen(code), &pbytecode)) { - PanicAlert("Failed to compile Pixel Shader:\n\n%s", code); GFX_DEBUGGER_PAUSE_AT(NEXT_ERROR, true); return false; } @@ -516,10 +515,8 @@ bool PixelShaderCache::InsertByteCode(const PIXELSHADERUID &uid, const void* byt { ID3D11PixelShader* shader = D3D::CreatePixelShaderFromByteCode(bytecode, bytecodelen); if (shader == NULL) - { - PanicAlert("Failed to create pixel shader at %s %d\n", __FILE__, __LINE__); return false; - } + // TODO: Somehow make the debug name a bit more specific D3D::SetDebugObjectName((ID3D11DeviceChild*)shader, "a pixel shader of PixelShaderCache"); diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp index f46881b16b..c81993e5e1 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp @@ -233,7 +233,6 @@ bool VertexShaderCache::SetShader(u32 components) if (pbytecode == NULL) { - PanicAlert("Failed to compile Vertex Shader %s %d:\n\n%s", __FILE__, __LINE__, code); GFX_DEBUGGER_PAUSE_AT(NEXT_ERROR, true); return false; } @@ -257,10 +256,8 @@ bool VertexShaderCache::InsertByteCode(const VERTEXSHADERUID &uid, D3DBlob* bcod { ID3D11VertexShader* shader = D3D::CreateVertexShaderFromByteCode(bcodeblob); if (shader == NULL) - { - PanicAlert("Failed to create vertex shader from %p size %d at %s %d\n", bcodeblob->Data(), bcodeblob->Size(), __FILE__, __LINE__); return false; - } + // TODO: Somehow make the debug name a bit more specific D3D::SetDebugObjectName((ID3D11DeviceChild*)shader, "a vertex shader of VertexShaderCache"); From 6ccfd85f42cd5aa4da9a328e65e81cd3da478d01 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Thu, 8 Sep 2011 22:24:11 -0500 Subject: [PATCH 045/381] Build fix for the linux libav build. --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 415d1986b3..1870a64f8b 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -932,7 +932,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons #ifdef _WIN32 AVIDump::AddFrame(frame_data); #elif defined HAVE_LIBAV - AVIDump::AddFrame(frame_data, w, h); + AVIDump::AddFrame((u8*)frame_data, w, h); #endif Core::Callback_VideoCopiedToXFB(false); return; @@ -951,7 +951,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons #ifdef _WIN32 AVIDump::AddFrame(frame_data); #elif defined HAVE_LIBAV - AVIDump::AddFrame(frame_data, w, h); + AVIDump::AddFrame((u8*)frame_data, w, h); #endif } Core::Callback_VideoCopiedToXFB(false); @@ -1145,8 +1145,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons #ifdef _WIN32 AVIDump::AddFrame(frame_data); #else - FlipImageData(frame_data, w, h); - AVIDump::AddFrame(frame_data, w, h); + FlipImageData((u8*)frame_data, w, h); + AVIDump::AddFrame((u8*)frame_data, w, h); #endif } From f041eee23b51b11f198b993b81820597af13a30b Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 9 Sep 2011 16:30:29 +0200 Subject: [PATCH 046/381] Compile fix. --- Source/Core/VideoCommon/Src/RenderBase.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/VideoCommon/Src/RenderBase.cpp b/Source/Core/VideoCommon/Src/RenderBase.cpp index fa6ba018c7..3b06bbb1c0 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.cpp +++ b/Source/Core/VideoCommon/Src/RenderBase.cpp @@ -99,8 +99,8 @@ Renderer::~Renderer() if (g_ActiveConfig.bDumpFrames && bLastFrameDumped && bAVIDumping) AVIDump::Stop(); #else - if (f_pFrameDump.IsOpen()) - f_pFrameDump.Close(); + if (pFrameDump.IsOpen()) + pFrameDump.Close(); #endif delete[] frame_data; } From 08af37509e3fcbc3b1ed4c72b588e267449b9568 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 12 Sep 2011 17:58:05 +0200 Subject: [PATCH 047/381] More buildfixes.. --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 1870a64f8b..19142e44bb 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -1178,7 +1178,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons std::string movie_file_name; w = dst_rect.GetWidth(); h = dst_rect.GetHeight(); - frame_data = new u8[3 * w * h]; + 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); if (GL_REPORT_ERROR() == GL_NO_ERROR) @@ -1198,7 +1198,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons } if (pFrameDump) { - FlipImageData(frame_data, w, h); + FlipImageData((u8*)frame_data, w, h); pFrameDump.WriteBytes(frame_data, w * 3 * h); pFrameDump.Flush(); } From cfba35f7e573257e527d1f90a64a56e7400d919e Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 12 Sep 2011 18:01:45 +0200 Subject: [PATCH 048/381] Only link against libav if it's available. --- Source/Core/DolphinWX/CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 5fc433009f..f38e791cd0 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -9,12 +9,13 @@ set(LIBS core sfml-network SDL GL - avcodec - avformat - swscale ${XRANDR_LIBRARIES} ${X11_LIBRARIES}) +if(LIBAV_FOUND) + set(LIBS ${LIBS} ${LIBAV_LIBRARIES}) +endif() + if(wxWidgets_FOUND) set(SRCS Src/ARCodeAddEdit.cpp Src/AboutDolphin.cpp From 0a0cf0e0646705d4421370d2307c7cafb39c5fdd Mon Sep 17 00:00:00 2001 From: Runo Date: Mon, 12 Sep 2011 22:44:03 -0300 Subject: [PATCH 049/381] Update Pt_BR Translation to POT file revision 60. This is also a testing commit, as this is my first one on this repository ^^ --- Languages/po/pt_BR.po | 610 +++++++++++++----------------------------- 1 file changed, 191 insertions(+), 419 deletions(-) diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index 1ac0c7a002..d7d782547c 100644 --- a/Languages/po/pt_BR.po +++ b/Languages/po/pt_BR.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-08-10 08:30-0500\n" -"PO-Revision-Date: 2011-07-09 19:12-0300\n" +"PO-Revision-Date: 2011-09-11 23:35-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" +"Language: \n" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" @@ -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\" é um arquivo GCM/ISO inválido, ou não é um arquivo ISO de GC/Wii." +msgstr "\"%s\" é um arquivo GCM/ISO inválido, ou não é um arquivo ISO de GC/Wii." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:193 #, c-format @@ -58,9 +57,9 @@ msgid "%d Hz" msgstr "%d Hz" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 -#, fuzzy, c-format +#, c-format msgid "%i connected" -msgstr "Desconectado" +msgstr "%i conectado" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296 @@ -74,22 +73,22 @@ msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s não pôde ser \"limpo\". A imagem provavelmente está corrompida." #: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 -#, fuzzy, c-format +#, c-format msgid "" "%s failed to load as a memorycard \n" " Card file size is invalid (0x%x bytes)" msgstr "" -"Falha ao carregar o Memory Card\n" -" O tamanho é inválido (%04X)" +"%s falhou ao ser carregado como Memory Card\n" +" O tamanho é inválido (0x%x bytes)" #: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 -#, fuzzy, c-format +#, c-format msgid "" "%s failed to load as a memorycard \n" " Card size is invalid (0x%x bytes)" msgstr "" -"Falha ao carregar o Memory Card\n" -" O tamanho é inválido (%04X)" +"%s falhou ao ser carregado como Memory Card\n" +" O tamanho é inválido (0x%x bytes)" #: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 #, c-format @@ -97,6 +96,8 @@ 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ão pôde ser carregado como um MemoryCard \n" +"o arquivo não é grande o bastante para ser um arquivo de Memory Card (0x%x bytes)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -367,13 +368,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" @@ -383,18 +382,14 @@ msgid "" msgstr "" "ALERTA:\n" "\n" -"O NetPlay atualmente irá funcionar corretamente apenas usando as " -"configurações a seguir:\n" +"O NetPlay atualmente irá funcionar corretamente apenas usando as configurações a seguir:\n" " - Dual Core [DESLIGADO]\n" " - Aceleração de Audio [Desligado]\n" " - DSP-HLE com \"Audio Nulo\" ou DSP-LLE\n" -" - Manualmente configurar o número exato de controles a serem usados para " -"[Controle Padrão]\n" +" - Manualmente configurar o número exato de controles a serem usados para [Controle Padrão]\n" "\n" -"Todos os jogadores devem tentar usar a mesma versão e configuração do " -"Dolphin.\n" -"Desative todos os cartões de memórias ou mande eles para todos os jogadores " -"antes de começar .\n" +"Todos os jogadores devem tentar usar a mesma versão e configuração do Dolphin.\n" +"Desative todos os cartões de memórias ou mande eles para todos os jogadores antes de começar .\n" "Suport ao wiimote não foi implementado.\n" "\n" "Você deve redirecionar as portas TCP para ser o Host!!" @@ -424,14 +419,12 @@ msgstr "Emulção precisa de 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, leave this checked." msgstr "" "Emula as Cópias do EFB com precisão.\n" -"Alguns jogos dependem disso para certos efeitos visuais ou funções de " -"jogabilidade.\n" +"Alguns jogos dependem disso para certos efeitos visuais ou funções de jogabilidade.\n" "\n" "Se estiver em dúvida, deixe isto ativado." @@ -456,38 +449,23 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" -msgstr "" -"Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Add Code " -"(%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +msgstr "Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Add Code (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:756 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " -"(%s)" -msgstr "" -"Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Fill e " -"Slide (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)" +msgstr "Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Fill e Slide (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:549 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " -"Fill (%s)" -msgstr "" -"Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em RAM Write " -"e Fill (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)" +msgstr "Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em RAM Write e Fill (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:609 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Write To " -"Pointer (%s)" -msgstr "" -"Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Write to " -"Pointer (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Write To Pointer (%s)" +msgstr "Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Write to Pointer (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:803 #, c-format @@ -496,11 +474,8 @@ msgstr "Erro no Action Replay: Valor inválido (%08x) na Cópia de Memória (%s) #: Source/Core/Core/Src/ActionReplay.cpp:684 #, c-format -msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "" -"Erro no Action Replay: Master Code e Write To CCXXXXXX não está implementado " -"(%s)" +msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgstr "Erro no Action Replay: Master Code e Write To CCXXXXXX não está implementado (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -562,16 +537,14 @@ msgstr "Endereço:" 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 "" "Adiciona o valor especificado ao Parâmetro do zFar.\n" "Duas formas de expressar os valores flutuantes do ponteiro.\n" -"Exemplo: Digitar ''200'' ou ''0.0002'' diretamente, isso vai produzir " -"efeitos iguais, o valor adquirido será ''0.0002''.\n" +"Exemplo: Digitar ''200'' ou ''0.0002'' diretamente, isso vai produzir efeitos iguais, o valor adquirido será ''0.0002''.\n" "Valores: (0->+/-Inteiro) ou (0->+/-FP[6 dígitos precisos])\n" "\n" "NOTA: Confira a Janela de Log/Console para ver os valores adquiridos." @@ -580,16 +553,14 @@ 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 "" "Adiciona o valor especificado ao Parâmetro do zNear.\n" "Duas formas de expressar os valores flutuantes do ponteiro.\n" -"Exemplo: Digitar ''200'' ou ''0.0002'' diretamente, isso vai produzir " -"efeitos iguais, o valor adquirido será ''0.0002''.\n" +"Exemplo: Digitar ''200'' ou ''0.0002'' diretamente, isso vai produzir efeitos iguais, o valor adquirido será ''0.0002''.\n" "Valores: (0->+/-Inteiro) ou (0->+/-FP[6 dígitos precisos])\n" "\n" "NOTA: Confira a Janela de Log/Console para ver os valores adquiridos." @@ -637,13 +608,11 @@ msgstr "Todos os arquivos (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 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, 6 e 7 enquanto o emulador está funcionando.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -700,9 +669,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 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!" +msgstr "Você tem certeza que quer deletar este arquivo? Ele ficará perdido para sempre!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 @@ -886,17 +853,12 @@ 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" +"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" +"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." @@ -928,21 +890,22 @@ msgstr "Não é possível abrir %s" #: Source/Core/DolphinWX/Src/FrameTools.cpp:721 msgid "Cannot record movies in read-only mode." -msgstr "" +msgstr "Não é possível gravar vídeos no modo Apenas Leitura" #: Source/Core/Core/Src/CoreTiming.cpp:122 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:1016 -#, fuzzy, c-format +#, c-format msgid "" "Cannot use that file as a memory card.\n" "%s\n" "is not a valid gamecube memory card file" msgstr "" "Não é possível usar aquele arquivo como um Memory Card.\n" -"Você está tentando usar o mesmo arquivo nos dois slots?" +"%s\n" +"não é um arquivo de Memory Card válido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 msgid "" @@ -955,14 +918,12 @@ msgstr "" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858 #, 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" +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:1872 #, 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" +msgstr "Não foi possível encontrar o Wiimote pelo identificador de conexão %02x" #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 @@ -1069,12 +1030,8 @@ msgid "Choose a memory card:" msgstr "Escolher um cartão de memória:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 -msgid "" -"Choose file to use as apploader: (applies to discs constructed from " -"directories only)" -msgstr "" -"Escolher um arquivo para ser usado como apploader: (aplicável somente para " -"discos construídos de diretórios)" +msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" +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:764 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 @@ -1101,12 +1058,8 @@ msgid "Clear failed." msgstr "Falha na liberação." #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "" -"Client disconnect while game is running!! NetPlay is disabled. You must " -"manually stop the game." -msgstr "" -"O Client desconectou-se enquanto o jogo rodava!! O NetPlay foi desativado. " -"Você deve parar o jogo manualmente." +msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." +msgstr "O Client desconectou-se enquanto o jogo rodava!! O NetPlay foi desativado. Você deve parar o jogo manualmente." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 @@ -1256,14 +1209,8 @@ msgstr "Não foi possível inicializar o Backend 5s. %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 "" -"Não foi possível ler \"%s\". Não há nenhum disco no leitor, ou não é uma " -"cópia de GC/Wii. Note que os discos originais de Gamecube e Wii não podem " -"ser lidos pela maioria dos leitores de DVD dos PCs." +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 "Não foi possível ler \"%s\". Não há nenhum disco no leitor, ou não é uma cópia de GC/Wii. Note que os discos originais de Gamecube e Wii não podem ser lidos pela maioria dos leitores de DVD dos PCs." #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format @@ -1280,8 +1227,7 @@ 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ão foi possível definir os controles. O jogador saiu ou o jogo está rodando " -"no momento!\n" +"Não foi possível definir os controles. O jogador saiu ou o jogo está rodando no momento!\n" "(Definir os controles durante o jogo ainda não é suportado)" #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 @@ -1289,13 +1235,11 @@ msgstr "" 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 "" "Não foi possível escrever no arquivo de Memory Card %s.\n" "\n" -"Você está executando o Dolphin de um CD/DVD, ou talvez o arquivo de salva " -"seja somente-leitura?" +"Você está executando o Dolphin de um CD/DVD, ou talvez o arquivo de salva seja somente-leitura?" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 msgid "Couldn't find open command for extension 'ini'!" @@ -1333,10 +1277,8 @@ msgid "Created by KDE-Look.org" msgstr "Criado por KDE-Look.org" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 -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 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:492 msgid "Created by VistaIcons.com" @@ -1352,7 +1294,7 @@ msgstr "Criador:" #: Source/Core/Common/Src/MsgHandler.cpp:68 msgid "Critical" -msgstr "" +msgstr "Crítico" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Crop" @@ -1512,12 +1454,8 @@ msgstr "Detectar" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -msgid "" -"Detected attempt to read more data from the DVD than fit inside the out " -"buffer. Clamp." -msgstr "" -"Foi detectada a tentativa de ler mais dados do DVD do que cabem no buffer de " -"saída. Segurando." +msgid "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp." +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 @@ -1577,30 +1515,24 @@ msgstr "Desabilitar o Auto-Falante do Wiimote" #: 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 "" "Desativa a emulação do XFB.\n" -"Aumenta bastante a performance mas pode causar problemas em vários jogos que " -"precisam dela (especialmente aplicativos amadores/homebrew).\n" +"Aumenta bastante a performance mas pode causar problemas em vários jogos que precisam dela (especialmente aplicativos amadores/homebrew).\n" "\n" "Se estiver em dúvida, deixe isto ativado." #: 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 "" "Desativa a emulação de cópias do EFB.\n" -"Elas são usadas com frequência para efeitos pós-processamento ou efeitos de " -"textura, portanto apesar de esta opção aumentar bastante a velocidade, ela " -"quase sempre causa problemas.\n" +"Elas são usadas com frequência para efeitos pós-processamento ou efeitos de textura, portanto apesar de esta opção aumentar bastante a velocidade, ela quase sempre causa problemas.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -1688,20 +1620,12 @@ msgid "Dolphin at &Google Code" msgstr "Dolphin no &Google Code" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 -msgid "" -"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " -"files..." -msgstr "" -"Dolphin não pôde encontrar ISOs GC/Wii. Duplo-clique aqui para procurar por " -"arquivos..." +msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." +msgstr "Dolphin não pôde encontrar ISOs GC/Wii. Duplo-clique aqui para procurar por arquivos..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 -msgid "" -"Dolphin is currently set to hide all games. Doubleclick here to show all " -"games..." -msgstr "" -"Dolphin atualmente está configurado para esconder todos os jogos. Duplo-" -"clique aqui para mostrar todos os jogos..." +msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." +msgstr "Dolphin atualmente está configurado para esconder todos os jogos. Duplo-clique aqui para mostrar todos os jogos..." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 @@ -1747,8 +1671,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Transfere todos os quadros renderizados para um arquivo AVI em User/Dump/" -"Frames/\n" +"Transfere todos os quadros renderizados para um arquivo AVI em User/Dump/Frames/\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -1787,16 +1710,8 @@ msgstr "Cópias de EFB" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, 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 " -"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." +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 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." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 msgid "EUROPE" @@ -1846,30 +1761,24 @@ msgstr "Este Segmento de Emulação já está rodando" #: 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 "" "Emula os XFBs com precisão.\n" -"Diminui muito a performance e impossibilita a renderização em resoluções " -"altas mas é necessário para emular corretamente um certo número de jogos.\n" +"Diminui muito a performance e impossibilita a renderização em resoluções altas mas é necessário para emular corretamente um certo número de jogos.\n" "\n" "Se estiver em dúvida, selecione Virtual." #: 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 "" "Emula os XFBs usando objetos de textura da GPU.\n" -"Corrige vários jogos que dependem da emulação do XFB e é bem mais rápido que " -"o XFB real. No entanto, ele ainda não funciona para muitos outros jogos (em " -"especial aplicativos homebrew/amadores).\n" +"Corrige vários jogos que dependem da emulação do XFB e é bem mais rápido que o XFB real. No entanto, ele ainda não funciona para muitos outros jogos (em especial aplicativos homebrew/amadores).\n" "\n" "Se estiver em dúvida, deixe isto ativado." @@ -1887,15 +1796,13 @@ msgstr "Ativar" #: 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 "" -"Ativa efeitos 3D através de estereoscopia usando a tecnologia Nvidia 3D " -"Vision se isto for suportado pela sua GPU.\n" +"Ativa efeitos 3D através de estereoscopia usando a tecnologia Nvidia 3D Vision se isto for suportado pela sua GPU.\n" "Pode causar problemas.\n" "Pecisa estar em Tela Cheia para funcionar.\n" "\n" @@ -1975,19 +1882,14 @@ msgid "" "If unsure, select 1x." msgstr "" "Ativar Filtro Anisotrópico.\n" -"Melhora a qualidade visual das texturas quando são vistas de ângulos " -"oblíquos.\n" +"Melhora a qualidade visual das texturas quando são vistas de ângulos oblíquos.\n" "Pode causar problemas em um número pequeno de jogos. \n" "\n" "Se estiver em dúvida, selecione 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -msgid "" -"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " -"Compatible)" -msgstr "" -"Ativar acesso rápido de disco. Necessário para alguns jogos.(ON = Rapido, " -"OFF = Compativel)" +msgid "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)" +msgstr "Ativar acesso rápido de disco. Necessário para alguns jogos.(ON = Rapido, OFF = Compativel)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Enable pages" @@ -2007,33 +1909,21 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 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 "" -"Tive esta opção se você quiser usar a janela principal do Dolphin para " -"mostrar o jogo em vez de uma janela separada para a renderização.\n" +"Tive esta opção se você quiser usar a janela principal do Dolphin para mostrar o jogo em vez de uma janela separada para a renderização.\n" "\n" "Se estiver em dúvida, deixe isto desativado." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 -msgid "" -"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " -"ANY other game." -msgstr "" -"Ative isso para ter ganho de velocidade em The legend of Zelda: Twilight " -"Princess. Disative para QUALQUER UM outro jogo." +msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." +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:311 -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 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:334 msgid "Enables Custom Projection Hack" @@ -2052,12 +1942,8 @@ msgstr "" "Se estiver em dúvida, deixe isto desativado" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -msgid "" -"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " -"OFF = Fast)" -msgstr "" -"Ativar unidade de gerenciamento de memoria, necessário para alguns jogos. " -"(ON = Compativel, OFF = Rapido)" +msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" +msgstr "Ativar unidade de gerenciamento de memoria, necessário para alguns jogos. (ON = Compativel, OFF = Rapido)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" @@ -2114,12 +2000,8 @@ msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema." #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 #, c-format -msgid "" -"Error: Trying to access %s fonts but they are not loaded. Games may not show " -"fonts correctly, or crash." -msgstr "" -"Erro: Tentando acessar as fontes %s mas elas não estão carregadas. Os jogos " -"podem não mostrar as fontes corretamente, ou travar." +msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." +msgstr "Erro: Tentando acessar as fontes %s mas elas não estão carregadas. Os jogos podem não mostrar as fontes corretamente, ou travar." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2132,8 +2014,7 @@ msgstr "Euphoria" #: Source/Core/Core/Src/MemTools.cpp:214 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" -msgstr "" -"Manipulador de Exceções - Acesso abaixo do espaço da memória. %08llx%08llx" +msgstr "Manipulador de Exceções - Acesso abaixo do espaço da memória. %08llx%08llx" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Execute" @@ -2262,7 +2143,7 @@ msgstr "Não foi possível Ouvir!!" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 msgid "Failed to download codes." -msgstr "Fa" +msgstr "Falha ao dazer o download de códigos." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 #, c-format @@ -2470,8 +2351,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Força filtro de texturas mesmo que o jogo tenha desativado-o " -"explicitamente.\n" +"Força filtro de texturas mesmo que o jogo tenha desativado-o explicitamente.\n" "Melhora um pouco a qualidade das texturas mas causa erros em certos jogos.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -2491,12 +2371,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 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 "" "Força o modo NTSC-J para usar a fonte da ROM Japonesa.\n" -"Se isto ficar desativado, o Dolphin usa NTSC-U e ativa esta opção " -"automaticamente quando você jogar jogos japoneses." +"Se isto ficar desativado, o Dolphin usa NTSC-U e ativa esta opção automaticamente quando você jogar jogos japoneses." #: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 msgid "" @@ -2641,7 +2519,7 @@ msgstr "Geral" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 msgid "General Settings" -msgstr "Opções Gerais" +msgstr "Configurações Gerais" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 @@ -2668,14 +2546,12 @@ msgstr "Maior do que" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 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" "\n" "If unsure, leave this checked." msgstr "" -"Aumenta muito a qualidade das texturas geradas usando efeitos de " -"renderização.\n" +"Aumenta muito a qualidade das texturas geradas usando efeitos de renderização.\n" "Aumentar a Resolução Interna vai melhorar o efeito desta opção.\n" "\n" "Se estiver em dúvida, deixe isto ativado." @@ -2736,8 +2612,7 @@ msgstr "" "Olá\n" "\n" "O Dolphin precisa que a sua CPU tenha suporte a extensões SSE2. \n" -"Infelizmente a sua CPU não tem este suporte, e portanto o Dolphin não " -"funcionará.\n" +"Infelizmente a sua CPU não tem este suporte, e portanto o Dolphin não funcionará.\n" "\n" "Sayonara!\n" @@ -2788,19 +2663,16 @@ msgstr "Wiimote Hibrido" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 #, 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" +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:795 #, 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: O jogo tentou recarregar a ios ou um título que não está " -"disponível no dump do seu NAND\n" +"IOCTL_ES_LAUNCH: O jogo tentou recarregar a ios ou um título que não está disponível no dump do seu NAND\n" "TitleID %016llx.\n" " O Dolphin vai provavelmente travar agora" @@ -2841,20 +2713,12 @@ msgid "Icon" msgstr "Icone" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -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)" +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:481 -msgid "" -"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." -msgstr "" -"Se você colocar o Limitador de FPS em um valor maior que a velocidade máxima " -"do jogo (NTSC:60, PAL:50), você também vai precisar desativar o Throttle de " -"Ãudio no DSP para que funcione." +msgid "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." +msgstr "Se você colocar o Limitador de FPS em um valor maior que a velocidade máxima do jogo (NTSC:60, PAL:50), você também vai precisar desativar o Throttle de Ãudio no DSP para que funcione." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 msgid "Ignore Format Changes" @@ -2863,28 +2727,24 @@ msgstr "Ignorar Mudanças de Formato" #: 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 "" "Ignora qualquer mudança no formato do EFB.\n" -"Melhora a Performance em vários jogos sem qualquer efeito negativo. Causa " -"defeitos gráficos em um pequeno número de jogos, no entanto.\n" +"Melhora a Performance em vários jogos sem qualquer efeito negativo. Causa defeitos gráficos em um pequeno número de jogos, no entanto.\n" "\n" "Se estiver em dúvida, deixe isto ativado." #: 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 "" "Ignora quaisquer pedidos da CPU de ler ou escrever no EFB.\n" -"Melhora a performance em alguns jogos, mas pode desativar algumas funções " -"dos jogos ou efeitos gráficos.\n" +"Melhora a performance em alguns jogos, mas pode desativar algumas funções dos jogos ou efeitos gráficos.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -2918,13 +2778,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 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 "" -"Aumenta a performance mas causa problemas em jogos que dependem da emulação " -"apropriada da névoa.\n" +"Aumenta a performance mas causa problemas em jogos que dependem da emulação apropriada da névoa.\n" "\n" "Se estiver em dúvida, deixe esta opção desativada." @@ -2934,8 +2792,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Melhora a performance mas faz a iluminação desaparecer na maioria dos " -"jogos.\n" +"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." @@ -2985,11 +2842,8 @@ msgid "Install to Wii Menu" msgstr "Instalar para o menu do WII" #: Source/Core/Core/Src/MemTools.cpp:248 -msgid "" -"InstallExceptionHandler called, but this platform does not yet support it." -msgstr "" -"InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem " -"suporte a ele." +msgid "InstallExceptionHandler called, but this platform does not yet support it." +msgstr "InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem suporte a ele." #: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 msgid "Installing WAD..." @@ -3238,8 +3092,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Carrega texturas de alta definição do diretório User/Load/Textures//\n" +"Carrega texturas de alta definição do diretório User/Load/Textures//\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -3346,12 +3199,8 @@ msgid "Memory Card" msgstr "Cartão de memoria" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "" -"Memory Card Manager WARNING-Make backups before using, should be fixed but " -"could mangle stuff!" -msgstr "" -"AVISO do Gerenciador de- Memory Card - Faça backupsantes de usar, deve estar " -"funcionando mas pode corromper coisas!" +msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" +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 #, c-format @@ -3372,7 +3221,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" -msgstr "" +msgstr "O tamanho do arquivo do Memory Card é diferente do tamanho do header" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:47 msgid "Menu" @@ -3402,14 +3251,11 @@ msgstr "Modificador" #: 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 "" -"Modifica as texturas para que elas mostrem o formato em que elas estão " -"codificadas. Ao ativar isto, é preciso reiniciar a emulação na maioria das " -"vezes.\n" +"Modifica as texturas para que elas mostrem o formato em que elas estão codificadas. Ao ativar isto, é preciso reiniciar a emulação na maioria das vezes.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -3449,12 +3295,8 @@ msgid "Multiply" msgstr "Multiplicar" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -msgid "" -"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " -"effect on emulated wiimotes." -msgstr "" -"Desliga o som que sai do Wiimote. Corrige desconexões imprevisíveis em " -"Wiimotes Reais. Não faz efeito em Wiimotes Emulados." +msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." +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/WXInputBase.cpp:126 msgid "NP Add" @@ -3758,12 +3600,8 @@ msgid "Other" msgstr "Outros" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "" -"Other client disconnected while game is running!! NetPlay is disabled. You " -"manually stop the game." -msgstr "" -"Outro Client desconectou enquanto o jogo rodava!! O Netplay foi " -"desabilitado. Você deve parar o jogo manualmente." +msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." +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 msgid "Output" @@ -3993,9 +3831,8 @@ msgid "Real Wiimote" msgstr "Wiimote Real" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 -#, fuzzy msgid "Real Wiimotes" -msgstr "Wiimote Real" +msgstr "Wiimotes Reais" #: Source/Core/DolphinWX/Src/Frame.cpp:163 msgid "Reconnect Wiimote Confirm" @@ -4220,8 +4057,10 @@ msgstr "Filtro de Busca" msgid "Search Subfolders" msgstr "Procurar em sub-pastas" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:104 +#: Source/Core/Common/Src/SysConf.h:127 +#: Source/Core/Common/Src/SysConf.h:147 +#: Source/Core/Common/Src/SysConf.h:168 #, c-format msgid "Section %s not found in SYSCONF" msgstr "A seção %s não foi encontrada no SYSCONF" @@ -4298,15 +4137,13 @@ msgstr "Fonte Selecionada" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 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 "" "Seleciona que resolução será usada no modo Tela Cheia.\n" -"Isto deve ser sempre maior ou igual à Resolução Interna. O impacto na " -"performance é insignificante.\n" +"Isto deve ser sempre maior ou igual à Resolução Interna. O impacto na performance é insignificante.\n" "\n" "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.." @@ -4314,15 +4151,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 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 "" "Seleciona qual API gráfico será usado internamente.\n" -"Direct3D 9 é geralmente o mais rápido. O OpenGL tem menos erros, no entanto. " -"O Direct3D 11 está entre os dois.\n" +"Direct3D 9 é geralmente o mais rápido. O OpenGL tem menos erros, no entanto. O Direct3D 11 está entre os dois.\n" "Note que os Backends Direct3D só podem ser usados no Windows.\n" "\n" "Se estiver em dúvida, use o Direct3D 9." @@ -4344,11 +4179,8 @@ msgid "Serbian" msgstr "Sérvio" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -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" +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 msgid "Set" @@ -4366,8 +4198,7 @@ msgstr "Definir como Memory Card padrão%c" #: Source/Core/Core/Src/ActionReplay.cpp:462 #, c-format 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" +msgstr "SetARCode_IsActive: O índice é maior que a lista de códigos AR de tamanho %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Settings..." @@ -4488,12 +4319,10 @@ msgstr "Mostrar uma janela de confirmação antes de parar um jogo." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 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 "" "Mostra uma menssagem 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." +"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:812 msgid "Show first block" @@ -4517,13 +4346,11 @@ msgstr "Mostrar título do salva" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 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 "" -"Mostra o número de quadros renderizados por segundo como uma forma de medir " -"a velocidade da emulação.\n" +"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." @@ -4571,13 +4398,11 @@ msgstr "Não permite o acesso da CPU ao EFB" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 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 "" -"Não faz o passe de destino Alfa usado em muitos jogos para vários efeitos " -"gráficos.\n" +"Não faz o passe de destino Alfa usado em muitos jogos para vários efeitos gráficos.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -4605,15 +4430,13 @@ msgstr "Renderizador por Software" #: 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 "" "O Renderizador por Software é bem mais lento que os outros backends.\n" "É útil apenas para a depuração de problemas.\n" -"Você realmente quer utilizar o Renderizador por Software? Se estiver em " -"dúvida, pressione 'Não'." +"Você realmente quer utilizar o Renderizador por Software? Se estiver em dúvida, pressione 'Não'." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 msgid "Sound Settings" @@ -4645,21 +4468,13 @@ msgstr "Volume do Auto-Falante:" #: 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 "" -"Especifica a resolução a renderizar. Uma resolução mais alta aumenta a " -"qualidade visual mas é bastante pesada e pode causar problemas em alguns " -"jogos.\n" -"\"Múltiplo de 640x528\" é um pouco mais lento que \"Window Size\" mas causa " -"menos problemas. De forma geral, quanto menor for a resolução interna, maior " -"será a performance.\n" +"Especifica a resolução a renderizar. Uma resolução mais alta aumenta a qualidade visual mas é bastante pesada e pode causar problemas em alguns jogos.\n" +"\"Múltiplo de 640x528\" é um pouco mais lento que \"Window Size\" mas causa menos problemas. De forma geral, quanto menor for a resolução interna, maior será a performance.\n" "\n" "Se estiver em dúvida, selecione 640x528." @@ -4814,12 +4629,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 "" -"O arquivo %s não pôde ser aberto para escrita. Por favor cheque se ele não " -"está aberto em outro programa." +msgid "The file %s could not be opened for writing. Please check if it's already opened by another program." +msgstr "O arquivo %s não pôde ser aberto para escrita. Por favor cheque se ele não está aberto em outro programa." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format @@ -4845,16 +4656,11 @@ msgstr "O código AR resultante da derciptação não contém nenhuma linha." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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" +msgstr "O Salva que você está tentando copiar tem um tamanho de arquivo inválido" #: Source/Core/DolphinWX/Src/Main.cpp:363 -msgid "" -"The selected language is not supported by your system. Falling back to " -"system default." -msgstr "" -"O idioma selecionado não é suportado pelo seu sistema. Voltando ao padrão do " -"sistema." +msgid "The selected language is not supported by your system. Falling back to system default." +msgstr "O idioma selecionado não é suportado pelo seu sistema. Voltando ao padrão do sistema." #: Source/Core/Core/Src/NetPlayClient.cpp:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -4890,12 +4696,8 @@ 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:467 -msgid "" -"There must be a ticket for 00000001/00000002. Your NAND dump is probably " -"incomplete." -msgstr "" -"É necessário um ticket para 00000001/00000002. O seu Dump do NAND está " -"provavelmente incompleto." +msgid "There must be a ticket for 00000001/00000002. Your NAND dump is probably incomplete." +msgstr "É necessário um ticket para 00000001/00000002. O seu Dump do NAND está provavelmente incompleto." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "" @@ -4906,34 +4708,23 @@ msgstr "" "Indeterminado significa que o jogo usa as configurações do Dolphin." #: Source/Core/Core/Src/ActionReplay.cpp:356 -msgid "" -"This action replay simulator does not support codes that modify Action " -"Replay itself." -msgstr "" -"Este simulador de Action Replay não suporta códigos que modifiquem o Action " -"Replay em si." +msgid "This action replay simulator does not support codes that modify Action Replay itself." +msgstr "Este simulador de Action Replay não suporta códigos que modifiquem o Action Replay em si." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 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." +msgstr "Isto pode causar diminuição da performance no Wii Menu e em alguns jogos." #: 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 "" "Este recurso permite mexer na câmera do jogo.\n" "\n" -"Segure o botão direito e mova o mouse para mover a câmera em qualquer " -"direção. Segure SHIFT e pressione uma das teclas WASD para mover a câmera em " -"uma certa distância (SHIFT+0 para movê-la mais rápido e SHIFT+9 para movê-la " -"mais devagar). Pressione SHIFT+R para voltar a câmera à posição inicial.\n" +"Segure o botão direito e mova o mouse para mover a câmera em qualquer direção. Segure SHIFT e pressione uma das teclas WASD para mover a câmera em uma certa distância (SHIFT+0 para movê-la mais rápido e SHIFT+9 para movê-la mais devagar). Pressione SHIFT+R para voltar a câmera à posição inicial.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -4946,8 +4737,7 @@ msgid "" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" "Isto é usado para controlar a velocidade do jogo por throttle de som.\n" -"Desativar isso pode causar velocidade de jogo anormal, ás vezes muito " -"rápido.\n" +"Desativar isso pode causar velocidade de jogo anormal, ás vezes muito rápido.\n" "Mas algumas vezes ativar isso pode causar ruído constante.\n" "\n" "Atalho de Teclado : Segure para instantaneamente desativar o Throttle." @@ -4958,15 +4748,11 @@ msgstr "Isto é usado para tocar trilhas sonoras de jogos, como BGM" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 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 "" -"Isto separa os segmentos de Ãudio e Vídeo, para que eles possam ser rodados " -"em núcleos diferentes.\n" -"Dá um grande aumento de velocidade para PCs com mais de um núcleo, mas " -"também pode causar travamentos/erros ocasionais." +"Isto separa os segmentos de Ãudio e Vídeo, para que eles possam ser rodados em núcleos diferentes.\n" +"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:283 msgid "This will let you Manually Edit the INI config file" @@ -5017,7 +4803,8 @@ msgstr "Houve a tentativa de carregar um tipo de arquivo desconhecido." msgid "Triggers" msgstr "Gatilhos" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:92 +#: Source/Core/Common/Src/SysConf.h:115 msgid "Trying to read from invalid SYSCONF" msgstr "Tentando ler de um SYSCONF inválido" @@ -5063,17 +4850,16 @@ msgid "" "Unable to create patch from given values.\n" "Entry not modified." msgstr "" +"Impossível criar patch com os valores dados. \n" +"Nada modificado." #: 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 "" -"Não foi possível analisar a linha %lu do código AR digitado como código " -"válido encriptado ou decriptad. Certifique-se de que você digitou " -"corretamente.\n" +"Não foi possível analisar a linha %lu do código AR digitado como código válido encriptado ou decriptad. Certifique-se de que você digitou corretamente.\n" "Você gostaria de ignorar esta linha e continuar a análise?" #: Source/Core/DolphinWX/Src/FrameTools.cpp:404 @@ -5107,8 +4893,7 @@ msgstr "Menssagem desconhecida recebida com identificação: %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" -msgstr "" -"Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!" +msgstr "Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!" #: Source/Core/Core/Src/HW/Memmap.cpp:633 #, c-format @@ -5157,23 +4942,19 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Usa múltiplos segmentos para decodificar texturas.\n" -"Pode resultar em um aumento de velocidade (especialmente em CPUs com mais de " -"dois núcleos).\n" +"Pode resultar em um aumento de velocidade (especialmente em CPUs com mais de dois núcleos).\n" "\n" "Se estiver em dúvida, deixe isto desativado." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 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 "" -"Normalmente se a compilação dos Shaders falha, uma mensagem de erro é " -"mostrada.\n" -"No entanto, é possível impedir estas mensagens de interromperem o jogo " -"ativando esta opção.\n" +"Normalmente se a compilação dos Shaders falha, uma mensagem de erro é mostrada.\n" +"No entanto, é possível impedir estas mensagens de interromperem o jogo ativando esta opção.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -5258,8 +5039,7 @@ msgid "" "%s\n" "Do you wish to continue?" msgstr "" -"Aviso! É recomendado que você tenha um backup de todos os arquivos na " -"pasta:\n" +"Aviso! É recomendado que você tenha um backup de todos os arquivos na pasta:\n" "%s\n" "Deseja continuar?" @@ -5271,8 +5051,7 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" -"Aviso: Isso vai substituir quaisquer arquivos de salva existentes na " -"pasta :\n" +"Aviso: Isso vai substituir quaisquer arquivos de salva existentes na pasta :\n" "%s\n" "que tenham o mesmo nome de um arquivo do Memory Card\n" "Continuar?" @@ -5324,9 +5103,9 @@ msgid "Wiimote" msgstr "Wiimote" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 -#, fuzzy, c-format +#, c-format msgid "Wiimote %i" -msgstr "Wiimote" +msgstr "Wiimote %i" #: Source/Core/DolphinWX/Src/Frame.cpp:162 #, c-format @@ -5354,9 +5133,8 @@ msgid "Wiimote settings" msgstr "Configurações do Wiimote" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 -#, fuzzy msgid "Wiimotes" -msgstr "Wiimote" +msgstr "Wiimotes" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:131 msgid "Windows Left" @@ -5416,6 +5194,8 @@ msgid "" "You are using free dsp roms made by Dolphin Team.\n" "Only Zelda ucode games will work correctly with them.\n" msgstr "" +"Você está usando roms do DSP grátis feitas pela Equipe do Dolphin.\n" +"Apenas o ucode dos jogos da série Zelda irão funcionar corretamente com elas. \n" #: Source/Core/DolphinWX/Src/FrameAui.cpp:72 msgid "You can't close panes that have pages in them." @@ -5497,19 +5277,14 @@ msgstr "[Personalizado]" #: 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 "" "[EXPERIMENTAL]\n" -"Tenta aumentar a velocidade de emulação dando o trabalho de decodificação de " -"texturas para a GPU usando o Framework OpenCL.\n" -"No entanto, em seu estado atual ele causa defeitos nas texturas em vários " -"jogos. Além disso, na maioria dos casos ele é mais lento que a decodificação " -"usual da CPU.\n" +"Tenta aumentar a velocidade de emulação dando o trabalho de decodificação de texturas para a GPU usando o Framework OpenCL.\n" +"No entanto, em seu estado atual ele causa defeitos nas texturas em vários jogos. Além disso, na maioria dos casos ele é mais lento que a decodificação usual da CPU.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -5522,8 +5297,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "[EXPERIMENTAL]\n" -"Aumenta a velocidade da emulação fazendo um reservatório temporário de " -"Dysplay Lists.\n" +"Aumenta a velocidade da emulação fazendo um reservatório temporário de Dysplay Lists.\n" "Pode causar problemas.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -5557,9 +5331,7 @@ msgstr "iCacheJIT: Lendo Opcode de %x. Favor reportar." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108 #, c-format msgid "not a wii save or read failure for file header size %x" -msgstr "" -"Não é um salva de Wii ou houve erro de leitura no tamanho do header do " -"arquivo %x" +msgstr "Não é um salva de Wii ou houve erro de leitura no tamanho do header do arquivo %x" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:461 msgid "s" From 75408fa9af9f81cbc5b798880f2b4dc865503b67 Mon Sep 17 00:00:00 2001 From: Runo Date: Mon, 12 Sep 2011 22:56:10 -0300 Subject: [PATCH 050/381] PT_BR Translation Update to revision 60. --- Languages/po/pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index d7d782547c..0e55fbbb5e 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: 2011-08-10 08:30-0500\n" -"PO-Revision-Date: 2011-09-11 23:35-0300\n" +"PO-Revision-Date: 2011-09-12 22:54-0300\n" "Last-Translator: Runo \n" "Language-Team: Portuguese (BR) \n" "MIME-Version: 1.0\n" @@ -739,7 +739,7 @@ msgstr "Input em Background" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:279 msgid "Backward" -msgstr "Para trás" +msgstr "Para Trás" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264 msgid "Bad File Header" From ce3e3339365486318b8970ccaa49a3f536b2dc1b Mon Sep 17 00:00:00 2001 From: Runo Date: Mon, 12 Sep 2011 23:16:26 -0300 Subject: [PATCH 051/381] Last attempt to update PT_BR.po --- Languages/po/pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index 0e55fbbb5e..d7d782547c 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: 2011-08-10 08:30-0500\n" -"PO-Revision-Date: 2011-09-12 22:54-0300\n" +"PO-Revision-Date: 2011-09-11 23:35-0300\n" "Last-Translator: Runo \n" "Language-Team: Portuguese (BR) \n" "MIME-Version: 1.0\n" @@ -739,7 +739,7 @@ msgstr "Input em Background" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:279 msgid "Backward" -msgstr "Para Trás" +msgstr "Para trás" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264 msgid "Bad File Header" From 2f321524d894e3bed7b7a8147a976b4224b568e0 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 13 Sep 2011 16:39:28 +0200 Subject: [PATCH 052/381] Add libav headers to the include directories. Fixes issue 4811. --- CMakeTests/CheckLib.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeTests/CheckLib.cmake b/CMakeTests/CheckLib.cmake index c1174ecb58..affc92ae8f 100644 --- a/CMakeTests/CheckLib.cmake +++ b/CMakeTests/CheckLib.cmake @@ -63,6 +63,7 @@ macro(check_libav) if(LIBAV_FOUND) message("libav found, enabling AVI frame dumps") add_definitions(-DHAVE_LIBAV) + include_directories(${LIBAV_INCLUDE_DIRS}) else() message("libav not found, disabling AVI frame dumps") endif() From 0abe19e31feabe26cab24710fa61731b83669a3f Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Thu, 15 Sep 2011 23:11:40 +0300 Subject: [PATCH 053/381] Gameini database update. Fight Night Round 2 boots properly now, Mystery Case Files: The Malgrave Incident (PAL) addition with proper settings, fix a mistake in Xenoblade and addition/updates to emulation state for a couple of games. Also update for the Greek language. --- Data/User/GameConfig/G8FE8P.ini | 15 +++++++++++++ Data/User/GameConfig/GEYE69.ini | 12 +++++++++- Data/User/GameConfig/GKUE9G.ini | 2 +- Data/User/GameConfig/GNOE78.ini | 2 +- Data/User/GameConfig/RM6EEB.ini | 15 +++++++++++++ Data/User/GameConfig/SFIP01.ini | 22 ++++++++++++++++++ Data/User/GameConfig/SX4J01.ini | 6 ++--- Data/User/GameConfig/SX4P01.ini | 5 ++--- Languages/po/el.po | 40 ++++++++++++++++----------------- 9 files changed, 90 insertions(+), 29 deletions(-) create mode 100644 Data/User/GameConfig/G8FE8P.ini create mode 100644 Data/User/GameConfig/RM6EEB.ini create mode 100644 Data/User/GameConfig/SFIP01.ini diff --git a/Data/User/GameConfig/G8FE8P.ini b/Data/User/GameConfig/G8FE8P.ini new file mode 100644 index 0000000000..43eef9a46e --- /dev/null +++ b/Data/User/GameConfig/G8FE8P.ini @@ -0,0 +1,15 @@ +# G8FE8P - VIRTUA QUEST +[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] diff --git a/Data/User/GameConfig/GEYE69.ini b/Data/User/GameConfig/GEYE69.ini index 8c96330c60..ebf5159b27 100644 --- a/Data/User/GameConfig/GEYE69.ini +++ b/Data/User/GameConfig/GEYE69.ini @@ -1,6 +1,16 @@ # GEYE69 - EA SPORTS(TM) Fight Night Round 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 = 1 +EmulationStateId = 4 +EmulationIssues = Videos are messed up, 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] diff --git a/Data/User/GameConfig/GKUE9G.ini b/Data/User/GameConfig/GKUE9G.ini index 4fce1959df..3a0d9b7c08 100644 --- a/Data/User/GameConfig/GKUE9G.ini +++ b/Data/User/GameConfig/GKUE9G.ini @@ -2,7 +2,7 @@ [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 = 0 +EmulationStateId = 4 EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. diff --git a/Data/User/GameConfig/GNOE78.ini b/Data/User/GameConfig/GNOE78.ini index cd8c06fa53..bf0d3f3f1f 100644 --- a/Data/User/GameConfig/GNOE78.ini +++ b/Data/User/GameConfig/GNOE78.ini @@ -3,7 +3,7 @@ TLBHack = 1 FastDiscSpeed = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 0 +EmulationStateId = 4 EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. diff --git a/Data/User/GameConfig/RM6EEB.ini b/Data/User/GameConfig/RM6EEB.ini new file mode 100644 index 0000000000..8f78ac8ffa --- /dev/null +++ b/Data/User/GameConfig/RM6EEB.ini @@ -0,0 +1,15 @@ +# RM6EEB - BAROQUE +[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] diff --git a/Data/User/GameConfig/SFIP01.ini b/Data/User/GameConfig/SFIP01.ini new file mode 100644 index 0000000000..d655f59141 --- /dev/null +++ b/Data/User/GameConfig/SFIP01.ini @@ -0,0 +1,22 @@ +# SFIP01 - Mystery Case Files: The Malgrave Incident +[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 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 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/SX4J01.ini b/Data/User/GameConfig/SX4J01.ini index 1add4f0579..2e2169a190 100644 --- a/Data/User/GameConfig/SX4J01.ini +++ b/Data/User/GameConfig/SX4J01.ini @@ -1,11 +1,10 @@ # SX4J01 - Xenoblade [Core] Values set here will override the main dolphin settings. -SkipIdle = 0 BlockMerging = 1 -TLBHack = 1 +SkipIdle = 0 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Disable idle skipping to solve sound issues or use LLE audio. Per pixel lighting creates a glitch in ether cave with direct 3d 9. +EmulationIssues = Disable idle skipping to solve sound issues or use LLE audio. Per pixel lighting creates a glitch in ether cave with direct 3d 9. The game randomly freezes. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -20,3 +19,4 @@ PH_ZFar = DlistCachingEnable = False [Video_Settings] EnablePixelLighting = False + diff --git a/Data/User/GameConfig/SX4P01.ini b/Data/User/GameConfig/SX4P01.ini index d649b00050..b374dab682 100644 --- a/Data/User/GameConfig/SX4P01.ini +++ b/Data/User/GameConfig/SX4P01.ini @@ -1,11 +1,10 @@ # SX4P01 - Xenoblade Chronicles [Core] Values set here will override the main dolphin settings. -SkipIdle = 0 BlockMerging = 1 -TLBHack = 1 +SkipIdle = 0 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Disable idle skipping to solve sound issues or use LLE audio. Per pixel lighting creates a glitch in ether cave with direct 3d 9. +EmulationIssues = Disable idle skipping to solve sound issues or use LLE audio. Per pixel lighting creates a glitch in ether cave with direct 3d 9. The game randomly freezes. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Languages/po/el.po b/Languages/po/el.po index 3f93e7d65a..9a746c96f1 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-08-10 08:30-0500\n" -"PO-Revision-Date: 2011-08-25 20:16+0200\n" +"PO-Revision-Date: 2011-09-13 17:28+0200\n" "Last-Translator: Linktothepast \n" "Language-Team: Gpower2 \n" -"Language: Greek\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: Greek\n" "X-Poedit-Language: Greek\n" "X-Poedit-Country: GREECE\n" @@ -862,7 +862,7 @@ msgid "" msgstr "" "Υπολογίζει τον φωτισμό των 3D γÏαφικών ανά pixel αντί ανά vertex.\n" "Μειώνει την ταχÏτητα εξομοίωσης κατά κάποιο ποσοστό (ανάλογα με την GPU).\n" -"Αυτή είναι συνήθως μια ασφαλής βελτίωση, αλλά μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα οÏισμένες φοÏές.\n" +"Αυτή συνήθως είναι μια ασφαλής βελτίωση, αλλά μποÏεί να Ï€Ïοκαλέσει οÏισμένες φοÏές Ï€Ïοβλήματα.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -1116,7 +1116,7 @@ msgstr "Ρυθμίσεις ΧειÏιστηÏίων" #: Source/Core/DolphinWX/Src/FrameTools.cpp:442 msgid "Configure..." -msgstr "Γενικές Ρυθμίσεις......" +msgstr "Γενικές Ρυθμίσεις..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 @@ -1741,7 +1741,7 @@ msgstr "ΕπεξεÏγασία..." #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44 msgid "Effect" -msgstr "Εφφέ" +msgstr "Εφέ" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Embedded Frame Buffer" @@ -1759,7 +1759,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" "Εξομοιώνει τα XFBs με ακÏίβεια.\n" -"ΕπιβÏαδÏνει την εξομοίωση αÏκετά και αποτÏέπει την απόδοση γÏαφικών υψηλής ανάλυσης, αλλά είναι απαÏαίτητο για την σωστή εξομοίωση οÏισμένου αÏÎ¹Î¸Î¼Î¿Ï Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹ÏŽÎ½.\n" +"ΕπιβÏαδÏνει αÏκετά την εξομοίωση και αποτÏέπει την απόδοση γÏαφικών υψηλής ανάλυσης, αλλά είναι απαÏαίτητο για την σωστή εξομοίωση οÏισμένου αÏÎ¹Î¸Î¼Î¿Ï Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹ÏŽÎ½.\n" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε εικονική XFB εξομοίωση." @@ -2634,12 +2634,12 @@ msgstr "Host" #: Source/Core/DolphinWX/Src/HotkeyDlg.h:44 msgid "Hotkey Configuration" -msgstr "Ρυθμίσεις ΠλήκτÏων ΣυντομεÏσεως" +msgstr "Ρυθμίσεις ΠλήκτÏων Συντόμευσης" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 msgid "Hotkeys" -msgstr "ΠλήκτÏα ΣυντομεÏσεως" +msgstr "ΠλήκτÏα Συντόμευσης" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hungarian" @@ -2708,7 +2708,7 @@ msgstr "Αν τα FPS διακυμαίνονται, αυτή η επιλογή #: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 msgid "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." msgstr "" -"Αν θέσετε τον πεÏιοÏισμό καÏέ υψηλότεÏα από ότι την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, PAL:50),\n" +"Αν θέσετε τιμή υψηλότεÏη από την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, PAL:50),\n" "θα Ï€Ïέπει επίσης να απενεÏγοποιήσετε το Throttle Ήχου στο DSP για να έχει αποτέλεσμα. " #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 @@ -2773,7 +2773,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί Ï€Ïοβλήματα σε παιχνίδια που βασίζονται στη σωστή εξομοίωση ομίχλης.\n" +"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί Ï€Ïοβλήματα σε παιχνίδια που βασίζονται στη σωστή εξομοίωση της ομίχλης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -3022,7 +3022,7 @@ msgstr "ΜικÏότεÏο από" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Limit by FPS" -msgstr "ΠεÏιοÏισμός με βάση τα FPS" +msgstr "ΠεÏιοÏισμός με βάση τα ΚαÏέ" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Load" @@ -4312,8 +4312,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 "" "Εμφάνιση μηνÏματος όταν Ï€ÏοκÏψει ένα πιθανά σοβαÏÏŒ σφάλμα.\n" -"ΑπενεÏγοποιώντας αυτήν την επιλογή μποÏεί να σας γλιτώσει από ενοχλητικά μη κÏίσιμα σφάλματα, αλλά επίσης σημαίνει\n" -"ότι το Dolphin μποÏεί να κÏασάÏει ξαφνικά χωÏίς καμία εξήγηση. " +"ΑπενεÏγοποιώντας αυτήν την επιλογή μποÏεί να γλιτώσετε από ενοχλητικά μη κÏίσιμα σφάλματα, αλλά \n" +"το Dolphin μποÏεί να κÏασάÏει ξαφνικά χωÏίς καμία εξήγηση. " #: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Show first block" @@ -4393,7 +4393,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΠαÏάλειψη του destination alpha pass που χÏησιμοποιείται σε πολλά παιχνίδια για ποικίλα γÏαφικά εφέ.\n" +"ΠαÏάλειψη του destination alpha pass που χÏησιμοποιείται από πολλά παιχνίδια σε διάφοÏα γÏαφικά εφέ.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -4427,7 +4427,7 @@ msgid "" msgstr "" "Η απεικόνιση Î»Î¿Î³Î¹ÏƒÎ¼Î¹ÎºÎ¿Ï ÎµÎ¯Î½Î±Î¹ αÏκετές βαθμίδες πιο αÏγή απ' ότι τα υπόλοιπα backends.\n" "Είναι μόνο χÏήσιμη για debugging σκοποÏÏ‚.\n" -"Θέλετε όντως να χÏησιμοπποιήσετε την απεικόνιση λογισμικοÏ; Αν δεν είστε σίγουÏοι, επιλέξτε 'No'." +"Θέλετε όντως να χÏησιμοποιήσετε την απεικόνιση λογισμικοÏ; Αν δεν είστε σίγουÏοι, επιλέξτε 'Όχι'." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 msgid "Sound Settings" @@ -4727,8 +4727,8 @@ msgid "" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" "ΧÏησιμοποιείται για τον έλεγχο της ταχÏτητας του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î¼Îµ throttle ήχου.\n" -"ΑπενεÏγοποίησή της μποÏεί να Ï€Ïοκαλέσει μη φυσιολογική ταχÏτητα παιχνιδιοÏ, όπως Ï€Î¿Î»Ï Î³ÏήγοÏη.\n" -"Αλλά μεÏικές φοÏές η ενεÏγοποίησή της μποÏεί να Ï€Ïοκαλέσει μόνιμο θόÏυβο.\n" +"ΑπενεÏγοποιώντας το μποÏεί να Ï€Ïοκλήθει αφÏσικη ταχÏτητα σε παιχνίδια, Ï€.χ. Ï€Î¿Î»Ï Î³ÏήγοÏη.\n" +"Όμως οÏισμένες φοÏές η ενεÏγοποίησή της μποÏεί να Ï€Ïοκαλέσει μόνιμο θόÏυβο.\n" "\n" "Συντόμευση πληκτÏολογίου : ΚÏατήστε το πατημένο για να απενεÏγοποιηθεί η λειτουÏγία Throttle." @@ -4747,7 +4747,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 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 @@ -5044,7 +5044,7 @@ msgid "" msgstr "" "ΠÏοειδοποίηση: Αυτό θα αντικαταστήσει όλα τα υπάÏχοντα σημεία αποθήκευσης που υπάÏχουν στον φάκελο:\n" "%s\n" -"κι έχουν το ίδιο όνομα με αÏχεία στη memcard\n" +"και έχουν το ίδιο όνομα με αÏχεία στη memcard\n" "Συνέχεια;" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 @@ -5257,7 +5257,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "[ΧΑΛΑΣΜΕÎΟ]\n" -"Τονίζει τις πεÏιοχές από όπου το EFB αντιγÏάφηκε.\n" +"Τονίζει τις πεÏιοχές από όπου έγινε αντιγÏαφή του EFB.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." From 1f8a8268c66b3349c7b0d7ba0e5e2e8c9bd2dd2e Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Fri, 23 Sep 2011 02:27:30 +0300 Subject: [PATCH 054/381] Another gameini database update. This makes playable by default games such as The Urbz (GC), Chicken Blaster, Wild West Shootout, Phineas and Ferb Across the 2nd Dimension (PAL), along with proper settings for METAL SLUG Anthology. --- Data/User/GameConfig/GUBE69.ini | 19 +++++++++++++++++++ Data/User/GameConfig/GUBP69.ini | 19 +++++++++++++++++++ Data/User/GameConfig/R8LE20.ini | 18 ++++++++++++++++++ Data/User/GameConfig/R8LP7J.ini | 18 ++++++++++++++++++ Data/User/GameConfig/RMLEH4.ini | 16 ++++++++++++++-- Data/User/GameConfig/RMLJH4.ini | 19 +++++++++++++++++++ Data/User/GameConfig/RMLK52.ini | 19 +++++++++++++++++++ Data/User/GameConfig/RMLP7U.ini | 19 +++++++++++++++++++ Data/User/GameConfig/RMLPH4.ini | 19 +++++++++++++++++++ Data/User/GameConfig/SMFP4Q.ini | 22 ++++++++++++++++++++++ Data/User/GameConfig/SSRE20.ini | 18 ++++++++++++++++++ Data/User/GameConfig/SSRPXT.ini | 18 ++++++++++++++++++ 12 files changed, 222 insertions(+), 2 deletions(-) create mode 100644 Data/User/GameConfig/GUBE69.ini create mode 100644 Data/User/GameConfig/GUBP69.ini create mode 100644 Data/User/GameConfig/R8LE20.ini create mode 100644 Data/User/GameConfig/R8LP7J.ini create mode 100644 Data/User/GameConfig/RMLJH4.ini create mode 100644 Data/User/GameConfig/RMLK52.ini create mode 100644 Data/User/GameConfig/RMLP7U.ini create mode 100644 Data/User/GameConfig/RMLPH4.ini create mode 100644 Data/User/GameConfig/SMFP4Q.ini create mode 100644 Data/User/GameConfig/SSRE20.ini create mode 100644 Data/User/GameConfig/SSRPXT.ini diff --git a/Data/User/GameConfig/GUBE69.ini b/Data/User/GameConfig/GUBE69.ini new file mode 100644 index 0000000000..a7fb26674a --- /dev/null +++ b/Data/User/GameConfig/GUBE69.ini @@ -0,0 +1,19 @@ +# GUBE69 - The Urbz GameCube +[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 = LLE audio is needed to fix some 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] +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/GUBP69.ini b/Data/User/GameConfig/GUBP69.ini new file mode 100644 index 0000000000..1ac1ed9c1d --- /dev/null +++ b/Data/User/GameConfig/GUBP69.ini @@ -0,0 +1,19 @@ +# GUBP69 - The Urbz GameCube +[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 = LLE audio is needed to fix some 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] +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/R8LE20.ini b/Data/User/GameConfig/R8LE20.ini new file mode 100644 index 0000000000..a38514bc43 --- /dev/null +++ b/Data/User/GameConfig/R8LE20.ini @@ -0,0 +1,18 @@ +# R8LE20 - Chicken Blaster +[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 = True diff --git a/Data/User/GameConfig/R8LP7J.ini b/Data/User/GameConfig/R8LP7J.ini new file mode 100644 index 0000000000..532178c53b --- /dev/null +++ b/Data/User/GameConfig/R8LP7J.ini @@ -0,0 +1,18 @@ +# R8LP7J - Chicken Blaster +[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 = True diff --git a/Data/User/GameConfig/RMLEH4.ini b/Data/User/GameConfig/RMLEH4.ini index e1444f1498..6bf280dc75 100644 --- a/Data/User/GameConfig/RMLEH4.ini +++ b/Data/User/GameConfig/RMLEH4.ini @@ -1,7 +1,19 @@ # RMLEH4 - METAL SLUG Anthology [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 = +EmulationStateId = 4 +EmulationIssues = Use LLE audio to solve some 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] +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RMLJH4.ini b/Data/User/GameConfig/RMLJH4.ini new file mode 100644 index 0000000000..cc6422800d --- /dev/null +++ b/Data/User/GameConfig/RMLJH4.ini @@ -0,0 +1,19 @@ +# RMLJH4 - Metal Slug Complete +[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 = Use LLE audio to solve some 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] +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RMLK52.ini b/Data/User/GameConfig/RMLK52.ini new file mode 100644 index 0000000000..12a6d1c800 --- /dev/null +++ b/Data/User/GameConfig/RMLK52.ini @@ -0,0 +1,19 @@ +# RMLK52 - Metal Slug Complete +[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 = Use LLE audio to solve some 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] +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RMLP7U.ini b/Data/User/GameConfig/RMLP7U.ini new file mode 100644 index 0000000000..0666be4c4a --- /dev/null +++ b/Data/User/GameConfig/RMLP7U.ini @@ -0,0 +1,19 @@ +# RMLP7U - METAL SLUG Anthology +[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 = Use LLE audio to solve some 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] +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RMLPH4.ini b/Data/User/GameConfig/RMLPH4.ini new file mode 100644 index 0000000000..9c062079f2 --- /dev/null +++ b/Data/User/GameConfig/RMLPH4.ini @@ -0,0 +1,19 @@ +# RMLPH4 - METAL SLUG Anthology +[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 = Use LLE audio to solve some 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] +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/SMFP4Q.ini b/Data/User/GameConfig/SMFP4Q.ini new file mode 100644 index 0000000000..ee1358c1c8 --- /dev/null +++ b/Data/User/GameConfig/SMFP4Q.ini @@ -0,0 +1,22 @@ +# SMFP4Q - Phineas and Ferb Across the 2nd Dimension +[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] +SafeTextureCache = True +SafeTextureCacheColorSamples = 0 +UseXFB = True +UseRealXFB = False +[Video_Hacks] +EFBEmulateFormatChanges = False diff --git a/Data/User/GameConfig/SSRE20.ini b/Data/User/GameConfig/SSRE20.ini new file mode 100644 index 0000000000..20edfda0c0 --- /dev/null +++ b/Data/User/GameConfig/SSRE20.ini @@ -0,0 +1,18 @@ +# SSRE20 - Wild West Shootout +[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 = True diff --git a/Data/User/GameConfig/SSRPXT.ini b/Data/User/GameConfig/SSRPXT.ini new file mode 100644 index 0000000000..880617b35c --- /dev/null +++ b/Data/User/GameConfig/SSRPXT.ini @@ -0,0 +1,18 @@ +# SSRPXT - Wild West Shootout +[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 = True From ca7e8a9e88aeb2271ed04af4ff3994286c00a90c Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Thu, 29 Sep 2011 21:21:09 +0200 Subject: [PATCH 055/381] Fix pixel lighting. --- .../Core/VideoCommon/Src/LightingShaderGen.cpp | 15 +++++++++++++++ .../Core/VideoCommon/Src/LightingShaderGen.h | 3 +++ Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 18 +++++++++++------- Source/Core/VideoCommon/Src/PixelShaderGen.h | 4 ++-- .../Core/VideoCommon/Src/VertexShaderGen.cpp | 14 +++++--------- 5 files changed, 36 insertions(+), 18 deletions(-) diff --git a/Source/Core/VideoCommon/Src/LightingShaderGen.cpp b/Source/Core/VideoCommon/Src/LightingShaderGen.cpp index 6824fbd2fc..a506acadfc 100644 --- a/Source/Core/VideoCommon/Src/LightingShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/LightingShaderGen.cpp @@ -21,6 +21,21 @@ #define WRITE p+=sprintf +int GetLightingShaderId(u32* out) +{ + for (int i = 0; i < xfregs.numChan.numColorChans; ++i) + { + out[i] = xfregs.color[i].enablelighting ? + (u32)xfregs.color[i].hex : + (u32)xfregs.color[i].matsource; + out[i] |= (xfregs.alpha[i].enablelighting ? + (u32)xfregs.alpha[i].hex : + (u32)xfregs.alpha[i].matsource) << 15; + } + _assert_(xfregs.numChan.numColorChans <= 2); + return xfregs.numChan.numColorChans; +} + // coloralpha - 1 if color, 2 if alpha char *GenerateLightShader(char *p, int index, const LitChannel& chan, const char* lightsName, int coloralpha) { diff --git a/Source/Core/VideoCommon/Src/LightingShaderGen.h b/Source/Core/VideoCommon/Src/LightingShaderGen.h index 21da8ca01a..e72623a4d2 100644 --- a/Source/Core/VideoCommon/Src/LightingShaderGen.h +++ b/Source/Core/VideoCommon/Src/LightingShaderGen.h @@ -18,6 +18,9 @@ #ifndef _LIGHTINGSHADERGEN_H_ #define _LIGHTINGSHADERGEN_H_ +#include "CommonTypes.h" + +int GetLightingShaderId(u32* out); char *GenerateLightingShader(char *p, int components, const char* materialsName, const char* lightsName, const char* inColorName, const char* dest); #endif // _LIGHTINGSHADERGEN_H_ diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 7937c695ce..52a4477390 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -125,16 +125,11 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode) if (alphaPreTest == 1 || (alphaPreTest && !DepthTextureEnable && dstAlphaMode == DSTALPHA_ALPHA_PASS)) { // Courtesy of PreAlphaTest, we're done already ;) - // TODO: There's a comment including bpmem.genmode.numindstages.. shouldnt really bother about that though. + // 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; } - if (enablePL) - { - // TODO: Include register states for lighting shader - } - for (unsigned int i = 0; i < bpmem.genMode.numtexgens; ++i) { if (18+i < 32) @@ -194,7 +189,12 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode) ptr[0] |= bpmem.fogRange.Base.Enabled << 17; // 1 } } - uid->num_values = (ptr+1) - uid->values; + + ++ptr; + if (enablePL) + ptr += GetLightingShaderId(ptr); + + uid->num_values = ptr - uid->values; } void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode) @@ -212,6 +212,10 @@ void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode) if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) { // TODO: Include register states for lighting shader + *ptr++ = xfregs.color[0].hex; + *ptr++ = xfregs.alpha[0].hex; + *ptr++ = xfregs.color[1].hex; + *ptr++ = xfregs.alpha[1].hex; } for (unsigned int i = 0; i < 8; ++i) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h index 8031fdfbb2..b24b656784 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.h +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h @@ -44,8 +44,8 @@ #define C_PLIGHTS (C_FOG + 3) #define C_PMATERIALS (C_PLIGHTS + 40) #define C_PENVCONST_END (C_PMATERIALS + 4) -#define PIXELSHADERUID_MAX_VALUES 67 -#define PIXELSHADERUID_MAX_VALUES_SAFE 115 +#define PIXELSHADERUID_MAX_VALUES 69 +#define PIXELSHADERUID_MAX_VALUES_SAFE 117 // 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 5c6c12887a..a492d5a201 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp @@ -37,14 +37,9 @@ void GetVertexShaderId(VERTEXSHADERUID *uid, u32 components) (xfregs.numChan.numColorChans << 27) | (xfregs.dualTexTrans.enabled << 29); - for (int i = 0; i < xfregs.numChan.numColorChans; ++i) { - uid->values[1+i] = xfregs.color[i].enablelighting ? - (u32)xfregs.color[i].hex : - (u32)xfregs.color[i].matsource; - uid->values[1+i] |= (xfregs.alpha[i].enablelighting ? - (u32)xfregs.alpha[i].hex : - (u32)xfregs.alpha[i].matsource) << 15; - } + // TODO: If pixel lighting is enabled, do we even have to bother about storing lighting related registers here? + GetLightingShaderId(&uid->values[1]); + uid->values[2] |= (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) << 31; u32 *pcurvalue = &uid->values[3]; for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) { @@ -306,7 +301,8 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE api_type) else WRITE(p, "o.colors_0 = float4(1.0f, 1.0f, 1.0f, 1.0f);\n"); } - + + // TODO: This probably isn't necessary if pixel lighting is enabled. p = GenerateLightingShader(p, components, I_MATERIALS, I_LIGHTS, "color", "o.colors_"); if(xfregs.numChan.numColorChans < 2) From ddfe219293e3af9e04f7020f0557736e1762370b Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Thu, 29 Sep 2011 21:52:13 +0200 Subject: [PATCH 056/381] Fixup line endings. --- .../Core/VideoCommon/Src/PixelShaderGen.cpp | 2482 ++++++++--------- .../Core/VideoCommon/Src/VertexShaderGen.cpp | 1006 +++---- 2 files changed, 1744 insertions(+), 1744 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 52a4477390..f52c6b4190 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -1,1242 +1,1242 @@ -// 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 - -#include "LightingShaderGen.h" -#include "PixelShaderGen.h" -#include "XFMemory.h" // for texture projection mode -#include "BPMemory.h" -#include "VideoConfig.h" -#include "NativeVertexFormat.h" - -PIXELSHADERUID last_pixel_shader_uid; - -static int AlphaPreTest(); - -static void StageHash(int 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 - out[0] |= (alphaC&0xF0) << 24; // 8 - out[1] |= alphaC >> 8; // 16 - - // reserve 3 bits for bpmem.tevorders[stage/2].getTexMap - out[1] |= bpmem.tevorders[stage/2].getTexCoord(stage&1) << 19; // 3 - out[1] |= bpmem.tevorders[stage/2].getEnable(stage&1) << 22; // 1 - // reserve 3 bits for bpmem.tevorders[stage/2].getColorChan - - bool bHasIndStage = bpmem.tevind[stage].IsActive() && bpmem.tevind[stage].bt < bpmem.genMode.numindstages; - out[2] |= bHasIndStage << 2; // 1 - - bool needstexcoord = false; - - if (bHasIndStage) - { - out[2] |= (bpmem.tevind[stage].hex & 0x17FFFF) << 3; // 21, TODO: needs an explanation - needstexcoord = true; - } - - - TevStageCombiner::ColorCombiner& cc = bpmem.combiners[stage].colorC; - TevStageCombiner::AlphaCombiner& ac = bpmem.combiners[stage].alphaC; - - 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 - || cc.d == TEVCOLORARG_RASA || cc.d == TEVCOLORARG_RASC - || ac.a == TEVALPHAARG_RASA || ac.b == TEVALPHAARG_RASA - || ac.c == TEVALPHAARG_RASA || ac.d == TEVALPHAARG_RASA) - { - out[0] |= bpmem.combiners[stage].alphaC.rswap; - out[2] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.rswap*2].swap1 << 24; // 2 - out[2] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.rswap*2].swap2 << 26; // 2 - out[2] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.rswap*2+1].swap1 << 28; // 2 - out[2] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.rswap*2+1].swap2 << 30; // 2 - out[1] |= (bpmem.tevorders[stage/2].getColorChan(stage&1)&1) << 23; - out[2] |= (bpmem.tevorders[stage/2].getColorChan(stage&1)&0x6) >> 1; - } - - out[3] |= bpmem.tevorders[stage/2].getEnable(stage&1); - if (bpmem.tevorders[stage/2].getEnable(stage&1)) - { - if (bHasIndStage) needstexcoord = true; - - out[0] |= bpmem.combiners[stage].alphaC.tswap; - out[3] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.tswap*2].swap1 << 1; // 2 - out[3] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.tswap*2].swap2 << 3; // 2 - out[3] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.tswap*2+1].swap1 << 5; // 2 - out[3] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.tswap*2+1].swap2 << 7; // 2 - out[1] |= bpmem.tevorders[stage/2].getTexMap(stage&1) << 16; - } - - 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) - { - out[3] |= bpmem.tevksel[stage/2].getKC(stage&1) << 9; // 5 - out[3] |= bpmem.tevksel[stage/2].getKA(stage&1) << 14; // 5 - } - - if (needstexcoord) - { - out[1] |= bpmem.tevorders[stage/2].getTexCoord(stage&1) << 16; - } -} - -// Mash together all the inputs that contribute to the code of a generated pixel shader into -// a unique identifier, basically containing all the bits. Yup, it's a lot .... -// It would likely be a lot more efficient to build this incrementally as the attributes -// are set... -void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode) -{ - uid->values[0] |= bpmem.genMode.numtevstages; // 4 - 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; - - uid->values[0] |= DepthTextureEnable << 10; // 1 - - bool enablePL = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting; - uid->values[0] |= enablePL << 11; // 1 - - if (!enablePL) uid->values[0] |= xfregs.numTexGen.numTexGens << 12; // 4 - u32 alphaPreTest = AlphaPreTest()+1; - - 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; - } - - for (unsigned int i = 0; i < bpmem.genMode.numtexgens; ++i) - { - 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[1] = bpmem.genMode.numindstages << 2; // 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) - indirectStagesUsed |= (1 << bpmem.tevind[i].bt); - - assert(indirectStagesUsed == (indirectStagesUsed & 0xF)); - - uid->values[1] |= indirectStagesUsed << 5; // 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 - if (bpmem.tevindref.getTexCoord(i) < bpmem.genMode.numtexgens) - uid->values[1] |= bpmem.tevindref.getTexCoord(i) << (10 + 3*i); // 2 - } - } - - u32* ptr = &uid->values[2]; - for (int i = 0; i < bpmem.genMode.numtevstages+1; ++i) - { - StageHash(i, ptr); - 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 - - if (alphaPreTest == 0 || alphaPreTest == 2) - { - ptr[0] |= bpmem.fog.c_proj_fsel.fsel << 8; // 3 - if (DepthTextureEnable) - { - ptr[0] |= bpmem.ztex2.op << 11; // 2 - ptr[0] |= bpmem.zcontrol.zcomploc << 13; // 1 - ptr[0] |= bpmem.zmode.testenable << 14; // 1 - ptr[0] |= bpmem.zmode.updateenable << 15; // 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; - if (enablePL) - ptr += GetLightingShaderId(ptr); - - uid->num_values = ptr - uid->values; -} - -void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode) -{ - u32* ptr = uid->values; - *ptr++ = dstAlphaMode; // 0 - *ptr++ = bpmem.genMode.hex; // 1 - *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 - - if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) - { - // TODO: Include register states for lighting shader - *ptr++ = xfregs.color[0].hex; - *ptr++ = xfregs.alpha[0].hex; - *ptr++ = xfregs.color[1].hex; - *ptr++ = xfregs.alpha[1].hex; - } - - for (unsigned int i = 0; i < 8; ++i) - *ptr++ = xfregs.texMtxInfo[i].hex; // 8-15 - - for (unsigned int i = 0; i < 16; ++i) - *ptr++ = bpmem.tevind[i].hex; // 16-31 - - *ptr++ = bpmem.tevindref.hex; // 32 - - 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 = &uid->values[113]; - - *ptr++ = bpmem.alphaFunc.hex; // 113 - - *ptr++ = bpmem.fog.c_proj_fsel.hex; // 114 - *ptr++ = bpmem.fogRange.Base.hex; // 115 - - _assert_((ptr - uid->values) == uid->GetNumValues()); -} - -void ValidatePixelShaderIDs(API_TYPE api, PIXELSHADERUIDSAFE old_id, const std::string& old_code, DSTALPHA_MODE dstAlphaMode, u32 components) -{ - if (!g_ActiveConfig.bEnableShaderDebugging) - return; - - PIXELSHADERUIDSAFE new_id; - GetSafePixelShaderId(&new_id, dstAlphaMode); - - if (!(old_id == new_id)) - { - std::string new_code(GeneratePixelShaderCode(dstAlphaMode, api, components)); - if (old_code != new_code) - { - _assert_(old_id.GetNumValues() == new_id.GetNumValues()); - - char msg[8192]; - char* ptr = msg; - ptr += sprintf(ptr, "Pixel shader IDs matched but unique IDs did not!\nUnique IDs (old <-> new):\n"); - const int N = new_id.GetNumValues(); - for (int i = 0; i < N/2; ++i) - ptr += sprintf(ptr, "%02d, %08X %08X | %08X %08X\n", 2*i, old_id.values[2*i], old_id.values[2*i+1], - new_id.values[2*i], new_id.values[2*i+1]); - if (N % 2) - ptr += sprintf(ptr, "%02d, %08X | %08X\n", N-1, old_id.values[N-1], new_id.values[N-1]); - - static int num_failures = 0; - char szTemp[MAX_PATH]; - sprintf(szTemp, "%spsuid_mismatch_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++); - std::ofstream file(szTemp); - file << msg; - file << "\n\nOld shader code:\n" << old_code; - file << "\n\nNew shader code:\n" << new_code; - file.close(); - - PanicAlert("Unique pixel shader ID mismatch!\n\nReport this to the devs, along with the contents of %s.", szTemp); - } - } -} - -// old tev->pixelshader notes -// -// color for this stage (alpha, color) is given by bpmem.tevorders[0].colorchan0 -// konstant for this stage (alpha, color) is given by bpmem.tevksel -// inputs are given by bpmem.combiners[0].colorC.a/b/c/d << could be current chan color -// according to GXTevColorArg table above -// output is given by .outreg -// tevtemp is set according to swapmodetables and - -static void WriteStage(char *&p, int n, API_TYPE ApiType); -static void SampleTexture(char *&p, const char *destination, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType); -// static void WriteAlphaCompare(char *&p, int num, int comp); -static bool WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode); -static void WriteFog(char *&p); - -static const char *tevKSelTableC[] = // KCSEL -{ - "1.0f,1.0f,1.0f", // 1 = 0x00 - "0.875f,0.875f,0.875f", // 7_8 = 0x01 - "0.75f,0.75f,0.75f", // 3_4 = 0x02 - "0.625f,0.625f,0.625f", // 5_8 = 0x03 - "0.5f,0.5f,0.5f", // 1_2 = 0x04 - "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 - I_KCOLORS"[0].rgb", // K0 = 0x0C - I_KCOLORS"[1].rgb", // K1 = 0x0D - I_KCOLORS"[2].rgb", // K2 = 0x0E - I_KCOLORS"[3].rgb", // K3 = 0x0F - I_KCOLORS"[0].rrr", // K0_R = 0x10 - I_KCOLORS"[1].rrr", // K1_R = 0x11 - I_KCOLORS"[2].rrr", // K2_R = 0x12 - I_KCOLORS"[3].rrr", // K3_R = 0x13 - I_KCOLORS"[0].ggg", // K0_G = 0x14 - I_KCOLORS"[1].ggg", // K1_G = 0x15 - I_KCOLORS"[2].ggg", // K2_G = 0x16 - I_KCOLORS"[3].ggg", // K3_G = 0x17 - I_KCOLORS"[0].bbb", // K0_B = 0x18 - I_KCOLORS"[1].bbb", // K1_B = 0x19 - I_KCOLORS"[2].bbb", // K2_B = 0x1A - I_KCOLORS"[3].bbb", // K3_B = 0x1B - I_KCOLORS"[0].aaa", // K0_A = 0x1C - I_KCOLORS"[1].aaa", // K1_A = 0x1D - I_KCOLORS"[2].aaa", // K2_A = 0x1E - I_KCOLORS"[3].aaa", // K3_A = 0x1F -}; - -static const char *tevKSelTableA[] = // KASEL -{ - "1.0f", // 1 = 0x00 - "0.875f",// 7_8 = 0x01 - "0.75f", // 3_4 = 0x02 - "0.625f",// 5_8 = 0x03 - "0.5f", // 1_2 = 0x04 - "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 - I_KCOLORS"[0].r", // K0_R = 0x10 - I_KCOLORS"[1].r", // K1_R = 0x11 - I_KCOLORS"[2].r", // K2_R = 0x12 - I_KCOLORS"[3].r", // K3_R = 0x13 - I_KCOLORS"[0].g", // K0_G = 0x14 - I_KCOLORS"[1].g", // K1_G = 0x15 - I_KCOLORS"[2].g", // K2_G = 0x16 - I_KCOLORS"[3].g", // K3_G = 0x17 - I_KCOLORS"[0].b", // K0_B = 0x18 - I_KCOLORS"[1].b", // K1_B = 0x19 - I_KCOLORS"[2].b", // K2_B = 0x1A - I_KCOLORS"[3].b", // K3_B = 0x1B - I_KCOLORS"[0].a", // K0_A = 0x1C - I_KCOLORS"[1].a", // K1_A = 0x1D - I_KCOLORS"[2].a", // K2_A = 0x1E - I_KCOLORS"[3].a", // K3_A = 0x1F -}; - -static const char *tevScaleTable[] = // CS -{ - "1.0f", // SCALE_1 - "2.0f", // SCALE_2 - "4.0f", // SCALE_4 - "0.5f", // DIVIDE_2 -}; - -static const char *tevBiasTable[] = // TB -{ - "", // ZERO, - "+0.5f", // ADDHALF, - "-0.5f", // SUBHALF, - "", -}; - -static const char *tevOpTable[] = { // TEV - "+", // TEVOP_ADD = 0, - "-", // TEVOP_SUB = 1, -}; - -static const char *tevCInputTable[] = // CC -{ - "(prev.rgb)", // CPREV, - "(prev.aaa)", // APREV, - "(c0.rgb)", // C0, - "(c0.aaa)", // A0, - "(c1.rgb)", // C1, - "(c1.aaa)", // A1, - "(c2.rgb)", // C2, - "(c2.aaa)", // A2, - "(textemp.rgb)", // TEXC, - "(textemp.aaa)", // TEXA, - "(rastemp.rgb)", // RASC, - "(rastemp.aaa)", // RASA, - "float3(1.0f, 1.0f, 1.0f)", // ONE - "float3(0.5f, 0.5f, 0.5f)", // HALF - "(konsttemp.rgb)", //"konsttemp.rgb", // KONST - "float3(0.0f, 0.0f, 0.0f)", // ZERO - ///aded extra values to map clamped values - "(cprev.rgb)", // CPREV, - "(cprev.aaa)", // APREV, - "(cc0.rgb)", // C0, - "(cc0.aaa)", // A0, - "(cc1.rgb)", // C1, - "(cc1.aaa)", // A1, - "(cc2.rgb)", // C2, - "(cc2.aaa)", // A2, - "(textemp.rgb)", // TEXC, - "(textemp.aaa)", // TEXA, - "(crastemp.rgb)", // RASC, - "(crastemp.aaa)", // RASA, - "float3(1.0f, 1.0f, 1.0f)", // ONE - "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" -}; - -static const char *tevAInputTable[] = // CA -{ - "prev", // APREV, - "c0", // A0, - "c1", // A1, - "c2", // A2, - "textemp", // TEXA, - "rastemp", // RASA, - "konsttemp", // KONST, (hw1 had quarter) - "float4(0.0f, 0.0f, 0.0f, 0.0f)", // ZERO - ///aded extra values to map clamped values - "cprev", // APREV, - "cc0", // A0, - "cc1", // A1, - "cc2", // A2, - "textemp", // TEXA, - "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", -}; - -static const char *tevRasTable[] = -{ - "colors_0", - "colors_1", - "ERROR", //2 - "ERROR", //3 - "ERROR", //4 - "alphabump", // use bump alpha - "(alphabump*(255.0f/248.0f))", //normalized - "float4(0.0f, 0.0f, 0.0f, 0.0f)", // zero -}; - -//static const char *tevTexFunc[] = { "tex2D", "texRECT" }; - -static const char *tevCOutputTable[] = { "prev.rgb", "c0.rgb", "c1.rgb", "c2.rgb" }; -static const char *tevAOutputTable[] = { "prev.a", "c0.a", "c1.a", "c2.a" }; -static const char *tevIndAlphaSel[] = {"", "x", "y", "z"}; -//static const char *tevIndAlphaScale[] = {"", "*32", "*16", "*8"}; -static const char *tevIndAlphaScale[] = {"*(248.0f/255.0f)", "*(224.0f/255.0f)", "*(240.0f/255.0f)", "*(248.0f/255.0f)"}; -static const char *tevIndBiasField[] = {"", "x", "y", "xy", "z", "xz", "yz", "xyz"}; // indexed by bias -static const char *tevIndBiasAdd[] = {"-128.0f", "1.0f", "1.0f", "1.0f" }; // indexed by fmt -static const char *tevIndWrapStart[] = {"0.0f", "256.0f", "128.0f", "64.0f", "32.0f", "16.0f", "0.001f" }; -static const char *tevIndFmtScale[] = {"255.0f", "31.0f", "15.0f", "7.0f" }; - -#define WRITE p+=sprintf - -static char swapModeTable[4][5]; - -static char text[16384]; -static bool DepthTextureEnable; - -static void BuildSwapModeTable() -{ - static const char *swapColors = "rgba"; - for (int i = 0; i < 4; i++) - { - swapModeTable[i][0] = swapColors[bpmem.tevksel[i*2].swap1]; - swapModeTable[i][1] = swapColors[bpmem.tevksel[i*2].swap2]; - swapModeTable[i][2] = swapColors[bpmem.tevksel[i*2+1].swap1]; - swapModeTable[i][3] = swapColors[bpmem.tevksel[i*2+1].swap2]; - swapModeTable[i][4] = 0; - } -} - -const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components) -{ - setlocale(LC_NUMERIC, "C"); // Reset locale for compilation - text[sizeof(text) - 1] = 0x7C; // canary - - BuildSwapModeTable(); // Needed for WriteStage - int numStages = bpmem.genMode.numtevstages + 1; - int numTexgen = bpmem.genMode.numtexgens; - - char *p = text; - WRITE(p, "//Pixel Shader for TEV stages\n"); - WRITE(p, "//%i TEV stages, %i texgens, XXX IND stages\n", - numStages, numTexgen/*, bpmem.genMode.numindstages*/); - - int nIndirectStagesUsed = 0; - if (bpmem.genMode.numindstages > 0) - { - for (int i = 0; i < numStages; ++i) - { - if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages) - nIndirectStagesUsed |= 1 << bpmem.tevind[i].bt; - } - } - DepthTextureEnable = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc && bpmem.zmode.testenable && bpmem.zmode.updateenable) || g_ActiveConfig.bEnablePerPixelDepth ; - // Declare samplers - - if(ApiType != API_D3D11) - { - WRITE(p, "uniform sampler2D "); - } - else - { - WRITE(p, "sampler "); - } - - bool bfirst = true; - for (int i = 0; i < 8; ++i) - { - WRITE(p, "%s samp%d : register(s%d)", bfirst?"":",", i, i); - bfirst = false; - } - WRITE(p, ";\n"); - if(ApiType == API_D3D11) - { - WRITE(p, "Texture2D "); - bfirst = true; - for (int i = 0; i < 8; ++i) - { - WRITE(p, "%s Tex%d : register(t%d)", bfirst?"":",", i, i); - bfirst = false; - } - WRITE(p, ";\n"); - } - - WRITE(p, "\n"); - - WRITE(p, "uniform float4 "I_COLORS"[4] : register(c%d);\n", C_COLORS); - WRITE(p, "uniform float4 "I_KCOLORS"[4] : register(c%d);\n", C_KCOLORS); - WRITE(p, "uniform float4 "I_ALPHA"[1] : register(c%d);\n", C_ALPHA); - WRITE(p, "uniform float4 "I_TEXDIMS"[8] : register(c%d);\n", C_TEXDIMS); - WRITE(p, "uniform float4 "I_ZBIAS"[2] : register(c%d);\n", C_ZBIAS); - WRITE(p, "uniform float4 "I_INDTEXSCALE"[2] : register(c%d);\n", C_INDTEXSCALE); - WRITE(p, "uniform float4 "I_INDTEXMTX"[6] : register(c%d);\n", C_INDTEXMTX); - WRITE(p, "uniform float4 "I_FOG"[3] : register(c%d);\n", C_FOG); - - if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) - { - WRITE(p,"typedef struct { float4 col; float4 cosatt; float4 distatt; float4 pos; float4 dir; } Light;\n"); - WRITE(p,"typedef struct { Light lights[8]; } s_"I_PLIGHTS";\n"); - WRITE(p, "uniform s_"I_PLIGHTS" "I_PLIGHTS" : register(c%d);\n", C_PLIGHTS); - WRITE(p, "typedef struct { float4 C0, C1, C2, C3; } s_"I_PMATERIALS";\n"); - WRITE(p, "uniform s_"I_PMATERIALS" "I_PMATERIALS" : register(c%d);\n", C_PMATERIALS); - } - - WRITE(p, "void main(\n"); - if(ApiType != API_D3D11) - { - 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," : "", - 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," : ""); - } - - WRITE(p, " in float4 colors_0 : COLOR0,\n"); - WRITE(p, " in float4 colors_1 : COLOR1"); - - // compute window position if needed because binding semantic WPOS is not widely supported - if (numTexgen < 7) - { - for (int i = 0; i < numTexgen; ++i) - WRITE(p, ",\n in float3 uv%d : TEXCOORD%d", i, i); - WRITE(p, ",\n in float4 clipPos : TEXCOORD%d", numTexgen); - if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) - WRITE(p, ",\n in float4 Normal : TEXCOORD%d", numTexgen + 1); - } - else - { - // wpos is in w of first 4 texcoords - if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) - { - for (int i = 0; i < 8; ++i) - WRITE(p, ",\n in float4 uv%d : TEXCOORD%d", i, i); - } - else - { - for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) - WRITE(p, ",\n in float%d uv%d : TEXCOORD%d", i < 4 ? 4 : 3 , i, i); - } - } - WRITE(p, " ) {\n"); - - char* pmainstart = p; - int Pretest = AlphaPreTest(); - if (dstAlphaMode == DSTALPHA_ALPHA_PASS && !DepthTextureEnable && Pretest >= 0) - { - if (!Pretest) - { - // alpha test will always fail, so restart the shader and just make it an empty function - WRITE(p, "ocol0 = 0;\n"); - WRITE(p, "discard;\n"); - if(ApiType != API_D3D11) - WRITE(p, "return;\n"); - } - else - { - WRITE(p, " ocol0 = "I_ALPHA"[0].aaaa;\n"); - } - 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" - " float3 tevcoord=float3(0.0f, 0.0f, 0.0f);\n" - " float2 wrappedcoord=float2(0.0f,0.0f), tempcoord=float2(0.0f,0.0f);\n" - " float4 cc0=float4(0.0f,0.0f,0.0f,0.0f), cc1=float4(0.0f,0.0f,0.0f,0.0f);\n" - " float4 cc2=float4(0.0f,0.0f,0.0f,0.0f), cprev=float4(0.0f,0.0f,0.0f,0.0f);\n" - " float4 crastemp=float4(0.0f,0.0f,0.0f,0.0f),ckonsttemp=float4(0.0f,0.0f,0.0f,0.0f);\n\n"); - - if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) - { - if (xfregs.numTexGen.numTexGens < 7) - { - WRITE(p,"float3 _norm0 = normalize(Normal.xyz);\n\n"); - WRITE(p,"float3 pos = float3(clipPos.x,clipPos.y,Normal.w);\n"); - } - else - { - WRITE(p," float3 _norm0 = normalize(float3(uv4.w,uv5.w,uv6.w));\n\n"); - WRITE(p,"float3 pos = float3(uv0.w,uv1.w,uv7.w);\n"); - } - - - WRITE(p, "float4 mat, lacc;\n" - "float3 ldir, h;\n" - "float dist, dist2, attn;\n"); - - p = GenerateLightingShader(p, components, I_PMATERIALS, I_PLIGHTS, "colors_", "colors_"); - } - - if (numTexgen < 7) - WRITE(p, "clipPos = float4(rawpos.x, rawpos.y, clipPos.z, clipPos.w);\n"); - else - WRITE(p, "float4 clipPos = float4(rawpos.x, rawpos.y, uv2.w, uv3.w);\n"); - - // HACK to handle cases where the tex gen is not enabled - if (numTexgen == 0) - { - WRITE(p, "float3 uv0 = float3(0.0f, 0.0f, 0.0f);\n"); - } - else - { - for (int i = 0; i < numTexgen; ++i) - { - // optional perspective divides - if (xfregs.texMtxInfo[i].projection == XF_TEXPROJ_STQ) - { - WRITE(p, "if (uv%d.z)", i); - WRITE(p, " uv%d.xy = uv%d.xy / uv%d.z;\n", i, i, i); - } - - WRITE(p, "uv%d.xy = uv%d.xy * "I_TEXDIMS"[%d].zw;\n", i, i, i); - } - } - - // indirect texture map lookup - for(u32 i = 0; i < bpmem.genMode.numindstages; ++i) - { - if (nIndirectStagesUsed & (1<= %s.r + (0.25f/255.0f)) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_R8_GT 8 - " %s + ((abs(%s.r - %s.r) < (0.5f/255.0f)) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_R8_EQ 9 - " %s + (( dot(%s.rgb, comp16) >= (dot(%s.rgb, comp16) + (0.25f/255.0f))) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_GR16_GT 10 - " %s + (abs(dot(%s.rgb, comp16) - dot(%s.rgb, comp16)) < (0.5f/255.0f) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_GR16_EQ 11 - " %s + (( dot(%s.rgb, comp24) >= (dot(%s.rgb, comp24) + (0.25f/255.0f))) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_BGR24_GT 12 - " %s + (abs(dot(%s.rgb, comp24) - dot(%s.rgb, comp24)) < (0.5f/255.0f) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_BGR24_EQ 13 - " %s + (max(sign(%s.rgb - %s.rgb - (0.25f/255.0f)), float3(0.0f, 0.0f, 0.0f)) * %s)",//#define TEVCMP_RGB8_GT 14 - " %s + ((float3(1.0f, 1.0f, 1.0f) - max(sign(abs(%s.rgb - %s.rgb) - (0.5f/255.0f)), float3(0.0f, 0.0f, 0.0f))) * %s)"//#define TEVCMP_RGB8_EQ 15 -}; - -//table with the alpha compare operations -static const char *TEVCMPAlphaOPTable[16] = -{ - "0.0f",//0 - "0.0f",//1 - "0.0f",//2 - "0.0f",//3 - "0.0f",//4 - "0.0f",//5 - "0.0f",//6 - "0.0f",//7 - " %s.a + ((%s.r >= (%s.r + (0.25f/255.0f))) ? %s.a : 0.0f)",//#define TEVCMP_R8_GT 8 - " %s.a + (abs(%s.r - %s.r) < (0.5f/255.0f) ? %s.a : 0.0f)",//#define TEVCMP_R8_EQ 9 - " %s.a + ((dot(%s.rgb, comp16) >= (dot(%s.rgb, comp16) + (0.25f/255.0f))) ? %s.a : 0.0f)",//#define TEVCMP_GR16_GT 10 - " %s.a + (abs(dot(%s.rgb, comp16) - dot(%s.rgb, comp16)) < (0.5f/255.0f) ? %s.a : 0.0f)",//#define TEVCMP_GR16_EQ 11 - " %s.a + ((dot(%s.rgb, comp24) >= (dot(%s.rgb, comp24) + (0.25f/255.0f))) ? %s.a : 0.0f)",//#define TEVCMP_BGR24_GT 12 - " %s.a + (abs(dot(%s.rgb, comp24) - dot(%s.rgb, comp24)) < (0.5f/255.0f) ? %s.a : 0.0f)",//#define TEVCMP_BGR24_EQ 13 - " %s.a + ((%s.a >= (%s.a + (0.25f/255.0f))) ? %s.a : 0.0f)",//#define TEVCMP_A8_GT 14 - " %s.a + (abs(%s.a - %s.a) < (0.5f/255.0f) ? %s.a : 0.0f)"//#define TEVCMP_A8_EQ 15 - -}; - - -static void WriteStage(char *&p, int n, API_TYPE ApiType) -{ - int texcoord = bpmem.tevorders[n/2].getTexCoord(n&1); - bool bHasTexCoord = (u32)texcoord < bpmem.genMode.numtexgens; - bool bHasIndStage = bpmem.tevind[n].IsActive() && bpmem.tevind[n].bt < bpmem.genMode.numindstages; - - // HACK to handle cases where the tex gen is not enabled - if (!bHasTexCoord) - texcoord = 0; - - WRITE(p, "// TEV stage %d\n", n); - - if (bHasIndStage) - { - WRITE(p, "// indirect op\n"); - // perform the indirect op on the incoming regular coordinates using indtex%d as the offset coords - if (bpmem.tevind[n].bs != ITBA_OFF) - { - WRITE(p, "alphabump = indtex%d.%s %s;\n", - bpmem.tevind[n].bt, - tevIndAlphaSel[bpmem.tevind[n].bs], - tevIndAlphaScale[bpmem.tevind[n].fmt]); - } - // format - WRITE(p, "float3 indtevcrd%d = indtex%d * %s;\n", n, bpmem.tevind[n].bt, tevIndFmtScale[bpmem.tevind[n].fmt]); - - // bias - if (bpmem.tevind[n].bias != ITB_NONE ) - WRITE(p, "indtevcrd%d.%s += %s;\n", n, tevIndBiasField[bpmem.tevind[n].bias], tevIndBiasAdd[bpmem.tevind[n].fmt]); - - // multiply by offset matrix and scale - if (bpmem.tevind[n].mid != 0) - { - if (bpmem.tevind[n].mid <= 3) - { - int mtxidx = 2*(bpmem.tevind[n].mid-1); - WRITE(p, "float2 indtevtrans%d = float2(dot("I_INDTEXMTX"[%d].xyz, indtevcrd%d), dot("I_INDTEXMTX"[%d].xyz, indtevcrd%d));\n", - n, mtxidx, n, mtxidx+1, n); - } - else if (bpmem.tevind[n].mid <= 7 && bHasTexCoord) - { // s matrix - // TODO: Might become negative? - int mtxidx = 2*(bpmem.tevind[n].mid-5); - WRITE(p, "float2 indtevtrans%d = "I_INDTEXMTX"[%d].ww * uv%d.xy * indtevcrd%d.xx;\n", n, mtxidx, texcoord, n); - } - else if (bpmem.tevind[n].mid <= 11 && bHasTexCoord) - { // t matrix - // TODO: Might become negative? - int mtxidx = 2*(bpmem.tevind[n].mid-9); - WRITE(p, "float2 indtevtrans%d = "I_INDTEXMTX"[%d].ww * uv%d.xy * indtevcrd%d.yy;\n", n, mtxidx, texcoord, n); - } - else - WRITE(p, "float2 indtevtrans%d = 0;\n", n); - } - else - WRITE(p, "float2 indtevtrans%d = 0;\n", n); - - // --------- - // Wrapping - // --------- - - // wrap S - if (bpmem.tevind[n].sw == ITW_OFF) - WRITE(p, "wrappedcoord.x = uv%d.x;\n", texcoord); - else if (bpmem.tevind[n].sw == ITW_0) - WRITE(p, "wrappedcoord.x = 0.0f;\n"); - else - WRITE(p, "wrappedcoord.x = fmod( uv%d.x, %s );\n", texcoord, tevIndWrapStart[bpmem.tevind[n].sw]); - - // wrap T - if (bpmem.tevind[n].tw == ITW_OFF) - WRITE(p, "wrappedcoord.y = uv%d.y;\n", texcoord); - else if (bpmem.tevind[n].tw == ITW_0) - WRITE(p, "wrappedcoord.y = 0.0f;\n"); - else - WRITE(p, "wrappedcoord.y = fmod( uv%d.y, %s );\n", texcoord, tevIndWrapStart[bpmem.tevind[n].tw]); - - if (bpmem.tevind[n].fb_addprev) // add previous tevcoord - WRITE(p, "tevcoord.xy += wrappedcoord + indtevtrans%d;\n", n); - else - WRITE(p, "tevcoord.xy = wrappedcoord + indtevtrans%d;\n", n); - } - - 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 - || cc.d == TEVCOLORARG_RASA || cc.d == TEVCOLORARG_RASC - || ac.a == TEVALPHAARG_RASA || ac.b == TEVALPHAARG_RASA - || ac.c == TEVALPHAARG_RASA || ac.d == TEVALPHAARG_RASA) - { - char *rasswap = swapModeTable[bpmem.combiners[n].alphaC.rswap]; - WRITE(p, "rastemp = %s.%s;\n", tevRasTable[bpmem.tevorders[n / 2].getColorChan(n & 1)], rasswap); - WRITE(p, "crastemp = frac(rastemp * (255.0f/256.0f)) * (256.0f/255.0f);\n"); - } - - - if (bpmem.tevorders[n/2].getEnable(n&1)) - { - if(!bHasIndStage) - { - // calc tevcord - if(bHasTexCoord) - WRITE(p, "tevcoord.xy = uv%d.xy;\n", texcoord); - else - WRITE(p, "tevcoord.xy = float2(0.0f, 0.0f);\n"); - } - - char *texswap = swapModeTable[bpmem.combiners[n].alphaC.tswap]; - int texmap = bpmem.tevorders[n/2].getTexMap(n&1); - SampleTexture(p, "textemp", "tevcoord", texswap, texmap, ApiType); - } - else - 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) - { - int kc = bpmem.tevksel[n / 2].getKC(n & 1); - int ka = bpmem.tevksel[n / 2].getKA(n & 1); - WRITE(p, "konsttemp = float4(%s, %s);\n", tevKSelTableC[kc], tevKSelTableA[ka]); - if(kc > 7 || ka > 7) - { - WRITE(p, "ckonsttemp = frac(konsttemp * (255.0f/256.0f)) * (256.0f/255.0f);\n"); - } - else - { - WRITE(p, "ckonsttemp = konsttemp;\n"); - } - } - - if(cc.a == TEVCOLORARG_CPREV || cc.a == TEVCOLORARG_APREV - || 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(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(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(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) - WRITE(p, "cc2 = frac(c2 * (255.0f/256.0f)) * (256.0f/255.0f);\n"); - - - WRITE(p, "// color combine\n"); - if (cc.clamp) - WRITE(p, "%s = saturate(", tevCOutputTable[cc.dest]); - else - WRITE(p, "%s = ", tevCOutputTable[cc.dest]); - - // combine the color channel - if (cc.bias != TevBias_COMPARE) // if not compare - { - //normal color combiner goes here - if (cc.shift > TEVSCALE_1) - WRITE(p, "%s*(", tevScaleTable[cc.shift]); - - if(!(cc.d == TEVCOLORARG_ZERO && cc.op == TEVOP_ADD)) - WRITE(p, "%s%s", tevCInputTable[cc.d], tevOpTable[cc.op]); - - if (cc.a == cc.b) - WRITE(p, "%s", tevCInputTable[cc.a + 16]); - else if (cc.c == TEVCOLORARG_ZERO) - WRITE(p, "%s", tevCInputTable[cc.a + 16]); - else if (cc.c == TEVCOLORARG_ONE) - WRITE(p, "%s", tevCInputTable[cc.b + 16]); - else if (cc.a == TEVCOLORARG_ZERO) - WRITE(p, "%s*%s", tevCInputTable[cc.b + 16], tevCInputTable[cc.c + 16]); - else if (cc.b == TEVCOLORARG_ZERO) - WRITE(p, "%s*(float3(1.0f, 1.0f, 1.0f)-%s)", tevCInputTable[cc.a + 16], tevCInputTable[cc.c + 16]); - else - WRITE(p, "lerp(%s, %s, %s)", tevCInputTable[cc.a + 16], tevCInputTable[cc.b + 16], tevCInputTable[cc.c + 16]); - - WRITE(p, "%s", tevBiasTable[cc.bias]); - - if (cc.shift > TEVSCALE_1) - WRITE(p, ")"); - } - else - { - int cmp = (cc.shift<<1)|cc.op|8; // comparemode stored here - WRITE(p, TEVCMPColorOPTable[cmp],//lookup the function from the op table - tevCInputTable[cc.d], - tevCInputTable[cc.a + 16], - tevCInputTable[cc.b + 16], - tevCInputTable[cc.c + 16]); - } - if (cc.clamp) - WRITE(p, ")"); - WRITE(p,";\n"); - - WRITE(p, "// alpha combine\n"); - // combine the alpha channel - if (ac.clamp) - WRITE(p, "%s = saturate(", tevAOutputTable[ac.dest]); - else - WRITE(p, "%s = ", tevAOutputTable[ac.dest]); - - if (ac.bias != TevBias_COMPARE) // if not compare - { - //normal alpha combiner goes here - if (ac.shift > TEVSCALE_1) - WRITE(p, "%s*(", tevScaleTable[ac.shift]); - - if(!(ac.d == TEVALPHAARG_ZERO && ac.op == TEVOP_ADD)) - WRITE(p, "%s.a%s", tevAInputTable[ac.d], tevOpTable[ac.op]); - - if (ac.a == ac.b) - WRITE(p, "%s.a", tevAInputTable[ac.a + 8]); - else if (ac.c == TEVALPHAARG_ZERO) - WRITE(p, "%s.a", tevAInputTable[ac.a + 8]); - else if (ac.a == TEVALPHAARG_ZERO) - WRITE(p, "%s.a*%s.a", tevAInputTable[ac.b + 8], tevAInputTable[ac.c + 8]); - else if (ac.b == TEVALPHAARG_ZERO) - WRITE(p, "%s.a*(1.0f-%s.a)", tevAInputTable[ac.a + 8], tevAInputTable[ac.c + 8]); - else - WRITE(p, "lerp(%s.a, %s.a, %s.a)", tevAInputTable[ac.a + 8], tevAInputTable[ac.b + 8], tevAInputTable[ac.c + 8]); - - WRITE(p, "%s",tevBiasTable[ac.bias]); - - if (ac.shift>0) - WRITE(p, ")"); - - } - else - { - //compare alpha combiner goes here - int cmp = (ac.shift<<1)|ac.op|8; // comparemode stored here - WRITE(p, TEVCMPAlphaOPTable[cmp], - tevAInputTable[ac.d], - tevAInputTable[ac.a + 8], - tevAInputTable[ac.b + 8], - tevAInputTable[ac.c + 8]); - } - if (ac.clamp) - WRITE(p, ")"); - WRITE(p, ";\n\n"); - WRITE(p, "// TEV done\n"); -} - -void SampleTexture(char *&p, const char *destination, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType) -{ - if (ApiType == API_D3D11) - WRITE(p, "%s=Tex%d.Sample(samp%d,%s.xy * "I_TEXDIMS"[%d].xy).%s;\n", destination, texmap,texmap, texcoords, texmap, texswap); - else - WRITE(p, "%s=tex2D(samp%d,%s.xy * "I_TEXDIMS"[%d].xy).%s;\n", destination, texmap, texcoords, texmap, texswap); -} - -static const char *tevAlphaFuncsTable[] = -{ - "(false)", //ALPHACMP_NEVER 0 - "(prev.a <= %s - (0.25f/255.0f))", //ALPHACMP_LESS 1 - "(abs( prev.a - %s ) < (0.5f/255.0f))", //ALPHACMP_EQUAL 2 - "(prev.a < %s + (0.25f/255.0f))", //ALPHACMP_LEQUAL 3 - "(prev.a >= %s + (0.25f/255.0f))", //ALPHACMP_GREATER 4 - "(abs( prev.a - %s ) >= (0.5f/255.0f))", //ALPHACMP_NEQUAL 5 - "(prev.a > %s - (0.25f/255.0f))", //ALPHACMP_GEQUAL 6 - "(true)" //ALPHACMP_ALWAYS 7 -}; - -static const char *tevAlphaFunclogicTable[] = -{ - " && ", // and - " || ", // or - " != ", // xor - " == " // xnor -}; -static 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 true; - if (comp[0] == ALPHACMP_NEVER || comp[1] == ALPHACMP_NEVER) return false; - 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; - break; - case 2: // XOR - if ((comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_NEVER) || (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_ALWAYS)) - return true; - if ((comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_ALWAYS) || (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_NEVER)) - return false; - break; - case 3: // XNOR - if ((comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_NEVER) || (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_ALWAYS)) - return false; - if ((comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_ALWAYS) || (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_NEVER)) - return true; - break; - default: PanicAlert("bad logic for alpha test? %08x", op); - } - return -1; -} - - -static bool WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode) -{ - static const char *alphaRef[2] = - { - I_ALPHA"[0].r", - I_ALPHA"[0].g" - }; - - int Pretest = AlphaPreTest(); - if(Pretest >= 0) - { - return Pretest != 0; - } - - // using discard then return works the same in cg and dx9 but not in dx11 - WRITE(p, "if(!( "); - - int compindex = bpmem.alphaFunc.comp0 % 8; - 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 - - compindex = bpmem.alphaFunc.comp1 % 8; - WRITE(p, tevAlphaFuncsTable[compindex],alphaRef[1]);//lookup the second component from the alpha function table - WRITE(p, ")){ocol0 = 0;%s%s discard;%s}\n", - dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND ? "ocol1 = 0;" : "", - DepthTextureEnable ? "depth = 1.f;" : "", - (ApiType != API_D3D11) ? "return;" : ""); - return true; -} - -static const char *tevFogFuncsTable[] = -{ - "", //No Fog - "", //? - "", //Linear - "", //? - " fog = 1.0f - pow(2.0f, -8.0f * fog);\n", //exp - " fog = 1.0f - pow(2.0f, -8.0f * fog * fog);\n", //exp2 - " fog = pow(2.0f, -8.0f * (1.0f - fog));\n", //backward exp - " fog = 1.0f - fog;\n fog = pow(2.0f, -8.0f * fog * fog);\n" //backward exp2 -}; - -static void WriteFog(char *&p) -{ - if(bpmem.fog.c_proj_fsel.fsel == 0)return;//no Fog - - if (bpmem.fog.c_proj_fsel.proj == 0) - { - // perspective - // ze = A/(B - (Zs >> B_SHF) - WRITE (p, " float ze = "I_FOG"[1].x / ("I_FOG"[1].y - (zCoord / "I_FOG"[1].w));\n"); - } - else - { - // orthographic - // ze = a*Zs (here, no B_SHF) - WRITE (p, " float ze = "I_FOG"[1].x * zCoord;\n"); - } - - // x_adjust = sqrt((x-center)^2 + k^2)/k - // ze *= x_adjust - //this is complitly teorical as the real hard seems to use a table intead of calculate the values. - if(bpmem.fogRange.Base.Enabled) - { - WRITE (p, " float x_adjust = (2.0f * (clipPos.x / "I_FOG"[2].y)) - 1.0f - "I_FOG"[2].x;\n"); - WRITE (p, " x_adjust = sqrt(x_adjust * x_adjust + "I_FOG"[2].z * "I_FOG"[2].z) / "I_FOG"[2].z;\n"); - WRITE (p, " ze *= x_adjust;\n"); - } - - WRITE (p, " float fog = saturate(ze - "I_FOG"[1].z);\n"); - - if(bpmem.fog.c_proj_fsel.fsel > 3) - { - WRITE(p, "%s", tevFogFuncsTable[bpmem.fog.c_proj_fsel.fsel]); - } - else - { - if(bpmem.fog.c_proj_fsel.fsel != 2) - WARN_LOG(VIDEO, "Unknown Fog Type! %08x", bpmem.fog.c_proj_fsel.fsel); - } - - WRITE(p, " prev.rgb = lerp(prev.rgb,"I_FOG"[0].rgb,fog);\n"); - - +// 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 + +#include "LightingShaderGen.h" +#include "PixelShaderGen.h" +#include "XFMemory.h" // for texture projection mode +#include "BPMemory.h" +#include "VideoConfig.h" +#include "NativeVertexFormat.h" + +PIXELSHADERUID last_pixel_shader_uid; + +static int AlphaPreTest(); + +static void StageHash(int 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 + out[0] |= (alphaC&0xF0) << 24; // 8 + out[1] |= alphaC >> 8; // 16 + + // reserve 3 bits for bpmem.tevorders[stage/2].getTexMap + out[1] |= bpmem.tevorders[stage/2].getTexCoord(stage&1) << 19; // 3 + out[1] |= bpmem.tevorders[stage/2].getEnable(stage&1) << 22; // 1 + // reserve 3 bits for bpmem.tevorders[stage/2].getColorChan + + bool bHasIndStage = bpmem.tevind[stage].IsActive() && bpmem.tevind[stage].bt < bpmem.genMode.numindstages; + out[2] |= bHasIndStage << 2; // 1 + + bool needstexcoord = false; + + if (bHasIndStage) + { + out[2] |= (bpmem.tevind[stage].hex & 0x17FFFF) << 3; // 21, TODO: needs an explanation + needstexcoord = true; + } + + + TevStageCombiner::ColorCombiner& cc = bpmem.combiners[stage].colorC; + TevStageCombiner::AlphaCombiner& ac = bpmem.combiners[stage].alphaC; + + 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 + || cc.d == TEVCOLORARG_RASA || cc.d == TEVCOLORARG_RASC + || ac.a == TEVALPHAARG_RASA || ac.b == TEVALPHAARG_RASA + || ac.c == TEVALPHAARG_RASA || ac.d == TEVALPHAARG_RASA) + { + out[0] |= bpmem.combiners[stage].alphaC.rswap; + out[2] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.rswap*2].swap1 << 24; // 2 + out[2] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.rswap*2].swap2 << 26; // 2 + out[2] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.rswap*2+1].swap1 << 28; // 2 + out[2] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.rswap*2+1].swap2 << 30; // 2 + out[1] |= (bpmem.tevorders[stage/2].getColorChan(stage&1)&1) << 23; + out[2] |= (bpmem.tevorders[stage/2].getColorChan(stage&1)&0x6) >> 1; + } + + out[3] |= bpmem.tevorders[stage/2].getEnable(stage&1); + if (bpmem.tevorders[stage/2].getEnable(stage&1)) + { + if (bHasIndStage) needstexcoord = true; + + out[0] |= bpmem.combiners[stage].alphaC.tswap; + out[3] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.tswap*2].swap1 << 1; // 2 + out[3] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.tswap*2].swap2 << 3; // 2 + out[3] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.tswap*2+1].swap1 << 5; // 2 + out[3] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.tswap*2+1].swap2 << 7; // 2 + out[1] |= bpmem.tevorders[stage/2].getTexMap(stage&1) << 16; + } + + 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) + { + out[3] |= bpmem.tevksel[stage/2].getKC(stage&1) << 9; // 5 + out[3] |= bpmem.tevksel[stage/2].getKA(stage&1) << 14; // 5 + } + + if (needstexcoord) + { + out[1] |= bpmem.tevorders[stage/2].getTexCoord(stage&1) << 16; + } +} + +// Mash together all the inputs that contribute to the code of a generated pixel shader into +// a unique identifier, basically containing all the bits. Yup, it's a lot .... +// It would likely be a lot more efficient to build this incrementally as the attributes +// are set... +void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode) +{ + uid->values[0] |= bpmem.genMode.numtevstages; // 4 + 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; + + uid->values[0] |= DepthTextureEnable << 10; // 1 + + bool enablePL = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting; + uid->values[0] |= enablePL << 11; // 1 + + if (!enablePL) uid->values[0] |= xfregs.numTexGen.numTexGens << 12; // 4 + u32 alphaPreTest = AlphaPreTest()+1; + + 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; + } + + for (unsigned int i = 0; i < bpmem.genMode.numtexgens; ++i) + { + 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[1] = bpmem.genMode.numindstages << 2; // 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) + indirectStagesUsed |= (1 << bpmem.tevind[i].bt); + + assert(indirectStagesUsed == (indirectStagesUsed & 0xF)); + + uid->values[1] |= indirectStagesUsed << 5; // 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 + if (bpmem.tevindref.getTexCoord(i) < bpmem.genMode.numtexgens) + uid->values[1] |= bpmem.tevindref.getTexCoord(i) << (10 + 3*i); // 2 + } + } + + u32* ptr = &uid->values[2]; + for (int i = 0; i < bpmem.genMode.numtevstages+1; ++i) + { + StageHash(i, ptr); + 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 + + if (alphaPreTest == 0 || alphaPreTest == 2) + { + ptr[0] |= bpmem.fog.c_proj_fsel.fsel << 8; // 3 + if (DepthTextureEnable) + { + ptr[0] |= bpmem.ztex2.op << 11; // 2 + ptr[0] |= bpmem.zcontrol.zcomploc << 13; // 1 + ptr[0] |= bpmem.zmode.testenable << 14; // 1 + ptr[0] |= bpmem.zmode.updateenable << 15; // 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; + if (enablePL) + ptr += GetLightingShaderId(ptr); + + uid->num_values = ptr - uid->values; +} + +void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode) +{ + u32* ptr = uid->values; + *ptr++ = dstAlphaMode; // 0 + *ptr++ = bpmem.genMode.hex; // 1 + *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 + + if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) + { + // TODO: Include register states for lighting shader + *ptr++ = xfregs.color[0].hex; + *ptr++ = xfregs.alpha[0].hex; + *ptr++ = xfregs.color[1].hex; + *ptr++ = xfregs.alpha[1].hex; + } + + for (unsigned int i = 0; i < 8; ++i) + *ptr++ = xfregs.texMtxInfo[i].hex; // 8-15 + + for (unsigned int i = 0; i < 16; ++i) + *ptr++ = bpmem.tevind[i].hex; // 16-31 + + *ptr++ = bpmem.tevindref.hex; // 32 + + 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 = &uid->values[113]; + + *ptr++ = bpmem.alphaFunc.hex; // 113 + + *ptr++ = bpmem.fog.c_proj_fsel.hex; // 114 + *ptr++ = bpmem.fogRange.Base.hex; // 115 + + _assert_((ptr - uid->values) == uid->GetNumValues()); +} + +void ValidatePixelShaderIDs(API_TYPE api, PIXELSHADERUIDSAFE old_id, const std::string& old_code, DSTALPHA_MODE dstAlphaMode, u32 components) +{ + if (!g_ActiveConfig.bEnableShaderDebugging) + return; + + PIXELSHADERUIDSAFE new_id; + GetSafePixelShaderId(&new_id, dstAlphaMode); + + if (!(old_id == new_id)) + { + std::string new_code(GeneratePixelShaderCode(dstAlphaMode, api, components)); + if (old_code != new_code) + { + _assert_(old_id.GetNumValues() == new_id.GetNumValues()); + + char msg[8192]; + char* ptr = msg; + ptr += sprintf(ptr, "Pixel shader IDs matched but unique IDs did not!\nUnique IDs (old <-> new):\n"); + const int N = new_id.GetNumValues(); + for (int i = 0; i < N/2; ++i) + ptr += sprintf(ptr, "%02d, %08X %08X | %08X %08X\n", 2*i, old_id.values[2*i], old_id.values[2*i+1], + new_id.values[2*i], new_id.values[2*i+1]); + if (N % 2) + ptr += sprintf(ptr, "%02d, %08X | %08X\n", N-1, old_id.values[N-1], new_id.values[N-1]); + + static int num_failures = 0; + char szTemp[MAX_PATH]; + sprintf(szTemp, "%spsuid_mismatch_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++); + std::ofstream file(szTemp); + file << msg; + file << "\n\nOld shader code:\n" << old_code; + file << "\n\nNew shader code:\n" << new_code; + file.close(); + + PanicAlert("Unique pixel shader ID mismatch!\n\nReport this to the devs, along with the contents of %s.", szTemp); + } + } +} + +// old tev->pixelshader notes +// +// color for this stage (alpha, color) is given by bpmem.tevorders[0].colorchan0 +// konstant for this stage (alpha, color) is given by bpmem.tevksel +// inputs are given by bpmem.combiners[0].colorC.a/b/c/d << could be current chan color +// according to GXTevColorArg table above +// output is given by .outreg +// tevtemp is set according to swapmodetables and + +static void WriteStage(char *&p, int n, API_TYPE ApiType); +static void SampleTexture(char *&p, const char *destination, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType); +// static void WriteAlphaCompare(char *&p, int num, int comp); +static bool WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode); +static void WriteFog(char *&p); + +static const char *tevKSelTableC[] = // KCSEL +{ + "1.0f,1.0f,1.0f", // 1 = 0x00 + "0.875f,0.875f,0.875f", // 7_8 = 0x01 + "0.75f,0.75f,0.75f", // 3_4 = 0x02 + "0.625f,0.625f,0.625f", // 5_8 = 0x03 + "0.5f,0.5f,0.5f", // 1_2 = 0x04 + "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 + I_KCOLORS"[0].rgb", // K0 = 0x0C + I_KCOLORS"[1].rgb", // K1 = 0x0D + I_KCOLORS"[2].rgb", // K2 = 0x0E + I_KCOLORS"[3].rgb", // K3 = 0x0F + I_KCOLORS"[0].rrr", // K0_R = 0x10 + I_KCOLORS"[1].rrr", // K1_R = 0x11 + I_KCOLORS"[2].rrr", // K2_R = 0x12 + I_KCOLORS"[3].rrr", // K3_R = 0x13 + I_KCOLORS"[0].ggg", // K0_G = 0x14 + I_KCOLORS"[1].ggg", // K1_G = 0x15 + I_KCOLORS"[2].ggg", // K2_G = 0x16 + I_KCOLORS"[3].ggg", // K3_G = 0x17 + I_KCOLORS"[0].bbb", // K0_B = 0x18 + I_KCOLORS"[1].bbb", // K1_B = 0x19 + I_KCOLORS"[2].bbb", // K2_B = 0x1A + I_KCOLORS"[3].bbb", // K3_B = 0x1B + I_KCOLORS"[0].aaa", // K0_A = 0x1C + I_KCOLORS"[1].aaa", // K1_A = 0x1D + I_KCOLORS"[2].aaa", // K2_A = 0x1E + I_KCOLORS"[3].aaa", // K3_A = 0x1F +}; + +static const char *tevKSelTableA[] = // KASEL +{ + "1.0f", // 1 = 0x00 + "0.875f",// 7_8 = 0x01 + "0.75f", // 3_4 = 0x02 + "0.625f",// 5_8 = 0x03 + "0.5f", // 1_2 = 0x04 + "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 + I_KCOLORS"[0].r", // K0_R = 0x10 + I_KCOLORS"[1].r", // K1_R = 0x11 + I_KCOLORS"[2].r", // K2_R = 0x12 + I_KCOLORS"[3].r", // K3_R = 0x13 + I_KCOLORS"[0].g", // K0_G = 0x14 + I_KCOLORS"[1].g", // K1_G = 0x15 + I_KCOLORS"[2].g", // K2_G = 0x16 + I_KCOLORS"[3].g", // K3_G = 0x17 + I_KCOLORS"[0].b", // K0_B = 0x18 + I_KCOLORS"[1].b", // K1_B = 0x19 + I_KCOLORS"[2].b", // K2_B = 0x1A + I_KCOLORS"[3].b", // K3_B = 0x1B + I_KCOLORS"[0].a", // K0_A = 0x1C + I_KCOLORS"[1].a", // K1_A = 0x1D + I_KCOLORS"[2].a", // K2_A = 0x1E + I_KCOLORS"[3].a", // K3_A = 0x1F +}; + +static const char *tevScaleTable[] = // CS +{ + "1.0f", // SCALE_1 + "2.0f", // SCALE_2 + "4.0f", // SCALE_4 + "0.5f", // DIVIDE_2 +}; + +static const char *tevBiasTable[] = // TB +{ + "", // ZERO, + "+0.5f", // ADDHALF, + "-0.5f", // SUBHALF, + "", +}; + +static const char *tevOpTable[] = { // TEV + "+", // TEVOP_ADD = 0, + "-", // TEVOP_SUB = 1, +}; + +static const char *tevCInputTable[] = // CC +{ + "(prev.rgb)", // CPREV, + "(prev.aaa)", // APREV, + "(c0.rgb)", // C0, + "(c0.aaa)", // A0, + "(c1.rgb)", // C1, + "(c1.aaa)", // A1, + "(c2.rgb)", // C2, + "(c2.aaa)", // A2, + "(textemp.rgb)", // TEXC, + "(textemp.aaa)", // TEXA, + "(rastemp.rgb)", // RASC, + "(rastemp.aaa)", // RASA, + "float3(1.0f, 1.0f, 1.0f)", // ONE + "float3(0.5f, 0.5f, 0.5f)", // HALF + "(konsttemp.rgb)", //"konsttemp.rgb", // KONST + "float3(0.0f, 0.0f, 0.0f)", // ZERO + ///aded extra values to map clamped values + "(cprev.rgb)", // CPREV, + "(cprev.aaa)", // APREV, + "(cc0.rgb)", // C0, + "(cc0.aaa)", // A0, + "(cc1.rgb)", // C1, + "(cc1.aaa)", // A1, + "(cc2.rgb)", // C2, + "(cc2.aaa)", // A2, + "(textemp.rgb)", // TEXC, + "(textemp.aaa)", // TEXA, + "(crastemp.rgb)", // RASC, + "(crastemp.aaa)", // RASA, + "float3(1.0f, 1.0f, 1.0f)", // ONE + "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" +}; + +static const char *tevAInputTable[] = // CA +{ + "prev", // APREV, + "c0", // A0, + "c1", // A1, + "c2", // A2, + "textemp", // TEXA, + "rastemp", // RASA, + "konsttemp", // KONST, (hw1 had quarter) + "float4(0.0f, 0.0f, 0.0f, 0.0f)", // ZERO + ///aded extra values to map clamped values + "cprev", // APREV, + "cc0", // A0, + "cc1", // A1, + "cc2", // A2, + "textemp", // TEXA, + "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", +}; + +static const char *tevRasTable[] = +{ + "colors_0", + "colors_1", + "ERROR", //2 + "ERROR", //3 + "ERROR", //4 + "alphabump", // use bump alpha + "(alphabump*(255.0f/248.0f))", //normalized + "float4(0.0f, 0.0f, 0.0f, 0.0f)", // zero +}; + +//static const char *tevTexFunc[] = { "tex2D", "texRECT" }; + +static const char *tevCOutputTable[] = { "prev.rgb", "c0.rgb", "c1.rgb", "c2.rgb" }; +static const char *tevAOutputTable[] = { "prev.a", "c0.a", "c1.a", "c2.a" }; +static const char *tevIndAlphaSel[] = {"", "x", "y", "z"}; +//static const char *tevIndAlphaScale[] = {"", "*32", "*16", "*8"}; +static const char *tevIndAlphaScale[] = {"*(248.0f/255.0f)", "*(224.0f/255.0f)", "*(240.0f/255.0f)", "*(248.0f/255.0f)"}; +static const char *tevIndBiasField[] = {"", "x", "y", "xy", "z", "xz", "yz", "xyz"}; // indexed by bias +static const char *tevIndBiasAdd[] = {"-128.0f", "1.0f", "1.0f", "1.0f" }; // indexed by fmt +static const char *tevIndWrapStart[] = {"0.0f", "256.0f", "128.0f", "64.0f", "32.0f", "16.0f", "0.001f" }; +static const char *tevIndFmtScale[] = {"255.0f", "31.0f", "15.0f", "7.0f" }; + +#define WRITE p+=sprintf + +static char swapModeTable[4][5]; + +static char text[16384]; +static bool DepthTextureEnable; + +static void BuildSwapModeTable() +{ + static const char *swapColors = "rgba"; + for (int i = 0; i < 4; i++) + { + swapModeTable[i][0] = swapColors[bpmem.tevksel[i*2].swap1]; + swapModeTable[i][1] = swapColors[bpmem.tevksel[i*2].swap2]; + swapModeTable[i][2] = swapColors[bpmem.tevksel[i*2+1].swap1]; + swapModeTable[i][3] = swapColors[bpmem.tevksel[i*2+1].swap2]; + swapModeTable[i][4] = 0; + } +} + +const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components) +{ + setlocale(LC_NUMERIC, "C"); // Reset locale for compilation + text[sizeof(text) - 1] = 0x7C; // canary + + BuildSwapModeTable(); // Needed for WriteStage + int numStages = bpmem.genMode.numtevstages + 1; + int numTexgen = bpmem.genMode.numtexgens; + + char *p = text; + WRITE(p, "//Pixel Shader for TEV stages\n"); + WRITE(p, "//%i TEV stages, %i texgens, XXX IND stages\n", + numStages, numTexgen/*, bpmem.genMode.numindstages*/); + + int nIndirectStagesUsed = 0; + if (bpmem.genMode.numindstages > 0) + { + for (int i = 0; i < numStages; ++i) + { + if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages) + nIndirectStagesUsed |= 1 << bpmem.tevind[i].bt; + } + } + DepthTextureEnable = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc && bpmem.zmode.testenable && bpmem.zmode.updateenable) || g_ActiveConfig.bEnablePerPixelDepth ; + // Declare samplers + + if(ApiType != API_D3D11) + { + WRITE(p, "uniform sampler2D "); + } + else + { + WRITE(p, "sampler "); + } + + bool bfirst = true; + for (int i = 0; i < 8; ++i) + { + WRITE(p, "%s samp%d : register(s%d)", bfirst?"":",", i, i); + bfirst = false; + } + WRITE(p, ";\n"); + if(ApiType == API_D3D11) + { + WRITE(p, "Texture2D "); + bfirst = true; + for (int i = 0; i < 8; ++i) + { + WRITE(p, "%s Tex%d : register(t%d)", bfirst?"":",", i, i); + bfirst = false; + } + WRITE(p, ";\n"); + } + + WRITE(p, "\n"); + + WRITE(p, "uniform float4 "I_COLORS"[4] : register(c%d);\n", C_COLORS); + WRITE(p, "uniform float4 "I_KCOLORS"[4] : register(c%d);\n", C_KCOLORS); + WRITE(p, "uniform float4 "I_ALPHA"[1] : register(c%d);\n", C_ALPHA); + WRITE(p, "uniform float4 "I_TEXDIMS"[8] : register(c%d);\n", C_TEXDIMS); + WRITE(p, "uniform float4 "I_ZBIAS"[2] : register(c%d);\n", C_ZBIAS); + WRITE(p, "uniform float4 "I_INDTEXSCALE"[2] : register(c%d);\n", C_INDTEXSCALE); + WRITE(p, "uniform float4 "I_INDTEXMTX"[6] : register(c%d);\n", C_INDTEXMTX); + WRITE(p, "uniform float4 "I_FOG"[3] : register(c%d);\n", C_FOG); + + if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) + { + WRITE(p,"typedef struct { float4 col; float4 cosatt; float4 distatt; float4 pos; float4 dir; } Light;\n"); + WRITE(p,"typedef struct { Light lights[8]; } s_"I_PLIGHTS";\n"); + WRITE(p, "uniform s_"I_PLIGHTS" "I_PLIGHTS" : register(c%d);\n", C_PLIGHTS); + WRITE(p, "typedef struct { float4 C0, C1, C2, C3; } s_"I_PMATERIALS";\n"); + WRITE(p, "uniform s_"I_PMATERIALS" "I_PMATERIALS" : register(c%d);\n", C_PMATERIALS); + } + + WRITE(p, "void main(\n"); + if(ApiType != API_D3D11) + { + 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," : "", + 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," : ""); + } + + WRITE(p, " in float4 colors_0 : COLOR0,\n"); + WRITE(p, " in float4 colors_1 : COLOR1"); + + // compute window position if needed because binding semantic WPOS is not widely supported + if (numTexgen < 7) + { + for (int i = 0; i < numTexgen; ++i) + WRITE(p, ",\n in float3 uv%d : TEXCOORD%d", i, i); + WRITE(p, ",\n in float4 clipPos : TEXCOORD%d", numTexgen); + if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) + WRITE(p, ",\n in float4 Normal : TEXCOORD%d", numTexgen + 1); + } + else + { + // wpos is in w of first 4 texcoords + if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) + { + for (int i = 0; i < 8; ++i) + WRITE(p, ",\n in float4 uv%d : TEXCOORD%d", i, i); + } + else + { + for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) + WRITE(p, ",\n in float%d uv%d : TEXCOORD%d", i < 4 ? 4 : 3 , i, i); + } + } + WRITE(p, " ) {\n"); + + char* pmainstart = p; + int Pretest = AlphaPreTest(); + if (dstAlphaMode == DSTALPHA_ALPHA_PASS && !DepthTextureEnable && Pretest >= 0) + { + if (!Pretest) + { + // alpha test will always fail, so restart the shader and just make it an empty function + WRITE(p, "ocol0 = 0;\n"); + WRITE(p, "discard;\n"); + if(ApiType != API_D3D11) + WRITE(p, "return;\n"); + } + else + { + WRITE(p, " ocol0 = "I_ALPHA"[0].aaaa;\n"); + } + 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" + " float3 tevcoord=float3(0.0f, 0.0f, 0.0f);\n" + " float2 wrappedcoord=float2(0.0f,0.0f), tempcoord=float2(0.0f,0.0f);\n" + " float4 cc0=float4(0.0f,0.0f,0.0f,0.0f), cc1=float4(0.0f,0.0f,0.0f,0.0f);\n" + " float4 cc2=float4(0.0f,0.0f,0.0f,0.0f), cprev=float4(0.0f,0.0f,0.0f,0.0f);\n" + " float4 crastemp=float4(0.0f,0.0f,0.0f,0.0f),ckonsttemp=float4(0.0f,0.0f,0.0f,0.0f);\n\n"); + + if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) + { + if (xfregs.numTexGen.numTexGens < 7) + { + WRITE(p,"float3 _norm0 = normalize(Normal.xyz);\n\n"); + WRITE(p,"float3 pos = float3(clipPos.x,clipPos.y,Normal.w);\n"); + } + else + { + WRITE(p," float3 _norm0 = normalize(float3(uv4.w,uv5.w,uv6.w));\n\n"); + WRITE(p,"float3 pos = float3(uv0.w,uv1.w,uv7.w);\n"); + } + + + WRITE(p, "float4 mat, lacc;\n" + "float3 ldir, h;\n" + "float dist, dist2, attn;\n"); + + p = GenerateLightingShader(p, components, I_PMATERIALS, I_PLIGHTS, "colors_", "colors_"); + } + + if (numTexgen < 7) + WRITE(p, "clipPos = float4(rawpos.x, rawpos.y, clipPos.z, clipPos.w);\n"); + else + WRITE(p, "float4 clipPos = float4(rawpos.x, rawpos.y, uv2.w, uv3.w);\n"); + + // HACK to handle cases where the tex gen is not enabled + if (numTexgen == 0) + { + WRITE(p, "float3 uv0 = float3(0.0f, 0.0f, 0.0f);\n"); + } + else + { + for (int i = 0; i < numTexgen; ++i) + { + // optional perspective divides + if (xfregs.texMtxInfo[i].projection == XF_TEXPROJ_STQ) + { + WRITE(p, "if (uv%d.z)", i); + WRITE(p, " uv%d.xy = uv%d.xy / uv%d.z;\n", i, i, i); + } + + WRITE(p, "uv%d.xy = uv%d.xy * "I_TEXDIMS"[%d].zw;\n", i, i, i); + } + } + + // indirect texture map lookup + for(u32 i = 0; i < bpmem.genMode.numindstages; ++i) + { + if (nIndirectStagesUsed & (1<= %s.r + (0.25f/255.0f)) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_R8_GT 8 + " %s + ((abs(%s.r - %s.r) < (0.5f/255.0f)) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_R8_EQ 9 + " %s + (( dot(%s.rgb, comp16) >= (dot(%s.rgb, comp16) + (0.25f/255.0f))) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_GR16_GT 10 + " %s + (abs(dot(%s.rgb, comp16) - dot(%s.rgb, comp16)) < (0.5f/255.0f) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_GR16_EQ 11 + " %s + (( dot(%s.rgb, comp24) >= (dot(%s.rgb, comp24) + (0.25f/255.0f))) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_BGR24_GT 12 + " %s + (abs(dot(%s.rgb, comp24) - dot(%s.rgb, comp24)) < (0.5f/255.0f) ? %s : float3(0.0f, 0.0f, 0.0f))",//#define TEVCMP_BGR24_EQ 13 + " %s + (max(sign(%s.rgb - %s.rgb - (0.25f/255.0f)), float3(0.0f, 0.0f, 0.0f)) * %s)",//#define TEVCMP_RGB8_GT 14 + " %s + ((float3(1.0f, 1.0f, 1.0f) - max(sign(abs(%s.rgb - %s.rgb) - (0.5f/255.0f)), float3(0.0f, 0.0f, 0.0f))) * %s)"//#define TEVCMP_RGB8_EQ 15 +}; + +//table with the alpha compare operations +static const char *TEVCMPAlphaOPTable[16] = +{ + "0.0f",//0 + "0.0f",//1 + "0.0f",//2 + "0.0f",//3 + "0.0f",//4 + "0.0f",//5 + "0.0f",//6 + "0.0f",//7 + " %s.a + ((%s.r >= (%s.r + (0.25f/255.0f))) ? %s.a : 0.0f)",//#define TEVCMP_R8_GT 8 + " %s.a + (abs(%s.r - %s.r) < (0.5f/255.0f) ? %s.a : 0.0f)",//#define TEVCMP_R8_EQ 9 + " %s.a + ((dot(%s.rgb, comp16) >= (dot(%s.rgb, comp16) + (0.25f/255.0f))) ? %s.a : 0.0f)",//#define TEVCMP_GR16_GT 10 + " %s.a + (abs(dot(%s.rgb, comp16) - dot(%s.rgb, comp16)) < (0.5f/255.0f) ? %s.a : 0.0f)",//#define TEVCMP_GR16_EQ 11 + " %s.a + ((dot(%s.rgb, comp24) >= (dot(%s.rgb, comp24) + (0.25f/255.0f))) ? %s.a : 0.0f)",//#define TEVCMP_BGR24_GT 12 + " %s.a + (abs(dot(%s.rgb, comp24) - dot(%s.rgb, comp24)) < (0.5f/255.0f) ? %s.a : 0.0f)",//#define TEVCMP_BGR24_EQ 13 + " %s.a + ((%s.a >= (%s.a + (0.25f/255.0f))) ? %s.a : 0.0f)",//#define TEVCMP_A8_GT 14 + " %s.a + (abs(%s.a - %s.a) < (0.5f/255.0f) ? %s.a : 0.0f)"//#define TEVCMP_A8_EQ 15 + +}; + + +static void WriteStage(char *&p, int n, API_TYPE ApiType) +{ + int texcoord = bpmem.tevorders[n/2].getTexCoord(n&1); + bool bHasTexCoord = (u32)texcoord < bpmem.genMode.numtexgens; + bool bHasIndStage = bpmem.tevind[n].IsActive() && bpmem.tevind[n].bt < bpmem.genMode.numindstages; + + // HACK to handle cases where the tex gen is not enabled + if (!bHasTexCoord) + texcoord = 0; + + WRITE(p, "// TEV stage %d\n", n); + + if (bHasIndStage) + { + WRITE(p, "// indirect op\n"); + // perform the indirect op on the incoming regular coordinates using indtex%d as the offset coords + if (bpmem.tevind[n].bs != ITBA_OFF) + { + WRITE(p, "alphabump = indtex%d.%s %s;\n", + bpmem.tevind[n].bt, + tevIndAlphaSel[bpmem.tevind[n].bs], + tevIndAlphaScale[bpmem.tevind[n].fmt]); + } + // format + WRITE(p, "float3 indtevcrd%d = indtex%d * %s;\n", n, bpmem.tevind[n].bt, tevIndFmtScale[bpmem.tevind[n].fmt]); + + // bias + if (bpmem.tevind[n].bias != ITB_NONE ) + WRITE(p, "indtevcrd%d.%s += %s;\n", n, tevIndBiasField[bpmem.tevind[n].bias], tevIndBiasAdd[bpmem.tevind[n].fmt]); + + // multiply by offset matrix and scale + if (bpmem.tevind[n].mid != 0) + { + if (bpmem.tevind[n].mid <= 3) + { + int mtxidx = 2*(bpmem.tevind[n].mid-1); + WRITE(p, "float2 indtevtrans%d = float2(dot("I_INDTEXMTX"[%d].xyz, indtevcrd%d), dot("I_INDTEXMTX"[%d].xyz, indtevcrd%d));\n", + n, mtxidx, n, mtxidx+1, n); + } + else if (bpmem.tevind[n].mid <= 7 && bHasTexCoord) + { // s matrix + // TODO: Might become negative? + int mtxidx = 2*(bpmem.tevind[n].mid-5); + WRITE(p, "float2 indtevtrans%d = "I_INDTEXMTX"[%d].ww * uv%d.xy * indtevcrd%d.xx;\n", n, mtxidx, texcoord, n); + } + else if (bpmem.tevind[n].mid <= 11 && bHasTexCoord) + { // t matrix + // TODO: Might become negative? + int mtxidx = 2*(bpmem.tevind[n].mid-9); + WRITE(p, "float2 indtevtrans%d = "I_INDTEXMTX"[%d].ww * uv%d.xy * indtevcrd%d.yy;\n", n, mtxidx, texcoord, n); + } + else + WRITE(p, "float2 indtevtrans%d = 0;\n", n); + } + else + WRITE(p, "float2 indtevtrans%d = 0;\n", n); + + // --------- + // Wrapping + // --------- + + // wrap S + if (bpmem.tevind[n].sw == ITW_OFF) + WRITE(p, "wrappedcoord.x = uv%d.x;\n", texcoord); + else if (bpmem.tevind[n].sw == ITW_0) + WRITE(p, "wrappedcoord.x = 0.0f;\n"); + else + WRITE(p, "wrappedcoord.x = fmod( uv%d.x, %s );\n", texcoord, tevIndWrapStart[bpmem.tevind[n].sw]); + + // wrap T + if (bpmem.tevind[n].tw == ITW_OFF) + WRITE(p, "wrappedcoord.y = uv%d.y;\n", texcoord); + else if (bpmem.tevind[n].tw == ITW_0) + WRITE(p, "wrappedcoord.y = 0.0f;\n"); + else + WRITE(p, "wrappedcoord.y = fmod( uv%d.y, %s );\n", texcoord, tevIndWrapStart[bpmem.tevind[n].tw]); + + if (bpmem.tevind[n].fb_addprev) // add previous tevcoord + WRITE(p, "tevcoord.xy += wrappedcoord + indtevtrans%d;\n", n); + else + WRITE(p, "tevcoord.xy = wrappedcoord + indtevtrans%d;\n", n); + } + + 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 + || cc.d == TEVCOLORARG_RASA || cc.d == TEVCOLORARG_RASC + || ac.a == TEVALPHAARG_RASA || ac.b == TEVALPHAARG_RASA + || ac.c == TEVALPHAARG_RASA || ac.d == TEVALPHAARG_RASA) + { + char *rasswap = swapModeTable[bpmem.combiners[n].alphaC.rswap]; + WRITE(p, "rastemp = %s.%s;\n", tevRasTable[bpmem.tevorders[n / 2].getColorChan(n & 1)], rasswap); + WRITE(p, "crastemp = frac(rastemp * (255.0f/256.0f)) * (256.0f/255.0f);\n"); + } + + + if (bpmem.tevorders[n/2].getEnable(n&1)) + { + if(!bHasIndStage) + { + // calc tevcord + if(bHasTexCoord) + WRITE(p, "tevcoord.xy = uv%d.xy;\n", texcoord); + else + WRITE(p, "tevcoord.xy = float2(0.0f, 0.0f);\n"); + } + + char *texswap = swapModeTable[bpmem.combiners[n].alphaC.tswap]; + int texmap = bpmem.tevorders[n/2].getTexMap(n&1); + SampleTexture(p, "textemp", "tevcoord", texswap, texmap, ApiType); + } + else + 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) + { + int kc = bpmem.tevksel[n / 2].getKC(n & 1); + int ka = bpmem.tevksel[n / 2].getKA(n & 1); + WRITE(p, "konsttemp = float4(%s, %s);\n", tevKSelTableC[kc], tevKSelTableA[ka]); + if(kc > 7 || ka > 7) + { + WRITE(p, "ckonsttemp = frac(konsttemp * (255.0f/256.0f)) * (256.0f/255.0f);\n"); + } + else + { + WRITE(p, "ckonsttemp = konsttemp;\n"); + } + } + + if(cc.a == TEVCOLORARG_CPREV || cc.a == TEVCOLORARG_APREV + || 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(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(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(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) + WRITE(p, "cc2 = frac(c2 * (255.0f/256.0f)) * (256.0f/255.0f);\n"); + + + WRITE(p, "// color combine\n"); + if (cc.clamp) + WRITE(p, "%s = saturate(", tevCOutputTable[cc.dest]); + else + WRITE(p, "%s = ", tevCOutputTable[cc.dest]); + + // combine the color channel + if (cc.bias != TevBias_COMPARE) // if not compare + { + //normal color combiner goes here + if (cc.shift > TEVSCALE_1) + WRITE(p, "%s*(", tevScaleTable[cc.shift]); + + if(!(cc.d == TEVCOLORARG_ZERO && cc.op == TEVOP_ADD)) + WRITE(p, "%s%s", tevCInputTable[cc.d], tevOpTable[cc.op]); + + if (cc.a == cc.b) + WRITE(p, "%s", tevCInputTable[cc.a + 16]); + else if (cc.c == TEVCOLORARG_ZERO) + WRITE(p, "%s", tevCInputTable[cc.a + 16]); + else if (cc.c == TEVCOLORARG_ONE) + WRITE(p, "%s", tevCInputTable[cc.b + 16]); + else if (cc.a == TEVCOLORARG_ZERO) + WRITE(p, "%s*%s", tevCInputTable[cc.b + 16], tevCInputTable[cc.c + 16]); + else if (cc.b == TEVCOLORARG_ZERO) + WRITE(p, "%s*(float3(1.0f, 1.0f, 1.0f)-%s)", tevCInputTable[cc.a + 16], tevCInputTable[cc.c + 16]); + else + WRITE(p, "lerp(%s, %s, %s)", tevCInputTable[cc.a + 16], tevCInputTable[cc.b + 16], tevCInputTable[cc.c + 16]); + + WRITE(p, "%s", tevBiasTable[cc.bias]); + + if (cc.shift > TEVSCALE_1) + WRITE(p, ")"); + } + else + { + int cmp = (cc.shift<<1)|cc.op|8; // comparemode stored here + WRITE(p, TEVCMPColorOPTable[cmp],//lookup the function from the op table + tevCInputTable[cc.d], + tevCInputTable[cc.a + 16], + tevCInputTable[cc.b + 16], + tevCInputTable[cc.c + 16]); + } + if (cc.clamp) + WRITE(p, ")"); + WRITE(p,";\n"); + + WRITE(p, "// alpha combine\n"); + // combine the alpha channel + if (ac.clamp) + WRITE(p, "%s = saturate(", tevAOutputTable[ac.dest]); + else + WRITE(p, "%s = ", tevAOutputTable[ac.dest]); + + if (ac.bias != TevBias_COMPARE) // if not compare + { + //normal alpha combiner goes here + if (ac.shift > TEVSCALE_1) + WRITE(p, "%s*(", tevScaleTable[ac.shift]); + + if(!(ac.d == TEVALPHAARG_ZERO && ac.op == TEVOP_ADD)) + WRITE(p, "%s.a%s", tevAInputTable[ac.d], tevOpTable[ac.op]); + + if (ac.a == ac.b) + WRITE(p, "%s.a", tevAInputTable[ac.a + 8]); + else if (ac.c == TEVALPHAARG_ZERO) + WRITE(p, "%s.a", tevAInputTable[ac.a + 8]); + else if (ac.a == TEVALPHAARG_ZERO) + WRITE(p, "%s.a*%s.a", tevAInputTable[ac.b + 8], tevAInputTable[ac.c + 8]); + else if (ac.b == TEVALPHAARG_ZERO) + WRITE(p, "%s.a*(1.0f-%s.a)", tevAInputTable[ac.a + 8], tevAInputTable[ac.c + 8]); + else + WRITE(p, "lerp(%s.a, %s.a, %s.a)", tevAInputTable[ac.a + 8], tevAInputTable[ac.b + 8], tevAInputTable[ac.c + 8]); + + WRITE(p, "%s",tevBiasTable[ac.bias]); + + if (ac.shift>0) + WRITE(p, ")"); + + } + else + { + //compare alpha combiner goes here + int cmp = (ac.shift<<1)|ac.op|8; // comparemode stored here + WRITE(p, TEVCMPAlphaOPTable[cmp], + tevAInputTable[ac.d], + tevAInputTable[ac.a + 8], + tevAInputTable[ac.b + 8], + tevAInputTable[ac.c + 8]); + } + if (ac.clamp) + WRITE(p, ")"); + WRITE(p, ";\n\n"); + WRITE(p, "// TEV done\n"); +} + +void SampleTexture(char *&p, const char *destination, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType) +{ + if (ApiType == API_D3D11) + WRITE(p, "%s=Tex%d.Sample(samp%d,%s.xy * "I_TEXDIMS"[%d].xy).%s;\n", destination, texmap,texmap, texcoords, texmap, texswap); + else + WRITE(p, "%s=tex2D(samp%d,%s.xy * "I_TEXDIMS"[%d].xy).%s;\n", destination, texmap, texcoords, texmap, texswap); +} + +static const char *tevAlphaFuncsTable[] = +{ + "(false)", //ALPHACMP_NEVER 0 + "(prev.a <= %s - (0.25f/255.0f))", //ALPHACMP_LESS 1 + "(abs( prev.a - %s ) < (0.5f/255.0f))", //ALPHACMP_EQUAL 2 + "(prev.a < %s + (0.25f/255.0f))", //ALPHACMP_LEQUAL 3 + "(prev.a >= %s + (0.25f/255.0f))", //ALPHACMP_GREATER 4 + "(abs( prev.a - %s ) >= (0.5f/255.0f))", //ALPHACMP_NEQUAL 5 + "(prev.a > %s - (0.25f/255.0f))", //ALPHACMP_GEQUAL 6 + "(true)" //ALPHACMP_ALWAYS 7 +}; + +static const char *tevAlphaFunclogicTable[] = +{ + " && ", // and + " || ", // or + " != ", // xor + " == " // xnor +}; +static 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 true; + if (comp[0] == ALPHACMP_NEVER || comp[1] == ALPHACMP_NEVER) return false; + 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; + break; + case 2: // XOR + if ((comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_NEVER) || (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_ALWAYS)) + return true; + if ((comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_ALWAYS) || (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_NEVER)) + return false; + break; + case 3: // XNOR + if ((comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_NEVER) || (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_ALWAYS)) + return false; + if ((comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_ALWAYS) || (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_NEVER)) + return true; + break; + default: PanicAlert("bad logic for alpha test? %08x", op); + } + return -1; +} + + +static bool WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode) +{ + static const char *alphaRef[2] = + { + I_ALPHA"[0].r", + I_ALPHA"[0].g" + }; + + int Pretest = AlphaPreTest(); + if(Pretest >= 0) + { + return Pretest != 0; + } + + // using discard then return works the same in cg and dx9 but not in dx11 + WRITE(p, "if(!( "); + + int compindex = bpmem.alphaFunc.comp0 % 8; + 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 + + compindex = bpmem.alphaFunc.comp1 % 8; + WRITE(p, tevAlphaFuncsTable[compindex],alphaRef[1]);//lookup the second component from the alpha function table + WRITE(p, ")){ocol0 = 0;%s%s discard;%s}\n", + dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND ? "ocol1 = 0;" : "", + DepthTextureEnable ? "depth = 1.f;" : "", + (ApiType != API_D3D11) ? "return;" : ""); + return true; +} + +static const char *tevFogFuncsTable[] = +{ + "", //No Fog + "", //? + "", //Linear + "", //? + " fog = 1.0f - pow(2.0f, -8.0f * fog);\n", //exp + " fog = 1.0f - pow(2.0f, -8.0f * fog * fog);\n", //exp2 + " fog = pow(2.0f, -8.0f * (1.0f - fog));\n", //backward exp + " fog = 1.0f - fog;\n fog = pow(2.0f, -8.0f * fog * fog);\n" //backward exp2 +}; + +static void WriteFog(char *&p) +{ + if(bpmem.fog.c_proj_fsel.fsel == 0)return;//no Fog + + if (bpmem.fog.c_proj_fsel.proj == 0) + { + // perspective + // ze = A/(B - (Zs >> B_SHF) + WRITE (p, " float ze = "I_FOG"[1].x / ("I_FOG"[1].y - (zCoord / "I_FOG"[1].w));\n"); + } + else + { + // orthographic + // ze = a*Zs (here, no B_SHF) + WRITE (p, " float ze = "I_FOG"[1].x * zCoord;\n"); + } + + // x_adjust = sqrt((x-center)^2 + k^2)/k + // ze *= x_adjust + //this is complitly teorical as the real hard seems to use a table intead of calculate the values. + if(bpmem.fogRange.Base.Enabled) + { + WRITE (p, " float x_adjust = (2.0f * (clipPos.x / "I_FOG"[2].y)) - 1.0f - "I_FOG"[2].x;\n"); + WRITE (p, " x_adjust = sqrt(x_adjust * x_adjust + "I_FOG"[2].z * "I_FOG"[2].z) / "I_FOG"[2].z;\n"); + WRITE (p, " ze *= x_adjust;\n"); + } + + WRITE (p, " float fog = saturate(ze - "I_FOG"[1].z);\n"); + + if(bpmem.fog.c_proj_fsel.fsel > 3) + { + WRITE(p, "%s", tevFogFuncsTable[bpmem.fog.c_proj_fsel.fsel]); + } + else + { + if(bpmem.fog.c_proj_fsel.fsel != 2) + WARN_LOG(VIDEO, "Unknown Fog Type! %08x", bpmem.fog.c_proj_fsel.fsel); + } + + WRITE(p, " prev.rgb = lerp(prev.rgb,"I_FOG"[0].rgb,fog);\n"); + + } \ No newline at end of file diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp index a492d5a201..8400fde9a5 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp @@ -1,503 +1,503 @@ -// 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 "NativeVertexFormat.h" - -#include "BPMemory.h" -#include "CPMemory.h" -#include "LightingShaderGen.h" -#include "VertexShaderGen.h" -#include "VideoConfig.h" - -VERTEXSHADERUID last_vertex_shader_uid; - -// Mash together all the inputs that contribute to the code of a generated vertex shader into -// a unique identifier, basically containing all the bits. Yup, it's a lot .... -void GetVertexShaderId(VERTEXSHADERUID *uid, u32 components) -{ - uid->values[0] = components | - (xfregs.numTexGen.numTexGens << 23) | - (xfregs.numChan.numColorChans << 27) | - (xfregs.dualTexTrans.enabled << 29); - - // TODO: If pixel lighting is enabled, do we even have to bother about storing lighting related registers here? - GetLightingShaderId(&uid->values[1]); - - uid->values[2] |= (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) << 31; - u32 *pcurvalue = &uid->values[3]; - for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) { - TexMtxInfo tinfo = xfregs.texMtxInfo[i]; - if (tinfo.texgentype != XF_TEXGEN_EMBOSS_MAP) - tinfo.hex &= 0x7ff; - if (tinfo.texgentype != XF_TEXGEN_REGULAR) - tinfo.projection = 0; - - u32 val = ((tinfo.hex >> 1) & 0x1ffff); - if (xfregs.dualTexTrans.enabled && tinfo.texgentype == XF_TEXGEN_REGULAR) { - // rewrite normalization and post index - val |= ((u32)xfregs.postMtxInfo[i].index << 17) | ((u32)xfregs.postMtxInfo[i].normalize << 23); - } - - switch (i & 3) { - case 0: pcurvalue[0] |= val; break; - case 1: pcurvalue[0] |= val << 24; pcurvalue[1] = val >> 8; ++pcurvalue; break; - case 2: pcurvalue[0] |= val << 16; pcurvalue[1] = val >> 16; ++pcurvalue; break; - case 3: pcurvalue[0] |= val << 8; ++pcurvalue; break; - } - } -} - -void GetSafeVertexShaderId(VERTEXSHADERUIDSAFE *uid, u32 components) -{ - // Just store all used registers here without caring whether we need all bits or less. - u32* ptr = uid->values; - *ptr++ = components; - *ptr++ = xfregs.numTexGen.hex; - *ptr++ = xfregs.numChan.hex; - *ptr++ = xfregs.dualTexTrans.hex; - - for (int i = 0; i < 2; ++i) { - *ptr++ = xfregs.color[i].hex; - *ptr++ = xfregs.alpha[i].hex; - } - *ptr++ = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting; - for (unsigned int i = 0; i < 8; ++i) { - *ptr++ = xfregs.texMtxInfo[i].hex; - *ptr++ = xfregs.postMtxInfo[i].hex; - } - _assert_((ptr - uid->values) == uid->GetNumValues()); -} - - -void ValidateVertexShaderIDs(API_TYPE api, VERTEXSHADERUIDSAFE old_id, const std::string& old_code, u32 components) -{ - if (!g_ActiveConfig.bEnableShaderDebugging) - return; - - VERTEXSHADERUIDSAFE new_id; - GetSafeVertexShaderId(&new_id, components); - - if (!(old_id == new_id)) - { - std::string new_code(GenerateVertexShaderCode(components, api)); - if (old_code != new_code) - { - _assert_(old_id.GetNumValues() == new_id.GetNumValues()); - - char msg[8192]; - char* ptr = msg; - ptr += sprintf(ptr, "Vertex shader IDs matched but unique IDs did not!\nUnique IDs (old <-> new):\n"); - const int N = new_id.GetNumValues(); - for (int i = 0; i < N/2; ++i) - ptr += sprintf(ptr, "%02d, %08X %08X | %08X %08X\n", 2*i, old_id.values[2*i], old_id.values[2*i+1], - new_id.values[2*i], new_id.values[2*i+1]); - if (N % 2) - ptr += sprintf(ptr, "%02d, %08X | %08X\n", N-1, old_id.values[N-1], new_id.values[N-1]); - - static int num_failures = 0; - char szTemp[MAX_PATH]; - sprintf(szTemp, "%svsuid_mismatch_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++); - std::ofstream file(szTemp); - file << msg; - file << "\n\nOld shader code:\n" << old_code; - file << "\n\nNew shader code:\n" << new_code; - file.close(); - - PanicAlert("Unique pixel shader ID mismatch!\n\nReport this to the devs, along with the contents of %s.", szTemp); - } - } -} - - -static char text[16384]; - -#define WRITE p+=sprintf - -char* GenerateVSOutputStruct(char* p, u32 components, API_TYPE api_type) -{ - WRITE(p, "struct VS_OUTPUT {\n"); - WRITE(p, " float4 pos : POSITION;\n"); - WRITE(p, " float4 colors_0 : COLOR0;\n"); - WRITE(p, " float4 colors_1 : COLOR1;\n"); - - if (xfregs.numTexGen.numTexGens < 7) { - for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) - WRITE(p, " float3 tex%d : TEXCOORD%d;\n", i, i); - WRITE(p, " float4 clipPos : TEXCOORD%d;\n", xfregs.numTexGen.numTexGens); - if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) - WRITE(p, " float4 Normal : TEXCOORD%d;\n", xfregs.numTexGen.numTexGens + 1); - } else { - // clip position is in w of first 4 texcoords - if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) - { - for (int i = 0; i < 8; ++i) - WRITE(p, " float4 tex%d : TEXCOORD%d;\n", i, i); - } - else - { - for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) - WRITE(p, " float%d tex%d : TEXCOORD%d;\n", i < 4 ? 4 : 3 , i, i); - } - } - WRITE(p, "};\n"); - - return p; -} - -const char *GenerateVertexShaderCode(u32 components, API_TYPE api_type) -{ - setlocale(LC_NUMERIC, "C"); // Reset locale for compilation - text[sizeof(text) - 1] = 0x7C; // canary - - _assert_(bpmem.genMode.numtexgens == xfregs.numTexGen.numTexGens); - _assert_(bpmem.genMode.numcolchans == xfregs.numChan.numColorChans); - - bool is_d3d = (api_type & API_D3D9 || api_type == API_D3D11); - u32 lightMask = 0; - if (xfregs.numChan.numColorChans > 0) - lightMask |= xfregs.color[0].GetFullLightMask() | xfregs.alpha[0].GetFullLightMask(); - if (xfregs.numChan.numColorChans > 1) - lightMask |= xfregs.color[1].GetFullLightMask() | xfregs.alpha[1].GetFullLightMask(); - - char *p = text; - WRITE(p, "//Vertex Shader: comp:%x, \n", components); - WRITE(p, "typedef struct { float4 T0, T1, T2; float4 N0, N1, N2; } s_"I_POSNORMALMATRIX";\n" - "typedef struct { float4 t; } FLT4;\n" - "typedef struct { FLT4 T[24]; } s_"I_TEXMATRICES";\n" - "typedef struct { FLT4 T[64]; } s_"I_TRANSFORMMATRICES";\n" - "typedef struct { FLT4 T[32]; } s_"I_NORMALMATRICES";\n" - "typedef struct { FLT4 T[64]; } s_"I_POSTTRANSFORMMATRICES";\n" - "typedef struct { float4 col; float4 cosatt; float4 distatt; float4 pos; float4 dir; } Light;\n" - "typedef struct { Light lights[8]; } s_"I_LIGHTS";\n" - "typedef struct { float4 C0, C1, C2, C3; } s_"I_MATERIALS";\n" - "typedef struct { float4 T0, T1, T2, T3; } s_"I_PROJECTION";\n" - ); - - p = GenerateVSOutputStruct(p, components, api_type); - - // uniforms - - WRITE(p, "uniform s_"I_TRANSFORMMATRICES" "I_TRANSFORMMATRICES" : register(c%d);\n", C_TRANSFORMMATRICES); - WRITE(p, "uniform s_"I_TEXMATRICES" "I_TEXMATRICES" : register(c%d);\n", C_TEXMATRICES); // also using tex matrices - WRITE(p, "uniform s_"I_NORMALMATRICES" "I_NORMALMATRICES" : register(c%d);\n", C_NORMALMATRICES); - WRITE(p, "uniform s_"I_POSNORMALMATRIX" "I_POSNORMALMATRIX" : register(c%d);\n", C_POSNORMALMATRIX); - WRITE(p, "uniform s_"I_POSTTRANSFORMMATRICES" "I_POSTTRANSFORMMATRICES" : register(c%d);\n", C_POSTTRANSFORMMATRICES); - WRITE(p, "uniform s_"I_LIGHTS" "I_LIGHTS" : register(c%d);\n", C_LIGHTS); - WRITE(p, "uniform s_"I_MATERIALS" "I_MATERIALS" : register(c%d);\n", C_MATERIALS); - WRITE(p, "uniform s_"I_PROJECTION" "I_PROJECTION" : register(c%d);\n", C_PROJECTION); - WRITE(p, "uniform float4 "I_DEPTHPARAMS" : register(c%d);\n", C_DEPTHPARAMS); - - WRITE(p, "VS_OUTPUT main(\n"); - - // inputs - if (components & VB_HAS_NRM0) - WRITE(p, " float3 rawnorm0 : NORMAL0,\n"); - if (components & VB_HAS_NRM1) { - if (is_d3d) - WRITE(p, " float3 rawnorm1 : NORMAL1,\n"); - else - WRITE(p, " float3 rawnorm1 : ATTR%d,\n", SHADER_NORM1_ATTRIB); - } - if (components & VB_HAS_NRM2) { - if (is_d3d) - WRITE(p, " float3 rawnorm2 : NORMAL2,\n"); - else - WRITE(p, " float3 rawnorm2 : ATTR%d,\n", SHADER_NORM2_ATTRIB); - } - if (components & VB_HAS_COL0) - WRITE(p, " float4 color0 : COLOR0,\n"); - if (components & VB_HAS_COL1) - WRITE(p, " float4 color1 : COLOR1,\n"); - for (int i = 0; i < 8; ++i) { - u32 hastexmtx = (components & (VB_HAS_TEXMTXIDX0<= 32 ? (posmtx-32) : posmtx;\n"); - WRITE(p, "float3 N0 = "I_NORMALMATRICES".T[normidx].t.xyz, N1 = "I_NORMALMATRICES".T[normidx+1].t.xyz, N2 = "I_NORMALMATRICES".T[normidx+2].t.xyz;\n"); - } - - if (components & VB_HAS_NRM0) - WRITE(p, "float3 _norm0 = normalize(float3(dot(N0, rawnorm0), dot(N1, rawnorm0), dot(N2, rawnorm0)));\n"); - if (components & VB_HAS_NRM1) - WRITE(p, "float3 _norm1 = float3(dot(N0, rawnorm1), dot(N1, rawnorm1), dot(N2, rawnorm1));\n"); - if (components & VB_HAS_NRM2) - WRITE(p, "float3 _norm2 = float3(dot(N0, rawnorm2), dot(N1, rawnorm2), dot(N2, rawnorm2));\n"); - } - else - { - WRITE(p, "float4 pos = float4(dot("I_POSNORMALMATRIX".T0, rawpos), dot("I_POSNORMALMATRIX".T1, rawpos), dot("I_POSNORMALMATRIX".T2, rawpos), 1.0f);\n"); - if (components & VB_HAS_NRM0) - WRITE(p, "float3 _norm0 = normalize(float3(dot("I_POSNORMALMATRIX".N0.xyz, rawnorm0), dot("I_POSNORMALMATRIX".N1.xyz, rawnorm0), dot("I_POSNORMALMATRIX".N2.xyz, rawnorm0)));\n"); - if (components & VB_HAS_NRM1) - WRITE(p, "float3 _norm1 = float3(dot("I_POSNORMALMATRIX".N0.xyz, rawnorm1), dot("I_POSNORMALMATRIX".N1.xyz, rawnorm1), dot("I_POSNORMALMATRIX".N2.xyz, rawnorm1));\n"); - if (components & VB_HAS_NRM2) - WRITE(p, "float3 _norm2 = float3(dot("I_POSNORMALMATRIX".N0.xyz, rawnorm2), dot("I_POSNORMALMATRIX".N1.xyz, rawnorm2), dot("I_POSNORMALMATRIX".N2.xyz, rawnorm2));\n"); - } - - if (!(components & VB_HAS_NRM0)) - WRITE(p, "float3 _norm0 = float3(0.0f, 0.0f, 0.0f);\n"); - - - - WRITE(p, "o.pos = float4(dot("I_PROJECTION".T0, pos), dot("I_PROJECTION".T1, pos), dot("I_PROJECTION".T2, pos), dot("I_PROJECTION".T3, pos));\n"); - - WRITE(p, "float4 mat, lacc;\n" - "float3 ldir, h;\n" - "float dist, dist2, attn;\n"); - - if(xfregs.numChan.numColorChans == 0) - { - if (components & VB_HAS_COL0) - WRITE(p, "o.colors_0 = color0;\n"); - else - WRITE(p, "o.colors_0 = float4(1.0f, 1.0f, 1.0f, 1.0f);\n"); - } - - // TODO: This probably isn't necessary if pixel lighting is enabled. - p = GenerateLightingShader(p, components, I_MATERIALS, I_LIGHTS, "color", "o.colors_"); - - if(xfregs.numChan.numColorChans < 2) - { - if (components & VB_HAS_COL1) - WRITE(p, "o.colors_1 = color1;\n"); - else - WRITE(p, "o.colors_1 = o.colors_0;\n"); - } - // special case if only pos and tex coord 0 and tex coord input is AB11 - // donko - this has caused problems in some games. removed for now. - bool texGenSpecialCase = false; - /*bool texGenSpecialCase = - ((g_VtxDesc.Hex & 0x60600L) == g_VtxDesc.Hex) && // only pos and tex coord 0 - (g_VtxDesc.Tex0Coord != NOT_PRESENT) && - (xfregs.texcoords[0].texmtxinfo.inputform == XF_TEXINPUT_AB11); - */ - - // transform texcoords - WRITE(p, "float4 coord = float4(0.0f, 0.0f, 1.0f, 1.0f);\n"); - for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) { - TexMtxInfo& texinfo = xfregs.texMtxInfo[i]; - - WRITE(p, "{\n"); - WRITE(p, "coord = float4(0.0f, 0.0f, 1.0f, 1.0f);\n"); - switch (texinfo.sourcerow) { - case XF_SRCGEOM_INROW: - _assert_( texinfo.inputform == XF_TEXINPUT_ABC1 ); - WRITE(p, "coord = rawpos;\n"); // pos.w is 1 - break; - case XF_SRCNORMAL_INROW: - if (components & VB_HAS_NRM0) { - _assert_( texinfo.inputform == XF_TEXINPUT_ABC1 ); - WRITE(p, "coord = float4(rawnorm0.xyz, 1.0f);\n"); - } - break; - case XF_SRCCOLORS_INROW: - _assert_( texinfo.texgentype == XF_TEXGEN_COLOR_STRGBC0 || texinfo.texgentype == XF_TEXGEN_COLOR_STRGBC1 ); - break; - case XF_SRCBINORMAL_T_INROW: - if (components & VB_HAS_NRM1) { - _assert_( texinfo.inputform == XF_TEXINPUT_ABC1 ); - WRITE(p, "coord = float4(rawnorm1.xyz, 1.0f);\n"); - } - break; - case XF_SRCBINORMAL_B_INROW: - if (components & VB_HAS_NRM2) { - _assert_( texinfo.inputform == XF_TEXINPUT_ABC1 ); - WRITE(p, "coord = float4(rawnorm2.xyz, 1.0f);\n"); - } - break; - 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); - break; - } - - // first transformation - switch (texinfo.texgentype) { - case XF_TEXGEN_EMBOSS_MAP: // calculate tex coords into bump map - - if (components & (VB_HAS_NRM1|VB_HAS_NRM2)) { - // transform the light dir into tangent space - WRITE(p, "ldir = normalize("I_LIGHTS".lights[%d].pos.xyz - pos.xyz);\n", texinfo.embosslightshift); - WRITE(p, "o.tex%d.xyz = o.tex%d.xyz + float3(dot(ldir, _norm1), dot(ldir, _norm2), 0.0f);\n", i, texinfo.embosssourceshift); - } - else - { - _assert_(0); // should have normals - WRITE(p, "o.tex%d.xyz = o.tex%d.xyz;\n", i, texinfo.embosssourceshift); - } - - break; - case XF_TEXGEN_COLOR_STRGBC0: - _assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW); - WRITE(p, "o.tex%d.xyz = float3(o.colors_0.x, o.colors_0.y, 1);\n", i); - break; - case XF_TEXGEN_COLOR_STRGBC1: - _assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW); - WRITE(p, "o.tex%d.xyz = float3(o.colors_1.x, o.colors_1.y, 1);\n", i); - break; - case XF_TEXGEN_REGULAR: - default: - if (components & (VB_HAS_TEXMTXIDX0< +#include + +#include "NativeVertexFormat.h" + +#include "BPMemory.h" +#include "CPMemory.h" +#include "LightingShaderGen.h" +#include "VertexShaderGen.h" +#include "VideoConfig.h" + +VERTEXSHADERUID last_vertex_shader_uid; + +// Mash together all the inputs that contribute to the code of a generated vertex shader into +// a unique identifier, basically containing all the bits. Yup, it's a lot .... +void GetVertexShaderId(VERTEXSHADERUID *uid, u32 components) +{ + uid->values[0] = components | + (xfregs.numTexGen.numTexGens << 23) | + (xfregs.numChan.numColorChans << 27) | + (xfregs.dualTexTrans.enabled << 29); + + // TODO: If pixel lighting is enabled, do we even have to bother about storing lighting related registers here? + GetLightingShaderId(&uid->values[1]); + + uid->values[2] |= (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) << 31; + u32 *pcurvalue = &uid->values[3]; + for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) { + TexMtxInfo tinfo = xfregs.texMtxInfo[i]; + if (tinfo.texgentype != XF_TEXGEN_EMBOSS_MAP) + tinfo.hex &= 0x7ff; + if (tinfo.texgentype != XF_TEXGEN_REGULAR) + tinfo.projection = 0; + + u32 val = ((tinfo.hex >> 1) & 0x1ffff); + if (xfregs.dualTexTrans.enabled && tinfo.texgentype == XF_TEXGEN_REGULAR) { + // rewrite normalization and post index + val |= ((u32)xfregs.postMtxInfo[i].index << 17) | ((u32)xfregs.postMtxInfo[i].normalize << 23); + } + + switch (i & 3) { + case 0: pcurvalue[0] |= val; break; + case 1: pcurvalue[0] |= val << 24; pcurvalue[1] = val >> 8; ++pcurvalue; break; + case 2: pcurvalue[0] |= val << 16; pcurvalue[1] = val >> 16; ++pcurvalue; break; + case 3: pcurvalue[0] |= val << 8; ++pcurvalue; break; + } + } +} + +void GetSafeVertexShaderId(VERTEXSHADERUIDSAFE *uid, u32 components) +{ + // Just store all used registers here without caring whether we need all bits or less. + u32* ptr = uid->values; + *ptr++ = components; + *ptr++ = xfregs.numTexGen.hex; + *ptr++ = xfregs.numChan.hex; + *ptr++ = xfregs.dualTexTrans.hex; + + for (int i = 0; i < 2; ++i) { + *ptr++ = xfregs.color[i].hex; + *ptr++ = xfregs.alpha[i].hex; + } + *ptr++ = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting; + for (unsigned int i = 0; i < 8; ++i) { + *ptr++ = xfregs.texMtxInfo[i].hex; + *ptr++ = xfregs.postMtxInfo[i].hex; + } + _assert_((ptr - uid->values) == uid->GetNumValues()); +} + + +void ValidateVertexShaderIDs(API_TYPE api, VERTEXSHADERUIDSAFE old_id, const std::string& old_code, u32 components) +{ + if (!g_ActiveConfig.bEnableShaderDebugging) + return; + + VERTEXSHADERUIDSAFE new_id; + GetSafeVertexShaderId(&new_id, components); + + if (!(old_id == new_id)) + { + std::string new_code(GenerateVertexShaderCode(components, api)); + if (old_code != new_code) + { + _assert_(old_id.GetNumValues() == new_id.GetNumValues()); + + char msg[8192]; + char* ptr = msg; + ptr += sprintf(ptr, "Vertex shader IDs matched but unique IDs did not!\nUnique IDs (old <-> new):\n"); + const int N = new_id.GetNumValues(); + for (int i = 0; i < N/2; ++i) + ptr += sprintf(ptr, "%02d, %08X %08X | %08X %08X\n", 2*i, old_id.values[2*i], old_id.values[2*i+1], + new_id.values[2*i], new_id.values[2*i+1]); + if (N % 2) + ptr += sprintf(ptr, "%02d, %08X | %08X\n", N-1, old_id.values[N-1], new_id.values[N-1]); + + static int num_failures = 0; + char szTemp[MAX_PATH]; + sprintf(szTemp, "%svsuid_mismatch_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++); + std::ofstream file(szTemp); + file << msg; + file << "\n\nOld shader code:\n" << old_code; + file << "\n\nNew shader code:\n" << new_code; + file.close(); + + PanicAlert("Unique pixel shader ID mismatch!\n\nReport this to the devs, along with the contents of %s.", szTemp); + } + } +} + + +static char text[16384]; + +#define WRITE p+=sprintf + +char* GenerateVSOutputStruct(char* p, u32 components, API_TYPE api_type) +{ + WRITE(p, "struct VS_OUTPUT {\n"); + WRITE(p, " float4 pos : POSITION;\n"); + WRITE(p, " float4 colors_0 : COLOR0;\n"); + WRITE(p, " float4 colors_1 : COLOR1;\n"); + + if (xfregs.numTexGen.numTexGens < 7) { + for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) + WRITE(p, " float3 tex%d : TEXCOORD%d;\n", i, i); + WRITE(p, " float4 clipPos : TEXCOORD%d;\n", xfregs.numTexGen.numTexGens); + if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) + WRITE(p, " float4 Normal : TEXCOORD%d;\n", xfregs.numTexGen.numTexGens + 1); + } else { + // clip position is in w of first 4 texcoords + if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) + { + for (int i = 0; i < 8; ++i) + WRITE(p, " float4 tex%d : TEXCOORD%d;\n", i, i); + } + else + { + for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) + WRITE(p, " float%d tex%d : TEXCOORD%d;\n", i < 4 ? 4 : 3 , i, i); + } + } + WRITE(p, "};\n"); + + return p; +} + +const char *GenerateVertexShaderCode(u32 components, API_TYPE api_type) +{ + setlocale(LC_NUMERIC, "C"); // Reset locale for compilation + text[sizeof(text) - 1] = 0x7C; // canary + + _assert_(bpmem.genMode.numtexgens == xfregs.numTexGen.numTexGens); + _assert_(bpmem.genMode.numcolchans == xfregs.numChan.numColorChans); + + bool is_d3d = (api_type & API_D3D9 || api_type == API_D3D11); + u32 lightMask = 0; + if (xfregs.numChan.numColorChans > 0) + lightMask |= xfregs.color[0].GetFullLightMask() | xfregs.alpha[0].GetFullLightMask(); + if (xfregs.numChan.numColorChans > 1) + lightMask |= xfregs.color[1].GetFullLightMask() | xfregs.alpha[1].GetFullLightMask(); + + char *p = text; + WRITE(p, "//Vertex Shader: comp:%x, \n", components); + WRITE(p, "typedef struct { float4 T0, T1, T2; float4 N0, N1, N2; } s_"I_POSNORMALMATRIX";\n" + "typedef struct { float4 t; } FLT4;\n" + "typedef struct { FLT4 T[24]; } s_"I_TEXMATRICES";\n" + "typedef struct { FLT4 T[64]; } s_"I_TRANSFORMMATRICES";\n" + "typedef struct { FLT4 T[32]; } s_"I_NORMALMATRICES";\n" + "typedef struct { FLT4 T[64]; } s_"I_POSTTRANSFORMMATRICES";\n" + "typedef struct { float4 col; float4 cosatt; float4 distatt; float4 pos; float4 dir; } Light;\n" + "typedef struct { Light lights[8]; } s_"I_LIGHTS";\n" + "typedef struct { float4 C0, C1, C2, C3; } s_"I_MATERIALS";\n" + "typedef struct { float4 T0, T1, T2, T3; } s_"I_PROJECTION";\n" + ); + + p = GenerateVSOutputStruct(p, components, api_type); + + // uniforms + + WRITE(p, "uniform s_"I_TRANSFORMMATRICES" "I_TRANSFORMMATRICES" : register(c%d);\n", C_TRANSFORMMATRICES); + WRITE(p, "uniform s_"I_TEXMATRICES" "I_TEXMATRICES" : register(c%d);\n", C_TEXMATRICES); // also using tex matrices + WRITE(p, "uniform s_"I_NORMALMATRICES" "I_NORMALMATRICES" : register(c%d);\n", C_NORMALMATRICES); + WRITE(p, "uniform s_"I_POSNORMALMATRIX" "I_POSNORMALMATRIX" : register(c%d);\n", C_POSNORMALMATRIX); + WRITE(p, "uniform s_"I_POSTTRANSFORMMATRICES" "I_POSTTRANSFORMMATRICES" : register(c%d);\n", C_POSTTRANSFORMMATRICES); + WRITE(p, "uniform s_"I_LIGHTS" "I_LIGHTS" : register(c%d);\n", C_LIGHTS); + WRITE(p, "uniform s_"I_MATERIALS" "I_MATERIALS" : register(c%d);\n", C_MATERIALS); + WRITE(p, "uniform s_"I_PROJECTION" "I_PROJECTION" : register(c%d);\n", C_PROJECTION); + WRITE(p, "uniform float4 "I_DEPTHPARAMS" : register(c%d);\n", C_DEPTHPARAMS); + + WRITE(p, "VS_OUTPUT main(\n"); + + // inputs + if (components & VB_HAS_NRM0) + WRITE(p, " float3 rawnorm0 : NORMAL0,\n"); + if (components & VB_HAS_NRM1) { + if (is_d3d) + WRITE(p, " float3 rawnorm1 : NORMAL1,\n"); + else + WRITE(p, " float3 rawnorm1 : ATTR%d,\n", SHADER_NORM1_ATTRIB); + } + if (components & VB_HAS_NRM2) { + if (is_d3d) + WRITE(p, " float3 rawnorm2 : NORMAL2,\n"); + else + WRITE(p, " float3 rawnorm2 : ATTR%d,\n", SHADER_NORM2_ATTRIB); + } + if (components & VB_HAS_COL0) + WRITE(p, " float4 color0 : COLOR0,\n"); + if (components & VB_HAS_COL1) + WRITE(p, " float4 color1 : COLOR1,\n"); + for (int i = 0; i < 8; ++i) { + u32 hastexmtx = (components & (VB_HAS_TEXMTXIDX0<= 32 ? (posmtx-32) : posmtx;\n"); + WRITE(p, "float3 N0 = "I_NORMALMATRICES".T[normidx].t.xyz, N1 = "I_NORMALMATRICES".T[normidx+1].t.xyz, N2 = "I_NORMALMATRICES".T[normidx+2].t.xyz;\n"); + } + + if (components & VB_HAS_NRM0) + WRITE(p, "float3 _norm0 = normalize(float3(dot(N0, rawnorm0), dot(N1, rawnorm0), dot(N2, rawnorm0)));\n"); + if (components & VB_HAS_NRM1) + WRITE(p, "float3 _norm1 = float3(dot(N0, rawnorm1), dot(N1, rawnorm1), dot(N2, rawnorm1));\n"); + if (components & VB_HAS_NRM2) + WRITE(p, "float3 _norm2 = float3(dot(N0, rawnorm2), dot(N1, rawnorm2), dot(N2, rawnorm2));\n"); + } + else + { + WRITE(p, "float4 pos = float4(dot("I_POSNORMALMATRIX".T0, rawpos), dot("I_POSNORMALMATRIX".T1, rawpos), dot("I_POSNORMALMATRIX".T2, rawpos), 1.0f);\n"); + if (components & VB_HAS_NRM0) + WRITE(p, "float3 _norm0 = normalize(float3(dot("I_POSNORMALMATRIX".N0.xyz, rawnorm0), dot("I_POSNORMALMATRIX".N1.xyz, rawnorm0), dot("I_POSNORMALMATRIX".N2.xyz, rawnorm0)));\n"); + if (components & VB_HAS_NRM1) + WRITE(p, "float3 _norm1 = float3(dot("I_POSNORMALMATRIX".N0.xyz, rawnorm1), dot("I_POSNORMALMATRIX".N1.xyz, rawnorm1), dot("I_POSNORMALMATRIX".N2.xyz, rawnorm1));\n"); + if (components & VB_HAS_NRM2) + WRITE(p, "float3 _norm2 = float3(dot("I_POSNORMALMATRIX".N0.xyz, rawnorm2), dot("I_POSNORMALMATRIX".N1.xyz, rawnorm2), dot("I_POSNORMALMATRIX".N2.xyz, rawnorm2));\n"); + } + + if (!(components & VB_HAS_NRM0)) + WRITE(p, "float3 _norm0 = float3(0.0f, 0.0f, 0.0f);\n"); + + + + WRITE(p, "o.pos = float4(dot("I_PROJECTION".T0, pos), dot("I_PROJECTION".T1, pos), dot("I_PROJECTION".T2, pos), dot("I_PROJECTION".T3, pos));\n"); + + WRITE(p, "float4 mat, lacc;\n" + "float3 ldir, h;\n" + "float dist, dist2, attn;\n"); + + if(xfregs.numChan.numColorChans == 0) + { + if (components & VB_HAS_COL0) + WRITE(p, "o.colors_0 = color0;\n"); + else + WRITE(p, "o.colors_0 = float4(1.0f, 1.0f, 1.0f, 1.0f);\n"); + } + + // TODO: This probably isn't necessary if pixel lighting is enabled. + p = GenerateLightingShader(p, components, I_MATERIALS, I_LIGHTS, "color", "o.colors_"); + + if(xfregs.numChan.numColorChans < 2) + { + if (components & VB_HAS_COL1) + WRITE(p, "o.colors_1 = color1;\n"); + else + WRITE(p, "o.colors_1 = o.colors_0;\n"); + } + // special case if only pos and tex coord 0 and tex coord input is AB11 + // donko - this has caused problems in some games. removed for now. + bool texGenSpecialCase = false; + /*bool texGenSpecialCase = + ((g_VtxDesc.Hex & 0x60600L) == g_VtxDesc.Hex) && // only pos and tex coord 0 + (g_VtxDesc.Tex0Coord != NOT_PRESENT) && + (xfregs.texcoords[0].texmtxinfo.inputform == XF_TEXINPUT_AB11); + */ + + // transform texcoords + WRITE(p, "float4 coord = float4(0.0f, 0.0f, 1.0f, 1.0f);\n"); + for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) { + TexMtxInfo& texinfo = xfregs.texMtxInfo[i]; + + WRITE(p, "{\n"); + WRITE(p, "coord = float4(0.0f, 0.0f, 1.0f, 1.0f);\n"); + switch (texinfo.sourcerow) { + case XF_SRCGEOM_INROW: + _assert_( texinfo.inputform == XF_TEXINPUT_ABC1 ); + WRITE(p, "coord = rawpos;\n"); // pos.w is 1 + break; + case XF_SRCNORMAL_INROW: + if (components & VB_HAS_NRM0) { + _assert_( texinfo.inputform == XF_TEXINPUT_ABC1 ); + WRITE(p, "coord = float4(rawnorm0.xyz, 1.0f);\n"); + } + break; + case XF_SRCCOLORS_INROW: + _assert_( texinfo.texgentype == XF_TEXGEN_COLOR_STRGBC0 || texinfo.texgentype == XF_TEXGEN_COLOR_STRGBC1 ); + break; + case XF_SRCBINORMAL_T_INROW: + if (components & VB_HAS_NRM1) { + _assert_( texinfo.inputform == XF_TEXINPUT_ABC1 ); + WRITE(p, "coord = float4(rawnorm1.xyz, 1.0f);\n"); + } + break; + case XF_SRCBINORMAL_B_INROW: + if (components & VB_HAS_NRM2) { + _assert_( texinfo.inputform == XF_TEXINPUT_ABC1 ); + WRITE(p, "coord = float4(rawnorm2.xyz, 1.0f);\n"); + } + break; + 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); + break; + } + + // first transformation + switch (texinfo.texgentype) { + case XF_TEXGEN_EMBOSS_MAP: // calculate tex coords into bump map + + if (components & (VB_HAS_NRM1|VB_HAS_NRM2)) { + // transform the light dir into tangent space + WRITE(p, "ldir = normalize("I_LIGHTS".lights[%d].pos.xyz - pos.xyz);\n", texinfo.embosslightshift); + WRITE(p, "o.tex%d.xyz = o.tex%d.xyz + float3(dot(ldir, _norm1), dot(ldir, _norm2), 0.0f);\n", i, texinfo.embosssourceshift); + } + else + { + _assert_(0); // should have normals + WRITE(p, "o.tex%d.xyz = o.tex%d.xyz;\n", i, texinfo.embosssourceshift); + } + + break; + case XF_TEXGEN_COLOR_STRGBC0: + _assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW); + WRITE(p, "o.tex%d.xyz = float3(o.colors_0.x, o.colors_0.y, 1);\n", i); + break; + case XF_TEXGEN_COLOR_STRGBC1: + _assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW); + WRITE(p, "o.tex%d.xyz = float3(o.colors_1.x, o.colors_1.y, 1);\n", i); + break; + case XF_TEXGEN_REGULAR: + default: + if (components & (VB_HAS_TEXMTXIDX0< Date: Thu, 29 Sep 2011 23:32:05 +0200 Subject: [PATCH 057/381] Clean up various things. --- Source/Core/Common/Src/LinearDiskCache.h | 2 +- .../Core/VideoCommon/Src/PixelShaderGen.cpp | 19 ++++++---- Source/Core/VideoCommon/Src/PixelShaderGen.h | 17 +++------ .../Core/VideoCommon/Src/VertexShaderGen.cpp | 4 +- Source/Core/VideoCommon/Src/VertexShaderGen.h | 3 -- .../Plugin_VideoDX11/Src/PixelShaderCache.cpp | 2 +- .../Src/VertexShaderCache.cpp | 2 +- .../Plugin_VideoDX9/Src/PixelShaderCache.cpp | 2 +- .../Plugin_VideoDX9/Src/VertexShaderCache.cpp | 2 +- .../Plugin_VideoOGL/Src/PixelShaderCache.cpp | 37 +++++++++---------- .../Plugin_VideoOGL/Src/PixelShaderCache.h | 5 ++- .../Plugin_VideoOGL/Src/VertexShaderCache.cpp | 31 +++++++++------- .../Plugin_VideoOGL/Src/VertexShaderCache.h | 8 ++-- 13 files changed, 65 insertions(+), 69 deletions(-) diff --git a/Source/Core/Common/Src/LinearDiskCache.h b/Source/Core/Common/Src/LinearDiskCache.h index a2f758b416..450392e70a 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 = 6965 + LINEAR_DISKCACHE_VER = 6966 }; // On disk format: diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index f52c6b4190..1726855d54 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -27,8 +27,6 @@ #include "VideoConfig.h" #include "NativeVertexFormat.h" -PIXELSHADERUID last_pixel_shader_uid; - static int AlphaPreTest(); static void StageHash(int stage, u32* out) @@ -104,8 +102,9 @@ static void StageHash(int stage, u32* out) // a unique identifier, basically containing all the bits. Yup, it's a lot .... // It would likely be a lot more efficient to build this incrementally as the attributes // are set... -void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode) +void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 components) { + memset(uid->values, 0, sizeof(uid->values)); uid->values[0] |= bpmem.genMode.numtevstages; // 4 uid->values[0] |= bpmem.genMode.numtexgens << 4; // 4 uid->values[0] |= dstAlphaMode << 8; // 2 @@ -192,13 +191,17 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode) ++ptr; if (enablePL) + { ptr += GetLightingShaderId(ptr); + *ptr++ = components; + } uid->num_values = ptr - uid->values; } -void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode) +void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode, u32 components) { + memset(uid->values, 0, sizeof(uid->values)); u32* ptr = uid->values; *ptr++ = dstAlphaMode; // 0 *ptr++ = bpmem.genMode.hex; // 1 @@ -211,11 +214,11 @@ void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode) if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) { - // TODO: Include register states for lighting shader *ptr++ = xfregs.color[0].hex; *ptr++ = xfregs.alpha[0].hex; *ptr++ = xfregs.color[1].hex; *ptr++ = xfregs.alpha[1].hex; + *ptr++ = components; } for (unsigned int i = 0; i < 8; ++i) @@ -251,7 +254,7 @@ void ValidatePixelShaderIDs(API_TYPE api, PIXELSHADERUIDSAFE old_id, const std:: return; PIXELSHADERUIDSAFE new_id; - GetSafePixelShaderId(&new_id, dstAlphaMode); + GetSafePixelShaderId(&new_id, dstAlphaMode, components); if (!(old_id == new_id)) { @@ -874,13 +877,13 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType) } else if (bpmem.tevind[n].mid <= 7 && bHasTexCoord) { // s matrix - // TODO: Might become negative? + _assert_(bpmem.tevind[n].mid >= 5); int mtxidx = 2*(bpmem.tevind[n].mid-5); WRITE(p, "float2 indtevtrans%d = "I_INDTEXMTX"[%d].ww * uv%d.xy * indtevcrd%d.xx;\n", n, mtxidx, texcoord, n); } else if (bpmem.tevind[n].mid <= 11 && bHasTexCoord) { // t matrix - // TODO: Might become negative? + _assert_(bpmem.tevind[n].mid >= 9); int mtxidx = 2*(bpmem.tevind[n].mid-9); WRITE(p, "float2 indtevtrans%d = "I_INDTEXMTX"[%d].ww * uv%d.xy * indtevcrd%d.yy;\n", n, mtxidx, texcoord, n); } diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h index b24b656784..31242a916e 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.h +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h @@ -44,8 +44,8 @@ #define C_PLIGHTS (C_FOG + 3) #define C_PMATERIALS (C_PLIGHTS + 40) #define C_PENVCONST_END (C_PMATERIALS + 4) -#define PIXELSHADERUID_MAX_VALUES 69 -#define PIXELSHADERUID_MAX_VALUES_SAFE 117 +#define PIXELSHADERUID_MAX_VALUES 70 +#define PIXELSHADERUID_MAX_VALUES_SAFE 120 // DO NOT make anything in this class virtual. template @@ -53,14 +53,10 @@ class _PIXELSHADERUID { public: u32 values[safe ? PIXELSHADERUID_MAX_VALUES_SAFE : PIXELSHADERUID_MAX_VALUES]; - u16 num_values; + int num_values; _PIXELSHADERUID() { - memset(values, 0, sizeof(values)); - - if (safe) num_values = sizeof(values) / sizeof(values[0]); - else num_values = 0; } _PIXELSHADERUID(const _PIXELSHADERUID& r) @@ -119,13 +115,10 @@ enum DSTALPHA_MODE const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components); -// TODO: Wtf, those need components as well! -.- -void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode); -void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode); +void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 components); +void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode, u32 components); // Used to make sure that our optimized pixel shader IDs don't lose any possible shader code changes void ValidatePixelShaderIDs(API_TYPE api, PIXELSHADERUIDSAFE old_id, const std::string& old_code, DSTALPHA_MODE dstAlphaMode, u32 components); -extern PIXELSHADERUID last_pixel_shader_uid; - #endif // GCOGL_PIXELSHADER_H diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp index 8400fde9a5..5076f9f044 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp @@ -26,12 +26,11 @@ #include "VertexShaderGen.h" #include "VideoConfig.h" -VERTEXSHADERUID last_vertex_shader_uid; - // Mash together all the inputs that contribute to the code of a generated vertex shader into // a unique identifier, basically containing all the bits. Yup, it's a lot .... void GetVertexShaderId(VERTEXSHADERUID *uid, u32 components) { + memset(uid->values, 0, sizeof(uid->values)); uid->values[0] = components | (xfregs.numTexGen.numTexGens << 23) | (xfregs.numChan.numColorChans << 27) | @@ -67,6 +66,7 @@ void GetVertexShaderId(VERTEXSHADERUID *uid, u32 components) void GetSafeVertexShaderId(VERTEXSHADERUIDSAFE *uid, u32 components) { // Just store all used registers here without caring whether we need all bits or less. + memset(uid->values, 0, sizeof(uid->values)); u32* ptr = uid->values; *ptr++ = components; *ptr++ = xfregs.numTexGen.hex; diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.h b/Source/Core/VideoCommon/Src/VertexShaderGen.h index 0680be3c86..0c522286b1 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderGen.h +++ b/Source/Core/VideoCommon/Src/VertexShaderGen.h @@ -57,7 +57,6 @@ public: _VERTEXSHADERUID() { - memset(values, 0, sizeof(values)); } _VERTEXSHADERUID(const _VERTEXSHADERUID& r) @@ -116,6 +115,4 @@ void GetSafeVertexShaderId(VERTEXSHADERUIDSAFE *uid, u32 components); // Used to make sure that our optimized vertex shader IDs don't lose any possible shader code changes void ValidateVertexShaderIDs(API_TYPE api, VERTEXSHADERUIDSAFE old_id, const std::string& old_code, u32 components); -extern VERTEXSHADERUID last_vertex_shader_uid; - #endif // GCOGL_VERTEXSHADER_H diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp index 0a67584409..656f8ddff2 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp @@ -413,7 +413,7 @@ void PixelShaderCache::Init() PixelShaderCacheInserter inserter; g_ps_disk_cache.OpenAndRead(cache_filename, inserter); - if (g_Config.bEnableShaderDebugging) // TODO: Hacks.. + if (g_Config.bEnableShaderDebugging) Clear(); } diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp index c81993e5e1..a12acfedfd 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp @@ -175,7 +175,7 @@ void VertexShaderCache::Init() VertexShaderCacheInserter inserter; g_vs_disk_cache.OpenAndRead(cache_filename, inserter); - if (g_Config.bEnableShaderDebugging) // TODO: Hacks.. + if (g_Config.bEnableShaderDebugging) Clear(); } diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp index 7f2cdfceee..34d1c37594 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp @@ -284,7 +284,7 @@ void PixelShaderCache::Init() PixelShaderCacheInserter inserter; g_ps_disk_cache.OpenAndRead(cache_filename, inserter); - if (g_Config.bEnableShaderDebugging) // TODO: Hacks.. + if (g_Config.bEnableShaderDebugging) Clear(); } diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp index 3ef18ffba8..5458157d80 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp @@ -152,7 +152,7 @@ void VertexShaderCache::Init() VertexShaderCacheInserter inserter; g_vs_disk_cache.OpenAndRead(cache_filename, inserter); - if (g_Config.bEnableShaderDebugging) // TODO: Hacks.. + if (g_Config.bEnableShaderDebugging) Clear(); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp index b76ce4ca9a..050b378d2f 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp @@ -44,7 +44,8 @@ bool PixelShaderCache::s_displayCompileAlert; GLuint PixelShaderCache::CurrentShader; bool PixelShaderCache::ShaderEnabled; -static FRAGMENTSHADER* pShaderLast = NULL; +PixelShaderCache::PSCacheEntry* PixelShaderCache::last_entry = NULL; +PIXELSHADERUID PixelShaderCache::last_uid; GLuint PixelShaderCache::GetDepthMatrixProgram() { @@ -61,10 +62,9 @@ void PixelShaderCache::Init() glEnable(GL_FRAGMENT_PROGRAM_ARB); ShaderEnabled = true; CurrentShader = 0; + last_entry = NULL; GL_REPORT_ERRORD(); - memset(&last_pixel_shader_uid, 0xFF, sizeof(last_pixel_shader_uid)); - s_displayCompileAlert = true; glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB, (GLint *)&s_nMaxPixelInstructions); @@ -184,41 +184,40 @@ void PixelShaderCache::Shutdown() FRAGMENTSHADER* PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) { PIXELSHADERUID uid; - GetPixelShaderId(&uid, dstAlphaMode); + GetPixelShaderId(&uid, dstAlphaMode, components); - // Check if the shader is already set - TODO: Use pShaderLast instead of PixelShaders[uid]? - if (uid == last_pixel_shader_uid && PixelShaders[uid].frameCount == frameCount) + // Check if the shader is already set + if (last_entry) { - GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true); - ValidatePixelShaderIDs(API_OPENGL, PixelShaders[uid].safe_uid, PixelShaders[uid].shader.strprog, dstAlphaMode, components); - return pShaderLast; + if (uid == last_uid) + { + GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true); + ValidatePixelShaderIDs(API_OPENGL, last_entry->safe_uid, last_entry->shader.strprog, dstAlphaMode, components); + return &last_entry->shader; + } } - memcpy(&last_pixel_shader_uid, &uid, sizeof(PIXELSHADERUID)); + last_uid = uid; PSCache::iterator iter = PixelShaders.find(uid); - if (iter != PixelShaders.end()) { - iter->second.frameCount = frameCount; PSCacheEntry &entry = iter->second; - if (&entry.shader != pShaderLast) - pShaderLast = &entry.shader; + last_entry = &entry; GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true); ValidatePixelShaderIDs(API_OPENGL, entry.safe_uid, entry.shader.strprog, dstAlphaMode, components); - return pShaderLast; + return &last_entry->shader; } // Make an entry in the table PSCacheEntry& newentry = PixelShaders[uid]; - newentry.frameCount = frameCount; - pShaderLast = &newentry.shader; + last_entry = &newentry; const char *code = GeneratePixelShaderCode(dstAlphaMode, API_OPENGL, components); if (g_ActiveConfig.bEnableShaderDebugging && code) { - GetSafePixelShaderId(&newentry.safe_uid, dstAlphaMode); + GetSafePixelShaderId(&newentry.safe_uid, dstAlphaMode, components); newentry.shader.strprog = code; } @@ -240,7 +239,7 @@ FRAGMENTSHADER* PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 comp INCSTAT(stats.numPixelShadersCreated); SETSTAT(stats.numPixelShadersAlive, PixelShaders.size()); GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true); - return pShaderLast; + return &last_entry->shader; } bool PixelShaderCache::CompilePixelShader(FRAGMENTSHADER& ps, const char* pstrprogram) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h index 2aac23a7e5..f528eeb35b 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h @@ -47,8 +47,7 @@ class PixelShaderCache struct PSCacheEntry { FRAGMENTSHADER shader; - int frameCount; - PSCacheEntry() : frameCount(0) {} + PSCacheEntry() {} ~PSCacheEntry() {} void Destroy() { @@ -66,6 +65,8 @@ class PixelShaderCache static bool s_displayCompileAlert; static GLuint CurrentShader; + static PSCacheEntry* last_entry; + static PIXELSHADERUID last_uid; static bool ShaderEnabled; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp index d922ef63db..dbbb7ee29b 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp @@ -41,7 +41,9 @@ VertexShaderCache::VSCache VertexShaderCache::vshaders; GLuint VertexShaderCache::CurrentShader; bool VertexShaderCache::ShaderEnabled; -static VERTEXSHADER *pShaderLast = NULL; +VertexShaderCache::VSCacheEntry* VertexShaderCache::last_entry = NULL; +VERTEXSHADERUID VertexShaderCache::last_uid; + static int s_nMaxVertexInstructions; @@ -50,7 +52,7 @@ void VertexShaderCache::Init() glEnable(GL_VERTEX_PROGRAM_ARB); ShaderEnabled = true; CurrentShader = 0; - memset(&last_vertex_shader_uid, 0xFF, sizeof(last_vertex_shader_uid)); + last_entry = NULL; glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB, (GLint *)&s_nMaxVertexInstructions); if (strstr((const char*)glGetString(GL_VENDOR), "Humper") != NULL) s_nMaxVertexInstructions = 4096; @@ -74,31 +76,32 @@ VERTEXSHADER* VertexShaderCache::SetShader(u32 components) { VERTEXSHADERUID uid; GetVertexShaderId(&uid, components); - if (uid == last_vertex_shader_uid && vshaders[uid].frameCount == frameCount) + if (last_entry) { - GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true); - ValidateVertexShaderIDs(API_OPENGL, vshaders[uid].safe_uid, vshaders[uid].shader.strprog, components); - return pShaderLast; + if (uid == last_uid) + { + GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true); + ValidateVertexShaderIDs(API_OPENGL, vshaders[uid].safe_uid, vshaders[uid].shader.strprog, components); + return &last_entry->shader; + } } - memcpy(&last_vertex_shader_uid, &uid, sizeof(VERTEXSHADERUID)); + + last_uid = uid; VSCache::iterator iter = vshaders.find(uid); if (iter != vshaders.end()) { - iter->second.frameCount = frameCount; VSCacheEntry &entry = iter->second; - if (&entry.shader != pShaderLast) - pShaderLast = &entry.shader; + last_entry = &entry; GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true); ValidateVertexShaderIDs(API_OPENGL, entry.safe_uid, entry.shader.strprog, components); - return pShaderLast; + return &last_entry->shader; } // Make an entry in the table VSCacheEntry& entry = vshaders[uid]; - entry.frameCount = frameCount; - pShaderLast = &entry.shader; + last_entry = &entry; const char *code = GenerateVertexShaderCode(components, API_OPENGL); GetSafeVertexShaderId(&entry.safe_uid, components); @@ -120,7 +123,7 @@ VERTEXSHADER* VertexShaderCache::SetShader(u32 components) INCSTAT(stats.numVertexShadersCreated); SETSTAT(stats.numVertexShadersAlive, vshaders.size()); GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true); - return pShaderLast; + return &last_entry->shader; } bool VertexShaderCache::CompileVertexShader(VERTEXSHADER& vs, const char* pstrprogram) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h index 1711d42a63..6f4cbe25c2 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h @@ -32,9 +32,7 @@ struct VERTEXSHADER VERTEXSHADER() : glprogid(0) {} GLuint glprogid; // opengl program id -//#if defined(_DEBUG) || defined(DEBUGFAST) std::string strprog; -//#endif }; class VertexShaderCache @@ -43,8 +41,7 @@ class VertexShaderCache { VERTEXSHADER shader; VERTEXSHADERUIDSAFE safe_uid; - int frameCount; - VSCacheEntry() : frameCount(0) {} + VSCacheEntry() {} void Destroy() { // printf("Destroying vs %i\n", shader.glprogid); glDeleteProgramsARB(1, &shader.glprogid); @@ -56,6 +53,9 @@ class VertexShaderCache static VSCache vshaders; + static VSCacheEntry* last_entry; + static VERTEXSHADERUID last_uid; + static GLuint CurrentShader; static bool ShaderEnabled; From 2b3b32872d2a01aba7195dc31a5270cf9613f5c1 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Thu, 29 Sep 2011 22:54:52 +0200 Subject: [PATCH 058/381] Fix Windows build. --- .../Plugin_VideoDX11/Src/PixelShaderCache.cpp | 25 +++++++++++-------- .../Plugin_VideoDX11/Src/PixelShaderCache.h | 4 +-- .../Src/VertexShaderCache.cpp | 20 +++++++++------ .../Plugin_VideoDX11/Src/VertexShaderCache.h | 4 +-- .../Plugin_VideoDX9/Src/PixelShaderCache.cpp | 25 +++++++++++-------- .../Plugin_VideoDX9/Src/PixelShaderCache.h | 4 +-- .../Plugin_VideoDX9/Src/VertexShaderCache.cpp | 20 +++++++++------ .../Plugin_VideoDX9/Src/VertexShaderCache.h | 8 +++--- 8 files changed, 64 insertions(+), 46 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp index 656f8ddff2..7e4af031bd 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp @@ -41,6 +41,7 @@ namespace DX11 PixelShaderCache::PSCache PixelShaderCache::PixelShaders; const PixelShaderCache::PSCacheEntry* PixelShaderCache::last_entry; +PIXELSHADERUID PixelShaderCache::last_uid; LinearDiskCache g_ps_disk_cache; @@ -415,6 +416,8 @@ void PixelShaderCache::Init() if (g_Config.bEnableShaderDebugging) Clear(); + + last_entry = NULL; } // ONLY to be used during shutdown. @@ -423,6 +426,8 @@ void PixelShaderCache::Clear() for (PSCache::iterator iter = PixelShaders.begin(); iter != PixelShaders.end(); iter++) iter->second.Destroy(); PixelShaders.clear(); + + last_entry = NULL; } // Used in Swap() when AA mode has changed @@ -457,25 +462,26 @@ void PixelShaderCache::Shutdown() bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) { PIXELSHADERUID uid; - GetPixelShaderId(&uid, dstAlphaMode); + GetPixelShaderId(&uid, dstAlphaMode, components); // Check if the shader is already set - if (uid == last_pixel_shader_uid && PixelShaders[uid].frameCount == frameCount) + if (last_entry) { - PSCache::const_iterator iter = PixelShaders.find(uid); - GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE,true); - ValidatePixelShaderIDs(API_D3D11, PixelShaders[uid].safe_uid, PixelShaders[uid].code, dstAlphaMode, components); - return (iter != PixelShaders.end() && iter->second.shader); + if (uid == last_uid) + { + GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE,true); + ValidatePixelShaderIDs(API_D3D11, last_entry->safe_uid, last_entry->code, dstAlphaMode, components); + return (last_entry->shader != NULL); + } } - memcpy(&last_pixel_shader_uid, &uid, sizeof(PIXELSHADERUID)); + last_uid = uid; // Check if the shader is already in the cache PSCache::iterator iter; iter = PixelShaders.find(uid); if (iter != PixelShaders.end()) { - iter->second.frameCount = frameCount; const PSCacheEntry &entry = iter->second; last_entry = &entry; @@ -504,7 +510,7 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) if (g_ActiveConfig.bEnableShaderDebugging && success) { PixelShaders[uid].code = code; - GetSafePixelShaderId(&PixelShaders[uid].safe_uid, dstAlphaMode); + GetSafePixelShaderId(&PixelShaders[uid].safe_uid, dstAlphaMode, components); } GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true); @@ -523,7 +529,6 @@ bool PixelShaderCache::InsertByteCode(const PIXELSHADERUID &uid, const void* byt // Make an entry in the table PSCacheEntry newentry; newentry.shader = shader; - newentry.frameCount = frameCount; PixelShaders[uid] = newentry; last_entry = &PixelShaders[uid]; diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h index f5a9cf34b8..874a47e4c1 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h +++ b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h @@ -53,12 +53,11 @@ private: struct PSCacheEntry { ID3D11PixelShader* shader; - int frameCount; PIXELSHADERUIDSAFE safe_uid; std::string code; - PSCacheEntry() : shader(NULL), frameCount(0) {} + PSCacheEntry() : shader(NULL) {} void Destroy() { SAFE_RELEASE(shader); } }; @@ -66,6 +65,7 @@ private: static PSCache PixelShaders; static const PSCacheEntry* last_entry; + static PIXELSHADERUID last_uid; }; } // namespace DX11 diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp index a12acfedfd..d9dae4cf91 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp @@ -37,6 +37,7 @@ namespace DX11 { VertexShaderCache::VSCache VertexShaderCache::vshaders; const VertexShaderCache::VSCacheEntry *VertexShaderCache::last_entry; +VERTEXSHADERUID VertexShaderCache::last_uid; static ID3D11VertexShader* SimpleVertexShader = NULL; static ID3D11VertexShader* ClearVertexShader = NULL; @@ -177,6 +178,8 @@ void VertexShaderCache::Init() if (g_Config.bEnableShaderDebugging) Clear(); + + last_entry = NULL; } void VertexShaderCache::Clear() @@ -184,6 +187,8 @@ void VertexShaderCache::Clear() for (VSCache::iterator iter = vshaders.begin(); iter != vshaders.end(); ++iter) iter->second.Destroy(); vshaders.clear(); + + last_entry = NULL; } void VertexShaderCache::Shutdown() @@ -205,19 +210,21 @@ bool VertexShaderCache::SetShader(u32 components) { VERTEXSHADERUID uid; GetVertexShaderId(&uid, components); - if (uid == last_vertex_shader_uid && vshaders[uid].frameCount == frameCount) + if (last_entry) { - GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true); - ValidateVertexShaderIDs(API_D3D11, vshaders[uid].safe_uid, vshaders[uid].code, components); - return (vshaders[uid].shader != NULL); + if (uid == last_uid) + { + GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true); + ValidateVertexShaderIDs(API_D3D11, last_entry->safe_uid, last_entry->code, components); + return (last_entry->shader != NULL); + } } - memcpy(&last_vertex_shader_uid, &uid, sizeof(VERTEXSHADERUID)); + last_uid = uid; VSCache::iterator iter = vshaders.find(uid); if (iter != vshaders.end()) { - iter->second.frameCount = frameCount; const VSCacheEntry &entry = iter->second; last_entry = &entry; @@ -264,7 +271,6 @@ bool VertexShaderCache::InsertByteCode(const VERTEXSHADERUID &uid, D3DBlob* bcod // Make an entry in the table VSCacheEntry entry; entry.shader = shader; - entry.frameCount = frameCount; entry.SetByteCode(bcodeblob); vshaders[uid] = entry; diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h index d614989b0a..6d9537606a 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h +++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h @@ -51,12 +51,11 @@ private: { ID3D11VertexShader* shader; D3DBlob* bytecode; // needed to initialize the input layout - int frameCount; VERTEXSHADERUIDSAFE safe_uid; std::string code; - VSCacheEntry() : shader(NULL), bytecode(NULL), frameCount(0) {} + VSCacheEntry() : shader(NULL), bytecode(NULL) {} void SetByteCode(D3DBlob* blob) { SAFE_RELEASE(bytecode); @@ -73,6 +72,7 @@ private: static VSCache vshaders; static const VSCacheEntry* last_entry; + static VERTEXSHADERUID last_uid; }; } // namespace DX11 diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp index 34d1c37594..14943e8f8f 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp @@ -43,6 +43,7 @@ namespace DX9 PixelShaderCache::PSCache PixelShaderCache::PixelShaders; const PixelShaderCache::PSCacheEntry *PixelShaderCache::last_entry; +PIXELSHADERUID PixelShaderCache::last_uid; static LinearDiskCache g_ps_disk_cache; static std::set unique_shaders; @@ -233,6 +234,8 @@ static LPDIRECT3DPIXELSHADER9 CreateCopyShader(int copyMatrixType, int depthConv void PixelShaderCache::Init() { + last_entry = NULL; + //program used for clear screen { char pprog[3072]; @@ -295,7 +298,7 @@ void PixelShaderCache::Clear() iter->second.Destroy(); PixelShaders.clear(); - memset(&last_pixel_shader_uid, 0xFF, sizeof(last_pixel_shader_uid)); + last_entry = NULL; } void PixelShaderCache::Shutdown() @@ -331,25 +334,26 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) { const API_TYPE api = ((D3D::GetCaps().PixelShaderVersion >> 8) & 0xFF) < 3 ? API_D3D9_SM20 : API_D3D9_SM30; PIXELSHADERUID uid; - GetPixelShaderId(&uid, dstAlphaMode); + GetPixelShaderId(&uid, dstAlphaMode, components); // Check if the shader is already set - if (uid == last_pixel_shader_uid && PixelShaders[uid].frameCount == frameCount) + if (last_entry) { - PSCache::const_iterator iter = PixelShaders.find(uid); - GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true); - ValidatePixelShaderIDs(api, PixelShaders[uid].safe_uid, PixelShaders[uid].code, dstAlphaMode, components); - return (iter != PixelShaders.end() && iter->second.shader); + if (uid == last_uid) + { + GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true); + ValidatePixelShaderIDs(api, last_entry->safe_uid, last_entry->code, dstAlphaMode, components); + return last_entry->shader != NULL; + } } - memcpy(&last_pixel_shader_uid, &uid, sizeof(PIXELSHADERUID)); + last_uid = uid; // Check if the shader is already in the cache PSCache::iterator iter; iter = PixelShaders.find(uid); if (iter != PixelShaders.end()) { - iter->second.frameCount = frameCount; const PSCacheEntry &entry = iter->second; last_entry = &entry; @@ -398,7 +402,7 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) if (g_ActiveConfig.bEnableShaderDebugging && success) { PixelShaders[uid].code = code; - GetSafePixelShaderId(&PixelShaders[uid].safe_uid, dstAlphaMode); + GetSafePixelShaderId(&PixelShaders[uid].safe_uid, dstAlphaMode, components); } GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true); @@ -412,7 +416,6 @@ bool PixelShaderCache::InsertByteCode(const PIXELSHADERUID &uid, const u8 *bytec // Make an entry in the table PSCacheEntry newentry; newentry.shader = shader; - newentry.frameCount = frameCount; PixelShaders[uid] = newentry; last_entry = &PixelShaders[uid]; diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.h b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.h index d323311fe0..c771984d36 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.h +++ b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.h @@ -40,12 +40,11 @@ private: { LPDIRECT3DPIXELSHADER9 shader; bool owns_shader; - int frameCount; PIXELSHADERUIDSAFE safe_uid; std::string code; - PSCacheEntry() : shader(NULL), owns_shader(true), frameCount(0) {} + PSCacheEntry() : shader(NULL), owns_shader(true) {} void Destroy() { if (shader && owns_shader) @@ -58,6 +57,7 @@ private: static PSCache PixelShaders; static const PSCacheEntry *last_entry; + static PIXELSHADERUID last_uid; static void Clear(); public: diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp index 5458157d80..9448c07371 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp @@ -38,6 +38,7 @@ namespace DX9 VertexShaderCache::VSCache VertexShaderCache::vshaders; const VertexShaderCache::VSCacheEntry *VertexShaderCache::last_entry; +VERTEXSHADERUID VertexShaderCache::last_uid; #define MAX_SSAA_SHADERS 3 @@ -154,6 +155,8 @@ void VertexShaderCache::Init() if (g_Config.bEnableShaderDebugging) Clear(); + + last_entry = NULL; } void VertexShaderCache::Clear() @@ -162,7 +165,7 @@ void VertexShaderCache::Clear() iter->second.Destroy(); vshaders.clear(); - memset(&last_vertex_shader_uid, 0xFF, sizeof(last_vertex_shader_uid)); + last_entry = NULL; } void VertexShaderCache::Shutdown() @@ -187,19 +190,21 @@ bool VertexShaderCache::SetShader(u32 components) { VERTEXSHADERUID uid; GetVertexShaderId(&uid, components); - if (uid == last_vertex_shader_uid && vshaders[uid].frameCount == frameCount) + if (last_entry) { - GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true); - ValidateVertexShaderIDs(API_D3D9, vshaders[uid].safe_uid, vshaders[uid].code, components); - return (vshaders[uid].shader != NULL); + if (uid == last_uid) + { + GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true); + ValidateVertexShaderIDs(API_D3D9, last_entry->safe_uid, last_entry->code, components); + return (last_entry->shader != NULL); + } } - memcpy(&last_vertex_shader_uid, &uid, sizeof(VERTEXSHADERUID)); + last_uid = uid; VSCache::iterator iter = vshaders.find(uid); if (iter != vshaders.end()) { - iter->second.frameCount = frameCount; const VSCacheEntry &entry = iter->second; last_entry = &entry; @@ -237,7 +242,6 @@ bool VertexShaderCache::InsertByteCode(const VERTEXSHADERUID &uid, const u8 *byt // Make an entry in the table VSCacheEntry entry; entry.shader = shader; - entry.frameCount = frameCount; vshaders[uid] = entry; last_entry = &vshaders[uid]; diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.h b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.h index 686f8b7c6d..c9c447e35b 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.h +++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.h @@ -34,12 +34,11 @@ private: struct VSCacheEntry { LPDIRECT3DVERTEXSHADER9 shader; - int frameCount; -//#if defined(_DEBUG) || defined(DEBUGFAST) + std::string code; VERTEXSHADERUIDSAFE safe_uid; -//#endif - VSCacheEntry() : shader(NULL), frameCount(0) {} + + VSCacheEntry() : shader(NULL) {} void Destroy() { if (shader) @@ -52,6 +51,7 @@ private: static VSCache vshaders; static const VSCacheEntry *last_entry; + static VERTEXSHADERUID last_uid; static void Clear(); public: From 0e1383b788cdc4975ab595b9b9969b9db1878b94 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Thu, 29 Sep 2011 22:55:28 +0200 Subject: [PATCH 059/381] Bump disk cache version. --- Source/Core/Common/Src/LinearDiskCache.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Common/Src/LinearDiskCache.h b/Source/Core/Common/Src/LinearDiskCache.h index 450392e70a..f213d2959e 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 = 6966 + LINEAR_DISKCACHE_VER = 6967 }; // On disk format: From 7eb06430ed35f73a073ca9851e199777a6695114 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Thu, 29 Sep 2011 23:16:42 +0200 Subject: [PATCH 060/381] Only sync shader caches to disk on stop. --- Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp | 1 - Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp | 1 - Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp | 1 - Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp | 1 - 4 files changed, 4 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp index 7e4af031bd..56f3719057 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp @@ -502,7 +502,6 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) // Insert the bytecode into the caches g_ps_disk_cache.Append(uid, pbytecode->Data(), pbytecode->Size()); - g_ps_disk_cache.Sync(); bool success = InsertByteCode(uid, pbytecode->Data(), pbytecode->Size()); pbytecode->Release(); diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp index d9dae4cf91..d727ce1ebf 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp @@ -244,7 +244,6 @@ bool VertexShaderCache::SetShader(u32 components) return false; } g_vs_disk_cache.Append(uid, pbytecode->Data(), pbytecode->Size()); - g_vs_disk_cache.Sync(); bool success = InsertByteCode(uid, pbytecode); pbytecode->Release(); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp index 14943e8f8f..f66d096ab6 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp @@ -393,7 +393,6 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) // Insert the bytecode into the caches g_ps_disk_cache.Append(uid, bytecode, bytecodelen); - g_ps_disk_cache.Sync(); // And insert it into the shader cache. bool success = InsertByteCode(uid, bytecode, bytecodelen, true); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp index 9448c07371..e392cf3de0 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp @@ -223,7 +223,6 @@ bool VertexShaderCache::SetShader(u32 components) return false; } g_vs_disk_cache.Append(uid, bytecode, bytecodelen); - g_vs_disk_cache.Sync(); bool success = InsertByteCode(uid, bytecode, bytecodelen, true); if (g_ActiveConfig.bEnableShaderDebugging && success) From c208e8a1f6bda386f1074ce2e06fd5d22e0f6e7b Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Sat, 1 Oct 2011 00:21:49 +0300 Subject: [PATCH 061/381] Gameini database updates for The Lord of the Rings The Third Age, X-Men Destiny, Super Smash Bros. Brawl, SUPER MARIO GALAXY, Mario Kart: Double Dash, Crash Nitro Kart. --- Data/User/GameConfig/G3AD69.ini | 3 ++- Data/User/GameConfig/G3AE69.ini | 5 ++--- Data/User/GameConfig/G3AF69.ini | 3 ++- Data/User/GameConfig/G3AP69.ini | 3 ++- Data/User/GameConfig/GCNE7D.ini | 6 +++--- Data/User/GameConfig/GM4E01.ini | 11 ++++++++--- Data/User/GameConfig/GM4P01.ini | 4 ++-- Data/User/GameConfig/RMGE01.ini | 4 ++-- Data/User/GameConfig/RMGJ01.ini | 4 ++-- Data/User/GameConfig/RMGK01.ini | 4 ++-- Data/User/GameConfig/RMGP01.ini | 5 ++--- Data/User/GameConfig/RSBE01.ini | 5 ++--- Data/User/GameConfig/RSBJ01.ini | 1 + Data/User/GameConfig/RSBP01.ini | 2 +- Data/User/GameConfig/SX8E52.ini | 20 ++++++++++++++++++++ 15 files changed, 53 insertions(+), 27 deletions(-) create mode 100644 Data/User/GameConfig/SX8E52.ini diff --git a/Data/User/GameConfig/G3AD69.ini b/Data/User/GameConfig/G3AD69.ini index 01fbb79385..eee6d29950 100644 --- a/Data/User/GameConfig/G3AD69.ini +++ b/Data/User/GameConfig/G3AD69.ini @@ -2,7 +2,7 @@ [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 = 0 +EmulationStateId = 4 EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. @@ -16,3 +16,4 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 0 diff --git a/Data/User/GameConfig/G3AE69.ini b/Data/User/GameConfig/G3AE69.ini index 50fa7af370..c651dd337a 100644 --- a/Data/User/GameConfig/G3AE69.ini +++ b/Data/User/GameConfig/G3AE69.ini @@ -2,7 +2,7 @@ [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 = 0 +EmulationStateId = 4 EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. @@ -16,5 +16,4 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCache = True -SafeTextureCacheColorSamples = 512 - +SafeTextureCacheColorSamples = 0 diff --git a/Data/User/GameConfig/G3AF69.ini b/Data/User/GameConfig/G3AF69.ini index 6096a11729..a2cb88f457 100644 --- a/Data/User/GameConfig/G3AF69.ini +++ b/Data/User/GameConfig/G3AF69.ini @@ -2,7 +2,7 @@ [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 = 0 +EmulationStateId = 4 EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. @@ -16,3 +16,4 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 0 diff --git a/Data/User/GameConfig/G3AP69.ini b/Data/User/GameConfig/G3AP69.ini index 5956160dcb..c651dd337a 100644 --- a/Data/User/GameConfig/G3AP69.ini +++ b/Data/User/GameConfig/G3AP69.ini @@ -2,7 +2,7 @@ [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 = 0 +EmulationStateId = 4 EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. @@ -16,3 +16,4 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 0 diff --git a/Data/User/GameConfig/GCNE7D.ini b/Data/User/GameConfig/GCNE7D.ini index 5053be5d8b..f84b8e8b8b 100644 --- a/Data/User/GameConfig/GCNE7D.ini +++ b/Data/User/GameConfig/GCNE7D.ini @@ -2,9 +2,9 @@ [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 +EmulationStateId = 4 Issues = -EmulationIssues = +EmulationIssues = Disable "Panic Handlers". Needs "Real Xfb" to display videos. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -17,4 +17,4 @@ PH_ZFar = [Gecko] [Video_Settings] UseXFB = True -UseRealXFB = True \ No newline at end of file +UseRealXFB = True diff --git a/Data/User/GameConfig/GM4E01.ini b/Data/User/GameConfig/GM4E01.ini index 8136d8f74f..dcf9ca8a32 100644 --- a/Data/User/GameConfig/GM4E01.ini +++ b/Data/User/GameConfig/GM4E01.ini @@ -1,8 +1,8 @@ # GM4E01 - Mario Kart: Double Dash!! [EmuState] #The Emulation State. -EmulationStateId = 5 -EmulationIssues = Disable "emulate format changes" to increase the game speed(r6730) +EmulationStateId = 4 +EmulationIssues = Needs LLE audio to prevent BGM from stopping. Disable "emulate format changes" to increase the game speed. [OnFrame] [ActionReplay] $Everything Unlocked @@ -121,4 +121,9 @@ $Increased Nintendo Blur 022B3382 000000CC [Video] ProjectionHack = 0 - +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GM4P01.ini b/Data/User/GameConfig/GM4P01.ini index 23c7114422..5d3b8c2510 100644 --- a/Data/User/GameConfig/GM4P01.ini +++ b/Data/User/GameConfig/GM4P01.ini @@ -1,8 +1,8 @@ # GM4P01 - Mario Kart: Double Dash!! [EmuState] #The Emulation State. -EmulationStateId = 5 -EmulationIssues = Disable "emulate format changes" to increase the game speed(r6730) +EmulationStateId = 4 +EmulationIssues = Needs LLE audio to prevent BGM from stopping. Disable "emulate format changes" to increase the game speed. [OnFrame]#Add memory patches here. [ActionReplay]#Add decrypted action replay cheats here. $Stars Last Forever diff --git a/Data/User/GameConfig/RMGE01.ini b/Data/User/GameConfig/RMGE01.ini index 72330832f7..295edc018a 100644 --- a/Data/User/GameConfig/RMGE01.ini +++ b/Data/User/GameConfig/RMGE01.ini @@ -1,8 +1,8 @@ # RMGE01 - SUPER MARIO GALAXY [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 "Enable CPU Access" to be able to grab the stars, LLE plugin fixes sound issues(r6722). +EmulationStateId = 4 +EmulationIssues = LLE audio prevents a crash after the last Grand Star and fixes sound issues. It needs EFB to CPU Access to be able to grab the stars. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RMGJ01.ini b/Data/User/GameConfig/RMGJ01.ini index e20632d8e1..688079d589 100644 --- a/Data/User/GameConfig/RMGJ01.ini +++ b/Data/User/GameConfig/RMGJ01.ini @@ -1,8 +1,8 @@ # RMGJ01 - SUPER MARIO GALAXY [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 "Enable CPU Access" to be able to grab the stars, LLE plugin fixes sound issues(r6722). +EmulationStateId = 4 +EmulationIssues = LLE audio prevents a crash after the last Grand Star and fixes sound issues. It needs EFB to CPU Access to be able to grab the stars. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RMGK01.ini b/Data/User/GameConfig/RMGK01.ini index 07a8d04745..f51950915d 100644 --- a/Data/User/GameConfig/RMGK01.ini +++ b/Data/User/GameConfig/RMGK01.ini @@ -1,8 +1,8 @@ # RMGK01 - SUPER MARIO GALAXY [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 "Enable CPU Access" to be able to grab the stars, LLE plugin fixes sound issues(r6722). +EmulationStateId = 4 +EmulationIssues = LLE audio prevents a crash after the last Grand Star and fixes sound issues. It needs EFB to CPU Access to be able to grab the stars. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RMGP01.ini b/Data/User/GameConfig/RMGP01.ini index 5859a73f1a..a083afc0ff 100644 --- a/Data/User/GameConfig/RMGP01.ini +++ b/Data/User/GameConfig/RMGP01.ini @@ -1,8 +1,8 @@ # RMGP01 - SUPER MARIO GALAXY [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 "Enable CPU Access" to be able to grab the stars, LLE plugin fixes sound issues(r6722). +EmulationStateId = 4 +EmulationIssues = LLE audio prevents a crash after the last Grand Star and fixes sound issues. It needs EFB to CPU Access to be able to grab the stars. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -15,4 +15,3 @@ PH_ZFar = [Gecko] [Video_Hacks] EFBAccessEnable = True - diff --git a/Data/User/GameConfig/RSBE01.ini b/Data/User/GameConfig/RSBE01.ini index 8b3a46ab95..d25e19156b 100644 --- a/Data/User/GameConfig/RSBE01.ini +++ b/Data/User/GameConfig/RSBE01.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 = Classic mode score report needs real xfb to appear properly. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -13,5 +13,4 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Gecko] -[Video_Enhancements] -PostProcessingShader = + diff --git a/Data/User/GameConfig/RSBJ01.ini b/Data/User/GameConfig/RSBJ01.ini index 3abea4be22..8c7e224def 100644 --- a/Data/User/GameConfig/RSBJ01.ini +++ b/Data/User/GameConfig/RSBJ01.ini @@ -4,5 +4,6 @@ [EmuState] #The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 +EmulationIssues = Classic mode score report needs real xfb to appear properly. [OnFrame] [ActionReplay] diff --git a/Data/User/GameConfig/RSBP01.ini b/Data/User/GameConfig/RSBP01.ini index 57c7a57067..9aa4a04713 100644 --- a/Data/User/GameConfig/RSBP01.ini +++ b/Data/User/GameConfig/RSBP01.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 = Classic mode score report needs real xfb to appear properly. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. $No HUD diff --git a/Data/User/GameConfig/SX8E52.ini b/Data/User/GameConfig/SX8E52.ini new file mode 100644 index 0000000000..170ef48db9 --- /dev/null +++ b/Data/User/GameConfig/SX8E52.ini @@ -0,0 +1,20 @@ +# SX8E52 - X-Men Destiny +[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 = 4 +EmulationIssues = Idle skipping causes drop in performance. +[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] +SafeTextureCache = True +SafeTextureCacheColorSamples = 0 From 266cafb82d67edb05cd932bd3f94febaf3348f40 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 1 Oct 2011 02:36:03 +0200 Subject: [PATCH 062/381] Add a call to VertexManager::Flush() when changing TC gen settings In previous revisions of Dolphin, changing texture generation settings (via GX_SetTexCoordGen for example) did not regenerate the vertex shader and flush the vertices. Adding this flush should fix texture problems in a few game, for example in Superman: Shadow of Apokolips: Before: http://i.imgur.com/mHmfb.jpg After: http://i.imgur.com/2ThES.png --- Source/Core/VideoCommon/Src/XFStructs.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/Core/VideoCommon/Src/XFStructs.cpp b/Source/Core/VideoCommon/Src/XFStructs.cpp index b4afdf3d6b..ec3975cb07 100644 --- a/Source/Core/VideoCommon/Src/XFStructs.cpp +++ b/Source/Core/VideoCommon/Src/XFStructs.cpp @@ -154,6 +154,8 @@ void XFRegWritten(int transferSize, u32 baseAddress, u32 *pData) case XFMEM_SETTEXMTXINFO+5: case XFMEM_SETTEXMTXINFO+6: case XFMEM_SETTEXMTXINFO+7: + VertexManager::Flush(); + nextAddress = XFMEM_SETTEXMTXINFO + 8; break; @@ -165,6 +167,8 @@ void XFRegWritten(int transferSize, u32 baseAddress, u32 *pData) case XFMEM_SETPOSMTXINFO+5: case XFMEM_SETPOSMTXINFO+6: case XFMEM_SETPOSMTXINFO+7: + VertexManager::Flush(); + nextAddress = XFMEM_SETPOSMTXINFO + 8; break; From e76bc71efe8c3c724e14a2f741fe4f34669d1bea Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 1 Oct 2011 21:50:15 +1000 Subject: [PATCH 063/381] Fixed the controller config so that it lists DInput controllers with special characters (like the Registered (R) sign) in their name. UTF8 is used to match the encoding used by the Wx GUI. --- .../InputCommon/Src/ControllerInterface/DInput/DInput.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInput.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInput.cpp index e09bd2fdd9..c23e9df17e 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInput.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInput.cpp @@ -51,9 +51,9 @@ std::string GetDeviceName(const LPDIRECTINPUTDEVICE8 device) if (SUCCEEDED(device->GetProperty(DIPROP_PRODUCTNAME, &str.diph))) { - const int size = WideCharToMultiByte(CP_ACP, 0, str.wsz, -1, NULL, 0, NULL, NULL); + const int size = WideCharToMultiByte(CP_UTF8, 0, str.wsz, -1, NULL, 0, NULL, NULL); char* const data = new char[size]; - if (size == WideCharToMultiByte(CP_ACP, 0, str.wsz, -1, data, size, NULL, NULL)) + if (size == WideCharToMultiByte(CP_UTF8, 0, str.wsz, -1, data, size, NULL, NULL)) out.assign(data); delete[] data; } From d3e639a3979205dc3ec52e6205170b03bbde3a1c Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sat, 1 Oct 2011 21:03:51 -0500 Subject: [PATCH 064/381] fix build issue with intel compiler and fix some unsafe string usages, patch by FilthyMonkey --- Source/Core/Common/Src/Common.h | 2 +- Source/Core/Common/Src/Version.cpp | 5 +++++ Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp | 7 ++++--- .../Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp | 7 ++++--- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h index bc9b4dc051..888a206d5d 100644 --- a/Source/Core/Common/Src/Common.h +++ b/Source/Core/Common/Src/Common.h @@ -143,7 +143,7 @@ private: #define _M_SSE 0x301 #elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) #define _M_SSE 0x301 -#elif _MSC_VER >= 1500 // Visual Studio 2008 +#elif (_MSC_VER >= 1500) || __INTEL_COMPILER // Visual Studio 2008 #define _M_SSE 0x402 #endif diff --git a/Source/Core/Common/Src/Version.cpp b/Source/Core/Common/Src/Version.cpp index f3d30398c8..97e232785d 100644 --- a/Source/Core/Common/Src/Version.cpp +++ b/Source/Core/Common/Src/Version.cpp @@ -30,7 +30,12 @@ const char *scm_rev_str = "Dolphin " #if !SCM_IS_MASTER "[" SCM_BRANCH_STR "] " #endif + +#ifdef __INTEL_COMPILER + BUILD_TYPE_STR SCM_DESC_STR "-ICC"; +#else BUILD_TYPE_STR SCM_DESC_STR; +#endif #ifdef _M_X64 #define NP_ARCH "x64" diff --git a/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp b/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp index 25f3712eb1..3afd38a2e1 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp @@ -187,14 +187,15 @@ bool LineGeometryShader::SetShader(u32 components, float lineWidth, p = GenerateVSOutputStruct(p, components, API_D3D11); p += sprintf(p, "\n%s", LINE_GS_COMMON); - std::stringstream numTexCoordsStr; - numTexCoordsStr << xfregs.numTexGen.numTexGens; + std::stringstream numTexCoordsStream; + numTexCoordsStream << xfregs.numTexGen.numTexGens; INFO_LOG(VIDEO, "Compiling line geometry shader for components 0x%.08X (num texcoords %d)", components, xfregs.numTexGen.numTexGens); + const std::string& numTexCoordsStr = numTexCoordsStream.str(); D3D_SHADER_MACRO macros[] = { - { "NUM_TEXCOORDS", numTexCoordsStr.str().c_str() }, + { "NUM_TEXCOORDS", numTexCoordsStr.c_str() }, { NULL, NULL } }; ID3D11GeometryShader* newShader = D3D::CompileAndCreateGeometryShader(code, unsigned int(strlen(code)), macros); diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp index fcf3315802..ad23786610 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp @@ -181,14 +181,15 @@ bool PointGeometryShader::SetShader(u32 components, float pointSize, p = GenerateVSOutputStruct(p, components, API_D3D11); p += sprintf(p, "\n%s", POINT_GS_COMMON); - std::stringstream numTexCoordsStr; - numTexCoordsStr << xfregs.numTexGen.numTexGens; + std::stringstream numTexCoordsStream; + numTexCoordsStream << xfregs.numTexGen.numTexGens; INFO_LOG(VIDEO, "Compiling point geometry shader for components 0x%.08X (num texcoords %d)", components, xfregs.numTexGen.numTexGens); + const std::string& numTexCoordsStr = numTexCoordsStream.str(); D3D_SHADER_MACRO macros[] = { - { "NUM_TEXCOORDS", numTexCoordsStr.str().c_str() }, + { "NUM_TEXCOORDS", numTexCoordsStr.c_str() }, { NULL, NULL } }; ID3D11GeometryShader* newShader = D3D::CompileAndCreateGeometryShader(code, unsigned int(strlen(code)), macros); From 15d6c6e9fc8a437ca1fffade3ed63e35e72e5448 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sat, 1 Oct 2011 21:02:06 -0500 Subject: [PATCH 065/381] fix 3rd party wiimotes, patch by pholklore --- Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index 0793900900..d1e2826ed3 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -159,7 +159,15 @@ void Wiimote::InterruptChannel(const u16 channel, const void* const data, const // //((wm_report_mode*)(data + 2))->continuous = false; //} - if (rpt.first[0] == 0xa2 && rpt.first[1] == 0x18 && rpt.second == 23) + // Convert output DATA packets to SET_REPORT packets. + // Nintendo Wiimotes work without this translation, but 3rd + // party ones don't. + if (rpt.first[0] == 0xa2) + { + rpt.first[0] = 0x52; + } + + if (rpt.first[0] == 0x52 && rpt.first[1] == 0x18 && rpt.second == 23) { m_audio_reports.Push(rpt); return; From d8def74dd1cda90af4fc523cc836ca3e36bb2126 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Mon, 3 Oct 2011 22:53:24 -0700 Subject: [PATCH 066/381] add portaudio headers and windows static libs to Externals, enable by default in windows build. --- Externals/portaudio/Win32/portaudio.lib | Bin 0 -> 1254336 bytes Externals/portaudio/include/pa_asio.h | 143 ++ Externals/portaudio/include/pa_jack.h | 77 ++ Externals/portaudio/include/pa_linux_alsa.h | 107 ++ Externals/portaudio/include/pa_mac_core.h | 178 +++ Externals/portaudio/include/pa_win_ds.h | 100 ++ Externals/portaudio/include/pa_win_wasapi.h | 391 ++++++ .../portaudio/include/pa_win_waveformat.h | 199 +++ Externals/portaudio/include/pa_win_wmme.h | 185 +++ Externals/portaudio/include/portaudio.h | 1149 +++++++++++++++++ Externals/portaudio/x64/portaudio.lib | Bin 0 -> 1212230 bytes Source/Core/Common/Src/Common.h | 2 + Source/Core/Core/Core.vcxproj | 12 +- Source/VSProps/Dolphin.Win32.props | 4 +- Source/VSProps/Dolphin.x64.props | 4 +- 15 files changed, 2541 insertions(+), 10 deletions(-) create mode 100644 Externals/portaudio/Win32/portaudio.lib create mode 100644 Externals/portaudio/include/pa_asio.h create mode 100644 Externals/portaudio/include/pa_jack.h create mode 100644 Externals/portaudio/include/pa_linux_alsa.h create mode 100644 Externals/portaudio/include/pa_mac_core.h create mode 100644 Externals/portaudio/include/pa_win_ds.h create mode 100644 Externals/portaudio/include/pa_win_wasapi.h create mode 100644 Externals/portaudio/include/pa_win_waveformat.h create mode 100644 Externals/portaudio/include/pa_win_wmme.h create mode 100644 Externals/portaudio/include/portaudio.h create mode 100644 Externals/portaudio/x64/portaudio.lib diff --git a/Externals/portaudio/Win32/portaudio.lib b/Externals/portaudio/Win32/portaudio.lib new file mode 100644 index 0000000000000000000000000000000000000000..2aed449b6b1abf1fccac36bf193d651f40916488 GIT binary patch literal 1254336 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%0AY^uvLC7N+nS3Yf(D!QjFOjcXs59 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�xxFYp73Ugr$1Eqsq5I3+yfZ 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�>RoX_#0E!B9?xK)AKq~J7g-Czb39QF4q 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

@$ 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%0A8-IH{s)W7U{02e!evE6Qij^xM_Qs#(D5kGB&B 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 z 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

++F9MK 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�OhS#)w7 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ⅅ^)#jDWlW@Zqu6Tnt?GTGVs8}&bb-U>#3;BL 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 jdyyvyYIo&q~$9~Wf6w^YIGg)81wZOFrugI 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 +//#include + +#ifdef __cplusplus +extern "C" { +#endif + + +/* + * A pointer to a paMacCoreStreamInfo may be passed as + * the hostApiSpecificStreamInfo in the PaStreamParameters struct + * when opening a stream or querying the format. Use NULL, for the + * defaults. Note that for duplex streams, flags for input and output + * should be the same or behaviour is undefined. + */ +typedef struct +{ + unsigned long size; /**size of whole structure including this header */ + PaHostApiTypeId hostApiType; /**host API for which this data is intended */ + unsigned long version; /**structure version */ + unsigned long flags; /* flags to modify behaviour */ + SInt32 const * channelMap; /* Channel map for HAL channel mapping , if not needed, use NULL;*/ + unsigned long channelMapSize; /* Channel map size for HAL channel mapping , if not needed, use 0;*/ +} PaMacCoreStreamInfo; + +/* + * Functions + */ + + +/* Use this function to initialize a paMacCoreStreamInfo struct + * using the requested flags. Note that channel mapping is turned + * off after a call to this function. + * @param data The datastructure to initialize + * @param flags The flags to initialize the datastructure with. +*/ +void PaMacCore_SetupStreamInfo( PaMacCoreStreamInfo *data, unsigned long flags ); + +/* call this after pa_SetupMacCoreStreamInfo to use channel mapping as described in notes.txt. + * @param data The stream info structure to assign a channel mapping to + * @param channelMap The channel map array, as described in notes.txt. This array pointer will be used directly (ie the underlying data will not be copied), so the caller should not free the array until after the stream has been opened. + * @param channelMapSize The size of the channel map array. + */ +void PaMacCore_SetupChannelMap( PaMacCoreStreamInfo *data, const SInt32 * const channelMap, unsigned long channelMapSize ); + +/* + * Retrieve the AudioDeviceID of the input device assigned to an open stream + * + * @param s The stream to query. + * + * @return A valid AudioDeviceID, or NULL if an error occurred. + */ +AudioDeviceID PaMacCore_GetStreamInputDevice( PaStream* s ); + +/* + * Retrieve the AudioDeviceID of the output device assigned to an open stream + * + * @param s The stream to query. + * + * @return A valid AudioDeviceID, or NULL if an error occurred. + */ +AudioDeviceID PaMacCore_GetStreamOutputDevice( PaStream* s ); + +/* + * Returns a statically allocated string with the device's name + * for the given channel. NULL will be returned on failure. + * + * This function's implemenation is not complete! + * + * @param device The PortAudio device index. + * @param channel The channel number who's name is requested. + * @return a statically allocated string with the name of the device. + * Because this string is statically allocated, it must be + * coppied if it is to be saved and used by the user after + * another call to this function. + * + */ +const char *PaMacCore_GetChannelName( int device, int channelIndex, bool input ); + +/* + * Flags + */ + +/* + * The following flags alter the behaviour of PA on the mac platform. + * they can be ORed together. These should work both for opening and + * checking a device. + */ + +/* Allows PortAudio to change things like the device's frame size, + * which allows for much lower latency, but might disrupt the device + * if other programs are using it, even when you are just Querying + * the device. */ +#define paMacCoreChangeDeviceParameters (0x01) + +/* In combination with the above flag, + * causes the stream opening to fail, unless the exact sample rates + * are supported by the device. */ +#define paMacCoreFailIfConversionRequired (0x02) + +/* These flags set the SR conversion quality, if required. The wierd ordering + * allows Maximum Quality to be the default.*/ +#define paMacCoreConversionQualityMin (0x0100) +#define paMacCoreConversionQualityMedium (0x0200) +#define paMacCoreConversionQualityLow (0x0300) +#define paMacCoreConversionQualityHigh (0x0400) +#define paMacCoreConversionQualityMax (0x0000) + +/* + * Here are some "preset" combinations of flags (above) to get to some + * common configurations. THIS IS OVERKILL, but if more flags are added + * it won't be. + */ + +/*This is the default setting: do as much sample rate conversion as possible + * and as little mucking with the device as possible. */ +#define paMacCorePlayNice (0x00) +/*This setting is tuned for pro audio apps. It allows SR conversion on input + and output, but it tries to set the appropriate SR on the device.*/ +#define paMacCorePro (0x01) +/*This is a setting to minimize CPU usage and still play nice.*/ +#define paMacCoreMinimizeCPUButPlayNice (0x0100) +/*This is a setting to minimize CPU usage, even if that means interrupting the device. */ +#define paMacCoreMinimizeCPU (0x0101) + + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* PA_MAC_CORE_H */ diff --git a/Externals/portaudio/include/pa_win_ds.h b/Externals/portaudio/include/pa_win_ds.h new file mode 100644 index 0000000000..2e1fd5958f --- /dev/null +++ b/Externals/portaudio/include/pa_win_ds.h @@ -0,0 +1,100 @@ +#ifndef PA_WIN_DS_H +#define PA_WIN_DS_H +/* + * $Id: $ + * PortAudio Portable Real-Time Audio Library + * DirectSound specific extensions + * + * Copyright (c) 1999-2007 Ross Bencina and Phil Burk + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files + * (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, + * publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is 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 Software. + * + * THE SOFTWARE IS 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +/* + * The text above constitutes the entire PortAudio license; however, + * the PortAudio community also makes the following non-binding requests: + * + * Any person wishing to distribute modifications to the Software is + * requested to send the modifications to the original developer so that + * they can be incorporated into the canonical version. It is also + * requested that these non-binding requests be included along with the + * license above. + */ + +/** @file + @ingroup public_header + @brief DirectSound-specific PortAudio API extension header file. +*/ + +#include "portaudio.h" +#include "pa_win_waveformat.h" + +#ifdef __cplusplus +extern "C" +{ +#endif /* __cplusplus */ + + +#define paWinDirectSoundUseLowLevelLatencyParameters (0x01) +#define paWinDirectSoundUseChannelMask (0x04) + + +typedef struct PaWinDirectSoundStreamInfo{ + unsigned long size; /**< sizeof(PaWinDirectSoundStreamInfo) */ + PaHostApiTypeId hostApiType; /**< paDirectSound */ + unsigned long version; /**< 1 */ + + unsigned long flags; + + /* low-level latency setting support + TODO ** NOT IMPLEMENTED ** + These settings control the number and size of host buffers in order + to set latency. They will be used instead of the generic parameters + to Pa_OpenStream() if flags contains the paWinDirectSoundUseLowLevelLatencyParameters + flag. + + If PaWinDirectSoundStreamInfo structures with paWinDirectSoundUseLowLevelLatencyParameters + are supplied for both input and output in a full duplex stream, then the + input and output framesPerBuffer must be the same, or the larger of the + two must be a multiple of the smaller, otherwise a + paIncompatibleHostApiSpecificStreamInfo error will be returned from + Pa_OpenStream(). + + unsigned long framesPerBuffer; + */ + + /* + support for WAVEFORMATEXTENSIBLE channel masks. If flags contains + paWinDirectSoundUseChannelMask this allows you to specify which speakers + to address in a multichannel stream. Constants for channelMask + are specified in pa_win_waveformat.h + + */ + PaWinWaveFormatChannelMask channelMask; + +}PaWinDirectSoundStreamInfo; + + + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* PA_WIN_DS_H */ diff --git a/Externals/portaudio/include/pa_win_wasapi.h b/Externals/portaudio/include/pa_win_wasapi.h new file mode 100644 index 0000000000..a60aa047a6 --- /dev/null +++ b/Externals/portaudio/include/pa_win_wasapi.h @@ -0,0 +1,391 @@ +#ifndef PA_WIN_WASAPI_H +#define PA_WIN_WASAPI_H +/* + * $Id: $ + * PortAudio Portable Real-Time Audio Library + * DirectSound specific extensions + * + * Copyright (c) 1999-2007 Ross Bencina and Phil Burk + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files + * (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, + * publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is 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 Software. + * + * THE SOFTWARE IS 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +/* + * The text above constitutes the entire PortAudio license; however, + * the PortAudio community also makes the following non-binding requests: + * + * Any person wishing to distribute modifications to the Software is + * requested to send the modifications to the original developer so that + * they can be incorporated into the canonical version. It is also + * requested that these non-binding requests be included along with the + * license above. + */ + +/** @file + @ingroup public_header + @brief WASAPI-specific PortAudio API extension header file. +*/ + +#include "portaudio.h" +#include "pa_win_waveformat.h" + +#ifdef __cplusplus +extern "C" +{ +#endif /* __cplusplus */ + + +/* Setup flags */ +typedef enum PaWasapiFlags +{ + /* puts WASAPI into exclusive mode */ + paWinWasapiExclusive = (1 << 0), + + /* allows to skip internal PA processing completely */ + paWinWasapiRedirectHostProcessor = (1 << 1), + + /* assigns custom channel mask */ + paWinWasapiUseChannelMask = (1 << 2), + + /* selects non-Event driven method of data read/write + Note: WASAPI Event driven core is capable of 2ms latency!!!, but Polling + method can only provide 15-20ms latency. */ + paWinWasapiPolling = (1 << 3), + + /* forces custom thread priority setting. must be used if PaWasapiStreamInfo::threadPriority + is set to custom value. */ + paWinWasapiThreadPriority = (1 << 4) +} +PaWasapiFlags; +#define paWinWasapiExclusive (paWinWasapiExclusive) +#define paWinWasapiRedirectHostProcessor (paWinWasapiRedirectHostProcessor) +#define paWinWasapiUseChannelMask (paWinWasapiUseChannelMask) +#define paWinWasapiPolling (paWinWasapiPolling) +#define paWinWasapiThreadPriority (paWinWasapiThreadPriority) + + +/* Host processor. Allows to skip internal PA processing completely. + You must set paWinWasapiRedirectHostProcessor flag to PaWasapiStreamInfo::flags member + in order to have host processor redirected to your callback. + Use with caution! inputFrames and outputFrames depend solely on final device setup. + To query maximal values of inputFrames/outputFrames use PaWasapi_GetFramesPerHostBuffer. +*/ +typedef void (*PaWasapiHostProcessorCallback) (void *inputBuffer, long inputFrames, + void *outputBuffer, long outputFrames, + void *userData); + +/* Device role */ +typedef enum PaWasapiDeviceRole +{ + eRoleRemoteNetworkDevice = 0, + eRoleSpeakers, + eRoleLineLevel, + eRoleHeadphones, + eRoleMicrophone, + eRoleHeadset, + eRoleHandset, + eRoleUnknownDigitalPassthrough, + eRoleSPDIF, + eRoleHDMI, + eRoleUnknownFormFactor +} +PaWasapiDeviceRole; + + +/* Jack connection type */ +typedef enum PaWasapiJackConnectionType +{ + eJackConnTypeUnknown, + eJackConnType3Point5mm, + eJackConnTypeQuarter, + eJackConnTypeAtapiInternal, + eJackConnTypeRCA, + eJackConnTypeOptical, + eJackConnTypeOtherDigital, + eJackConnTypeOtherAnalog, + eJackConnTypeMultichannelAnalogDIN, + eJackConnTypeXlrProfessional, + eJackConnTypeRJ11Modem, + eJackConnTypeCombination +} +PaWasapiJackConnectionType; + + +/* Jack geometric location */ +typedef enum PaWasapiJackGeoLocation +{ + eJackGeoLocUnk = 0, + eJackGeoLocRear = 0x1, /* matches EPcxGeoLocation::eGeoLocRear */ + eJackGeoLocFront, + eJackGeoLocLeft, + eJackGeoLocRight, + eJackGeoLocTop, + eJackGeoLocBottom, + eJackGeoLocRearPanel, + eJackGeoLocRiser, + eJackGeoLocInsideMobileLid, + eJackGeoLocDrivebay, + eJackGeoLocHDMI, + eJackGeoLocOutsideMobileLid, + eJackGeoLocATAPI, + eJackGeoLocReserved5, + eJackGeoLocReserved6, +} +PaWasapiJackGeoLocation; + + +/* Jack general location */ +typedef enum PaWasapiJackGenLocation +{ + eJackGenLocPrimaryBox = 0, + eJackGenLocInternal, + eJackGenLocSeparate, + eJackGenLocOther +} +PaWasapiJackGenLocation; + + +/* Jack's type of port */ +typedef enum PaWasapiJackPortConnection +{ + eJackPortConnJack = 0, + eJackPortConnIntegratedDevice, + eJackPortConnBothIntegratedAndJack, + eJackPortConnUnknown +} +PaWasapiJackPortConnection; + + +/* Thread priority */ +typedef enum PaWasapiThreadPriority +{ + eThreadPriorityNone = 0, + eThreadPriorityAudio, //!< Default for Shared mode. + eThreadPriorityCapture, + eThreadPriorityDistribution, + eThreadPriorityGames, + eThreadPriorityPlayback, + eThreadPriorityProAudio, //!< Default for Exclusive mode. + eThreadPriorityWindowManager +} +PaWasapiThreadPriority; + + +/* Stream descriptor. */ +typedef struct PaWasapiJackDescription +{ + unsigned long channelMapping; + unsigned long color; /* derived from macro: #define RGB(r,g,b) ((COLORREF)(((BYTE)(r)|((WORD)((BYTE)(g))<<8))|(((DWORD)(BYTE)(b))<<16))) */ + PaWasapiJackConnectionType connectionType; + PaWasapiJackGeoLocation geoLocation; + PaWasapiJackGenLocation genLocation; + PaWasapiJackPortConnection portConnection; + unsigned int isConnected; +} +PaWasapiJackDescription; + + +/* Stream descriptor. */ +typedef struct PaWasapiStreamInfo +{ + unsigned long size; /**< sizeof(PaWasapiStreamInfo) */ + PaHostApiTypeId hostApiType; /**< paWASAPI */ + unsigned long version; /**< 1 */ + + unsigned long flags; /**< collection of PaWasapiFlags */ + + /* Support for WAVEFORMATEXTENSIBLE channel masks. If flags contains + paWinWasapiUseChannelMask this allows you to specify which speakers + to address in a multichannel stream. Constants for channelMask + are specified in pa_win_waveformat.h. Will be used only if + paWinWasapiUseChannelMask flag is specified. + */ + PaWinWaveFormatChannelMask channelMask; + + /* Delivers raw data to callback obtained from GetBuffer() methods skipping + internal PortAudio processing inventory completely. userData parameter will + be the same that was passed to Pa_OpenStream method. Will be used only if + paWinWasapiRedirectHostProcessor flag is specified. + */ + PaWasapiHostProcessorCallback hostProcessorOutput; + PaWasapiHostProcessorCallback hostProcessorInput; + + /* Specifies thread priority explicitly. Will be used only if paWinWasapiThreadPriority flag + is specified. + + Please note, if Input/Output streams are opened simultaniously (Full-Duplex mode) + you shall specify same value for threadPriority or othervise one of the values will be used + to setup thread priority. + */ + PaWasapiThreadPriority threadPriority; +} +PaWasapiStreamInfo; + + +/** Returns default sound format for device. Format is represented by PaWinWaveFormat or + WAVEFORMATEXTENSIBLE structure. + + @param pFormat Pointer to PaWinWaveFormat or WAVEFORMATEXTENSIBLE structure. + @param nFormatSize Size of PaWinWaveFormat or WAVEFORMATEXTENSIBLE structure in bytes. + @param nDevice Device index. + + @return Non-negative value indicating the number of bytes copied into format decriptor + or, a PaErrorCode (which are always negative) if PortAudio is not initialized + or an error is encountered. +*/ +int PaWasapi_GetDeviceDefaultFormat( void *pFormat, unsigned int nFormatSize, PaDeviceIndex nDevice ); + + +/** Returns device role (PaWasapiDeviceRole enum). + + @param nDevice device index. + + @return Non-negative value indicating device role or, a PaErrorCode (which are always negative) + if PortAudio is not initialized or an error is encountered. +*/ +int/*PaWasapiDeviceRole*/ PaWasapi_GetDeviceRole( PaDeviceIndex nDevice ); + + +/** Boost thread priority of calling thread (MMCSS). Use it for Blocking Interface only for thread + which makes calls to Pa_WriteStream/Pa_ReadStream. + + @param hTask Handle to pointer to priority task. Must be used with PaWasapi_RevertThreadPriority + method to revert thread priority to initial state. + + @param nPriorityClass Id of thread priority of PaWasapiThreadPriority type. Specifying + eThreadPriorityNone does nothing. + + @return Error code indicating success or failure. + @see PaWasapi_RevertThreadPriority +*/ +PaError PaWasapi_ThreadPriorityBoost( void **hTask, PaWasapiThreadPriority nPriorityClass ); + + +/** Boost thread priority of calling thread (MMCSS). Use it for Blocking Interface only for thread + which makes calls to Pa_WriteStream/Pa_ReadStream. + + @param hTask Task handle obtained by PaWasapi_BoostThreadPriority method. + @return Error code indicating success or failure. + @see PaWasapi_BoostThreadPriority +*/ +PaError PaWasapi_ThreadPriorityRevert( void *hTask ); + + +/** Get number of frames per host buffer. This is maximal value of frames of WASAPI buffer which + can be locked for operations. Use this method as helper to findout maximal values of + inputFrames/outputFrames of PaWasapiHostProcessorCallback. + + @param pStream Pointer to PaStream to query. + @param nInput Pointer to variable to receive number of input frames. Can be NULL. + @param nOutput Pointer to variable to receive number of output frames. Can be NULL. + @return Error code indicating success or failure. + @see PaWasapiHostProcessorCallback +*/ +PaError PaWasapi_GetFramesPerHostBuffer( PaStream *pStream, unsigned int *nInput, unsigned int *nOutput ); + + +/** Get number of jacks associated with a WASAPI device. Use this method to determine if + there are any jacks associated with the provided WASAPI device. Not all audio devices + will support this capability. This is valid for both input and output devices. + @param nDevice device index. + @param jcount Number of jacks is returned in this variable + @return Error code indicating success or failure + @see PaWasapi_GetJackDescription + */ +PaError PaWasapi_GetJackCount(PaDeviceIndex nDevice, int *jcount); + + +/** Get the jack description associated with a WASAPI device and jack number + Before this function is called, use PaWasapi_GetJackCount to determine the + number of jacks associated with device. If jcount is greater than zero, then + each jack from 0 to jcount can be queried with this function to get the jack + description. + @param nDevice device index. + @param jindex Which jack to return information + @param KSJACK_DESCRIPTION This structure filled in on success. + @return Error code indicating success or failure + @see PaWasapi_GetJackCount + */ +PaError PaWasapi_GetJackDescription(PaDeviceIndex nDevice, int jindex, PaWasapiJackDescription *pJackDescription); + + +/* + IMPORTANT: + + WASAPI is implemented for Callback and Blocking interfaces. It supports Shared and Exclusive + share modes. + + Exclusive Mode: + + Exclusive mode allows to deliver audio data directly to hardware bypassing + software mixing. + Exclusive mode is specified by 'paWinWasapiExclusive' flag. + + Callback Interface: + + Provides best audio quality with low latency. Callback interface is implemented in + two versions: + + 1) Event-Driven: + This is the most powerful WASAPI implementation which provides glitch-free + audio at around 3ms latency in Exclusive mode. Lowest possible latency for this mode is + 3 ms for HD Audio class audio chips. For the Shared mode latency can not be + lower than 20 ms. + + 2) Poll-Driven: + Polling is another 2-nd method to operate with WASAPI. It is less efficient than Event-Driven + and provides latency at around 10-13ms. Polling must be used to overcome a system bug + under Windows Vista x64 when application is WOW64(32-bit) and Event-Driven method simply + times out (event handle is never signalled on buffer completion). Please note, such WOW64 bug + does not exist in Vista x86 or Windows 7. + Polling can be setup by speciying 'paWinWasapiPolling' flag. Our WASAPI implementation detects + WOW64 bug and sets 'paWinWasapiPolling' automatically. + + Thread priority: + + Normally thread priority is set automatically and does not require modification. Although + if user wants some tweaking thread priority can be modified by setting 'paWinWasapiThreadPriority' + flag and specifying 'PaWasapiStreamInfo::threadPriority' with value from PaWasapiThreadPriority + enum. + + Blocking Interface: + + Blocking interface is implemented but due to above described Poll-Driven method can not + deliver lowest possible latency. Specifying too low latency in Shared mode will result in + distorted audio although Exclusive mode adds stability. + + Pa_IsFormatSupported: + + To check format with correct Share Mode (Exclusive/Shared) you must supply + PaWasapiStreamInfo with flags paWinWasapiExclusive set through member of + PaStreamParameters::hostApiSpecificStreamInfo structure. + + Pa_OpenStream: + + To set desired Share Mode (Exclusive/Shared) you must supply + PaWasapiStreamInfo with flags paWinWasapiExclusive set through member of + PaStreamParameters::hostApiSpecificStreamInfo structure. +*/ + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* PA_WIN_WASAPI_H */ diff --git a/Externals/portaudio/include/pa_win_waveformat.h b/Externals/portaudio/include/pa_win_waveformat.h new file mode 100644 index 0000000000..2c00267117 --- /dev/null +++ b/Externals/portaudio/include/pa_win_waveformat.h @@ -0,0 +1,199 @@ +#ifndef PA_WIN_WAVEFORMAT_H +#define PA_WIN_WAVEFORMAT_H + +/* + * PortAudio Portable Real-Time Audio Library + * Windows WAVEFORMAT* data structure utilities + * portaudio.h should be included before this file. + * + * Copyright (c) 2007 Ross Bencina + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files + * (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, + * publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is 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 Software. + * + * THE SOFTWARE IS 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +/* + * The text above constitutes the entire PortAudio license; however, + * the PortAudio community also makes the following non-binding requests: + * + * Any person wishing to distribute modifications to the Software is + * requested to send the modifications to the original developer so that + * they can be incorporated into the canonical version. It is also + * requested that these non-binding requests be included along with the + * license above. + */ + +/** @file + @ingroup public_header + @brief Windows specific PortAudio API extension and utilities header file. +*/ + +#ifdef __cplusplus +extern "C" { +#endif + +/* + The following #defines for speaker channel masks are the same + as those in ksmedia.h, except with PAWIN_ prepended, KSAUDIO_ removed + in some cases, and casts to PaWinWaveFormatChannelMask added. +*/ + +typedef unsigned long PaWinWaveFormatChannelMask; + +/* Speaker Positions: */ +#define PAWIN_SPEAKER_FRONT_LEFT ((PaWinWaveFormatChannelMask)0x1) +#define PAWIN_SPEAKER_FRONT_RIGHT ((PaWinWaveFormatChannelMask)0x2) +#define PAWIN_SPEAKER_FRONT_CENTER ((PaWinWaveFormatChannelMask)0x4) +#define PAWIN_SPEAKER_LOW_FREQUENCY ((PaWinWaveFormatChannelMask)0x8) +#define PAWIN_SPEAKER_BACK_LEFT ((PaWinWaveFormatChannelMask)0x10) +#define PAWIN_SPEAKER_BACK_RIGHT ((PaWinWaveFormatChannelMask)0x20) +#define PAWIN_SPEAKER_FRONT_LEFT_OF_CENTER ((PaWinWaveFormatChannelMask)0x40) +#define PAWIN_SPEAKER_FRONT_RIGHT_OF_CENTER ((PaWinWaveFormatChannelMask)0x80) +#define PAWIN_SPEAKER_BACK_CENTER ((PaWinWaveFormatChannelMask)0x100) +#define PAWIN_SPEAKER_SIDE_LEFT ((PaWinWaveFormatChannelMask)0x200) +#define PAWIN_SPEAKER_SIDE_RIGHT ((PaWinWaveFormatChannelMask)0x400) +#define PAWIN_SPEAKER_TOP_CENTER ((PaWinWaveFormatChannelMask)0x800) +#define PAWIN_SPEAKER_TOP_FRONT_LEFT ((PaWinWaveFormatChannelMask)0x1000) +#define PAWIN_SPEAKER_TOP_FRONT_CENTER ((PaWinWaveFormatChannelMask)0x2000) +#define PAWIN_SPEAKER_TOP_FRONT_RIGHT ((PaWinWaveFormatChannelMask)0x4000) +#define PAWIN_SPEAKER_TOP_BACK_LEFT ((PaWinWaveFormatChannelMask)0x8000) +#define PAWIN_SPEAKER_TOP_BACK_CENTER ((PaWinWaveFormatChannelMask)0x10000) +#define PAWIN_SPEAKER_TOP_BACK_RIGHT ((PaWinWaveFormatChannelMask)0x20000) + +/* Bit mask locations reserved for future use */ +#define PAWIN_SPEAKER_RESERVED ((PaWinWaveFormatChannelMask)0x7FFC0000) + +/* Used to specify that any possible permutation of speaker configurations */ +#define PAWIN_SPEAKER_ALL ((PaWinWaveFormatChannelMask)0x80000000) + +/* DirectSound Speaker Config */ +#define PAWIN_SPEAKER_DIRECTOUT 0 +#define PAWIN_SPEAKER_MONO (PAWIN_SPEAKER_FRONT_CENTER) +#define PAWIN_SPEAKER_STEREO (PAWIN_SPEAKER_FRONT_LEFT | PAWIN_SPEAKER_FRONT_RIGHT) +#define PAWIN_SPEAKER_QUAD (PAWIN_SPEAKER_FRONT_LEFT | PAWIN_SPEAKER_FRONT_RIGHT | \ + PAWIN_SPEAKER_BACK_LEFT | PAWIN_SPEAKER_BACK_RIGHT) +#define PAWIN_SPEAKER_SURROUND (PAWIN_SPEAKER_FRONT_LEFT | PAWIN_SPEAKER_FRONT_RIGHT | \ + PAWIN_SPEAKER_FRONT_CENTER | PAWIN_SPEAKER_BACK_CENTER) +#define PAWIN_SPEAKER_5POINT1 (PAWIN_SPEAKER_FRONT_LEFT | PAWIN_SPEAKER_FRONT_RIGHT | \ + PAWIN_SPEAKER_FRONT_CENTER | PAWIN_SPEAKER_LOW_FREQUENCY | \ + PAWIN_SPEAKER_BACK_LEFT | PAWIN_SPEAKER_BACK_RIGHT) +#define PAWIN_SPEAKER_7POINT1 (PAWIN_SPEAKER_FRONT_LEFT | PAWIN_SPEAKER_FRONT_RIGHT | \ + PAWIN_SPEAKER_FRONT_CENTER | PAWIN_SPEAKER_LOW_FREQUENCY | \ + PAWIN_SPEAKER_BACK_LEFT | PAWIN_SPEAKER_BACK_RIGHT | \ + PAWIN_SPEAKER_FRONT_LEFT_OF_CENTER | PAWIN_SPEAKER_FRONT_RIGHT_OF_CENTER) +#define PAWIN_SPEAKER_5POINT1_SURROUND (PAWIN_SPEAKER_FRONT_LEFT | PAWIN_SPEAKER_FRONT_RIGHT | \ + PAWIN_SPEAKER_FRONT_CENTER | PAWIN_SPEAKER_LOW_FREQUENCY | \ + PAWIN_SPEAKER_SIDE_LEFT | PAWIN_SPEAKER_SIDE_RIGHT) +#define PAWIN_SPEAKER_7POINT1_SURROUND (PAWIN_SPEAKER_FRONT_LEFT | PAWIN_SPEAKER_FRONT_RIGHT | \ + PAWIN_SPEAKER_FRONT_CENTER | PAWIN_SPEAKER_LOW_FREQUENCY | \ + PAWIN_SPEAKER_BACK_LEFT | PAWIN_SPEAKER_BACK_RIGHT | \ + PAWIN_SPEAKER_SIDE_LEFT | PAWIN_SPEAKER_SIDE_RIGHT) +/* + According to the Microsoft documentation: + The following are obsolete 5.1 and 7.1 settings (they lack side speakers). Note this means + that the default 5.1 and 7.1 settings (KSAUDIO_SPEAKER_5POINT1 and KSAUDIO_SPEAKER_7POINT1 are + similarly obsolete but are unchanged for compatibility reasons). +*/ +#define PAWIN_SPEAKER_5POINT1_BACK PAWIN_SPEAKER_5POINT1 +#define PAWIN_SPEAKER_7POINT1_WIDE PAWIN_SPEAKER_7POINT1 + +/* DVD Speaker Positions */ +#define PAWIN_SPEAKER_GROUND_FRONT_LEFT PAWIN_SPEAKER_FRONT_LEFT +#define PAWIN_SPEAKER_GROUND_FRONT_CENTER PAWIN_SPEAKER_FRONT_CENTER +#define PAWIN_SPEAKER_GROUND_FRONT_RIGHT PAWIN_SPEAKER_FRONT_RIGHT +#define PAWIN_SPEAKER_GROUND_REAR_LEFT PAWIN_SPEAKER_BACK_LEFT +#define PAWIN_SPEAKER_GROUND_REAR_RIGHT PAWIN_SPEAKER_BACK_RIGHT +#define PAWIN_SPEAKER_TOP_MIDDLE PAWIN_SPEAKER_TOP_CENTER +#define PAWIN_SPEAKER_SUPER_WOOFER PAWIN_SPEAKER_LOW_FREQUENCY + + +/* + PaWinWaveFormat is defined here to provide compatibility with + compilation environments which don't have headers defining + WAVEFORMATEXTENSIBLE (e.g. older versions of MSVC, Borland C++ etc. + + The fields for WAVEFORMATEX and WAVEFORMATEXTENSIBLE are declared as an + unsigned char array here to avoid clients who include this file having + a dependency on windows.h and mmsystem.h, and also to to avoid having + to write separate packing pragmas for each compiler. +*/ +#define PAWIN_SIZEOF_WAVEFORMATEX 18 +#define PAWIN_SIZEOF_WAVEFORMATEXTENSIBLE (PAWIN_SIZEOF_WAVEFORMATEX + 22) + +typedef struct{ + unsigned char fields[ PAWIN_SIZEOF_WAVEFORMATEXTENSIBLE ]; + unsigned long extraLongForAlignment; /* ensure that compiler aligns struct to DWORD */ +} PaWinWaveFormat; + +/* + WAVEFORMATEXTENSIBLE fields: + + union { + WORD wValidBitsPerSample; + WORD wSamplesPerBlock; + WORD wReserved; + } Samples; + DWORD dwChannelMask; + GUID SubFormat; +*/ + +#define PAWIN_INDEXOF_WVALIDBITSPERSAMPLE (PAWIN_SIZEOF_WAVEFORMATEX+0) +#define PAWIN_INDEXOF_DWCHANNELMASK (PAWIN_SIZEOF_WAVEFORMATEX+2) +#define PAWIN_INDEXOF_SUBFORMAT (PAWIN_SIZEOF_WAVEFORMATEX+6) + + +/* + Valid values to pass for the waveFormatTag PaWin_InitializeWaveFormatEx and + PaWin_InitializeWaveFormatExtensible functions below. These must match + the standard Windows WAVE_FORMAT_* values. +*/ +#define PAWIN_WAVE_FORMAT_PCM (1) +#define PAWIN_WAVE_FORMAT_IEEE_FLOAT (3) +#define PAWIN_WAVE_FORMAT_DOLBY_AC3_SPDIF (0x0092) +#define PAWIN_WAVE_FORMAT_WMA_SPDIF (0x0164) + + +/* + returns PAWIN_WAVE_FORMAT_PCM or PAWIN_WAVE_FORMAT_IEEE_FLOAT + depending on the sampleFormat parameter. +*/ +int PaWin_SampleFormatToLinearWaveFormatTag( PaSampleFormat sampleFormat ); + +/* + Use the following two functions to initialize the waveformat structure. +*/ + +void PaWin_InitializeWaveFormatEx( PaWinWaveFormat *waveFormat, + int numChannels, PaSampleFormat sampleFormat, int waveFormatTag, double sampleRate ); + + +void PaWin_InitializeWaveFormatExtensible( PaWinWaveFormat *waveFormat, + int numChannels, PaSampleFormat sampleFormat, int waveFormatTag, double sampleRate, + PaWinWaveFormatChannelMask channelMask ); + + +/* Map a channel count to a speaker channel mask */ +PaWinWaveFormatChannelMask PaWin_DefaultChannelMask( int numChannels ); + + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* PA_WIN_WAVEFORMAT_H */ \ No newline at end of file diff --git a/Externals/portaudio/include/pa_win_wmme.h b/Externals/portaudio/include/pa_win_wmme.h new file mode 100644 index 0000000000..ac5efe782f --- /dev/null +++ b/Externals/portaudio/include/pa_win_wmme.h @@ -0,0 +1,185 @@ +#ifndef PA_WIN_WMME_H +#define PA_WIN_WMME_H +/* + * $Id: pa_win_wmme.h 1592 2011-02-04 10:41:58Z rossb $ + * PortAudio Portable Real-Time Audio Library + * MME specific extensions + * + * Copyright (c) 1999-2000 Ross Bencina and Phil Burk + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files + * (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, + * publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is 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 Software. + * + * THE SOFTWARE IS 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +/* + * The text above constitutes the entire PortAudio license; however, + * the PortAudio community also makes the following non-binding requests: + * + * Any person wishing to distribute modifications to the Software is + * requested to send the modifications to the original developer so that + * they can be incorporated into the canonical version. It is also + * requested that these non-binding requests be included along with the + * license above. + */ + +/** @file + @ingroup public_header + @brief WMME-specific PortAudio API extension header file. +*/ + +#include "portaudio.h" +#include "pa_win_waveformat.h" + +#ifdef __cplusplus +extern "C" +{ +#endif /* __cplusplus */ + + +/* The following are flags which can be set in + PaWinMmeStreamInfo's flags field. +*/ + +#define paWinMmeUseLowLevelLatencyParameters (0x01) +#define paWinMmeUseMultipleDevices (0x02) /* use mme specific multiple device feature */ +#define paWinMmeUseChannelMask (0x04) + +/* By default, the mme implementation drops the processing thread's priority + to THREAD_PRIORITY_NORMAL and sleeps the thread if the CPU load exceeds 100% + This flag disables any priority throttling. The processing thread will always + run at THREAD_PRIORITY_TIME_CRITICAL. +*/ +#define paWinMmeDontThrottleOverloadedProcessingThread (0x08) + +/* Flags for non-PCM spdif passthrough. +*/ +#define paWinMmeWaveFormatDolbyAc3Spdif (0x10) +#define paWinMmeWaveFormatWmaSpdif (0x20) + + +typedef struct PaWinMmeDeviceAndChannelCount{ + PaDeviceIndex device; + int channelCount; +}PaWinMmeDeviceAndChannelCount; + + +typedef struct PaWinMmeStreamInfo{ + unsigned long size; /**< sizeof(PaWinMmeStreamInfo) */ + PaHostApiTypeId hostApiType; /**< paMME */ + unsigned long version; /**< 1 */ + + unsigned long flags; + + /* low-level latency setting support + These settings control the number and size of host buffers in order + to set latency. They will be used instead of the generic parameters + to Pa_OpenStream() if flags contains the PaWinMmeUseLowLevelLatencyParameters + flag. + + If PaWinMmeStreamInfo structures with PaWinMmeUseLowLevelLatencyParameters + are supplied for both input and output in a full duplex stream, then the + input and output framesPerBuffer must be the same, or the larger of the + two must be a multiple of the smaller, otherwise a + paIncompatibleHostApiSpecificStreamInfo error will be returned from + Pa_OpenStream(). + */ + unsigned long framesPerBuffer; + unsigned long bufferCount; /* formerly numBuffers */ + + /* multiple devices per direction support + If flags contains the PaWinMmeUseMultipleDevices flag, + this functionality will be used, otherwise the device parameter to + Pa_OpenStream() will be used instead. + If devices are specified here, the corresponding device parameter + to Pa_OpenStream() should be set to paUseHostApiSpecificDeviceSpecification, + otherwise an paInvalidDevice error will result. + The total number of channels accross all specified devices + must agree with the corresponding channelCount parameter to + Pa_OpenStream() otherwise a paInvalidChannelCount error will result. + */ + PaWinMmeDeviceAndChannelCount *devices; + unsigned long deviceCount; + + /* + support for WAVEFORMATEXTENSIBLE channel masks. If flags contains + paWinMmeUseChannelMask this allows you to specify which speakers + to address in a multichannel stream. Constants for channelMask + are specified in pa_win_waveformat.h + + */ + PaWinWaveFormatChannelMask channelMask; + +}PaWinMmeStreamInfo; + + +/** Retrieve the number of wave in handles used by a PortAudio WinMME stream. + Returns zero if the stream is output only. + + @return A non-negative value indicating the number of wave in handles + or, a PaErrorCode (which are always negative) if PortAudio is not initialized + or an error is encountered. + + @see PaWinMME_GetStreamInputHandle +*/ +int PaWinMME_GetStreamInputHandleCount( PaStream* stream ); + + +/** Retrieve a wave in handle used by a PortAudio WinMME stream. + + @param stream The stream to query. + @param handleIndex The zero based index of the wave in handle to retrieve. This + should be in the range [0, PaWinMME_GetStreamInputHandleCount(stream)-1]. + + @return A valid wave in handle, or NULL if an error occurred. + + @see PaWinMME_GetStreamInputHandle +*/ +HWAVEIN PaWinMME_GetStreamInputHandle( PaStream* stream, int handleIndex ); + + +/** Retrieve the number of wave out handles used by a PortAudio WinMME stream. + Returns zero if the stream is input only. + + @return A non-negative value indicating the number of wave out handles + or, a PaErrorCode (which are always negative) if PortAudio is not initialized + or an error is encountered. + + @see PaWinMME_GetStreamOutputHandle +*/ +int PaWinMME_GetStreamOutputHandleCount( PaStream* stream ); + + +/** Retrieve a wave out handle used by a PortAudio WinMME stream. + + @param stream The stream to query. + @param handleIndex The zero based index of the wave out handle to retrieve. + This should be in the range [0, PaWinMME_GetStreamOutputHandleCount(stream)-1]. + + @return A valid wave out handle, or NULL if an error occurred. + + @see PaWinMME_GetStreamOutputHandleCount +*/ +HWAVEOUT PaWinMME_GetStreamOutputHandle( PaStream* stream, int handleIndex ); + + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* PA_WIN_WMME_H */ diff --git a/Externals/portaudio/include/portaudio.h b/Externals/portaudio/include/portaudio.h new file mode 100644 index 0000000000..f26e09d79c --- /dev/null +++ b/Externals/portaudio/include/portaudio.h @@ -0,0 +1,1149 @@ +#ifndef PORTAUDIO_H +#define PORTAUDIO_H +/* + * $Id: portaudio.h 1594 2011-02-05 14:33:29Z rossb $ + * PortAudio Portable Real-Time Audio Library + * PortAudio API Header File + * Latest version available at: http://www.portaudio.com/ + * + * Copyright (c) 1999-2002 Ross Bencina and Phil Burk + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files + * (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, + * publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is 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 Software. + * + * THE SOFTWARE IS 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +/* + * The text above constitutes the entire PortAudio license; however, + * the PortAudio community also makes the following non-binding requests: + * + * Any person wishing to distribute modifications to the Software is + * requested to send the modifications to the original developer so that + * they can be incorporated into the canonical version. It is also + * requested that these non-binding requests be included along with the + * license above. + */ + +/** @file + @ingroup public_header + @brief The portable PortAudio API. +*/ + + +#ifdef __cplusplus +extern "C" +{ +#endif /* __cplusplus */ + + +/** Retrieve the release number of the currently running PortAudio build, + eg 1900. +*/ +int Pa_GetVersion( void ); + + +/** Retrieve a textual description of the current PortAudio build, + eg "PortAudio V19-devel 13 October 2002". +*/ +const char* Pa_GetVersionText( void ); + + +/** Error codes returned by PortAudio functions. + Note that with the exception of paNoError, all PaErrorCodes are negative. +*/ + +typedef int PaError; +typedef enum PaErrorCode +{ + paNoError = 0, + + paNotInitialized = -10000, + paUnanticipatedHostError, + paInvalidChannelCount, + paInvalidSampleRate, + paInvalidDevice, + paInvalidFlag, + paSampleFormatNotSupported, + paBadIODeviceCombination, + paInsufficientMemory, + paBufferTooBig, + paBufferTooSmall, + paNullCallback, + paBadStreamPtr, + paTimedOut, + paInternalError, + paDeviceUnavailable, + paIncompatibleHostApiSpecificStreamInfo, + paStreamIsStopped, + paStreamIsNotStopped, + paInputOverflowed, + paOutputUnderflowed, + paHostApiNotFound, + paInvalidHostApi, + paCanNotReadFromACallbackStream, + paCanNotWriteToACallbackStream, + paCanNotReadFromAnOutputOnlyStream, + paCanNotWriteToAnInputOnlyStream, + paIncompatibleStreamHostApi, + paBadBufferPtr +} PaErrorCode; + + +/** Translate the supplied PortAudio error code into a human readable + message. +*/ +const char *Pa_GetErrorText( PaError errorCode ); + + +/** Library initialization function - call this before using PortAudio. + This function initializes internal data structures and prepares underlying + host APIs for use. With the exception of Pa_GetVersion(), Pa_GetVersionText(), + and Pa_GetErrorText(), this function MUST be called before using any other + PortAudio API functions. + + If Pa_Initialize() is called multiple times, each successful + call must be matched with a corresponding call to Pa_Terminate(). + Pairs of calls to Pa_Initialize()/Pa_Terminate() may overlap, and are not + required to be fully nested. + + Note that if Pa_Initialize() returns an error code, Pa_Terminate() should + NOT be called. + + @return paNoError if successful, otherwise an error code indicating the cause + of failure. + + @see Pa_Terminate +*/ +PaError Pa_Initialize( void ); + + +/** Library termination function - call this when finished using PortAudio. + This function deallocates all resources allocated by PortAudio since it was + initialized by a call to Pa_Initialize(). In cases where Pa_Initialise() has + been called multiple times, each call must be matched with a corresponding call + to Pa_Terminate(). The final matching call to Pa_Terminate() will automatically + close any PortAudio streams that are still open. + + Pa_Terminate() MUST be called before exiting a program which uses PortAudio. + Failure to do so may result in serious resource leaks, such as audio devices + not being available until the next reboot. + + @return paNoError if successful, otherwise an error code indicating the cause + of failure. + + @see Pa_Initialize +*/ +PaError Pa_Terminate( void ); + + + +/** The type used to refer to audio devices. Values of this type usually + range from 0 to (Pa_GetDeviceCount()-1), and may also take on the PaNoDevice + and paUseHostApiSpecificDeviceSpecification values. + + @see Pa_GetDeviceCount, paNoDevice, paUseHostApiSpecificDeviceSpecification +*/ +typedef int PaDeviceIndex; + + +/** A special PaDeviceIndex value indicating that no device is available, + or should be used. + + @see PaDeviceIndex +*/ +#define paNoDevice ((PaDeviceIndex)-1) + + +/** A special PaDeviceIndex value indicating that the device(s) to be used + are specified in the host api specific stream info structure. + + @see PaDeviceIndex +*/ +#define paUseHostApiSpecificDeviceSpecification ((PaDeviceIndex)-2) + + +/* Host API enumeration mechanism */ + +/** The type used to enumerate to host APIs at runtime. Values of this type + range from 0 to (Pa_GetHostApiCount()-1). + + @see Pa_GetHostApiCount +*/ +typedef int PaHostApiIndex; + + +/** Retrieve the number of available host APIs. Even if a host API is + available it may have no devices available. + + @return A non-negative value indicating the number of available host APIs + or, a PaErrorCode (which are always negative) if PortAudio is not initialized + or an error is encountered. + + @see PaHostApiIndex +*/ +PaHostApiIndex Pa_GetHostApiCount( void ); + + +/** Retrieve the index of the default host API. The default host API will be + the lowest common denominator host API on the current platform and is + unlikely to provide the best performance. + + @return A non-negative value ranging from 0 to (Pa_GetHostApiCount()-1) + indicating the default host API index or, a PaErrorCode (which are always + negative) if PortAudio is not initialized or an error is encountered. +*/ +PaHostApiIndex Pa_GetDefaultHostApi( void ); + + +/** Unchanging unique identifiers for each supported host API. This type + is used in the PaHostApiInfo structure. The values are guaranteed to be + unique and to never change, thus allowing code to be written that + conditionally uses host API specific extensions. + + New type ids will be allocated when support for a host API reaches + "public alpha" status, prior to that developers should use the + paInDevelopment type id. + + @see PaHostApiInfo +*/ +typedef enum PaHostApiTypeId +{ + paInDevelopment=0, /* use while developing support for a new host API */ + paDirectSound=1, + paMME=2, + paASIO=3, + paSoundManager=4, + paCoreAudio=5, + paOSS=7, + paALSA=8, + paAL=9, + paBeOS=10, + paWDMKS=11, + paJACK=12, + paWASAPI=13, + paAudioScienceHPI=14 +} PaHostApiTypeId; + + +/** A structure containing information about a particular host API. */ + +typedef struct PaHostApiInfo +{ + /** this is struct version 1 */ + int structVersion; + /** The well known unique identifier of this host API @see PaHostApiTypeId */ + PaHostApiTypeId type; + /** A textual description of the host API for display on user interfaces. */ + const char *name; + + /** The number of devices belonging to this host API. This field may be + used in conjunction with Pa_HostApiDeviceIndexToDeviceIndex() to enumerate + all devices for this host API. + @see Pa_HostApiDeviceIndexToDeviceIndex + */ + int deviceCount; + + /** The default input device for this host API. The value will be a + device index ranging from 0 to (Pa_GetDeviceCount()-1), or paNoDevice + if no default input device is available. + */ + PaDeviceIndex defaultInputDevice; + + /** The default output device for this host API. The value will be a + device index ranging from 0 to (Pa_GetDeviceCount()-1), or paNoDevice + if no default output device is available. + */ + PaDeviceIndex defaultOutputDevice; + +} PaHostApiInfo; + + +/** Retrieve a pointer to a structure containing information about a specific + host Api. + + @param hostApi A valid host API index ranging from 0 to (Pa_GetHostApiCount()-1) + + @return A pointer to an immutable PaHostApiInfo structure describing + a specific host API. If the hostApi parameter is out of range or an error + is encountered, the function returns NULL. + + The returned structure is owned by the PortAudio implementation and must not + be manipulated or freed. The pointer is only guaranteed to be valid between + calls to Pa_Initialize() and Pa_Terminate(). +*/ +const PaHostApiInfo * Pa_GetHostApiInfo( PaHostApiIndex hostApi ); + + +/** Convert a static host API unique identifier, into a runtime + host API index. + + @param type A unique host API identifier belonging to the PaHostApiTypeId + enumeration. + + @return A valid PaHostApiIndex ranging from 0 to (Pa_GetHostApiCount()-1) or, + a PaErrorCode (which are always negative) if PortAudio is not initialized + or an error is encountered. + + The paHostApiNotFound error code indicates that the host API specified by the + type parameter is not available. + + @see PaHostApiTypeId +*/ +PaHostApiIndex Pa_HostApiTypeIdToHostApiIndex( PaHostApiTypeId type ); + + +/** Convert a host-API-specific device index to standard PortAudio device index. + This function may be used in conjunction with the deviceCount field of + PaHostApiInfo to enumerate all devices for the specified host API. + + @param hostApi A valid host API index ranging from 0 to (Pa_GetHostApiCount()-1) + + @param hostApiDeviceIndex A valid per-host device index in the range + 0 to (Pa_GetHostApiInfo(hostApi)->deviceCount-1) + + @return A non-negative PaDeviceIndex ranging from 0 to (Pa_GetDeviceCount()-1) + or, a PaErrorCode (which are always negative) if PortAudio is not initialized + or an error is encountered. + + A paInvalidHostApi error code indicates that the host API index specified by + the hostApi parameter is out of range. + + A paInvalidDevice error code indicates that the hostApiDeviceIndex parameter + is out of range. + + @see PaHostApiInfo +*/ +PaDeviceIndex Pa_HostApiDeviceIndexToDeviceIndex( PaHostApiIndex hostApi, + int hostApiDeviceIndex ); + + + +/** Structure used to return information about a host error condition. +*/ +typedef struct PaHostErrorInfo{ + PaHostApiTypeId hostApiType; /**< the host API which returned the error code */ + long errorCode; /**< the error code returned */ + const char *errorText; /**< a textual description of the error if available, otherwise a zero-length string */ +}PaHostErrorInfo; + + +/** Return information about the last host error encountered. The error + information returned by Pa_GetLastHostErrorInfo() will never be modified + asynchronously by errors occurring in other PortAudio owned threads + (such as the thread that manages the stream callback.) + + This function is provided as a last resort, primarily to enhance debugging + by providing clients with access to all available error information. + + @return A pointer to an immutable structure constraining information about + the host error. The values in this structure will only be valid if a + PortAudio function has previously returned the paUnanticipatedHostError + error code. +*/ +const PaHostErrorInfo* Pa_GetLastHostErrorInfo( void ); + + + +/* Device enumeration and capabilities */ + +/** Retrieve the number of available devices. The number of available devices + may be zero. + + @return A non-negative value indicating the number of available devices or, + a PaErrorCode (which are always negative) if PortAudio is not initialized + or an error is encountered. +*/ +PaDeviceIndex Pa_GetDeviceCount( void ); + + +/** Retrieve the index of the default input device. The result can be + used in the inputDevice parameter to Pa_OpenStream(). + + @return The default input device index for the default host API, or paNoDevice + if no default input device is available or an error was encountered. +*/ +PaDeviceIndex Pa_GetDefaultInputDevice( void ); + + +/** Retrieve the index of the default output device. The result can be + used in the outputDevice parameter to Pa_OpenStream(). + + @return The default output device index for the default host API, or paNoDevice + if no default output device is available or an error was encountered. + + @note + On the PC, the user can specify a default device by + setting an environment variable. For example, to use device #1. +

+ set PA_RECOMMENDED_OUTPUT_DEVICE=1
+
+ The user should first determine the available device ids by using + the supplied application "pa_devs". +*/ +PaDeviceIndex Pa_GetDefaultOutputDevice( void ); + + +/** The type used to represent monotonic time in seconds. PaTime is + used for the fields of the PaStreamCallbackTimeInfo argument to the + PaStreamCallback and as the result of Pa_GetStreamTime(). + + PaTime values have unspecified origin. + + @see PaStreamCallback, PaStreamCallbackTimeInfo, Pa_GetStreamTime +*/ +typedef double PaTime; + + +/** A type used to specify one or more sample formats. Each value indicates + a possible format for sound data passed to and from the stream callback, + Pa_ReadStream and Pa_WriteStream. + + The standard formats paFloat32, paInt16, paInt32, paInt24, paInt8 + and aUInt8 are usually implemented by all implementations. + + The floating point representation (paFloat32) uses +1.0 and -1.0 as the + maximum and minimum respectively. + + paUInt8 is an unsigned 8 bit format where 128 is considered "ground" + + The paNonInterleaved flag indicates that audio data is passed as an array + of pointers to separate buffers, one buffer for each channel. Usually, + when this flag is not used, audio data is passed as a single buffer with + all channels interleaved. + + @see Pa_OpenStream, Pa_OpenDefaultStream, PaDeviceInfo + @see paFloat32, paInt16, paInt32, paInt24, paInt8 + @see paUInt8, paCustomFormat, paNonInterleaved +*/ +typedef unsigned long PaSampleFormat; + + +#define paFloat32 ((PaSampleFormat) 0x00000001) /**< @see PaSampleFormat */ +#define paInt32 ((PaSampleFormat) 0x00000002) /**< @see PaSampleFormat */ +#define paInt24 ((PaSampleFormat) 0x00000004) /**< Packed 24 bit format. @see PaSampleFormat */ +#define paInt16 ((PaSampleFormat) 0x00000008) /**< @see PaSampleFormat */ +#define paInt8 ((PaSampleFormat) 0x00000010) /**< @see PaSampleFormat */ +#define paUInt8 ((PaSampleFormat) 0x00000020) /**< @see PaSampleFormat */ +#define paCustomFormat ((PaSampleFormat) 0x00010000) /**< @see PaSampleFormat */ + +#define paNonInterleaved ((PaSampleFormat) 0x80000000) /**< @see PaSampleFormat */ + +/** A structure providing information and capabilities of PortAudio devices. + Devices may support input, output or both input and output. +*/ +typedef struct PaDeviceInfo +{ + int structVersion; /* this is struct version 2 */ + const char *name; + PaHostApiIndex hostApi; /* note this is a host API index, not a type id*/ + + int maxInputChannels; + int maxOutputChannels; + + /* Default latency values for interactive performance. */ + PaTime defaultLowInputLatency; + PaTime defaultLowOutputLatency; + /* Default latency values for robust non-interactive applications (eg. playing sound files). */ + PaTime defaultHighInputLatency; + PaTime defaultHighOutputLatency; + + double defaultSampleRate; +} PaDeviceInfo; + + +/** Retrieve a pointer to a PaDeviceInfo structure containing information + about the specified device. + @return A pointer to an immutable PaDeviceInfo structure. If the device + parameter is out of range the function returns NULL. + + @param device A valid device index in the range 0 to (Pa_GetDeviceCount()-1) + + @note PortAudio manages the memory referenced by the returned pointer, + the client must not manipulate or free the memory. The pointer is only + guaranteed to be valid between calls to Pa_Initialize() and Pa_Terminate(). + + @see PaDeviceInfo, PaDeviceIndex +*/ +const PaDeviceInfo* Pa_GetDeviceInfo( PaDeviceIndex device ); + + +/** Parameters for one direction (input or output) of a stream. +*/ +typedef struct PaStreamParameters +{ + /** A valid device index in the range 0 to (Pa_GetDeviceCount()-1) + specifying the device to be used or the special constant + paUseHostApiSpecificDeviceSpecification which indicates that the actual + device(s) to use are specified in hostApiSpecificStreamInfo. + This field must not be set to paNoDevice. + */ + PaDeviceIndex device; + + /** The number of channels of sound to be delivered to the + stream callback or accessed by Pa_ReadStream() or Pa_WriteStream(). + It can range from 1 to the value of maxInputChannels in the + PaDeviceInfo record for the device specified by the device parameter. + */ + int channelCount; + + /** The sample format of the buffer provided to the stream callback, + a_ReadStream() or Pa_WriteStream(). It may be any of the formats described + by the PaSampleFormat enumeration. + */ + PaSampleFormat sampleFormat; + + /** The desired latency in seconds. Where practical, implementations should + configure their latency based on these parameters, otherwise they may + choose the closest viable latency instead. Unless the suggested latency + is greater than the absolute upper limit for the device implementations + should round the suggestedLatency up to the next practical value - ie to + provide an equal or higher latency than suggestedLatency wherever possible. + Actual latency values for an open stream may be retrieved using the + inputLatency and outputLatency fields of the PaStreamInfo structure + returned by Pa_GetStreamInfo(). + @see default*Latency in PaDeviceInfo, *Latency in PaStreamInfo + */ + PaTime suggestedLatency; + + /** An optional pointer to a host api specific data structure + containing additional information for device setup and/or stream processing. + hostApiSpecificStreamInfo is never required for correct operation, + if not used it should be set to NULL. + */ + void *hostApiSpecificStreamInfo; + +} PaStreamParameters; + + +/** Return code for Pa_IsFormatSupported indicating success. */ +#define paFormatIsSupported (0) + +/** Determine whether it would be possible to open a stream with the specified + parameters. + + @param inputParameters A structure that describes the input parameters used to + open a stream. The suggestedLatency field is ignored. See PaStreamParameters + for a description of these parameters. inputParameters must be NULL for + output-only streams. + + @param outputParameters A structure that describes the output parameters used + to open a stream. The suggestedLatency field is ignored. See PaStreamParameters + for a description of these parameters. outputParameters must be NULL for + input-only streams. + + @param sampleRate The required sampleRate. For full-duplex streams it is the + sample rate for both input and output + + @return Returns 0 if the format is supported, and an error code indicating why + the format is not supported otherwise. The constant paFormatIsSupported is + provided to compare with the return value for success. + + @see paFormatIsSupported, PaStreamParameters +*/ +PaError Pa_IsFormatSupported( const PaStreamParameters *inputParameters, + const PaStreamParameters *outputParameters, + double sampleRate ); + + + +/* Streaming types and functions */ + + +/** + A single PaStream can provide multiple channels of real-time + streaming audio input and output to a client application. A stream + provides access to audio hardware represented by one or more + PaDevices. Depending on the underlying Host API, it may be possible + to open multiple streams using the same device, however this behavior + is implementation defined. Portable applications should assume that + a PaDevice may be simultaneously used by at most one PaStream. + + Pointers to PaStream objects are passed between PortAudio functions that + operate on streams. + + @see Pa_OpenStream, Pa_OpenDefaultStream, Pa_OpenDefaultStream, Pa_CloseStream, + Pa_StartStream, Pa_StopStream, Pa_AbortStream, Pa_IsStreamActive, + Pa_GetStreamTime, Pa_GetStreamCpuLoad + +*/ +typedef void PaStream; + + +/** Can be passed as the framesPerBuffer parameter to Pa_OpenStream() + or Pa_OpenDefaultStream() to indicate that the stream callback will + accept buffers of any size. +*/ +#define paFramesPerBufferUnspecified (0) + + +/** Flags used to control the behavior of a stream. They are passed as + parameters to Pa_OpenStream or Pa_OpenDefaultStream. Multiple flags may be + ORed together. + + @see Pa_OpenStream, Pa_OpenDefaultStream + @see paNoFlag, paClipOff, paDitherOff, paNeverDropInput, + paPrimeOutputBuffersUsingStreamCallback, paPlatformSpecificFlags +*/ +typedef unsigned long PaStreamFlags; + +/** @see PaStreamFlags */ +#define paNoFlag ((PaStreamFlags) 0) + +/** Disable default clipping of out of range samples. + @see PaStreamFlags +*/ +#define paClipOff ((PaStreamFlags) 0x00000001) + +/** Disable default dithering. + @see PaStreamFlags +*/ +#define paDitherOff ((PaStreamFlags) 0x00000002) + +/** Flag requests that where possible a full duplex stream will not discard + overflowed input samples without calling the stream callback. This flag is + only valid for full duplex callback streams and only when used in combination + with the paFramesPerBufferUnspecified (0) framesPerBuffer parameter. Using + this flag incorrectly results in a paInvalidFlag error being returned from + Pa_OpenStream and Pa_OpenDefaultStream. + + @see PaStreamFlags, paFramesPerBufferUnspecified +*/ +#define paNeverDropInput ((PaStreamFlags) 0x00000004) + +/** Call the stream callback to fill initial output buffers, rather than the + default behavior of priming the buffers with zeros (silence). This flag has + no effect for input-only and blocking read/write streams. + + @see PaStreamFlags +*/ +#define paPrimeOutputBuffersUsingStreamCallback ((PaStreamFlags) 0x00000008) + +/** A mask specifying the platform specific bits. + @see PaStreamFlags +*/ +#define paPlatformSpecificFlags ((PaStreamFlags)0xFFFF0000) + +/** + Timing information for the buffers passed to the stream callback. +*/ +typedef struct PaStreamCallbackTimeInfo{ + PaTime inputBufferAdcTime; + PaTime currentTime; + PaTime outputBufferDacTime; +} PaStreamCallbackTimeInfo; + + +/** + Flag bit constants for the statusFlags to PaStreamCallback. + + @see paInputUnderflow, paInputOverflow, paOutputUnderflow, paOutputOverflow, + paPrimingOutput +*/ +typedef unsigned long PaStreamCallbackFlags; + +/** In a stream opened with paFramesPerBufferUnspecified, indicates that + input data is all silence (zeros) because no real data is available. In a + stream opened without paFramesPerBufferUnspecified, it indicates that one or + more zero samples have been inserted into the input buffer to compensate + for an input underflow. + @see PaStreamCallbackFlags +*/ +#define paInputUnderflow ((PaStreamCallbackFlags) 0x00000001) + +/** In a stream opened with paFramesPerBufferUnspecified, indicates that data + prior to the first sample of the input buffer was discarded due to an + overflow, possibly because the stream callback is using too much CPU time. + Otherwise indicates that data prior to one or more samples in the + input buffer was discarded. + @see PaStreamCallbackFlags +*/ +#define paInputOverflow ((PaStreamCallbackFlags) 0x00000002) + +/** Indicates that output data (or a gap) was inserted, possibly because the + stream callback is using too much CPU time. + @see PaStreamCallbackFlags +*/ +#define paOutputUnderflow ((PaStreamCallbackFlags) 0x00000004) + +/** Indicates that output data will be discarded because no room is available. + @see PaStreamCallbackFlags +*/ +#define paOutputOverflow ((PaStreamCallbackFlags) 0x00000008) + +/** Some of all of the output data will be used to prime the stream, input + data may be zero. + @see PaStreamCallbackFlags +*/ +#define paPrimingOutput ((PaStreamCallbackFlags) 0x00000010) + +/** + Allowable return values for the PaStreamCallback. + @see PaStreamCallback +*/ +typedef enum PaStreamCallbackResult +{ + paContinue=0, + paComplete=1, + paAbort=2 +} PaStreamCallbackResult; + + +/** + Functions of type PaStreamCallback are implemented by PortAudio clients. + They consume, process or generate audio in response to requests from an + active PortAudio stream. + + @param input and @param output are either arrays of interleaved samples or; + if non-interleaved samples were requested using the paNonInterleaved sample + format flag, an array of buffer pointers, one non-interleaved buffer for + each channel. + + The format, packing and number of channels used by the buffers are + determined by parameters to Pa_OpenStream(). + + @param frameCount The number of sample frames to be processed by + the stream callback. + + @param timeInfo The time in seconds when the first sample of the input + buffer was received at the audio input, the time in seconds when the first + sample of the output buffer will begin being played at the audio output, and + the time in seconds when the stream callback was called. + See also Pa_GetStreamTime() + + @param statusFlags Flags indicating whether input and/or output buffers + have been inserted or will be dropped to overcome underflow or overflow + conditions. + + @param userData The value of a user supplied pointer passed to + Pa_OpenStream() intended for storing synthesis data etc. + + @return + The stream callback should return one of the values in the + PaStreamCallbackResult enumeration. To ensure that the callback continues + to be called, it should return paContinue (0). Either paComplete or paAbort + can be returned to finish stream processing, after either of these values is + returned the callback will not be called again. If paAbort is returned the + stream will finish as soon as possible. If paComplete is returned, the stream + will continue until all buffers generated by the callback have been played. + This may be useful in applications such as soundfile players where a specific + duration of output is required. However, it is not necessary to utilize this + mechanism as Pa_StopStream(), Pa_AbortStream() or Pa_CloseStream() can also + be used to stop the stream. The callback must always fill the entire output + buffer irrespective of its return value. + + @see Pa_OpenStream, Pa_OpenDefaultStream + + @note With the exception of Pa_GetStreamCpuLoad() it is not permissible to call + PortAudio API functions from within the stream callback. +*/ +typedef int PaStreamCallback( + const void *input, void *output, + unsigned long frameCount, + const PaStreamCallbackTimeInfo* timeInfo, + PaStreamCallbackFlags statusFlags, + void *userData ); + + +/** Opens a stream for either input, output or both. + + @param stream The address of a PaStream pointer which will receive + a pointer to the newly opened stream. + + @param inputParameters A structure that describes the input parameters used by + the opened stream. See PaStreamParameters for a description of these parameters. + inputParameters must be NULL for output-only streams. + + @param outputParameters A structure that describes the output parameters used by + the opened stream. See PaStreamParameters for a description of these parameters. + outputParameters must be NULL for input-only streams. + + @param sampleRate The desired sampleRate. For full-duplex streams it is the + sample rate for both input and output + + @param framesPerBuffer The number of frames passed to the stream callback + function, or the preferred block granularity for a blocking read/write stream. + The special value paFramesPerBufferUnspecified (0) may be used to request that + the stream callback will receive an optimal (and possibly varying) number of + frames based on host requirements and the requested latency settings. + Note: With some host APIs, the use of non-zero framesPerBuffer for a callback + stream may introduce an additional layer of buffering which could introduce + additional latency. PortAudio guarantees that the additional latency + will be kept to the theoretical minimum however, it is strongly recommended + that a non-zero framesPerBuffer value only be used when your algorithm + requires a fixed number of frames per stream callback. + + @param streamFlags Flags which modify the behavior of the streaming process. + This parameter may contain a combination of flags ORed together. Some flags may + only be relevant to certain buffer formats. + + @param streamCallback A pointer to a client supplied function that is responsible + for processing and filling input and output buffers. If this parameter is NULL + the stream will be opened in 'blocking read/write' mode. In blocking mode, + the client can receive sample data using Pa_ReadStream and write sample data + using Pa_WriteStream, the number of samples that may be read or written + without blocking is returned by Pa_GetStreamReadAvailable and + Pa_GetStreamWriteAvailable respectively. + + @param userData A client supplied pointer which is passed to the stream callback + function. It could for example, contain a pointer to instance data necessary + for processing the audio buffers. This parameter is ignored if streamCallback + is NULL. + + @return + Upon success Pa_OpenStream() returns paNoError and places a pointer to a + valid PaStream in the stream argument. The stream is inactive (stopped). + If a call to Pa_OpenStream() fails, a non-zero error code is returned (see + PaError for possible error codes) and the value of stream is invalid. + + @see PaStreamParameters, PaStreamCallback, Pa_ReadStream, Pa_WriteStream, + Pa_GetStreamReadAvailable, Pa_GetStreamWriteAvailable +*/ +PaError Pa_OpenStream( PaStream** stream, + const PaStreamParameters *inputParameters, + const PaStreamParameters *outputParameters, + double sampleRate, + unsigned long framesPerBuffer, + PaStreamFlags streamFlags, + PaStreamCallback *streamCallback, + void *userData ); + + +/** A simplified version of Pa_OpenStream() that opens the default input + and/or output devices. + + @param stream The address of a PaStream pointer which will receive + a pointer to the newly opened stream. + + @param numInputChannels The number of channels of sound that will be supplied + to the stream callback or returned by Pa_ReadStream. It can range from 1 to + the value of maxInputChannels in the PaDeviceInfo record for the default input + device. If 0 the stream is opened as an output-only stream. + + @param numOutputChannels The number of channels of sound to be delivered to the + stream callback or passed to Pa_WriteStream. It can range from 1 to the value + of maxOutputChannels in the PaDeviceInfo record for the default output device. + If 0 the stream is opened as an output-only stream. + + @param sampleFormat The sample format of both the input and output buffers + provided to the callback or passed to and from Pa_ReadStream and Pa_WriteStream. + sampleFormat may be any of the formats described by the PaSampleFormat + enumeration. + + @param sampleRate Same as Pa_OpenStream parameter of the same name. + @param framesPerBuffer Same as Pa_OpenStream parameter of the same name. + @param streamCallback Same as Pa_OpenStream parameter of the same name. + @param userData Same as Pa_OpenStream parameter of the same name. + + @return As for Pa_OpenStream + + @see Pa_OpenStream, PaStreamCallback +*/ +PaError Pa_OpenDefaultStream( PaStream** stream, + int numInputChannels, + int numOutputChannels, + PaSampleFormat sampleFormat, + double sampleRate, + unsigned long framesPerBuffer, + PaStreamCallback *streamCallback, + void *userData ); + + +/** Closes an audio stream. If the audio stream is active it + discards any pending buffers as if Pa_AbortStream() had been called. +*/ +PaError Pa_CloseStream( PaStream *stream ); + + +/** Functions of type PaStreamFinishedCallback are implemented by PortAudio + clients. They can be registered with a stream using the Pa_SetStreamFinishedCallback + function. Once registered they are called when the stream becomes inactive + (ie once a call to Pa_StopStream() will not block). + A stream will become inactive after the stream callback returns non-zero, + or when Pa_StopStream or Pa_AbortStream is called. For a stream providing audio + output, if the stream callback returns paComplete, or Pa_StopStream is called, + the stream finished callback will not be called until all generated sample data + has been played. + + @param userData The userData parameter supplied to Pa_OpenStream() + + @see Pa_SetStreamFinishedCallback +*/ +typedef void PaStreamFinishedCallback( void *userData ); + + +/** Register a stream finished callback function which will be called when the + stream becomes inactive. See the description of PaStreamFinishedCallback for + further details about when the callback will be called. + + @param stream a pointer to a PaStream that is in the stopped state - if the + stream is not stopped, the stream's finished callback will remain unchanged + and an error code will be returned. + + @param streamFinishedCallback a pointer to a function with the same signature + as PaStreamFinishedCallback, that will be called when the stream becomes + inactive. Passing NULL for this parameter will un-register a previously + registered stream finished callback function. + + @return on success returns paNoError, otherwise an error code indicating the cause + of the error. + + @see PaStreamFinishedCallback +*/ +PaError Pa_SetStreamFinishedCallback( PaStream *stream, PaStreamFinishedCallback* streamFinishedCallback ); + + +/** Commences audio processing. +*/ +PaError Pa_StartStream( PaStream *stream ); + + +/** Terminates audio processing. It waits until all pending + audio buffers have been played before it returns. +*/ +PaError Pa_StopStream( PaStream *stream ); + + +/** Terminates audio processing immediately without waiting for pending + buffers to complete. +*/ +PaError Pa_AbortStream( PaStream *stream ); + + +/** Determine whether the stream is stopped. + A stream is considered to be stopped prior to a successful call to + Pa_StartStream and after a successful call to Pa_StopStream or Pa_AbortStream. + If a stream callback returns a value other than paContinue the stream is NOT + considered to be stopped. + + @return Returns one (1) when the stream is stopped, zero (0) when + the stream is running or, a PaErrorCode (which are always negative) if + PortAudio is not initialized or an error is encountered. + + @see Pa_StopStream, Pa_AbortStream, Pa_IsStreamActive +*/ +PaError Pa_IsStreamStopped( PaStream *stream ); + + +/** Determine whether the stream is active. + A stream is active after a successful call to Pa_StartStream(), until it + becomes inactive either as a result of a call to Pa_StopStream() or + Pa_AbortStream(), or as a result of a return value other than paContinue from + the stream callback. In the latter case, the stream is considered inactive + after the last buffer has finished playing. + + @return Returns one (1) when the stream is active (ie playing or recording + audio), zero (0) when not playing or, a PaErrorCode (which are always negative) + if PortAudio is not initialized or an error is encountered. + + @see Pa_StopStream, Pa_AbortStream, Pa_IsStreamStopped +*/ +PaError Pa_IsStreamActive( PaStream *stream ); + + + +/** A structure containing unchanging information about an open stream. + @see Pa_GetStreamInfo +*/ + +typedef struct PaStreamInfo +{ + /** this is struct version 1 */ + int structVersion; + + /** The input latency of the stream in seconds. This value provides the most + accurate estimate of input latency available to the implementation. It may + differ significantly from the suggestedLatency value passed to Pa_OpenStream(). + The value of this field will be zero (0.) for output-only streams. + @see PaTime + */ + PaTime inputLatency; + + /** The output latency of the stream in seconds. This value provides the most + accurate estimate of output latency available to the implementation. It may + differ significantly from the suggestedLatency value passed to Pa_OpenStream(). + The value of this field will be zero (0.) for input-only streams. + @see PaTime + */ + PaTime outputLatency; + + /** The sample rate of the stream in Hertz (samples per second). In cases + where the hardware sample rate is inaccurate and PortAudio is aware of it, + the value of this field may be different from the sampleRate parameter + passed to Pa_OpenStream(). If information about the actual hardware sample + rate is not available, this field will have the same value as the sampleRate + parameter passed to Pa_OpenStream(). + */ + double sampleRate; + +} PaStreamInfo; + + +/** Retrieve a pointer to a PaStreamInfo structure containing information + about the specified stream. + @return A pointer to an immutable PaStreamInfo structure. If the stream + parameter invalid, or an error is encountered, the function returns NULL. + + @param stream A pointer to an open stream previously created with Pa_OpenStream. + + @note PortAudio manages the memory referenced by the returned pointer, + the client must not manipulate or free the memory. The pointer is only + guaranteed to be valid until the specified stream is closed. + + @see PaStreamInfo +*/ +const PaStreamInfo* Pa_GetStreamInfo( PaStream *stream ); + + +/** Returns the current time in seconds for a stream according to the same clock used + to generate callback PaStreamCallbackTimeInfo timestamps. The time values are + monotonically increasing and have unspecified origin. + + Pa_GetStreamTime returns valid time values for the entire life of the stream, + from when the stream is opened until it is closed. Starting and stopping the stream + does not affect the passage of time returned by Pa_GetStreamTime. + + This time may be used for synchronizing other events to the audio stream, for + example synchronizing audio to MIDI. + + @return The stream's current time in seconds, or 0 if an error occurred. + + @see PaTime, PaStreamCallback, PaStreamCallbackTimeInfo +*/ +PaTime Pa_GetStreamTime( PaStream *stream ); + + +/** Retrieve CPU usage information for the specified stream. + The "CPU Load" is a fraction of total CPU time consumed by a callback stream's + audio processing routines including, but not limited to the client supplied + stream callback. This function does not work with blocking read/write streams. + + This function may be called from the stream callback function or the + application. + + @return + A floating point value, typically between 0.0 and 1.0, where 1.0 indicates + that the stream callback is consuming the maximum number of CPU cycles possible + to maintain real-time operation. A value of 0.5 would imply that PortAudio and + the stream callback was consuming roughly 50% of the available CPU time. The + return value may exceed 1.0. A value of 0.0 will always be returned for a + blocking read/write stream, or if an error occurs. +*/ +double Pa_GetStreamCpuLoad( PaStream* stream ); + + +/** Read samples from an input stream. The function doesn't return until + the entire buffer has been filled - this may involve waiting for the operating + system to supply the data. + + @param stream A pointer to an open stream previously created with Pa_OpenStream. + + @param buffer A pointer to a buffer of sample frames. The buffer contains + samples in the format specified by the inputParameters->sampleFormat field + used to open the stream, and the number of channels specified by + inputParameters->numChannels. If non-interleaved samples were requested using + the paNonInterleaved sample format flag, buffer is a pointer to the first element + of an array of buffer pointers, one non-interleaved buffer for each channel. + + @param frames The number of frames to be read into buffer. This parameter + is not constrained to a specific range, however high performance applications + will want to match this parameter to the framesPerBuffer parameter used + when opening the stream. + + @return On success PaNoError will be returned, or PaInputOverflowed if input + data was discarded by PortAudio after the previous call and before this call. +*/ +PaError Pa_ReadStream( PaStream* stream, + void *buffer, + unsigned long frames ); + + +/** Write samples to an output stream. This function doesn't return until the + entire buffer has been consumed - this may involve waiting for the operating + system to consume the data. + + @param stream A pointer to an open stream previously created with Pa_OpenStream. + + @param buffer A pointer to a buffer of sample frames. The buffer contains + samples in the format specified by the outputParameters->sampleFormat field + used to open the stream, and the number of channels specified by + outputParameters->numChannels. If non-interleaved samples were requested using + the paNonInterleaved sample format flag, buffer is a pointer to the first element + of an array of buffer pointers, one non-interleaved buffer for each channel. + + @param frames The number of frames to be written from buffer. This parameter + is not constrained to a specific range, however high performance applications + will want to match this parameter to the framesPerBuffer parameter used + when opening the stream. + + @return On success PaNoError will be returned, or paOutputUnderflowed if + additional output data was inserted after the previous call and before this + call. +*/ +PaError Pa_WriteStream( PaStream* stream, + const void *buffer, + unsigned long frames ); + + +/** Retrieve the number of frames that can be read from the stream without + waiting. + + @return Returns a non-negative value representing the maximum number of frames + that can be read from the stream without blocking or busy waiting or, a + PaErrorCode (which are always negative) if PortAudio is not initialized or an + error is encountered. +*/ +signed long Pa_GetStreamReadAvailable( PaStream* stream ); + + +/** Retrieve the number of frames that can be written to the stream without + waiting. + + @return Returns a non-negative value representing the maximum number of frames + that can be written to the stream without blocking or busy waiting or, a + PaErrorCode (which are always negative) if PortAudio is not initialized or an + error is encountered. +*/ +signed long Pa_GetStreamWriteAvailable( PaStream* stream ); + + +/* Miscellaneous utilities */ + + +/** Retrieve the size of a given sample format in bytes. + + @return The size in bytes of a single sample in the specified format, + or paSampleFormatNotSupported if the format is not supported. +*/ +PaError Pa_GetSampleSize( PaSampleFormat format ); + + +/** Put the caller to sleep for at least 'msec' milliseconds. This function is + provided only as a convenience for authors of portable code (such as the tests + and examples in the PortAudio distribution.) + + The function may sleep longer than requested so don't rely on this for accurate + musical timing. +*/ +void Pa_Sleep( long msec ); + + + +#ifdef __cplusplus +} +#endif /* __cplusplus */ +#endif /* PORTAUDIO_H */ diff --git a/Externals/portaudio/x64/portaudio.lib b/Externals/portaudio/x64/portaudio.lib new file mode 100644 index 0000000000000000000000000000000000000000..788abc25f25f7e00ea6cf77532e17cb1dbc25171 GIT binary patch literal 1212230 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%0Au5#RyfNYDfB2!_F3z*dlb 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

W19j~cIMBj1hJPZ+Pc{_eqR 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

63%UsY9A;7qnO&g|8gCF~u$|S$p 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

akNn+E+{ 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 literal 0 HcmV?d00001 diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h index 888a206d5d..f08a4d1bfe 100644 --- a/Source/Core/Common/Src/Common.h +++ b/Source/Core/Common/Src/Common.h @@ -89,6 +89,8 @@ private: // Since it is always around on windows #define HAVE_WX 1 + #define HAVE_PORTAUDIO 1 + // Debug definitions #if defined(_DEBUG) #include diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index cc6d673f29..289d741852 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -115,7 +115,7 @@ - .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories) + .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories) true @@ -127,7 +127,7 @@ - .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories) + .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories) true @@ -139,7 +139,7 @@ - .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories) + .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories) true @@ -153,7 +153,7 @@ - .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories) + .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories) true @@ -167,7 +167,7 @@ - .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories) + .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories) true @@ -181,7 +181,7 @@ - .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories) + .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories) true diff --git a/Source/VSProps/Dolphin.Win32.props b/Source/VSProps/Dolphin.Win32.props index 3e9c99f5c9..8908f84c94 100644 --- a/Source/VSProps/Dolphin.Win32.props +++ b/Source/VSProps/Dolphin.Win32.props @@ -7,8 +7,8 @@ - ..\..\..\Externals\SDL\$(PlatformName);..\..\..\Externals\GLew;..\..\..\Externals\Cg - 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) + ..\..\..\Externals\SDL\$(PlatformName);..\..\..\Externals\GLew;..\..\..\Externals\Cg;..\..\..\Externals\portaudio\$(PlatformName) + 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 97a981c8ce..b729ff4414 100644 --- a/Source/VSProps/Dolphin.x64.props +++ b/Source/VSProps/Dolphin.x64.props @@ -8,8 +8,8 @@ - ..\..\..\Externals\SDL\$(PlatformName);..\..\..\Externals\GLew;..\..\..\Externals\Cg64 - 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) + ..\..\..\Externals\SDL\$(PlatformName);..\..\..\Externals\GLew;..\..\..\Externals\Cg64;..\..\..\Externals\portaudio\$(PlatformName) + 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 856972f808e62b026f1c4bc035e95722c86fac92 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Mon, 3 Oct 2011 22:54:15 -0700 Subject: [PATCH 067/381] remove hacky old MicButton stuff --- Source/Core/Core/Src/HW/SI_DeviceGCController.cpp | 2 -- Source/Core/Core/Src/Movie.cpp | 2 -- Source/Core/InputCommon/Src/GCPadStatus.h | 1 - 3 files changed, 5 deletions(-) diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp index f4ee12d9dc..601fb98f02 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp @@ -239,8 +239,6 @@ bool CSIDevice_GCController::GetData(u32& _Hi, u32& _Low) } } - SetMic(PadStatus.MicButton); // This is dumb and should not be here - return true; } diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 5bfd5fbc24..d340496c33 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -483,10 +483,8 @@ void PlayController(SPADStatus *PadStatus, int controllerID) // dtm files don't save the mic button or error bit. not sure if they're actually // used, but better safe than sorry - bool m = PadStatus->MicButton; signed char e = PadStatus->err; memset(PadStatus, 0, sizeof(SPADStatus)); - PadStatus->MicButton = m; PadStatus->err = e; memcpy(&g_padState, &(tmpInput[inputOffset]), 8); diff --git a/Source/Core/InputCommon/Src/GCPadStatus.h b/Source/Core/InputCommon/Src/GCPadStatus.h index 72b790bbc6..835089a70d 100644 --- a/Source/Core/InputCommon/Src/GCPadStatus.h +++ b/Source/Core/InputCommon/Src/GCPadStatus.h @@ -51,7 +51,6 @@ typedef struct unsigned char triggerRight; // 0 <= triggerRight <= 255 unsigned char analogA; // 0 <= analogA <= 255 unsigned char analogB; // 0 <= analogB <= 255 - bool MicButton; // HAX signed char err; // one of PAD_ERR_* number } SPADStatus; From 5dc866bfc9c178b1a490012d04f9ef3d499a8d76 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Mon, 3 Oct 2011 23:30:29 -0700 Subject: [PATCH 068/381] Fix gamecube microphone (button not implemented, yet :p). Calls ExpansionInterface::UpdateInterrupts just before checking exceptions now. --- Source/Core/Core/Src/HW/EXI_Device.cpp | 2 +- Source/Core/Core/Src/HW/EXI_DeviceMic.cpp | 378 ++++++++---------- Source/Core/Core/Src/HW/EXI_DeviceMic.h | 74 +++- Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp | 13 +- Source/Core/Core/Src/PowerPC/PowerPC.cpp | 5 + 5 files changed, 226 insertions(+), 246 deletions(-) diff --git a/Source/Core/Core/Src/HW/EXI_Device.cpp b/Source/Core/Core/Src/HW/EXI_Device.cpp index fc73f4e0d8..8660d84720 100644 --- a/Source/Core/Core/Src/HW/EXI_Device.cpp +++ b/Source/Core/Core/Src/HW/EXI_Device.cpp @@ -127,7 +127,7 @@ IEXIDevice* EXIDevice_Create(TEXIDevices _EXIDevice) break; case EXIDEVICE_MIC: - return new CEXIMic(1); + return new CEXIMic(); break; case EXIDEVICE_ETH: diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp index 5979463176..4bafd51de6 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp @@ -16,115 +16,131 @@ // http://code.google.com/p/dolphin-emu/ #include "Common.h" + +#if HAVE_PORTAUDIO + #include "FileUtil.h" #include "StringUtil.h" #include "../Core.h" #include "../CoreTiming.h" +#include "SystemTimers.h" #include "EXI_Device.h" #include "EXI_DeviceMic.h" -// Unfortunately this must be enabled in Common.h for windows users. Scons should enable it otherwise -#if !HAVE_PORTAUDIO - -void SetMic(bool Value){} - -CEXIMic::CEXIMic(int _Index){} -CEXIMic::~CEXIMic(){} -bool CEXIMic::IsPresent() {return false;} -void CEXIMic::SetCS(int cs){} -void CEXIMic::Update(){} -void CEXIMic::TransferByte(u8 &byte){} -bool CEXIMic::IsInterruptSet(){return false;} - -#else - -// We use PortAudio for cross-platform audio input. -// It needs the headers and a lib file for the dll #include -#ifdef _WIN32 -#pragma comment(lib, "C:/Users/Shawn/Desktop/portaudio/portaudio-v19/portaudio_x64.lib") -#endif +static bool pa_init = false; -static bool MicButton = false; -static bool IsOpen; - -union InputData +void CEXIMic::StreamLog(const char *msg) { - s16 word; - u8 byte[2]; -}; - -InputData inputData[64]; // 64 words = Max 128 bytes returned???? -PaStream *stream; -PaError err; -unsigned short SFreq; -unsigned short SNum; -bool m_bInterruptSet; -bool Sampling; - - -void SetMic(bool Value) -{ - MicButton = Value; - if(Sampling) - Pa_StartStream( stream ); - else - Pa_StopStream( stream ); + DEBUG_LOG(EXPANSIONINTERFACE, "%s: %s", + msg, Pa_GetErrorText(pa_error)); } -int patestCallback( const void *inputBuffer, void *outputBuffer, - unsigned long frameCount, - const PaStreamCallbackTimeInfo* timeInfo, - PaStreamCallbackFlags statusFlags, - void *userData ) +void CEXIMic::StreamInit() { - s16 *data = (s16*)inputBuffer; - //s16 *out = (s16*)outputBuffer; - - if (!m_bInterruptSet && Sampling) + // Setup the wonderful c-interfaced lib... + pa_error = paNoError; + if (!pa_init) { - for(unsigned int i = 0; i < SNum; ++i) + pa_error = Pa_Initialize(); + + if (pa_error != paNoError) { - inputData[i].word = data[i]; - //out[i] = inputData[i].word; + StreamLog("Pa_Initialize"); } - m_bInterruptSet = true; + else + pa_init = true; } - return paContinue; + + mic_count++; } +void CEXIMic::StreamTerminate() +{ + // TODO keep track of number of mics... + if (pa_init && --mic_count <= 0) + pa_error = Pa_Terminate(); + + if (pa_error != paNoError) + { + StreamLog("Pa_Terminate"); + } + else + pa_init = false; +} + +void CEXIMic::StreamStart() +{ + // Open stream with current parameters + if (pa_init) + { + pa_error = Pa_OpenDefaultStream(&pa_stream, 1, 0, paInt16, + sample_rate, buff_size_samples, NULL, NULL); + StreamLog("Pa_OpenDefaultStream"); + pa_error = Pa_StartStream(pa_stream); + StreamLog("Pa_StartStream"); + } +} + +void CEXIMic::StreamStop() +{ + // Acts as if Pa_AbortStream was called + pa_error = Pa_CloseStream(pa_stream); + StreamLog("Pa_CloseStream"); +} + +void CEXIMic::StreamReadOne() +{ + // Returns num samples or error + pa_error = Pa_GetStreamReadAvailable(pa_stream); + if (pa_error >= buff_size_samples) + { + pa_error = Pa_ReadStream(pa_stream, ring_buffer, buff_size_samples); + + if (pa_error != paNoError) + { + status.buff_ovrflw = 1; + // Input overflowed - is re-setting the stream the only to recover? + StreamLog("Pa_ReadStream"); + + StreamStop(); + StreamStart(); + } + } +} // EXI Mic Device +// This works by opening and starting a portaudio input stream when the is_active +// bit is set. The interrupt is scheduled in the future based on sample rate and +// buffer size settings. When the console handles the interrupt, it will send +// cmdGetBuffer, which is when we actually read data from a buffer portaudio fills +// in the background (ie on demand instead of realtime). Because of this we need +// to clear portaudio's buffer if emulation speed drops below realtime, or else +// a bad audio lag develops. It's actually kind of convenient because it gives +// us a way to detect if buff_ovrflw should be set. -CEXIMic::CEXIMic(int _Index) +u8 const CEXIMic::exi_id[] = { 0, 0x0a, 0, 0, 0 }; +int CEXIMic::mic_count = 0; + +CEXIMic::CEXIMic() { - Index = _Index; - - memset(&inputData, 0 , sizeof(inputData)); - memset(&Status.U16, 0 , sizeof(u16)); + status.U16 = 0; command = 0; - m_uPosition = 0; - m_bInterruptSet = false; - MicButton = false; - IsOpen = false; - err = Pa_Initialize(); - if (err != paNoError) - ERROR_LOG(EXPANSIONINTERFACE, "EXI MIC: PortAudio Initialize error %s", Pa_GetErrorText(err)); + m_position = 0; + ring_pos = 0; + next_int_ticks = 0; + + StreamInit(); } CEXIMic::~CEXIMic() { - err = Pa_CloseStream( stream ); - if (err != paNoError) - ERROR_LOG(EXPANSIONINTERFACE, "EXI MIC: PortAudio Close error %s", Pa_GetErrorText(err)); - err = Pa_Terminate(); - if (err != paNoError) - ERROR_LOG(EXPANSIONINTERFACE, "EXI MIC: PortAudio Terminate error %s", Pa_GetErrorText(err)); + StreamTerminate(); } -bool CEXIMic::IsPresent() +bool CEXIMic::IsPresent() { return true; } @@ -132,38 +148,26 @@ bool CEXIMic::IsPresent() void CEXIMic::SetCS(int cs) { if (cs) // not-selected to selected - m_uPosition = 0; - else - { - switch (command) - { - case cmdID: - case cmdGetStatus: - case cmdSetStatus: - case cmdGetBuffer: - break; - case cmdWakeUp: - // This is probably not a command, but anyway... - // The command 0xff seems to be used to get in sync with the microphone or to wake it up. - // Normally, it is issued before any other command, or to recover from errors. - WARN_LOG(EXPANSIONINTERFACE, "EXI MIC: WakeUp cmd"); - break; - default: - WARN_LOG(EXPANSIONINTERFACE, "EXI MIC: unknown CS command %02x\n", command); - break; - } - } + m_position = 0; + // Doesn't appear to do anything we care about + //else if (command == cmdReset) } -void CEXIMic::Update() +void CEXIMic::UpdateNextInterruptTicks() { + next_int_ticks = CoreTiming::GetTicks() + + (SystemTimers::GetTicksPerSecond() / sample_rate) * buff_size_samples; } bool CEXIMic::IsInterruptSet() { - if(m_bInterruptSet) + if (next_int_ticks && CoreTiming::GetTicks() >= next_int_ticks) { - m_bInterruptSet = false; + if (status.is_active) + UpdateNextInterruptTicks(); + else + next_int_ticks = 0; + return true; } else @@ -174,124 +178,66 @@ bool CEXIMic::IsInterruptSet() void CEXIMic::TransferByte(u8 &byte) { - if (m_uPosition == 0) + if (m_position == 0) { command = byte; // first byte is command byte = 0xFF; // would be tristate, but we don't care. - } - else - { - switch (command) - { - case cmdID: - if (m_uPosition == 1) - ;//byte = 0x80; // dummy cycle - taken from memcard, it doesn't seem to need it here - else - byte = (u8)(EXI_DEVTYPE_MIC >> (24-(((m_uPosition-2) & 3) * 8))); - break; - case cmdGetStatus: - { - if (m_uPosition != 1 && m_uPosition != 2) - WARN_LOG(EXPANSIONINTERFACE, "EXI MIC: WARNING GetStatus @ pos: %d should never happen", m_uPosition); - if((!Status.button && MicButton)||(Status.button && !MicButton)) - WARN_LOG(EXPANSIONINTERFACE, "EXI MIC: Mic button %s", MicButton ? "pressed" : "released"); - - Status.button = MicButton ? 1 : 0; - byte = Status.U8[ (m_uPosition - 1) ? 0 : 1]; - INFO_LOG(EXPANSIONINTERFACE, "EXI MIC: Status is 0x%04x", Status.U16); - } - break; - case cmdSetStatus: - { - // 0x80 0xXX 0xYY - // cmd pos1 pos2 - - // Here we assign the byte to the proper place in Status and update portaudio settings - Status.U8[ (m_uPosition - 1) ? 0 : 1] = byte; - - if(m_uPosition == 2) - { - Sampling = (Status.sampling == 1) ? true : false; - - switch (Status.sRate) - { - case 0: - SFreq = 11025; - break; - case 1: - SFreq = 22050; - break; - case 2: - SFreq = 44100; - break; - default: - ERROR_LOG(EXPANSIONINTERFACE, "EXI MIC: Trying to set unknown sampling rate"); - SFreq = 44100; - break; - } - - switch (Status.pLength) - { - case 0: - SNum = 32; - break; - case 1: - SNum = 64; - break; - case 2: - SNum = 128; - break; - default: - ERROR_LOG(EXPANSIONINTERFACE, "EXI MIC: Trying to set unknown period length"); - SNum = 128; - break; - } - - DEBUG_LOG(EXPANSIONINTERFACE, "//////////////////////////////////////////////////////////////////////////"); - DEBUG_LOG(EXPANSIONINTERFACE, "EXI MIC: Status is now 0x%04x", Status.U16); - DEBUG_LOG(EXPANSIONINTERFACE, "\tbutton %i\tsRate %i\tpLength %i\tsampling %i\n", - Status.button, SFreq, SNum, Status.sampling); - - if(!IsOpen) - { - // Open Our PortAudio Stream - // (shuffle2) This (and the callback) could still be wrong - err = Pa_OpenDefaultStream( - &stream, // Our PaStream - 1, // Input Channels - 0, // Output Channels - paInt16, // Output format - GC wants PCM samples in signed 16-bit format - SFreq, // Sample Rate - SNum, // Period Length (frames per buffer) - patestCallback,// Our callback! - NULL); // Pointer passed to our callback - if (err != paNoError) - { - ERROR_LOG(EXPANSIONINTERFACE, "EXI MIC: PortAudio error %s", Pa_GetErrorText(err)); - } - else - IsOpen = true; - } - } - } - break; - case cmdGetBuffer: - { - int pos = m_uPosition - 1; - // (sonicadvance1)I think if we set the Interrupt to false, it reads another 64 - // Will Look in to it. - // (shuffle2)Seems like games just continuously get the buffer as long as - // they're sampling and the mic is generating interrupts - byte = inputData[pos].byte[ (pos & 1) ? 0 : 1 ]; - INFO_LOG(EXPANSIONINTERFACE, "EXI MIC: GetBuffer%s%d/%d byte: 0x%02x", - (pos > 9) ? " " : " ", pos, SNum, byte); - } - break; - default: - ERROR_LOG(EXPANSIONINTERFACE, "EXI MIC: unknown command byte %02x\n", command); - break; - } + m_position++; + return; } - m_uPosition++; + + int pos = m_position - 1; + + switch (command) + { + case cmdID: + byte = exi_id[pos]; + break; + + case cmdGetStatus: + byte = status.U8[pos ^ 1]; + if (pos == 1 && status.buff_ovrflw) + status.buff_ovrflw = 0; + break; + + case cmdSetStatus: + { + bool wasactive = status.is_active; + status.U8[pos ^ 1] = byte; + + // safe to do since these can only be entered if both bytes of status have been written + if (!wasactive && status.is_active) + { + sample_rate = rate_base << status.sample_rate; + buff_size = ring_base << status.buff_size; + buff_size_samples = buff_size / sample_size; + + UpdateNextInterruptTicks(); + + StreamStart(); + } + else if (wasactive && !status.is_active) + { + StreamStop(); + } + } + break; + + case cmdGetBuffer: + if (ring_pos == 0) + { + // Can set buff_ovrflw + StreamReadOne(); + } + byte = ring_buffer[ring_pos ^ 1]; + ring_pos = (ring_pos + 1) % buff_size; + break; + + default: + ERROR_LOG(EXPANSIONINTERFACE, "EXI MIC: unknown command byte %02x", command); + break; + } + + m_position++; } #endif diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMic.h b/Source/Core/Core/Src/HW/EXI_DeviceMic.h index 3fa463e722..e87d39f1a5 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMic.h +++ b/Source/Core/Core/Src/HW/EXI_DeviceMic.h @@ -18,58 +18,90 @@ #ifndef _EXI_DEVICEMIC_H #define _EXI_DEVICEMIC_H +#if HAVE_PORTAUDIO + class CEXIMic : public IEXIDevice { public: - CEXIMic(int _Index); + CEXIMic(); virtual ~CEXIMic(); void SetCS(int cs); - void Update(); bool IsInterruptSet(); bool IsPresent(); private: + static int mic_count; + static u8 const exi_id[]; + static int const sample_size = sizeof(s16); + static int const rate_base = 11025; + static int const ring_base = 32; enum - { - EXI_DEVTYPE_MIC = 0x0A000000 - }; - - enum { cmdID = 0x00, cmdGetStatus = 0x40, cmdSetStatus = 0x80, cmdGetBuffer = 0x20, - cmdWakeUp = 0xFF, + cmdReset = 0xFF, }; // STATE_TO_SAVE - int interruptSwitch; + u32 m_position; int command; - union uStatus + union UStatus { u16 U16; u8 U8[2]; struct { - u16 :8; // Unknown - u16 button :1; // 1: Button Pressed - u16 unk1 :1; // 1 ? Overflow? - u16 unk2 :1; // Unknown related to 0 and 15 values It seems - u16 sRate :2; // Sample Rate, 00-11025, 01-22050, 10-44100, 11-?? - u16 pLength :2; // Period Length, 00-32, 01-64, 10-128, 11-??? - u16 sampling :1; // If We Are Sampling or Not + u16 out :4; // MICSet/GetOut...??? + u16 button :5; // Buttons. Top bit is mic button. Lowest bit is used for MICGetDeviceID (always 0) + u16 buff_ovrflw :1; // Ring buffer wrote over bytes which weren't read by console + u16 gain :1; // Gain: 0dB or 15dB + u16 sample_rate :2; // Sample rate, 00-11025, 01-22050, 10-44100, 11-?? + u16 buff_size :2; // Ring buffer size in bytes, 00-32, 01-64, 10-128, 11-??? + u16 is_active :1; // If we are sampling or not }; }; - int Index; - u32 m_uPosition; - uStatus Status; + UStatus status; + + // status bits converted to nice numbers + int sample_rate; + int buff_size; + int buff_size_samples; + + // 64 is the max size, can be 16 or 32 as well + int ring_pos; + u8 ring_buffer[64 * sample_size]; + + // 0 to disable interrupts, else it will be checked against current cpu ticks + // to determine if interrupt should be raised + u64 next_int_ticks; + void UpdateNextInterruptTicks(); + + // Streaming input interface + int pa_error; // PaError + void *pa_stream; // PaStream + + void StreamLog(const char *msg); + void StreamInit(); + void StreamTerminate(); + void StreamStart(); + void StreamStop(); + void StreamReadOne(); protected: virtual void TransferByte(u8 &byte); }; -void SetMic(bool Value); +#else // HAVE_PORTAUDIO + +class CEXIMic : public IEXIDevice +{ +public: + CEXIMic() {} +}; #endif + +#endif // _EXI_DEVICEMIC_H diff --git a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp b/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp index 4515cd5a79..b9aaa2df6a 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp @@ -206,14 +206,11 @@ void Jit64AsmRoutineManager::Generate() ABI_CallFunction(reinterpret_cast(&CoreTiming::Advance)); testExceptions = GetCodePtr(); - TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(0xFFFFFFFF)); - FixupBranch skipExceptions = J_CC(CC_Z); - 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)); - SetJumpTarget(skipExceptions); + 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, outerLoop, true); diff --git a/Source/Core/Core/Src/PowerPC/PowerPC.cpp b/Source/Core/Core/Src/PowerPC/PowerPC.cpp index 567f3ff98e..590881bb96 100644 --- a/Source/Core/Core/Src/PowerPC/PowerPC.cpp +++ b/Source/Core/Core/Src/PowerPC/PowerPC.cpp @@ -37,6 +37,7 @@ #include "CPUCoreBase.h" #include "../Host.h" +#include "HW/EXI.h" CPUCoreBase *cpu_core_base; @@ -268,6 +269,10 @@ void Stop() void CheckExceptions() { + // Make sure we are checking against the latest EXI status. This is required + // for devices which interrupt frequently, such as the gc mic + ExpansionInterface::UpdateInterrupts(); + // Read volatile data once u32 exceptions = ppcState.Exceptions; From 86950e7cceb33c676ba6093ba20f4d08ae794195 Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Thu, 15 Sep 2011 14:08:27 -0700 Subject: [PATCH 069/381] fix gcmemcard format broken by 5f9591cf9d0a0c9f87832dad58faa079d4ca7d24 small cleanup to format, now works for slot a and b and any memcard size --- .../DolphinWX/Src/MemoryCards/GCMemcard.cpp | 74 ++++++++++--------- .../DolphinWX/Src/MemoryCards/GCMemcard.h | 4 +- 2 files changed, 42 insertions(+), 36 deletions(-) diff --git a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp b/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp index df79e001f2..8e4ba674e2 100644 --- a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp +++ b/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp @@ -61,7 +61,10 @@ void decodeCI8image(u32* dst, u8* src, u16* pal, int width, int height) } } -GCMemcard::GCMemcard(const char *filename, bool forceCreation, bool sjis) : m_valid(false), m_fileName(filename) +GCMemcard::GCMemcard(const char *filename, bool forceCreation, bool sjis) + : m_valid(false) + , m_fileName(filename) + , mc_data(NULL) { File::IOFile mcdFile(m_fileName, "r+b"); if (!mcdFile.IsOpen()) @@ -71,10 +74,7 @@ GCMemcard::GCMemcard(const char *filename, bool forceCreation, bool sjis) : m_va return; } Format(forceCreation ? sjis : !AskYesNoT("Format as ascii (NTSC\\PAL)?\nChoose no for sjis (NTSC-J)")); - if (!mcdFile.Open(m_fileName, "r+b")) - { - return; - } + return; } else { @@ -1157,20 +1157,15 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) return frames; } -bool GCMemcard::Format(bool sjis, bool New, int slot, u16 SizeMb, bool hdrOnly) +bool GCMemcard::Format(bool sjis, int slot, u16 SizeMb) { // Currently only formats cards for slot A - const u32 data_size = BLOCK_SIZE * (SizeMb * MBIT_TO_BLOCKS - MC_FST_BLOCKS); - + m_sizeMb = SizeMb; + mc_data_size = BLOCK_SIZE * (m_sizeMb * MBIT_TO_BLOCKS - MC_FST_BLOCKS); + SRAM m_SRAM; - if (New) - { - mc_data_size = data_size; - mc_data = new u8[mc_data_size]; - } - // Only Format 16MB memcards for now - if ((SizeMb != MemCard2043Mb) || (data_size != mc_data_size)) return false; + File::IOFile pStream(File::GetUserPath(F_GCSRAM_IDX), "rb"); if (pStream) @@ -1199,28 +1194,39 @@ bool GCMemcard::Format(bool sjis, bool New, int slot, u16 SizeMb, bool hdrOnly) hdr.fmtTime.low = time & 0xFFFFFFFF; *(u32*)&(hdr.SramBias) = m_SRAM.counter_bias; *(u32*)&(hdr.SramLang) = m_SRAM.lang; - *(u32*)&(hdr.Unk2) = Common::swap32(1); // = _viReg[55]; static vu16* const _viReg = (u16*)0xCC002000; - // TODO: find out why memcard cares if component cable used for now set to one like main app + // TODO: determine the purpose of Unk2 1 works for slot A, 0 works for both slot A and slot B + *(u32*)&(hdr.Unk2) = 0; // = _viReg[55]; static vu16* const _viReg = (u16*)0xCC002000; *(u16*)&(hdr.deviceID) = 0; - *(u16*)&(hdr.SizeMb) = Common::swap16(SizeMb); + *(u16*)&(hdr.SizeMb) = Common::swap16(m_sizeMb); *(u16*)&(hdr.Encoding) = Common::swap16(sjis ? 1 : 0); - if (!hdrOnly) - { - memset(&dir, 0xFF, BLOCK_SIZE); - memset(&dir_backup, 0xFF, BLOCK_SIZE); - *(u16*)&dir.UpdateCounter = 0; - *(u16*)&dir_backup.UpdateCounter = Common::swap16(1); - memset(&bat, 0, BLOCK_SIZE); - memset(&bat_backup, 0, BLOCK_SIZE); - *(u16*)&bat.UpdateCounter = 0; - *(u16*)&bat_backup.UpdateCounter = Common::swap16(1); - *(u16*)&bat.FreeBlocks = *(u16*)&bat_backup.FreeBlocks = Common::swap16(SizeMb * MBIT_TO_BLOCKS - MC_FST_BLOCKS); - *(u16*)&bat.LastAllocated = *(u16*)&bat_backup.LastAllocated = Common::swap16(4); - memset(mc_data, 0xFF, mc_data_size); - } + memset(&dir, 0xFF, BLOCK_SIZE); + memset(&dir_backup, 0xFF, BLOCK_SIZE); + *(u16*)&dir.UpdateCounter = 0; + *(u16*)&dir_backup.UpdateCounter = Common::swap16(1); + + maxBlock = (u32)m_sizeMb * MBIT_TO_BLOCKS; + + memset(&bat, 0, BLOCK_SIZE); + memset(&bat_backup, 0, BLOCK_SIZE); + *(u16*)&bat.UpdateCounter = 0; + *(u16*)&bat_backup.UpdateCounter = Common::swap16(1); + *(u16*)&bat.FreeBlocks = *(u16*)&bat_backup.FreeBlocks = Common::swap16(maxBlock - MC_FST_BLOCKS); + *(u16*)&bat.LastAllocated = *(u16*)&bat_backup.LastAllocated = Common::swap16(4); + + if (mc_data) + { + delete mc_data; + mc_data = NULL; + } + mc_data = new u8[mc_data_size]; + if (!mc_data) + return false; + + memset(mc_data, 0xFF, mc_data_size); + m_valid = true; + FixChecksums(); - Save(); - return true; + return Save(); } diff --git a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h b/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h index 07ce5656f8..48d0a09b5e 100644 --- a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h +++ b/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h @@ -67,7 +67,7 @@ enum CI8, }; -class GCMemcard +class GCMemcard : NonCopyable { private: friend class CMemcardManagerDebug; @@ -175,7 +175,7 @@ public: bool IsValid() { return m_valid; } bool IsAsciiEncoding(); bool Save(); - bool Format(bool sjis = false, bool New = true, int slot = 0, u16 SizeMb = MemCard2043Mb, bool hdrOnly = false); + bool Format(bool sjis = false, int slot = 0, u16 SizeMb = MemCard2043Mb); void calc_checksumsBE(u16 *buf, u32 num, u16 *c1, u16 *c2); u32 TestChecksums(); From 8d91f1e0c1bda8c91e3d4cea1b3c0709950809d0 Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Thu, 22 Sep 2011 00:05:32 -0700 Subject: [PATCH 070/381] EXI_Memcard: HLE memcard Formatting, GCMemcard: Add static format function, cleanup checksums code --- .../Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp | 9 +- .../DolphinWX/Src/MemoryCards/GCMemcard.cpp | 246 ++++++++---------- .../DolphinWX/Src/MemoryCards/GCMemcard.h | 36 +-- 3 files changed, 134 insertions(+), 157 deletions(-) diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp index 341a14bec6..dcf6cfb0e0 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp @@ -26,6 +26,7 @@ #include "EXI_Device.h" #include "EXI_DeviceMemoryCard.h" #include "Sram.h" +#include "../../DolphinWx/Src/MemoryCards/GCMemcard.h" #define MC_STATUS_BUSY 0x80 #define MC_STATUS_UNLOCKED 0x40 @@ -34,6 +35,7 @@ #define MC_STATUS_PROGRAMEERROR 0x08 #define MC_STATUS_READY 0x01 #define SIZE_TO_Mb (1024 * 8 * 16) +#define MC_HDR_SIZE 0xA000 static CEXIMemoryCard *cards[2]; @@ -84,7 +86,6 @@ CEXIMemoryCard::CEXIMemoryCard(const std::string& _rName, const std::string& _rF INFO_LOG(EXPANSIONINTERFACE, "Reading memory card %s", m_strFilename.c_str()); pFile.ReadBytes(memory_card_content, memory_card_size); - SetCardFlashID(memory_card_content, card_index); } else @@ -94,11 +95,11 @@ CEXIMemoryCard::CEXIMemoryCard(const std::string& _rName, const std::string& _rF memory_card_size = nintendo_card_id * SIZE_TO_Mb; memory_card_content = new u8[memory_card_size]; - memset(memory_card_content, 0xFF, memory_card_size); - + GCMemcard::Format(memory_card_content, m_strFilename.find(".JAP.raw") != std::string::npos, nintendo_card_id); + memset(memory_card_content+MC_HDR_SIZE, 0xFF, memory_card_size-MC_HDR_SIZE); WARN_LOG(EXPANSIONINTERFACE, "No memory card found. Will create new."); - Flush(); } + SetCardFlashID(memory_card_content, card_index); } void innerFlush(FlushData* data) diff --git a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp b/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp index 8e4ba674e2..2471e76599 100644 --- a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp +++ b/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp @@ -227,7 +227,7 @@ GCMemcard::GCMemcard(const char *filename, bool forceCreation, bool sjis) bool GCMemcard::IsAsciiEncoding() { - return hdr.Encoding[1] == 0; + return hdr.Encoding == 0; } bool GCMemcard::Save() @@ -245,51 +245,49 @@ bool GCMemcard::Save() return mcdFile.Close(); } -void GCMemcard::calc_checksumsBE(u16 *buf, u32 num, u16 *c1, u16 *c2) +void GCMemcard::calc_checksumsBE(u16 *buf, u32 length, u16 *csum, u16 *inv_csum) { - *c1 = 0;*c2 = 0; - for (u32 i = 0; i < num; ++i) + *csum = *inv_csum = 0; + + for (u32 i = 0; i < length; ++i) { //weird warnings here - *c1 += Common::swap16(buf[i]); - *c2 += Common::swap16((u16)(buf[i] ^ 0xffff)); + *csum += BE16(buf[i]); + *inv_csum += BE16((u16)(buf[i] ^ 0xffff)); } - if (*c1 == 0xffff) + *csum = BE16(*csum); + *inv_csum = BE16(*inv_csum); + if (*csum == 0xffff) { - *c1 = 0; + *csum = 0; } - if (*c2 == 0xffff) + if (*inv_csum == 0xffff) { - *c2 = 0; + *inv_csum = 0; } } u32 GCMemcard::TestChecksums() { - u16 csum1=0, - csum2=0; + u16 csum=0, + csum_inv=0; u32 results = 0; - calc_checksumsBE((u16*)&hdr, 0xFE , &csum1, &csum2); - if (BE16(hdr.CheckSum1) != csum1) results |= 1; - if (BE16(hdr.CheckSum2) != csum2) results |= 1; + calc_checksumsBE((u16*)&hdr, 0xFE , &csum, &csum_inv); + if ((hdr.Checksum != csum) || (hdr.Checksum_Inv != csum_inv)) results |= 1; - calc_checksumsBE((u16*)&dir, 0xFFE, &csum1, &csum2); - if (BE16(dir.CheckSum1) != csum1) results |= 2; - if (BE16(dir.CheckSum2) != csum2) results |= 2; + calc_checksumsBE((u16*)&dir, 0xFFE, &csum, &csum_inv); + if ((dir.Checksum != csum) || (dir.Checksum_Inv != csum_inv)) results |= 2; - calc_checksumsBE((u16*)&dir_backup, 0xFFE, &csum1, &csum2); - if (BE16(dir_backup.CheckSum1) != csum1) results |= 4; - if (BE16(dir_backup.CheckSum2) != csum2) results |= 4; + calc_checksumsBE((u16*)&dir_backup, 0xFFE, &csum, &csum_inv); + if ((dir_backup.Checksum != csum) || (dir_backup.Checksum_Inv != csum_inv)) results |= 4; - calc_checksumsBE((u16*)(((u8*)&bat)+4), 0xFFE, &csum1, &csum2); - if (BE16(bat.CheckSum1) != csum1) results |= 8; - if (BE16(bat.CheckSum2) != csum2) results |= 8; + calc_checksumsBE((u16*)(((u8*)&bat)+4), 0xFFE, &csum, &csum_inv); + if ((bat.Checksum != csum) || (bat.Checksum_Inv != csum_inv)) results |= 8; - calc_checksumsBE((u16*)(((u8*)&bat_backup)+4), 0xFFE, &csum1, &csum2); - if (BE16(bat_backup.CheckSum1) != csum1) results |= 16; - if (BE16(bat_backup.CheckSum2) != csum2) results |= 16; + calc_checksumsBE((u16*)(((u8*)&bat_backup)+4), 0xFFE, &csum, &csum_inv); + if ((bat_backup.Checksum != csum) || (bat_backup.Checksum_Inv != csum_inv)) results |= 16; return results; } @@ -298,39 +296,12 @@ bool GCMemcard::FixChecksums() { if (!m_valid) return false; - - u16 csum1=0, - csum2=0; - - calc_checksumsBE((u16*)&hdr, 0xFE, &csum1, &csum2); - hdr.CheckSum1[0] = u8(csum1 >> 8); - hdr.CheckSum1[1] = u8(csum1); - hdr.CheckSum2[0] = u8(csum2 >> 8); - hdr.CheckSum2[1] = u8(csum2); - - calc_checksumsBE((u16*)&dir, 0xFFE, &csum1, &csum2); - dir.CheckSum1[0] = u8(csum1 >> 8); - dir.CheckSum1[1] = u8(csum1); - dir.CheckSum2[0] = u8(csum2 >> 8); - dir.CheckSum2[1] = u8(csum2); - - calc_checksumsBE((u16*)&dir_backup, 0xFFE, &csum1, &csum2); - dir_backup.CheckSum1[0] = u8(csum1 >> 8); - dir_backup.CheckSum1[1] = u8(csum1); - dir_backup.CheckSum2[0] = u8(csum2 >> 8); - dir_backup.CheckSum2[1] = u8(csum2); - - calc_checksumsBE((u16*)(((u8*)&bat)+4), 0xFFE, &csum1, &csum2); - bat.CheckSum1[0] = u8(csum1 >> 8); - bat.CheckSum1[1] = u8(csum1); - bat.CheckSum2[0] = u8(csum2 >> 8); - bat.CheckSum2[1] = u8(csum2); - - calc_checksumsBE((u16*)(((u8*)&bat_backup)+4), 0xFFE, &csum1, &csum2); - bat_backup.CheckSum1[0] = u8(csum1 >> 8); - bat_backup.CheckSum1[1] = u8(csum1); - bat_backup.CheckSum2[0] = u8(csum2 >> 8); - bat_backup.CheckSum2[1] = u8(csum2); + + calc_checksumsBE((u16*)&hdr, 0xFE, &hdr.Checksum, &hdr.Checksum_Inv); + calc_checksumsBE((u16*)&dir, 0xFFE, &dir.Checksum, &dir.Checksum_Inv); + calc_checksumsBE((u16*)&dir_backup, 0xFFE, &dir_backup.Checksum, &dir_backup.Checksum_Inv); + calc_checksumsBE((u16*)&bat+2, 0xFFE, &bat.Checksum, &bat.Checksum_Inv); + calc_checksumsBE((u16*)&bat_backup+2, 0xFFE, &bat_backup.Checksum, &bat_backup.Checksum_Inv); return true; } @@ -620,8 +591,7 @@ u32 GCMemcard::ImportFile(DEntry& direntry, u8* contents, int remove) { index = i; dir.Dir[i] = direntry; - dir.Dir[i].FirstBlock[0] = u8(firstFree1 >> 8); - dir.Dir[i].FirstBlock[1] = u8(firstFree1); + *(u16*)&dir.Dir[i].FirstBlock = BE16(firstFree1); if (!remove) { dir.Dir[i].CopyCounter = dir.Dir[i].CopyCounter+1; @@ -642,7 +612,7 @@ u32 GCMemcard::ImportFile(DEntry& direntry, u8* contents, int remove) int j = 2; while(j < BE16(direntry.BlockCount) + 1) { - bat_backup.Map[i] = Common::swap16(last + (u16)j); + bat_backup.Map[i] = BE16(last + (u16)j); i++; j++; } @@ -654,25 +624,16 @@ u32 GCMemcard::ImportFile(DEntry& direntry, u8* contents, int remove) } //update last allocated block - int lastallocated = BE16(bat_backup.LastAllocated) + j - 1; - bat_backup.LastAllocated[0] = u8(lastallocated >> 8); - bat_backup.LastAllocated[1] = u8(lastallocated); - + *(u16*)&bat_backup.LastAllocated = BE16(BE16(bat_backup.LastAllocated) + j - 1); //update freespace counter - int freespace1 = totalspace - firstFree1 - fileBlocks + MC_FST_BLOCKS; - bat_backup.FreeBlocks[0] = u8(freespace1 >> 8); - bat_backup.FreeBlocks[1] = u8(freespace1); + *(u16*)&bat_backup.FreeBlocks = BE16(totalspace - firstFree1 - fileBlocks + MC_FST_BLOCKS); if (!remove) { // ... and dir update counter - int updateCtr = BE16(dir_backup.UpdateCounter) + 1; - dir_backup.UpdateCounter[0] = u8(updateCtr >> 8); - dir_backup.UpdateCounter[1] = u8(updateCtr); + *(u16*)&dir_backup.UpdateCounter = BE16(BE16(dir_backup.UpdateCounter) + 1); // ... and bat update counter - updateCtr = BE16(bat_backup.UpdateCounter) + 1; - bat_backup.UpdateCounter[0] = u8(updateCtr >> 8); - bat_backup.UpdateCounter[1] = u8(updateCtr); + *(u16*)&bat_backup.UpdateCounter = BE16(BE16(bat_backup.UpdateCounter) + 1); } bat = bat_backup; return SUCCESS; @@ -698,9 +659,7 @@ u32 GCMemcard::RemoveFile(u8 index) //index in the directory array //free the blocks int blocks_left = BE16(dir.Dir[index].BlockCount); - int block = BE16(dir.Dir[index].FirstBlock) - 1; - bat.LastAllocated[0] = (u8)(block >> 8); - bat.LastAllocated[1] = (u8)block; + *(u16*)&bat.LastAllocated = BE16(BE16(dir.Dir[index].FirstBlock) - 1); u8 nextIndex = index + 1; memset(&(dir.Dir[index]), 0xFF, DENTRY_SIZE); @@ -713,9 +672,7 @@ u32 GCMemcard::RemoveFile(u8 index) //index in the directory array //Only get file data if it is a valid dir entry if (BE16(tempDEntry->FirstBlock) != 0xFFFF) { - u16 freeBlock= BE16(bat.FreeBlocks) - BE16(tempDEntry->BlockCount); - bat.FreeBlocks[0] = u8(freeBlock >> 8); - bat.FreeBlocks[1] = u8(freeBlock); + *(u16*)&bat.FreeBlocks = BE16(BE16(bat.FreeBlocks) - BE16(tempDEntry->BlockCount)); u16 size = DEntry_BlockCount(nextIndex); if (size != 0xFFFF) @@ -754,9 +711,7 @@ u32 GCMemcard::RemoveFile(u8 index) //index in the directory array } } // increment update counter - int updateCtr = BE16(dir.UpdateCounter) + 1; - dir.UpdateCounter[0] = u8(updateCtr >> 8); - dir.UpdateCounter[1] = u8(updateCtr); + *(u16*)&dir.UpdateCounter = BE16(BE16(dir.UpdateCounter) + 1); return SUCCESS; } @@ -989,9 +944,7 @@ void GCMemcard::Gcs_SavConvert(DEntry* tempDEntry, int saveType, int length) // It is stored only within the corresponding GSV file. // If the GCS file is added without using the GameSaves software, // the value stored is always "1" - int blockCount = length / BLOCK_SIZE; - tempDEntry->BlockCount[0] = u8(blockCount >> 8); - tempDEntry->BlockCount[1] = u8(blockCount); + *(u16*)&tempDEntry->BlockCount = BE16(length / BLOCK_SIZE); } break; case SAV: @@ -1157,69 +1110,55 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) return frames; } -bool GCMemcard::Format(bool sjis, int slot, u16 SizeMb) + +bool GCMemcard::Format(u8 * card_data, bool sjis, u16 SizeMb) { - // Currently only formats cards for slot A - m_sizeMb = SizeMb; - mc_data_size = BLOCK_SIZE * (m_sizeMb * MBIT_TO_BLOCKS - MC_FST_BLOCKS); - - SRAM m_SRAM; + if (!card_data) + return false; + memset(card_data, 0xFF, BLOCK_SIZE*3); + memset(card_data + BLOCK_SIZE*3, 0, BLOCK_SIZE*2); + GCMC_Header gcp; + gcp.hdr = (Header*)card_data; + gcp.dir = (Directory *)(card_data + BLOCK_SIZE); + gcp.dir_backup = (Directory *)(card_data + BLOCK_SIZE*2); + gcp.bat = (BlockAlloc *)(card_data + BLOCK_SIZE*3); + gcp.bat_backup = (BlockAlloc *)(card_data + BLOCK_SIZE*4); + *(u16*)gcp.hdr->SizeMb = BE16(SizeMb); + *(u16*)gcp.hdr->Encoding = BE16(sjis ? 1 : 0); - File::IOFile pStream(File::GetUserPath(F_GCSRAM_IDX), "rb"); - if (pStream) - { - pStream.ReadBytes(&m_SRAM, 64); - pStream.Close(); - } - else - { - m_SRAM = sram_dump; - } - - const u64 time = CEXIIPL::GetGCTime(); - u64 rand = Common::swap64(time); + FormatInternal(gcp); + return true; +} +bool GCMemcard::Format(bool sjis, u16 SizeMb) +{ memset(&hdr, 0xFF, BLOCK_SIZE); - for(int i = 0; i < 12; i++) - { - rand = (((rand * (u64)0x0000000041c64e6dULL) + (u64)0x0000000000003039ULL) >> 16); - hdr.serial[i] = (u8)(m_SRAM.flash_id[slot][i] + (u32)rand); - rand = (((rand * (u64)0x0000000041c64e6dULL) + (u64)0x0000000000003039ULL) >> 16); - rand &= (u64)0x0000000000007fffULL; - } - - hdr.fmtTime.high = (time >> 32) & 0xFFFFFFFF; - hdr.fmtTime.low = time & 0xFFFFFFFF; - *(u32*)&(hdr.SramBias) = m_SRAM.counter_bias; - *(u32*)&(hdr.SramLang) = m_SRAM.lang; - // TODO: determine the purpose of Unk2 1 works for slot A, 0 works for both slot A and slot B - *(u32*)&(hdr.Unk2) = 0; // = _viReg[55]; static vu16* const _viReg = (u16*)0xCC002000; - *(u16*)&(hdr.deviceID) = 0; - *(u16*)&(hdr.SizeMb) = Common::swap16(m_sizeMb); - *(u16*)&(hdr.Encoding) = Common::swap16(sjis ? 1 : 0); - memset(&dir, 0xFF, BLOCK_SIZE); memset(&dir_backup, 0xFF, BLOCK_SIZE); - *(u16*)&dir.UpdateCounter = 0; - *(u16*)&dir_backup.UpdateCounter = Common::swap16(1); - - - maxBlock = (u32)m_sizeMb * MBIT_TO_BLOCKS; - memset(&bat, 0, BLOCK_SIZE); memset(&bat_backup, 0, BLOCK_SIZE); - *(u16*)&bat.UpdateCounter = 0; - *(u16*)&bat_backup.UpdateCounter = Common::swap16(1); - *(u16*)&bat.FreeBlocks = *(u16*)&bat_backup.FreeBlocks = Common::swap16(maxBlock - MC_FST_BLOCKS); - *(u16*)&bat.LastAllocated = *(u16*)&bat_backup.LastAllocated = Common::swap16(4); + GCMC_Header gcp; + gcp.hdr = &hdr; + gcp.dir = &dir; + gcp.dir_backup = &dir_backup; + gcp.bat = &bat; + gcp.bat_backup = &bat_backup; + + *(u16*)hdr.SizeMb = BE16(SizeMb); + *(u16*)hdr.Encoding = BE16(sjis ? 1 : 0); + FormatInternal(gcp); + + m_sizeMb = SizeMb; + maxBlock = (u32)m_sizeMb * MBIT_TO_BLOCKS; if (mc_data) { delete mc_data; mc_data = NULL; } + mc_data_size = BLOCK_SIZE * (m_sizeMb * MBIT_TO_BLOCKS - MC_FST_BLOCKS); mc_data = new u8[mc_data_size]; if (!mc_data) return false; @@ -1227,6 +1166,41 @@ bool GCMemcard::Format(bool sjis, int slot, u16 SizeMb) memset(mc_data, 0xFF, mc_data_size); m_valid = true; - FixChecksums(); return Save(); } + +void GCMemcard::FormatInternal(GCMC_Header &GCP) +{ + Header *p_hdr = GCP.hdr; + u64 rand = CEXIIPL::GetGCTime(); + p_hdr->formatTime = Common::swap64(rand); + + for(int i = 0; i < 12; i++) + { + rand = (((rand * (u64)0x0000000041c64e6dULL) + (u64)0x0000000000003039ULL) >> 16); + p_hdr->serial[i] = (u8)(g_SRAM.flash_id[0][i] + (u32)rand); + rand = (((rand * (u64)0x0000000041c64e6dULL) + (u64)0x0000000000003039ULL) >> 16); + rand &= (u64)0x0000000000007fffULL; + } + *(u32*)&p_hdr->SramBias = g_SRAM.counter_bias; + *(u32*)&p_hdr->SramLang = g_SRAM.lang; + // TODO: determine the purpose of Unk2 1 works for slot A, 0 works for both slot A and slot B + *(u32*)&p_hdr->Unk2 = 0; // = _viReg[55]; static vu16* const _viReg = (u16*)0xCC002000; + *(u16*)&p_hdr->deviceID = 0; + calc_checksumsBE((u16*)p_hdr, 0xFE, &p_hdr->Checksum, &p_hdr->Checksum_Inv); + + Directory *p_dir = GCP.dir, + *p_dir_backup = GCP.dir_backup; + *(u16*)&p_dir->UpdateCounter = 0; + *(u16*)&p_dir_backup->UpdateCounter = BE16(1); + calc_checksumsBE((u16*)p_dir, 0xFFE, &p_dir->Checksum, &p_dir->Checksum_Inv); + calc_checksumsBE((u16*)p_dir_backup, 0xFFE, &p_dir_backup->Checksum, &p_dir_backup->Checksum_Inv); + + BlockAlloc *p_bat = GCP.bat, + *p_bat_backup = GCP.bat_backup; + *(u16*)&p_bat_backup->UpdateCounter = BE16(1); + *(u16*)&p_bat->FreeBlocks = *(u16*)&p_bat_backup->FreeBlocks = BE16(( BE16(p_hdr->SizeMb) * MBIT_TO_BLOCKS) - MC_FST_BLOCKS); + *(u16*)&p_bat->LastAllocated = *(u16*)&p_bat_backup->LastAllocated = BE16(4); + 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); +} diff --git a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h b/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h index 48d0a09b5e..c53830034d 100644 --- a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h +++ b/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h @@ -23,8 +23,8 @@ #include "StringUtil.h" #include "../../../Core/Src/HW/EXI_DeviceIPL.h" -#define BE32(x) ((u32((x)[0])<<24) | (u32((x)[1])<<16) | (u32((x)[2])<<8) | u32((x)[3])) -#define BE16(x) ((u16((x)[0])<<8) | u16((x)[1])) +#define BE32(x) (Common::swap32(x)) +#define BE16(x) (Common::swap16(x)) #define ArrayByteSwap(a) (ByteSwap(a, a+sizeof(u8))); enum @@ -81,15 +81,10 @@ private: u16 m_sizeMb; #pragma pack(push,1) - struct OSTime { - u32 low; - u32 high; - }; - struct Header { //Offset Size Description // Serial in libogc u8 serial[12]; //0x0000 12 ? - OSTime fmtTime; //0x000c 8 time of format (OSTime value) + u64 formatTime; //0x000c 8 time of format (OSTime value) u8 SramBias[4]; //0x0014 4 sram bias at time of format u8 SramLang[4]; //0x0018 4 sram language u8 Unk2[4]; //0x001c 4 ? almost always 0 @@ -99,8 +94,8 @@ private: u8 Encoding[2]; //0x0024 2 encoding (ASCII or japanese) u8 Unused1[468]; //0x0026 468 unused (0xff) u8 UpdateCounter[2];//0x01fa 2 update Counter (?, probably unused) - u8 CheckSum1[2]; //0x01fc 2 Checksum 1 (?) - u8 CheckSum2[2]; //0x01fe 2 Checksum 2 (?) + u16 Checksum; //0x01fc 2 Additive Checksum + u16 Checksum_Inv; //0x01fe 2 Inverse Checksum u8 Unused2[7680]; //0x0200 0x1e00 unused (0xff) } hdr; @@ -153,31 +148,38 @@ private: DEntry Dir[DIRLEN]; //0x0000 Directory Entries (max 127) u8 Padding[0x3a]; u8 UpdateCounter[2];//0x1ffa 2 update Counter - u8 CheckSum1[2]; //0x1ffc 2 Checksum 1 - u8 CheckSum2[2]; //0x1ffe 2 Checksum 2 + u16 Checksum; //0x1ffc 2 Additive Checksum + u16 Checksum_Inv; //0x1ffe 2 Inverse Checksum } dir, dir_backup; struct BlockAlloc { - u8 CheckSum1[2]; //0x0000 2 Checksum 1 - u8 CheckSum2[2]; //0x0002 2 Checksum 2 + u16 Checksum; //0x0000 2 Additive Checksum + u16 Checksum_Inv; //0x0002 2 Inverse Checksum u8 UpdateCounter[2];//0x0004 2 update Counter u8 FreeBlocks[2]; //0x0006 2 free Blocks u8 LastAllocated[2];//0x0008 2 last allocated Block u16 Map[0xFFB]; //0x000a 0x1ff8 Map of allocated Blocks } bat,bat_backup; + struct GCMC_Header + { + Header *hdr; + Directory *dir, *dir_backup; + BlockAlloc *bat, *bat_backup; + }; #pragma pack(pop) u32 ImportGciInternal(FILE* gcih, const char *inputFile, std::string outputFile); - + static void FormatInternal(GCMC_Header &GCP); public: GCMemcard(const char* fileName, bool forceCreation=false, bool sjis=false); bool IsValid() { return m_valid; } bool IsAsciiEncoding(); bool Save(); - bool Format(bool sjis = false, int slot = 0, u16 SizeMb = MemCard2043Mb); + bool Format(bool sjis = false, u16 SizeMb = MemCard2043Mb); + static bool Format(u8 * card_data, bool sjis = false, u16 SizeMb = MemCard2043Mb); - void calc_checksumsBE(u16 *buf, u32 num, u16 *c1, u16 *c2); + static void calc_checksumsBE(u16 *buf, u32 length, u16 *csum, u16 *inv_csum); u32 TestChecksums(); bool FixChecksums(); From 5316c6d97b75ec8352a379274d2d27c6570941b2 Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Tue, 4 Oct 2011 10:51:13 -0700 Subject: [PATCH 071/381] Move GCMemcard from DolphinWX/Memorycards to Core/HW --- Source/Core/Core/CMakeLists.txt | 1 + Source/Core/Core/Core.vcxproj | 2 ++ Source/Core/Core/Core.vcxproj.filters | 9 +++++++++ Source/Core/Core/SConscript | 1 + Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp | 2 +- .../Src/MemoryCards => Core/Src/HW}/GCMemcard.cpp | 0 .../Src/MemoryCards => Core/Src/HW}/GCMemcard.h | 4 ++-- Source/Core/DolphinWX/CMakeLists.txt | 1 - Source/Core/DolphinWX/Dolphin.vcxproj | 2 -- Source/Core/DolphinWX/Dolphin.vcxproj.filters | 6 ------ Source/Core/DolphinWX/SConscript | 1 - Source/Core/DolphinWX/Src/ConfigMain.cpp | 2 +- Source/Core/DolphinWX/Src/MemcardManager.h | 2 +- 13 files changed, 18 insertions(+), 15 deletions(-) rename Source/Core/{DolphinWX/Src/MemoryCards => Core/Src/HW}/GCMemcard.cpp (100%) rename Source/Core/{DolphinWX/Src/MemoryCards => Core/Src/HW}/GCMemcard.h (98%) diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index b5e731ce15..734d966781 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -101,6 +101,7 @@ set(SRCS Src/ActionReplay.cpp Src/HW/EXI_DeviceIPL.cpp Src/HW/EXI_DeviceMemoryCard.cpp Src/HW/EXI_DeviceMic.cpp + Src/HW/GCMemcard.cpp Src/HW/GCPad.cpp Src/HW/GCPadEmu.cpp Src/HW/GPFifo.cpp diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index cc6d673f29..b0b72fcc1b 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -287,6 +287,7 @@ + @@ -483,6 +484,7 @@ + diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters index e51098f2ec..66b25af176 100644 --- a/Source/Core/Core/Core.vcxproj.filters +++ b/Source/Core/Core/Core.vcxproj.filters @@ -553,6 +553,9 @@ FifoPlayer + + HW %28Flipper/Hollywood%29\GCMemcard + @@ -1027,6 +1030,9 @@ FifoPlayer + + HW %28Flipper/Hollywood%29\GCMemcard + @@ -1165,5 +1171,8 @@ {ca7d56f7-4e84-4d15-9aea-7ae6fa7d6586} + + {3e9e6e83-c1bf-45f9-aeff-231f98f60d29} + \ No newline at end of file diff --git a/Source/Core/Core/SConscript b/Source/Core/Core/SConscript index 2f350557ec..3dafad8a62 100644 --- a/Source/Core/Core/SConscript +++ b/Source/Core/Core/SConscript @@ -97,6 +97,7 @@ files = [ 'Src/HW/EXI_DeviceIPL.cpp', 'Src/HW/EXI_DeviceMemoryCard.cpp', 'Src/HW/EXI_DeviceMic.cpp', + 'Src/HW/GCMemcard.cpp', 'Src/HW/GCPad.cpp', 'Src/HW/GCPadEmu.cpp', 'Src/HW/GPFifo.cpp', diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp index dcf6cfb0e0..5e3d6865d4 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp @@ -26,7 +26,7 @@ #include "EXI_Device.h" #include "EXI_DeviceMemoryCard.h" #include "Sram.h" -#include "../../DolphinWx/Src/MemoryCards/GCMemcard.h" +#include "GCMemcard.h" #define MC_STATUS_BUSY 0x80 #define MC_STATUS_UNLOCKED 0x40 diff --git a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp b/Source/Core/Core/Src/HW/GCMemcard.cpp similarity index 100% rename from Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp rename to Source/Core/Core/Src/HW/GCMemcard.cpp diff --git a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h b/Source/Core/Core/Src/HW/GCMemcard.h similarity index 98% rename from Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h rename to Source/Core/Core/Src/HW/GCMemcard.h index c53830034d..5aa0a3c97f 100644 --- a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h +++ b/Source/Core/Core/Src/HW/GCMemcard.h @@ -19,9 +19,9 @@ #define __GCMEMCARD_h__ #include "Common.h" -#include "../../../Core/Src/HW/Sram.h" +#include "Sram.h" #include "StringUtil.h" -#include "../../../Core/Src/HW/EXI_DeviceIPL.h" +#include "EXI_DeviceIPL.h" #define BE32(x) (Common::swap32(x)) #define BE16(x) (Common::swap16(x)) diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index f38e791cd0..438ee9ce82 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -52,7 +52,6 @@ if(wxWidgets_FOUND) Src/LogWindow.cpp Src/Main.cpp Src/MemcardManager.cpp - Src/MemoryCards/GCMemcard.cpp Src/MemoryCards/WiiSaveCrypted.cpp Src/NetWindow.cpp Src/PHackSettings.cpp diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj b/Source/Core/DolphinWX/Dolphin.vcxproj index fc232ea77f..2d64eb58bc 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj +++ b/Source/Core/DolphinWX/Dolphin.vcxproj @@ -255,7 +255,6 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / true - @@ -309,7 +308,6 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj.filters b/Source/Core/DolphinWX/Dolphin.vcxproj.filters index 3c14226fc0..9c679eee36 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj.filters +++ b/Source/Core/DolphinWX/Dolphin.vcxproj.filters @@ -6,9 +6,6 @@ - - GUI\Saves - GUI\Saves @@ -141,9 +138,6 @@ - - GUI\Saves - GUI\Saves diff --git a/Source/Core/DolphinWX/SConscript b/Source/Core/DolphinWX/SConscript index 3d3d1e56c2..92ca4f9f62 100644 --- a/Source/Core/DolphinWX/SConscript +++ b/Source/Core/DolphinWX/SConscript @@ -43,7 +43,6 @@ else: 'Src/LogWindow.cpp', 'Src/Main.cpp', 'Src/MemcardManager.cpp', - 'Src/MemoryCards/GCMemcard.cpp', 'Src/MemoryCards/WiiSaveCrypted.cpp', 'Src/NetWindow.cpp', 'Src/PHackSettings.cpp', diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 8b2dcb07f6..10472b15eb 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -27,6 +27,7 @@ #include "HW/SI.h" #include "HW/DSPHLE/DSPHLE.h" #include "HW/DSPLLE/DSPLLE.h" +#include "HW/GCMemcard.h" #include "IPC_HLE/WII_IPC_HLE.h" #include "NANDContentLoader.h" @@ -37,7 +38,6 @@ #include "Frame.h" #include "HotkeyDlg.h" #include "Main.h" -#include "MemoryCards/GCMemcard.h" #include "VideoBackendBase.h" #define TEXT_BOX(page, text) new wxStaticText(page, wxID_ANY, text, wxDefaultPosition, wxDefaultSize) diff --git a/Source/Core/DolphinWX/Src/MemcardManager.h b/Source/Core/DolphinWX/Src/MemcardManager.h index e3707f6414..beff71b671 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.h +++ b/Source/Core/DolphinWX/Src/MemcardManager.h @@ -29,7 +29,7 @@ #include "IniFile.h" #include "FileUtil.h" -#include "MemoryCards/GCMemcard.h" +#include "HW/GCMemcard.h" #undef MEMCARD_MANAGER_STYLE #define MEMCARD_MANAGER_STYLE wxCAPTION | wxSYSTEM_MENU | wxDIALOG_NO_PARENT | wxCLOSE_BOX | wxRESIZE_BORDER | wxMAXIMIZE_BOX From 2f254585bf82aeabecb5910dd594e350f4acde25 Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Thu, 6 Oct 2011 14:24:51 +0300 Subject: [PATCH 072/381] Game ini database update. Lots of small changes, among others it provides proper settings for Medabots Infinity, Cabela's Big Game Hunter 2012. --- Data/User/GameConfig/GEND69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GENE69.ini | 10 +++++++--- Data/User/GameConfig/GENP69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GENS69.ini | 9 +++++++-- Data/User/GameConfig/GM6EE9.ini | 3 ++- Data/User/GameConfig/GM6PE9.ini | 3 ++- Data/User/GameConfig/GP6E01.ini | 12 ++++++++++++ Data/User/GameConfig/GP6J01.ini | 17 +++++++++++++++++ Data/User/GameConfig/GP6P01.ini | 28 ++++++++++++++++++---------- Data/User/GameConfig/GPKE41.ini | 13 ++++++++++++- Data/User/GameConfig/GQSDAF.ini | 5 ++++- Data/User/GameConfig/GQSEAF.ini | 15 ++++++++------- Data/User/GameConfig/GQSFAF.ini | 5 ++++- Data/User/GameConfig/GQSPAF.ini | 5 ++++- Data/User/GameConfig/GRUE78.ini | 14 +++++++++++++- Data/User/GameConfig/GTYE69.ini | 15 +++++++++++++++ Data/User/GameConfig/GTYP69.ini | 15 +++++++++++++++ Data/User/GameConfig/RCJE8P.ini | 5 ++++- Data/User/GameConfig/RCJP8P.ini | 11 ++++++++--- Data/User/GameConfig/RM3E01.ini | 6 ++++-- Data/User/GameConfig/RM3J01.ini | 6 ++++-- Data/User/GameConfig/RM3P01.ini | 4 ++++ Data/User/GameConfig/RWSE8P.ini | 2 +- Data/User/GameConfig/RWSJ01.ini | 8 +++++++- Data/User/GameConfig/RWSK01.ini | 8 +++++++- Data/User/GameConfig/RWSP8P.ini | 8 +++++++- Data/User/GameConfig/SC2E8P.ini | 4 +++- Data/User/GameConfig/SC2P8P.ini | 3 ++- Data/User/GameConfig/SC7D52.ini | 2 +- Data/User/GameConfig/SC7E52.ini | 2 +- Data/User/GameConfig/SC7F52.ini | 2 +- Data/User/GameConfig/SC7I52.ini | 2 +- Data/User/GameConfig/SC7P52.ini | 2 +- Data/User/GameConfig/SC7S52.ini | 4 ++-- Data/User/GameConfig/SD2J01.ini | 21 +++++++++++++++++++++ Data/User/GameConfig/SH6E52.ini | 20 ++++++++++++++++++++ Data/User/GameConfig/SRQE41.ini | 19 +++++++++++++++++++ Data/User/GameConfig/SRQP41.ini | 19 +++++++++++++++++++ 38 files changed, 309 insertions(+), 50 deletions(-) create mode 100644 Data/User/GameConfig/GEND69.ini create mode 100644 Data/User/GameConfig/GENP69.ini create mode 100644 Data/User/GameConfig/GP6J01.ini create mode 100644 Data/User/GameConfig/GTYE69.ini create mode 100644 Data/User/GameConfig/GTYP69.ini create mode 100644 Data/User/GameConfig/SD2J01.ini create mode 100644 Data/User/GameConfig/SH6E52.ini create mode 100644 Data/User/GameConfig/SRQE41.ini create mode 100644 Data/User/GameConfig/SRQP41.ini diff --git a/Data/User/GameConfig/GEND69.ini b/Data/User/GameConfig/GEND69.ini new file mode 100644 index 0000000000..43cb8e86e1 --- /dev/null +++ b/Data/User/GameConfig/GEND69.ini @@ -0,0 +1,16 @@ +# GEND69 - 007: Everything or Nothing +[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 = Needs LLE audio for proper sound. +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/GENE69.ini b/Data/User/GameConfig/GENE69.ini index b30dad3b14..6307e0268f 100644 --- a/Data/User/GameConfig/GENE69.ini +++ b/Data/User/GameConfig/GENE69.ini @@ -2,11 +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 = Missing Textures,3D Models Broken cutscenes -EmulationStateId = 2 +EmulationIssues = Needs LLE audio for proper sound. +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/GENP69.ini b/Data/User/GameConfig/GENP69.ini new file mode 100644 index 0000000000..be23957d70 --- /dev/null +++ b/Data/User/GameConfig/GENP69.ini @@ -0,0 +1,16 @@ +# GENP69 - 007: Everything or Nothing +[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 = Needs LLE audio for proper sound. +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/GENS69.ini b/Data/User/GameConfig/GENS69.ini index 8f89df5ec1..c0645ed29a 100644 --- a/Data/User/GameConfig/GENS69.ini +++ b/Data/User/GameConfig/GENS69.ini @@ -2,10 +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 = Missing Textures,3D Models Broken cutscenes -EmulationStateId = 2 +EmulationIssues = Needs LLE audio for proper sound. +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/GM6EE9.ini b/Data/User/GameConfig/GM6EE9.ini index 37fa68e57c..e0554fbf76 100644 --- a/Data/User/GameConfig/GM6EE9.ini +++ b/Data/User/GameConfig/GM6EE9.ini @@ -1,8 +1,9 @@ # GM6EE9 - Medabots Infinity 4th Submission [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 = Use LLE plugin for proper ingame sound.(r7483). +EmulationIssues = Use LLE plugin for proper ingame sound. MMU speed hack is needed for balloon bombs or the game crashes. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GM6PE9.ini b/Data/User/GameConfig/GM6PE9.ini index 2a8664ebbb..44849b73fb 100644 --- a/Data/User/GameConfig/GM6PE9.ini +++ b/Data/User/GameConfig/GM6PE9.ini @@ -1,8 +1,9 @@ # GM6PE9 - Medabots Infinity 4th Submission [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 = Use LLE plugin for proper ingame sound.(r7483). +EmulationIssues = Use LLE plugin for proper ingame sound. MMU speed hack is needed for balloon bombs or the game crashes. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GP6E01.ini b/Data/User/GameConfig/GP6E01.ini index 3663c09d52..69596e46ce 100644 --- a/Data/User/GameConfig/GP6E01.ini +++ b/Data/User/GameConfig/GP6E01.ini @@ -2,5 +2,17 @@ [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 = Mini games tour bus needs emulate format changes to preview the mini games. [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/GP6J01.ini b/Data/User/GameConfig/GP6J01.ini new file mode 100644 index 0000000000..d7b9ff310f --- /dev/null +++ b/Data/User/GameConfig/GP6J01.ini @@ -0,0 +1,17 @@ +# GP6J01 - Mario Party 6 +[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 = Mini games tour bus needs emulate format changes to preview the mini games. +[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/GP6P01.ini b/Data/User/GameConfig/GP6P01.ini index 1657242141..fbc068ca72 100644 --- a/Data/User/GameConfig/GP6P01.ini +++ b/Data/User/GameConfig/GP6P01.ini @@ -1,11 +1,19 @@ # GP6P01 - Mario Party 6 -[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 = 0 -Issues="uses the mic attachment" -[OnLoad] -#Add memory patches to be loaded once on boot here. -[OnFrame] -[ActionReplay] +[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 = Mini games tour bus needs emulate format changes to preview the mini games. +[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/GPKE41.ini b/Data/User/GameConfig/GPKE41.ini index 7fe27f49a4..282217dc84 100644 --- a/Data/User/GameConfig/GPKE41.ini +++ b/Data/User/GameConfig/GPKE41.ini @@ -2,6 +2,17 @@ [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 = Videos Not seen +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/GQSDAF.ini b/Data/User/GameConfig/GQSDAF.ini index b2ca3063f2..650f6ffd2a 100644 --- a/Data/User/GameConfig/GQSDAF.ini +++ b/Data/User/GameConfig/GQSDAF.ini @@ -17,4 +17,7 @@ PH_ZNear = 0.5 PH_ZFar = 1 [Gecko] [Video_Settings] -SafeTextureCache = True \ No newline at end of file +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 +[Video_Hacks] +DlistCachingEnable = False diff --git a/Data/User/GameConfig/GQSEAF.ini b/Data/User/GameConfig/GQSEAF.ini index c190a0f463..7cb18083db 100644 --- a/Data/User/GameConfig/GQSEAF.ini +++ b/Data/User/GameConfig/GQSEAF.ini @@ -561,7 +561,7 @@ $COLETTE Super Quick Level Up 045B6CA8 0098967F $COLETTE Have All Titles 05A0DBC7 08000000 -045B6CB0 FFFFFFFF +045B6CB0 08000000 $GENIS Full HP 05A0DBC9 08000000 025B6DBA 0000270F @@ -609,7 +609,7 @@ $RAINE Super Quick Level Up 045B6ED8 0098967F $RAINE Have All Titles 05A0DBD9 08000000 -045B6EE0 FFFFFFFF +045B6EE0 08000000 $KRATOS Full HP 05A0DBDB 08000000 025B744A 0000270F @@ -657,7 +657,7 @@ $SHEENA Super Quick Level Up 045B6FF0 0098967F $SHEENA Have All Titles 05A0DC18 08000000 -045B6FF8 FFFFFFFF +045B6FF8 08000000 $ZELOS Full HP 05A0DC1A 08000000 025B7102 0000270F @@ -681,7 +681,7 @@ $ZELOS Super Quick Level Up 045B7108 0098967F $ZELOS Have All Titles 05A0DC21 08000000 -045B7110 FFFFFFFF +045B7110 08000000 $PRESEA Full HP 05A0DC23 08000000 025B721A 0000270F @@ -705,7 +705,7 @@ $PRESEA Super Quick Level Up 045B7220 0098967F $PRESEA Have All Titles 05A0DC2A 08000000 -045B7228 FFFFFFFF +045B7228 08000000 $Equipment Modifier-Lloyd - READ INSTRUCTIONS 025B6BC2 0000009B 045B6BC4 0122014A @@ -789,5 +789,6 @@ PH_ZFar = 1 [Video_Settings] SafeTextureCache = True SafeTextureCacheColorSamples = 512 -[Video_Enhancements] -PostProcessingShader = +[Video_Hacks] +DlistCachingEnable = False + diff --git a/Data/User/GameConfig/GQSFAF.ini b/Data/User/GameConfig/GQSFAF.ini index 901cba8f92..3395be24bb 100644 --- a/Data/User/GameConfig/GQSFAF.ini +++ b/Data/User/GameConfig/GQSFAF.ini @@ -17,4 +17,7 @@ PH_ZNear = 0.5 PH_ZFar = 1 [Gecko] [Video_Settings] -SafeTextureCache = True \ No newline at end of file +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 +[Video_Hacks] +DlistCachingEnable = False diff --git a/Data/User/GameConfig/GQSPAF.ini b/Data/User/GameConfig/GQSPAF.ini index df727db8b2..e6ddfab0a8 100644 --- a/Data/User/GameConfig/GQSPAF.ini +++ b/Data/User/GameConfig/GQSPAF.ini @@ -17,4 +17,7 @@ PH_ZNear = 0.5 PH_ZFar = 1 [Gecko] [Video_Settings] -SafeTextureCache = True \ No newline at end of file +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 +[Video_Hacks] +DlistCachingEnable = False diff --git a/Data/User/GameConfig/GRUE78.ini b/Data/User/GameConfig/GRUE78.ini index 53b240f6b0..3b0bb35f75 100644 --- a/Data/User/GameConfig/GRUE78.ini +++ b/Data/User/GameConfig/GRUE78.ini @@ -1,7 +1,8 @@ # GRUE78 - Power Rangers Dino Thunder [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 = Needs LLE audio for proper sound and Real XFB to display videos. +EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. $(M) @@ -16,3 +17,14 @@ $Max Turbo Charges 00318047 00000063 $Infinite Health 04069830 38000004 +[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/GTYE69.ini b/Data/User/GameConfig/GTYE69.ini new file mode 100644 index 0000000000..268b84cb93 --- /dev/null +++ b/Data/User/GameConfig/GTYE69.ini @@ -0,0 +1,15 @@ +# GTYE69 - TY the Tasmanian Tiger +[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] diff --git a/Data/User/GameConfig/GTYP69.ini b/Data/User/GameConfig/GTYP69.ini new file mode 100644 index 0000000000..91ee039579 --- /dev/null +++ b/Data/User/GameConfig/GTYP69.ini @@ -0,0 +1,15 @@ +# GTYP69 - TY the Tasmanian Tiger +[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] diff --git a/Data/User/GameConfig/RCJE8P.ini b/Data/User/GameConfig/RCJE8P.ini index bb7568cc0a..845f08de77 100644 --- a/Data/User/GameConfig/RCJE8P.ini +++ b/Data/User/GameConfig/RCJE8P.ini @@ -23,4 +23,7 @@ PH_ZFar = [Gecko] [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 b64f4ad713..6d82c897e5 100644 --- a/Data/User/GameConfig/RCJP8P.ini +++ b/Data/User/GameConfig/RCJP8P.ini @@ -1,8 +1,9 @@ # RCJP8P - The Conduit [Core] Values set here will override the main dolphin settings. +BlockMerging = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = random crashes -EmulationStateId = 2 +EmulationIssues = +EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -15,4 +16,8 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Enhancements] -ForceFiltering = False \ No newline at end of file +ForceFiltering = False +[Wii] +DisableWiimoteSpeaker = 1 +[Video_Hacks] +DlistCachingEnable = False diff --git a/Data/User/GameConfig/RM3E01.ini b/Data/User/GameConfig/RM3E01.ini index 5ef96b0d77..cee3c4e962 100644 --- a/Data/User/GameConfig/RM3E01.ini +++ b/Data/User/GameConfig/RM3E01.ini @@ -21,5 +21,7 @@ SafeTextureCacheColorSamples = 512 [Video_Hacks] EFBToTextureEnable = False EFBCopyEnable = True -[Video_Enhancements] -PostProcessingShader = +[Wii] +DisableWiimoteSpeaker = 1 +[Video_Hacks] +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/RM3J01.ini b/Data/User/GameConfig/RM3J01.ini index f27e1e111d..3a3292be12 100644 --- a/Data/User/GameConfig/RM3J01.ini +++ b/Data/User/GameConfig/RM3J01.ini @@ -21,5 +21,7 @@ SafeTextureCacheColorSamples = 512 [Video_Hacks] EFBToTextureEnable = False EFBCopyEnable = True -[Video_Enhancements] -PostProcessingShader = +[Wii] +DisableWiimoteSpeaker = 1 +[Video_Hacks] +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/RM3P01.ini b/Data/User/GameConfig/RM3P01.ini index 42dc04ed9d..18164dc78a 100644 --- a/Data/User/GameConfig/RM3P01.ini +++ b/Data/User/GameConfig/RM3P01.ini @@ -23,3 +23,7 @@ SafeTextureCacheColorSamples = 512 [Video_Hacks] EFBToTextureEnable = False EFBCopyEnable = True +[Wii] +DisableWiimoteSpeaker = 1 +[Video_Hacks] +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/RWSE8P.ini b/Data/User/GameConfig/RWSE8P.ini index b745ea0226..b8f2398dfa 100644 --- a/Data/User/GameConfig/RWSE8P.ini +++ b/Data/User/GameConfig/RWSE8P.ini @@ -1,5 +1,6 @@ # RWSE8P - MARIO & SONIC At The OlympicGames [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 emulating format changes (r6871) @@ -15,4 +16,3 @@ PH_ZFar = [Gecko] [Video_Hacks] EFBEmulateFormatChanges = True - diff --git a/Data/User/GameConfig/RWSJ01.ini b/Data/User/GameConfig/RWSJ01.ini index 9599041d62..ad32d2e869 100644 --- a/Data/User/GameConfig/RWSJ01.ini +++ b/Data/User/GameConfig/RWSJ01.ini @@ -1,5 +1,6 @@ # RWSJ01 - MARIO & SONIC At The OlympicGames [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 emulating format changes (r6871) @@ -7,6 +8,11 @@ EmulationIssues = Needs emulating format changes (r6871) [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 \ No newline at end of file +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/RWSK01.ini b/Data/User/GameConfig/RWSK01.ini index 2d3b334a44..818bb671b0 100644 --- a/Data/User/GameConfig/RWSK01.ini +++ b/Data/User/GameConfig/RWSK01.ini @@ -1,5 +1,6 @@ # RWSK01 - MARIO & SONIC At The OlympicGames [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 emulating format changes (r6871) @@ -7,6 +8,11 @@ EmulationIssues = Needs emulating format changes (r6871) [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 \ No newline at end of file +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/RWSP8P.ini b/Data/User/GameConfig/RWSP8P.ini index 041c227b97..6793b10d3a 100644 --- a/Data/User/GameConfig/RWSP8P.ini +++ b/Data/User/GameConfig/RWSP8P.ini @@ -1,5 +1,6 @@ # RWSP8P - MARIO & SONIC At The OlympicGames [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 emulating format changes (r6871) @@ -7,6 +8,11 @@ EmulationIssues = Needs emulating format changes (r6871) [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 \ No newline at end of file +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/SC2E8P.ini b/Data/User/GameConfig/SC2E8P.ini index 61746b7162..ff46b91be8 100644 --- a/Data/User/GameConfig/SC2E8P.ini +++ b/Data/User/GameConfig/SC2E8P.ini @@ -16,4 +16,6 @@ EmulationIssues = [Gecko] [Video_Hacks] DlistCachingEnable = False -[Video_Settings] \ No newline at end of file +[Video_Settings] +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/SC2P8P.ini b/Data/User/GameConfig/SC2P8P.ini index 5ddb0fe59e..a065f8a096 100644 --- a/Data/User/GameConfig/SC2P8P.ini +++ b/Data/User/GameConfig/SC2P8P.ini @@ -66,4 +66,5 @@ $Profile Three Name Changer Jedi Hack & [Mitch] [Video_Hacks] DlistCachingEnable = False [Video_Settings] - +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/SC7D52.ini b/Data/User/GameConfig/SC7D52.ini index ab8c361ab2..07aac1180a 100644 --- a/Data/User/GameConfig/SC7D52.ini +++ b/Data/User/GameConfig/SC7D52.ini @@ -9,7 +9,7 @@ PH_ExtraParam = 0 PH_ZNear = 0. 01 PH_ZFar = [EmuState] -EmulationStateId = 0 +EmulationStateId = 4 EmulationIssues = [OnFrame] [ActionReplay] diff --git a/Data/User/GameConfig/SC7E52.ini b/Data/User/GameConfig/SC7E52.ini index fa15a58e5f..17e7dbf3e1 100644 --- a/Data/User/GameConfig/SC7E52.ini +++ b/Data/User/GameConfig/SC7E52.ini @@ -9,7 +9,7 @@ PH_ExtraParam = 0 PH_ZNear = 0. 01 PH_ZFar = [EmuState] -EmulationStateId = 0 +EmulationStateId = 4 EmulationIssues = [OnFrame] [ActionReplay] diff --git a/Data/User/GameConfig/SC7F52.ini b/Data/User/GameConfig/SC7F52.ini index 6a90a7ba0c..efa2e74bd4 100644 --- a/Data/User/GameConfig/SC7F52.ini +++ b/Data/User/GameConfig/SC7F52.ini @@ -9,7 +9,7 @@ PH_ExtraParam = 0 PH_ZNear = 0. 01 PH_ZFar = [EmuState] -EmulationStateId = 0 +EmulationStateId = 4 EmulationIssues = [OnFrame] [ActionReplay] diff --git a/Data/User/GameConfig/SC7I52.ini b/Data/User/GameConfig/SC7I52.ini index 18e1853d3e..804a02a547 100644 --- a/Data/User/GameConfig/SC7I52.ini +++ b/Data/User/GameConfig/SC7I52.ini @@ -9,7 +9,7 @@ PH_ExtraParam = 0 PH_ZNear = 0. 01 PH_ZFar = [EmuState] -EmulationStateId = 0 +EmulationStateId = 4 EmulationIssues = [OnFrame] [ActionReplay] diff --git a/Data/User/GameConfig/SC7P52.ini b/Data/User/GameConfig/SC7P52.ini index 160cbd1b27..95e09c5053 100644 --- a/Data/User/GameConfig/SC7P52.ini +++ b/Data/User/GameConfig/SC7P52.ini @@ -9,7 +9,7 @@ PH_ExtraParam = 0 PH_ZNear = 0. 01 PH_ZFar = [EmuState] -EmulationStateId = 0 +EmulationStateId = 4 EmulationIssues = [OnFrame] [ActionReplay] diff --git a/Data/User/GameConfig/SC7S52.ini b/Data/User/GameConfig/SC7S52.ini index fa15a58e5f..76f6efb914 100644 --- a/Data/User/GameConfig/SC7S52.ini +++ b/Data/User/GameConfig/SC7S52.ini @@ -1,4 +1,4 @@ -# SC7E52 - Call of Duty: Black Ops +# SC7S52 - Call of Duty: Black Ops [Video_Enhancements] MaxAnisotropy = 0 [Video] @@ -9,7 +9,7 @@ PH_ExtraParam = 0 PH_ZNear = 0. 01 PH_ZFar = [EmuState] -EmulationStateId = 0 +EmulationStateId = 4 EmulationIssues = [OnFrame] [ActionReplay] diff --git a/Data/User/GameConfig/SD2J01.ini b/Data/User/GameConfig/SD2J01.ini new file mode 100644 index 0000000000..a5d922d877 --- /dev/null +++ b/Data/User/GameConfig/SD2J01.ini @@ -0,0 +1,21 @@ +# SD2J01 - Just Dance 2 +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 +[Video_Enhancements] +MaxAnisotropy = 0 +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[EmuState] +EmulationStateId = 4 +EmulationIssues = +[OnFrame] +[ActionReplay] +[Gecko] +[Wii] +DisableWiimoteSpeaker = 1 \ No newline at end of file diff --git a/Data/User/GameConfig/SH6E52.ini b/Data/User/GameConfig/SH6E52.ini new file mode 100644 index 0000000000..286d4c8a8a --- /dev/null +++ b/Data/User/GameConfig/SH6E52.ini @@ -0,0 +1,20 @@ +# SH6E52 - Cabela's Big Game Hunter 2012 +[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 = MMU hack is needed or the game crashes during loading. EFB to RAM prevents glitches. +[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 diff --git a/Data/User/GameConfig/SRQE41.ini b/Data/User/GameConfig/SRQE41.ini new file mode 100644 index 0000000000..5060189327 --- /dev/null +++ b/Data/User/GameConfig/SRQE41.ini @@ -0,0 +1,19 @@ +# SRQE41 - Racquet Sports +[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] +[Wii] +DisableWiimoteSpeaker = 1 +[Video_Hacks] +DlistCachingEnable = False diff --git a/Data/User/GameConfig/SRQP41.ini b/Data/User/GameConfig/SRQP41.ini new file mode 100644 index 0000000000..f360aef050 --- /dev/null +++ b/Data/User/GameConfig/SRQP41.ini @@ -0,0 +1,19 @@ +# SRQP41 - Racquet Sports +[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] +[Wii] +DisableWiimoteSpeaker = 1 +[Video_Hacks] +DlistCachingEnable = False From 59072adc32bf779dee4879a456fcb2bdc71036fc Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 8 Oct 2011 17:33:21 +0200 Subject: [PATCH 073/381] Align stack variables on a 16-bytes boundary in SSSE3 functions Fixes issue 4450. Thanks to pholklore1 for his patch. --- Source/Core/VideoCommon/Src/VertexLoader_Position.cpp | 4 ++-- Source/Core/VideoCommon/Src/VertexLoader_TextCoord.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/VideoCommon/Src/VertexLoader_Position.cpp b/Source/Core/VideoCommon/Src/VertexLoader_Position.cpp index b8483b119c..06481f9ddf 100644 --- a/Source/Core/VideoCommon/Src/VertexLoader_Position.cpp +++ b/Source/Core/VideoCommon/Src/VertexLoader_Position.cpp @@ -179,8 +179,8 @@ void Pos_ReadIndex_Float_SSSE3(int Index) if(Index < MaxSize) { const u32* pData = (const u32 *)(cached_arraybases[ARRAY_POSITION] + (Index * arraystrides[ARRAY_POSITION])); - const __m128i a = _mm_loadu_si128((__m128i*)pData); - __m128i b = _mm_shuffle_epi8(a, three ? kMaskSwap32_3 : kMaskSwap32_2); + GC_ALIGNED128(const __m128i a = _mm_loadu_si128((__m128i*)pData)); + GC_ALIGNED128(__m128i b = _mm_shuffle_epi8(a, three ? kMaskSwap32_3 : kMaskSwap32_2)); _mm_storeu_si128((__m128i*)VertexManager::s_pCurBufferPointer, b); LOG_VTX(); VertexManager::s_pCurBufferPointer += 12; diff --git a/Source/Core/VideoCommon/Src/VertexLoader_TextCoord.cpp b/Source/Core/VideoCommon/Src/VertexLoader_TextCoord.cpp index de853081ed..ba3bb73f43 100644 --- a/Source/Core/VideoCommon/Src/VertexLoader_TextCoord.cpp +++ b/Source/Core/VideoCommon/Src/VertexLoader_TextCoord.cpp @@ -353,8 +353,8 @@ void LOADERDECL TexCoord_ReadIndex16_Float2_SSSE3() { u16 Index = DataReadU16(); const u32 *pData = (const u32 *)(cached_arraybases[ARRAY_TEXCOORD0+tcIndex] + (Index * arraystrides[ARRAY_TEXCOORD0+tcIndex])); - const __m128i a = _mm_loadl_epi64((__m128i*)pData); - const __m128i b = _mm_shuffle_epi8(a, kMaskSwap32); + GC_ALIGNED128(const __m128i a = _mm_loadl_epi64((__m128i*)pData)); + GC_ALIGNED128(const __m128i b = _mm_shuffle_epi8(a, kMaskSwap32)); u8* p = VertexManager::s_pCurBufferPointer; _mm_storel_epi64((__m128i*)p, b); LOG_TEX2(); From ad508ab8fb34cd80db45814619fbde2546df7e7d Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sat, 8 Oct 2011 15:23:00 -0700 Subject: [PATCH 074/381] Let's go ahead and throw this in here, should bring support of Intel IGP back in with DX9.... I can't actually test this for an obvious reason, but I figure while Windows is broken anyway, go ahead with it. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7707 8ced0084-cf51-0410-be5f-012b33b47a6e That should fix the seg faults on IGP chipsets. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7715 8ced0084-cf51-0410-be5f-012b33b47a6e Compile fix. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7716 8ced0084-cf51-0410-be5f-012b33b47a6e --- .../Plugins/Plugin_VideoDX9/Src/D3DBase.cpp | 19 ++++++++++++++----- Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h | 1 + 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp b/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp index de610eab39..ff3f68a6cd 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp @@ -28,7 +28,8 @@ D3DXCOMPILESHADERTYPE PD3DXCompileShader = NULL; namespace DX9 { - +static char vsVersions[5][7] = {"ERROR", "vs_1_4", "vs_2_a", "vs_3_0", "vs_4_0"}; +static char psVersions[5][7] = {"ERROR", "ps_1_4", "ps_2_a", "ps_3_0", "ps_4_0"}; // D3DX HINSTANCE hD3DXDll = NULL; int d3dx_dll_ref = 0; @@ -55,6 +56,7 @@ static bool auto_depth_stencil = false; #define VENDOR_NVIDIA 4318 #define VENDOR_ATI 4098 +#define VENDOR_INTEL 32902 bool bFrameInProgress = false; @@ -112,6 +114,10 @@ bool IsATIDevice() { return GetCurAdapter().ident.VendorId == VENDOR_ATI; } +bool IsIntelDevice() +{ + return GetCurAdapter().ident.VendorId == VENDOR_INTEL; +} HRESULT Init() @@ -139,6 +145,11 @@ HRESULT Init() int adapter = g_Config.iAdapter; D3D->GetDeviceCaps((adapter >= 0 && adapter < std::min(MAX_ADAPTERS, numAdapters)) ? adapter : D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, &caps); Enumerate(); + if(IsIntelDevice()){ + // Murder the a because Intel doesn't support 2.0a because the 'a' part was a ATI and Nvidia war going on + psVersions[2][5] = '0'; + vsVersions[2][5] = '0'; + } return S_OK; } @@ -522,16 +533,14 @@ D3DFORMAT GetSupportedDepthSurfaceFormat(D3DFORMAT target_format) const char *VertexShaderVersionString() { - static const char *versions[5] = {"ERROR", "vs_1_4", "vs_2_a", "vs_3_0", "vs_4_0"}; int version = ((D3D::caps.VertexShaderVersion >> 8) & 0xFF); - return versions[std::min(4, version)]; + return vsVersions[std::min(4, version)]; } const char *PixelShaderVersionString() { - static const char *versions[5] = {"ERROR", "ps_1_4", "ps_2_a", "ps_3_0", "ps_4_0"}; int version = ((D3D::caps.PixelShaderVersion >> 8) & 0xFF); - return versions[std::min(4, version)]; + return psVersions[std::min(4, version)]; } LPDIRECT3DSURFACE9 GetBackBufferSurface() diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h b/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h index f4a5244dbe..d1e7eeaa91 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h +++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h @@ -47,6 +47,7 @@ namespace D3D #define FOURCC_NULL ((D3DFORMAT)(MAKEFOURCC('N','U','L','L'))) bool IsATIDevice(); +bool IsIntelDevice(); HRESULT Init(); HRESULT Create(int adapter, HWND wnd, int resolution, int aa_mode, bool auto_depth); void Close(); From a751b627fdacd52db0f0d18cfaf33b8502fc7d06 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Tue, 4 Oct 2011 00:25:53 -0700 Subject: [PATCH 075/381] remove a now-unneeded comment --- Source/Core/Core/Src/HW/EXI_DeviceMic.cpp | 1 - Source/Core/Core/Src/PowerPC/PowerPC.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp index 4bafd51de6..bf73dbc002 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp @@ -59,7 +59,6 @@ void CEXIMic::StreamInit() void CEXIMic::StreamTerminate() { - // TODO keep track of number of mics... if (pa_init && --mic_count <= 0) pa_error = Pa_Terminate(); diff --git a/Source/Core/Core/Src/PowerPC/PowerPC.cpp b/Source/Core/Core/Src/PowerPC/PowerPC.cpp index 590881bb96..aef4c78c7b 100644 --- a/Source/Core/Core/Src/PowerPC/PowerPC.cpp +++ b/Source/Core/Core/Src/PowerPC/PowerPC.cpp @@ -276,7 +276,6 @@ void CheckExceptions() // Read volatile data once u32 exceptions = ppcState.Exceptions; - // This check is unnecessary in JIT mode. However, it probably doesn't really hurt. if (!exceptions) return; From ade9485aac2ed464105c1f40f6d6e62c2480f6eb Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Tue, 4 Oct 2011 03:29:01 -0700 Subject: [PATCH 076/381] ok...just need to update the button... --- Source/Core/Core/Src/HW/EXI_DeviceMic.cpp | 25 +- Source/Core/Core/Src/HW/EXI_DeviceMic.h | 4 +- Source/Core/DolphinWX/Dolphin.vcxproj | 2 + Source/Core/DolphinWX/Dolphin.vcxproj.filters | 6 + Source/Core/DolphinWX/Src/GCMicDlg.cpp | 290 ++++++++++++++++++ Source/Core/DolphinWX/Src/GCMicDlg.h | 74 +++++ 6 files changed, 394 insertions(+), 7 deletions(-) create mode 100644 Source/Core/DolphinWX/Src/GCMicDlg.cpp create mode 100644 Source/Core/DolphinWX/Src/GCMicDlg.h diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp index bf73dbc002..b2bb38d504 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp @@ -59,7 +59,7 @@ void CEXIMic::StreamInit() void CEXIMic::StreamTerminate() { - if (pa_init && --mic_count <= 0) + if (--mic_count <= 0 && pa_init) pa_error = Pa_Terminate(); if (pa_error != paNoError) @@ -98,15 +98,17 @@ void CEXIMic::StreamReadOne() { pa_error = Pa_ReadStream(pa_stream, ring_buffer, buff_size_samples); - if (pa_error != paNoError) + if (pa_error == paInputOverflowed) { status.buff_ovrflw = 1; // Input overflowed - is re-setting the stream the only to recover? - StreamLog("Pa_ReadStream"); - StreamStop(); StreamStart(); } + else if (pa_error != paNoError) + { + StreamLog("Pa_ReadStream"); + } } } @@ -125,10 +127,17 @@ int CEXIMic::mic_count = 0; CEXIMic::CEXIMic() { - status.U16 = 0; - command = 0; m_position = 0; + command = 0; + status.U16 = 0; + + sample_rate = rate_base; + buff_size = ring_base; + buff_size_samples = buff_size / sample_size; + ring_pos = 0; + memset(ring_buffer, 0, sizeof(ring_buffer)); + next_int_ticks = 0; StreamInit(); @@ -194,7 +203,11 @@ void CEXIMic::TransferByte(u8 &byte) break; case cmdGetStatus: + if (pos == 0) + status.button = 0;// TODO + byte = status.U8[pos ^ 1]; + if (pos == 1 && status.buff_ovrflw) status.buff_ovrflw = 0; break; diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMic.h b/Source/Core/Core/Src/HW/EXI_DeviceMic.h index e87d39f1a5..7631395100 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMic.h +++ b/Source/Core/Core/Src/HW/EXI_DeviceMic.h @@ -55,7 +55,9 @@ private: struct { u16 out :4; // MICSet/GetOut...??? - u16 button :5; // Buttons. Top bit is mic button. Lowest bit is used for MICGetDeviceID (always 0) + u16 id :1; // Used for MICGetDeviceID (always 0) + u16 button_unk :3; // Button bits which appear unused + u16 button :1; // The actual button on the mic u16 buff_ovrflw :1; // Ring buffer wrote over bytes which weren't read by console u16 gain :1; // Gain: 0dB or 15dB u16 sample_rate :2; // Sample rate, 00-11025, 01-22050, 10-44100, 11-?? diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj b/Source/Core/DolphinWX/Dolphin.vcxproj index fc232ea77f..d6b854d075 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj +++ b/Source/Core/DolphinWX/Dolphin.vcxproj @@ -236,6 +236,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / + @@ -298,6 +299,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / + diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj.filters b/Source/Core/DolphinWX/Dolphin.vcxproj.filters index 3c14226fc0..d3ab073527 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj.filters +++ b/Source/Core/DolphinWX/Dolphin.vcxproj.filters @@ -135,6 +135,9 @@ GUI + + GUI + @@ -264,6 +267,9 @@ GUI + + GUI + diff --git a/Source/Core/DolphinWX/Src/GCMicDlg.cpp b/Source/Core/DolphinWX/Src/GCMicDlg.cpp new file mode 100644 index 0000000000..1cdd166cf5 --- /dev/null +++ b/Source/Core/DolphinWX/Src/GCMicDlg.cpp @@ -0,0 +1,290 @@ +// 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 "GCMicDlg.h" +#include "ConfigManager.h" + +BEGIN_EVENT_TABLE(GCMicDialog,wxDialog) + EVT_COMMAND_RANGE(0, NUM_HOTKEYS - 1, + wxEVT_COMMAND_BUTTON_CLICKED, GCMicDialog::OnButtonClick) + EVT_TIMER(wxID_ANY, GCMicDialog::OnButtonTimer) +END_EVENT_TABLE() + +GCMicDialog::GCMicDialog(wxWindow *parent, wxWindowID id, const wxString &title, + const wxPoint &position, const wxSize& size, long style) +: wxDialog(parent, id, title, position, size, style) +{ + CreateHotkeyGUIControls(); + +#if wxUSE_TIMER + m_ButtonMappingTimer = new wxTimer(this, wxID_ANY); + g_Pressed = 0; + g_Modkey = 0; + ClickedButton = NULL; + GetButtonWaitingID = 0; + GetButtonWaitingTimer = 0; +#endif +} + +GCMicDialog::~GCMicDialog() +{ + delete m_ButtonMappingTimer; +} + +// Save keyboard key mapping +void GCMicDialog::SaveButtonMapping(int Id, int Key, int Modkey) +{ + SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[Id] = Key; + SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[Id] = Modkey; +} + +void GCMicDialog::EndGetButtons(void) +{ + wxTheApp->Disconnect(wxID_ANY, wxEVT_KEY_DOWN, // Keyboard + wxKeyEventHandler(GCMicDialog::OnKeyDown), + (wxObject*)0, this); + m_ButtonMappingTimer->Stop(); + GetButtonWaitingTimer = 0; + GetButtonWaitingID = 0; + ClickedButton = NULL; + SetEscapeId(wxID_ANY); +} + +void GCMicDialog::OnKeyDown(wxKeyEvent& event) +{ + if(ClickedButton != NULL) + { + // Save the key + g_Pressed = event.GetKeyCode(); + g_Modkey = event.GetModifiers(); + + // Don't allow modifier keys + if (g_Pressed == WXK_CONTROL || g_Pressed == WXK_ALT || + g_Pressed == WXK_SHIFT || g_Pressed == WXK_COMMAND) + return; + + // Use the space key to set a blank key + if (g_Pressed == WXK_SPACE) + { + SaveButtonMapping(ClickedButton->GetId(), -1, 0); + SetButtonText(ClickedButton->GetId(), wxString()); + } + else + { + SetButtonText(ClickedButton->GetId(), + InputCommon::WXKeyToString(g_Pressed), + InputCommon::WXKeymodToString(g_Modkey)); + SaveButtonMapping(ClickedButton->GetId(), g_Pressed, g_Modkey); + } + EndGetButtons(); + } +} + +// Update the textbox for the buttons +void GCMicDialog::SetButtonText(int id, const wxString &keystr, const wxString &modkeystr) +{ + m_Button_Hotkeys[id]->SetLabel(modkeystr + keystr); +} + +void GCMicDialog::DoGetButtons(int _GetId) +{ + // Values used in this function + const int Seconds = 4; // Seconds to wait for + const int TimesPerSecond = 40; // How often to run the check + + // If the Id has changed or the timer is not running we should start one + if( GetButtonWaitingID != _GetId || !m_ButtonMappingTimer->IsRunning() ) + { + if(m_ButtonMappingTimer->IsRunning()) + m_ButtonMappingTimer->Stop(); + + // Save the button Id + GetButtonWaitingID = _GetId; + GetButtonWaitingTimer = 0; + + // Start the timer + #if wxUSE_TIMER + m_ButtonMappingTimer->Start(1000 / TimesPerSecond); + #endif + } + + // Process results + // Count each time + GetButtonWaitingTimer++; + + // This is run every second + if (GetButtonWaitingTimer % TimesPerSecond == 0) + { + // Current time + int TmpTime = Seconds - (GetButtonWaitingTimer / TimesPerSecond); + // Update text + SetButtonText(_GetId, wxString::Format(wxT("[ %d ]"), TmpTime)); + } + + // Time's up + if (GetButtonWaitingTimer / TimesPerSecond >= Seconds) + { + // Revert back to old label + SetButtonText(_GetId, OldLabel); + EndGetButtons(); + } +} + +// Input button clicked +void GCMicDialog::OnButtonClick(wxCommandEvent& event) +{ + event.Skip(); + + if (m_ButtonMappingTimer->IsRunning()) return; + + wxTheApp->Connect(wxID_ANY, wxEVT_KEY_DOWN, // Keyboard + wxKeyEventHandler(GCMicDialog::OnKeyDown), + (wxObject*)0, this); + + // Get the button + ClickedButton = (wxButton *)event.GetEventObject(); + SetEscapeId(wxID_CANCEL); + // Save old label so we can revert back + OldLabel = ClickedButton->GetLabel(); + ClickedButton->SetWindowStyle(wxWANTS_CHARS); + ClickedButton->SetLabel(_("")); + DoGetButtons(ClickedButton->GetId()); +} + +#define HOTKEY_NUM_COLUMNS 2 + +void GCMicDialog::CreateHotkeyGUIControls(void) +{ + const wxString pageNames[] = + { + _("General"), + _("State Saves") + }; + + const wxString hkText[] = + { + _("Open"), + _("Change Disc"), + _("Refresh List"), + + _("Play/Pause"), + _("Stop"), + _("Reset"), + _("Frame Advance"), + + _("Start Recording"), + _("Play Recording"), + _("Export Recording"), + _("Read-only mode"), + + _("Toggle Fullscreen"), + _("Take Screenshot"), + + _("Connect Wiimote 1"), + _("Connect Wiimote 2"), + _("Connect Wiimote 3"), + _("Connect Wiimote 4"), + + _("Load State Slot 1"), + _("Load State Slot 2"), + _("Load State Slot 3"), + _("Load State Slot 4"), + _("Load State Slot 5"), + _("Load State Slot 6"), + _("Load State Slot 7"), + _("Load State Slot 8"), + + _("Save State Slot 1"), + _("Save State Slot 2"), + _("Save State Slot 3"), + _("Save State Slot 4"), + _("Save State Slot 5"), + _("Save State Slot 6"), + _("Save State Slot 7"), + _("Save State Slot 8") + }; + + const int page_breaks[3] = {HK_OPEN, HK_LOAD_STATE_SLOT_1, NUM_HOTKEYS}; + + // Configuration controls sizes + wxSize size(100,20); + // A small type font + wxFont m_SmallFont(7, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); + + wxNotebook *Notebook = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize); + + for (int j = 0; j < 2; j++) + { + wxPanel *Page = new wxPanel(Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize); + Notebook->AddPage(Page, pageNames[j]); + + wxGridBagSizer *sHotkeys = new wxGridBagSizer(); + + // Header line + for (int i = 0; i < HOTKEY_NUM_COLUMNS; i++) + { + wxBoxSizer *HeaderSizer = new wxBoxSizer(wxHORIZONTAL); + wxStaticText *StaticTextHeader = new wxStaticText(Page, wxID_ANY, _("Action")); + HeaderSizer->Add(StaticTextHeader, 1, wxALL, 2); + StaticTextHeader = new wxStaticText(Page, wxID_ANY, _("Key"), wxDefaultPosition, size); + HeaderSizer->Add(StaticTextHeader, 0, wxALL, 2); + sHotkeys->Add(HeaderSizer, wxGBPosition(0, i), wxDefaultSpan, wxEXPAND | wxLEFT, (i > 0) ? 30 : 1); + } + + int column_break = (page_breaks[j+1] + page_breaks[j] + 1) / 2; + + for (int i = page_breaks[j]; i < page_breaks[j+1]; i++) + { + // Text for the action + wxStaticText *stHotkeys = new wxStaticText(Page, wxID_ANY, hkText[i]); + + // Key selection button + m_Button_Hotkeys[i] = new wxButton(Page, i, wxEmptyString, + wxDefaultPosition, size); + m_Button_Hotkeys[i]->SetFont(m_SmallFont); + m_Button_Hotkeys[i]->SetToolTip(_("Left click to detect hotkeys.\nEnter space to clear.")); + SetButtonText(i, + InputCommon::WXKeyToString(SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[i]), + InputCommon::WXKeymodToString( + SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[i])); + + wxBoxSizer *sHotkey = new wxBoxSizer(wxHORIZONTAL); + sHotkey->Add(stHotkeys, 1, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL, 2); + sHotkey->Add(m_Button_Hotkeys[i], 0, wxALL, 2); + sHotkeys->Add(sHotkey, + wxGBPosition((i < column_break) ? i - page_breaks[j] + 1 : i - column_break + 1, + (i < column_break) ? 0 : 1), + wxDefaultSpan, wxEXPAND | wxLEFT, (i < column_break) ? 1 : 30); + } + + wxStaticBoxSizer *sHotkeyBox = new wxStaticBoxSizer(wxVERTICAL, Page, _("Hotkeys")); + sHotkeyBox->Add(sHotkeys); + + wxBoxSizer* const sPage = new wxBoxSizer(wxVERTICAL); + sPage->Add(sHotkeyBox, 0, wxEXPAND | wxALL, 5); + Page->SetSizer(sPage); + } + + wxBoxSizer *sMainSizer = new wxBoxSizer(wxVERTICAL); + sMainSizer->Add(Notebook, 0, wxEXPAND | wxALL, 5); + sMainSizer->Add(CreateButtonSizer(wxOK), 0, wxEXPAND | wxLEFT | wxRIGHT | wxDOWN, 5); + SetSizerAndFit(sMainSizer); + SetFocus(); +} + diff --git a/Source/Core/DolphinWX/Src/GCMicDlg.h b/Source/Core/DolphinWX/Src/GCMicDlg.h new file mode 100644 index 0000000000..c817a67254 --- /dev/null +++ b/Source/Core/DolphinWX/Src/GCMicDlg.h @@ -0,0 +1,74 @@ +// 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 __HOTKEYDIALOG_h__ +#define __HOTKEYDIALOG_h__ + +#include +#include +#include +#include +#include +#include +#include + +#include "Common.h" +#include "CoreParameter.h" +#include "WXInputBase.h" + +#if defined(HAVE_X11) && HAVE_X11 +#include "X11InputBase.h" +#include +#include +#endif + +class GCMicDialog : public wxDialog +{ + public: + GCMicDialog(wxWindow *parent, + wxWindowID id = 1, + const wxString &title = _("GCMic Configuration"), + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDEFAULT_DIALOG_STYLE); + virtual ~GCMicDialog(); + + private: + DECLARE_EVENT_TABLE(); + + wxString OldLabel; + + wxButton *ClickedButton, + *m_Button_Hotkeys[NUM_HOTKEYS]; + + wxTimer *m_ButtonMappingTimer; + + void OnButtonTimer(wxTimerEvent& WXUNUSED(event)) { DoGetButtons(GetButtonWaitingID); } + void OnButtonClick(wxCommandEvent& event); + void OnKeyDown(wxKeyEvent& event); + void SaveButtonMapping(int Id, int Key, int Modkey); + void CreateHotkeyGUIControls(void); + + void SetButtonText(int id, const wxString &keystr, const wxString &modkeystr = wxString()); + + void DoGetButtons(int id); + void EndGetButtons(void); + + int GetButtonWaitingID, GetButtonWaitingTimer, g_Pressed, g_Modkey; +}; +#endif + From 3790a16ece95733cb546069766346c6563ae0c52 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 9 Oct 2011 01:10:47 -0700 Subject: [PATCH 077/381] billliarrddd...here is how to set the button bit --- Source/Core/Core/Src/HW/EXI_DeviceMic.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp index b2bb38d504..8e37fe7d75 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp @@ -30,6 +30,9 @@ #include +#include "GCPadStatus.h" +#include "GCPad.h" + static bool pa_init = false; void CEXIMic::StreamLog(const char *msg) @@ -204,7 +207,11 @@ void CEXIMic::TransferByte(u8 &byte) case cmdGetStatus: if (pos == 0) - status.button = 0;// TODO + { + SPADStatus silly; + Pad::GetStatus(0, &silly); + status.button = !!(silly.button & PAD_BUTTON_A); + } byte = status.U8[pos ^ 1]; From ceef98b882e0f4ed089bd66c85ed9af24403ed24 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 9 Oct 2011 04:27:43 -0500 Subject: [PATCH 078/381] Added mic button to gcpad 1 and 2 diags. Both mic slots use gcpad 1 currently. Totally untested. --- Source/Core/Core/Src/HW/EXI_DeviceMic.cpp | 4 +--- Source/Core/Core/Src/HW/GCPad.cpp | 11 +++++++++++ Source/Core/Core/Src/HW/GCPad.h | 1 + Source/Core/Core/Src/HW/GCPadEmu.cpp | 12 ++++++++++-- Source/Core/Core/Src/HW/GCPadEmu.h | 2 ++ 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp index 8e37fe7d75..b13f22f785 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp @@ -208,9 +208,7 @@ void CEXIMic::TransferByte(u8 &byte) case cmdGetStatus: if (pos == 0) { - SPADStatus silly; - Pad::GetStatus(0, &silly); - status.button = !!(silly.button & PAD_BUTTON_A); + status.button = Pad::GetMicButton(0); // TODO: slot A/B -> 0/1 } byte = status.U8[pos ^ 1]; diff --git a/Source/Core/Core/Src/HW/GCPad.cpp b/Source/Core/Core/Src/HW/GCPad.cpp index 8027c82db5..65b920409e 100644 --- a/Source/Core/Core/Src/HW/GCPad.cpp +++ b/Source/Core/Core/Src/HW/GCPad.cpp @@ -107,4 +107,15 @@ void Rumble(u8 _numPAD, unsigned int _uType, unsigned int _uStrength) } } +bool GetMicButton(u8 pad) +{ + + std::unique_lock lk(g_plugin.controls_lock, std::try_to_lock); + + if (!lk.owns_lock()) + return false; + + return ((GCPad*)g_plugin.controllers[pad])->GetMicButton(); +} + } diff --git a/Source/Core/Core/Src/HW/GCPad.h b/Source/Core/Core/Src/HW/GCPad.h index c3e1ace61e..f7f6af2f20 100644 --- a/Source/Core/Core/Src/HW/GCPad.h +++ b/Source/Core/Core/Src/HW/GCPad.h @@ -33,6 +33,7 @@ InputPlugin *GetPlugin(); void GetStatus(u8 _numPAD, SPADStatus* _pPADStatus); void Rumble(u8 _numPAD, unsigned int _uType, unsigned int _uStrength); +bool GetMicButton(u8 pad); } #endif diff --git a/Source/Core/Core/Src/HW/GCPadEmu.cpp b/Source/Core/Core/Src/HW/GCPadEmu.cpp index 47e32b1efc..837c9104cc 100644 --- a/Source/Core/Core/Src/HW/GCPadEmu.cpp +++ b/Source/Core/Core/Src/HW/GCPadEmu.cpp @@ -25,7 +25,8 @@ const u16 button_bitmasks[] = PAD_BUTTON_X, PAD_BUTTON_Y, PAD_TRIGGER_Z, - PAD_BUTTON_START + PAD_BUTTON_START, + 0 // MIC HAX }; const u16 trigger_bitmasks[] = @@ -47,6 +48,7 @@ const char* const named_buttons[] = "Y", "Z", _trans("Start"), + "Mic" }; const char* const named_triggers[] = @@ -63,10 +65,11 @@ const char* const named_triggers[] = GCPad::GCPad(const unsigned int index) : m_index(index) { + int const mic_hax = index > 1; // buttons groups.push_back(m_buttons = new Buttons(_trans("Buttons"))); - for (unsigned int i=0; i < sizeof(named_buttons)/sizeof(*named_buttons); ++i) + for (unsigned int i=0; i < sizeof(named_buttons)/sizeof(*named_buttons) - mic_hax; ++i) m_buttons->controls.push_back(new ControlGroup::Input(named_buttons[i])); // sticks @@ -203,3 +206,8 @@ void GCPad::LoadDefaults(const ControllerInterface& ciface) set_control(m_triggers, 0, "Q"); // L set_control(m_triggers, 1, "W"); // R } + +bool GCPad::GetMicButton() const +{ + return m_buttons->controls.back()->control_ref->State(); +} diff --git a/Source/Core/Core/Src/HW/GCPadEmu.h b/Source/Core/Core/Src/HW/GCPadEmu.h index 5fa67e284f..5185ff221c 100644 --- a/Source/Core/Core/Src/HW/GCPadEmu.h +++ b/Source/Core/Core/Src/HW/GCPadEmu.h @@ -29,6 +29,8 @@ public: GCPad(const unsigned int index); void GetInput(SPADStatus* const pad); void SetOutput(const bool on); + + bool GetMicButton() const; std::string GetName() const; From 41424d98e8ccd089411d844b38c8eb9b56e43adb Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 9 Oct 2011 03:18:15 -0700 Subject: [PATCH 079/381] Make the mic button respect which slot it's plugged into. *You need to open the Gamecube config page and reselect the devices in slot A and B after this commit* Just jitil left... --- Source/Core/Core/Src/ConfigManager.cpp | 2 +- Source/Core/Core/Src/HW/EXI.cpp | 12 ++++++------ Source/Core/Core/Src/HW/EXI.h | 2 +- Source/Core/Core/Src/HW/EXI_Channel.cpp | 18 +++++++++--------- Source/Core/Core/Src/HW/EXI_Channel.h | 4 ++-- Source/Core/Core/Src/HW/EXI_Device.cpp | 14 +++++--------- Source/Core/Core/Src/HW/EXI_Device.h | 5 ++--- .../Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp | 17 +++++++---------- Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h | 4 +--- Source/Core/Core/Src/HW/EXI_DeviceMic.cpp | 13 ++++--------- Source/Core/Core/Src/HW/EXI_DeviceMic.h | 6 ++++-- Source/Core/DolphinWX/Src/ConfigMain.cpp | 9 ++++----- 12 files changed, 46 insertions(+), 60 deletions(-) diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index 7b0716a3eb..3d68189db3 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -355,7 +355,7 @@ void SConfig::LoadSettings() ini.Get("Core", "MemcardA", &m_strMemoryCardA); ini.Get("Core", "MemcardB", &m_strMemoryCardB); ini.Get("Core", "ReloadMemcardOnState", &b_reloadMCOnState, true); - ini.Get("Core", "SlotA", (int*)&m_EXIDevice[0], EXIDEVICE_MEMORYCARD_A); + ini.Get("Core", "SlotA", (int*)&m_EXIDevice[0], EXIDEVICE_MEMORYCARD); ini.Get("Core", "SlotB", (int*)&m_EXIDevice[1], EXIDEVICE_NONE); ini.Get("Core", "SerialPort1", (int*)&m_EXIDevice[2], EXIDEVICE_NONE); ini.Get("Core", "BBA_MAC", &m_bba_mac); diff --git a/Source/Core/Core/Src/HW/EXI.cpp b/Source/Core/Core/Src/HW/EXI.cpp index 7c93d5a567..109e955e8c 100644 --- a/Source/Core/Core/Src/HW/EXI.cpp +++ b/Source/Core/Core/Src/HW/EXI.cpp @@ -75,18 +75,18 @@ void DoState(PointerWrap &p) void ChangeDeviceCallback(u64 userdata, int cyclesLate) { u8 channel = (u8)(userdata >> 32); - u8 device = (u8)(userdata >> 16); - u8 slot = (u8)userdata; + u8 type = (u8)(userdata >> 16); + u8 num = (u8)userdata; - g_Channels[channel]->AddDevice((TEXIDevices)device, slot); + g_Channels[channel]->AddDevice((TEXIDevices)type, num); } -void ChangeDevice(u8 channel, TEXIDevices device, u8 slot) +void ChangeDevice(const u8 channel, const TEXIDevices device_type, const u8 device_num) { // Called from GUI, so we need to make it thread safe. // Let the hardware see no device for .5b cycles - CoreTiming::ScheduleEvent_Threadsafe(0, changeDevice, ((u64)channel << 32) | ((u64)EXIDEVICE_NONE << 16) | slot); - CoreTiming::ScheduleEvent_Threadsafe(500000000, changeDevice, ((u64)channel << 32) | ((u64)device << 16) | slot); + CoreTiming::ScheduleEvent_Threadsafe(0, changeDevice, ((u64)channel << 32) | ((u64)EXIDEVICE_NONE << 16) | device_num); + CoreTiming::ScheduleEvent_Threadsafe(500000000, changeDevice, ((u64)channel << 32) | ((u64)device_type << 16) | device_num); } // Unused (?!) diff --git a/Source/Core/Core/Src/HW/EXI.h b/Source/Core/Core/Src/HW/EXI.h index 867700947a..fbd5b2e788 100644 --- a/Source/Core/Core/Src/HW/EXI.h +++ b/Source/Core/Core/Src/HW/EXI.h @@ -33,7 +33,7 @@ void Update(); void UpdateInterrupts(); void ChangeDeviceCallback(u64 userdata, int cyclesLate); -void ChangeDevice(u8 channel, TEXIDevices device, u8 slot); +void ChangeDevice(const u8 channel, const TEXIDevices device_type, const u8 device_num); void Read32(u32& _uReturnValue, const u32 _iAddress); void Write32(const u32 _iValue, const u32 _iAddress); diff --git a/Source/Core/Core/Src/HW/EXI_Channel.cpp b/Source/Core/Core/Src/HW/EXI_Channel.cpp index 9ab0fd13d3..c7f45bd667 100644 --- a/Source/Core/Core/Src/HW/EXI_Channel.cpp +++ b/Source/Core/Core/Src/HW/EXI_Channel.cpp @@ -42,7 +42,7 @@ CEXIChannel::CEXIChannel(u32 ChannelId) : m_Status.CHIP_SELECT = 1; for (int i = 0; i < NUM_DEVICES; i++) - m_pDevices[i] = EXIDevice_Create(EXIDEVICE_NONE); + m_pDevices[i] = EXIDevice_Create(EXIDEVICE_NONE, i); } CEXIChannel::~CEXIChannel() @@ -59,19 +59,19 @@ void CEXIChannel::RemoveDevices() } } -void CEXIChannel::AddDevice(const TEXIDevices _device, const unsigned int _iSlot) +void CEXIChannel::AddDevice(const TEXIDevices device_type, const int device_num) { - _dbg_assert_(EXPANSIONINTERFACE, _iSlot < NUM_DEVICES); + _dbg_assert_(EXPANSIONINTERFACE, device_num < NUM_DEVICES); // delete the old device - if (m_pDevices[_iSlot] != NULL) + if (m_pDevices[device_num] != NULL) { - delete m_pDevices[_iSlot]; - m_pDevices[_iSlot] = NULL; + delete m_pDevices[device_num]; + m_pDevices[device_num] = NULL; } // create the new one - m_pDevices[_iSlot] = EXIDevice_Create(_device); + m_pDevices[device_num] = EXIDevice_Create(device_type, device_num); // This means "device presence changed", software has to check // m_Status.EXT to see if it is now present or not @@ -107,9 +107,9 @@ bool CEXIChannel::IsCausingInterrupt() } } -IEXIDevice* CEXIChannel::GetDevice(u8 _CHIP_SELECT) +IEXIDevice* CEXIChannel::GetDevice(const u8 chip_select) { - switch(_CHIP_SELECT) + switch (chip_select) { case 1: return m_pDevices[0]; case 2: return m_pDevices[1]; diff --git a/Source/Core/Core/Src/HW/EXI_Channel.h b/Source/Core/Core/Src/HW/EXI_Channel.h index df39939f38..8109de6fc1 100644 --- a/Source/Core/Core/Src/HW/EXI_Channel.h +++ b/Source/Core/Core/Src/HW/EXI_Channel.h @@ -112,12 +112,12 @@ private: public: // get device - IEXIDevice* GetDevice(u8 _CHIP_SELECT); + IEXIDevice* GetDevice(const u8 _CHIP_SELECT); CEXIChannel(u32 ChannelId); ~CEXIChannel(); - void AddDevice(const TEXIDevices _device, const unsigned int _iSlot); + void AddDevice(const TEXIDevices device_type, const int device_num); // Remove all devices void RemoveDevices(); diff --git a/Source/Core/Core/Src/HW/EXI_Device.cpp b/Source/Core/Core/Src/HW/EXI_Device.cpp index 8660d84720..5eb3aa1631 100644 --- a/Source/Core/Core/Src/HW/EXI_Device.cpp +++ b/Source/Core/Core/Src/HW/EXI_Device.cpp @@ -102,20 +102,16 @@ public: // F A C T O R Y -IEXIDevice* EXIDevice_Create(TEXIDevices _EXIDevice) +IEXIDevice* EXIDevice_Create(TEXIDevices device_type, const int device_num) { - switch(_EXIDevice) + switch (device_type) { case EXIDEVICE_DUMMY: return new CEXIDummy("Dummy"); break; - case EXIDEVICE_MEMORYCARD_A: - return new CEXIMemoryCard("MemoryCardA", SConfig::GetInstance().m_strMemoryCardA, 0); - break; - - case EXIDEVICE_MEMORYCARD_B: - return new CEXIMemoryCard("MemoryCardB", SConfig::GetInstance().m_strMemoryCardB, 1); + case EXIDEVICE_MEMORYCARD: + return new CEXIMemoryCard(device_num); break; case EXIDEVICE_MASKROM: @@ -127,7 +123,7 @@ IEXIDevice* EXIDevice_Create(TEXIDevices _EXIDevice) break; case EXIDEVICE_MIC: - return new CEXIMic(); + return new CEXIMic(device_num); break; case EXIDEVICE_ETH: diff --git a/Source/Core/Core/Src/HW/EXI_Device.h b/Source/Core/Core/Src/HW/EXI_Device.h index 4cc613950b..d8f3706885 100644 --- a/Source/Core/Core/Src/HW/EXI_Device.h +++ b/Source/Core/Core/Src/HW/EXI_Device.h @@ -53,8 +53,7 @@ public: enum TEXIDevices { EXIDEVICE_DUMMY, - EXIDEVICE_MEMORYCARD_A, - EXIDEVICE_MEMORYCARD_B, + EXIDEVICE_MEMORYCARD, EXIDEVICE_MASKROM, EXIDEVICE_AD16, EXIDEVICE_MIC, @@ -64,6 +63,6 @@ enum TEXIDevices EXIDEVICE_NONE = (u8)-1 }; -extern IEXIDevice* EXIDevice_Create(TEXIDevices _EXIDevice); +extern IEXIDevice* EXIDevice_Create(const TEXIDevices device_type, const int device_num); #endif diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp index 341a14bec6..b5ca14b305 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp @@ -43,13 +43,13 @@ void CEXIMemoryCard::FlushCallback(u64 userdata, int cyclesLate) ptr->Flush(); } -CEXIMemoryCard::CEXIMemoryCard(const std::string& _rName, const std::string& _rFilename, int _card_index) : - m_strFilename(_rFilename), - card_index(_card_index), - m_bDirty(false) +CEXIMemoryCard::CEXIMemoryCard(const int index) + : card_index(index) + , m_bDirty(false) { - cards[_card_index] = this; - et_this_card = CoreTiming::RegisterEvent(_rName.c_str(), FlushCallback); + m_strFilename = (card_index == 0) ? SConfig::GetInstance().m_strMemoryCardA : SConfig::GetInstance().m_strMemoryCardB; + cards[card_index] = this; + et_this_card = CoreTiming::RegisterEvent((card_index == 0) ? "memcardA" : "memcardB", FlushCallback); reloadOnState = SConfig::GetInstance().b_reloadMCOnState; interruptSwitch = 0; @@ -426,9 +426,6 @@ void CEXIMemoryCard::DoState(PointerWrap &p) { if (reloadOnState) { - int slot = 0; - if (GetFileName() == SConfig::GetInstance().m_strMemoryCardA) - slot = 1; - ExpansionInterface::ChangeDevice(slot, slot ? EXIDEVICE_MEMORYCARD_B : EXIDEVICE_MEMORYCARD_A, 0); + ExpansionInterface::ChangeDevice(card_index, EXIDEVICE_MEMORYCARD, 0); } } diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h index 248fcd31cb..e61a3d99a7 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h +++ b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h @@ -32,7 +32,7 @@ struct FlushData class CEXIMemoryCard : public IEXIDevice { public: - CEXIMemoryCard(const std::string& _rName, const std::string& _rFilename, int card_index); + CEXIMemoryCard(const int index); virtual ~CEXIMemoryCard(); void SetCS(int cs); void Update(); @@ -40,8 +40,6 @@ public: bool IsPresent(); void DoState(PointerWrap &p); - inline const std::string &GetFileName() const { return m_strFilename; }; - private: // This is scheduled whenever a page write is issued. The this pointer is passed // through the userdata parameter, so that it can then call Flush on the right card. diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp index b13f22f785..9faff0e7b6 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp @@ -19,9 +19,6 @@ #if HAVE_PORTAUDIO -#include "FileUtil.h" -#include "StringUtil.h" -#include "../Core.h" #include "../CoreTiming.h" #include "SystemTimers.h" @@ -30,7 +27,6 @@ #include -#include "GCPadStatus.h" #include "GCPad.h" static bool pa_init = false; @@ -128,7 +124,8 @@ void CEXIMic::StreamReadOne() u8 const CEXIMic::exi_id[] = { 0, 0x0a, 0, 0, 0 }; int CEXIMic::mic_count = 0; -CEXIMic::CEXIMic() +CEXIMic::CEXIMic(int index) + : slot(index) { m_position = 0; command = 0; @@ -207,13 +204,11 @@ void CEXIMic::TransferByte(u8 &byte) case cmdGetStatus: if (pos == 0) - { - status.button = Pad::GetMicButton(0); // TODO: slot A/B -> 0/1 - } + status.button = Pad::GetMicButton(slot); byte = status.U8[pos ^ 1]; - if (pos == 1 && status.buff_ovrflw) + if (pos == 1) status.buff_ovrflw = 0; break; diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMic.h b/Source/Core/Core/Src/HW/EXI_DeviceMic.h index 7631395100..491a112375 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMic.h +++ b/Source/Core/Core/Src/HW/EXI_DeviceMic.h @@ -23,7 +23,7 @@ class CEXIMic : public IEXIDevice { public: - CEXIMic(); + CEXIMic(const int index); virtual ~CEXIMic(); void SetCS(int cs); bool IsInterruptSet(); @@ -46,6 +46,8 @@ private: }; // STATE_TO_SAVE + int slot; + u32 m_position; int command; union UStatus @@ -101,7 +103,7 @@ protected: class CEXIMic : public IEXIDevice { public: - CEXIMic() {} + CEXIMic(const int) {} }; #endif diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 8b2dcb07f6..cc0a391d10 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -406,8 +406,7 @@ void CConfigMain::InitializeGUIValues() case EXIDEVICE_NONE: GCEXIDevice[i]->SetStringSelection(SlotDevices[0]); break; - case EXIDEVICE_MEMORYCARD_A: - case EXIDEVICE_MEMORYCARD_B: + case EXIDEVICE_MEMORYCARD: isMemcard = GCEXIDevice[i]->SetStringSelection(SlotDevices[2]); break; case EXIDEVICE_MIC: @@ -1030,7 +1029,7 @@ void CConfigMain::ChooseMemcardPath(std::string& strMemcard, bool isSlotA) // Change memcard to the new file ExpansionInterface::ChangeDevice( isSlotA ? 0 : 1, // SlotA: channel 0, SlotB channel 1 - isSlotA ? EXIDEVICE_MEMORYCARD_A : EXIDEVICE_MEMORYCARD_B, + EXIDEVICE_MEMORYCARD, 0); // SP1 is device 2, slots are device 0 } } @@ -1068,7 +1067,7 @@ void CConfigMain::ChooseEXIDevice(std::string deviceName, int deviceNum) TEXIDevices tempType; if (!deviceName.compare(CSTR_TRANS(EXIDEV_MEMCARD_STR))) - tempType = deviceNum ? EXIDEVICE_MEMORYCARD_B : EXIDEVICE_MEMORYCARD_A; + tempType = EXIDEVICE_MEMORYCARD; else if (!deviceName.compare(CSTR_TRANS(EXIDEV_MIC_STR))) tempType = EXIDEVICE_MIC; else if (!deviceName.compare(EXIDEV_BBA_STR)) @@ -1083,7 +1082,7 @@ void CConfigMain::ChooseEXIDevice(std::string deviceName, int deviceNum) tempType = EXIDEVICE_DUMMY; // Gray out the memcard path button if we're not on a memcard - if (tempType == EXIDEVICE_MEMORYCARD_A || tempType == EXIDEVICE_MEMORYCARD_B) + if (tempType == EXIDEVICE_MEMORYCARD) GCMemcardPath[deviceNum]->Enable(); else if (deviceNum == 0 || deviceNum == 1) GCMemcardPath[deviceNum]->Disable(); From 3556069f9f32d187d91a67c86daa6bbcaf16e972 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 9 Oct 2011 03:41:31 -0700 Subject: [PATCH 080/381] Also allow JitIL to update EXI exceptions much more frequently. At this point, the mic branch is ready for testing by windows people at least. cmake/scons may work already, not sure. --- Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp index adf215135d..da94c881e3 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp @@ -210,14 +210,11 @@ void JitILAsmRoutineManager::Generate() ABI_CallFunction(reinterpret_cast(&CoreTiming::Advance)); testExceptions = GetCodePtr(); - TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(0xFFFFFFFF)); - FixupBranch skipExceptions = J_CC(CC_Z); - 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)); - SetJumpTarget(skipExceptions); + 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, outerLoop, true); From a09e859b3a3cb2cf80bef1047cf10301ca42b590 Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 2 Oct 2011 14:26:48 +1100 Subject: [PATCH 081/381] Adjusted IPC HLE period to allow for four emulated wiimotes. --- 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 d7bbfc331b..b651c8ac84 100644 --- a/Source/Core/Core/Src/HW/SystemTimers.cpp +++ b/Source/Core/Core/Src/HW/SystemTimers.cpp @@ -246,7 +246,7 @@ void Init() // FIXME: does Wiimote Speaker support really require a different interval? (issue 4608) const int interval = SConfig::GetInstance().m_LocalCoreStartupParameter. - bDisableWiimoteSpeaker ? 1250 : 1500; + bDisableWiimoteSpeaker ? 1250 : 3000; const int fields = SConfig::GetInstance().m_LocalCoreStartupParameter. bVBeam ? 2 : 1; IPC_HLE_PERIOD = GetTicksPerSecond() / (interval * fields); From 58cbe9cbd939dcf52325683d013ab285e7dda2b1 Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 2 Oct 2011 16:34:23 +1100 Subject: [PATCH 082/381] Adjusted the System Timing of the IPC HLE period for Wiimotes when used with DSP HLE. --- 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 b651c8ac84..4ca6730816 100644 --- a/Source/Core/Core/Src/HW/SystemTimers.cpp +++ b/Source/Core/Core/Src/HW/SystemTimers.cpp @@ -246,7 +246,7 @@ void Init() // FIXME: does Wiimote Speaker support really require a different interval? (issue 4608) const int interval = SConfig::GetInstance().m_LocalCoreStartupParameter. - bDisableWiimoteSpeaker ? 1250 : 3000; + bDisableWiimoteSpeaker ? 12500 : 4000; const int fields = SConfig::GetInstance().m_LocalCoreStartupParameter. bVBeam ? 2 : 1; IPC_HLE_PERIOD = GetTicksPerSecond() / (interval * fields); From 0ceb3cba36a982ff967eb835f31d419d28ad002b Mon Sep 17 00:00:00 2001 From: skidau Date: Thu, 6 Oct 2011 19:55:30 +1100 Subject: [PATCH 083/381] Adjusted the system timing as DKCR was still getting disconnects with DSP HLE. --- 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 4ca6730816..bfc2b61af6 100644 --- a/Source/Core/Core/Src/HW/SystemTimers.cpp +++ b/Source/Core/Core/Src/HW/SystemTimers.cpp @@ -246,7 +246,7 @@ void Init() // FIXME: does Wiimote Speaker support really require a different interval? (issue 4608) const int interval = SConfig::GetInstance().m_LocalCoreStartupParameter. - bDisableWiimoteSpeaker ? 12500 : 4000; + bDisableWiimoteSpeaker ? 15000 : 4000; const int fields = SConfig::GetInstance().m_LocalCoreStartupParameter. bVBeam ? 2 : 1; IPC_HLE_PERIOD = GetTicksPerSecond() / (interval * fields); From da9bd95a683187966c5225cfcb9f6ea3e19b9b05 Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 9 Oct 2011 21:54:38 +1100 Subject: [PATCH 084/381] Renamed the "Disable Wiimote Speaker" option to "Alternate Wiimote Timing". --- Source/Core/DolphinWX/Src/ISOProperties.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index a6977727dc..4618e739ae 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -321,7 +321,7 @@ void CISOProperties::CreateGUIControls(bool IsWad) // 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, _("Disable Wiimote Speaker"), 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 From 544132bc3eaba753efc0d89ff748dc7ef2391fa5 Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Wed, 12 Oct 2011 19:04:23 +0300 Subject: [PATCH 085/381] Gameini database updates/additions. Affects SONIC GEMS COLLECTION, Star Wars Bounty Hunter, Bomberman Jetters, Shamu's Deep Sea Adventures, Cabela's Outdoor Adventures, Tony Hawk's Pro Skater 3, Viewtiful Joe Red Hot Rumble, Spider-Man SD etc. Also fixes issue 4888. --- Data/User/GameConfig/G2ME01.ini | 17 +++- Data/User/GameConfig/G2MP01.ini | 144 ++++++++++++++++++++++++++++++-- Data/User/GameConfig/G2XE8P.ini | 8 +- Data/User/GameConfig/G2XP8P.ini | 8 +- Data/User/GameConfig/GAVP78.ini | 19 +++++ Data/User/GameConfig/GAVY78.ini | 19 +++++ Data/User/GameConfig/GBWD64.ini | 19 +++++ Data/User/GameConfig/GBWE64.ini | 13 ++- Data/User/GameConfig/GBWF64.ini | 19 +++++ Data/User/GameConfig/GBWP64.ini | 19 +++++ Data/User/GameConfig/GEAE8P.ini | 3 +- Data/User/GameConfig/GEAP8P.ini | 3 +- Data/User/GameConfig/GG5E52.ini | 13 ++- Data/User/GameConfig/GJBE5G.ini | 17 +++- Data/User/GameConfig/GJZE52.ini | 16 ++++ Data/User/GameConfig/GOAE52.ini | 16 ++++ Data/User/GameConfig/GOSE41.ini | 16 ++++ Data/User/GameConfig/GOSP41.ini | 16 ++++ Data/User/GameConfig/GOSX41.ini | 16 ++++ Data/User/GameConfig/GT3D52.ini | 18 ++++ Data/User/GameConfig/GT3E52.ini | 18 ++++ Data/User/GameConfig/GT3F52.ini | 18 ++++ Data/User/GameConfig/GT3P52.ini | 18 ++++ Data/User/GameConfig/GVCE08.ini | 18 ++++ Data/User/GameConfig/GVCP08.ini | 13 ++- Data/User/GameConfig/GVJE08.ini | 5 +- Data/User/GameConfig/GVJJ08.ini | 4 +- Data/User/GameConfig/GVJP08.ini | 4 +- Data/User/GameConfig/SPDE52.ini | 20 +++++ Data/User/GameConfig/SPDP52.ini | 20 +++++ 30 files changed, 528 insertions(+), 29 deletions(-) create mode 100644 Data/User/GameConfig/GAVP78.ini create mode 100644 Data/User/GameConfig/GAVY78.ini create mode 100644 Data/User/GameConfig/GBWD64.ini create mode 100644 Data/User/GameConfig/GBWF64.ini create mode 100644 Data/User/GameConfig/GBWP64.ini create mode 100644 Data/User/GameConfig/GJZE52.ini create mode 100644 Data/User/GameConfig/GOAE52.ini create mode 100644 Data/User/GameConfig/GOSE41.ini create mode 100644 Data/User/GameConfig/GOSP41.ini create mode 100644 Data/User/GameConfig/GOSX41.ini create mode 100644 Data/User/GameConfig/GT3D52.ini create mode 100644 Data/User/GameConfig/GT3E52.ini create mode 100644 Data/User/GameConfig/GT3F52.ini create mode 100644 Data/User/GameConfig/GT3P52.ini create mode 100644 Data/User/GameConfig/GVCE08.ini create mode 100644 Data/User/GameConfig/SPDE52.ini create mode 100644 Data/User/GameConfig/SPDP52.ini diff --git a/Data/User/GameConfig/G2ME01.ini b/Data/User/GameConfig/G2ME01.ini index d8807fcf07..0ecd587a67 100644 --- a/Data/User/GameConfig/G2ME01.ini +++ b/Data/User/GameConfig/G2ME01.ini @@ -2,8 +2,7 @@ [EmuState] #The Emulation State. EmulationStateId = 4 -Issues="Scanner does not work, music is buggy, scanner mode is buggy" -EmulationIssues = +EmulationIssues = EFB to RAM is needed for the scanner/visors to work properly. [Speedhacks] 0x803758bc=400 [OnFrame] @@ -131,6 +130,20 @@ $Have Ing Hive Temple Key 2 4241FD80 011B0001 $Have Ing Hive Temple Key 3 4241FD80 011F0001 +$One Hit Kill +0403DB68 4BFC539C +04002F04 FFC00090 +04002F08 7C1BE050 +04002F0C 2C000010 +04002F10 41820008 +04002F14 EFDEF028 +04002F18 4803AC54 +$Full Logbook +0421166C 4BDF18CC +04002F38 3BE000FF +04002F3C 9BE50004 +04002F40 88050004 +04002F44 4820E72C [Video] ProjectionHack = 0 PH_SZNear = 0 diff --git a/Data/User/GameConfig/G2MP01.ini b/Data/User/GameConfig/G2MP01.ini index ca94aac829..c3fb1fdac5 100644 --- a/Data/User/GameConfig/G2MP01.ini +++ b/Data/User/GameConfig/G2MP01.ini @@ -1,15 +1,147 @@ -# G2MP01 - Metroid Prime 2 Echoes[EmuState] +# G2MP01 - Metroid Prime 2 Echoes +[EmuState] #The Emulation State. -EmulationStateId = 2 -Issues="Scanner does not work, music is buggy, scanner mode is buggy" +EmulationStateId = 4 +EmulationIssues = EFB to RAM is needed for the scanner/visors to work properly. [Speedhacks] #Patch OSYieldThread to take more time - MP2's idle loop is really stupid. 0x80375c68=400 [OnFrame] [ActionReplay] -[EmuState] -EmulationStateId = 4 -EmulationIssues = needs safe texture cache and EFB to Ram +$(M) +C43552C8 0000FF01 +C436F41C 0000FF02 +0D30294C 4E800020 +C530294C 0000FF03 +$Infinite Health +423DDE0C 000A44BB +423DDE0C 000B6000 +$Max Energy Tanks +423DDE0C 012B000E +423DDE0C 012D000E +$Maximum Missiles +423DDE0C 013900FA +$Infinite Missiles +423DDE0C 013700FA +$Moon Jump (Hold B) +3A705F24 00000200 +423DDDFC 00D84101 +$Have Charge Beam +423DDE0C 00310001 +423DDE0C 00330001 +$Have Dark Beam +423DDE0C 00370001 +423DDE0C 00390001 +$Have Light Beam +423DDE0C 003D0001 +423DDE0C 003F0001 +$Have Annihilator +423DDE0C 00430001 +423DDE0C 00450001 +$Have Super Missile +423DDE0C 00470001 +423DDE0C 00490001 +$Have Darkburst +423DDE0C 004D0001 +423DDE0C 004F0001 +$Have Sunburst +423DDE0C 00530001 +423DDE0C 00550001 +$Have Sonic Boom +423DDE0C 00590001 +423DDE0C 005B0001 +$Have Combat Visor +423DDE0C 005F0001 +423DDE0C 00610001 +$Have Scan Visor +423DDE0C 00650001 +423DDE0C 00670001 +$Have Dark Visor +423DDE0C 006B0001 +423DDE0C 006D0001 +$Have Echo Visor +423DDE0C 00710001 +423DDE0C 00730001 +$Have Varia Suit +423DDE0C 00770001 +423DDE0C 00790001 +$Have Dark Suit +423DDE0C 007D0001 +423DDE0C 007F0001 +$Have Light Suit +423DDE0C 00830001 +423DDE0C 00850001 +$Have Space Jump Boots +423DDE0C 00BF0001 +423DDE0C 00C10001 +$Have Grapple Beam +423DDE0C 00B90001 +423DDE0C 00BB0001 +$Have Gravity Boost +423DDE0C 00C50001 +423DDE0C 00C70001 +$Have Screw Attack +423DDE0C 00D10001 +423DDE0C 00D30001 +$Have Seeker Missile +423DDE0C 00CB0001 +423DDE0C 00CD0001 +$Have Morph Ball Power Bomb +423DDE0C 01310001 +423DDE0C 01330001 +$Have Beam Ammo Expansion +423DDE0C 013D000F +423DDE0C 013F000F +$Have Sky Temple Key 1 +423DDE0C 00DD0001 +423DDE0C 00DF0001 +$Have Sky Temple Key 2 +423DDE0C 00E30001 +423DDE0C 00E50001 +$Have Sky Temple Key 3 +423DDE0C 00E90001 +423DDE0C 00EB0001 +$Have Agon Temple Key 1 +423DDE0C 00EF0001 +423DDE0C 00F10001 +$Have Agon Temple Key 2 +423DDE0C 00F50001 +423DDE0C 00F70001 +$Have Agon Temple Key 3 +423DDE0C 00FB0001 +423DDE0C 00FD0001 +$Have Torvus Temple Key 1 +423DDE0C 01010001 +423DDE0C 01030001 +$Have Torvus Temple Key 2 +423DDE0C 01070001 +423DDE0C 01090001 +$Have Torvus Temple Key 3 +423DDE0C 010D0001 +423DDE0C 010F0001 +$Have Ing Hive Temple Key 1 +423DDE0C 01130001 +423DDE0C 01150001 +$Have Ing Hive Temple Key 2 +423DDE0C 01190001 +423DDE0C 011B0001 +$Have Ing Hive Temple Key 3 +423DDE0C 011F0001 +423DDE0C 01210001 +$One Hit Kill +0403DCB8 4BFC524C +04002F04 FFC00090 +04002F08 7C1BE050 +04002F0C 2C000010 +04002F10 41820008 +04002F14 EFDEF028 +04002F18 4803ADA4 +$Full Logbook +04211974 4BDF15C4 +04002F38 3BE000FF +04002F3C 9BE50004 +04002F40 88050004 +04002F44 4820EA34 [Video] ProjectionHack = 0 PH_SZNear = 0 diff --git a/Data/User/GameConfig/G2XE8P.ini b/Data/User/GameConfig/G2XE8P.ini index 9f5533b5f2..be2e404a17 100644 --- a/Data/User/GameConfig/G2XE8P.ini +++ b/Data/User/GameConfig/G2XE8P.ini @@ -1,8 +1,9 @@ # G2XE8P - SONIC GEMS COLLECTION [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 = Everything playable with minor glitches, except Sonic the Fighters. +EmulationIssues = Everything playable with minor glitches. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -13,3 +14,8 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Gecko] +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 +[Video_Hacks] +DlistCachingEnable = False diff --git a/Data/User/GameConfig/G2XP8P.ini b/Data/User/GameConfig/G2XP8P.ini index 820688756d..091b1b318a 100644 --- a/Data/User/GameConfig/G2XP8P.ini +++ b/Data/User/GameConfig/G2XP8P.ini @@ -1,8 +1,9 @@ # G2XP8P - SONIC GEMS COLLECTION [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 = Everything playable with minor glitches, except Sonic the Fighters. +EmulationIssues = Everything playable with minor glitches. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -13,3 +14,8 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Gecko] +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 +[Video_Hacks] +DlistCachingEnable = False diff --git a/Data/User/GameConfig/GAVP78.ini b/Data/User/GameConfig/GAVP78.ini new file mode 100644 index 0000000000..97b105e31f --- /dev/null +++ b/Data/User/GameConfig/GAVP78.ini @@ -0,0 +1,19 @@ +# GAVP78 - Avatar: The Legend of Aang +[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 = 3 +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] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/GAVY78.ini b/Data/User/GameConfig/GAVY78.ini new file mode 100644 index 0000000000..fe7c2c8ce7 --- /dev/null +++ b/Data/User/GameConfig/GAVY78.ini @@ -0,0 +1,19 @@ +# GAVE78 - Avatar: The Legend of Aang +[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 = 3 +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] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/GBWD64.ini b/Data/User/GameConfig/GBWD64.ini new file mode 100644 index 0000000000..993175d5c9 --- /dev/null +++ b/Data/User/GameConfig/GBWD64.ini @@ -0,0 +1,19 @@ +# GBWD64 - Star Wars Bounty Hunter +[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 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/GBWE64.ini b/Data/User/GameConfig/GBWE64.ini index 4ee318e208..914770f161 100644 --- a/Data/User/GameConfig/GBWE64.ini +++ b/Data/User/GameConfig/GBWE64.ini @@ -2,11 +2,18 @@ [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 = 0 -EmulationIssues = +EmulationStateId = 4 +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. [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/GBWF64.ini b/Data/User/GameConfig/GBWF64.ini new file mode 100644 index 0000000000..40e3ed43af --- /dev/null +++ b/Data/User/GameConfig/GBWF64.ini @@ -0,0 +1,19 @@ +# GBWF64 - Star Wars Bounty Hunter +[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 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/GBWP64.ini b/Data/User/GameConfig/GBWP64.ini new file mode 100644 index 0000000000..671a618a66 --- /dev/null +++ b/Data/User/GameConfig/GBWP64.ini @@ -0,0 +1,19 @@ +# GBWP64 - Star Wars Bounty Hunter +[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 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/GEAE8P.ini b/Data/User/GameConfig/GEAE8P.ini index c032bc3e73..9b6bdd2f3a 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 = +EmulationIssues = LLE audio is needed to fix sound issues. Gfx glitches. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -16,4 +16,3 @@ PH_ZFar = 1.99998 [Video_Settings] SafeTextureCache = True SafeTextureCacheColorSamples = 512 - diff --git a/Data/User/GameConfig/GEAP8P.ini b/Data/User/GameConfig/GEAP8P.ini index ff88026d45..2d7aef6141 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 = +EmulationIssues = LLE audio is needed to fix sound issues. Gfx glitches. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -15,3 +15,4 @@ PH_ZFar = 1.99998 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/GG5E52.ini b/Data/User/GameConfig/GG5E52.ini index b6807f49e9..32174bc73d 100644 --- a/Data/User/GameConfig/GG5E52.ini +++ b/Data/User/GameConfig/GG5E52.ini @@ -1,7 +1,16 @@ # GG5E52 - Cabela's(R) BGH 2005 Adv. [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 = Needs Jitil to run. LLE audio fixes sound issues. +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/GJBE5G.ini b/Data/User/GameConfig/GJBE5G.ini index 680342055a..25b06784f0 100644 --- a/Data/User/GameConfig/GJBE5G.ini +++ b/Data/User/GameConfig/GJBE5G.ini @@ -1,7 +1,20 @@ # GJBE5G - Bomberman Jetters [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 = 3 +EmulationIssues = Use D3D9 for less problems. Videos need Real XFB to show up. Graphic glitches / unstable during videos. [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 = 0.1 +[Gecko] +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GJZE52.ini b/Data/User/GameConfig/GJZE52.ini new file mode 100644 index 0000000000..b37df81b13 --- /dev/null +++ b/Data/User/GameConfig/GJZE52.ini @@ -0,0 +1,16 @@ +# GJZE52 - Shamu's Deep Sea Adventures +[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 Jitil to run. LLE audio fixes some 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/GOAE52.ini b/Data/User/GameConfig/GOAE52.ini new file mode 100644 index 0000000000..8a3da2eb71 --- /dev/null +++ b/Data/User/GameConfig/GOAE52.ini @@ -0,0 +1,16 @@ +# GOAE52 - Cabela's Outdoor Adventures +[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 Jitil to run. LLE audio fixes 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/GOSE41.ini b/Data/User/GameConfig/GOSE41.ini new file mode 100644 index 0000000000..4682f2275c --- /dev/null +++ b/Data/User/GameConfig/GOSE41.ini @@ -0,0 +1,16 @@ +# GOSE41 - Open Season +[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 = 2 +EmulationIssues = Severe graphic 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/GOSP41.ini b/Data/User/GameConfig/GOSP41.ini new file mode 100644 index 0000000000..40fc6ad1f1 --- /dev/null +++ b/Data/User/GameConfig/GOSP41.ini @@ -0,0 +1,16 @@ +# GOSP41 - Open Season +[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 = 2 +EmulationIssues = Severe graphic 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/GOSX41.ini b/Data/User/GameConfig/GOSX41.ini new file mode 100644 index 0000000000..92662f0a4c --- /dev/null +++ b/Data/User/GameConfig/GOSX41.ini @@ -0,0 +1,16 @@ +# GOSX41 - Open Season +[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 = 2 +EmulationIssues = Severe graphic 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/GT3D52.ini b/Data/User/GameConfig/GT3D52.ini new file mode 100644 index 0000000000..f50771d9b3 --- /dev/null +++ b/Data/User/GameConfig/GT3D52.ini @@ -0,0 +1,18 @@ +# GT3D52 - Tony Hawk's Pro Skater 3 +[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 = Neads 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/GT3E52.ini b/Data/User/GameConfig/GT3E52.ini new file mode 100644 index 0000000000..dbfe35663e --- /dev/null +++ b/Data/User/GameConfig/GT3E52.ini @@ -0,0 +1,18 @@ +# GT3E52 - Tony Hawk's Pro Skater 3 +[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 = Neads 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/GT3F52.ini b/Data/User/GameConfig/GT3F52.ini new file mode 100644 index 0000000000..24d932371a --- /dev/null +++ b/Data/User/GameConfig/GT3F52.ini @@ -0,0 +1,18 @@ +# GT3F52 - Tony Hawk's Pro Skater 3 +[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 = Neads 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/GT3P52.ini b/Data/User/GameConfig/GT3P52.ini new file mode 100644 index 0000000000..aa644f6659 --- /dev/null +++ b/Data/User/GameConfig/GT3P52.ini @@ -0,0 +1,18 @@ +# GT3P52 - Tony Hawk's Pro Skater 3 +[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 = Neads 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/GVCE08.ini b/Data/User/GameConfig/GVCE08.ini new file mode 100644 index 0000000000..4f7ece130f --- /dev/null +++ b/Data/User/GameConfig/GVCE08.ini @@ -0,0 +1,18 @@ +# GVCE08 - Viewtiful Joe Red Hot Rumble +[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 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/GVCP08.ini b/Data/User/GameConfig/GVCP08.ini index fb766c6e32..3b98757de5 100644 --- a/Data/User/GameConfig/GVCP08.ini +++ b/Data/User/GameConfig/GVCP08.ini @@ -2,8 +2,17 @@ [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 = Intro (and likely other) video blacked out. +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. [Video] -ProjectionHack = 0 \ No newline at end of file +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/GVJE08.ini b/Data/User/GameConfig/GVJE08.ini index eca3a4cf5a..58c49806bc 100644 --- a/Data/User/GameConfig/GVJE08.ini +++ b/Data/User/GameConfig/GVJE08.ini @@ -1,7 +1,7 @@ # GVJE08 - VIEWTIFUL JOE [EmuState] -EmulationStateId = 0 -EmulationIssues = +EmulationStateId = 4 +EmulationIssues = Needs real xfb for videos to show up. [OnFrame] [ActionReplay] [Gecko] @@ -15,4 +15,3 @@ PH_ZFar = [Video_Settings] UseXFB = True UseRealXFB = True - diff --git a/Data/User/GameConfig/GVJJ08.ini b/Data/User/GameConfig/GVJJ08.ini index bacabfab6d..da0a34a4bd 100644 --- a/Data/User/GameConfig/GVJJ08.ini +++ b/Data/User/GameConfig/GVJJ08.ini @@ -1,7 +1,7 @@ # GVJJ08 - VIEWTIFUL JOE [EmuState] -EmulationStateId = 0 -EmulationIssues = +EmulationStateId = 4 +EmulationIssues = Needs real xfb for videos to show up. [OnFrame] [ActionReplay] [Gecko] diff --git a/Data/User/GameConfig/GVJP08.ini b/Data/User/GameConfig/GVJP08.ini index 6f749f2947..c159fac154 100644 --- a/Data/User/GameConfig/GVJP08.ini +++ b/Data/User/GameConfig/GVJP08.ini @@ -1,7 +1,7 @@ # GVJP08 - VIEWTIFUL JOE [EmuState] -EmulationStateId = 0 -EmulationIssues = +EmulationStateId = 4 +EmulationIssues = Needs real xfb for videos to show up. [OnFrame] [ActionReplay] [Gecko] diff --git a/Data/User/GameConfig/SPDE52.ini b/Data/User/GameConfig/SPDE52.ini new file mode 100644 index 0000000000..e9698d8952 --- /dev/null +++ b/Data/User/GameConfig/SPDE52.ini @@ -0,0 +1,20 @@ +# SPDE52 - Spider-Man™: SD +[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 = Needs LLE audio for sound ingame. Graphic glitches. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 1 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = 0.7 +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True +[Video_Enhancements] +MaxAnisotropy = 0 diff --git a/Data/User/GameConfig/SPDP52.ini b/Data/User/GameConfig/SPDP52.ini new file mode 100644 index 0000000000..0a19aeb06b --- /dev/null +++ b/Data/User/GameConfig/SPDP52.ini @@ -0,0 +1,20 @@ +# SPDP52 - Spider-Man™: SD +[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 = Needs LLE audio for sound ingame. Graphic glitches. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 1 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = 0.7 +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True +[Video_Enhancements] +MaxAnisotropy = 0 From 5d14bb5e70dd1122c36e68ee529fcda8db67243e Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 15 Oct 2011 22:19:42 +1100 Subject: [PATCH 086/381] Changed the save state system to load/save only after the screen has been drawn. This should help stabilise the save states. --- Source/Core/Core/Src/HW/VideoInterface.cpp | 4 + Source/Core/Core/Src/PowerPC/PowerPC.cpp | 3 + Source/Core/Core/Src/State.cpp | 113 +++++++++++++++++--- Source/Core/Core/Src/State.h | 3 + Source/Core/VideoCommon/Src/PixelEngine.cpp | 3 + 5 files changed, 110 insertions(+), 16 deletions(-) diff --git a/Source/Core/Core/Src/HW/VideoInterface.cpp b/Source/Core/Core/Src/HW/VideoInterface.cpp index d8d6d98570..93c48d92f9 100644 --- a/Source/Core/Core/Src/HW/VideoInterface.cpp +++ b/Source/Core/Core/Src/HW/VideoInterface.cpp @@ -28,6 +28,7 @@ #include "StringUtil.h" #include "VideoBackendBase.h" +#include "State.h" namespace VideoInterface { @@ -698,6 +699,9 @@ void UpdateInterrupts() { ProcessorInterface::SetInterrupt(ProcessorInterface::INT_CAUSE_VI, false); } + + if (m_InterruptRegister[1].IR_INT && m_InterruptRegister[1].IR_MASK) + State::ProcessRequestedStates(1); } u32 GetXFBAddressTop() diff --git a/Source/Core/Core/Src/PowerPC/PowerPC.cpp b/Source/Core/Core/Src/PowerPC/PowerPC.cpp index 567f3ff98e..d4ec476280 100644 --- a/Source/Core/Core/Src/PowerPC/PowerPC.cpp +++ b/Source/Core/Core/Src/PowerPC/PowerPC.cpp @@ -81,6 +81,9 @@ void DoState(PointerWrap &p) SystemTimers::DecrementerSet(); SystemTimers::TimeBaseSet(); + + if (jit && p.GetMode() == PointerWrap::MODE_READ) + jit->GetBlockCache()->ClearSafe(); } void ResetRegisters() diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp index d942255d2a..650f5a788f 100644 --- a/Source/Core/Core/Src/State.cpp +++ b/Source/Core/Core/Src/State.cpp @@ -31,6 +31,9 @@ #include "VideoBackendBase.h" #include +#include "HW/Memmap.h" +#include "HW/VideoInterface.h" +#include "HW/SystemTimers.h" namespace State { @@ -64,6 +67,12 @@ static std::vector g_current_buffer; static std::thread g_save_thread; +static const u8 NUM_HOOKS = 2; +static u8 waiting; +static u8 waitingslot; +static u64 lastCheckedStates[NUM_HOOKS]; +static u8 hook; + // Don't forget to increase this after doing changes on the savestate system static const int STATE_VERSION = 5; @@ -73,6 +82,13 @@ struct StateHeader size_t size; }; +enum +{ + STATE_NONE = 0, + STATE_SAVE = 1, + STATE_LOAD = 2, +}; + static bool g_use_compression = true; void EnableCompression(bool compression) @@ -105,6 +121,12 @@ void DoState(PointerWrap &p) g_video_backend->RunLoop(true); } +void ResetCounters() +{ + for (int i = 0; i < NUM_HOOKS; ++i) + lastCheckedStates[i] = CoreTiming::GetTicks(); +} + void LoadBufferStateCallback(u64 userdata, int cyclesLate) { u8* ptr = &g_current_buffer[0]; @@ -217,10 +239,6 @@ void SaveFileStateCallback(u64 userdata, int cyclesLate) // Pause the core while we save the state CCPU::EnableStepping(true); - // Wait for the other threaded sub-systems to stop too - // TODO: this is ugly - SLEEP(100); - Flush(); // Measure the size of the buffer. @@ -318,10 +336,6 @@ void LoadFileStateCallback(u64 userdata, int cyclesLate) // Stop the core while we load the state CCPU::EnableStepping(true); - // Wait for the other threaded sub-systems to stop too - // TODO: uglyyy - SLEEP(100); - Flush(); // Save temp buffer for undo load state @@ -350,6 +364,8 @@ void LoadFileStateCallback(u64 userdata, int cyclesLate) Movie::EndPlayInput(false); } + ResetCounters(); + g_op_in_progress = false; // resume dat core @@ -386,6 +402,11 @@ void Init() ev_BufferSave = CoreTiming::RegisterEvent("SaveBufferState", &SaveBufferStateCallback); ev_BufferVerify = CoreTiming::RegisterEvent("VerifyBufferState", &VerifyBufferStateCallback); + waiting = STATE_NONE; + waitingslot = 0; + hook = 0; + ResetCounters(); + if (lzo_init() != LZO_E_OK) PanicAlertT("Internal LZO Error - lzo_init() failed"); } @@ -413,40 +434,100 @@ static std::string MakeStateFilename(int number) SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID().c_str(), number); } -void ScheduleFileEvent(const std::string &filename, int ev) +void ScheduleFileEvent(const std::string &filename, int ev, bool immediate) { if (g_op_in_progress) return; g_op_in_progress = true; g_current_filename = filename; - CoreTiming::ScheduleEvent_Threadsafe_Immediate(ev); + + if (immediate) + CoreTiming::ScheduleEvent_Threadsafe_Immediate(ev); + else + CoreTiming::ScheduleEvent_Threadsafe(0, ev); +} + +void SaveAs(const std::string &filename, bool immediate) +{ + g_last_filename = filename; + ScheduleFileEvent(filename, ev_FileSave, immediate); } void SaveAs(const std::string &filename) { - g_last_filename = filename; - ScheduleFileEvent(filename, ev_FileSave); + SaveAs(filename, true); +} + +void LoadAs(const std::string &filename, bool immediate) +{ + ScheduleFileEvent(filename, ev_FileLoad, immediate); } void LoadAs(const std::string &filename) { - ScheduleFileEvent(filename, ev_FileLoad); + LoadAs(filename, true); } void VerifyAt(const std::string &filename) { - ScheduleFileEvent(filename, ev_FileVerify); + ScheduleFileEvent(filename, ev_FileVerify, true); +} + +bool ProcessRequestedStates(int priority) +{ + bool save = true; + + if (hook == priority) + { + if (waiting == STATE_SAVE) + { + SaveAs(MakeStateFilename(waitingslot), false); + waitingslot = 0; + waiting = STATE_NONE; + } + else if (waiting == STATE_LOAD) + { + LoadAs(MakeStateFilename(waitingslot), false); + waitingslot = 0; + waiting = STATE_NONE; + save = false; + } + } + + // Change hooks if the new hook gets called frequently (at least once a frame) and if the old + // hook has not been called for the last 5 seconds + if ((CoreTiming::GetTicks() - lastCheckedStates[priority]) < (VideoInterface::GetTicksPerFrame())) + { + lastCheckedStates[priority] = CoreTiming::GetTicks(); + if (hook < NUM_HOOKS && priority >= (hook + 1) && + (lastCheckedStates[priority] - lastCheckedStates[hook]) > (SystemTimers::GetTicksPerSecond() * 5)) + { + hook++; + } + } + else + lastCheckedStates[priority] = CoreTiming::GetTicks(); + + return save; } void Save(int slot) { - SaveAs(MakeStateFilename(slot)); + if (waiting == STATE_NONE) + { + waiting = STATE_SAVE; + waitingslot = slot; + } } void Load(int slot) { - LoadAs(MakeStateFilename(slot)); + if (waiting == STATE_NONE) + { + waiting = STATE_LOAD; + waitingslot = slot; + } } void Verify(int slot) diff --git a/Source/Core/Core/Src/State.h b/Source/Core/Core/Src/State.h index 791468f154..111c4e24f0 100644 --- a/Source/Core/Core/Src/State.h +++ b/Source/Core/Core/Src/State.h @@ -26,6 +26,7 @@ namespace State { void Init(); + void Shutdown(); void EnableCompression(bool compression); @@ -39,6 +40,8 @@ void Save(int slot); void Load(int slot); void Verify(int slot); +bool ProcessRequestedStates(int priority); + void SaveAs(const std::string &filename); void LoadAs(const std::string &filename); void VerifyAt(const std::string &filename); diff --git a/Source/Core/VideoCommon/Src/PixelEngine.cpp b/Source/Core/VideoCommon/Src/PixelEngine.cpp index 2a328de95d..3b6d1b7487 100644 --- a/Source/Core/VideoCommon/Src/PixelEngine.cpp +++ b/Source/Core/VideoCommon/Src/PixelEngine.cpp @@ -31,6 +31,7 @@ #include "CommandProcessor.h" #include "HW/ProcessorInterface.h" #include "DLCache.h" +#include "State.h" namespace PixelEngine { @@ -329,6 +330,8 @@ void UpdateFinishInterrupt(bool active) { ProcessorInterface::SetInterrupt(INT_CAUSE_PE_FINISH, active); interruptSetFinish = active; + if (active) + State::ProcessRequestedStates(0); } } From c0498ca8314e9c7cce319eae4c006a7f459e3851 Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 16 Oct 2011 16:26:43 +1100 Subject: [PATCH 087/381] Synchronised the JIT cache with the ICache by invalidating the JIT block when the ICache is updated. This fixes Mario & Sonic at the Olympic Winter Games. Thanks to DimitriPilot3 for the tip. Fixes issue 1610. --- Source/Core/Core/Src/PowerPC/PPCCache.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Core/Core/Src/PowerPC/PPCCache.cpp b/Source/Core/Core/Src/PowerPC/PPCCache.cpp index 33ecc0ee88..540d4940f7 100644 --- a/Source/Core/Core/Src/PowerPC/PPCCache.cpp +++ b/Source/Core/Core/Src/PowerPC/PPCCache.cpp @@ -134,6 +134,8 @@ namespace PowerPC #endif if (t == 0xff) // load to the cache { + if (jit) + jit->GetBlockCache()->InvalidateICache(addr); if (HID0.ILOCK) // instruction cache is locked return Memory::ReadUnchecked_U32(addr); // select a way From 676822891d4b6c31fd335a667b73eff7bce6e748 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 16 Oct 2011 02:08:51 -0700 Subject: [PATCH 088/381] ups, exi slots are on whole different channels... --- Source/Core/Core/Src/HW/EXI_Channel.cpp | 4 ++-- Source/Core/Core/Src/HW/EXI_Device.cpp | 6 +++--- Source/Core/Core/Src/HW/EXI_Device.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/HW/EXI_Channel.cpp b/Source/Core/Core/Src/HW/EXI_Channel.cpp index c7f45bd667..cb729d21ff 100644 --- a/Source/Core/Core/Src/HW/EXI_Channel.cpp +++ b/Source/Core/Core/Src/HW/EXI_Channel.cpp @@ -42,7 +42,7 @@ CEXIChannel::CEXIChannel(u32 ChannelId) : m_Status.CHIP_SELECT = 1; for (int i = 0; i < NUM_DEVICES; i++) - m_pDevices[i] = EXIDevice_Create(EXIDEVICE_NONE, i); + m_pDevices[i] = EXIDevice_Create(EXIDEVICE_NONE, m_ChannelId); } CEXIChannel::~CEXIChannel() @@ -71,7 +71,7 @@ void CEXIChannel::AddDevice(const TEXIDevices device_type, const int device_num) } // create the new one - m_pDevices[device_num] = EXIDevice_Create(device_type, device_num); + m_pDevices[device_num] = EXIDevice_Create(device_type, m_ChannelId); // This means "device presence changed", software has to check // m_Status.EXT to see if it is now present or not diff --git a/Source/Core/Core/Src/HW/EXI_Device.cpp b/Source/Core/Core/Src/HW/EXI_Device.cpp index 5eb3aa1631..aa24148f59 100644 --- a/Source/Core/Core/Src/HW/EXI_Device.cpp +++ b/Source/Core/Core/Src/HW/EXI_Device.cpp @@ -102,7 +102,7 @@ public: // F A C T O R Y -IEXIDevice* EXIDevice_Create(TEXIDevices device_type, const int device_num) +IEXIDevice* EXIDevice_Create(TEXIDevices device_type, const int channel_num) { switch (device_type) { @@ -111,7 +111,7 @@ IEXIDevice* EXIDevice_Create(TEXIDevices device_type, const int device_num) break; case EXIDEVICE_MEMORYCARD: - return new CEXIMemoryCard(device_num); + return new CEXIMemoryCard(channel_num); break; case EXIDEVICE_MASKROM: @@ -123,7 +123,7 @@ IEXIDevice* EXIDevice_Create(TEXIDevices device_type, const int device_num) break; case EXIDEVICE_MIC: - return new CEXIMic(device_num); + return new CEXIMic(channel_num); break; case EXIDEVICE_ETH: diff --git a/Source/Core/Core/Src/HW/EXI_Device.h b/Source/Core/Core/Src/HW/EXI_Device.h index d8f3706885..15cd79d77c 100644 --- a/Source/Core/Core/Src/HW/EXI_Device.h +++ b/Source/Core/Core/Src/HW/EXI_Device.h @@ -63,6 +63,6 @@ enum TEXIDevices EXIDEVICE_NONE = (u8)-1 }; -extern IEXIDevice* EXIDevice_Create(const TEXIDevices device_type, const int device_num); +extern IEXIDevice* EXIDevice_Create(const TEXIDevices device_type, const int channel_num); #endif From 18d9a275e70c626c687b5360640205334d3d53eb Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 16 Oct 2011 23:23:17 +1100 Subject: [PATCH 089/381] Invalidated a wider range in the JIT cache to force recompile updated code in the ICache. This fixes the crashes in Mario Power Tennis and the remaining games in Mario & Sonic at the Olympic Winter Games. Fixes issue 2102. Fixes issue 2751. --- Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp index 1ed997ce4c..eba23ca1d0 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp @@ -418,17 +418,17 @@ bool JitBlock::ContainsAddress(u32 em_address) if (address & JIT_ICACHE_VMEM_BIT) { u32 cacheaddr = address & JIT_ICACHE_MASK; - memset(iCacheVMEM + cacheaddr, JIT_ICACHE_INVALID_BYTE, 32); + memset(iCacheVMEM + cacheaddr, JIT_ICACHE_INVALID_BYTE, 96); } else if (address & JIT_ICACHE_EXRAM_BIT) { u32 cacheaddr = address & JIT_ICACHEEX_MASK; - memset(iCacheEx + cacheaddr, JIT_ICACHE_INVALID_BYTE, 32); + memset(iCacheEx + cacheaddr, JIT_ICACHE_INVALID_BYTE, 96); } else { u32 cacheaddr = address & JIT_ICACHE_MASK; - memset(iCache + cacheaddr, JIT_ICACHE_INVALID_BYTE, 32); + memset(iCache + cacheaddr, JIT_ICACHE_INVALID_BYTE, 96); } #endif } From 1d6bd3248c951ee4eb2d0069f307ed973085bdc1 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 16 Oct 2011 13:29:10 -0700 Subject: [PATCH 090/381] It is safe to call Pa_Initialize and Pa_Terminate more than once. --- Source/Core/Core/Src/HW/EXI_DeviceMic.cpp | 41 +++++------------------ Source/Core/Core/Src/HW/EXI_DeviceMic.h | 1 - 2 files changed, 8 insertions(+), 34 deletions(-) diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp index 9faff0e7b6..264d6a0539 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp @@ -29,8 +29,6 @@ #include "GCPad.h" -static bool pa_init = false; - void CEXIMic::StreamLog(const char *msg) { DEBUG_LOG(EXPANSIONINTERFACE, "%s: %s", @@ -40,46 +38,24 @@ void CEXIMic::StreamLog(const char *msg) void CEXIMic::StreamInit() { // Setup the wonderful c-interfaced lib... - pa_error = paNoError; - if (!pa_init) - { - pa_error = Pa_Initialize(); - - if (pa_error != paNoError) - { - StreamLog("Pa_Initialize"); - } - else - pa_init = true; - } - - mic_count++; + if ((pa_error = Pa_Initialize()) != paNoError) + StreamLog("Pa_Initialize"); } void CEXIMic::StreamTerminate() { - if (--mic_count <= 0 && pa_init) - pa_error = Pa_Terminate(); - - if (pa_error != paNoError) - { + if ((pa_error = Pa_Terminate()) != paNoError) StreamLog("Pa_Terminate"); - } - else - pa_init = false; } void CEXIMic::StreamStart() { // Open stream with current parameters - if (pa_init) - { - pa_error = Pa_OpenDefaultStream(&pa_stream, 1, 0, paInt16, - sample_rate, buff_size_samples, NULL, NULL); - StreamLog("Pa_OpenDefaultStream"); - pa_error = Pa_StartStream(pa_stream); - StreamLog("Pa_StartStream"); - } + pa_error = Pa_OpenDefaultStream(&pa_stream, 1, 0, paInt16, + sample_rate, buff_size_samples, NULL, NULL); + StreamLog("Pa_OpenDefaultStream"); + pa_error = Pa_StartStream(pa_stream); + StreamLog("Pa_StartStream"); } void CEXIMic::StreamStop() @@ -122,7 +98,6 @@ void CEXIMic::StreamReadOne() // us a way to detect if buff_ovrflw should be set. u8 const CEXIMic::exi_id[] = { 0, 0x0a, 0, 0, 0 }; -int CEXIMic::mic_count = 0; CEXIMic::CEXIMic(int index) : slot(index) diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMic.h b/Source/Core/Core/Src/HW/EXI_DeviceMic.h index 491a112375..bdae580135 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMic.h +++ b/Source/Core/Core/Src/HW/EXI_DeviceMic.h @@ -30,7 +30,6 @@ public: bool IsPresent(); private: - static int mic_count; static u8 const exi_id[]; static int const sample_size = sizeof(s16); static int const rate_base = 11025; From c5289786085f9f8f9291258f283c7c15f101eec9 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 16 Oct 2011 23:20:37 -0700 Subject: [PATCH 091/381] use callback model instead of blocking read/write. fixes delay on linux. currently not implementing the overflow bit, not sure it's needed since we manage our own buffer now. --- Source/Core/Core/Src/HW/EXI_DeviceMic.cpp | 96 +++++++++++++++++------ Source/Core/Core/Src/HW/EXI_DeviceMic.h | 22 ++++-- 2 files changed, 88 insertions(+), 30 deletions(-) diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp index 264d6a0539..308f03b3cb 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp @@ -40,19 +40,64 @@ void CEXIMic::StreamInit() // Setup the wonderful c-interfaced lib... if ((pa_error = Pa_Initialize()) != paNoError) StreamLog("Pa_Initialize"); + + stream_wpos = stream_rpos = 0; + memset(stream_buffer, 0, stream_size * sample_size); } void CEXIMic::StreamTerminate() { + Pa_AbortStream(pa_stream); + if ((pa_error = Pa_Terminate()) != paNoError) StreamLog("Pa_Terminate"); } +static int Pa_Callback(const void *inputBuffer, void *outputBuffer, + unsigned long framesPerBuffer, + const PaStreamCallbackTimeInfo *timeInfo, + PaStreamCallbackFlags statusFlags, + void *userData) +{ + (void)outputBuffer; + (void)timeInfo; + + CEXIMic *mic = (CEXIMic *)userData; + + std::lock_guard lk(mic->ring_lock); + + if (mic->stream_wpos + mic->buff_size_samples >= mic->stream_size) + mic->stream_wpos = 0; + + s16 *buff_in = (s16 *)inputBuffer; + s16 *buff_out = &mic->stream_buffer[mic->stream_wpos]; + + if (buff_in == NULL) + { + for (int i = 0; i < mic->buff_size_samples; i++) + { + buff_out[i] = 0; + } + } + else + { + for (int i = 0; i < mic->buff_size_samples; i++) + { + buff_out[i] = buff_in[i]; + } + } + + mic->stream_wpos += mic->buff_size_samples; + mic->stream_wpos %= mic->stream_size; + + return paContinue; +} + void CEXIMic::StreamStart() { // Open stream with current parameters pa_error = Pa_OpenDefaultStream(&pa_stream, 1, 0, paInt16, - sample_rate, buff_size_samples, NULL, NULL); + sample_rate, buff_size_samples, Pa_Callback, this); StreamLog("Pa_OpenDefaultStream"); pa_error = Pa_StartStream(pa_stream); StreamLog("Pa_StartStream"); @@ -67,23 +112,26 @@ void CEXIMic::StreamStop() void CEXIMic::StreamReadOne() { - // Returns num samples or error - pa_error = Pa_GetStreamReadAvailable(pa_stream); - if (pa_error >= buff_size_samples) - { - pa_error = Pa_ReadStream(pa_stream, ring_buffer, buff_size_samples); + std::lock_guard lk(ring_lock); - if (pa_error == paInputOverflowed) - { - status.buff_ovrflw = 1; - // Input overflowed - is re-setting the stream the only to recover? - StreamStop(); - StreamStart(); - } - else if (pa_error != paNoError) - { - StreamLog("Pa_ReadStream"); - } + int samples_avail = (stream_wpos > stream_rpos) ? + stream_wpos - stream_rpos : + stream_size - stream_rpos + stream_wpos; + + if (samples_avail >= buff_size_samples) + { + s16 *last_buffer = &stream_buffer[stream_rpos]; + memcpy(ring_buffer, last_buffer, buff_size); + + stream_rpos += buff_size_samples; + stream_rpos %= stream_size; + + // TODO: if overflow bit matters, find a nice way + //if (samples_avail >= buff_size_samples * 2) + //{ + // status.buff_ovrflw = 1; + // stream_rpos = stream_wpos = 0; + //} } } @@ -91,13 +139,11 @@ void CEXIMic::StreamReadOne() // This works by opening and starting a portaudio input stream when the is_active // bit is set. The interrupt is scheduled in the future based on sample rate and // buffer size settings. When the console handles the interrupt, it will send -// cmdGetBuffer, which is when we actually read data from a buffer portaudio fills -// in the background (ie on demand instead of realtime). Because of this we need -// to clear portaudio's buffer if emulation speed drops below realtime, or else -// a bad audio lag develops. It's actually kind of convenient because it gives -// us a way to detect if buff_ovrflw should be set. +// cmdGetBuffer, which is when we actually read data from a buffer filled +// in the background by Pa_Callback. u8 const CEXIMic::exi_id[] = { 0, 0x0a, 0, 0, 0 }; +int const CEXIMic::stream_size = sizeof(stream_buffer) / sizeof(*stream_buffer); CEXIMic::CEXIMic(int index) : slot(index) @@ -211,13 +257,13 @@ void CEXIMic::TransferByte(u8 &byte) break; case cmdGetBuffer: - if (ring_pos == 0) { - // Can set buff_ovrflw + if (ring_pos == 0) StreamReadOne(); - } + byte = ring_buffer[ring_pos ^ 1]; ring_pos = (ring_pos + 1) % buff_size; + } break; default: diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMic.h b/Source/Core/Core/Src/HW/EXI_DeviceMic.h index bdae580135..1832e6b59d 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMic.h +++ b/Source/Core/Core/Src/HW/EXI_DeviceMic.h @@ -20,6 +20,8 @@ #if HAVE_PORTAUDIO +#include "StdMutex.h" + class CEXIMic : public IEXIDevice { public: @@ -68,11 +70,6 @@ private: }; UStatus status; - // status bits converted to nice numbers - int sample_rate; - int buff_size; - int buff_size_samples; - // 64 is the max size, can be 16 or 32 as well int ring_pos; u8 ring_buffer[64 * sample_size]; @@ -92,6 +89,21 @@ private: void StreamStart(); void StreamStop(); void StreamReadOne(); + +public: + std::mutex ring_lock; + + // status bits converted to nice numbers + int sample_rate; + int buff_size; + int buff_size_samples; + + // Arbitrarily small ringbuffer used by audio input backend in order to + // keep delay tolerable + s16 stream_buffer[64 * sample_size * 500]; + static int const stream_size; + int stream_wpos; + int stream_rpos; protected: virtual void TransferByte(u8 &byte); From 45eb9f0e7ae3cd68ea7c1f8ef986ead30f00ca9b Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Mon, 17 Oct 2011 03:14:20 -0700 Subject: [PATCH 092/381] fix some logic errors in the mic code and decrease latency a bit. emulate the buffer_overflow bit. --- Source/Core/Core/Src/HW/EXI_DeviceMic.cpp | 45 +++++++++++++---------- Source/Core/Core/Src/HW/EXI_DeviceMic.h | 9 +++-- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp index 308f03b3cb..cba3940cdf 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp @@ -38,16 +38,18 @@ void CEXIMic::StreamLog(const char *msg) void CEXIMic::StreamInit() { // Setup the wonderful c-interfaced lib... + pa_stream = NULL; + if ((pa_error = Pa_Initialize()) != paNoError) StreamLog("Pa_Initialize"); - stream_wpos = stream_rpos = 0; - memset(stream_buffer, 0, stream_size * sample_size); + stream_buffer = NULL; + samples_avail = stream_wpos = stream_rpos = 0; } void CEXIMic::StreamTerminate() { - Pa_AbortStream(pa_stream); + StreamStop(); if ((pa_error = Pa_Terminate()) != paNoError) StreamLog("Pa_Terminate"); @@ -61,12 +63,13 @@ static int Pa_Callback(const void *inputBuffer, void *outputBuffer, { (void)outputBuffer; (void)timeInfo; + (void)statusFlags; CEXIMic *mic = (CEXIMic *)userData; std::lock_guard lk(mic->ring_lock); - if (mic->stream_wpos + mic->buff_size_samples >= mic->stream_size) + if (mic->stream_wpos + mic->buff_size_samples > mic->stream_size) mic->stream_wpos = 0; s16 *buff_in = (s16 *)inputBuffer; @@ -87,6 +90,13 @@ static int Pa_Callback(const void *inputBuffer, void *outputBuffer, } } + mic->samples_avail += mic->buff_size_samples; + if (mic->samples_avail > mic->stream_size) + { + mic->samples_avail = 0; + mic->status.buff_ovrflw = 1; + } + mic->stream_wpos += mic->buff_size_samples; mic->stream_wpos %= mic->stream_size; @@ -96,6 +106,9 @@ static int Pa_Callback(const void *inputBuffer, void *outputBuffer, void CEXIMic::StreamStart() { // Open stream with current parameters + stream_size = buff_size_samples * 500; + stream_buffer = new s16[stream_size]; + pa_error = Pa_OpenDefaultStream(&pa_stream, 1, 0, paInt16, sample_rate, buff_size_samples, Pa_Callback, this); StreamLog("Pa_OpenDefaultStream"); @@ -105,33 +118,26 @@ void CEXIMic::StreamStart() void CEXIMic::StreamStop() { - // Acts as if Pa_AbortStream was called - pa_error = Pa_CloseStream(pa_stream); - StreamLog("Pa_CloseStream"); + if (pa_stream != NULL && Pa_IsStreamActive(pa_stream) >= paNoError) + Pa_AbortStream(pa_stream); + + delete [] stream_buffer; + stream_buffer = NULL; } void CEXIMic::StreamReadOne() { std::lock_guard lk(ring_lock); - - int samples_avail = (stream_wpos > stream_rpos) ? - stream_wpos - stream_rpos : - stream_size - stream_rpos + stream_wpos; - + if (samples_avail >= buff_size_samples) { s16 *last_buffer = &stream_buffer[stream_rpos]; memcpy(ring_buffer, last_buffer, buff_size); + samples_avail -= buff_size_samples; + stream_rpos += buff_size_samples; stream_rpos %= stream_size; - - // TODO: if overflow bit matters, find a nice way - //if (samples_avail >= buff_size_samples * 2) - //{ - // status.buff_ovrflw = 1; - // stream_rpos = stream_wpos = 0; - //} } } @@ -143,7 +149,6 @@ void CEXIMic::StreamReadOne() // in the background by Pa_Callback. u8 const CEXIMic::exi_id[] = { 0, 0x0a, 0, 0, 0 }; -int const CEXIMic::stream_size = sizeof(stream_buffer) / sizeof(*stream_buffer); CEXIMic::CEXIMic(int index) : slot(index) diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMic.h b/Source/Core/Core/Src/HW/EXI_DeviceMic.h index 1832e6b59d..b9596ba85a 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMic.h +++ b/Source/Core/Core/Src/HW/EXI_DeviceMic.h @@ -46,7 +46,6 @@ private: cmdReset = 0xFF, }; - // STATE_TO_SAVE int slot; u32 m_position; @@ -68,7 +67,6 @@ private: u16 is_active :1; // If we are sampling or not }; }; - UStatus status; // 64 is the max size, can be 16 or 32 as well int ring_pos; @@ -91,6 +89,8 @@ private: void StreamReadOne(); public: + UStatus status; + std::mutex ring_lock; // status bits converted to nice numbers @@ -100,10 +100,11 @@ public: // Arbitrarily small ringbuffer used by audio input backend in order to // keep delay tolerable - s16 stream_buffer[64 * sample_size * 500]; - static int const stream_size; + s16 *stream_buffer; + int stream_size; int stream_wpos; int stream_rpos; + int samples_avail; protected: virtual void TransferByte(u8 &byte); From 1e558aedeb0bff49645ea41be774f0789de4c6a8 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 22 Aug 2011 06:15:02 +0200 Subject: [PATCH 093/381] Added an EFB peek cache to the GL video plugin Most of the games using EFB peeks are suffering from major performance problems when these peeks are not disabled in the graphics settings. This is an attempt to fix this in the GL renderer by doing the glReadPixels in bulk: instead of doing a lot of 1x1 pixel reads, read for 64x64 pixels at once and keep that in a cache. Deck menu in Baten Kaitos: 3FPS -> 54FPS Character creation in Monster Hunter Tri: 7FPS -> 60FPS --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 128 ++++++++++++++---- Source/Plugins/Plugin_VideoOGL/Src/Render.h | 5 + .../Plugin_VideoOGL/Src/VertexManager.cpp | 2 + 3 files changed, 107 insertions(+), 28 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 19142e44bb..792c14960e 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -123,6 +123,12 @@ static u32 s_blendMode; 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; +const u32 EFB_CACHE_HEIGHT = EFB_HEIGHT / 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 static const GLenum glSrcFactors[8] = { @@ -637,6 +643,42 @@ void Renderer::SetColorMask() glColorMask(ColorMask, ColorMask, ColorMask, AlphaMask); } +void ClearEFBCache() +{ + for (u32 i = 0; i < EFB_CACHE_WIDTH * EFB_CACHE_HEIGHT; ++i) + s_efbCacheValid[0][i] = false; + + for (u32 i = 0; i < EFB_CACHE_WIDTH * EFB_CACHE_HEIGHT; ++i) + s_efbCacheValid[1][i] = false; +} + +void Renderer::UpdateEFBCache(EFBAccessType type, u32 cacheRectIdx, const EFBRectangle& efbPixelRc, const TargetRectangle& targetPixelRc, const u32* data) +{ + u32 cacheType = (type == PEEK_Z ? 0 : 1); + + if (!s_efbCache[cacheType][cacheRectIdx].size()) + s_efbCache[cacheType][cacheRectIdx].resize(EFB_CACHE_RECT_SIZE * EFB_CACHE_RECT_SIZE); + + u32 targetPixelRcWidth = targetPixelRc.right - targetPixelRc.left; + + for (u32 yCache = 0; yCache < EFB_CACHE_RECT_SIZE; ++yCache) + { + u32 yEFB = efbPixelRc.top + yCache; + u32 yPixel = (EFBToScaledY(EFB_HEIGHT - yEFB) + EFBToScaledY(EFB_HEIGHT - yEFB - 1)) / 2; + u32 yData = yPixel - targetPixelRc.bottom; + + for (u32 xCache = 0; xCache < EFB_CACHE_RECT_SIZE; ++xCache) + { + u32 xEFB = efbPixelRc.left + xCache; + u32 xPixel = (EFBToScaledX(xEFB) + EFBToScaledX(xEFB + 1)) / 2; + u32 xData = xPixel - targetPixelRc.left; + s_efbCache[cacheType][cacheRectIdx][yCache * EFB_CACHE_RECT_SIZE + xCache] = data[yData * targetPixelRcWidth + xData]; + } + } + + s_efbCacheValid[cacheType][cacheRectIdx] = true; +} + // This function allows the CPU to directly access the EFB. // There are EFB peeks (which will read the color or depth of a pixel) // and EFB pokes (which will change the color or depth of a pixel). @@ -656,34 +698,49 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) if (!g_ActiveConfig.bEFBAccessEnable) return 0; - // Get the rectangular target region covered by the EFB pixel + u32 cacheRectIdx = ((x / EFB_CACHE_RECT_SIZE) << 16) | (y / EFB_CACHE_RECT_SIZE); + + // Get the rectangular target region containing the EFB pixel EFBRectangle efbPixelRc; - efbPixelRc.left = x; - efbPixelRc.top = y; - efbPixelRc.right = x + 1; - efbPixelRc.bottom = y + 1; + efbPixelRc.left = (x / EFB_CACHE_RECT_SIZE) * EFB_CACHE_RECT_SIZE; + efbPixelRc.top = (y / EFB_CACHE_RECT_SIZE) * EFB_CACHE_RECT_SIZE; + efbPixelRc.right = efbPixelRc.left + EFB_CACHE_RECT_SIZE; + efbPixelRc.bottom = efbPixelRc.top + EFB_CACHE_RECT_SIZE; TargetRectangle targetPixelRc = ConvertEFBRectangle(efbPixelRc); + u32 targetPixelRcWidth = targetPixelRc.right - targetPixelRc.left; + u32 targetPixelRcHeight = targetPixelRc.top - targetPixelRc.bottom; // TODO (FIX) : currently, AA path is broken/offset and doesn't return the correct pixel switch (type) { case PEEK_Z: { - if (s_MSAASamples > 1) + u32 z; + + if (!s_efbCacheValid[0][cacheRectIdx]) { - // Resolve our rectangle. - FramebufferManager::GetEFBDepthTexture(efbPixelRc); - glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, FramebufferManager::GetResolvedFramebuffer()); + if (s_MSAASamples > 1) + { + // Resolve our rectangle. + FramebufferManager::GetEFBDepthTexture(efbPixelRc); + glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, FramebufferManager::GetResolvedFramebuffer()); + } + + u32* depthMap = new u32[targetPixelRcWidth * targetPixelRcHeight]; + + glReadPixels(targetPixelRc.left, targetPixelRc.bottom, targetPixelRcWidth, targetPixelRcHeight, + GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, depthMap); + GL_REPORT_ERRORD(); + + UpdateEFBCache(type, cacheRectIdx, efbPixelRc, targetPixelRc, depthMap); + + delete[] depthMap; } - // Sample from the center of the target region. - int srcX = (targetPixelRc.left + targetPixelRc.right) / 2; - int srcY = (targetPixelRc.top + targetPixelRc.bottom) / 2; - - u32 z = 0; - glReadPixels(srcX, srcY, 1, 1, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, &z); - GL_REPORT_ERRORD(); + u32 xRect = x % EFB_CACHE_RECT_SIZE; + u32 yRect = y % EFB_CACHE_RECT_SIZE; + z = s_efbCache[0][cacheRectIdx][yRect * EFB_CACHE_RECT_SIZE + xRect]; // Scale the 32-bit value returned by glReadPixels to a 24-bit // value (GC uses a 24-bit Z-buffer). @@ -708,21 +765,31 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) // determine if we're aiming at an enemy (0x80 / 0x88) or not (0x70) // Wind Waker is also using it for the pictograph to determine the color of each pixel - if (s_MSAASamples > 1) + u32 color; + + if (!s_efbCacheValid[1][cacheRectIdx]) { - // Resolve our rectangle. - FramebufferManager::GetEFBColorTexture(efbPixelRc); - glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, FramebufferManager::GetResolvedFramebuffer()); + if (s_MSAASamples > 1) + { + // Resolve our rectangle. + FramebufferManager::GetEFBColorTexture(efbPixelRc); + glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, FramebufferManager::GetResolvedFramebuffer()); + } + + u32* colorMap = new u32[targetPixelRcWidth * targetPixelRcHeight]; + + glReadPixels(targetPixelRc.left, targetPixelRc.bottom, targetPixelRcWidth, targetPixelRcHeight, + GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, colorMap); + GL_REPORT_ERRORD(); + + UpdateEFBCache(type, cacheRectIdx, efbPixelRc, targetPixelRc, colorMap); + + delete[] colorMap; } - // Sample from the center of the target region. - int srcX = (targetPixelRc.left + targetPixelRc.right) / 2; - int srcY = (targetPixelRc.top + targetPixelRc.bottom) / 2; - - // Read back pixel in BGRA format, then byteswap to get GameCube's ARGB Format. - u32 color = 0; - glReadPixels(srcX, srcY, 1, 1, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, &color); - GL_REPORT_ERRORD(); + u32 xRect = x % EFB_CACHE_RECT_SIZE; + u32 yRect = y % EFB_CACHE_RECT_SIZE; + color = s_efbCache[1][cacheRectIdx][yRect * EFB_CACHE_RECT_SIZE + xRect]; // check what to do with the alpha channel (GX_PokeAlphaRead) PixelEngine::UPEAlphaReadReg alpha_read_mode; @@ -839,6 +906,8 @@ void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaE glEnd(); RestoreAPIState(); + + ClearEFBCache(); } void Renderer::ReinterpretPixelData(unsigned int convtype) @@ -1347,6 +1416,9 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons // GetTargetWidth(), GetTargetHeight()); Core::Callback_VideoCopiedToXFB(XFBWrited || (g_ActiveConfig.bUseXFB && g_ActiveConfig.bUseRealXFB)); XFBWrited = false; + + // Invalidate EFB cache + ClearEFBCache(); } // ALWAYS call RestoreAPIState for each ResetAPIState call you're doing diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.h b/Source/Plugins/Plugin_VideoOGL/Src/Render.h index 032a9a222c..9cf1573b56 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.h @@ -7,6 +7,8 @@ namespace OGL { +void ClearEFBCache(); + class Renderer : public ::Renderer { public: @@ -57,6 +59,9 @@ public: void SetVSConstant4fv(unsigned int const_number, const float *f); void SetMultiVSConstant3fv(unsigned int const_number, unsigned int count, const float *f); void SetMultiVSConstant4fv(unsigned int const_number, unsigned int count, const float *f); + +private: + void UpdateEFBCache(EFBAccessType type, u32 cacheRectIdx, const EFBRectangle& efbPixelRc, const TargetRectangle& targetPixelRc, const u32* data); }; } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp index a101d6c2d6..5144c328d9 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp @@ -268,6 +268,8 @@ void VertexManager::vFlush() #endif g_Config.iSaveTargetId++; + ClearEFBCache(); + GL_REPORT_ERRORD(); } From 5b2c5c9ce37b45666d5d2f6ff0acf1c302a79240 Mon Sep 17 00:00:00 2001 From: skidau Date: Wed, 19 Oct 2011 02:36:30 +1100 Subject: [PATCH 094/381] Removed the icache invalidation code as it is causing frequent code clearing. --- Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp | 6 +++--- Source/Core/Core/Src/PowerPC/PPCCache.cpp | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp index eba23ca1d0..1ed997ce4c 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp @@ -418,17 +418,17 @@ bool JitBlock::ContainsAddress(u32 em_address) if (address & JIT_ICACHE_VMEM_BIT) { u32 cacheaddr = address & JIT_ICACHE_MASK; - memset(iCacheVMEM + cacheaddr, JIT_ICACHE_INVALID_BYTE, 96); + memset(iCacheVMEM + cacheaddr, JIT_ICACHE_INVALID_BYTE, 32); } else if (address & JIT_ICACHE_EXRAM_BIT) { u32 cacheaddr = address & JIT_ICACHEEX_MASK; - memset(iCacheEx + cacheaddr, JIT_ICACHE_INVALID_BYTE, 96); + memset(iCacheEx + cacheaddr, JIT_ICACHE_INVALID_BYTE, 32); } else { u32 cacheaddr = address & JIT_ICACHE_MASK; - memset(iCache + cacheaddr, JIT_ICACHE_INVALID_BYTE, 96); + memset(iCache + cacheaddr, JIT_ICACHE_INVALID_BYTE, 32); } #endif } diff --git a/Source/Core/Core/Src/PowerPC/PPCCache.cpp b/Source/Core/Core/Src/PowerPC/PPCCache.cpp index 540d4940f7..33ecc0ee88 100644 --- a/Source/Core/Core/Src/PowerPC/PPCCache.cpp +++ b/Source/Core/Core/Src/PowerPC/PPCCache.cpp @@ -134,8 +134,6 @@ namespace PowerPC #endif if (t == 0xff) // load to the cache { - if (jit) - jit->GetBlockCache()->InvalidateICache(addr); if (HID0.ILOCK) // instruction cache is locked return Memory::ReadUnchecked_U32(addr); // select a way From 8d9061ac39ee8841557ce461c48fdc2791ec8a20 Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Wed, 19 Oct 2011 21:03:08 +0300 Subject: [PATCH 095/381] Possible fix for random crashes with plenty of games(like Mario Galaxy) and issue 4568 (please test). Gameini database changes that affects Black & Bruised, BLOODY ROAR(R): PRIMAL FURY, CASPER, Karaoke Revolution Party, Wii Music, TMNT. --- Data/User/GameConfig/G2BE5G.ini | 13 ++++++++++++- Data/User/GameConfig/G2BP7D.ini | 12 ++++++++++++ Data/User/GameConfig/GBLE52.ini | 15 +++++++++++++-- Data/User/GameConfig/GBLP52.ini | 22 +++++++++++++++------- Data/User/GameConfig/GCPE6S.ini | 17 +++++++++++++++-- Data/User/GameConfig/GCPP6S.ini | 14 ++++++++++++-- Data/User/GameConfig/GK9EA4.ini | 12 ++++++++++-- Data/User/GameConfig/R64E01.ini | 13 ++++++++++++- Data/User/GameConfig/R64J01.ini | 17 +++++++++++++++++ Data/User/GameConfig/R64K01.ini | 17 +++++++++++++++++ Data/User/GameConfig/R64P01.ini | 17 +++++++++++++++++ Data/User/GameConfig/RTME41.ini | 17 +++++++++++++++++ Data/User/GameConfig/RTMP41.ini | 17 +++++++++++++++++ Source/Core/DolphinWX/Src/Main.cpp | 1 - 14 files changed, 186 insertions(+), 18 deletions(-) create mode 100644 Data/User/GameConfig/R64J01.ini create mode 100644 Data/User/GameConfig/R64K01.ini create mode 100644 Data/User/GameConfig/R64P01.ini create mode 100644 Data/User/GameConfig/RTME41.ini create mode 100644 Data/User/GameConfig/RTMP41.ini diff --git a/Data/User/GameConfig/G2BE5G.ini b/Data/User/GameConfig/G2BE5G.ini index 421ecf417a..25ee8fe471 100644 --- a/Data/User/GameConfig/G2BE5G.ini +++ b/Data/User/GameConfig/G2BE5G.ini @@ -2,6 +2,17 @@ [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 = No sound/bad sound +EmulationIssues = Needs LLE audio for sound 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] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/G2BP7D.ini b/Data/User/GameConfig/G2BP7D.ini index d730c87189..462c5eff83 100644 --- a/Data/User/GameConfig/G2BP7D.ini +++ b/Data/User/GameConfig/G2BP7D.ini @@ -2,5 +2,17 @@ [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. [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] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/GBLE52.ini b/Data/User/GameConfig/GBLE52.ini index a3e059d1ae..198f4eeb94 100644 --- a/Data/User/GameConfig/GBLE52.ini +++ b/Data/User/GameConfig/GBLE52.ini @@ -1,7 +1,18 @@ # GBLE52 - BLOODY ROAR(R): PRIMAL FURY [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 = Black screen afther logos -EmulationStateId = 1 +EmulationIssues = Needs real xfb for videos to display and LLE audio for video sound. +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/GBLP52.ini b/Data/User/GameConfig/GBLP52.ini index 6cb0a7a23a..a7eca2fb72 100644 --- a/Data/User/GameConfig/GBLP52.ini +++ b/Data/User/GameConfig/GBLP52.ini @@ -1,10 +1,18 @@ # GBLP52 - BLOODY ROAR(R): PRIMAL FURY - -[EmuState] -#The Emulation State. -EmulationStateId = 2 -EmulationIssues = 60Hz Display only -[OnFrame] -[ActionReplay] +[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 display and LLE audio for video sound. +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/GCPE6S.ini b/Data/User/GameConfig/GCPE6S.ini index 1d9cd9266b..d483b5b255 100644 --- a/Data/User/GameConfig/GCPE6S.ini +++ b/Data/User/GameConfig/GCPE6S.ini @@ -1,7 +1,20 @@ # GCPE6S - CASPER [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 = +EmulationStateId = 4 +EmulationIssues = Needs real xfb for videos to appear and LLE audio for them to have 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] +UseXFB = True +UseRealXFB = True +[Video_Hacks] +DlistCachingEnable = False diff --git a/Data/User/GameConfig/GCPP6S.ini b/Data/User/GameConfig/GCPP6S.ini index 88dcd47ab0..b088ab6a74 100644 --- a/Data/User/GameConfig/GCPP6S.ini +++ b/Data/User/GameConfig/GCPP6S.ini @@ -1,10 +1,20 @@ # GCPP6S - Casper Spirit Dimensions [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 = Bad transparencies +EmulationStateId = 4 +EmulationIssues = Needs real xfb for videos to appear and LLE audio for them to have 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] +UseXFB = True +UseRealXFB = True +[Video_Hacks] +DlistCachingEnable = False diff --git a/Data/User/GameConfig/GK9EA4.ini b/Data/User/GameConfig/GK9EA4.ini index 47ba05e7d0..78dcce6e94 100644 --- a/Data/User/GameConfig/GK9EA4.ini +++ b/Data/User/GameConfig/GK9EA4.ini @@ -1,7 +1,15 @@ # GK9EA4 - Karaoke Revolution Party [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 = Need Microphone to play this game. +EmulationStateId = 4 +EmulationIssues = Needs Microphone set in a gamecube pad slot to play this game. [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/R64E01.ini b/Data/User/GameConfig/R64E01.ini index 281224d780..d38abcbb03 100644 --- a/Data/User/GameConfig/R64E01.ini +++ b/Data/User/GameConfig/R64E01.ini @@ -1,6 +1,17 @@ # R64E01 - RVL Wii Music [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 +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/R64J01.ini b/Data/User/GameConfig/R64J01.ini new file mode 100644 index 0000000000..6b2a66b752 --- /dev/null +++ b/Data/User/GameConfig/R64J01.ini @@ -0,0 +1,17 @@ +# R64J01 - RVL Wii Music +[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/R64K01.ini b/Data/User/GameConfig/R64K01.ini new file mode 100644 index 0000000000..e59730ce2b --- /dev/null +++ b/Data/User/GameConfig/R64K01.ini @@ -0,0 +1,17 @@ +# R64K01 - RVL Wii Music +[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/R64P01.ini b/Data/User/GameConfig/R64P01.ini new file mode 100644 index 0000000000..4ada809cd4 --- /dev/null +++ b/Data/User/GameConfig/R64P01.ini @@ -0,0 +1,17 @@ +# R64P01 - RVL Wii Music +[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/RTME41.ini b/Data/User/GameConfig/RTME41.ini new file mode 100644 index 0000000000..1da1d64564 --- /dev/null +++ b/Data/User/GameConfig/RTME41.ini @@ -0,0 +1,17 @@ +# RTME41 - TMNT +[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] +DisableFog = True diff --git a/Data/User/GameConfig/RTMP41.ini b/Data/User/GameConfig/RTMP41.ini new file mode 100644 index 0000000000..3886311fc2 --- /dev/null +++ b/Data/User/GameConfig/RTMP41.ini @@ -0,0 +1,17 @@ +# RTMP41 - TMNT +[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] +DisableFog = True diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index b5e9de4960..709c2b4b53 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -510,7 +510,6 @@ void Host_UpdateTitle(const char* title) wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATETITLE); event.SetString(wxString::FromAscii(title)); main_frame->GetEventHandler()->AddPendingEvent(event); - Host_UpdateMainFrame(); } void Host_UpdateBreakPointView() From 599c3ccd7bc0c7b75c9ef6c4a3fd4f0fb2ae266c Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 22 Oct 2011 16:14:34 +1100 Subject: [PATCH 096/381] Fixed save states for games which use the MMU Speed Hack --- Source/Core/Core/Src/HW/Memmap.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Core/Core/Src/HW/Memmap.cpp b/Source/Core/Core/Src/HW/Memmap.cpp index 1c185ccaf3..c1c01d26a9 100644 --- a/Source/Core/Core/Src/HW/Memmap.cpp +++ b/Source/Core/Core/Src/HW/Memmap.cpp @@ -373,6 +373,8 @@ void DoState(PointerWrap &p) p.DoArray(m_pPhysicalRAM, RAM_SIZE); // p.DoArray(m_pVirtualEFB, EFB_SIZE); p.DoArray(m_pVirtualL1Cache, L1_CACHE_SIZE); + if (bFakeVMEM) + p.DoArray(m_pVirtualFakeVMEM, FAKEVMEM_SIZE); if (wii) p.DoArray(m_pEXRAM, EXRAM_SIZE); } From ba119e8c0504c3c50580b33bdd60310fe8d64c73 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 23 Oct 2011 02:53:31 -0700 Subject: [PATCH 097/381] Set the correct bit for "trap" program exception. Fixes http://wiibrew.org/wiki/Descent --- 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 4e58873d7e..bd24d2d87d 100644 --- a/Source/Core/Core/Src/PowerPC/PowerPC.cpp +++ b/Source/Core/Core/Src/PowerPC/PowerPC.cpp @@ -310,7 +310,7 @@ void CheckExceptions() { SRR0 = PC; // say that it's a trap exception - SRR1 = (MSR & 0x87C0FFFF) | 0x40000; + SRR1 = (MSR & 0x87C0FFFF) | 0x20000; MSR |= (MSR >> 16) & 1; MSR &= ~0x04EF36; NPC = 0x80000700; From 105e7e4eb41b8ccaf439f1dad1ae393ed9dac710 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 23 Oct 2011 07:01:17 -0700 Subject: [PATCH 098/381] Added TaruKonga (DK Bongos) support. Separated SI Device IDs from the enums used for config/gui since quite a few device types all have the gc controller SI ID. --- Source/Core/Core/Src/ConfigManager.cpp | 2 +- Source/Core/Core/Src/ConfigManager.h | 2 +- Source/Core/Core/Src/HW/DVDInterface.cpp | 2 +- Source/Core/Core/Src/HW/GCPad.cpp | 2 - Source/Core/Core/Src/HW/SI.cpp | 12 +-- Source/Core/Core/Src/HW/SI.h | 4 +- Source/Core/Core/Src/HW/SI_Device.cpp | 24 +++--- Source/Core/Core/Src/HW/SI_Device.h | 20 ++++- .../Core/Src/HW/SI_DeviceGCController.cpp | 85 ++++++++----------- .../Core/Core/Src/HW/SI_DeviceGCController.h | 17 +++- Source/Core/Core/Src/Movie.cpp | 6 +- Source/Core/DolphinWX/Src/ConfigMain.cpp | 23 +++-- Source/Core/DolphinWX/Src/FrameTools.cpp | 2 +- 13 files changed, 114 insertions(+), 87 deletions(-) diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index 3d68189db3..e70b021a0c 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -366,7 +366,7 @@ void SConfig::LoadSettings() for (int i = 0; i < 4; ++i) { sprintf(sidevicenum, "SIDevice%i", i); - ini.Get("Core", sidevicenum, (u32*)&m_SIDevice[i], i==0 ? SI_GC_CONTROLLER:SI_NONE); + ini.Get("Core", sidevicenum, (u32*)&m_SIDevice[i], (i == 0) ? SIDEVICE_GC_CONTROLLER : SIDEVICE_NONE); } ini.Get("Core", "WiiSDCard", &m_WiiSDCard, false); diff --git a/Source/Core/Core/Src/ConfigManager.h b/Source/Core/Core/Src/ConfigManager.h index 585e3689d6..35ac8269e9 100644 --- a/Source/Core/Core/Src/ConfigManager.h +++ b/Source/Core/Core/Src/ConfigManager.h @@ -52,7 +52,7 @@ struct SConfig : NonCopyable //this is necessary to save after loading a savestate bool b_reloadMCOnState; TEXIDevices m_EXIDevice[3]; - TSIDevices m_SIDevice[4]; + SIDevices m_SIDevice[4]; std::string m_bba_mac; // interface language diff --git a/Source/Core/Core/Src/HW/DVDInterface.cpp b/Source/Core/Core/Src/HW/DVDInterface.cpp index cea7486426..205cd00448 100644 --- a/Source/Core/Core/Src/HW/DVDInterface.cpp +++ b/Source/Core/Core/Src/HW/DVDInterface.cpp @@ -522,7 +522,7 @@ void GenerateDIInterrupt(DI_InterruptType _DVDInterrupt) void ExecuteCommand(UDICR& _DICR) { // _dbg_assert_(DVDINTERFACE, _DICR.RW == 0); // only DVD to Memory - int GCAM = ((SConfig::GetInstance().m_SIDevice[0] == SI_AM_BASEBOARD) + int GCAM = ((SConfig::GetInstance().m_SIDevice[0] == SIDEVICE_AM_BASEBOARD) && (SConfig::GetInstance().m_EXIDevice[2] == EXIDEVICE_AM_BASEBOARD)) ? 1 : 0; diff --git a/Source/Core/Core/Src/HW/GCPad.cpp b/Source/Core/Core/Src/HW/GCPad.cpp index 65b920409e..4c1b4dabdd 100644 --- a/Source/Core/Core/Src/HW/GCPad.cpp +++ b/Source/Core/Core/Src/HW/GCPad.cpp @@ -62,8 +62,6 @@ void GetStatus(u8 _numPAD, SPADStatus* _pPADStatus) { memset(_pPADStatus, 0, sizeof(*_pPADStatus)); _pPADStatus->err = PAD_ERR_NONE; - // wtf is this? - _pPADStatus->button = PAD_USE_ORIGIN; std::unique_lock lk(g_plugin.controls_lock, std::try_to_lock); diff --git a/Source/Core/Core/Src/HW/SI.cpp b/Source/Core/Core/Src/HW/SI.cpp index 178550b445..cd80c14daf 100644 --- a/Source/Core/Core/Src/HW/SI.cpp +++ b/Source/Core/Core/Src/HW/SI.cpp @@ -247,9 +247,9 @@ void Init() g_Channel[i].m_InLo.Hex = 0; if (Movie::IsUsingPad(i)) - AddDevice(SI_GC_CONTROLLER, i); + AddDevice(SIDEVICE_GC_CONTROLLER, i); else if (Movie::IsRecordingInput() || Movie::IsPlayingInput()) - AddDevice(SI_NONE, i); + AddDevice(SIDEVICE_NONE, i); else AddDevice(SConfig::GetInstance().m_SIDevice[i], i); } @@ -538,7 +538,7 @@ void RemoveDevice(int _iDeviceNumber) g_Channel[_iDeviceNumber].m_pDevice = NULL; } -void AddDevice(const TSIDevices _device, int _iDeviceNumber) +void AddDevice(const SIDevices _device, int _iDeviceNumber) { //_dbg_assert_(SERIALINTERFACE, _iDeviceNumber < NUMBER_OF_CHANNELS); @@ -572,14 +572,14 @@ void ChangeDeviceCallback(u64 userdata, int cyclesLate) SetNoResponse(channel); - AddDevice((TSIDevices)(u32)userdata, channel); + AddDevice((SIDevices)(u32)userdata, channel); } -void ChangeDevice(TSIDevices device, int channel) +void ChangeDevice(SIDevices device, int channel) { // Called from GUI, so we need to make it thread safe. // Let the hardware see no device for .5b cycles - CoreTiming::ScheduleEvent_Threadsafe(0, changeDevice, ((u64)channel << 32) | SI_NONE); + CoreTiming::ScheduleEvent_Threadsafe(0, changeDevice, ((u64)channel << 32) | SIDEVICE_NONE); CoreTiming::ScheduleEvent_Threadsafe(500000000, changeDevice, ((u64)channel << 32) | device); } diff --git a/Source/Core/Core/Src/HW/SI.h b/Source/Core/Core/Src/HW/SI.h index 59e38df9c8..c1eb336798 100644 --- a/Source/Core/Core/Src/HW/SI.h +++ b/Source/Core/Core/Src/HW/SI.h @@ -31,10 +31,10 @@ void DoState(PointerWrap &p); void UpdateDevices(); void RemoveDevice(int _iDeviceNumber); -void AddDevice(const TSIDevices _device, int _iDeviceNumber); +void AddDevice(const SIDevices _device, int _iDeviceNumber); void ChangeDeviceCallback(u64 userdata, int cyclesLate); -void ChangeDevice(TSIDevices device, int channel); +void ChangeDevice(SIDevices device, int channel); void Read32(u32& _uReturnValue, const u32 _iAddress); void Write32(const u32 _iValue, const u32 _iAddress); diff --git a/Source/Core/Core/Src/HW/SI_Device.cpp b/Source/Core/Core/Src/HW/SI_Device.cpp index c1a65ebcb8..6c0c40f40d 100644 --- a/Source/Core/Core/Src/HW/SI_Device.cpp +++ b/Source/Core/Core/Src/HW/SI_Device.cpp @@ -68,25 +68,29 @@ public: // F A C T O R Y -ISIDevice* SIDevice_Create(TSIDevices _SIDevice, int _iDeviceNumber) +ISIDevice* SIDevice_Create(const SIDevices device, const int port_number) { - switch(_SIDevice) + switch (device) { - case SI_GC_CONTROLLER: - return new CSIDevice_GCController(_iDeviceNumber); + case SIDEVICE_GC_CONTROLLER: + return new CSIDevice_GCController(port_number); break; - case SI_GBA: - return new CSIDevice_GBA(_iDeviceNumber); + case SIDEVICE_GC_TARUKONGA: + return new CSIDevice_TaruKonga(port_number); break; - case SI_AM_BASEBOARD: - return new CSIDevice_AMBaseboard(_iDeviceNumber); + case SIDEVICE_GC_GBA: + return new CSIDevice_GBA(port_number); break; - case SI_NONE: + case SIDEVICE_AM_BASEBOARD: + return new CSIDevice_AMBaseboard(port_number); + break; + + case SIDEVICE_NONE: default: - return new CSIDevice_Null(_iDeviceNumber); + return new CSIDevice_Null(port_number); break; } } diff --git a/Source/Core/Core/Src/HW/SI_Device.h b/Source/Core/Core/Src/HW/SI_Device.h index 642a54d918..2ed982ad0a 100644 --- a/Source/Core/Core/Src/HW/SI_Device.h +++ b/Source/Core/Core/Src/HW/SI_Device.h @@ -57,7 +57,7 @@ public: virtual void SendCommand(u32 _Cmd, u8 _Poll) = 0; }; -// SI Device IDs +// SI Device IDs for emulator use enum TSIDevices { SI_NONE = SI_ERROR_NO_RESPONSE, @@ -72,6 +72,22 @@ enum TSIDevices SI_AM_BASEBOARD = 0x10110800 // gets ORd with dipswitch state }; -extern ISIDevice* SIDevice_Create(TSIDevices _SIDevice, int _iDeviceNumber); +// For configuration use, since some devices can have the same SI Device ID +enum SIDevices +{ + SIDEVICE_NONE, + SIDEVICE_N64_MIC, + SIDEVICE_N64_KEYBOARD, + SIDEVICE_N64_MOUSE, + SIDEVICE_N64_CONTROLLER, + SIDEVICE_GC_GBA, + SIDEVICE_GC_CONTROLLER, + SIDEVICE_GC_KEYBOARD, + SIDEVICE_GC_STEERING, + SIDEVICE_GC_TARUKONGA, + SIDEVICE_AM_BASEBOARD +}; + +extern ISIDevice* SIDevice_Create(const SIDevices device, const int port_number); #endif diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp index 601fb98f02..abb4bf8dec 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp @@ -59,60 +59,49 @@ int CSIDevice_GCController::RunBuffer(u8* _pBuffer, int _iLength) // For debug logging only ISIDevice::RunBuffer(_pBuffer, _iLength); - int iPosition = 0; - while (iPosition < _iLength) + // Read the command + EBufferCommands command = static_cast(_pBuffer[3]); + + // Handle it + switch (command) { - // Read the command - EBufferCommands command = static_cast(_pBuffer[iPosition ^ 3]); - iPosition++; + case CMD_RESET: + *(u32*)&_pBuffer[0] = SI_GC_CONTROLLER; + break; - // Handle it - switch (command) + case CMD_ORIGIN: { - case CMD_RESET: + INFO_LOG(SERIALINTERFACE, "PAD - Get Origin"); + u8* pCalibration = reinterpret_cast(&m_Origin); + for (int i = 0; i < (int)sizeof(SOrigin); i++) { - *(u32*)&_pBuffer[0] = SI_GC_CONTROLLER; - iPosition = _iLength; // Break the while loop + _pBuffer[i ^ 3] = *pCalibration++; } - 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++; - } - } - iPosition = _iLength; - 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++; - } - } - iPosition = _iLength; - break; - - // DEFAULT - default: - { - ERROR_LOG(SERIALINTERFACE, "unknown SI command (0x%x)", command); - PanicAlert("SI: Unknown command"); - iPosition = _iLength; - } - break; } + 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); + PanicAlert("SI: Unknown command"); + } + break; } - return iPosition; + return _iLength; } @@ -156,9 +145,7 @@ bool CSIDevice_GCController::GetData(u32& _Hi, u32& _Low) // 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 << 16); - _Hi |= 0x00800000; // F|RES: means that the pad must be "combined" with the origin to match the "final" OSPad-Struct - //_Hi |= 0x20000000; // ? + _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) diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCController.h b/Source/Core/Core/Src/HW/SI_DeviceGCController.h index 5493417793..81e0d9d03f 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCController.h +++ b/Source/Core/Core/Src/HW/SI_DeviceGCController.h @@ -30,7 +30,6 @@ private: // Commands enum EBufferCommands { - CMD_INVALID = 0xFFFFFFFF, CMD_RESET = 0x00, CMD_ORIGIN = 0x41, CMD_RECALIBRATE = 0x42, @@ -111,4 +110,20 @@ public: // Send a command directly virtual void SendCommand(u32 _Cmd, u8 _Poll); }; + + +// "TaruKonga", the DK Bongo controller +class CSIDevice_TaruKonga : public CSIDevice_GCController +{ +public: + CSIDevice_TaruKonga(int _iDeviceNumber) : CSIDevice_GCController(_iDeviceNumber) { } + + virtual bool GetData(u32& _Hi, u32& _Low) + { + CSIDevice_GCController::GetData(_Hi, _Low); + _Hi &= ~PAD_USE_ORIGIN << 16; + return true; + } +}; + #endif diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index d340496c33..818d77cd35 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -181,7 +181,7 @@ void ChangePads(bool instantly) int controllers = 0; for (int i = 0; i < 4; i++) - if (SConfig::GetInstance().m_SIDevice[i] == SI_GC_CONTROLLER) + if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER) controllers |= (1 << i); if (instantly && (g_numPads & 0x0F) == controllers) @@ -189,9 +189,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) ? SI_GC_CONTROLLER : SI_NONE, i); + SerialInterface::AddDevice(IsUsingPad(i) ? SIDEVICE_GC_CONTROLLER : SIDEVICE_NONE, i); else - SerialInterface::ChangeDevice(IsUsingPad(i) ? SI_GC_CONTROLLER : SI_NONE, i); + SerialInterface::ChangeDevice(IsUsingPad(i) ? SIDEVICE_GC_CONTROLLER : SIDEVICE_NONE, i); } void ChangeWiiPads(bool instantly) diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 31000173ae..c364267362 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -78,6 +78,7 @@ static const wxLanguage langIds[] = #define DEV_DUMMY_STR _trans("Dummy") #define SIDEV_STDCONT_STR _trans("Standard Controller") +#define SIDEV_BONGO_STR _trans("TaruKonga (Bongos)") #define SIDEV_GBA_STR "GBA" #define SIDEV_AM_BB_STR _trans("AM-Baseboard") @@ -388,6 +389,7 @@ void CConfigMain::InitializeGUIValues() wxArrayString SIDevices; SIDevices.Add(_(DEV_NONE_STR)); SIDevices.Add(_(SIDEV_STDCONT_STR)); + SIDevices.Add(_(SIDEV_BONGO_STR)); SIDevices.Add(_(SIDEV_GBA_STR)); SIDevices.Add(_(SIDEV_AM_BB_STR)); @@ -436,15 +438,18 @@ void CConfigMain::InitializeGUIValues() switch (SConfig::GetInstance().m_SIDevice[i]) { - case SI_GC_CONTROLLER: + case SIDEVICE_GC_CONTROLLER: GCSIDevice[i]->SetStringSelection(SIDevices[1]); break; - case SI_GBA: + case SIDEVICE_GC_TARUKONGA: GCSIDevice[i]->SetStringSelection(SIDevices[2]); break; - case SI_AM_BASEBOARD: + case SIDEVICE_GC_GBA: GCSIDevice[i]->SetStringSelection(SIDevices[3]); break; + case SIDEVICE_AM_BASEBOARD: + GCSIDevice[i]->SetStringSelection(SIDevices[4]); + break; default: GCSIDevice[i]->SetStringSelection(SIDevices[0]); break; @@ -1043,15 +1048,17 @@ void CConfigMain::ChooseMemcardPath(std::string& strMemcard, bool isSlotA) void CConfigMain::ChooseSIDevice(std::string deviceName, int deviceNum) { - TSIDevices tempType; + SIDevices tempType; if (!deviceName.compare(CSTR_TRANS(SIDEV_STDCONT_STR))) - tempType = SI_GC_CONTROLLER; + tempType = SIDEVICE_GC_CONTROLLER; + else if (!deviceName.compare(CSTR_TRANS(SIDEV_BONGO_STR))) + tempType = SIDEVICE_GC_TARUKONGA; else if (!deviceName.compare(SIDEV_GBA_STR)) - tempType = SI_GBA; + tempType = SIDEVICE_GC_GBA; else if (!deviceName.compare(CSTR_TRANS(SIDEV_AM_BB_STR))) - tempType = SI_AM_BASEBOARD; + tempType = SIDEVICE_AM_BASEBOARD; else - tempType = SI_NONE; + tempType = SIDEVICE_NONE; SConfig::GetInstance().m_SIDevice[deviceNum] = tempType; diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index be24228c98..32b7d48477 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -723,7 +723,7 @@ void CFrame::OnRecord(wxCommandEvent& WXUNUSED (event)) } for (int i = 0; i < 4; i++) { - if (SConfig::GetInstance().m_SIDevice[i] == SI_GC_CONTROLLER) + if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER) controllers |= (1 << i); if (g_wiimote_sources[i] != WIIMOTE_SRC_NONE) From 78832cb4ea1531873c6175f07eb53aa1b5d1f5e1 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 23 Oct 2011 18:17:50 -0700 Subject: [PATCH 099/381] Update to portaudio SVN rev 1762 Disable portaudio backend for wdmks (fixes debug build on windows) --- Externals/portaudio/Win32/portaudio.lib | Bin 1254336 -> 1100706 bytes Externals/portaudio/include/pa_asio.h | 33 ++++++++----- Externals/portaudio/include/pa_mac_core.h | 44 ++++++++--------- Externals/portaudio/include/pa_win_ds.h | 12 ++--- Externals/portaudio/include/portaudio.h | 57 ++++++++++++++++------ Externals/portaudio/x64/portaudio.lib | Bin 1212230 -> 1062780 bytes 6 files changed, 88 insertions(+), 58 deletions(-) diff --git a/Externals/portaudio/Win32/portaudio.lib b/Externals/portaudio/Win32/portaudio.lib index 2aed449b6b1abf1fccac36bf193d651f40916488..01213c53993d839d41b74757bbb6256d751b13a5 100644 GIT binary patch literal 1100706 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 z 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ਟT@i(I)@X99-KMdRnHR2SpNf1!Y1l>9cxr{Mw$ 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 literal 1254336 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%0AY^uvLC7N+nS3Yf(D!QjFOjcXs59 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�xxFYp73Ugr$1Eqsq5I3+yfZ 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�>RoX_#0E!B9?xK)AKq~J7g-Czb39QF4q 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

@$ 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%0A8-IH{s)W7U{02e!evE6Qij^xM_Qs#(D5kGB&B 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 z zaW<8+1kSYP5;BaYG=nLySuzDr+~QPp2qY2d2OVz?mgy&Ybn;Y%pg-I1Aw{g0lq95;?O=g^wlDRB0^`73>3; zf@e0IZQ^V%X9qYt!`XSxZgX~@v)7!x=dA2PMZ9WE38X4#H92d^nLcN#i{N_)H1&8h zH7Xe?VhW!8EEaErmyt?Lf$a;_Sn94ZQ}AR3l<0ROQ!plSwx6@poSozB7H9W3d&Sv1 z&dQ`I;waA)*dsWr!C52DnsC;Zvksh@a%RbyGiSXy8_d}d&O$hg;4GT6$(+sRY#wJh zoUP$Zbt&BbO>4o4DR_R#6g=eyHH(&b0#k4@3Dj)LGMIw1N1zfZ+sBkZ+GmI%%SdOY z1Y*INoU>k>xpC&hnIC82oQ>ivma{m{=5m(8*>cWSa<+l90?rCKJH**p&MtCxm$QeQ zz2)p9XXTbF%Af*M0;$efEzWc~YsOi7&N_2u!I_-1UYxmc=EIpEXW^WU;w+Z4IL^{J z%izo@8=jreR`P`@8JPP;CJ-a0WWy$u;O6~&Z^~$K48pd3ZC?Hc89YMoPFU;eKR3@X>6`cfjyfk z*nNUJKx3QB6!e)bq7NCV#gssFIcvsQd(Jv@X2F@9vtFFJapuFBA7|m5jp8hpvpCM? za+bo`a?VzAwt=$(&I&m@#MxQSE^>C4vxl6$`}Xzf^$`%>QnZHDL5Z- z80=S+bz%yhL4wkzESM>QEC$t(vZYK3o&Tm{vFvYSl7 zYW+G`nJBBq6xjYjwW7?LDTo79Ys!+Cg0pX++E8|oDR`C-N}sY1Oo7e(23X4|tIHJZ zQ$V$)%$zCM2Y_lvStL_n!vkeVSq@Wh{^}OkhbU8L3f4KGI#DKP3T)hCWrs2yroiF=syk)wOo8qCIarD)(_jkP5GW(cIx!`X zKJ>C>ZF{)Jb*N7WaS932Ho-4$5GQ}nQG?++B4Xtk;1deZUGR?Z!Ent{P#`fAKbTEK zmt`+3uQ$8sszXBK8@s+goA3{T|D;Ss2`i(7l~ux2m9TP3Sa~H(O$k#6W?w$-WlMEE zhi#$0(Mz_@umePz{4?cFVYkzETPzO?sliWGF)env1$94NZfmzTa?e}e%(D4YlW){X z@{Kc&ot)a-ze&Hs)84&TR-4z}G1Kze^o<>A-kS>_v}tp9tmTaE`})kD<=6U4PSPt& zgGuI@J9DpO?iqB;dwcG|`uEeVGp=d5cXmHhbG)%y^JH%=o8&2N-!C|Maps*Ht?~}{ zZ{?V6IiTu?uj^L!d0)Z8vQdM2Fnp1caSJJl|ec!7=dM2{BKNi@xReM zmLKNX*p_A!`j7z)CQ;Sgdz#%T&1u2vq{G_UWwETJ37uv?AMQ{tS!tF)G_8+)nO+ETjLIkdHc=#%V^mr$>LffKQ6a z-gB9<>Al@dR?Uj6J?ry`yU1j(yR3758)GrY|Hz!X$Cjoc>lFW%*cKYwO`ezB*e&YO zO=PngBxo6TYiqK&@WPs|Az4e270r9yKYw75<@Sed*1hUbFA&*@K9^i}4c=!l@mhq& zw&&;HBD3pzBuGVcFBX@z4vT1Ar;+?H(W94PLQ$V zmWBH!I~$*RgDl2z?;(>$D&`y2wrf8P&zpd3mWk|%Y}F9E#EtvC#$MaH3fabtT9fV5 znwck5E|_=N?RI-)U3|tw&0752Y-Y0Nan)zqg~;}Y)ZS4qb(7`l`>R(cJeQ{+8)+W4 zqT`sZ+7TekhB=x zEo`ZA%(&N7n-%Z8@64~8a0;2d&YaZT%nyzWQY@a??Mi)ztlR#8np2y^IZQNLW))Rg z_hB1gS2tD;9eZN9X}Zz&8vci#>7YA9w-(0zp6s=rb1(M6uvT*%kW~xayyo4P$Bxs# zFR!#>b?>^!7N-~8?0f!{-Nq+|SsOBqqL3XQ;jryv&9l}!9+s*1;*o0wWD_ET%=c*= zFdD9|Tb{bQbC-)n!W|8>ZizG3Abb7p`7FKGhfU}77@Lx|!$5{iyMjUQ zSvs}kDaRjOF8}FkKC<+?)rZv=&f9HGIQ??Xp=R5V?LFnP^M-taW9-m=(e>gBO_4nc zxH7X@K?{>DiJeF5hWUI$rkWg5^m4{?vqYU1XC`V*IE!rJow!)zLEWv^j+l_OP*43S zvhty6UuJ%n+ox?b`sQAtC+$beCVcwP;#90vyn|our1#72qdPCBd7TbE^)-!|wJF3P zpR+eue+IRyC!A)Sk-yM4kPRM`a(>-`RmN*RX^Ysu%#yLGdhkzM<)#`vYp~O z)V|V#(VNj-rp?lqnG4?;$302D_VN3J%gD?lldH*x=h|de%jntlo$4TDJrf6dEq7XK zTX5OoWbXqZ^N{s@meB1*(MP*Yy&VSVn2$N8jQM~&Bi%g%GzVU{S@>;MrIYo0(DA@^ z(#QFuJvUp%4(eaWduM|<^eb&ICcu{TTcLjF%~i8S*OzslF+MjI-39Od5^ovrV!QZR z;+Ff>>kmej;*~bWNT^~Px83GS&qG?Pk)3RudN5$zW``+7BZoy7&7pmN(93Ir(PeeB z)Q067kE!vAw)=Cc{|s3*ailywE!x1K>Z&Hn(ozk=i{C!|Tv)q_wkaV!_Lh&n+#TIj zdUN6R5vQf*$y&xoX4R4pK$g^DOx)sc_spV(G^y-XQH9``EoC@=NSP`yX&K=79GAN$ zS$_Sfe3HYE3SnQv`(qp=q{GbMJ!37_7Tp-z|5)MyWW%&`c8!mAvYeYY^48X{FNcsx z!?RMt8Y^KoN*Im@pFAfzbu~C^HfhQ3oD;r-TVfoIoB0NgnNZPjS;rHHn+=(=6Pa&# zjhT5uBeNM72ld*t=JtGKyL<1SyR*5q$>KAM_m{c7iMAJ$M@^>9EcebV@2GKm-?|S+ zqPue=*Nq6i>tVViI4UhK^e!C_Dm0n*{oJM$`Q%n}wJJHMK0aH@d6~nxmcAtA%bHh29doF67#I=f);r31Hw~i848`x~g znhRFrME|Akrsr0*HI~0DGbmy4;~WiOZ?m?vY;fVQ)!NY?E;Q0tF~Bm|bpC^xdBzmS zIg_0A>Moc?*H;raeG0jhbJuKbuY5Dd*n5%aP8uHOV@bWu)!M5V*w4G@zw^-0+9}S^ z;iT?x;l3dx#%T48eEX;og+}*>-9L`umCN=x@O9pO`NH*SgEXSgx+seS>q8nISZ;nP ztBSx}#yzj-{ppnEQmC8{4W8nckx4h<<(+%-0mji&mv$|BmhG=Bj_TmX`cuJtnJbWM1=Wm4_bwi>N(SAF*w({jkjcU-SiSr%Ix z#GP7jWKQgi_u2&dow&+Vh%KU(SLy6+dp+(BYN2g9Yes(kX)gy+R#vy|zQd9G<*7$k%xL~~%y4u!=6hhl z;r8uqCaX2Oz1+@{j%z_RbahO7dt0Zpng4bEtE9c??#4gi=QH*{vEI;Q^BCuQCqt1* z%L?20tmOPxnM&CnScD^%6d?}UvJ1G+ERYQ8Z~ z_mZPm{7~#~Qikp2pvNWmXYF1)CMM;LxiC4w9{oDpyqh@9yNPvvcFyWi|Fo})dlw(8 ztO4I|N19GvvvkzZ&sWQ$yVHYSulU&Onsq^i!T(ecyvHItHO=2}SZfQrxD3xtGiC%= zR+bjrYe>_A^()OU#w&HF3QXGm8UpKYH}(0q7F$iS??ybk?wC>r;}sm!Pd2yAu-@9H zWBCWuw~s@X+jp|+=2jUdTQ}y^f2lowEwc4tm)}n@Eo-uR%geRhkA>5=EA4~I(ueKu zss8p$W+cuk^TWxi8KFZOVR&Kb(}%lv-DWm5NN9QGhAaq~G(61POCy8xqciIoC!}=W zelGrM2Xt2>`(%-IN`^^x?8ONmz5V7Ola>q4)6z1)GL%=d zj<-Ix68A3BaU9!=w7+3{nfu)KMQmZR$9&{b=)#kl+b)wRkE6#`F%D(_ZJcVkGHqP2#R}`&*LSUIVT68XPSpv} zvbtou`st&}>pS^hKqejkus)>i1(|fN!0}ITn6L5bV?(n|&$qmsyV|T4hG(q)Ez`W} z3(M&pou7_qZu=3LeR{$5HXWAPt&^2;T|1_K3^HjsYbjy%l`t%4>9~ev5O$)$!sJ$4 zOxEWeY2Cqd#T{hR9!|SBeDhr6oz9CI=ikVrd+|meGdqv9x@JA?V1A6rZBx2tFiENR z>czy`R=Lj{!q(5O`4rP9%`e8AIkr~f%&!R!i@#5Gnb=MLsCJDOjug%@R&8{H2 z)0$kJ<0r9iIjEz9{zVJS^6Lph>Wpq|mS=lcuXC4r z6VdO%z^~R-;;-AK_i!j&uKDyDvL)3pCb;;6{!1*CwR>#i(!QVxY;BDI^W5pd)|uAE ztuwkuCSZ6{ceqxOGK^8$UT}RNZM&G3ey^=%fjeqCu2t`59C~U!6ce*QdWjG$N1$TH@6`9d|KvIEB#&rJuO zB?YZDNlH7=ETqyYd~=gTG&m-2(z~W@#sjVO*|i(dv0ch)C~;R4*g?m=kv1BKZ5C%Z z+dHQO_UW&L4OGJ1m4t_BmWJ06SozcA6XK2Ztk=z@3zp1tu-i`QTUD4sf24GMs0mOchu~+u-v04<_2pikx-lVZW$!EWZ{LcJ0%N z9paGJWkq8TjjoTe{H&i>8}iLT$9(an18K$%*LxrnnmlY#McdSBd9OEhyrzvif~@!4 z-frqb71Ox|pKj%PSG|nv=07*m54J^mNINZj+e(rhxX4jkE{3f`>IFn z>3n{qm0@Jx+ZHBysl&fHR8H%Ob-Ag2ZmWQaXN(u`Jv6fGt!z3^FB+U<`6#@)#pDSA z``Xs+YmV-Ev}>I_KIf%8{(5F5wUyhbeZ0!SG99{Beqj-tJIK)YTvB6n*UdIy|I`OZ ztqRf>9qw`4p6<6kyxBI|XzWyZ&aCMzTPHtRj_y|0>$>IHxzGnS6XX!e4x`RABz zPOaQL+;(fDkWrC-Bafgv)w~`nReg0Fb0${EA7ar^3)zB0dlrny(KA_8S9jjY^H(+@ zyJU5##eVghj#1k(+Z5I;Jc;bgEBmK&C(A5igWm2g>~drXvcj?T7Ik*7YcYA<>=~`J zj#?p`-Kb-i!xJ*)DQEAD$uGK3^Y(7znL+c?6f^1(!OSD>AB-1B&>^^&G! zK;o3$vypiYUTI}_M9n(>jB&xm%lqlx`L5pp(_CvJpB@#sar4QX$>=V+jPA04&u6Vu z<1QaQ9)6VOcSZe{T6M=xGG1ky-O{ZJNH?=AG4;ixW51Vp<+j^ zm!>O{GgU?}jia`L!lWJPTb#yNZ*O1Tb;s0+blq8FcnvGZ4(T>&2Desqe

++F9MK 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�OhS#)w7 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ⅅ^)#jDWlW@Zqu6Tnt?GTGVs8}&bb-U>#3;BL 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 jdyyvyYIo&q~$9~Wf6w^YIGg)81wZOFrugI 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

jk9Wh5%q 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

-9rQ+6OhPdEDe8^c{{H-BX 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 z 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 mTH)LwSxJR+r(~rKDx7^f+^ Date: Wed, 26 Oct 2011 01:19:10 +0100 Subject: [PATCH 100/381] Added proper Bounding Box support. Should fix most graphical issues with Paper Mario: TTYD and Super Paper Mario. Fixes issue 360. Since only those two games seem to require BBox support, and as per ector's suggestion, BBox is only enabled for those two games. BBoxes and Display List Caches don't get along too well, causing Paper Mario: TTYD to hang during certain effects where BBoxes are used. For now, I disabled DList Cache for the Paper Mario games, hopefully both will be compatible in the future. --- Data/User/GameConfig/G8ME01.ini | 4 +- Data/User/GameConfig/G8MP01.ini | 4 ++ Data/User/GameConfig/NAEE01.ini | 4 ++ Data/User/GameConfig/R8PE01.ini | 3 + Data/User/GameConfig/R8PP01.ini | 3 + Source/Core/DolphinWX/Src/ISOProperties.cpp | 17 ++++- Source/Core/DolphinWX/Src/ISOProperties.h | 2 +- Source/Core/VideoCommon/Src/BPStructs.cpp | 42 ++++++------ Source/Core/VideoCommon/Src/VertexLoader.cpp | 67 +++++++++++--------- Source/Core/VideoCommon/Src/VideoCommon.h | 6 -- Source/Core/VideoCommon/Src/VideoConfig.cpp | 1 + Source/Core/VideoCommon/Src/VideoConfig.h | 1 + 12 files changed, 93 insertions(+), 61 deletions(-) diff --git a/Data/User/GameConfig/G8ME01.ini b/Data/User/GameConfig/G8ME01.ini index d49e5395d0..0033486b59 100644 --- a/Data/User/GameConfig/G8ME01.ini +++ b/Data/User/GameConfig/G8ME01.ini @@ -41,5 +41,7 @@ $Max Gold $Max Shop Points 026EE7F0 000003E7 [Video] +UseBBox = True ProjectionHack = 0 - +[Video_Hacks] +DlistCachingEnable = False diff --git a/Data/User/GameConfig/G8MP01.ini b/Data/User/GameConfig/G8MP01.ini index db66750a7f..5e1ff20ee6 100644 --- a/Data/User/GameConfig/G8MP01.ini +++ b/Data/User/GameConfig/G8MP01.ini @@ -4,3 +4,7 @@ EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +UseBBox = True +[Video_Hacks] +DlistCachingEnable = False diff --git a/Data/User/GameConfig/NAEE01.ini b/Data/User/GameConfig/NAEE01.ini index 8ff0d929d0..b385f23889 100644 --- a/Data/User/GameConfig/NAEE01.ini +++ b/Data/User/GameConfig/NAEE01.ini @@ -5,3 +5,7 @@ EmulationIssues = Sound requires LLE. No graphical issues. EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +UseBBox = True +[Video_Hacks] +DlistCachingEnable = False diff --git a/Data/User/GameConfig/R8PE01.ini b/Data/User/GameConfig/R8PE01.ini index 4ae6b89983..ce4ee47320 100644 --- a/Data/User/GameConfig/R8PE01.ini +++ b/Data/User/GameConfig/R8PE01.ini @@ -7,5 +7,8 @@ EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] +UseBBox = True ProjectionHack = 0 +[Video_Hacks] +DlistCachingEnable = False [Gecko] diff --git a/Data/User/GameConfig/R8PP01.ini b/Data/User/GameConfig/R8PP01.ini index a348557b9c..ccfb4ec45d 100644 --- a/Data/User/GameConfig/R8PP01.ini +++ b/Data/User/GameConfig/R8PP01.ini @@ -6,4 +6,7 @@ EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] +UseBBox = True ProjectionHack = 0 +[Video_Hacks] +DlistCachingEnable = False diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index 4618e739ae..aa554e4b48 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -325,6 +325,9 @@ void CISOProperties::CreateGUIControls(bool IsWad) DisableWiimoteSpeaker->SetToolTip(_("Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes.")); // Video + UseBBox = new wxCheckBox(m_GameConfig, ID_ZTP_SPEEDUP, _("Enable Bounding Box Calculation"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER); + UseBBox->SetToolTip(_("If checked, the bounding box registers will be updated. Used by the Paper Mario games.")); + UseZTPSpeedupHack = new wxCheckBox(m_GameConfig, ID_ZTP_SPEEDUP, _("ZTP hack"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER); UseZTPSpeedupHack->SetToolTip(_("Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game.")); @@ -383,6 +386,7 @@ void CISOProperties::CreateGUIControls(bool IsWad) wxStaticBoxSizer * const sbVideoOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Video")); + sbVideoOverrides->Add(UseBBox, 0, wxLEFT, 5); sbVideoOverrides->Add(UseZTPSpeedupHack, 0, wxLEFT, 5); szrPHackSettings->Add(PHackEnable, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5); szrPHackSettings->Add(PHSettings, 0, wxLEFT, 5); @@ -898,7 +902,13 @@ void CISOProperties::LoadGameConfig() DisableWiimoteSpeaker->Set3StateValue((wxCheckBoxState)bTemp); else DisableWiimoteSpeaker->Set3StateValue(wxCHK_UNDETERMINED); - + + if (GameIni.Get("Video", "UseBBox", &bTemp)) + UseBBox->Set3StateValue((wxCheckBoxState)bTemp); + else + UseBBox->Set3StateValue(wxCHK_UNDETERMINED); + + if (GameIni.Get("Video", "ZTPSpeedupHack", &bTemp)) UseZTPSpeedupHack->Set3StateValue((wxCheckBoxState)bTemp); else @@ -992,6 +1002,11 @@ bool CISOProperties::SaveGameConfig() else GameIni.Set("Wii", "DisableWiimoteSpeaker", DisableWiimoteSpeaker->Get3StateValue()); + if (UseBBox->Get3StateValue() == wxCHK_UNDETERMINED) + GameIni.DeleteKey("Video", "UseBBox"); + else + GameIni.Set("Video", "UseBBox", UseBBox->Get3StateValue()); + if (UseZTPSpeedupHack->Get3StateValue() == wxCHK_UNDETERMINED) GameIni.DeleteKey("Video", "ZTPSpeedupHack"); else diff --git a/Source/Core/DolphinWX/Src/ISOProperties.h b/Source/Core/DolphinWX/Src/ISOProperties.h index 0add6e9451..7161585a36 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.h +++ b/Source/Core/DolphinWX/Src/ISOProperties.h @@ -74,7 +74,7 @@ private: // Wii wxCheckBox *EnableProgressiveScan, *EnableWideScreen, *DisableWiimoteSpeaker; // Video - wxCheckBox *UseZTPSpeedupHack, *PHackEnable; + wxCheckBox *UseZTPSpeedupHack, *PHackEnable, *UseBBox; wxButton *PHSettings; wxArrayString arrayStringFor_EmuState; diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp index cee68327f5..d5909fdd95 100644 --- a/Source/Core/VideoCommon/Src/BPStructs.cpp +++ b/Source/Core/VideoCommon/Src/BPStructs.cpp @@ -257,9 +257,8 @@ void BPWritten(const BPCmd& bp) // We should be able to get away with deactivating the current bbox tracking // here. Not sure if there's a better spot to put this. // the number of lines copied is determined by the y scale * source efb height -#ifdef BBOX_SUPPORT + PixelEngine::bbox_active = false; -#endif float yScale; if (PE_copy.scale_invert) @@ -400,28 +399,29 @@ void BPWritten(const BPCmd& bp) case BPMEM_CLEARBBOX1: case BPMEM_CLEARBBOX2: { -#ifdef BBOX_SUPPORT - // which is which? these are GUESSES! - if (bp.address == BPMEM_CLEARBBOX1) { - int right = bp.newvalue >> 10; - int left = bp.newvalue & 0x3ff; + if(g_ActiveConfig.bUseBBox) + { + // which is which? these are GUESSES! + if (bp.address == BPMEM_CLEARBBOX1) { + int right = bp.newvalue >> 10; + int left = bp.newvalue & 0x3ff; - // We should only set these if bbox is calculated properly. - PixelEngine::bbox[0] = left; - PixelEngine::bbox[1] = right; - PixelEngine::bbox_active = true; - // WARN_LOG(VIDEO, "ClearBBox LR: %i, %08x - %i, %i", bp.address, bp.newvalue, left, right); - } else { - int bottom = bp.newvalue >> 10; - int top = bp.newvalue & 0x3ff; + // We should only set these if bbox is calculated properly. + PixelEngine::bbox[0] = left; + PixelEngine::bbox[1] = right; + PixelEngine::bbox_active = true; + // WARN_LOG(VIDEO, "ClearBBox LR: %i, %08x - %i, %i", bp.address, bp.newvalue, left, right); + } else { + int bottom = bp.newvalue >> 10; + int top = bp.newvalue & 0x3ff; - // We should only set these if bbox is calculated properly. - PixelEngine::bbox[2] = top; - PixelEngine::bbox[3] = bottom; - PixelEngine::bbox_active = true; - // WARN_LOG(VIDEO, "ClearBBox TB: %i, %08x - %i, %i", bp.address, bp.newvalue, top, bottom); + // We should only set these if bbox is calculated properly. + PixelEngine::bbox[2] = top; + PixelEngine::bbox[3] = bottom; + PixelEngine::bbox_active = true; + // WARN_LOG(VIDEO, "ClearBBox TB: %i, %08x - %i, %i", bp.address, bp.newvalue, top, bottom); + } } -#endif } break; case BPMEM_TEXINVALIDATE: // Used, if game has manual control the Texture Cache, which we don't allow diff --git a/Source/Core/VideoCommon/Src/VertexLoader.cpp b/Source/Core/VideoCommon/Src/VertexLoader.cpp index ce9e81219d..ee0538751a 100644 --- a/Source/Core/VideoCommon/Src/VertexLoader.cpp +++ b/Source/Core/VideoCommon/Src/VertexLoader.cpp @@ -101,7 +101,7 @@ void LOADERDECL PosMtx_Write() void LOADERDECL UpdateBoundingBox() { - if (!PixelEngine::bbox_active) + if (!PixelEngine::bbox_active) return; // Truly evil hack, reading backwards from the write pointer. If we were writing to write-only @@ -119,40 +119,46 @@ void LOADERDECL UpdateBoundingBox() t[1] = p[0] * world_matrix[4] + p[1] * world_matrix[5] + p[2] * world_matrix[6] + world_matrix[7]; t[2] = p[0] * world_matrix[8] + p[1] * world_matrix[9] + p[2] * world_matrix[10] + world_matrix[11]; - float o[4]; - o[2] = t[0] * proj_matrix[8] + t[1] * proj_matrix[9] + t[2] * proj_matrix[10] + proj_matrix[11]; - // Depth culling - if (o[2] < 0.0) { - // No pixels are likely to be drawn - don't update bounding box. - return; - } + float o[3]; o[0] = t[0] * proj_matrix[0] + t[1] * proj_matrix[1] + t[2] * proj_matrix[2] + proj_matrix[3]; o[1] = t[0] * proj_matrix[4] + t[1] * proj_matrix[5] + t[2] * proj_matrix[6] + proj_matrix[7]; - o[3] = t[0] * proj_matrix[12] + t[1] * proj_matrix[13] + t[2] * proj_matrix[14] + proj_matrix[15]; - - o[0] /= o[3]; - o[1] /= o[3]; + o[2] = t[0] * proj_matrix[12] + t[1] * proj_matrix[13] + t[2] * proj_matrix[14] + proj_matrix[15]; + + + o[0] /= o[2]; + o[1] /= o[2]; // should possibly adjust for viewport? - o[0] = (o[0] + 1.0f) * 320.0f; - o[1] = (o[1] + 1.0f) * 240.0f; + o[0] = (o[0] + 1.0f) * 304.0f; + o[1] = (1.0f - o[1]) * 240.0f; - if (o[0] < PixelEngine::bbox[0]) PixelEngine::bbox[0] = (u16)std::max(0.0f, o[0]); - if (o[0] > PixelEngine::bbox[1]) PixelEngine::bbox[1] = (u16)std::min(640.0f, o[0]); - if (o[1] < PixelEngine::bbox[2]) PixelEngine::bbox[2] = (u16)std::max(0.0f, o[1]); - if (o[1] > PixelEngine::bbox[3]) PixelEngine::bbox[3] = (u16)std::min(480.0f, o[1]); + if (o[0] < PixelEngine::bbox[0]) + { + PixelEngine::bbox[0] = (u16) std::max(0.0f, o[0]); - // Hardware tests bounding boxes in 2x2 blocks => left and top are even, right and bottom are odd - PixelEngine::bbox[0] &= ~1; - PixelEngine::bbox[1] |= 1; - PixelEngine::bbox[2] &= ~1; - PixelEngine::bbox[3] |= 1; + // Hardware tests bounding boxes in 2x2 blocks => left and top are even, right and bottom are odd + PixelEngine::bbox[0] &= ~1; + } - /* - if (GetAsyncKeyState(VK_LSHIFT)) { - ERROR_LOG(VIDEO, "XForm: %f %f %f to %f %f", p[0], p[1], p[2], o[0], o[1]); - ERROR_LOG(VIDEO, "%i %i %i %i", g_VideoInitialize.pBBox[0], g_VideoInitialize.pBBox[1], g_VideoInitialize.pBBox[2], g_VideoInitialize.pBBox[3]); - }*/ + if (o[0] > PixelEngine::bbox[1]) + { + PixelEngine::bbox[1] = (u16) std::min(608.0f, o[0]); + if(!(PixelEngine::bbox[1] & 1) && PixelEngine::bbox[1] != 0) + PixelEngine::bbox[1]--; + } + + if (o[1] < PixelEngine::bbox[2]) + { + PixelEngine::bbox[2] = (u16) std::max(0.0f, o[1]); + PixelEngine::bbox[2] &= ~1; + } + + if (o[1] > PixelEngine::bbox[3]) + { + PixelEngine::bbox[3] = (u16) std::min(480.0f, o[1]); + if(!(PixelEngine::bbox[3] & 1) && PixelEngine::bbox[3] != 0) + PixelEngine::bbox[3]--; + } } void LOADERDECL TexMtx_ReadDirect_UByte() @@ -290,9 +296,8 @@ void VertexLoader::CompileVertexTranslator() // OK, so we just got a point. Let's go back and read it for the bounding box. -#ifdef BBOX_SUPPORT - WriteCall(UpdateBoundingBox); -#endif + if(g_ActiveConfig.bUseBBox) + WriteCall(UpdateBoundingBox); // Normals vtx_decl.num_normals = 0; diff --git a/Source/Core/VideoCommon/Src/VideoCommon.h b/Source/Core/VideoCommon/Src/VideoCommon.h index 80c0937884..9f6dd59cd3 100644 --- a/Source/Core/VideoCommon/Src/VideoCommon.h +++ b/Source/Core/VideoCommon/Src/VideoCommon.h @@ -56,12 +56,6 @@ enum MAX_XFB_HEIGHT = 574 }; -// If this is enabled, bounding boxes will be computed for everything drawn. -// This can theoretically have a big speed hit in some geom heavy games. Needs more work. -// Helps some effects in Paper Mario (but they aren't quite right yet). -// Do testing to figure out if the speed hit is bad? -// #define BBOX_SUPPORT - // Logging // ---------- void HandleGLError(); diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp index 2c7788c9cc..b6ba76f45e 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.cpp +++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp @@ -172,6 +172,7 @@ void VideoConfig::GameIniLoad(const char *ini_file) iniFile.GetIfExists("Video", "PH_ZNear", &sPhackvalue[0]); iniFile.GetIfExists("Video", "PH_ZFar", &sPhackvalue[1]); iniFile.GetIfExists("Video", "ZTPSpeedupHack", &bZTPSpeedHack); + iniFile.GetIfExists("Video", "UseBBox", &bUseBBox); } void VideoConfig::VerifyValidity() diff --git a/Source/Core/VideoCommon/Src/VideoConfig.h b/Source/Core/VideoCommon/Src/VideoConfig.h index 83ec08784d..3bd833cc73 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.h +++ b/Source/Core/VideoCommon/Src/VideoConfig.h @@ -135,6 +135,7 @@ struct VideoConfig std::string sPhackvalue[2]; float fAspectRatioHackW, fAspectRatioHackH; bool bZTPSpeedHack; // The Legend of Zelda: Twilight Princess + bool bUseBBox; bool bEnablePixelLighting; bool bEnablePerPixelDepth; From 9a627e89fb2e5a8f00ad158fde595926298cc573 Mon Sep 17 00:00:00 2001 From: Brad Gearon Date: Wed, 26 Oct 2011 14:28:57 -0500 Subject: [PATCH 101/381] Add unimplemented device map for sdio/slot1 and slot2. Fixes #4932. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 2 ++ 1 file changed, 2 insertions(+) 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 2fa2587e60..2f79e2bc91 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -93,6 +93,8 @@ void Init() g_DeviceMap[i] = new CWII_IPC_HLE_Device_net_ip_top(i, std::string("/dev/net/ip/top")); i++; g_DeviceMap[i] = new CWII_IPC_HLE_Device_usb_kbd(i, std::string("/dev/usb/kbd")); i++; g_DeviceMap[i] = new CWII_IPC_HLE_Device_sdio_slot0(i, std::string("/dev/sdio/slot0")); i++; + g_DeviceMap[i] = new CWII_IPC_HLE_Device_sdio_slot0(i, std::string("/dev/sdio/slot1")); i++; + g_DeviceMap[i] = new CWII_IPC_HLE_Device_sdio_slot0(i, std::string("/dev/sdio/slot2")); i++; g_DeviceMap[i] = new CWII_IPC_HLE_Device_stub(i, std::string("/dev/usb/hid")); i++; g_DeviceMap[i] = new IWII_IPC_HLE_Device(i, std::string("_Unimplemented_Device_")); From e03fd9a942e9851ca29b590b99c7f311b043c021 Mon Sep 17 00:00:00 2001 From: skidau Date: Thu, 27 Oct 2011 21:08:35 +1100 Subject: [PATCH 102/381] Added code to invalidate the JIT cache on dcbi and writes to memory. --- Source/Core/Core/Src/HW/MemmapFunctions.cpp | 3 + .../Interpreter/Interpreter_LoadStore.cpp | 3 + Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 5 +- .../Core/Src/PowerPC/JitCommon/JitCache.cpp | 58 ++++--------------- .../Core/Src/PowerPC/JitCommon/JitCache.h | 2 +- Source/Core/Core/Src/PowerPC/PPCCache.cpp | 10 +++- Source/Core/Core/Src/PowerPC/PPCCache.h | 1 + 7 files changed, 31 insertions(+), 51 deletions(-) diff --git a/Source/Core/Core/Src/HW/MemmapFunctions.cpp b/Source/Core/Core/Src/HW/MemmapFunctions.cpp index b391eea975..993a3aabf1 100644 --- a/Source/Core/Core/Src/HW/MemmapFunctions.cpp +++ b/Source/Core/Core/Src/HW/MemmapFunctions.cpp @@ -265,6 +265,7 @@ inline void WriteToHardware(u32 em_address, const T data, u32 effective_address, ((em_address & 0xF0000000) == 0xC0000000) || ((em_address & 0xF0000000) == 0x00000000)) { + PowerPC::ppcState.iCache.InvalidateBlock(em_address); *(T*)&m_pRAM[em_address & RAM_MASK] = bswap(data); return; } @@ -272,6 +273,8 @@ inline void WriteToHardware(u32 em_address, const T data, u32 effective_address, ((em_address & 0xF0000000) == 0xD0000000) || ((em_address & 0xF0000000) == 0x10000000)) { + // Should we invalidate jit blocks in exram? + //PowerPC::ppcState.iCache.InvalidateBlock(em_address); *(T*)&m_pEXRAM[em_address & EXRAM_MASK] = bswap(data); return; } diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp index 5d7cd28b20..81346b3ae6 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp @@ -369,6 +369,9 @@ 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. // Seen used during initialization. + u32 address = Helper_Get_EA_X(_inst); + if (jit) + jit->GetBlockCache()->InvalidateICache(address & ~0x1f); } void Interpreter::dcbst(UGeckoInstruction _inst) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index 3d5efd80ae..f9fd3c4635 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -393,6 +393,7 @@ void STACKALIGN Jit64::Jit(u32 em_address) { ClearCache(); } + int block_num = blocks.AllocateBlock(em_address); JitBlock *b = blocks.GetBlock(block_num); blocks.FinalizeBlock(block_num, jo.enableBlocklink, DoJit(em_address, &code_buffer, b)); @@ -612,14 +613,14 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc #ifdef _M_IX86 if (js.compilerPC & JIT_ICACHE_VMEM_BIT) MOV(32, M((jit->GetBlockCache()->GetICacheVMEM() + (js.compilerPC & JIT_ICACHE_MASK))), Imm32(JIT_ICACHE_INVALID_WORD)); - else if (js.blockStart & JIT_ICACHE_EXRAM_BIT) + else if (js.compilerPC & JIT_ICACHE_EXRAM_BIT) MOV(32, M((jit->GetBlockCache()->GetICacheEx() + (js.compilerPC & JIT_ICACHEEX_MASK))), Imm32(JIT_ICACHE_INVALID_WORD)); else MOV(32, M((jit->GetBlockCache()->GetICache() + (js.compilerPC & JIT_ICACHE_MASK))), Imm32(JIT_ICACHE_INVALID_WORD)); #else if (js.compilerPC & JIT_ICACHE_VMEM_BIT) MOV(64, R(RAX), ImmPtr(jit->GetBlockCache()->GetICacheVMEM() + (js.compilerPC & JIT_ICACHE_MASK))); - else if (js.blockStart & JIT_ICACHE_EXRAM_BIT) + else if (js.compilerPC & JIT_ICACHE_EXRAM_BIT) MOV(64, R(RAX), ImmPtr(jit->GetBlockCache()->GetICacheEx() + (js.compilerPC & JIT_ICACHEEX_MASK))); else MOV(64, R(RAX), ImmPtr(jit->GetBlockCache()->GetICache() + (js.compilerPC & JIT_ICACHE_MASK))); diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp index 1ed997ce4c..deffa9586d 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp @@ -126,16 +126,16 @@ 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() - { + { Core::DisplayMessage("Clearing code cache.", 3000); for (int i = 0; i < num_blocks; i++) { DestroyBlock(i, false); } links_to.clear(); - block_map.clear(); num_blocks = 0; memset(blockCodePointers, 0, sizeof(u8*)*MAX_NUM_BLOCKS); + ClearSafe(); } void JitBlockCache::ClearSafe() @@ -207,8 +207,9 @@ bool JitBlock::ContainsAddress(u32 em_address) blockCodePointers[block_num] = code_ptr; JitBlock &b = blocks[block_num]; b.originalFirstOpcode = Memory::Read_Opcode_JIT(b.originalAddress); + if ((b.originalAddress + b.originalSize) > code_high) + code_high = b.originalAddress + b.originalSize; Memory::Write_Opcode_JIT(b.originalAddress, (JIT_OPCODE << 26) | block_num); - block_map[std::make_pair(b.originalAddress + 4 * b.originalSize - 1, b.originalAddress)] = block_num; if (block_link) { for (int i = 0; i < 2; i++) @@ -355,79 +356,44 @@ bool JitBlock::ContainsAddress(u32 em_address) void JitBlockCache::DestroyBlock(int block_num, bool invalidate) { - if (block_num < 0 || block_num >= num_blocks) - { - PanicAlert("DestroyBlock: Invalid block number %d", block_num); - return; - } JitBlock &b = blocks[block_num]; if (b.invalid) { - if (invalidate) - PanicAlert("Invalidating invalid block %d", block_num); return; } b.invalid = true; #ifdef JIT_UNLIMITED_ICACHE - Memory::Write_Opcode_JIT(b.originalAddress, b.originalFirstOpcode?b.originalFirstOpcode:JIT_ICACHE_INVALID_WORD); + Memory::Write_Opcode_JIT(b.originalAddress, JIT_ICACHE_INVALID_WORD); #else if (Memory::ReadFast32(b.originalAddress) == block_num) Memory::WriteUnchecked_U32(b.originalFirstOpcode, b.originalAddress); #endif - - // We don't unlink blocks, we just send anyone who tries to run them 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); - */ } void JitBlockCache::InvalidateICache(u32 address) - { + { address &= ~0x1f; - // 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(address, 0)), it2 = it1, it; - while (it2 != block_map.end() && it2->first.second < address + 0x20) - { - DestroyBlock(it2->second, true); - it2++; - } - if (it1 != it2) - { - block_map.erase(it1, it2); - } - #ifdef JIT_UNLIMITED_ICACHE - // invalidate iCache. - // icbi can be called with any address, so we should check - 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) - { - return; - } if (address & JIT_ICACHE_VMEM_BIT) { u32 cacheaddr = address & JIT_ICACHE_MASK; + if (cacheaddr > (code_high & JIT_ICACHE_MASK)) + return; memset(iCacheVMEM + cacheaddr, JIT_ICACHE_INVALID_BYTE, 32); } else if (address & JIT_ICACHE_EXRAM_BIT) { u32 cacheaddr = address & JIT_ICACHEEX_MASK; + if (cacheaddr > (code_high & JIT_ICACHEEX_MASK)) + return; memset(iCacheEx + cacheaddr, JIT_ICACHE_INVALID_BYTE, 32); } else { u32 cacheaddr = address & JIT_ICACHE_MASK; + if (cacheaddr > (code_high & JIT_ICACHE_MASK)) + return; memset(iCache + cacheaddr, JIT_ICACHE_INVALID_BYTE, 32); } #endif diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h index 91d47a3d0e..e6862a747b 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h @@ -76,7 +76,6 @@ class JitBlockCache JitBlock *blocks; int num_blocks; std::multimap links_to; - std::map, u32> block_map; // (end_addr, start_addr) -> number #ifdef JIT_UNLIMITED_ICACHE u8 *iCache; u8 *iCacheEx; @@ -105,6 +104,7 @@ public: void Reset(); bool IsFull() const; + u32 code_high; // Code Cache JitBlock *GetBlock(int block_num); diff --git a/Source/Core/Core/Src/PowerPC/PPCCache.cpp b/Source/Core/Core/Src/PowerPC/PPCCache.cpp index 33ecc0ee88..7e45c9e1ab 100644 --- a/Source/Core/Core/Src/PowerPC/PPCCache.cpp +++ b/Source/Core/Core/Src/PowerPC/PPCCache.cpp @@ -82,8 +82,6 @@ namespace PowerPC void InstructionCache::Invalidate(u32 addr) { - if (jit) - jit->GetBlockCache()->InvalidateICache(addr); if (!HID0.ICE) return; // invalidates the whole set @@ -101,6 +99,14 @@ namespace PowerPC } #endif valid[set] = 0; + if (jit) + jit->GetBlockCache()->InvalidateICache(addr); + } + + void InstructionCache::InvalidateBlock(u32 addr) + { + if (jit) + jit->GetBlockCache()->InvalidateICache(addr); } u32 InstructionCache::ReadInstruction(u32 addr) diff --git a/Source/Core/Core/Src/PowerPC/PPCCache.h b/Source/Core/Core/Src/PowerPC/PPCCache.h index c2e428946c..76e1f47345 100644 --- a/Source/Core/Core/Src/PowerPC/PPCCache.h +++ b/Source/Core/Core/Src/PowerPC/PPCCache.h @@ -53,6 +53,7 @@ namespace PowerPC void Reset(); u32 ReadInstruction(u32 addr); void Invalidate(u32 addr); + void InvalidateBlock(u32 addr); }; } From ffd9b6875a50b2568025420cf42c81adee957fd0 Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Thu, 27 Oct 2011 21:04:28 +0300 Subject: [PATCH 103/381] Gameini database update for Teenage Mutant Ninja Turtles(gc), Just Dance 3, Spider-Man: Edge of Time, Paper Mario, Super Paper Mario. --- Data/User/GameConfig/G8ME01.ini | 12 ++++++++++-- Data/User/GameConfig/G8MJ01.ini | 13 +++++++++++++ Data/User/GameConfig/G8MP01.ini | 3 +++ Data/User/GameConfig/GTFEA4.ini | 16 ++++++++++++++++ Data/User/GameConfig/NAEE01.ini | 4 +++- Data/User/GameConfig/R8PE01.ini | 6 ++++-- Data/User/GameConfig/R8PJ01.ini | 14 ++++++++++++++ Data/User/GameConfig/R8PK01.ini | 14 ++++++++++++++ Data/User/GameConfig/R8PP01.ini | 4 +++- Data/User/GameConfig/SJDE41.ini | 17 +++++++++++++++++ Data/User/GameConfig/SJDP41.ini | 17 +++++++++++++++++ Data/User/GameConfig/SJDY41.ini | 17 +++++++++++++++++ Data/User/GameConfig/SJDZ41.ini | 17 +++++++++++++++++ Data/User/GameConfig/SQME52.ini | 15 +++++++++++++++ Data/User/GameConfig/SQMP52.ini | 15 +++++++++++++++ 15 files changed, 178 insertions(+), 6 deletions(-) create mode 100644 Data/User/GameConfig/G8MJ01.ini create mode 100644 Data/User/GameConfig/GTFEA4.ini create mode 100644 Data/User/GameConfig/R8PJ01.ini create mode 100644 Data/User/GameConfig/R8PK01.ini create mode 100644 Data/User/GameConfig/SJDE41.ini create mode 100644 Data/User/GameConfig/SJDP41.ini create mode 100644 Data/User/GameConfig/SJDY41.ini create mode 100644 Data/User/GameConfig/SJDZ41.ini create mode 100644 Data/User/GameConfig/SQME52.ini create mode 100644 Data/User/GameConfig/SQMP52.ini diff --git a/Data/User/GameConfig/G8ME01.ini b/Data/User/GameConfig/G8ME01.ini index 0033486b59..3c84c3fcc4 100644 --- a/Data/User/GameConfig/G8ME01.ini +++ b/Data/User/GameConfig/G8ME01.ini @@ -6,7 +6,7 @@ [EmuState] #The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = +EmulationIssues = Needs Efb to Ram for BBox (proper graphics). [OnFrame] [ActionReplay] $(M) Must Be ON @@ -41,7 +41,15 @@ $Max Gold $Max Shop Points 026EE7F0 000003E7 [Video] -UseBBox = True +UseBBox = 1 ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = [Video_Hacks] DlistCachingEnable = False +EFBToTextureEnable = False +EFBCopyEnable = True +[Gecko] diff --git a/Data/User/GameConfig/G8MJ01.ini b/Data/User/GameConfig/G8MJ01.ini new file mode 100644 index 0000000000..33e6dff27c --- /dev/null +++ b/Data/User/GameConfig/G8MJ01.ini @@ -0,0 +1,13 @@ +# G8MJ01 - Paper Mario +[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 BBox (proper graphics). +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +UseBBox = True +[Video_Hacks] +DlistCachingEnable = False +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/G8MP01.ini b/Data/User/GameConfig/G8MP01.ini index 5e1ff20ee6..02ac609e04 100644 --- a/Data/User/GameConfig/G8MP01.ini +++ b/Data/User/GameConfig/G8MP01.ini @@ -2,9 +2,12 @@ [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 BBox (proper graphics). [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] UseBBox = True [Video_Hacks] DlistCachingEnable = False +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/GTFEA4.ini b/Data/User/GameConfig/GTFEA4.ini new file mode 100644 index 0000000000..898a9e1d07 --- /dev/null +++ b/Data/User/GameConfig/GTFEA4.ini @@ -0,0 +1,16 @@ +# GTFEA4 - Teenage Mutant Ninja Turtles +[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/NAEE01.ini b/Data/User/GameConfig/NAEE01.ini index b385f23889..3b08c9fb57 100644 --- a/Data/User/GameConfig/NAEE01.ini +++ b/Data/User/GameConfig/NAEE01.ini @@ -1,7 +1,7 @@ # NAEE01 - Paper Mario [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 = Sound requires LLE. No graphical issues. +EmulationIssues = Sound requires LLE. Needs Efb to Ram for BBox (proper graphics). EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. @@ -9,3 +9,5 @@ EmulationStateId = 4 UseBBox = True [Video_Hacks] DlistCachingEnable = False +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/R8PE01.ini b/Data/User/GameConfig/R8PE01.ini index ce4ee47320..80feeb9d2b 100644 --- a/Data/User/GameConfig/R8PE01.ini +++ b/Data/User/GameConfig/R8PE01.ini @@ -1,9 +1,9 @@ -# R8PP01 - SUPER PAPER MARIO +# R8PE01 - SUPER PAPER MARIO [Core] Values set here will override the main dolphin settings. AccurateFCMP = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = +EmulationIssues = Needs Efb to Ram for BBox (proper graphics). [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -11,4 +11,6 @@ UseBBox = True ProjectionHack = 0 [Video_Hacks] DlistCachingEnable = False +EFBToTextureEnable = False +EFBCopyEnable = True [Gecko] diff --git a/Data/User/GameConfig/R8PJ01.ini b/Data/User/GameConfig/R8PJ01.ini new file mode 100644 index 0000000000..86c7f14bec --- /dev/null +++ b/Data/User/GameConfig/R8PJ01.ini @@ -0,0 +1,14 @@ +# R8PJ01 - SUPER PAPER MARIO +[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 BBox (proper graphics). +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +UseBBox = True +ProjectionHack = 0 +[Video_Hacks] +DlistCachingEnable = False +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/R8PK01.ini b/Data/User/GameConfig/R8PK01.ini new file mode 100644 index 0000000000..7e496dea9f --- /dev/null +++ b/Data/User/GameConfig/R8PK01.ini @@ -0,0 +1,14 @@ +# R8PK01 - SUPER PAPER MARIO +[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 BBox (proper graphics). +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +UseBBox = True +ProjectionHack = 0 +[Video_Hacks] +DlistCachingEnable = False +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/R8PP01.ini b/Data/User/GameConfig/R8PP01.ini index ccfb4ec45d..58ec58e6b5 100644 --- a/Data/User/GameConfig/R8PP01.ini +++ b/Data/User/GameConfig/R8PP01.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 = Needs Efb to Ram for BBox (proper graphics). [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -10,3 +10,5 @@ UseBBox = True ProjectionHack = 0 [Video_Hacks] DlistCachingEnable = False +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/SJDE41.ini b/Data/User/GameConfig/SJDE41.ini new file mode 100644 index 0000000000..1e16ddd21f --- /dev/null +++ b/Data/User/GameConfig/SJDE41.ini @@ -0,0 +1,17 @@ +# SJDE41 - Just Dance 3 +[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 = 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 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/SJDP41.ini b/Data/User/GameConfig/SJDP41.ini new file mode 100644 index 0000000000..53f65d5704 --- /dev/null +++ b/Data/User/GameConfig/SJDP41.ini @@ -0,0 +1,17 @@ +# SJDP41 - Just Dance 3 +[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 = 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 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/SJDY41.ini b/Data/User/GameConfig/SJDY41.ini new file mode 100644 index 0000000000..107abedfd2 --- /dev/null +++ b/Data/User/GameConfig/SJDY41.ini @@ -0,0 +1,17 @@ +# SJDY41 - Just Dance 3 +[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 = 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 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/SJDZ41.ini b/Data/User/GameConfig/SJDZ41.ini new file mode 100644 index 0000000000..53f65d5704 --- /dev/null +++ b/Data/User/GameConfig/SJDZ41.ini @@ -0,0 +1,17 @@ +# SJDP41 - Just Dance 3 +[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 = 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 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/SQME52.ini b/Data/User/GameConfig/SQME52.ini new file mode 100644 index 0000000000..e510a3e524 --- /dev/null +++ b/Data/User/GameConfig/SQME52.ini @@ -0,0 +1,15 @@ +# SQME52 - Spider-Man: Edge of Time +[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. +[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/SQMP52.ini b/Data/User/GameConfig/SQMP52.ini new file mode 100644 index 0000000000..0819a4f354 --- /dev/null +++ b/Data/User/GameConfig/SQMP52.ini @@ -0,0 +1,15 @@ +# SQMP52 - Spider-Man: Edge of Time +[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. +[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] From dd551814c9c160c1dd33ed0f29e722e73fb43eca Mon Sep 17 00:00:00 2001 From: crudelios Date: Fri, 28 Oct 2011 21:12:12 +0100 Subject: [PATCH 104/381] Bounding Box bugfixes. - Fixes all (I hope) BBox-related unknown pointer crashes. - Fixes wrong BBox values with Frame Skip on (and the resulting unknown pointer crashes). - Fixes a small oversight on the change I made to the ISO Properties dialog. This should also be a (very very little) bit faster than the previous version. --- Source/Core/DolphinWX/Src/ISOProperties.cpp | 2 +- Source/Core/DolphinWX/Src/ISOProperties.h | 1 + Source/Core/VideoCommon/Src/BPStructs.cpp | 10 +++-- Source/Core/VideoCommon/Src/PixelEngine.cpp | 45 +++++++++++++++++--- Source/Core/VideoCommon/Src/VertexLoader.cpp | 39 ++++------------- 5 files changed, 55 insertions(+), 42 deletions(-) diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index aa554e4b48..731cfac932 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -325,7 +325,7 @@ void CISOProperties::CreateGUIControls(bool IsWad) DisableWiimoteSpeaker->SetToolTip(_("Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes.")); // Video - UseBBox = new wxCheckBox(m_GameConfig, ID_ZTP_SPEEDUP, _("Enable Bounding Box Calculation"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER); + UseBBox = new wxCheckBox(m_GameConfig, ID_USE_BBOX, _("Enable Bounding Box Calculation"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER); UseBBox->SetToolTip(_("If checked, the bounding box registers will be updated. Used by the Paper Mario games.")); UseZTPSpeedupHack = new wxCheckBox(m_GameConfig, ID_ZTP_SPEEDUP, _("ZTP hack"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER); diff --git a/Source/Core/DolphinWX/Src/ISOProperties.h b/Source/Core/DolphinWX/Src/ISOProperties.h index 7161585a36..6e72993b42 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.h +++ b/Source/Core/DolphinWX/Src/ISOProperties.h @@ -133,6 +133,7 @@ private: ID_DISCSPEED, ID_MERGEBLOCKS, ID_AUDIO_DSP_HLE, + ID_USE_BBOX, ID_ZTP_SPEEDUP, ID_PHACKENABLE, ID_PHSETTINGS, diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp index d5909fdd95..d06f1de8b9 100644 --- a/Source/Core/VideoCommon/Src/BPStructs.cpp +++ b/Source/Core/VideoCommon/Src/BPStructs.cpp @@ -37,6 +37,8 @@ u32 mapTexAddress; bool mapTexFound; int numWrites; +extern volatile bool g_bSkipCurrentFrame; + static const float s_gammaLUT[] = { 1.0f, @@ -401,7 +403,11 @@ void BPWritten(const BPCmd& bp) { if(g_ActiveConfig.bUseBBox) { - // which is which? these are GUESSES! + // Don't compute bounding box if this frame is being skipped! + // Wrong but valid values are better than bogus values... + if(g_bSkipCurrentFrame) + break; + if (bp.address == BPMEM_CLEARBBOX1) { int right = bp.newvalue >> 10; int left = bp.newvalue & 0x3ff; @@ -410,7 +416,6 @@ void BPWritten(const BPCmd& bp) PixelEngine::bbox[0] = left; PixelEngine::bbox[1] = right; PixelEngine::bbox_active = true; - // WARN_LOG(VIDEO, "ClearBBox LR: %i, %08x - %i, %i", bp.address, bp.newvalue, left, right); } else { int bottom = bp.newvalue >> 10; int top = bp.newvalue & 0x3ff; @@ -419,7 +424,6 @@ void BPWritten(const BPCmd& bp) PixelEngine::bbox[2] = top; PixelEngine::bbox[3] = bottom; PixelEngine::bbox_active = true; - // WARN_LOG(VIDEO, "ClearBBox TB: %i, %08x - %i, %i", bp.address, bp.newvalue, top, bottom); } } } diff --git a/Source/Core/VideoCommon/Src/PixelEngine.cpp b/Source/Core/VideoCommon/Src/PixelEngine.cpp index 3b6d1b7487..90f1546ebd 100644 --- a/Source/Core/VideoCommon/Src/PixelEngine.cpp +++ b/Source/Core/VideoCommon/Src/PixelEngine.cpp @@ -206,14 +206,45 @@ void Read16(u16& _uReturnValue, const u32 _iAddress) INFO_LOG(PIXELENGINE, "(r16) TOKEN_REG : %04x", _uReturnValue); break; - // The return values for these BBOX registers need to be gotten from the bounding box of the object. - // See http://code.google.com/p/dolphin-emu/issues/detail?id=360#c74 for more details. + case PE_BBOX_LEFT: + { + // Left must be even and 606px max + _uReturnValue = std::min((u16) 606, bbox[0]) & ~1; - // 0x80, 0xa0, 0x80, 0xa0 makes Paper Mario happy. - case PE_BBOX_LEFT: _uReturnValue = bbox[0]; INFO_LOG(PIXELENGINE, "R: BBOX_LEFT = %i", bbox[0]); bbox_active = false; break; - case PE_BBOX_RIGHT: _uReturnValue = bbox[1]; INFO_LOG(PIXELENGINE, "R: BBOX_RIGHT = %i", bbox[1]); bbox_active = false; break; - case PE_BBOX_TOP: _uReturnValue = bbox[2]; INFO_LOG(PIXELENGINE, "R: BBOX_TOP = %i", bbox[2]); bbox_active = false; break; - case PE_BBOX_BOTTOM: _uReturnValue = bbox[3]; INFO_LOG(PIXELENGINE, "R: BBOX_BOTTOM = %i", bbox[3]); bbox_active = false; break; + INFO_LOG(PIXELENGINE, "R: BBOX_LEFT = %i", _uReturnValue); + bbox_active = false; + break; + } + + case PE_BBOX_RIGHT: + { + // Right must be odd and 607px max + _uReturnValue = std::min((u16) 607, bbox[1]) | 1; + + INFO_LOG(PIXELENGINE, "R: BBOX_RIGHT = %i", _uReturnValue); + bbox_active = false; + break; + } + + case PE_BBOX_TOP: + { + // Top must be even and 478px max + _uReturnValue = std::min((u16) 478, bbox[2]) & ~1; + + INFO_LOG(PIXELENGINE, "R: BBOX_TOP = %i", _uReturnValue); + bbox_active = false; + break; + } + + case PE_BBOX_BOTTOM: + { + // Bottom must be odd and 479px max + _uReturnValue = std::min((u16) 479, bbox[3]) | 1; + + INFO_LOG(PIXELENGINE, "R: BBOX_BOTTOM = %i", _uReturnValue); + bbox_active = false; + break; + } case PE_PERF_0L: case PE_PERF_0H: diff --git a/Source/Core/VideoCommon/Src/VertexLoader.cpp b/Source/Core/VideoCommon/Src/VertexLoader.cpp index ee0538751a..fb34ce1bc1 100644 --- a/Source/Core/VideoCommon/Src/VertexLoader.cpp +++ b/Source/Core/VideoCommon/Src/VertexLoader.cpp @@ -111,7 +111,7 @@ void LOADERDECL UpdateBoundingBox() // Then convert to screen space and update the bounding box. float p[3] = {data[0], data[1], data[2]}; - const float *world_matrix = (float*)xfmem + MatrixIndexA.PosNormalMtxIdx * 4; + const float *world_matrix = (float*)xfmem + MatrixIndexA.PosNormalMtxIdx * 4; const float *proj_matrix = &g_fProjectionMatrix[0]; float t[3]; @@ -124,41 +124,18 @@ void LOADERDECL UpdateBoundingBox() o[1] = t[0] * proj_matrix[4] + t[1] * proj_matrix[5] + t[2] * proj_matrix[6] + proj_matrix[7]; o[2] = t[0] * proj_matrix[12] + t[1] * proj_matrix[13] + t[2] * proj_matrix[14] + proj_matrix[15]; - o[0] /= o[2]; o[1] /= o[2]; - // should possibly adjust for viewport? + // Max width seems to be 608, while max height is 480 + // Here height is set to 484 as BBox bottom always seems to be off by a few pixels o[0] = (o[0] + 1.0f) * 304.0f; - o[1] = (1.0f - o[1]) * 240.0f; + o[1] = (1.0f - o[1]) * 242.0f; - if (o[0] < PixelEngine::bbox[0]) - { - PixelEngine::bbox[0] = (u16) std::max(0.0f, o[0]); - - // Hardware tests bounding boxes in 2x2 blocks => left and top are even, right and bottom are odd - PixelEngine::bbox[0] &= ~1; - } - - if (o[0] > PixelEngine::bbox[1]) - { - PixelEngine::bbox[1] = (u16) std::min(608.0f, o[0]); - if(!(PixelEngine::bbox[1] & 1) && PixelEngine::bbox[1] != 0) - PixelEngine::bbox[1]--; - } - - if (o[1] < PixelEngine::bbox[2]) - { - PixelEngine::bbox[2] = (u16) std::max(0.0f, o[1]); - PixelEngine::bbox[2] &= ~1; - } - - if (o[1] > PixelEngine::bbox[3]) - { - PixelEngine::bbox[3] = (u16) std::min(480.0f, o[1]); - if(!(PixelEngine::bbox[3] & 1) && PixelEngine::bbox[3] != 0) - PixelEngine::bbox[3]--; - } + if (o[0] < PixelEngine::bbox[0]) PixelEngine::bbox[0] = (u16) std::max(0.0f, o[0]); + if (o[0] > PixelEngine::bbox[1]) PixelEngine::bbox[1] = (u16) o[0]; + if (o[1] < PixelEngine::bbox[2]) PixelEngine::bbox[2] = (u16) std::max(0.0f, o[1]); + if (o[1] > PixelEngine::bbox[3]) PixelEngine::bbox[3] = (u16) o[1]; } void LOADERDECL TexMtx_ReadDirect_UByte() From 78b74101b0dc6cb7e2dc8424928e34138423c116 Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 29 Oct 2011 17:21:20 +1100 Subject: [PATCH 105/381] Added code to invalidate the JIT cache on dcbf. This fixes Monster House and Scooby Doo: Mystery Mayhem. --- Source/Core/Core/Src/HW/MemmapFunctions.cpp | 4 ++-- .../PowerPC/Interpreter/Interpreter_LoadStore.cpp | 14 +++++++++++--- .../Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp | 10 +++++----- Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp | 2 +- .../Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp | 10 +++++----- 5 files changed, 24 insertions(+), 16 deletions(-) diff --git a/Source/Core/Core/Src/HW/MemmapFunctions.cpp b/Source/Core/Core/Src/HW/MemmapFunctions.cpp index 993a3aabf1..7e3f78616d 100644 --- a/Source/Core/Core/Src/HW/MemmapFunctions.cpp +++ b/Source/Core/Core/Src/HW/MemmapFunctions.cpp @@ -273,8 +273,7 @@ inline void WriteToHardware(u32 em_address, const T data, u32 effective_address, ((em_address & 0xF0000000) == 0xD0000000) || ((em_address & 0xF0000000) == 0x10000000)) { - // Should we invalidate jit blocks in exram? - //PowerPC::ppcState.iCache.InvalidateBlock(em_address); + PowerPC::ppcState.iCache.InvalidateBlock(em_address); *(T*)&m_pEXRAM[em_address & EXRAM_MASK] = bswap(data); return; } @@ -287,6 +286,7 @@ inline void WriteToHardware(u32 em_address, const T data, u32 effective_address, (bFakeVMEM && ((em_address &0xF0000000) == 0x40000000))) { // fake VMEM + PowerPC::ppcState.iCache.InvalidateBlock(em_address); *(T*)&m_pFakeVMEM[em_address & FAKEVMEM_MASK] = bswap(data); } else diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp index 81346b3ae6..1133f348e4 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp @@ -363,15 +363,23 @@ void Interpreter::dcbf(UGeckoInstruction _inst) { NPC = PC + 12; }*/ + // Invalidate the icache on dcbf + if (jit) + { + u32 address = Helper_Get_EA_X(_inst); + jit->GetBlockCache()->InvalidateICache(address & ~0x1f); + } } 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. - // Seen used during initialization. - u32 address = Helper_Get_EA_X(_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 icache on dcbi if (jit) + { + u32 address = Helper_Get_EA_X(_inst); jit->GetBlockCache()->InvalidateICache(address & ~0x1f); + } } void Interpreter::dcbst(UGeckoInstruction _inst) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp index 1632a76796..c366617dfa 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp @@ -210,12 +210,12 @@ static GekkoOPTemplate table31[] = {824, &Jit64::srawix}, //"srawix", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}}, {24, &Jit64::slwx}, //"slwx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}}, - {54, &Jit64::Default}, //"dcbst", OPTYPE_DCACHE, 0, 4}}, - {86, &Jit64::DoNothing}, //"dcbf", OPTYPE_DCACHE, 0, 4}}, - {246, &Jit64::Default}, //"dcbtst", OPTYPE_DCACHE, 0, 1}}, - {278, &Jit64::Default}, //"dcbt", OPTYPE_DCACHE, 0, 1}}, + {54, &Jit64::DoNothing}, //"dcbst", OPTYPE_DCACHE, 0, 4}}, + {86, &Jit64::Default}, //"dcbf", OPTYPE_DCACHE, 0, 4}}, + {246, &Jit64::DoNothing}, //"dcbtst", OPTYPE_DCACHE, 0, 1}}, + {278, &Jit64::DoNothing}, //"dcbt", OPTYPE_DCACHE, 0, 1}}, {470, &Jit64::Default}, //"dcbi", OPTYPE_DCACHE, 0, 4}}, - {758, &Jit64::Default}, //"dcba", OPTYPE_DCACHE, 0, 4}}, + {758, &Jit64::DoNothing}, //"dcba", OPTYPE_DCACHE, 0, 4}}, {1014, &Jit64::dcbz}, //"dcbz", OPTYPE_DCACHE, 0, 4}}, //load word diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp index 4110c37f96..75755de5cb 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp @@ -494,7 +494,7 @@ void JitIL::Trace() } #endif - NOTICE_LOG(DYNA_REC, "JITIL PC: %08x SRR0: %08x SRR1: %08x CRfast: %02x%02x%02x%02x%02x%02x%02x%02x FPSCR: %08x MSR: %08x LR: %08x %s %s", + DEBUG_LOG(DYNA_REC, "JITIL 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); diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp index f34f100657..bcfea0a07b 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp @@ -212,12 +212,12 @@ static GekkoOPTemplate table31[] = {824, &JitIL::srawix}, //"srawix", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}}, {24, &JitIL::slwx}, //"slwx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}}, - {54, &JitIL::Default}, //"dcbst", OPTYPE_DCACHE, 0, 4}}, - {86, &JitIL::DoNothing}, //"dcbf", OPTYPE_DCACHE, 0, 4}}, - {246, &JitIL::Default}, //"dcbtst", OPTYPE_DCACHE, 0, 1}}, - {278, &JitIL::Default}, //"dcbt", OPTYPE_DCACHE, 0, 1}}, + {54, &JitIL::DoNothing}, //"dcbst", OPTYPE_DCACHE, 0, 4}}, + {86, &JitIL::Default}, //"dcbf", OPTYPE_DCACHE, 0, 4}}, + {246, &JitIL::DoNothing}, //"dcbtst", OPTYPE_DCACHE, 0, 1}}, + {278, &JitIL::DoNothing}, //"dcbt", OPTYPE_DCACHE, 0, 1}}, {470, &JitIL::Default}, //"dcbi", OPTYPE_DCACHE, 0, 4}}, - {758, &JitIL::Default}, //"dcba", OPTYPE_DCACHE, 0, 4}}, + {758, &JitIL::DoNothing}, //"dcba", OPTYPE_DCACHE, 0, 4}}, {1014, &JitIL::dcbz}, //"dcbz", OPTYPE_DCACHE, 0, 4}}, //load word {23, &JitIL::lXzx}, //"lwzx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}}, From 8f31968466fb3cbb1ca033cf3baf5ba843640f6f Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 1 Nov 2011 01:37:54 +0100 Subject: [PATCH 106/381] Revert "Merge branch 'zcomploc-support'" This reverts commit 9dad9ebe899b4f2c36923c9721a09ff45b4e573c, reversing changes made to e76bc71efe8c3c724e14a2f741fe4f34669d1bea. --- .../Core/VideoCommon/Src/PixelShaderGen.cpp | 27 +++++++------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index f9aa7fd551..1726855d54 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -143,6 +143,8 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages) indirectStagesUsed |= (1 << bpmem.tevind[i].bt); + assert(indirectStagesUsed == (indirectStagesUsed & 0xF)); + uid->values[1] |= indirectStagesUsed << 5; // 4; for (unsigned int i = 0; i < bpmem.genMode.numindstages; ++i) @@ -169,10 +171,10 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo if (alphaPreTest == 0 || alphaPreTest == 2) { ptr[0] |= bpmem.fog.c_proj_fsel.fsel << 8; // 3 - ptr[0] |= bpmem.zcontrol.zcomploc << 11; // 1 if (DepthTextureEnable) { - ptr[0] |= bpmem.ztex2.op << 12; // 2 + ptr[0] |= bpmem.ztex2.op << 11; // 2 + ptr[0] |= bpmem.zcontrol.zcomploc << 13; // 1 ptr[0] |= bpmem.zmode.testenable << 14; // 1 ptr[0] |= bpmem.zmode.updateenable << 15; // 1 } @@ -1179,21 +1181,10 @@ static bool WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode compindex = bpmem.alphaFunc.comp1 % 8; WRITE(p, tevAlphaFuncsTable[compindex],alphaRef[1]);//lookup the second component from the alpha function table - WRITE(p, ")) {\n"); - - WRITE(p, "ocol0 = 0;\n"); - if (dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND) - WRITE(p, "ocol1 = 0;\n"); - if (DepthTextureEnable) - WRITE(p, "depth = 1.f;\n"); - if (!bpmem.zcontrol.zcomploc) - { - WRITE(p, "discard;\n"); - if (ApiType != API_D3D11) - WRITE(p, "return;\n"); - } - - WRITE(p, "}\n"); + WRITE(p, ")){ocol0 = 0;%s%s discard;%s}\n", + dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND ? "ocol1 = 0;" : "", + DepthTextureEnable ? "depth = 1.f;" : "", + (ApiType != API_D3D11) ? "return;" : ""); return true; } @@ -1251,4 +1242,4 @@ static void WriteFog(char *&p) WRITE(p, " prev.rgb = lerp(prev.rgb,"I_FOG"[0].rgb,fog);\n"); -} +} \ No newline at end of file From 7aed6a6859ae57e58e9e98a20f2d5f20bc4ff2e6 Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Tue, 1 Nov 2011 15:09:41 +0200 Subject: [PATCH 107/381] Game ini database update for Kirby's Adventure Wii, Monster House, Mario Strikers Charged, Yu-Gi-Oh! 5D's: Duel Transfer, Mario & Sonic at the Olympic Winter Games, Disney Epic Mickey. --- Data/User/GameConfig/G5DE78.ini | 16 ++++++++++++++++ Data/User/GameConfig/G5DP78.ini | 16 ++++++++++++++++ Data/User/GameConfig/GK5E78.ini | 10 +++++++--- Data/User/GameConfig/GK5X78.ini | 16 ++++++++++++++-- Data/User/GameConfig/R4QE01.ini | 2 +- Data/User/GameConfig/R4QJ01.ini | 4 ++-- Data/User/GameConfig/R4QK01.ini | 2 +- Data/User/GameConfig/R4QP01.ini | 4 ++-- Data/User/GameConfig/R8DEA4.ini | 15 +++++++++++++++ Data/User/GameConfig/R8DJA4.ini | 15 +++++++++++++++ Data/User/GameConfig/R8DPA4.ini | 8 ++++++-- Data/User/GameConfig/ROLE8P.ini | 10 +++++++--- Data/User/GameConfig/ROLJ01.ini | 18 ++++++++++++++++++ Data/User/GameConfig/ROLK01.ini | 18 ++++++++++++++++++ Data/User/GameConfig/ROLP8P.ini | 11 ++++++++++- Data/User/GameConfig/SEME4Q.ini | 2 +- Data/User/GameConfig/SEMP4Q.ini | 2 +- Data/User/GameConfig/SEMX4Q.ini | 2 +- Data/User/GameConfig/SUKE01.ini | 21 +++++++++++++++++++++ Data/User/GameConfig/SUKJ01.ini | 20 ++++++++++++++++++++ Data/User/GameConfig/SUKP01.ini | 20 ++++++++++++++++++++ 21 files changed, 212 insertions(+), 20 deletions(-) create mode 100644 Data/User/GameConfig/G5DE78.ini create mode 100644 Data/User/GameConfig/G5DP78.ini create mode 100644 Data/User/GameConfig/R8DEA4.ini create mode 100644 Data/User/GameConfig/R8DJA4.ini create mode 100644 Data/User/GameConfig/ROLJ01.ini create mode 100644 Data/User/GameConfig/ROLK01.ini create mode 100644 Data/User/GameConfig/SUKE01.ini create mode 100644 Data/User/GameConfig/SUKJ01.ini create mode 100644 Data/User/GameConfig/SUKP01.ini diff --git a/Data/User/GameConfig/G5DE78.ini b/Data/User/GameConfig/G5DE78.ini new file mode 100644 index 0000000000..8ec9209c7b --- /dev/null +++ b/Data/User/GameConfig/G5DE78.ini @@ -0,0 +1,16 @@ +# G5DE78 - Scooby-Doo! Unmasked +[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/G5DP78.ini b/Data/User/GameConfig/G5DP78.ini new file mode 100644 index 0000000000..f5ee02af32 --- /dev/null +++ b/Data/User/GameConfig/G5DP78.ini @@ -0,0 +1,16 @@ +# G5DP78 - Scooby-Doo! Unmasked +[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/GK5E78.ini b/Data/User/GameConfig/GK5E78.ini index bb27d40b41..95ad2128a7 100644 --- a/Data/User/GameConfig/GK5E78.ini +++ b/Data/User/GameConfig/GK5E78.ini @@ -1,15 +1,19 @@ # GK5E78 - Monster House [Core] Values set here will override the main dolphin settings. -MMU = 1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 0 +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] SafeTextureCache = True SafeTextureCacheColorSamples = 512 - diff --git a/Data/User/GameConfig/GK5X78.ini b/Data/User/GameConfig/GK5X78.ini index d44b5ee519..ccc9738c97 100644 --- a/Data/User/GameConfig/GK5X78.ini +++ b/Data/User/GameConfig/GK5X78.ini @@ -1,7 +1,19 @@ # GK5X78 - Monster House [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 = 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] +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/R4QE01.ini b/Data/User/GameConfig/R4QE01.ini index 84e6a2f07b..3ae6cb283a 100644 --- a/Data/User/GameConfig/R4QE01.ini +++ b/Data/User/GameConfig/R4QE01.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 = 5 -EmulationIssues = Needs progressive scan to boot(r7411) +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/R4QJ01.ini b/Data/User/GameConfig/R4QJ01.ini index 3cc45fa94d..d97cc37c84 100644 --- a/Data/User/GameConfig/R4QJ01.ini +++ b/Data/User/GameConfig/R4QJ01.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 = 5 -EmulationIssues = Needs progressive scan to boot(r7411) +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -17,4 +17,4 @@ PH_ZFar = [Video_Hacks] DlistCachingEnable = False [Wii] -DisableWiimoteSpeaker = 1 \ No newline at end of file +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/R4QK01.ini b/Data/User/GameConfig/R4QK01.ini index b297ceef5b..2c45a961a0 100644 --- a/Data/User/GameConfig/R4QK01.ini +++ b/Data/User/GameConfig/R4QK01.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 = 5 -EmulationIssues = Needs progressive scan to boot(r7411) +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/R4QP01.ini b/Data/User/GameConfig/R4QP01.ini index 89a29e399c..8ec96e8cf3 100644 --- a/Data/User/GameConfig/R4QP01.ini +++ b/Data/User/GameConfig/R4QP01.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 = 5 -EmulationIssues = Needs progressive scan to boot(r7411) +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -17,4 +17,4 @@ PH_ZFar = [Video_Hacks] DlistCachingEnable = False [Wii] -DisableWiimoteSpeaker = 1 \ No newline at end of file +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/R8DEA4.ini b/Data/User/GameConfig/R8DEA4.ini new file mode 100644 index 0000000000..b94df680b1 --- /dev/null +++ b/Data/User/GameConfig/R8DEA4.ini @@ -0,0 +1,15 @@ +# R8DEA4 - Yu-Gi-Oh! 5D's: Duel Transer +[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] diff --git a/Data/User/GameConfig/R8DJA4.ini b/Data/User/GameConfig/R8DJA4.ini new file mode 100644 index 0000000000..1399c6ce77 --- /dev/null +++ b/Data/User/GameConfig/R8DJA4.ini @@ -0,0 +1,15 @@ +# R8DJA4 - Yu-Gi-Oh! 5D's: Duel Transer +[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] diff --git a/Data/User/GameConfig/R8DPA4.ini b/Data/User/GameConfig/R8DPA4.ini index 29559ff97f..393a8acf6c 100644 --- a/Data/User/GameConfig/R8DPA4.ini +++ b/Data/User/GameConfig/R8DPA4.ini @@ -1,11 +1,15 @@ # R8DPA4 - Yugioh Sim EU [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 +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/ROLE8P.ini b/Data/User/GameConfig/ROLE8P.ini index 450f94131d..fee61aa643 100644 --- a/Data/User/GameConfig/ROLE8P.ini +++ b/Data/User/GameConfig/ROLE8P.ini @@ -1,14 +1,18 @@ # ROLE8P - Mario & Sonic at the Olympic Winter Games [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 = Use Direct 3d 11 backend. [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] SafeTextureCache = True SafeTextureCacheColorSamples = 512 - diff --git a/Data/User/GameConfig/ROLJ01.ini b/Data/User/GameConfig/ROLJ01.ini new file mode 100644 index 0000000000..4ef9c12a69 --- /dev/null +++ b/Data/User/GameConfig/ROLJ01.ini @@ -0,0 +1,18 @@ +# ROLJ01 - Mario & Sonic at the Olympic Winter Games +[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. +[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] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/ROLK01.ini b/Data/User/GameConfig/ROLK01.ini new file mode 100644 index 0000000000..6827e96fc9 --- /dev/null +++ b/Data/User/GameConfig/ROLK01.ini @@ -0,0 +1,18 @@ +# ROLK01 - Mario & Sonic at the Olympic Winter Games +[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. +[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] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/ROLP8P.ini b/Data/User/GameConfig/ROLP8P.ini index fc0ee2e21b..a7bd40c64d 100644 --- a/Data/User/GameConfig/ROLP8P.ini +++ b/Data/User/GameConfig/ROLP8P.ini @@ -1,9 +1,18 @@ # ROLP8P - Mario & Sonic at the Olympic Winter Games [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 +EmulationIssues = Use Direct 3d 11 backend. [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] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/SEME4Q.ini b/Data/User/GameConfig/SEME4Q.ini index 3955caebb4..0dc0d03acc 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 = Use Jitil recompiler or enable progressive scan to run the game(r7559) +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/SEMP4Q.ini b/Data/User/GameConfig/SEMP4Q.ini index 0d2acb5188..4703a7848d 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 = Use Jitil recompiler or enable progressive scan to run the game(r7559) +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/SEMX4Q.ini b/Data/User/GameConfig/SEMX4Q.ini index d1c180f1ba..46246b3ca1 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 = Use Jitil recompiler or enable progressive scan to run the game(r7559) +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/SUKE01.ini b/Data/User/GameConfig/SUKE01.ini new file mode 100644 index 0000000000..a4c7b22fd4 --- /dev/null +++ b/Data/User/GameConfig/SUKE01.ini @@ -0,0 +1,21 @@ +# SUKE01 - Kirby 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 = Theater mode crashes, needs XFB for certain minigames. +[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 +SafeTextureCache = True +SafeTextureCacheColorSamples = 128 + diff --git a/Data/User/GameConfig/SUKJ01.ini b/Data/User/GameConfig/SUKJ01.ini new file mode 100644 index 0000000000..a6cd7a1961 --- /dev/null +++ b/Data/User/GameConfig/SUKJ01.ini @@ -0,0 +1,20 @@ +# SUKJ01 - Hoshi no Kirby 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 = Theater mode crashes, needs XFB for certain minigames. +[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 +SafeTextureCache = True +SafeTextureCacheColorSamples = 128 diff --git a/Data/User/GameConfig/SUKP01.ini b/Data/User/GameConfig/SUKP01.ini new file mode 100644 index 0000000000..8ea6027097 --- /dev/null +++ b/Data/User/GameConfig/SUKP01.ini @@ -0,0 +1,20 @@ +# SUKP01 - Kirby's Adventure 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 = Theater mode crashes, needs XFB for certain minigames. +[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 +SafeTextureCache = True +SafeTextureCacheColorSamples = 128 From d9b3a69f47d9f7895f818dfce0de5551f690fa27 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 1 Nov 2011 23:20:09 +0100 Subject: [PATCH 108/381] Formatting fixes for el.po and pt_BR.po On Linux with recent versions of gettext these formatting fixes are done automatically by gettext when updating the PO files. They create conflicts each time a rebase / merge is done and need to be reset manually. --- Languages/po/el.po | 640 ++++++++++++++++++++++++++++++------------ Languages/po/pt_BR.po | 567 ++++++++++++++++++++++++++----------- 2 files changed, 854 insertions(+), 353 deletions(-) diff --git a/Languages/po/el.po b/Languages/po/el.po index 9a746c96f1..70aac51e67 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -11,10 +11,10 @@ msgstr "" "PO-Revision-Date: 2011-09-13 17:28+0200\n" "Last-Translator: Linktothepast \n" "Language-Team: Gpower2 \n" +"Language: Greek\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: Greek\n" "X-Poedit-Language: Greek\n" "X-Poedit-Country: GREECE\n" @@ -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/MemcardManager.cpp:193 #, c-format @@ -72,7 +73,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/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 #, c-format @@ -99,7 +101,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 @@ -130,7 +133,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:199 #, c-format @@ -370,11 +375,13 @@ 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" @@ -388,10 +395,12 @@ msgstr "" " - ΔÏο ΠυÏήνες [ΑÎΕÎΕΡΓΟ]\n" " - Throttle Ήχου [ΑÎΕÎΕΡΓΟ]\n" " - DSP-HLE με \"Null Audio\" ή DSP-LLE\n" -" - ΧειÏοκίνητη εισαγωγή του ακÏιβοÏÏ‚ αÏÎ¹Î¸Î¼Î¿Ï Ï„Ï‰Î½ ελεγκτών που θα χÏησιμοποιηθοÏν σαν [Τυπικός Ελεγκτής]\n" +" - ΧειÏοκίνητη εισαγωγή του ακÏιβοÏÏ‚ αÏÎ¹Î¸Î¼Î¿Ï Ï„Ï‰Î½ ελεγκτών που θα " +"χÏησιμοποιηθοÏν σαν [Τυπικός Ελεγκτής]\n" "\n" "Όλοι οι παίκτες Ï€Ïέπει να έχουν την ίδια έκδοση και Ïυθμίσεις του Dolphin.\n" -"ΑπενεÏγοποιήστε όλες τις κάÏτες μνήμης ή στείλτε τες σε όλους τους παίκτες Ï€Ïιν την εκκίνηση.\n" +"ΑπενεÏγοποιήστε όλες τις κάÏτες μνήμης ή στείλτε τες σε όλους τους παίκτες " +"Ï€Ïιν την εκκίνηση.\n" "Η υποστήÏιξη Wiimote δεν έχει ακόμα υλοποιηθεί.\n" "\n" "Θα Ï€Ïέπει να έχετε κάνει Ï€Ïοώθηση της πόÏτας TCP στον host!!" @@ -421,12 +430,14 @@ 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, leave this checked." msgstr "" "Εξομοιώνει με ακÏίβεια τα EFB αντίγÏαφα.\n" -"Κάποια παιχνίδια βασίζονται σε αυτό για οÏισμένα εφέ γÏαφικών ή λειτουÏγίες του gameplay.\n" +"Κάποια παιχνίδια βασίζονται σε αυτό για οÏισμένα εφέ γÏαφικών ή λειτουÏγίες " +"του gameplay.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -451,23 +462,38 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, 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:756 #, 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:549 #, 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:609 #, 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:803 #, c-format @@ -476,8 +502,11 @@ msgstr "Σφάλμα Action Replay: Μη έγκυÏη τιμή (%08x) σε Memor #: Source/Core/Core/Src/ActionReplay.cpp:684 #, 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 @@ -539,7 +568,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." @@ -549,7 +579,8 @@ 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." @@ -557,7 +588,9 @@ 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:486 msgid "Advanced" @@ -598,11 +631,13 @@ msgstr "Όλα τα αÏχεία (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕπιτÏέπει την εναλλαγή οÏισμένων επιλογών με τα πλήκτÏα συντόμευσης 3, 4, 5, 6 και 7 μέσα από το παÏάθυÏο εξομοίωσης.\n" +"ΕπιτÏέπει την εναλλαγή οÏισμένων επιλογών με τα πλήκτÏα συντόμευσης 3, 4, 5, " +"6 και 7 μέσα από το παÏάθυÏο εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -659,7 +694,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 msgid "Are you sure you want to delete this file? It will be gone forever!" -msgstr "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για πάντα!" +msgstr "" +"Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για " +"πάντα!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 @@ -705,7 +742,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΠÏοσαÏμόζει αυτόματα το μέγεθος του παÏαθÏÏου σÏμφωνα με την εσωτεÏική ανάλυση.\n" +"ΠÏοσαÏμόζει αυτόματα το μέγεθος του παÏαθÏÏου σÏμφωνα με την εσωτεÏική " +"ανάλυση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -843,12 +881,16 @@ 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" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -862,7 +904,8 @@ msgid "" msgstr "" "Υπολογίζει τον φωτισμό των 3D γÏαφικών ανά pixel αντί ανά vertex.\n" "Μειώνει την ταχÏτητα εξομοίωσης κατά κάποιο ποσοστό (ανάλογα με την GPU).\n" -"Αυτή συνήθως είναι μια ασφαλής βελτίωση, αλλά μποÏεί να Ï€Ïοκαλέσει οÏισμένες φοÏές Ï€Ïοβλήματα.\n" +"Αυτή συνήθως είναι μια ασφαλής βελτίωση, αλλά μποÏεί να Ï€Ïοκαλέσει οÏισμένες " +"φοÏές Ï€Ïοβλήματα.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -1020,8 +1063,12 @@ msgid "Choose a memory card:" msgstr "Επιλέξτε μια κάÏτα μνήμης:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 -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:764 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 @@ -1048,8 +1095,12 @@ msgid "Clear failed." 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/VideoConfigDiag.cpp:558 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 @@ -1199,10 +1250,15 @@ 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 @@ -1219,19 +1275,23 @@ 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:118 #, 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:1044 msgid "Couldn't find open command for extension 'ini'!" @@ -1269,8 +1329,11 @@ msgid "Created by KDE-Look.org" msgstr "ΔημιουÏγήθηκε από KDE-Look.org" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 -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:492 msgid "Created by VistaIcons.com" @@ -1278,7 +1341,9 @@ msgstr "ΔημιουÏγήθηκε από VistaIcons.com" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 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:15 msgid "Creator: " @@ -1446,8 +1511,12 @@ msgstr "Ανίχνευση" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -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 @@ -1507,24 +1576,30 @@ msgstr "ΑπενεÏγοποίηση Ηχείου Wiimote" #: 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -1612,12 +1687,20 @@ msgid "Dolphin at &Google Code" msgstr "Dolphin στο &Google Code" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 -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:307 -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/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 @@ -1663,7 +1746,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Εξαγωγή όλων των απεικονισμένων καÏέ σε ένα AVI αÏχείο στο User/Dump/Frames/\n" +"Εξαγωγή όλων των απεικονισμένων καÏέ σε ένα AVI αÏχείο στο User/Dump/" +"Frames/\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -1673,7 +1757,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Εξαγωγή των αποκωδικοποιημένων υφών του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï ÏƒÏ„Î¿ User/Dump/Textures//\n" +"Εξαγωγή των αποκωδικοποιημένων υφών του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï ÏƒÏ„Î¿ User/Dump/Textures/" +"/\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -1703,8 +1788,16 @@ msgstr "EFB ΑντίγÏαφα" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, 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:162 msgid "EUROPE" @@ -1754,24 +1847,31 @@ 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" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -1789,13 +1889,15 @@ 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" @@ -1875,14 +1977,19 @@ msgid "" "If unsure, select 1x." msgstr "" "ΕνεÏγοποιεί το ανισοτÏοπικό φιλτÏάÏισμα.\n" -"Βελτιώνει την ποιότητα απεικόνισης των υφών που βÏίσκονται σε οξείες οπτικές γωνίες.\n" +"Βελτιώνει την ποιότητα απεικόνισης των υφών που βÏίσκονται σε οξείες οπτικές " +"γωνίες.\n" "ΜποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα σε έναν μικÏÏŒ αÏιθμό παιχνιδιών.\n" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -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:799 msgid "Enable pages" @@ -1895,28 +2002,41 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιήστε το αν θέλετε ολόκληÏη η οθόνη να χÏησιμοποιηθεί για την απεικόνιση.\n" +"ΕνεÏγοποιήστε το αν θέλετε ολόκληÏη η οθόνη να χÏησιμοποιηθεί για την " +"απεικόνιση.\n" "Αν αυτό είναι απενεÏγοποιημένο, θα δημιουÏγηθεί ένα παÏάθυÏο απεικόνισης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 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:329 -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:311 -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:334 msgid "Enables Custom Projection Hack" @@ -1929,13 +2049,18 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιεί την Ï€Ïοοδευτική σάÏωση αν υποστηÏίζεται από το εξομοιωμένο λογισμικό. Τα πεÏισσότεÏα παιχνίδια δεν την χÏειάζονται αυτήν την ÏÏθμιση.\n" +"ΕνεÏγοποιεί την Ï€Ïοοδευτική σάÏωση αν υποστηÏίζεται από το εξομοιωμένο " +"λογισμικό. Τα πεÏισσότεÏα παιχνίδια δεν την χÏειάζονται αυτήν την ÏÏθμιση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -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 "" @@ -1988,12 +2113,19 @@ msgstr "Σφάλμα" #: Source/Core/DolphinWX/Src/Main.cpp:356 msgid "Error loading selected language. Falling back to system default." -msgstr "Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή συστήματος." +msgstr "" +"Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή " +"συστήματος." #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 #, 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" @@ -2006,7 +2138,8 @@ 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:58 msgid "Execute" @@ -2157,10 +2290,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 @@ -2341,7 +2476,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Επιβάλλει φιλτÏάÏισμα υφών ακόμα κι αν το παιχνίδι το έχει απενεÏγοποιήσει.\n" -"Βελτιώνει ελαφÏÏŽÏ‚ την ποιότητα των υφών αλλά μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα σε οÏισμένα παιχνίδια.\n" +"Βελτιώνει ελαφÏÏŽÏ‚ την ποιότητα των υφών αλλά μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα " +"σε οÏισμένα παιχνίδια.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -2360,10 +2496,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 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/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 msgid "" @@ -2519,7 +2658,9 @@ msgstr "ΓεÏμανικά" #: Source/Core/Core/Src/ActionReplay.cpp:451 #, 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:443 msgid "Graphics" @@ -2535,12 +2676,14 @@ msgstr "ΜεγαλÏτεÏο από" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 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" "\n" "If unsure, leave this checked." msgstr "" -"Βελτιώνει Ï€Î¿Î»Ï Ï„Î·Î½ ποιότητα των υφών που παÏάγονται χÏησιμοποιώντας render to texture εφέ.\n" +"Βελτιώνει Ï€Î¿Î»Ï Ï„Î·Î½ ποιότητα των υφών που παÏάγονται χÏησιμοποιώντας render " +"to texture εφέ.\n" "Μία αÏξηση της εσωτεÏικής ανάλυσης θα βελτιώσει το εφέ αυτής της ÏÏθμισης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -2619,7 +2762,8 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"ΑποκÏÏπτει τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î±Î½ βÏίσκεται πάνω από το παÏάθυÏο εξομοίωσης.\n" +"ΑποκÏÏπτει τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î±Î½ βÏίσκεται πάνω από το παÏάθυÏο " +"εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -2652,16 +2796,20 @@ msgstr "ΥβÏιδικό Wiimote" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 #, 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:795 #, 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 πιθανότατα θα κολλήσει Ï„ÏŽÏα." @@ -2702,14 +2850,21 @@ msgid "Icon" msgstr "Εικονίδιο" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -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:481 -msgid "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." +msgid "" +"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." msgstr "" -"Αν θέσετε τιμή υψηλότεÏη από την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, PAL:50),\n" -"θα Ï€Ïέπει επίσης να απενεÏγοποιήσετε το Throttle Ήχου στο DSP για να έχει αποτέλεσμα. " +"Αν θέσετε τιμή υψηλότεÏη από την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, " +"PAL:50),\n" +"θα Ï€Ïέπει επίσης να απενεÏγοποιήσετε το Throttle Ήχου στο DSP για να έχει " +"αποτέλεσμα. " #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 msgid "Ignore Format Changes" @@ -2718,24 +2873,29 @@ 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -2769,11 +2929,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -2783,7 +2945,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί την εξαφάνιση του Ï†Ï‰Ï„Î¹ÏƒÎ¼Î¿Ï ÏƒÏ„Î± πεÏισσότεÏα παιχνίδια.\n" +"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί την εξαφάνιση του Ï†Ï‰Ï„Î¹ÏƒÎ¼Î¿Ï ÏƒÏ„Î± " +"πεÏισσότεÏα παιχνίδια.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -2833,8 +2996,11 @@ 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:1361 msgid "Installing WAD..." @@ -3190,8 +3356,12 @@ 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 @@ -3212,7 +3382,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" -msgstr "Το μέγεθος του αÏχείου της κάÏτας μνήμης δεν ταιÏιάζει με το μέγεθος της κεφαλίδας." +msgstr "" +"Το μέγεθος του αÏχείου της κάÏτας μνήμης δεν ταιÏιάζει με το μέγεθος της " +"κεφαλίδας." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:47 msgid "Menu" @@ -3242,11 +3414,13 @@ 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -3274,7 +3448,8 @@ msgid "" "\n" "\n" msgstr "" -"Μετακινήστε τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Ï€Î¬Î½Ï‰ από μία επιλογή για να εμφανιστεί μία λεπτομεÏής πεÏιγÏαφή.\n" +"Μετακινήστε τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Ï€Î¬Î½Ï‰ από μία επιλογή για να εμφανιστεί " +"μία λεπτομεÏής πεÏιγÏαφή.\n" "\n" "\n" "\n" @@ -3285,8 +3460,12 @@ msgid "Multiply" msgstr "Multiply" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -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/WXInputBase.cpp:126 msgid "NP Add" @@ -3580,7 +3759,8 @@ 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" @@ -3590,8 +3770,12 @@ 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" @@ -4016,7 +4200,9 @@ msgstr "Αποθήκευση αποσυμπιεσμένου GCM/ISO" #: Source/Core/Core/Src/Movie.cpp:428 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." -msgstr "Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της εγγÏαφής της ταινίας..." +msgstr "" +"Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της " +"εγγÏαφής της ταινίας..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format @@ -4047,10 +4233,8 @@ msgstr "ΦίλτÏο Αναζήτησης" msgid "Search Subfolders" msgstr "Αναζήτηση σε Υποφακέλους" -#: Source/Core/Common/Src/SysConf.h:104 -#: Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 -#: Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 +#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Η ενότητα %s δε βÏέθηκε στο SYSCONF" @@ -4117,7 +4301,8 @@ msgstr "" "Αυτόματα: ΧÏήση της τοπικής αναλογίας οθόνης (4:3)\n" "Επιβολή 16:9: ΠÏοσαÏμόζει την εικόνα σε αναλογία οθόνης 16:9.\n" "Επιβολή 4:3: ΠÏοσαÏμόζει την εικόνα σε αναλογία οθόνης 4:3.\n" -"ΠÏοσαÏμογή στο παÏάθυÏο: ΠÏοσαÏμόζει την εικόνα στην αναλογία του παÏαθÏÏου.\n" +"ΠÏοσαÏμογή στο παÏάθυÏο: ΠÏοσαÏμόζει την εικόνα στην αναλογία του " +"παÏαθÏÏου.\n" "\n" "Αν δεν είστε σίγουÏοι επιλέξτε Αυτόματα." @@ -4128,26 +4313,32 @@ msgstr "Επιλεγμένη γÏαμματοσειÏά" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 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:73 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." @@ -4169,8 +4360,11 @@ msgid "Serbian" msgstr "ΣεÏβικά" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -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" @@ -4188,7 +4382,9 @@ msgstr "ΟÏισμός ως Ï€Ïοεπιλεγμένη ΚάÏτα Μνήμης % #: Source/Core/Core/Src/ActionReplay.cpp:462 #, 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:335 msgid "Settings..." @@ -4309,10 +4505,12 @@ msgstr "Εμφάνιση επιβεβαίωσης Ï€Ïιν τη διακοπή #: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 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:812 @@ -4337,11 +4535,13 @@ msgstr "Εμφάνιση αποθηκευμένου τίτλου" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -4389,11 +4589,13 @@ msgstr "ΠαÏάλειψη EFB ΠÏόσβασης από τη CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -4421,13 +4623,16 @@ 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:618 msgid "Sound Settings" @@ -4459,13 +4664,22 @@ 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." @@ -4620,8 +4834,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 "Αδυναμία ανοίγματος του αÏχείου %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 @@ -4643,15 +4861,21 @@ 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/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" -msgstr "Το σημείο αποθήκευσης που Ï€Ïοσπαθείτε να αντιγÏάψετε έχει μη έγκυÏο μέγεθος" +msgstr "" +"Το σημείο αποθήκευσης που Ï€Ïοσπαθείτε να αντιγÏάψετε έχει μη έγκυÏο μέγεθος" #: Source/Core/DolphinWX/Src/Main.cpp:363 -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!" @@ -4687,8 +4911,12 @@ msgid "Theme selection went wrong" msgstr "Η επιλογή θέματος απέτυχε" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 -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:304 msgid "" @@ -4696,25 +4924,40 @@ msgid "" "Undetermined means the game uses Dolphin's setting." msgstr "" "Αυτές οι Ïυθμίσεις υπεÏισχÏουν των γενικών Ïυθμίσεων του Dolphin.\n" -"Αν είναι ακαθόÏιστη η επιλογή το παιχνίδι χÏησιμοποιεί τις γενικές Ïυθμίσεις του Dolphin. " +"Αν είναι ακαθόÏιστη η επιλογή το παιχνίδι χÏησιμοποιεί τις γενικές Ïυθμίσεις " +"του Dolphin. " #: Source/Core/Core/Src/ActionReplay.cpp:356 -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:509 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -4726,11 +4969,14 @@ msgid "" "\n" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" -"ΧÏησιμοποιείται για τον έλεγχο της ταχÏτητας του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î¼Îµ throttle ήχου.\n" -"ΑπενεÏγοποιώντας το μποÏεί να Ï€Ïοκλήθει αφÏσικη ταχÏτητα σε παιχνίδια, Ï€.χ. Ï€Î¿Î»Ï Î³ÏήγοÏη.\n" +"ΧÏησιμοποιείται για τον έλεγχο της ταχÏτητας του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î¼Îµ throttle " +"ήχου.\n" +"ΑπενεÏγοποιώντας το μποÏεί να Ï€Ïοκλήθει αφÏσικη ταχÏτητα σε παιχνίδια, Ï€.χ. " +"Ï€Î¿Î»Ï Î³ÏήγοÏη.\n" "Όμως οÏισμένες φοÏές η ενεÏγοποίησή της μποÏεί να Ï€Ïοκαλέσει μόνιμο θόÏυβο.\n" "\n" -"Συντόμευση πληκτÏολογίου : ΚÏατήστε το πατημένο για να απενεÏγοποιηθεί η λειτουÏγία Throttle." +"Συντόμευση πληκτÏολογίου : ΚÏατήστε το πατημένο για να απενεÏγοποιηθεί " +"η λειτουÏγία Throttle." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "This is used to play music tracks, like BGM." @@ -4738,16 +4984,20 @@ msgstr "ΧÏησιμοποιείται για την αναπαÏαγωγή μο #: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 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:283 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 @@ -4794,8 +5044,7 @@ msgstr "ΠÏοσπάθεια φόÏτωσης ενός άγνωστου Ï„Ïπο msgid "Triggers" msgstr "Σκανδάλες" -#: Source/Core/Common/Src/SysConf.h:92 -#: Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 msgid "Trying to read from invalid SYSCONF" msgstr "ΠÏοσπάθεια ανάγνωσης από ένα μη έγκυÏο SYSCONF" @@ -4847,10 +5096,13 @@ 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:404 @@ -4933,19 +5185,23 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "ΧÏησιμοποίηση πολλαπλών νημάτων για την αποκωδικοποίηση υφών.\n" -"ΜποÏεί να βελτιώσει την ταχÏτητα (ειδικά σε CPUs με πεÏισσότεÏους από δÏο πυÏήνες).\n" +"ΜποÏεί να βελτιώσει την ταχÏτητα (ειδικά σε CPUs με πεÏισσότεÏους από δÏο " +"πυÏήνες).\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -5000,7 +5256,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Αναμονή για την κάθετη ανανέωση της οθόνης ώστε να μειωθεί το σπάσιμο της εικόνας.\n" +"Αναμονή για την κάθετη ανανέωση της οθόνης ώστε να μειωθεί το σπάσιμο της " +"εικόνας.\n" "Μειώνει τις επιδόσεις αν η ταχÏτητα εξομοίωσης είναι μικÏότεÏη από 100%.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -5030,7 +5287,8 @@ msgid "" "%s\n" "Do you wish to continue?" msgstr "" -"ΠÏοειδοποίηση! Συστήνεται η δημιουÏγία αντιγÏάφου ασφαλείας όλων των αÏχείων στον φάκελο:\n" +"ΠÏοειδοποίηση! Συστήνεται η δημιουÏγία αντιγÏάφου ασφαλείας όλων των αÏχείων " +"στον φάκελο:\n" "%s\n" "Θέλετε να συνεχίσετε;" @@ -5042,7 +5300,8 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" -"ΠÏοειδοποίηση: Αυτό θα αντικαταστήσει όλα τα υπάÏχοντα σημεία αποθήκευσης που υπάÏχουν στον φάκελο:\n" +"ΠÏοειδοποίηση: Αυτό θα αντικαταστήσει όλα τα υπάÏχοντα σημεία αποθήκευσης " +"που υπάÏχουν στον φάκελο:\n" "%s\n" "και έχουν το ίδιο όνομα με αÏχεία στη memcard\n" "Συνέχεια;" @@ -5210,7 +5469,8 @@ msgstr "ΠÏέπει να εισάγετε ένα έγκυÏο όνομα Ï€Ïο #: Source/Core/DolphinWX/Src/ConfigMain.cpp:877 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 "" @@ -5268,14 +5528,19 @@ 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -5322,7 +5587,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:461 msgid "s" @@ -5348,4 +5615,3 @@ msgstr "zNear ΔιόÏθωση: " #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 msgid "| OR" msgstr "| OR" - diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index d7d782547c..479c1da646 100644 --- a/Languages/po/pt_BR.po +++ b/Languages/po/pt_BR.po @@ -11,10 +11,10 @@ msgstr "" "PO-Revision-Date: 2011-09-11 23:35-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" -"Language: \n" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" @@ -42,7 +42,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\" é um arquivo GCM/ISO inválido, ou não é um arquivo ISO de GC/Wii." +msgstr "" +"\"%s\" é um arquivo GCM/ISO inválido, ou não é um arquivo ISO de GC/Wii." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:193 #, c-format @@ -97,7 +98,8 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" "%s não pôde ser carregado como um MemoryCard \n" -"o arquivo não é grande o bastante para ser um arquivo de Memory Card (0x%x bytes)" +"o arquivo não é grande o bastante para ser um arquivo de Memory Card (0x%x " +"bytes)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -368,11 +370,13 @@ 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" @@ -382,14 +386,18 @@ msgid "" msgstr "" "ALERTA:\n" "\n" -"O NetPlay atualmente irá funcionar corretamente apenas usando as configurações a seguir:\n" +"O NetPlay atualmente irá funcionar corretamente apenas usando as " +"configurações a seguir:\n" " - Dual Core [DESLIGADO]\n" " - Aceleração de Audio [Desligado]\n" " - DSP-HLE com \"Audio Nulo\" ou DSP-LLE\n" -" - Manualmente configurar o número exato de controles a serem usados para [Controle Padrão]\n" +" - Manualmente configurar o número exato de controles a serem usados para " +"[Controle Padrão]\n" "\n" -"Todos os jogadores devem tentar usar a mesma versão e configuração do Dolphin.\n" -"Desative todos os cartões de memórias ou mande eles para todos os jogadores antes de começar .\n" +"Todos os jogadores devem tentar usar a mesma versão e configuração do " +"Dolphin.\n" +"Desative todos os cartões de memórias ou mande eles para todos os jogadores " +"antes de começar .\n" "Suport ao wiimote não foi implementado.\n" "\n" "Você deve redirecionar as portas TCP para ser o Host!!" @@ -419,12 +427,14 @@ msgstr "Emulção precisa de 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, leave this checked." msgstr "" "Emula as Cópias do EFB com precisão.\n" -"Alguns jogos dependem disso para certos efeitos visuais ou funções de jogabilidade.\n" +"Alguns jogos dependem disso para certos efeitos visuais ou funções de " +"jogabilidade.\n" "\n" "Se estiver em dúvida, deixe isto ativado." @@ -449,23 +459,38 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" -msgstr "Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Add Code (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +msgstr "" +"Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Add Code " +"(%s)" #: Source/Core/Core/Src/ActionReplay.cpp:756 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)" -msgstr "Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Fill e Slide (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " +"(%s)" +msgstr "" +"Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Fill e " +"Slide (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:549 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)" -msgstr "Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em RAM Write e Fill (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " +"Fill (%s)" +msgstr "" +"Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em RAM Write " +"e Fill (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:609 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Write To Pointer (%s)" -msgstr "Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Write to Pointer (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Write To " +"Pointer (%s)" +msgstr "" +"Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Write to " +"Pointer (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:803 #, c-format @@ -474,8 +499,11 @@ msgstr "Erro no Action Replay: Valor inválido (%08x) na Cópia de Memória (%s) #: Source/Core/Core/Src/ActionReplay.cpp:684 #, c-format -msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "Erro no Action Replay: Master Code e Write To CCXXXXXX não está implementado (%s)" +msgid "" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgstr "" +"Erro no Action Replay: Master Code e Write To CCXXXXXX não está implementado " +"(%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -537,14 +565,16 @@ msgstr "Endereço:" 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 "" "Adiciona o valor especificado ao Parâmetro do zFar.\n" "Duas formas de expressar os valores flutuantes do ponteiro.\n" -"Exemplo: Digitar ''200'' ou ''0.0002'' diretamente, isso vai produzir efeitos iguais, o valor adquirido será ''0.0002''.\n" +"Exemplo: Digitar ''200'' ou ''0.0002'' diretamente, isso vai produzir " +"efeitos iguais, o valor adquirido será ''0.0002''.\n" "Valores: (0->+/-Inteiro) ou (0->+/-FP[6 dígitos precisos])\n" "\n" "NOTA: Confira a Janela de Log/Console para ver os valores adquiridos." @@ -553,14 +583,16 @@ 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 "" "Adiciona o valor especificado ao Parâmetro do zNear.\n" "Duas formas de expressar os valores flutuantes do ponteiro.\n" -"Exemplo: Digitar ''200'' ou ''0.0002'' diretamente, isso vai produzir efeitos iguais, o valor adquirido será ''0.0002''.\n" +"Exemplo: Digitar ''200'' ou ''0.0002'' diretamente, isso vai produzir " +"efeitos iguais, o valor adquirido será ''0.0002''.\n" "Valores: (0->+/-Inteiro) ou (0->+/-FP[6 dígitos precisos])\n" "\n" "NOTA: Confira a Janela de Log/Console para ver os valores adquiridos." @@ -608,11 +640,13 @@ msgstr "Todos os arquivos (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 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, 6 e 7 " +"enquanto o emulador está funcionando.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -669,7 +703,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 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!" +msgstr "" +"Você tem certeza que quer deletar este arquivo? Ele ficará perdido para " +"sempre!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 @@ -853,12 +889,17 @@ 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" +"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" +"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." @@ -918,12 +959,14 @@ msgstr "" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858 #, 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" +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:1872 #, 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" +msgstr "" +"Não foi possível encontrar o Wiimote pelo identificador de conexão %02x" #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 @@ -1030,8 +1073,12 @@ msgid "Choose a memory card:" msgstr "Escolher um cartão de memória:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 -msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" -msgstr "Escolher um arquivo para ser usado como apploader: (aplicável somente para discos construídos de diretórios)" +msgid "" +"Choose file to use as apploader: (applies to discs constructed from " +"directories only)" +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:764 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 @@ -1058,8 +1105,12 @@ msgid "Clear failed." msgstr "Falha na liberação." #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." -msgstr "O Client desconectou-se enquanto o jogo rodava!! O NetPlay foi desativado. Você deve parar o jogo manualmente." +msgid "" +"Client disconnect while game is running!! NetPlay is disabled. You must " +"manually stop the game." +msgstr "" +"O Client desconectou-se enquanto o jogo rodava!! O NetPlay foi desativado. " +"Você deve parar o jogo manualmente." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 @@ -1209,8 +1260,14 @@ msgstr "Não foi possível inicializar o Backend 5s. %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 "Não foi possível ler \"%s\". Não há nenhum disco no leitor, ou não é uma cópia de GC/Wii. Note que os discos originais de Gamecube e Wii não podem ser lidos pela maioria dos leitores de DVD dos PCs." +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 "" +"Não foi possível ler \"%s\". Não há nenhum disco no leitor, ou não é uma " +"cópia de GC/Wii. Note que os discos originais de Gamecube e Wii não podem " +"ser lidos pela maioria dos leitores de DVD dos PCs." #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format @@ -1227,7 +1284,8 @@ 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ão foi possível definir os controles. O jogador saiu ou o jogo está rodando no momento!\n" +"Não foi possível definir os controles. O jogador saiu ou o jogo está rodando " +"no momento!\n" "(Definir os controles durante o jogo ainda não é suportado)" #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 @@ -1235,11 +1293,13 @@ msgstr "" 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 "" "Não foi possível escrever no arquivo de Memory Card %s.\n" "\n" -"Você está executando o Dolphin de um CD/DVD, ou talvez o arquivo de salva seja somente-leitura?" +"Você está executando o Dolphin de um CD/DVD, ou talvez o arquivo de salva " +"seja somente-leitura?" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 msgid "Couldn't find open command for extension 'ini'!" @@ -1277,8 +1337,10 @@ msgid "Created by KDE-Look.org" msgstr "Criado por KDE-Look.org" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 -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 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:492 msgid "Created by VistaIcons.com" @@ -1454,8 +1516,12 @@ msgstr "Detectar" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -msgid "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp." -msgstr "Foi detectada a tentativa de ler mais dados do DVD do que cabem no buffer de saída. Segurando." +msgid "" +"Detected attempt to read more data from the DVD than fit inside the out " +"buffer. Clamp." +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 @@ -1515,24 +1581,30 @@ msgstr "Desabilitar o Auto-Falante do Wiimote" #: 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 "" "Desativa a emulação do XFB.\n" -"Aumenta bastante a performance mas pode causar problemas em vários jogos que precisam dela (especialmente aplicativos amadores/homebrew).\n" +"Aumenta bastante a performance mas pode causar problemas em vários jogos que " +"precisam dela (especialmente aplicativos amadores/homebrew).\n" "\n" "Se estiver em dúvida, deixe isto ativado." #: 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 "" "Desativa a emulação de cópias do EFB.\n" -"Elas são usadas com frequência para efeitos pós-processamento ou efeitos de textura, portanto apesar de esta opção aumentar bastante a velocidade, ela quase sempre causa problemas.\n" +"Elas são usadas com frequência para efeitos pós-processamento ou efeitos de " +"textura, portanto apesar de esta opção aumentar bastante a velocidade, ela " +"quase sempre causa problemas.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -1620,12 +1692,20 @@ msgid "Dolphin at &Google Code" msgstr "Dolphin no &Google Code" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 -msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." -msgstr "Dolphin não pôde encontrar ISOs GC/Wii. Duplo-clique aqui para procurar por arquivos..." +msgid "" +"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " +"files..." +msgstr "" +"Dolphin não pôde encontrar ISOs GC/Wii. Duplo-clique aqui para procurar por " +"arquivos..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 -msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." -msgstr "Dolphin atualmente está configurado para esconder todos os jogos. Duplo-clique aqui para mostrar todos os jogos..." +msgid "" +"Dolphin is currently set to hide all games. Doubleclick here to show all " +"games..." +msgstr "" +"Dolphin atualmente está configurado para esconder todos os jogos. Duplo-" +"clique aqui para mostrar todos os jogos..." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 @@ -1671,7 +1751,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Transfere todos os quadros renderizados para um arquivo AVI em User/Dump/Frames/\n" +"Transfere todos os quadros renderizados para um arquivo AVI em User/Dump/" +"Frames/\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -1710,8 +1791,16 @@ msgstr "Cópias de EFB" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, 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 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." +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 " +"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." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 msgid "EUROPE" @@ -1761,24 +1850,30 @@ msgstr "Este Segmento de Emulação já está rodando" #: 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 "" "Emula os XFBs com precisão.\n" -"Diminui muito a performance e impossibilita a renderização em resoluções altas mas é necessário para emular corretamente um certo número de jogos.\n" +"Diminui muito a performance e impossibilita a renderização em resoluções " +"altas mas é necessário para emular corretamente um certo número de jogos.\n" "\n" "Se estiver em dúvida, selecione Virtual." #: 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 "" "Emula os XFBs usando objetos de textura da GPU.\n" -"Corrige vários jogos que dependem da emulação do XFB e é bem mais rápido que o XFB real. No entanto, ele ainda não funciona para muitos outros jogos (em especial aplicativos homebrew/amadores).\n" +"Corrige vários jogos que dependem da emulação do XFB e é bem mais rápido que " +"o XFB real. No entanto, ele ainda não funciona para muitos outros jogos (em " +"especial aplicativos homebrew/amadores).\n" "\n" "Se estiver em dúvida, deixe isto ativado." @@ -1796,13 +1891,15 @@ msgstr "Ativar" #: 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 "" -"Ativa efeitos 3D através de estereoscopia usando a tecnologia Nvidia 3D Vision se isto for suportado pela sua GPU.\n" +"Ativa efeitos 3D através de estereoscopia usando a tecnologia Nvidia 3D " +"Vision se isto for suportado pela sua GPU.\n" "Pode causar problemas.\n" "Pecisa estar em Tela Cheia para funcionar.\n" "\n" @@ -1882,14 +1979,19 @@ msgid "" "If unsure, select 1x." msgstr "" "Ativar Filtro Anisotrópico.\n" -"Melhora a qualidade visual das texturas quando são vistas de ângulos oblíquos.\n" +"Melhora a qualidade visual das texturas quando são vistas de ângulos " +"oblíquos.\n" "Pode causar problemas em um número pequeno de jogos. \n" "\n" "Se estiver em dúvida, selecione 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -msgid "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)" -msgstr "Ativar acesso rápido de disco. Necessário para alguns jogos.(ON = Rapido, OFF = Compativel)" +msgid "" +"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " +"Compatible)" +msgstr "" +"Ativar acesso rápido de disco. Necessário para alguns jogos.(ON = Rapido, " +"OFF = Compativel)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Enable pages" @@ -1909,21 +2011,33 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 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 "" -"Tive esta opção se você quiser usar a janela principal do Dolphin para mostrar o jogo em vez de uma janela separada para a renderização.\n" +"Tive esta opção se você quiser usar a janela principal do Dolphin para " +"mostrar o jogo em vez de uma janela separada para a renderização.\n" "\n" "Se estiver em dúvida, deixe isto desativado." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 -msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." -msgstr "Ative isso para ter ganho de velocidade em The legend of Zelda: Twilight Princess. Disative para QUALQUER UM outro jogo." +msgid "" +"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " +"ANY other game." +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:311 -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 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:334 msgid "Enables Custom Projection Hack" @@ -1942,8 +2056,12 @@ msgstr "" "Se estiver em dúvida, deixe isto desativado" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" -msgstr "Ativar unidade de gerenciamento de memoria, necessário para alguns jogos. (ON = Compativel, OFF = Rapido)" +msgid "" +"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " +"OFF = Fast)" +msgstr "" +"Ativar unidade de gerenciamento de memoria, necessário para alguns jogos. " +"(ON = Compativel, OFF = Rapido)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" @@ -2000,8 +2118,12 @@ msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema." #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 #, c-format -msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." -msgstr "Erro: Tentando acessar as fontes %s mas elas não estão carregadas. Os jogos podem não mostrar as fontes corretamente, ou travar." +msgid "" +"Error: Trying to access %s fonts but they are not loaded. Games may not show " +"fonts correctly, or crash." +msgstr "" +"Erro: Tentando acessar as fontes %s mas elas não estão carregadas. Os jogos " +"podem não mostrar as fontes corretamente, ou travar." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2014,7 +2136,8 @@ msgstr "Euphoria" #: Source/Core/Core/Src/MemTools.cpp:214 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" -msgstr "Manipulador de Exceções - Acesso abaixo do espaço da memória. %08llx%08llx" +msgstr "" +"Manipulador de Exceções - Acesso abaixo do espaço da memória. %08llx%08llx" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Execute" @@ -2351,7 +2474,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Força filtro de texturas mesmo que o jogo tenha desativado-o explicitamente.\n" +"Força filtro de texturas mesmo que o jogo tenha desativado-o " +"explicitamente.\n" "Melhora um pouco a qualidade das texturas mas causa erros em certos jogos.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -2371,10 +2495,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 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 "" "Força o modo NTSC-J para usar a fonte da ROM Japonesa.\n" -"Se isto ficar desativado, o Dolphin usa NTSC-U e ativa esta opção automaticamente quando você jogar jogos japoneses." +"Se isto ficar desativado, o Dolphin usa NTSC-U e ativa esta opção " +"automaticamente quando você jogar jogos japoneses." #: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 msgid "" @@ -2546,12 +2672,14 @@ msgstr "Maior do que" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 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" "\n" "If unsure, leave this checked." msgstr "" -"Aumenta muito a qualidade das texturas geradas usando efeitos de renderização.\n" +"Aumenta muito a qualidade das texturas geradas usando efeitos de " +"renderização.\n" "Aumentar a Resolução Interna vai melhorar o efeito desta opção.\n" "\n" "Se estiver em dúvida, deixe isto ativado." @@ -2612,7 +2740,8 @@ msgstr "" "Olá\n" "\n" "O Dolphin precisa que a sua CPU tenha suporte a extensões SSE2. \n" -"Infelizmente a sua CPU não tem este suporte, e portanto o Dolphin não funcionará.\n" +"Infelizmente a sua CPU não tem este suporte, e portanto o Dolphin não " +"funcionará.\n" "\n" "Sayonara!\n" @@ -2663,16 +2792,19 @@ msgstr "Wiimote Hibrido" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 #, 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" +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:795 #, 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: O jogo tentou recarregar a ios ou um título que não está disponível no dump do seu NAND\n" +"IOCTL_ES_LAUNCH: O jogo tentou recarregar a ios ou um título que não está " +"disponível no dump do seu NAND\n" "TitleID %016llx.\n" " O Dolphin vai provavelmente travar agora" @@ -2713,12 +2845,20 @@ msgid "Icon" msgstr "Icone" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -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)" +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:481 -msgid "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." -msgstr "Se você colocar o Limitador de FPS em um valor maior que a velocidade máxima do jogo (NTSC:60, PAL:50), você também vai precisar desativar o Throttle de Ãudio no DSP para que funcione." +msgid "" +"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." +msgstr "" +"Se você colocar o Limitador de FPS em um valor maior que a velocidade máxima " +"do jogo (NTSC:60, PAL:50), você também vai precisar desativar o Throttle de " +"Ãudio no DSP para que funcione." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 msgid "Ignore Format Changes" @@ -2727,24 +2867,28 @@ msgstr "Ignorar Mudanças de Formato" #: 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 "" "Ignora qualquer mudança no formato do EFB.\n" -"Melhora a Performance em vários jogos sem qualquer efeito negativo. Causa defeitos gráficos em um pequeno número de jogos, no entanto.\n" +"Melhora a Performance em vários jogos sem qualquer efeito negativo. Causa " +"defeitos gráficos em um pequeno número de jogos, no entanto.\n" "\n" "Se estiver em dúvida, deixe isto ativado." #: 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 "" "Ignora quaisquer pedidos da CPU de ler ou escrever no EFB.\n" -"Melhora a performance em alguns jogos, mas pode desativar algumas funções dos jogos ou efeitos gráficos.\n" +"Melhora a performance em alguns jogos, mas pode desativar algumas funções " +"dos jogos ou efeitos gráficos.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -2778,11 +2922,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 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 "" -"Aumenta a performance mas causa problemas em jogos que dependem da emulação apropriada da névoa.\n" +"Aumenta a performance mas causa problemas em jogos que dependem da emulação " +"apropriada da névoa.\n" "\n" "Se estiver em dúvida, deixe esta opção desativada." @@ -2792,7 +2938,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Melhora a performance mas faz a iluminação desaparecer na maioria dos jogos.\n" +"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." @@ -2842,8 +2989,11 @@ msgid "Install to Wii Menu" msgstr "Instalar para o menu do WII" #: Source/Core/Core/Src/MemTools.cpp:248 -msgid "InstallExceptionHandler called, but this platform does not yet support it." -msgstr "InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem suporte a ele." +msgid "" +"InstallExceptionHandler called, but this platform does not yet support it." +msgstr "" +"InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem " +"suporte a ele." #: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 msgid "Installing WAD..." @@ -3092,7 +3242,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Carrega texturas de alta definição do diretório User/Load/Textures//\n" +"Carrega texturas de alta definição do diretório User/Load/Textures//\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -3199,8 +3350,12 @@ msgid "Memory Card" msgstr "Cartão de memoria" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" -msgstr "AVISO do Gerenciador de- Memory Card - Faça backupsantes de usar, deve estar funcionando mas pode corromper coisas!" +msgid "" +"Memory Card Manager WARNING-Make backups before using, should be fixed but " +"could mangle stuff!" +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 #, c-format @@ -3251,11 +3406,14 @@ msgstr "Modificador" #: 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 "" -"Modifica as texturas para que elas mostrem o formato em que elas estão codificadas. Ao ativar isto, é preciso reiniciar a emulação na maioria das vezes.\n" +"Modifica as texturas para que elas mostrem o formato em que elas estão " +"codificadas. Ao ativar isto, é preciso reiniciar a emulação na maioria das " +"vezes.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -3295,8 +3453,12 @@ msgid "Multiply" msgstr "Multiplicar" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." -msgstr "Desliga o som que sai do Wiimote. Corrige desconexões imprevisíveis em Wiimotes Reais. Não faz efeito em Wiimotes Emulados." +msgid "" +"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " +"effect on emulated wiimotes." +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/WXInputBase.cpp:126 msgid "NP Add" @@ -3600,8 +3762,12 @@ msgid "Other" msgstr "Outros" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." -msgstr "Outro Client desconectou enquanto o jogo rodava!! O Netplay foi desabilitado. Você deve parar o jogo manualmente." +msgid "" +"Other client disconnected while game is running!! NetPlay is disabled. You " +"manually stop the game." +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 msgid "Output" @@ -4057,10 +4223,8 @@ msgstr "Filtro de Busca" msgid "Search Subfolders" msgstr "Procurar em sub-pastas" -#: Source/Core/Common/Src/SysConf.h:104 -#: Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 -#: Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 +#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 #, c-format msgid "Section %s not found in SYSCONF" msgstr "A seção %s não foi encontrada no SYSCONF" @@ -4137,13 +4301,15 @@ msgstr "Fonte Selecionada" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 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 "" "Seleciona que resolução será usada no modo Tela Cheia.\n" -"Isto deve ser sempre maior ou igual à Resolução Interna. O impacto na performance é insignificante.\n" +"Isto deve ser sempre maior ou igual à Resolução Interna. O impacto na " +"performance é insignificante.\n" "\n" "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.." @@ -4151,13 +4317,15 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 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 "" "Seleciona qual API gráfico será usado internamente.\n" -"Direct3D 9 é geralmente o mais rápido. O OpenGL tem menos erros, no entanto. O Direct3D 11 está entre os dois.\n" +"Direct3D 9 é geralmente o mais rápido. O OpenGL tem menos erros, no entanto. " +"O Direct3D 11 está entre os dois.\n" "Note que os Backends Direct3D só podem ser usados no Windows.\n" "\n" "Se estiver em dúvida, use o Direct3D 9." @@ -4179,8 +4347,11 @@ msgid "Serbian" msgstr "Sérvio" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -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" +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 msgid "Set" @@ -4198,7 +4369,8 @@ msgstr "Definir como Memory Card padrão%c" #: Source/Core/Core/Src/ActionReplay.cpp:462 #, c-format 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" +msgstr "" +"SetARCode_IsActive: O índice é maior que a lista de códigos AR de tamanho %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Settings..." @@ -4319,10 +4491,12 @@ msgstr "Mostrar uma janela de confirmação antes de parar um jogo." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 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 "" "Mostra uma menssagem 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." +"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:812 msgid "Show first block" @@ -4346,11 +4520,13 @@ msgstr "Mostrar título do salva" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 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 "" -"Mostra o número de quadros renderizados por segundo como uma forma de medir a velocidade da emulação.\n" +"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." @@ -4398,11 +4574,13 @@ msgstr "Não permite o acesso da CPU ao EFB" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 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 "" -"Não faz o passe de destino Alfa usado em muitos jogos para vários efeitos gráficos.\n" +"Não faz o passe de destino Alfa usado em muitos jogos para vários efeitos " +"gráficos.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -4430,13 +4608,15 @@ msgstr "Renderizador por Software" #: 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 "" "O Renderizador por Software é bem mais lento que os outros backends.\n" "É útil apenas para a depuração de problemas.\n" -"Você realmente quer utilizar o Renderizador por Software? Se estiver em dúvida, pressione 'Não'." +"Você realmente quer utilizar o Renderizador por Software? Se estiver em " +"dúvida, pressione 'Não'." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 msgid "Sound Settings" @@ -4468,13 +4648,21 @@ msgstr "Volume do Auto-Falante:" #: 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 "" -"Especifica a resolução a renderizar. Uma resolução mais alta aumenta a qualidade visual mas é bastante pesada e pode causar problemas em alguns jogos.\n" -"\"Múltiplo de 640x528\" é um pouco mais lento que \"Window Size\" mas causa menos problemas. De forma geral, quanto menor for a resolução interna, maior será a performance.\n" +"Especifica a resolução a renderizar. Uma resolução mais alta aumenta a " +"qualidade visual mas é bastante pesada e pode causar problemas em alguns " +"jogos.\n" +"\"Múltiplo de 640x528\" é um pouco mais lento que \"Window Size\" mas causa " +"menos problemas. De forma geral, quanto menor for a resolução interna, maior " +"será a performance.\n" "\n" "Se estiver em dúvida, selecione 640x528." @@ -4629,8 +4817,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 "O arquivo %s não pôde ser aberto para escrita. Por favor cheque se ele não está aberto em outro programa." +msgid "" +"The file %s could not be opened for writing. Please check if it's already " +"opened by another program." +msgstr "" +"O arquivo %s não pôde ser aberto para escrita. Por favor cheque se ele não " +"está aberto em outro programa." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format @@ -4656,11 +4848,16 @@ msgstr "O código AR resultante da derciptação não contém nenhuma linha." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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" +msgstr "" +"O Salva que você está tentando copiar tem um tamanho de arquivo inválido" #: Source/Core/DolphinWX/Src/Main.cpp:363 -msgid "The selected language is not supported by your system. Falling back to system default." -msgstr "O idioma selecionado não é suportado pelo seu sistema. Voltando ao padrão do sistema." +msgid "" +"The selected language is not supported by your system. Falling back to " +"system default." +msgstr "" +"O idioma selecionado não é suportado pelo seu sistema. Voltando ao padrão do " +"sistema." #: Source/Core/Core/Src/NetPlayClient.cpp:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -4696,8 +4893,12 @@ 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:467 -msgid "There must be a ticket for 00000001/00000002. Your NAND dump is probably incomplete." -msgstr "É necessário um ticket para 00000001/00000002. O seu Dump do NAND está provavelmente incompleto." +msgid "" +"There must be a ticket for 00000001/00000002. Your NAND dump is probably " +"incomplete." +msgstr "" +"É necessário um ticket para 00000001/00000002. O seu Dump do NAND está " +"provavelmente incompleto." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "" @@ -4708,23 +4909,34 @@ msgstr "" "Indeterminado significa que o jogo usa as configurações do Dolphin." #: Source/Core/Core/Src/ActionReplay.cpp:356 -msgid "This action replay simulator does not support codes that modify Action Replay itself." -msgstr "Este simulador de Action Replay não suporta códigos que modifiquem o Action Replay em si." +msgid "" +"This action replay simulator does not support codes that modify Action " +"Replay itself." +msgstr "" +"Este simulador de Action Replay não suporta códigos que modifiquem o Action " +"Replay em si." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 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." +msgstr "" +"Isto pode causar diminuição da performance no Wii Menu e em alguns jogos." #: 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 "" "Este recurso permite mexer na câmera do jogo.\n" "\n" -"Segure o botão direito e mova o mouse para mover a câmera em qualquer direção. Segure SHIFT e pressione uma das teclas WASD para mover a câmera em uma certa distância (SHIFT+0 para movê-la mais rápido e SHIFT+9 para movê-la mais devagar). Pressione SHIFT+R para voltar a câmera à posição inicial.\n" +"Segure o botão direito e mova o mouse para mover a câmera em qualquer " +"direção. Segure SHIFT e pressione uma das teclas WASD para mover a câmera em " +"uma certa distância (SHIFT+0 para movê-la mais rápido e SHIFT+9 para movê-la " +"mais devagar). Pressione SHIFT+R para voltar a câmera à posição inicial.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -4737,7 +4949,8 @@ msgid "" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" "Isto é usado para controlar a velocidade do jogo por throttle de som.\n" -"Desativar isso pode causar velocidade de jogo anormal, ás vezes muito rápido.\n" +"Desativar isso pode causar velocidade de jogo anormal, ás vezes muito " +"rápido.\n" "Mas algumas vezes ativar isso pode causar ruído constante.\n" "\n" "Atalho de Teclado : Segure para instantaneamente desativar o Throttle." @@ -4748,11 +4961,15 @@ msgstr "Isto é usado para tocar trilhas sonoras de jogos, como BGM" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 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 "" -"Isto separa os segmentos de Ãudio e Vídeo, para que eles possam ser rodados em núcleos diferentes.\n" -"Dá um grande aumento de velocidade para PCs com mais de um núcleo, mas também pode causar travamentos/erros ocasionais." +"Isto separa os segmentos de Ãudio e Vídeo, para que eles possam ser rodados " +"em núcleos diferentes.\n" +"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:283 msgid "This will let you Manually Edit the INI config file" @@ -4803,8 +5020,7 @@ msgstr "Houve a tentativa de carregar um tipo de arquivo desconhecido." msgid "Triggers" msgstr "Gatilhos" -#: Source/Core/Common/Src/SysConf.h:92 -#: Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 msgid "Trying to read from invalid SYSCONF" msgstr "Tentando ler de um SYSCONF inválido" @@ -4856,10 +5072,13 @@ 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 "" -"Não foi possível analisar a linha %lu do código AR digitado como código válido encriptado ou decriptad. Certifique-se de que você digitou corretamente.\n" +"Não foi possível analisar a linha %lu do código AR digitado como código " +"válido encriptado ou decriptad. Certifique-se de que você digitou " +"corretamente.\n" "Você gostaria de ignorar esta linha e continuar a análise?" #: Source/Core/DolphinWX/Src/FrameTools.cpp:404 @@ -4893,7 +5112,8 @@ msgstr "Menssagem desconhecida recebida com identificação: %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" -msgstr "Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!" +msgstr "" +"Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!" #: Source/Core/Core/Src/HW/Memmap.cpp:633 #, c-format @@ -4942,19 +5162,23 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Usa múltiplos segmentos para decodificar texturas.\n" -"Pode resultar em um aumento de velocidade (especialmente em CPUs com mais de dois núcleos).\n" +"Pode resultar em um aumento de velocidade (especialmente em CPUs com mais de " +"dois núcleos).\n" "\n" "Se estiver em dúvida, deixe isto desativado." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 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 "" -"Normalmente se a compilação dos Shaders falha, uma mensagem de erro é mostrada.\n" -"No entanto, é possível impedir estas mensagens de interromperem o jogo ativando esta opção.\n" +"Normalmente se a compilação dos Shaders falha, uma mensagem de erro é " +"mostrada.\n" +"No entanto, é possível impedir estas mensagens de interromperem o jogo " +"ativando esta opção.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -5039,7 +5263,8 @@ msgid "" "%s\n" "Do you wish to continue?" msgstr "" -"Aviso! É recomendado que você tenha um backup de todos os arquivos na pasta:\n" +"Aviso! É recomendado que você tenha um backup de todos os arquivos na " +"pasta:\n" "%s\n" "Deseja continuar?" @@ -5051,7 +5276,8 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" -"Aviso: Isso vai substituir quaisquer arquivos de salva existentes na pasta :\n" +"Aviso: Isso vai substituir quaisquer arquivos de salva existentes na " +"pasta :\n" "%s\n" "que tenham o mesmo nome de um arquivo do Memory Card\n" "Continuar?" @@ -5195,7 +5421,8 @@ msgid "" "Only Zelda ucode games will work correctly with them.\n" msgstr "" "Você está usando roms do DSP grátis feitas pela Equipe do Dolphin.\n" -"Apenas o ucode dos jogos da série Zelda irão funcionar corretamente com elas. \n" +"Apenas o ucode dos jogos da série Zelda irão funcionar corretamente com " +"elas. \n" #: Source/Core/DolphinWX/Src/FrameAui.cpp:72 msgid "You can't close panes that have pages in them." @@ -5277,14 +5504,19 @@ msgstr "[Personalizado]" #: 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 "" "[EXPERIMENTAL]\n" -"Tenta aumentar a velocidade de emulação dando o trabalho de decodificação de texturas para a GPU usando o Framework OpenCL.\n" -"No entanto, em seu estado atual ele causa defeitos nas texturas em vários jogos. Além disso, na maioria dos casos ele é mais lento que a decodificação usual da CPU.\n" +"Tenta aumentar a velocidade de emulação dando o trabalho de decodificação de " +"texturas para a GPU usando o Framework OpenCL.\n" +"No entanto, em seu estado atual ele causa defeitos nas texturas em vários " +"jogos. Além disso, na maioria dos casos ele é mais lento que a decodificação " +"usual da CPU.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -5297,7 +5529,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "[EXPERIMENTAL]\n" -"Aumenta a velocidade da emulação fazendo um reservatório temporário de Dysplay Lists.\n" +"Aumenta a velocidade da emulação fazendo um reservatório temporário de " +"Dysplay Lists.\n" "Pode causar problemas.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -5331,7 +5564,9 @@ msgstr "iCacheJIT: Lendo Opcode de %x. Favor reportar." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108 #, c-format msgid "not a wii save or read failure for file header size %x" -msgstr "Não é um salva de Wii ou houve erro de leitura no tamanho do header do arquivo %x" +msgstr "" +"Não é um salva de Wii ou houve erro de leitura no tamanho do header do " +"arquivo %x" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:461 msgid "s" From 7f055d6b568c677c5b46aad14e5c62201578bef4 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 2 Nov 2011 02:16:49 +0100 Subject: [PATCH 109/381] UI: refactor the game list sorting code --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 159 ++++++++------------- 1 file changed, 57 insertions(+), 102 deletions(-) diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index de7bd83581..05f8c8365a 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -52,13 +52,21 @@ size_t CGameListCtrl::m_currentItem = 0; size_t CGameListCtrl::m_numberItem = 0; std::string CGameListCtrl::m_currentFilename; -static int currentColumn = 0; -bool operator < (const GameListItem &one, const GameListItem &other) +static int CompareGameListItems(const GameListItem* iso1, const GameListItem* iso2, + long sortData = CGameListCtrl::COLUMN_TITLE) { + int t = 1; + + if (sortData < 0) + { + t = -1; + sortData = -sortData; + } + int indexOne = 0; int indexOther = 0; - switch (one.GetCountry()) + switch (iso1->GetCountry()) { case DiscIO::IVolume::COUNTRY_JAPAN: case DiscIO::IVolume::COUNTRY_USA: @@ -68,7 +76,7 @@ bool operator < (const GameListItem &one, const GameListItem &other) indexOne = SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage; } - switch (other.GetCountry()) + switch (iso2->GetCountry()) { case DiscIO::IVolume::COUNTRY_JAPAN: case DiscIO::IVolume::COUNTRY_USA: @@ -78,35 +86,63 @@ bool operator < (const GameListItem &one, const GameListItem &other) indexOther = SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage; } - switch (currentColumn) + switch(sortData) { case CGameListCtrl::COLUMN_TITLE: - return strcasecmp(one.GetName(indexOne).c_str(), - other.GetName(indexOther).c_str()) < 0; + return strcasecmp(iso1->GetName(indexOne).c_str(), + iso2->GetName(indexOther).c_str()) * t; case CGameListCtrl::COLUMN_NOTES: { - // On Gamecube we show the company string, while it's empty on - // other platforms, so we show the description instead std::string cmp1 = - (one.GetPlatform() == GameListItem::GAMECUBE_DISC) ? - one.GetCompany() : one.GetDescription(indexOne); + (iso1->GetPlatform() == GameListItem::GAMECUBE_DISC) ? + iso1->GetCompany() : iso1->GetDescription(indexOne); std::string cmp2 = - (other.GetPlatform() == GameListItem::GAMECUBE_DISC) ? - other.GetCompany() : other.GetDescription(indexOther); - return strcasecmp(cmp1.c_str(), cmp2.c_str()) < 0; + (iso2->GetPlatform() == GameListItem::GAMECUBE_DISC) ? + iso2->GetCompany() : iso2->GetDescription(indexOther); + return strcasecmp(cmp1.c_str(), cmp2.c_str()) * t; } case CGameListCtrl::COLUMN_COUNTRY: - return (one.GetCountry() < other.GetCountry()); + if(iso1->GetCountry() > iso2->GetCountry()) + return 1 * t; + if(iso1->GetCountry() < iso2->GetCountry()) + return -1 * t; + return 0; case CGameListCtrl::COLUMN_SIZE: - return (one.GetFileSize() < other.GetFileSize()); + if (iso1->GetFileSize() > iso2->GetFileSize()) + return 1 * t; + if (iso1->GetFileSize() < iso2->GetFileSize()) + return -1 * t; + return 0; case CGameListCtrl::COLUMN_PLATFORM: - return (one.GetPlatform() < other.GetPlatform()); - default: - return strcasecmp(one.GetName(indexOne).c_str(), - other.GetName(indexOther).c_str()) < 0; + if(iso1->GetPlatform() > iso2->GetPlatform()) + return 1 * t; + if(iso1->GetPlatform() < iso2->GetPlatform()) + return -1 * t; + return 0; + + case CGameListCtrl::COLUMN_EMULATION_STATE: + { + const int + nState1 = iso1->GetEmuState(), + nState2 = iso2->GetEmuState(); + + if (nState1 > nState2) + return 1 * t; + if (nState1 < nState2) + return -1 * t; + else + return 0; + } + break; } + + return 0; } +bool operator < (const GameListItem &one, const GameListItem &other) +{ + return CompareGameListItems(&one, &other) < 0; +} BEGIN_EVENT_TABLE(wxEmuStateTip, wxTipWindow) EVT_KEY_DOWN(wxEmuStateTip::OnKeyDown) @@ -702,88 +738,7 @@ int wxCALLBACK wxListCompare(long item1, long item2, long sortData) const GameListItem *iso1 = caller->GetISO(item1); const GameListItem *iso2 = caller->GetISO(item2); - int t = 1; - - if (sortData < 0) - { - t = -1; - sortData = -sortData; - } - - int indexOne = 0; - int indexOther = 0; - - switch (iso1->GetCountry()) - { - case DiscIO::IVolume::COUNTRY_JAPAN: - case DiscIO::IVolume::COUNTRY_USA: - indexOne = 0; - break; - default: - indexOne = SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage; - } - - switch (iso2->GetCountry()) - { - case DiscIO::IVolume::COUNTRY_JAPAN: - case DiscIO::IVolume::COUNTRY_USA: - indexOther = 0; - break; - default: - indexOther = SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage; - } - - switch(sortData) - { - case CGameListCtrl::COLUMN_TITLE: - return strcasecmp(iso1->GetName(indexOne).c_str(), - iso2->GetName(indexOther).c_str()) * t; - case CGameListCtrl::COLUMN_NOTES: - { - std::string cmp1 = - (iso1->GetPlatform() == GameListItem::GAMECUBE_DISC) ? - iso1->GetCompany() : iso1->GetDescription(indexOne); - std::string cmp2 = - (iso2->GetPlatform() == GameListItem::GAMECUBE_DISC) ? - iso2->GetCompany() : iso2->GetDescription(indexOther); - return strcasecmp(cmp1.c_str(), cmp2.c_str()) * t; - } - case CGameListCtrl::COLUMN_COUNTRY: - if(iso1->GetCountry() > iso2->GetCountry()) - return 1 * t; - if(iso1->GetCountry() < iso2->GetCountry()) - return -1 * t; - return 0; - case CGameListCtrl::COLUMN_SIZE: - if (iso1->GetFileSize() > iso2->GetFileSize()) - return 1 * t; - if (iso1->GetFileSize() < iso2->GetFileSize()) - return -1 * t; - return 0; - case CGameListCtrl::COLUMN_PLATFORM: - if(iso1->GetPlatform() > iso2->GetPlatform()) - return 1 * t; - if(iso1->GetPlatform() < iso2->GetPlatform()) - return -1 * t; - return 0; - - case CGameListCtrl::COLUMN_EMULATION_STATE: - { - const int - nState1 = iso1->GetEmuState(), - nState2 = iso2->GetEmuState(); - - if (nState1 > nState2) - return 1 * t; - if (nState1 < nState2) - return -1 * t; - else - return 0; - } - break; - } - - return 0; + return CompareGameListItems(iso1, iso2, sortData); } void CGameListCtrl::OnColumnClick(wxListEvent& event) From 3d2a2abb49df3ae11a821c61e422f211be782f3e Mon Sep 17 00:00:00 2001 From: skidau Date: Thu, 3 Nov 2011 20:55:47 +1100 Subject: [PATCH 110/381] Made the JIT bypass the icache when it is executing the external interrupt exception handler. Fixed by comwiz.k --- Source/Core/Core/Src/HW/Memmap.cpp | 45 +++++++++++++++- .../Core/Src/PowerPC/JitCommon/JitCache.cpp | 54 +++++++++++++++---- .../Core/Src/PowerPC/JitCommon/JitCache.h | 2 +- 3 files changed, 89 insertions(+), 12 deletions(-) diff --git a/Source/Core/Core/Src/HW/Memmap.cpp b/Source/Core/Core/Src/HW/Memmap.cpp index c1c01d26a9..8b99243528 100644 --- a/Source/Core/Core/Src/HW/Memmap.cpp +++ b/Source/Core/Core/Src/HW/Memmap.cpp @@ -419,6 +419,44 @@ 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 @@ -430,8 +468,13 @@ u32 Read_Opcode_JIT(u32 _Address) return 0; } } + u32 inst = 0; - u32 inst = PowerPC::ppcState.iCache.ReadInstruction(_Address); + // 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 diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp index deffa9586d..422369d307 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp @@ -133,9 +133,9 @@ bool JitBlock::ContainsAddress(u32 em_address) DestroyBlock(i, false); } links_to.clear(); + block_map.clear(); num_blocks = 0; memset(blockCodePointers, 0, sizeof(u8*)*MAX_NUM_BLOCKS); - ClearSafe(); } void JitBlockCache::ClearSafe() @@ -207,9 +207,8 @@ bool JitBlock::ContainsAddress(u32 em_address) blockCodePointers[block_num] = code_ptr; JitBlock &b = blocks[block_num]; b.originalFirstOpcode = Memory::Read_Opcode_JIT(b.originalAddress); - if ((b.originalAddress + b.originalSize) > code_high) - code_high = b.originalAddress + b.originalSize; Memory::Write_Opcode_JIT(b.originalAddress, (JIT_OPCODE << 26) | block_num); + block_map[std::make_pair(b.originalAddress + 4 * b.originalSize - 1, b.originalAddress)] = block_num; if (block_link) { for (int i = 0; i < 2; i++) @@ -356,44 +355,79 @@ bool JitBlock::ContainsAddress(u32 em_address) void JitBlockCache::DestroyBlock(int block_num, bool invalidate) { + if (block_num < 0 || block_num >= num_blocks) + { + PanicAlert("DestroyBlock: Invalid block number %d", block_num); + return; + } JitBlock &b = blocks[block_num]; if (b.invalid) { + if (invalidate) + PanicAlert("Invalidating invalid block %d", block_num); return; } b.invalid = true; #ifdef JIT_UNLIMITED_ICACHE - Memory::Write_Opcode_JIT(b.originalAddress, JIT_ICACHE_INVALID_WORD); + Memory::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); #endif + + // We don't unlink blocks, we just send anyone who tries to run them 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); + */ } void JitBlockCache::InvalidateICache(u32 address) { address &= ~0x1f; + // 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(address, 0)), it2 = it1, it; + while (it2 != block_map.end() && it2->first.second < address + 0x20) + { + DestroyBlock(it2->second, true); + it2++; + } + if (it1 != it2) + { + block_map.erase(it1, it2); + } + #ifdef JIT_UNLIMITED_ICACHE + // invalidate iCache. + // icbi can be called with any address, so we should check + 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) + { + return; + } if (address & JIT_ICACHE_VMEM_BIT) { u32 cacheaddr = address & JIT_ICACHE_MASK; - if (cacheaddr > (code_high & JIT_ICACHE_MASK)) - return; memset(iCacheVMEM + cacheaddr, JIT_ICACHE_INVALID_BYTE, 32); } else if (address & JIT_ICACHE_EXRAM_BIT) { u32 cacheaddr = address & JIT_ICACHEEX_MASK; - if (cacheaddr > (code_high & JIT_ICACHEEX_MASK)) - return; memset(iCacheEx + cacheaddr, JIT_ICACHE_INVALID_BYTE, 32); } else { u32 cacheaddr = address & JIT_ICACHE_MASK; - if (cacheaddr > (code_high & JIT_ICACHE_MASK)) - return; memset(iCache + cacheaddr, JIT_ICACHE_INVALID_BYTE, 32); } #endif diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h index e6862a747b..91d47a3d0e 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h @@ -76,6 +76,7 @@ class JitBlockCache JitBlock *blocks; int num_blocks; std::multimap links_to; + std::map, u32> block_map; // (end_addr, start_addr) -> number #ifdef JIT_UNLIMITED_ICACHE u8 *iCache; u8 *iCacheEx; @@ -104,7 +105,6 @@ public: void Reset(); bool IsFull() const; - u32 code_high; // Code Cache JitBlock *GetBlock(int block_num); From 4c3a799f08f6f3b6a230987c3e0a1e984cf3a565 Mon Sep 17 00:00:00 2001 From: skidau Date: Fri, 4 Nov 2011 19:07:09 +1100 Subject: [PATCH 111/381] Added a check for HID0.DCFA before proceeding to dcbz. Allows Rubik's Puzzle Galaxy: RUSH to go in-game. --- .../Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp index 1133f348e4..b2a51b3e6f 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp @@ -401,7 +401,8 @@ void Interpreter::dcbtst(UGeckoInstruction _inst) void Interpreter::dcbz(UGeckoInstruction _inst) { // HACK but works... we think - Memory::Memset(Helper_Get_EA_X(_inst) & (~31), 0, 32); + if (!HID0.DCFA) + Memory::Memset(Helper_Get_EA_X(_inst) & (~31), 0, 32); } // eciwx/ecowx technically should access the specified device From 38a97fb9d7d2022b049a59799f22b58e2cd73e1f Mon Sep 17 00:00:00 2001 From: skidau Date: Fri, 4 Nov 2011 21:26:56 +1100 Subject: [PATCH 112/381] Added some missing "table31" instructions to the table. The instructions themselves are not properly implemented as they do not handle the OE case. Allows ANIMA Ark of Sinners to go in-game. --- .../Interpreter/Interpreter_Tables.cpp | 37 +++++++++++-------- .../Core/Src/PowerPC/Jit64/Jit64_Tables.cpp | 37 +++++++++++-------- .../Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 3 +- 3 files changed, 44 insertions(+), 33 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp index c6a0c352f8..13b1cf46c1 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp @@ -292,22 +292,27 @@ static GekkoOPTemplate table31[] = static GekkoOPTemplate table31_2[] = { - {266, Interpreter::addx, {"addx", 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}}, - {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}}, - {491, Interpreter::divwx, {"divwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39, 0, 0, 0}}, - {459, Interpreter::divwux, {"divwux", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39, 0, 0, 0}}, - {75, Interpreter::mulhwx, {"mulhwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4, 0, 0, 0}}, - {11, Interpreter::mulhwux, {"mulhwux", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4, 0, 0, 0}}, - {235, Interpreter::mullwx, {"mullwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4, 0, 0, 0}}, - {104, Interpreter::negx, {"negx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 0, 0, 0, 0}}, - {40, Interpreter::subfx, {"subfx", 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}}, - {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}}, + {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}}, + {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}}, + {491, Interpreter::divwx, {"divwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39, 0, 0, 0}}, + {1003, Interpreter::divwx, {"divwox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39, 0, 0, 0}}, + {459, Interpreter::divwux, {"divwux", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39, 0, 0, 0}}, + {971, Interpreter::divwux, {"divwuox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39, 0, 0, 0}}, + {75, Interpreter::mulhwx, {"mulhwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4, 0, 0, 0}}, + {11, Interpreter::mulhwux, {"mulhwux", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4, 0, 0, 0}}, + {235, Interpreter::mullwx, {"mullwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4, 0, 0, 0}}, + {747, Interpreter::mullwx, {"mullwox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4, 0, 0, 0}}, + {104, Interpreter::negx, {"negx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 0, 0, 0, 0}}, + {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}}, + {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}}, }; static GekkoOPTemplate table59[] = diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp index c366617dfa..474dabdd2f 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp @@ -305,22 +305,27 @@ static GekkoOPTemplate table31[] = static GekkoOPTemplate table31_2[] = { - {266, &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}}, - {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}}, - {491, &Jit64::Default}, //"divwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, - {459, &Jit64::divwux}, //"divwux", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, - {75, &Jit64::Default}, //"mulhwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, - {11, &Jit64::mulhwux}, //"mulhwux", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, - {235, &Jit64::mullwx}, //"mullwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, - {104, &Jit64::negx}, //"negx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, - {40, &Jit64::subfx}, //"subfx", 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}}, - {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}}, + {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}}, + {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}}, + {491, &Jit64::Default}, //"divwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, + {1003, &Jit64::Default}, //"divwox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, + {459, &Jit64::divwux}, //"divwux", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, + {971, &Jit64::divwux}, //"divwuox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, + {75, &Jit64::Default}, //"mulhwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, + {11, &Jit64::mulhwux}, //"mulhwux", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, + {235, &Jit64::mullwx}, //"mullwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, + {747, &Jit64::mullwx}, //"mullwox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, + {104, &Jit64::negx}, //"negx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, + {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}}, + {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}}, }; static GekkoOPTemplate table59[] = diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index b41d8b1852..b72e14f252 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -976,7 +976,8 @@ void Jit64::addx(UGeckoInstruction inst) INSTRUCTION_START JITDISABLE(Integer) int a = inst.RA, b = inst.RB, d = inst.RD; - _assert_msg_(DYNA_REC, !inst.OE, "Add - OE enabled :("); + if (inst.OE) + NOTICE_LOG(DYNA_REC, "Add - OE enabled :("); if (gpr.R(a).IsImm() && gpr.R(b).IsImm()) { From 2ee79e7057674a31f52993618f425ee4b3b01696 Mon Sep 17 00:00:00 2001 From: skidau Date: Fri, 4 Nov 2011 23:11:43 +1100 Subject: [PATCH 113/381] Added the missing "table31" instructions into the JITIL tables. --- .../Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp index bcfea0a07b..68e3e7493c 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp @@ -306,22 +306,27 @@ static GekkoOPTemplate table31[] = static GekkoOPTemplate table31_2[] = { - {266, &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}}, - {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}}, - {491, &JitIL::Default}, //"divwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, - {459, &JitIL::divwux}, //"divwux", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, - {75, &JitIL::Default}, //"mulhwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, - {11, &JitIL::mulhwux}, //"mulhwux", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, - {235, &JitIL::mullwx}, //"mullwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, - {104, &JitIL::negx}, //"negx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, - {40, &JitIL::subfx}, //"subfx", 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}}, - {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}}, + {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}}, + {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}}, + {491, &JitIL::Default}, //"divwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, + {1003, &JitIL::Default}, //"divwox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, + {459, &JitIL::divwux}, //"divwux", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, + {971, &JitIL::divwux}, //"divwuox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, + {75, &JitIL::Default}, //"mulhwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, + {11, &JitIL::mulhwux}, //"mulhwux", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, + {235, &JitIL::mullwx}, //"mullwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, + {747, &JitIL::mullwx}, //"mullwox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, + {104, &JitIL::negx}, //"negx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, + {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}}, + {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}}, }; static GekkoOPTemplate table59[] = From 9eaf20cc44dac19517dd9a2de1fcdb0d9da523e8 Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 5 Nov 2011 13:04:46 +1100 Subject: [PATCH 114/381] Fixed the slowdown that occurred under JIT32. Fixes issue 4969. --- Source/Core/Core/Src/HW/MemmapFunctions.cpp | 3 --- Source/Core/Core/Src/PowerPC/PPCCache.cpp | 6 ------ Source/Core/Core/Src/PowerPC/PPCCache.h | 1 - 3 files changed, 10 deletions(-) diff --git a/Source/Core/Core/Src/HW/MemmapFunctions.cpp b/Source/Core/Core/Src/HW/MemmapFunctions.cpp index 7e3f78616d..b391eea975 100644 --- a/Source/Core/Core/Src/HW/MemmapFunctions.cpp +++ b/Source/Core/Core/Src/HW/MemmapFunctions.cpp @@ -265,7 +265,6 @@ inline void WriteToHardware(u32 em_address, const T data, u32 effective_address, ((em_address & 0xF0000000) == 0xC0000000) || ((em_address & 0xF0000000) == 0x00000000)) { - PowerPC::ppcState.iCache.InvalidateBlock(em_address); *(T*)&m_pRAM[em_address & RAM_MASK] = bswap(data); return; } @@ -273,7 +272,6 @@ inline void WriteToHardware(u32 em_address, const T data, u32 effective_address, ((em_address & 0xF0000000) == 0xD0000000) || ((em_address & 0xF0000000) == 0x10000000)) { - PowerPC::ppcState.iCache.InvalidateBlock(em_address); *(T*)&m_pEXRAM[em_address & EXRAM_MASK] = bswap(data); return; } @@ -286,7 +284,6 @@ inline void WriteToHardware(u32 em_address, const T data, u32 effective_address, (bFakeVMEM && ((em_address &0xF0000000) == 0x40000000))) { // fake VMEM - PowerPC::ppcState.iCache.InvalidateBlock(em_address); *(T*)&m_pFakeVMEM[em_address & FAKEVMEM_MASK] = bswap(data); } else diff --git a/Source/Core/Core/Src/PowerPC/PPCCache.cpp b/Source/Core/Core/Src/PowerPC/PPCCache.cpp index 7e45c9e1ab..af40568813 100644 --- a/Source/Core/Core/Src/PowerPC/PPCCache.cpp +++ b/Source/Core/Core/Src/PowerPC/PPCCache.cpp @@ -103,12 +103,6 @@ namespace PowerPC jit->GetBlockCache()->InvalidateICache(addr); } - void InstructionCache::InvalidateBlock(u32 addr) - { - if (jit) - jit->GetBlockCache()->InvalidateICache(addr); - } - u32 InstructionCache::ReadInstruction(u32 addr) { if (!HID0.ICE) // instruction cache is disabled diff --git a/Source/Core/Core/Src/PowerPC/PPCCache.h b/Source/Core/Core/Src/PowerPC/PPCCache.h index 76e1f47345..c2e428946c 100644 --- a/Source/Core/Core/Src/PowerPC/PPCCache.h +++ b/Source/Core/Core/Src/PowerPC/PPCCache.h @@ -53,7 +53,6 @@ namespace PowerPC void Reset(); u32 ReadInstruction(u32 addr); void Invalidate(u32 addr); - void InvalidateBlock(u32 addr); }; } From cc6f90c7d5d56055b2d70c41cd9dd76c8b149955 Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 5 Nov 2011 19:42:06 +1100 Subject: [PATCH 115/381] Enabled memory breakpoints under JIT in the debugger. --- .../Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp | 6 +++++ .../Core/Src/PowerPC/JitCommon/Jit_Util.cpp | 27 ++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp index d8bb2bfc55..e1807cfbb4 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp @@ -1347,6 +1347,12 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, bool UseProfile, bool Mak 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 Jit->TEST(32, regLocForInst(RI, getOp2(I)), Imm32(mem_mask)); FixupBranch safe = Jit->J_CC(CC_NZ); // Fast routine diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp index 1b3155bf63..8abf0fc18a 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp @@ -118,7 +118,11 @@ void EmuCodeBlock::UnsafeLoadToEAX(const Gen::OpArg & opAddress, int accessSize, void EmuCodeBlock::SafeLoadToEAX(const Gen::OpArg & opAddress, int accessSize, s32 offset, bool signExtend) { +#ifdef ENABLE_MEM_CHECK + if (Core::g_CoreStartupParameter.bUseFastMem && (accessSize == 32) && !Core::g_CoreStartupParameter.bMMU && !Core::g_CoreStartupParameter.bEnableDebugging) +#else if (Core::g_CoreStartupParameter.bUseFastMem && (accessSize == 32) && !Core::g_CoreStartupParameter.bMMU) +#endif { // BackPatch only supports 32-bits accesses UnsafeLoadToEAX(opAddress, accessSize, offset, signExtend); @@ -130,7 +134,14 @@ void EmuCodeBlock::SafeLoadToEAX(const Gen::OpArg & opAddress, int accessSize, s { mem_mask |= Memory::ADDR_MASK_MEM1; } - + +#ifdef ENABLE_MEM_CHECK + if (Core::g_CoreStartupParameter.bEnableDebugging) + { + mem_mask |= Memory::EXRAM_MASK; + } +#endif + if (opAddress.IsImm()) { u32 address = (u32)opAddress.offset + offset; @@ -232,6 +243,13 @@ void EmuCodeBlock::SafeWriteRegToReg(X64Reg reg_value, X64Reg reg_addr, int acce 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 fast = J_CC(CC_Z); @@ -256,6 +274,13 @@ void EmuCodeBlock::SafeWriteFloatToReg(X64Reg xmm_value, X64Reg reg_addr) 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. From 507a4aa704003273d163ca177403451f8047f900 Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Sun, 20 Nov 2011 19:32:00 +0200 Subject: [PATCH 116/381] Gameini database update for auto modellista, Happy Feet, Alone In The Dark, DeadSpace, MADWORLD, Scooby-Doo! Mystery Mayhem, FIFA 2003, Mission: Impossible Operation Surma, Def Jam Fight For NY, FIFA Soccer 2004, THE HOUSE OF THE DEAD 2 AND 3 RETURN, LEGO Star Wars The Complete Saga, Rayman Origins, The Legend of Zelda Skyward Sword. Fixes issue 4953. --- Data/User/GameConfig/GAUE08.ini | 13 ++++++++++--- Data/User/GameConfig/GAUJ08.ini | 12 ++++++++++-- Data/User/GameConfig/GC3D78.ini | 16 ++++++++++++++++ Data/User/GameConfig/GC3E78.ini | 16 ++++++++++++++++ Data/User/GameConfig/GC3F78.ini | 16 ++++++++++++++++ Data/User/GameConfig/GC3P78.ini | 16 ++++++++++++++++ Data/User/GameConfig/GFAD69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GFAE69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GFAP69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GFAS69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GH7E5D.ini | 17 ++++++++++++++--- Data/User/GameConfig/GMIE70.ini | 19 +++++++++++++++++++ Data/User/GameConfig/GMIP70.ini | 19 +++++++++++++++++++ Data/User/GameConfig/GNWP69.ini | 18 ++++++++++++++++++ Data/User/GameConfig/GXFE69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GXFF69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GXFP69.ini | 16 ++++++++++++++++ Data/User/GameConfig/RHDE8P.ini | 20 ++++++++++++++++++++ Data/User/GameConfig/RHDJ8P.ini | 20 ++++++++++++++++++++ Data/User/GameConfig/RHDP8P.ini | 20 ++++++++++++++++++++ Data/User/GameConfig/RLGE64.ini | 17 +++++++++++++++++ Data/User/GameConfig/RLGJ52.ini | 17 +++++++++++++++++ Data/User/GameConfig/RLGP64.ini | 17 +++++++++++++++++ Data/User/GameConfig/RRKE70.ini | 2 ++ Data/User/GameConfig/RRKP70.ini | 2 ++ Data/User/GameConfig/RZJD69.ini | 10 ++++++++++ Data/User/GameConfig/RZJE69.ini | 4 +++- Data/User/GameConfig/RZJJ13.ini | 10 ++++++++++ Data/User/GameConfig/RZJP69.ini | 6 ++++++ Data/User/GameConfig/RZZE8P.ini | 11 ++++++++++- Data/User/GameConfig/RZZJEL.ini | 17 +++++++++++++++++ Data/User/GameConfig/RZZP8P.ini | 11 +++++++++++ Data/User/GameConfig/SOJE41.ini | 17 +++++++++++++++++ Data/User/GameConfig/SOJP41.ini | 17 +++++++++++++++++ Data/User/GameConfig/SOUE01.ini | 18 ++++++++++++++++++ Data/User/GameConfig/SOUJ01.ini | 18 ++++++++++++++++++ Data/User/GameConfig/SOUK01.ini | 18 ++++++++++++++++++ Data/User/GameConfig/SOUP01.ini | 18 ++++++++++++++++++ 38 files changed, 554 insertions(+), 10 deletions(-) create mode 100644 Data/User/GameConfig/GC3D78.ini create mode 100644 Data/User/GameConfig/GC3E78.ini create mode 100644 Data/User/GameConfig/GC3F78.ini create mode 100644 Data/User/GameConfig/GC3P78.ini create mode 100644 Data/User/GameConfig/GFAD69.ini create mode 100644 Data/User/GameConfig/GFAE69.ini create mode 100644 Data/User/GameConfig/GFAP69.ini create mode 100644 Data/User/GameConfig/GFAS69.ini create mode 100644 Data/User/GameConfig/GMIE70.ini create mode 100644 Data/User/GameConfig/GMIP70.ini create mode 100644 Data/User/GameConfig/GNWP69.ini create mode 100644 Data/User/GameConfig/GXFE69.ini create mode 100644 Data/User/GameConfig/GXFF69.ini create mode 100644 Data/User/GameConfig/GXFP69.ini create mode 100644 Data/User/GameConfig/RHDE8P.ini create mode 100644 Data/User/GameConfig/RHDJ8P.ini create mode 100644 Data/User/GameConfig/RHDP8P.ini create mode 100644 Data/User/GameConfig/RLGE64.ini create mode 100644 Data/User/GameConfig/RLGJ52.ini create mode 100644 Data/User/GameConfig/RLGP64.ini create mode 100644 Data/User/GameConfig/RZZJEL.ini create mode 100644 Data/User/GameConfig/SOJE41.ini create mode 100644 Data/User/GameConfig/SOJP41.ini create mode 100644 Data/User/GameConfig/SOUE01.ini create mode 100644 Data/User/GameConfig/SOUJ01.ini create mode 100644 Data/User/GameConfig/SOUK01.ini create mode 100644 Data/User/GameConfig/SOUP01.ini diff --git a/Data/User/GameConfig/GAUE08.ini b/Data/User/GameConfig/GAUE08.ini index 86c546a939..d134940264 100644 --- a/Data/User/GameConfig/GAUE08.ini +++ b/Data/User/GameConfig/GAUE08.ini @@ -2,9 +2,15 @@ [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 = Use Real XFB and Safe texture cache +EmulationIssues = Slowdowns ingame if Accurate texture cache is disabled. [OnFrame] Add memory patches to be applied every frame here. [Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = [ActionReplay] Add action replay cheats here. $Master Code C40EBABC 0000FF00 @@ -58,6 +64,7 @@ $C-Stick Sends All Car Back To Start 00000000 00070B60 [Video_Settings] UseXFB = True -UseRealXFB = True +UseRealXFB = False SafeTextureCache = True - +SafeTextureCacheColorSamples = 128 +[Gecko] diff --git a/Data/User/GameConfig/GAUJ08.ini b/Data/User/GameConfig/GAUJ08.ini index bf4a323cb7..5f36abb0f2 100644 --- a/Data/User/GameConfig/GAUJ08.ini +++ b/Data/User/GameConfig/GAUJ08.ini @@ -2,11 +2,19 @@ [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 = Use Real XFB and Safe texture cache +EmulationIssues = Slowdowns ingame if Accurate texture cache is disabled. [OnFrame] Add memory patches to be applied every frame here. [Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = [ActionReplay] Add action replay cheats here. [Video_Settings] UseXFB = True -UseRealXFB = True +UseRealXFB = False SafeTextureCache = True +SafeTextureCacheColorSamples = 128 +[Gecko] diff --git a/Data/User/GameConfig/GC3D78.ini b/Data/User/GameConfig/GC3D78.ini new file mode 100644 index 0000000000..a602203f18 --- /dev/null +++ b/Data/User/GameConfig/GC3D78.ini @@ -0,0 +1,16 @@ +# GC3D78 - Scooby-Doo!(tm) Mystery Mayhem +[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/GC3E78.ini b/Data/User/GameConfig/GC3E78.ini new file mode 100644 index 0000000000..9daa7a6088 --- /dev/null +++ b/Data/User/GameConfig/GC3E78.ini @@ -0,0 +1,16 @@ +# GC3E78 - Scooby-Doo!(tm) Mystery Mayhem +[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/GC3F78.ini b/Data/User/GameConfig/GC3F78.ini new file mode 100644 index 0000000000..10665939be --- /dev/null +++ b/Data/User/GameConfig/GC3F78.ini @@ -0,0 +1,16 @@ +# GC3F78 - Scooby-Doo!(tm) Mystery Mayhem +[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/GC3P78.ini b/Data/User/GameConfig/GC3P78.ini new file mode 100644 index 0000000000..0fb1533be4 --- /dev/null +++ b/Data/User/GameConfig/GC3P78.ini @@ -0,0 +1,16 @@ +# GC3P78 - Scooby-Doo!(tm) Mystery Mayhem +[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/GFAD69.ini b/Data/User/GameConfig/GFAD69.ini new file mode 100644 index 0000000000..115f719d10 --- /dev/null +++ b/Data/User/GameConfig/GFAD69.ini @@ -0,0 +1,16 @@ +# GFAD69 - FIFA 2003 +[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 = Sound issues need LLE plugin and videos are messed up. Slow due to MMU. +[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/GFAE69.ini b/Data/User/GameConfig/GFAE69.ini new file mode 100644 index 0000000000..bfeae04974 --- /dev/null +++ b/Data/User/GameConfig/GFAE69.ini @@ -0,0 +1,16 @@ +# GFAE69 - FIFA 2003 +[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 = Sound issues need LLE plugin and videos are messed up. Slow due to MMU. +[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/GFAP69.ini b/Data/User/GameConfig/GFAP69.ini new file mode 100644 index 0000000000..3de799a41e --- /dev/null +++ b/Data/User/GameConfig/GFAP69.ini @@ -0,0 +1,16 @@ +# GFAP69 - FIFA 2003 +[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 = Sound issues need LLE plugin and videos are messed up. Slow due to MMU. +[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/GFAS69.ini b/Data/User/GameConfig/GFAS69.ini new file mode 100644 index 0000000000..003023a82c --- /dev/null +++ b/Data/User/GameConfig/GFAS69.ini @@ -0,0 +1,16 @@ +# GFAS69 - FIFA 2003 +[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 = Sound issues need LLE plugin and videos are messed up. Slow due to MMU. +[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/GH7E5D.ini b/Data/User/GameConfig/GH7E5D.ini index 93ed35bad6..4ce4e822d5 100644 --- a/Data/User/GameConfig/GH7E5D.ini +++ b/Data/User/GameConfig/GH7E5D.ini @@ -1,8 +1,19 @@ # GH7E5D - Happy Feet [Core] Values set here will override the main dolphin settings. -TLBHack = 1 +MMU = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Dolphin crash -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] +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/GMIE70.ini b/Data/User/GameConfig/GMIE70.ini new file mode 100644 index 0000000000..f32657ffaa --- /dev/null +++ b/Data/User/GameConfig/GMIE70.ini @@ -0,0 +1,19 @@ +# GMIE70 - Mission: Impossible Operation Surma +[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/GMIP70.ini b/Data/User/GameConfig/GMIP70.ini new file mode 100644 index 0000000000..2738d6e0c4 --- /dev/null +++ b/Data/User/GameConfig/GMIP70.ini @@ -0,0 +1,19 @@ +# GMIP70 - Mission: Impossible Operation Surma +[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/GNWP69.ini b/Data/User/GameConfig/GNWP69.ini new file mode 100644 index 0000000000..3ce337ae1e --- /dev/null +++ b/Data/User/GameConfig/GNWP69.ini @@ -0,0 +1,18 @@ +# GNWP69 - Def Jam Fight For NY +[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/GXFE69.ini b/Data/User/GameConfig/GXFE69.ini new file mode 100644 index 0000000000..8a70142f4a --- /dev/null +++ b/Data/User/GameConfig/GXFE69.ini @@ -0,0 +1,16 @@ +# GXFE69 - FIFA Soccer 2004 +[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 = Sound issues need LLE plugin and videos are messed up. Slow due to MMU.Use Opengl backend for less graphic glitches. +[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/GXFF69.ini b/Data/User/GameConfig/GXFF69.ini new file mode 100644 index 0000000000..22a7852666 --- /dev/null +++ b/Data/User/GameConfig/GXFF69.ini @@ -0,0 +1,16 @@ +# GXFF69 - FIFA Soccer 2004 +[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 = Sound issues need LLE plugin and videos are messed up. Slow due to MMU.Use Opengl backend for less graphic glitches. +[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/GXFP69.ini b/Data/User/GameConfig/GXFP69.ini new file mode 100644 index 0000000000..b6c9d1a977 --- /dev/null +++ b/Data/User/GameConfig/GXFP69.ini @@ -0,0 +1,16 @@ +# GXFP69 - FIFA Soccer 2004 +[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 = Sound issues need LLE plugin and videos are messed up. Slow due to MMU.Use Opengl backend for less graphic glitches. +[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/RHDE8P.ini b/Data/User/GameConfig/RHDE8P.ini new file mode 100644 index 0000000000..4a2fd1499c --- /dev/null +++ b/Data/User/GameConfig/RHDE8P.ini @@ -0,0 +1,20 @@ +# 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. +[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 diff --git a/Data/User/GameConfig/RHDJ8P.ini b/Data/User/GameConfig/RHDJ8P.ini new file mode 100644 index 0000000000..784933d971 --- /dev/null +++ b/Data/User/GameConfig/RHDJ8P.ini @@ -0,0 +1,20 @@ +# 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. +[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 diff --git a/Data/User/GameConfig/RHDP8P.ini b/Data/User/GameConfig/RHDP8P.ini new file mode 100644 index 0000000000..f6a1f98430 --- /dev/null +++ b/Data/User/GameConfig/RHDP8P.ini @@ -0,0 +1,20 @@ +# 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. +[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 diff --git a/Data/User/GameConfig/RLGE64.ini b/Data/User/GameConfig/RLGE64.ini new file mode 100644 index 0000000000..505df3c17d --- /dev/null +++ b/Data/User/GameConfig/RLGE64.ini @@ -0,0 +1,17 @@ +# RLGE64 - LEGO Star Wars The Complete Saga +[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. +[Wii] +DisableWiimoteSpeaker = 1 +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/RLGJ52.ini b/Data/User/GameConfig/RLGJ52.ini new file mode 100644 index 0000000000..52b8648072 --- /dev/null +++ b/Data/User/GameConfig/RLGJ52.ini @@ -0,0 +1,17 @@ +# RLGJ52 - LEGO Star Wars The Complete Saga +[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. +[Wii] +DisableWiimoteSpeaker = 1 +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/RLGP64.ini b/Data/User/GameConfig/RLGP64.ini new file mode 100644 index 0000000000..f82d202584 --- /dev/null +++ b/Data/User/GameConfig/RLGP64.ini @@ -0,0 +1,17 @@ +# RLGP64 - LEGO Star Wars The Complete Saga +[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. +[Wii] +DisableWiimoteSpeaker = 1 +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/RRKE70.ini b/Data/User/GameConfig/RRKE70.ini index 9a28e7535d..f65ca62bdc 100644 --- a/Data/User/GameConfig/RRKE70.ini +++ b/Data/User/GameConfig/RRKE70.ini @@ -17,3 +17,5 @@ EmulationIssues = [Gecko] [Video_Hacks] EFBEmulateFormatChanges = True +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/RRKP70.ini b/Data/User/GameConfig/RRKP70.ini index 04cdba86b7..e87f2f60d3 100644 --- a/Data/User/GameConfig/RRKP70.ini +++ b/Data/User/GameConfig/RRKP70.ini @@ -17,3 +17,5 @@ EmulationIssues = [Gecko] [Video_Hacks] EFBEmulateFormatChanges = True +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/RZJD69.ini b/Data/User/GameConfig/RZJD69.ini index b5511f120e..9a8825e038 100644 --- a/Data/User/GameConfig/RZJD69.ini +++ b/Data/User/GameConfig/RZJD69.ini @@ -1,12 +1,22 @@ # RZJD69 - DeadSpace [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. [Video] ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = [ActionReplay] [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 +[Video_Enhancements] +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/RZJE69.ini b/Data/User/GameConfig/RZJE69.ini index 3999569fcf..b8902b2ff0 100644 --- a/Data/User/GameConfig/RZJE69.ini +++ b/Data/User/GameConfig/RZJE69.ini @@ -1,5 +1,6 @@ # RZJE69 - DeadSpace [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 = @@ -17,4 +18,5 @@ PH_ZFar = SafeTextureCache = True SafeTextureCacheColorSamples = 512 [Video_Enhancements] -PostProcessingShader = +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/RZJJ13.ini b/Data/User/GameConfig/RZJJ13.ini index 2054dfecf7..79efb8b08c 100644 --- a/Data/User/GameConfig/RZJJ13.ini +++ b/Data/User/GameConfig/RZJJ13.ini @@ -1,12 +1,22 @@ # RZJJ13 - DeadSpace [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. [Video] ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = [ActionReplay] [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 +[Video_Enhancements] +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/RZJP69.ini b/Data/User/GameConfig/RZJP69.ini index f6bbffccb3..cef151134d 100644 --- a/Data/User/GameConfig/RZJP69.ini +++ b/Data/User/GameConfig/RZJP69.ini @@ -1,5 +1,6 @@ # RZJP69 - DeadSpace [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 = @@ -29,3 +30,8 @@ $Rapid Fire [TNTkryzt] 0423A4DC 60000000 [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 +[Video_Enhancements] +[Wii] +DisableWiimoteSpeaker = 1 + diff --git a/Data/User/GameConfig/RZZE8P.ini b/Data/User/GameConfig/RZZE8P.ini index d029c1da66..31859ef891 100644 --- a/Data/User/GameConfig/RZZE8P.ini +++ b/Data/User/GameConfig/RZZE8P.ini @@ -5,4 +5,13 @@ 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 diff --git a/Data/User/GameConfig/RZZJEL.ini b/Data/User/GameConfig/RZZJEL.ini new file mode 100644 index 0000000000..0e6a08334a --- /dev/null +++ b/Data/User/GameConfig/RZZJEL.ini @@ -0,0 +1,17 @@ +# 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 diff --git a/Data/User/GameConfig/RZZP8P.ini b/Data/User/GameConfig/RZZP8P.ini index e97339328c..6dc117c26f 100644 --- a/Data/User/GameConfig/RZZP8P.ini +++ b/Data/User/GameConfig/RZZP8P.ini @@ -1,6 +1,17 @@ # 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 diff --git a/Data/User/GameConfig/SOJE41.ini b/Data/User/GameConfig/SOJE41.ini new file mode 100644 index 0000000000..183a8823ca --- /dev/null +++ b/Data/User/GameConfig/SOJE41.ini @@ -0,0 +1,17 @@ +# 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 diff --git a/Data/User/GameConfig/SOJP41.ini b/Data/User/GameConfig/SOJP41.ini new file mode 100644 index 0000000000..2c835fe6e2 --- /dev/null +++ b/Data/User/GameConfig/SOJP41.ini @@ -0,0 +1,17 @@ +# 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 diff --git a/Data/User/GameConfig/SOUE01.ini b/Data/User/GameConfig/SOUE01.ini new file mode 100644 index 0000000000..5e9a8939d7 --- /dev/null +++ b/Data/User/GameConfig/SOUE01.ini @@ -0,0 +1,18 @@ +# SOUE01 - The Legend of Zelda Skyward Sword +[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 and efb to ram for less graphic glitches. 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] +[Video_Hacks] +EFBAccessEnable = True +DlistCachingEnable = False diff --git a/Data/User/GameConfig/SOUJ01.ini b/Data/User/GameConfig/SOUJ01.ini new file mode 100644 index 0000000000..f868f5ccf2 --- /dev/null +++ b/Data/User/GameConfig/SOUJ01.ini @@ -0,0 +1,18 @@ +# SOUJ01 - The Legend of Zelda Skyward Sword +[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 and efb to ram for less graphic glitches. 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] +[Video_Hacks] +EFBAccessEnable = True +DlistCachingEnable = False diff --git a/Data/User/GameConfig/SOUK01.ini b/Data/User/GameConfig/SOUK01.ini new file mode 100644 index 0000000000..800efb33d0 --- /dev/null +++ b/Data/User/GameConfig/SOUK01.ini @@ -0,0 +1,18 @@ +# SOUK01 - The Legend of Zelda Skyward Sword +[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 and efb to ram for less graphic glitches. 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] +[Video_Hacks] +EFBAccessEnable = True +DlistCachingEnable = False diff --git a/Data/User/GameConfig/SOUP01.ini b/Data/User/GameConfig/SOUP01.ini new file mode 100644 index 0000000000..23f5acee83 --- /dev/null +++ b/Data/User/GameConfig/SOUP01.ini @@ -0,0 +1,18 @@ +# SOUP01 - The Legend of Zelda Skyward Sword +[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 and efb to ram for less graphic glitches. 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] +[Video_Hacks] +EFBAccessEnable = True +DlistCachingEnable = False From 73beeaf45ac05f91284e22f4afe5c7fe394fed07 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 20 Nov 2011 15:35:43 -0800 Subject: [PATCH 117/381] Change the mask shown for rlw* to be shifted. ie the result of the instruction is source & mask, right-aligned. --- Externals/Bochs_disasm/PowerPCDisasm.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Externals/Bochs_disasm/PowerPCDisasm.cpp b/Externals/Bochs_disasm/PowerPCDisasm.cpp index 16f4afd865..0b0f8c7326 100644 --- a/Externals/Bochs_disasm/PowerPCDisasm.cpp +++ b/Externals/Bochs_disasm/PowerPCDisasm.cpp @@ -563,7 +563,7 @@ typedef unsigned int ppc_word; } - static unsigned int Helper_Mask(int mb, int me) + static unsigned int Helper_Rotate_Mask(int r, int mb, int me) { //first make 001111111111111 part unsigned int begin = 0xFFFFFFFF >> mb; @@ -573,9 +573,9 @@ typedef unsigned int ppc_word; unsigned int mask = begin ^ end; //and invert if backwards if (me < mb) - return ~mask; - else - return mask; + mask = ~mask; + //rotate the mask so it can be applied to source reg + return _rotl(mask, 32 - r); } @@ -587,7 +587,7 @@ typedef unsigned int ppc_word; int mb = (int)PPCGETC(in); int me = (int)PPCGETM(in); sprintf(dp->opcode,"rlw%s%c",name,in&1?'.':'\0'); - sprintf(dp->operands,"%s, %s, %s%d, %d, %d (%08x)",regnames[a],regnames[s],regsel[i],bsh,mb,me,Helper_Mask(mb, me)); + sprintf(dp->operands,"%s, %s, %s%d, %d, %d (%08x)",regnames[a],regnames[s],regsel[i],bsh,mb,me,Helper_Rotate_Mask(bsh, mb, me)); } From 29f52ce6dd8b16773b48936cda80d434143966f1 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 20 Nov 2011 16:25:23 -0800 Subject: [PATCH 118/381] gcc sux --- Externals/Bochs_disasm/PowerPCDisasm.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Externals/Bochs_disasm/PowerPCDisasm.cpp b/Externals/Bochs_disasm/PowerPCDisasm.cpp index 0b0f8c7326..56719ff662 100644 --- a/Externals/Bochs_disasm/PowerPCDisasm.cpp +++ b/Externals/Bochs_disasm/PowerPCDisasm.cpp @@ -39,6 +39,11 @@ #include "PowerPCDisasm.h" +#ifndef _MSC_VER +// Pull in rotate functions for non-msvc +#include "Common.h" +#endif + namespace PPCDisasm { From e5d051a4e977443785f4e78cb6464eca0408e578 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 22 Nov 2011 19:24:05 -0600 Subject: [PATCH 119/381] Update linux libav frame dump code for recent api changes. --- Source/Core/VideoCommon/Src/AVIDump.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Source/Core/VideoCommon/Src/AVIDump.cpp b/Source/Core/VideoCommon/Src/AVIDump.cpp index a5a6098489..469e00d9f5 100644 --- a/Source/Core/VideoCommon/Src/AVIDump.cpp +++ b/Source/Core/VideoCommon/Src/AVIDump.cpp @@ -267,8 +267,6 @@ bool AVIDump::CreateFile() s_Stream->codec->gop_size = 12; s_Stream->codec->pix_fmt = g_Config.bUseFFV1 ? PIX_FMT_BGRA : PIX_FMT_YUV420P; - av_set_parameters(s_FormatContext, NULL); - if (!(codec = avcodec_find_encoder(s_Stream->codec->codec_id)) || (avcodec_open(s_Stream->codec, codec) < 0)) { @@ -287,14 +285,14 @@ bool AVIDump::CreateFile() s_OutBuffer = new uint8_t[s_size]; NOTICE_LOG(VIDEO, "Opening file %s for dumping", s_FormatContext->filename); - if (url_fopen(&s_FormatContext->pb, s_FormatContext->filename, URL_WRONLY) < 0) + if (avio_open(&s_FormatContext->pb, s_FormatContext->filename, AVIO_FLAG_WRITE) < 0) { WARN_LOG(VIDEO, "Could not open %s", s_FormatContext->filename); CloseFile(); return false; } - av_write_header(s_FormatContext); + avformat_write_header(s_FormatContext, NULL); return true; } @@ -374,7 +372,7 @@ void AVIDump::CloseFile() if (s_FormatContext) { if (s_FormatContext->pb) - url_fclose(s_FormatContext->pb); + avio_close(s_FormatContext->pb); av_free(s_FormatContext); s_FormatContext = NULL; } From ea42e9e04d6149b2ef67d6a1d6ecad3bd1223fc4 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 22 Nov 2011 19:56:42 -0600 Subject: [PATCH 120/381] Update required libav versions in the cmake build. --- CMakeTests/CheckLib.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeTests/CheckLib.cmake b/CMakeTests/CheckLib.cmake index affc92ae8f..43f9370188 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>=52.72.2 libavformat>=52.64.2 - libswscale>=0.11.0 libavutil>=50.15.1) + pkg_check_modules(LIBAV libavcodec>=53.5.0 libavformat>=53.2.0 + libswscale>=2.0.0 libavutil>=51.7.0) else() message("pkg-config is required to check for libav") endif() From 04026ae19ac902f946b8f238f96c4f8b2e740ff1 Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Mon, 28 Nov 2011 01:29:18 +0200 Subject: [PATCH 121/381] Gameini database cleanup of "postprocessingshader" and additions/updates for FlingSmash, Rune Factory Tides of Destiny, The Legend of Zelda Twilight Princess for GC and Wii. --- Data/User/GameConfig/G4AEE9.ini | 1 - Data/User/GameConfig/GCCE01.ini | 1 - Data/User/GameConfig/GCZE69.ini | 2 +- Data/User/GameConfig/GEZE8P.ini | 1 - Data/User/GameConfig/GEZP8P.ini | 1 - Data/User/GameConfig/GKME41.ini | 2 +- Data/User/GameConfig/GL8E4F.ini | 2 +- Data/User/GameConfig/GLME01.ini | 2 +- Data/User/GameConfig/GM8E01.ini | 2 +- Data/User/GameConfig/GRSPAF.ini | 2 ++ Data/User/GameConfig/GX2E52.ini | 2 +- Data/User/GameConfig/GZ2E01.ini | 5 +++-- Data/User/GameConfig/GZ2J01.ini | 3 ++- Data/User/GameConfig/GZ2P01.ini | 1 + Data/User/GameConfig/R22E01.ini | 22 ++++++++++++++++++++++ Data/User/GameConfig/R22J01.ini | 22 ++++++++++++++++++++++ Data/User/GameConfig/R22P01.ini | 22 ++++++++++++++++++++++ Data/User/GameConfig/R2GJAF.ini | 1 - Data/User/GameConfig/R3OE01.ini | 2 +- Data/User/GameConfig/R4EE01.ini | 2 +- Data/User/GameConfig/R4EJ01.ini | 2 +- Data/User/GameConfig/R4EP01.ini | 2 +- Data/User/GameConfig/RBHJ08.ini | 1 - Data/User/GameConfig/RBWE01.ini | 2 +- Data/User/GameConfig/RFCEGD.ini | 2 +- Data/User/GameConfig/RIPEAF.ini | 1 - Data/User/GameConfig/RMKP01.ini | 1 - Data/User/GameConfig/RZDE01.ini | 3 +++ Data/User/GameConfig/RZDJ01.ini | 6 +++++- Data/User/GameConfig/RZDK01.ini | 6 +++++- Data/User/GameConfig/RZDP01.ini | 8 ++++++-- Data/User/GameConfig/SDWE18.ini | 2 +- Data/User/GameConfig/SDWP18.ini | 2 +- Data/User/GameConfig/SK3EEB.ini | 2 +- Data/User/GameConfig/SO3EE9.ini | 19 +++++++++++++++++++ Data/User/GameConfig/SO3J99.ini | 19 +++++++++++++++++++ Data/User/GameConfig/SSZE5G.ini | 3 ++- 37 files changed, 148 insertions(+), 31 deletions(-) create mode 100644 Data/User/GameConfig/R22E01.ini create mode 100644 Data/User/GameConfig/R22J01.ini create mode 100644 Data/User/GameConfig/R22P01.ini create mode 100644 Data/User/GameConfig/SO3EE9.ini create mode 100644 Data/User/GameConfig/SO3J99.ini diff --git a/Data/User/GameConfig/G4AEE9.ini b/Data/User/GameConfig/G4AEE9.ini index 23e1643048..5c4701bb8e 100644 --- a/Data/User/GameConfig/G4AEE9.ini +++ b/Data/User/GameConfig/G4AEE9.ini @@ -7,7 +7,6 @@ EmulationStateId = 4 EmulationIssues = [OnFrame]#Add memory patches here. [Video_Enhancements] -PostProcessingShader = [Video_Hacks] DlistCachingEnable = False [Video] diff --git a/Data/User/GameConfig/GCCE01.ini b/Data/User/GameConfig/GCCE01.ini index 2e0dccc4c7..a841bf6408 100644 --- a/Data/User/GameConfig/GCCE01.ini +++ b/Data/User/GameConfig/GCCE01.ini @@ -302,6 +302,5 @@ PH_ZFar = SafeTextureCache = True SafeTextureCacheColorSamples = 512 [Video_Enhancements] -PostProcessingShader = [Video_Hacks] EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/GCZE69.ini b/Data/User/GameConfig/GCZE69.ini index eaba11ce0b..dd3f749849 100644 --- a/Data/User/GameConfig/GCZE69.ini +++ b/Data/User/GameConfig/GCZE69.ini @@ -14,4 +14,4 @@ ProjectionHack = 0 SafeTextureCache = True SafeTextureCacheColorSamples = 512 [Video_Enhancements] -PostProcessingShader = + diff --git a/Data/User/GameConfig/GEZE8P.ini b/Data/User/GameConfig/GEZE8P.ini index 2c9afa3700..6082ea8f59 100644 --- a/Data/User/GameConfig/GEZE8P.ini +++ b/Data/User/GameConfig/GEZE8P.ini @@ -17,5 +17,4 @@ PH_ZFar = SafeTextureCache = True SafeTextureCacheColorSamples = 512 [Video_Enhancements] -PostProcessingShader = [Video_Hacks] diff --git a/Data/User/GameConfig/GEZP8P.ini b/Data/User/GameConfig/GEZP8P.ini index ceb07208e7..8b48eb836e 100644 --- a/Data/User/GameConfig/GEZP8P.ini +++ b/Data/User/GameConfig/GEZP8P.ini @@ -17,5 +17,4 @@ PH_ZFar = SafeTextureCache = True SafeTextureCacheColorSamples = 512 [Video_Enhancements] -PostProcessingShader = [Video_Hacks] diff --git a/Data/User/GameConfig/GKME41.ini b/Data/User/GameConfig/GKME41.ini index 4f738d5674..1737175038 100644 --- a/Data/User/GameConfig/GKME41.ini +++ b/Data/User/GameConfig/GKME41.ini @@ -13,4 +13,4 @@ ProjectionHack = 0 SafeTextureCache = True SafeTextureCacheColorSamples = 512 [Video_Enhancements] -PostProcessingShader = + diff --git a/Data/User/GameConfig/GL8E4F.ini b/Data/User/GameConfig/GL8E4F.ini index 41b88ed85b..a4880c7c22 100644 --- a/Data/User/GameConfig/GL8E4F.ini +++ b/Data/User/GameConfig/GL8E4F.ini @@ -15,4 +15,4 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Enhancements] -PostProcessingShader = + diff --git a/Data/User/GameConfig/GLME01.ini b/Data/User/GameConfig/GLME01.ini index 53a301f016..97b857fb1a 100644 --- a/Data/User/GameConfig/GLME01.ini +++ b/Data/User/GameConfig/GLME01.ini @@ -22,4 +22,4 @@ $99 of some treasures 040AE530 3F000063 $End Boss Has No HP [Video_Enhancements] -PostProcessingShader = + diff --git a/Data/User/GameConfig/GM8E01.ini b/Data/User/GameConfig/GM8E01.ini index f706caab46..4118981ab8 100644 --- a/Data/User/GameConfig/GM8E01.ini +++ b/Data/User/GameConfig/GM8E01.ini @@ -101,4 +101,4 @@ SafeTextureCacheColorSamples = 512 EFBCopyEnable = True EFBToTextureEnable = False [Video_Enhancements] -PostProcessingShader = + diff --git a/Data/User/GameConfig/GRSPAF.ini b/Data/User/GameConfig/GRSPAF.ini index 214f087b16..2ce9edae96 100644 --- a/Data/User/GameConfig/GRSPAF.ini +++ b/Data/User/GameConfig/GRSPAF.ini @@ -557,5 +557,7 @@ PH_ZFar = [Gecko] [Video_Settings] UseXFB = True +UseRealXFB = False SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/GX2E52.ini b/Data/User/GameConfig/GX2E52.ini index 80547020b9..bb10b57ede 100644 --- a/Data/User/GameConfig/GX2E52.ini +++ b/Data/User/GameConfig/GX2E52.ini @@ -15,4 +15,4 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Enhancements] -PostProcessingShader = + diff --git a/Data/User/GameConfig/GZ2E01.ini b/Data/User/GameConfig/GZ2E01.ini index 760ac4368b..f84b0006e7 100644 --- a/Data/User/GameConfig/GZ2E01.ini +++ b/Data/User/GameConfig/GZ2E01.ini @@ -25,7 +25,7 @@ $Infinite Arrows $Infinite Lantern Oil 024061C8 00005460 $Have All Swords/Shields/Tunics -04406290 FFFFFFFF +04406290 00005460 $All Hidden Skills Learned 004069D9 0000000F 004069DA 000000F0 @@ -622,7 +622,7 @@ $Link has the Medicine Scent (Twilight Spectre) $Have All 60 Poe Souls (Twilight Spectre) 004062CC 0000003C $Have All 24 Golden Bugs (Twilight Spectre) -044062A4 FFFFFFFF +044062A4 0000003C $All Fish in Inventry (ZeldaFan07) 0240632C 00056363 0040634C 00000563 @@ -1488,6 +1488,7 @@ PH_ZFar = [Video_Hacks] EFBToTextureEnable = False EFBCopyEnable = True +EFBCopyCacheEnable = True [Video_Settings] SafeTextureCache = False SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/GZ2J01.ini b/Data/User/GameConfig/GZ2J01.ini index 5ae8e69bfa..da0b6ceb42 100644 --- a/Data/User/GameConfig/GZ2J01.ini +++ b/Data/User/GameConfig/GZ2J01.ini @@ -21,8 +21,9 @@ PH_ZFar = [Video_Hacks] EFBToTextureEnable = False EFBCopyEnable = True +EFBCopyCacheEnable = True [Video_Settings] SafeTextureCache = False SafeTextureCacheColorSamples = 512 [Video_Enhancements] -PostProcessingShader = \ No newline at end of file + diff --git a/Data/User/GameConfig/GZ2P01.ini b/Data/User/GameConfig/GZ2P01.ini index 9252b294c7..4ed0b6f6ef 100644 --- a/Data/User/GameConfig/GZ2P01.ini +++ b/Data/User/GameConfig/GZ2P01.ini @@ -88,6 +88,7 @@ PH_ZFar = [Video_Hacks] EFBToTextureEnable = False EFBCopyEnable = True +EFBCopyCacheEnable = True [Video_Settings] SafeTextureCache = False SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/R22E01.ini b/Data/User/GameConfig/R22E01.ini new file mode 100644 index 0000000000..8d992eb454 --- /dev/null +++ b/Data/User/GameConfig/R22E01.ini @@ -0,0 +1,22 @@ +# R22E01 - FlingSmash +[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] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 +[Video_Hacks] +EFBEmulateFormatChanges = True +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/R22J01.ini b/Data/User/GameConfig/R22J01.ini new file mode 100644 index 0000000000..cdf18e0b81 --- /dev/null +++ b/Data/User/GameConfig/R22J01.ini @@ -0,0 +1,22 @@ +# R22J01 - Tataite Hazumu: Super Smash Ball Plus +[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] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 +[Video_Hacks] +EFBEmulateFormatChanges = True +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/R22P01.ini b/Data/User/GameConfig/R22P01.ini new file mode 100644 index 0000000000..1a04cc43e1 --- /dev/null +++ b/Data/User/GameConfig/R22P01.ini @@ -0,0 +1,22 @@ +# R22P01 - FlingSmash +[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] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 +[Video_Hacks] +EFBEmulateFormatChanges = True +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/R2GJAF.ini b/Data/User/GameConfig/R2GJAF.ini index 5be6ca6a97..d4da60084e 100644 --- a/Data/User/GameConfig/R2GJAF.ini +++ b/Data/User/GameConfig/R2GJAF.ini @@ -17,6 +17,5 @@ PH_ZFar = UseXFB = True UseRealXFB = False [Video_Enhancements] -PostProcessingShader = [Video_Hacks] DlistCachingEnable = False diff --git a/Data/User/GameConfig/R3OE01.ini b/Data/User/GameConfig/R3OE01.ini index 308cb3e4eb..db3ea992dd 100644 --- a/Data/User/GameConfig/R3OE01.ini +++ b/Data/User/GameConfig/R3OE01.ini @@ -17,4 +17,4 @@ PH_ZFar = SafeTextureCache = True SafeTextureCacheColorSamples = 512 [Video_Enhancements] -PostProcessingShader = +[Wii] diff --git a/Data/User/GameConfig/R4EE01.ini b/Data/User/GameConfig/R4EE01.ini index 50429e8854..68cd650b3b 100644 --- a/Data/User/GameConfig/R4EE01.ini +++ b/Data/User/GameConfig/R4EE01.ini @@ -17,4 +17,4 @@ PH_ZFar = EFBToTextureEnable = False EFBCopyEnable = True [Video_Enhancements] -PostProcessingShader = + diff --git a/Data/User/GameConfig/R4EJ01.ini b/Data/User/GameConfig/R4EJ01.ini index 336450af78..422271a286 100644 --- a/Data/User/GameConfig/R4EJ01.ini +++ b/Data/User/GameConfig/R4EJ01.ini @@ -17,4 +17,4 @@ PH_ZFar = EFBToTextureEnable = False EFBCopyEnable = True [Video_Enhancements] -PostProcessingShader = + diff --git a/Data/User/GameConfig/R4EP01.ini b/Data/User/GameConfig/R4EP01.ini index 0f7df1804b..b08539dade 100644 --- a/Data/User/GameConfig/R4EP01.ini +++ b/Data/User/GameConfig/R4EP01.ini @@ -17,4 +17,4 @@ PH_ZFar = EFBToTextureEnable = False EFBCopyEnable = True [Video_Enhancements] -PostProcessingShader = + diff --git a/Data/User/GameConfig/RBHJ08.ini b/Data/User/GameConfig/RBHJ08.ini index 3d8cc9f715..7fd20513e4 100644 --- a/Data/User/GameConfig/RBHJ08.ini +++ b/Data/User/GameConfig/RBHJ08.ini @@ -17,7 +17,6 @@ PH_ZFar = [Video_Hacks] DlistCachingEnable = False [Video_Enhancements] -PostProcessingShader = [Video_Settings] SafeTextureCache = True SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RBWE01.ini b/Data/User/GameConfig/RBWE01.ini index 135c359b5d..49c72178af 100644 --- a/Data/User/GameConfig/RBWE01.ini +++ b/Data/User/GameConfig/RBWE01.ini @@ -9,4 +9,4 @@ EmulationIssues = Needs an older rev to play like r6461. Set to 600 watermark ti ProjectionHack = 0 [Gecko] [Video_Enhancements] -PostProcessingShader = + diff --git a/Data/User/GameConfig/RFCEGD.ini b/Data/User/GameConfig/RFCEGD.ini index 23d3a8cbcc..b4d1f1df19 100644 --- a/Data/User/GameConfig/RFCEGD.ini +++ b/Data/User/GameConfig/RFCEGD.ini @@ -12,4 +12,4 @@ ProjectionHack = 0 SafeTextureCache = True SafeTextureCacheColorSamples = 512 [Video_Enhancements] -PostProcessingShader = + diff --git a/Data/User/GameConfig/RIPEAF.ini b/Data/User/GameConfig/RIPEAF.ini index 192d024521..d7c429abbb 100644 --- a/Data/User/GameConfig/RIPEAF.ini +++ b/Data/User/GameConfig/RIPEAF.ini @@ -12,4 +12,3 @@ ProjectionHack = 0 SafeTextureCache = True SafeTextureCacheColorSamples = 512 [Video_Enhancements] -PostProcessingShader = diff --git a/Data/User/GameConfig/RMKP01.ini b/Data/User/GameConfig/RMKP01.ini index 446f381c8b..72af5bfc0d 100644 --- a/Data/User/GameConfig/RMKP01.ini +++ b/Data/User/GameConfig/RMKP01.ini @@ -14,4 +14,3 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Enhancements] -PostProcessingShader = diff --git a/Data/User/GameConfig/RZDE01.ini b/Data/User/GameConfig/RZDE01.ini index 05ef8be870..c080b3127f 100644 --- a/Data/User/GameConfig/RZDE01.ini +++ b/Data/User/GameConfig/RZDE01.ini @@ -20,6 +20,9 @@ PH_ZFar = [Gecko] [Video_Hacks] EFBAccessEnable = True +EFBToTextureEnable = False +EFBCopyEnable = True +EFBCopyCacheEnable = True [Video_Settings] SafeTextureCache = False SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RZDJ01.ini b/Data/User/GameConfig/RZDJ01.ini index 691be27e10..00ab7c3262 100644 --- a/Data/User/GameConfig/RZDJ01.ini +++ b/Data/User/GameConfig/RZDJ01.ini @@ -20,5 +20,9 @@ PH_ZFar = [Gecko] [Video_Hacks] EFBAccessEnable = True +EFBToTextureEnable = False +EFBCopyEnable = True +EFBCopyCacheEnable = True [Video_Settings] -SafeTextureCache = False \ No newline at end of file +SafeTextureCache = False +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RZDK01.ini b/Data/User/GameConfig/RZDK01.ini index b0007ffe6f..f2a8a29b23 100644 --- a/Data/User/GameConfig/RZDK01.ini +++ b/Data/User/GameConfig/RZDK01.ini @@ -20,5 +20,9 @@ PH_ZFar = [Gecko] [Video_Hacks] EFBAccessEnable = True +EFBToTextureEnable = False +EFBCopyEnable = True +EFBCopyCacheEnable = True [Video_Settings] -SafeTextureCache = False \ No newline at end of file +SafeTextureCache = False +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RZDP01.ini b/Data/User/GameConfig/RZDP01.ini index e26bff70b2..afec28f1c1 100644 --- a/Data/User/GameConfig/RZDP01.ini +++ b/Data/User/GameConfig/RZDP01.ini @@ -4,7 +4,7 @@ [EmuState] #The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = low FPS in big areas +EmulationIssues = [OnLoad] #Add memory patches to be loaded once on boot here. [OnFrame] @@ -20,5 +20,9 @@ PH_ZFar = [Gecko] [Video_Hacks] EFBAccessEnable = True +EFBToTextureEnable = False +EFBCopyEnable = True +EFBCopyCacheEnable = True [Video_Settings] -SafeTextureCache = False \ No newline at end of file +SafeTextureCache = False +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/SDWE18.ini b/Data/User/GameConfig/SDWE18.ini index e112396904..76807c8b2e 100644 --- a/Data/User/GameConfig/SDWE18.ini +++ b/Data/User/GameConfig/SDWE18.ini @@ -17,4 +17,4 @@ PH_ZFar = EFBToTextureEnable = False EFBCopyEnable = True [Video_Enhancements] -PostProcessingShader = + diff --git a/Data/User/GameConfig/SDWP18.ini b/Data/User/GameConfig/SDWP18.ini index aa4fba4d2f..29a0a42aa1 100644 --- a/Data/User/GameConfig/SDWP18.ini +++ b/Data/User/GameConfig/SDWP18.ini @@ -17,4 +17,4 @@ PH_ZFar = EFBToTextureEnable = False EFBCopyEnable = True [Video_Enhancements] -PostProcessingShader = + diff --git a/Data/User/GameConfig/SK3EEB.ini b/Data/User/GameConfig/SK3EEB.ini index cd1026b8da..ba164a7ffd 100644 --- a/Data/User/GameConfig/SK3EEB.ini +++ b/Data/User/GameConfig/SK3EEB.ini @@ -17,4 +17,4 @@ PH_ZFar = SafeTextureCache = True SafeTextureCacheColorSamples = 512 [Video_Enhancements] -PostProcessingShader = + diff --git a/Data/User/GameConfig/SO3EE9.ini b/Data/User/GameConfig/SO3EE9.ini new file mode 100644 index 0000000000..f8da896a23 --- /dev/null +++ b/Data/User/GameConfig/SO3EE9.ini @@ -0,0 +1,19 @@ +# SO3EE9 - Rune Factory: Tides of Destiny +[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 = 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 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +DlistCachingEnable = False diff --git a/Data/User/GameConfig/SO3J99.ini b/Data/User/GameConfig/SO3J99.ini new file mode 100644 index 0000000000..2ad57e3af2 --- /dev/null +++ b/Data/User/GameConfig/SO3J99.ini @@ -0,0 +1,19 @@ +# SO3J99 - Rune Factory Oceans +[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 = 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 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +DlistCachingEnable = False diff --git a/Data/User/GameConfig/SSZE5G.ini b/Data/User/GameConfig/SSZE5G.ini index f3d7274c5a..dd9db599ab 100644 --- a/Data/User/GameConfig/SSZE5G.ini +++ b/Data/User/GameConfig/SSZE5G.ini @@ -17,4 +17,5 @@ PH_ZFar = UseXFB = True UseRealXFB = False [Video_Enhancements] -PostProcessingShader = + + From b62cac2ca93006c3deae1b4406588ec218d1d0ba Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 20 Nov 2011 15:50:33 -0800 Subject: [PATCH 122/381] Allow modifying main ram size at compile time by changing Memory::REALRAM_SIZE. --- Source/Core/Common/Src/CommonFuncs.h | 7 +++ Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp | 7 ++- Source/Core/Core/Src/HW/Memmap.cpp | 61 ++++++++++------------- Source/Core/Core/Src/HW/Memmap.h | 20 ++++---- 4 files changed, 47 insertions(+), 48 deletions(-) diff --git a/Source/Core/Common/Src/CommonFuncs.h b/Source/Core/Common/Src/CommonFuncs.h index c79137780d..74d317d95f 100644 --- a/Source/Core/Common/Src/CommonFuncs.h +++ b/Source/Core/Common/Src/CommonFuncs.h @@ -27,6 +27,13 @@ template struct CompileTimeAssert; template<> struct CompileTimeAssert {}; +#define b2(x) ( (x) | ( (x) >> 1) ) +#define b4(x) ( b2(x) | ( b2(x) >> 2) ) +#define b8(x) ( b4(x) | ( b4(x) >> 4) ) +#define b16(x) ( b8(x) | ( b8(x) >> 8) ) +#define b32(x) (b16(x) | (b16(x) >>16) ) +#define ROUND_UP_POW2(x) (b32(x - 1) + 1) + #if defined __GNUC__ && !defined __SSSE3__ #include static __inline __m128i __attribute__((__always_inline__)) diff --git a/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp index c04938ca65..2555416a04 100644 --- a/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp +++ b/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp @@ -66,7 +66,7 @@ bool CBoot::EmulatedBS2_GC() DVDInterface::DVDRead(0x00000000, 0x80000000, 0x20); // write disc info Memory::Write_U32(0x0D15EA5E, 0x80000020); // booted from bootrom. 0xE5207C22 = booted from jtag - Memory::Write_U32(0x01800000, 0x80000028); // Physical Memory Size (24MB on retail) + Memory::Write_U32(Memory::REALRAM_SIZE, 0x80000028); // Physical Memory Size (24MB on retail) // TODO determine why some games fail when using a retail id. (Seem to take different EXI paths, see ikaruga for example) Memory::Write_U32(0x10000006, 0x8000002C); // Console type - DevKit (retail ID == 0x00000003) see yagcd 4.2.1.1.2 @@ -172,7 +172,6 @@ bool CBoot::EmulatedBS2_GC() return true; } - bool CBoot::SetupWiiMemory(unsigned int _CountryCode) { INFO_LOG(BOOT, "Setup Wii Memory..."); @@ -238,14 +237,14 @@ bool CBoot::SetupWiiMemory(unsigned int _CountryCode) DVDInterface::DVDRead(0x00000000, 0x00000000, 0x20); // Game Code Memory::Write_U32(0x0D15EA5E, 0x00000020); // Another magic word Memory::Write_U32(0x00000001, 0x00000024); // Unknown - Memory::Write_U32(0x01800000, 0x00000028); // MEM1 size 24MB + Memory::Write_U32(Memory::REALRAM_SIZE, 0x00000028); // MEM1 size 24MB Memory::Write_U32(0x00000023, 0x0000002c); // Production Board Model Memory::Write_U32(0x00000000, 0x00000030); // Init Memory::Write_U32(0x817FEC60, 0x00000034); // Init // 38, 3C should get start, size of FST through apploader Memory::Write_U32(0x38a00040, 0x00000060); // Exception init Memory::Write_U32(0x8008f7b8, 0x000000e4); // Thread Init - Memory::Write_U32(0x01800000, 0x000000f0); // "Simulated memory size" (debug mode?) + Memory::Write_U32(Memory::REALRAM_SIZE, 0x000000f0); // "Simulated memory size" (debug mode?) Memory::Write_U32(0x8179b500, 0x000000f4); // __start Memory::Write_U32(0x0e7be2c0, 0x000000f8); // Bus speed Memory::Write_U32(0x2B73A840, 0x000000fc); // CPU speed diff --git a/Source/Core/Core/Src/HW/Memmap.cpp b/Source/Core/Core/Src/HW/Memmap.cpp index 8b99243528..a0631a0fa3 100644 --- a/Source/Core/Core/Src/HW/Memmap.cpp +++ b/Source/Core/Core/Src/HW/Memmap.cpp @@ -625,53 +625,45 @@ void GetString(std::string& _string, const u32 em_address) // GetPointer must always return an address in the bottom 32 bits of address space, so that 64-bit // programs don't have problems directly addressing any part of memory. +// TODO re-think with respect to other BAT setups... u8 *GetPointer(const u32 _Address) { - switch (_Address >> 24) + switch (_Address >> 28) { - case 0x00: - case 0x01: - case 0x80: - case 0x81: - case 0xC0: - case 0xC1: - return (u8*)(((char*)m_pPhysicalRAM) + (_Address & RAM_MASK)); + case 0x0: + case 0x8: + return m_pPhysicalRAM + (_Address & RAM_MASK); + case 0xc: + switch (_Address >> 24) + { + case 0xcc: + case 0xcd: + _dbg_assert_msg_(MEMMAP, 0, "GetPointer from IO Bridge doesnt work"); + case 0xc8: + // EFB. We don't want to return a pointer here since we have no memory mapped for it. + return 0; - case 0x10: - case 0x11: - case 0x12: - case 0x13: - case 0x90: - case 0x91: - case 0x92: - case 0x93: - case 0xD0: - case 0xD1: - case 0xD2: - case 0xD3: + default: + return m_pPhysicalRAM + (_Address & RAM_MASK); + } + + case 0x1: + case 0x9: + case 0xd: if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii) - return (u8*)(((char*)m_pPhysicalEXRAM) + (_Address & EXRAM_MASK)); + return m_pPhysicalEXRAM + (_Address & EXRAM_MASK); else return 0; - case 0xE0: + case 0xe: if (_Address < (0xE0000000 + L1_CACHE_SIZE)) return GetCachePtr() + (_Address & L1_CACHE_MASK); else return 0; - case 0xC8: - return 0; // EFB. We don't want to return a pointer here since we have no memory mapped for it. - - case 0xCC: - case 0xCD: - _dbg_assert_msg_(MEMMAP, 0, "GetPointer from IO Bridge doesnt work"); - return NULL; default: if (bFakeVMEM) - { - return (u8*)(((char*)m_pVirtualFakeVMEM) + (_Address & RAM_MASK)); - } + return m_pVirtualFakeVMEM + (_Address & FAKEVMEM_MASK); else { if (!Core::g_CoreStartupParameter.bMMU && @@ -679,15 +671,14 @@ u8 *GetPointer(const u32 _Address) Crash(); return 0; } - break; } - return NULL; } bool IsRAMAddress(const u32 addr, bool allow_locked_cache) { - switch ((addr >> 24) & 0xFC) { + switch ((addr >> 24) & 0xFC) + { case 0x00: case 0x80: case 0xC0: diff --git a/Source/Core/Core/Src/HW/Memmap.h b/Source/Core/Core/Src/HW/Memmap.h index 26a918fee8..6c808cbc00 100644 --- a/Source/Core/Core/Src/HW/Memmap.h +++ b/Source/Core/Core/Src/HW/Memmap.h @@ -58,20 +58,22 @@ extern u8 *m_pL1Cache; enum { - // The size should be just 24MB instead of 32, but the RAM_MASK wouldn't - // work. - RAM_SIZE = 0x2000000, - RAM_MASK = 0x1FFFFFF, + // RAM_SIZE is the amount allocated by the emulator, whereas REALRAM_SIZE is + // what will be reported in lowmem, and thus used by emulated software. + // Note: Writing to lowmem is done by IPL. If using retail IPL, it will + // always be set to 24MB. + REALRAM_SIZE = 0x1800000, + RAM_SIZE = ROUND_UP_POW2(REALRAM_SIZE), + RAM_MASK = RAM_SIZE - 1, FAKEVMEM_SIZE = 0x2000000, - FAKEVMEM_MASK = 0x1FFFFFF, - REALRAM_SIZE = 0x1800000, + FAKEVMEM_MASK = FAKEVMEM_SIZE - 1, L1_CACHE_SIZE = 0x40000, - L1_CACHE_MASK = 0x3FFFF, + L1_CACHE_MASK = L1_CACHE_SIZE - 1, EFB_SIZE = 0x200000, - EFB_MASK = 0x1FFFFF, + EFB_MASK = EFB_SIZE - 1, IO_SIZE = 0x10000, EXRAM_SIZE = 0x4000000, - EXRAM_MASK = 0x3FFFFFF, + EXRAM_MASK = EXRAM_SIZE - 1, ADDR_MASK_HW_ACCESS = 0x0c000000, ADDR_MASK_MEM1 = 0x20000000, From 1bbd63ebc5740fef5e066834616bfa158bae3c89 Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Tue, 29 Nov 2011 17:45:39 +0200 Subject: [PATCH 123/381] Gameini database cleanup. Fixes improper file endings due to copy paste errors (last line didn't work). Addition of SSX On Tour - fixes issue 5032. Also some small additions/updates. --- Data/User/GameConfig/G2OP41.ini | 6 ++++++ Data/User/GameConfig/G3XP52.ini | 6 ++++++ Data/User/GameConfig/G4MP69.ini | 1 + Data/User/GameConfig/G4SP01.ini | 1 + Data/User/GameConfig/G9SJ8P.ini | 2 +- Data/User/GameConfig/G9SP8P.ini | 2 +- Data/User/GameConfig/GC9P6S.ini | 3 ++- Data/User/GameConfig/GCNP7D.ini | 2 +- Data/User/GameConfig/GCZP69.ini | 1 + Data/User/GameConfig/GFDD69.ini | 2 +- Data/User/GameConfig/GFYP69.ini | 1 + Data/User/GameConfig/GGSJA4.ini | 3 ++- Data/User/GameConfig/GGSPA4.ini | 2 +- Data/User/GameConfig/GGYP41.ini | 1 + Data/User/GameConfig/GHSY69.ini | 2 +- Data/User/GameConfig/GKMP41.ini | 1 + Data/User/GameConfig/GKOP70.ini | 1 + Data/User/GameConfig/GLCF52.ini | 24 ++++++++++++++++++++++++ Data/User/GameConfig/GMHF52.ini | 2 +- Data/User/GameConfig/GMHP52.ini | 2 +- Data/User/GameConfig/GPTP41.ini | 2 +- Data/User/GameConfig/GRKP7G.ini | 5 ++++- Data/User/GameConfig/GSWP64.ini | 2 +- Data/User/GameConfig/GSWS64.ini | 2 +- Data/User/GameConfig/GTEP01.ini | 2 +- Data/User/GameConfig/GUZP41.ini | 2 +- Data/User/GameConfig/GXOE69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GXOX69.ini | 16 ++++++++++++++++ Data/User/GameConfig/R3NPH3.ini | 14 ++++++++++++++ Data/User/GameConfig/R5IE4Q.ini | 2 +- Data/User/GameConfig/R5IP4Q.ini | 2 +- Data/User/GameConfig/R5IX4Q.ini | 2 +- Data/User/GameConfig/R5WJA4.ini | 2 +- Data/User/GameConfig/R6BJ78.ini | 2 +- Data/User/GameConfig/R6BK78.ini | 2 +- Data/User/GameConfig/R6BP78.ini | 2 +- Data/User/GameConfig/R6BX78.ini | 2 +- Data/User/GameConfig/RHOP8P.ini | 2 +- Data/User/GameConfig/RM8P01.ini | 2 +- Data/User/GameConfig/RMHP08.ini | 1 + Data/User/GameConfig/RO3J99.ini | 3 ++- Data/User/GameConfig/RO3P99.ini | 3 ++- Data/User/GameConfig/RPBJ01.ini | 2 +- Data/User/GameConfig/RT4JAF.ini | 2 +- Data/User/GameConfig/RT4PAF.ini | 2 +- Data/User/GameConfig/SD2J01.ini | 2 +- Data/User/GameConfig/SD2P41.ini | 2 +- Data/User/GameConfig/SD2Y41.ini | 2 +- Data/User/GameConfig/SE2P69.ini | 2 +- Data/User/GameConfig/SEAE69.ini | 2 +- Data/User/GameConfig/SEAJ13.ini | 2 +- Data/User/GameConfig/SEAP69.ini | 2 +- Data/User/GameConfig/SF8P01.ini | 2 +- Data/User/GameConfig/SHLPA4.ini | 2 +- Data/User/GameConfig/SMNE01.ini | 2 +- Data/User/GameConfig/SMNJ01.ini | 2 +- Data/User/GameConfig/SMNK01.ini | 2 +- Data/User/GameConfig/SMNW01.ini | 2 +- Data/User/GameConfig/SMOX41.ini | 2 +- Data/User/GameConfig/WMBP01.ini | 2 +- 60 files changed, 143 insertions(+), 46 deletions(-) create mode 100644 Data/User/GameConfig/GLCF52.ini create mode 100644 Data/User/GameConfig/GXOE69.ini create mode 100644 Data/User/GameConfig/GXOX69.ini create mode 100644 Data/User/GameConfig/R3NPH3.ini diff --git a/Data/User/GameConfig/G2OP41.ini b/Data/User/GameConfig/G2OP41.ini index e2afb7c0bd..d6168e719e 100644 --- a/Data/User/GameConfig/G2OP41.ini +++ b/Data/User/GameConfig/G2OP41.ini @@ -8,6 +8,12 @@ EmulationIssues = [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] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/G3XP52.ini b/Data/User/GameConfig/G3XP52.ini index e9b35a34c8..c31dabec6a 100644 --- a/Data/User/GameConfig/G3XP52.ini +++ b/Data/User/GameConfig/G3XP52.ini @@ -8,6 +8,12 @@ EmulationIssues = [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] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/G4MP69.ini b/Data/User/GameConfig/G4MP69.ini index a97f19579e..c09911f0a7 100644 --- a/Data/User/GameConfig/G4MP69.ini +++ b/Data/User/GameConfig/G4MP69.ini @@ -16,3 +16,4 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/G4SP01.ini b/Data/User/GameConfig/G4SP01.ini index c6ac41749c..433e876a05 100644 --- a/Data/User/GameConfig/G4SP01.ini +++ b/Data/User/GameConfig/G4SP01.ini @@ -106,3 +106,4 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/G9SJ8P.ini b/Data/User/GameConfig/G9SJ8P.ini index 2eb543f7e8..3a65ad401b 100644 --- a/Data/User/GameConfig/G9SJ8P.ini +++ b/Data/User/GameConfig/G9SJ8P.ini @@ -16,4 +16,4 @@ PH_ZFar = [Video_Settings] SafeTextureCache = True SafeTextureCacheColorSamples = 0 -EFBScale = 2 \ No newline at end of file +EFBScale = 2 diff --git a/Data/User/GameConfig/G9SP8P.ini b/Data/User/GameConfig/G9SP8P.ini index db14e49d3e..397dcbdf6f 100644 --- a/Data/User/GameConfig/G9SP8P.ini +++ b/Data/User/GameConfig/G9SP8P.ini @@ -16,4 +16,4 @@ PH_ZFar = [Video_Settings] SafeTextureCache = True SafeTextureCacheColorSamples = 0 -EFBScale = 2 \ No newline at end of file +EFBScale = 2 diff --git a/Data/User/GameConfig/GC9P6S.ini b/Data/User/GameConfig/GC9P6S.ini index ce306fbb9a..14399c6602 100644 --- a/Data/User/GameConfig/GC9P6S.ini +++ b/Data/User/GameConfig/GC9P6S.ini @@ -7,4 +7,5 @@ EmulationIssues = Need ZTP BLoom Hack and Safe Texture Cache [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video_Settings] -SafeTextureCache = True \ No newline at end of file +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/GCNP7D.ini b/Data/User/GameConfig/GCNP7D.ini index 671d6af1b0..fd9720811f 100644 --- a/Data/User/GameConfig/GCNP7D.ini +++ b/Data/User/GameConfig/GCNP7D.ini @@ -18,4 +18,4 @@ PH_ZFar = [Gecko] [Video_Settings] UseXFB = True -UseRealXFB = True \ No newline at end of file +UseRealXFB = True diff --git a/Data/User/GameConfig/GCZP69.ini b/Data/User/GameConfig/GCZP69.ini index c37bc8827e..320db678f9 100644 --- a/Data/User/GameConfig/GCZP69.ini +++ b/Data/User/GameConfig/GCZP69.ini @@ -12,3 +12,4 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/GFDD69.ini b/Data/User/GameConfig/GFDD69.ini index 083826fdc2..9fb2a9d2b4 100644 --- a/Data/User/GameConfig/GFDD69.ini +++ b/Data/User/GameConfig/GFDD69.ini @@ -16,4 +16,4 @@ PH_ZFar = [Gecko] [Video_Settings] UseXFB = True -UseRealXFB = False \ No newline at end of file +UseRealXFB = False diff --git a/Data/User/GameConfig/GFYP69.ini b/Data/User/GameConfig/GFYP69.ini index 74f910c9e1..e65004851e 100644 --- a/Data/User/GameConfig/GFYP69.ini +++ b/Data/User/GameConfig/GFYP69.ini @@ -12,3 +12,4 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/GGSJA4.ini b/Data/User/GameConfig/GGSJA4.ini index 6b2af534ed..436e9a1838 100644 --- a/Data/User/GameConfig/GGSJA4.ini +++ b/Data/User/GameConfig/GGSJA4.ini @@ -11,4 +11,5 @@ EmulationIssues = [Video] ProjectionHack = 0 [Video_Settings] -SafeTextureCache = True \ No newline at end of file +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/GGSPA4.ini b/Data/User/GameConfig/GGSPA4.ini index 8ae868a615..e4a358a3cd 100644 --- a/Data/User/GameConfig/GGSPA4.ini +++ b/Data/User/GameConfig/GGSPA4.ini @@ -118,4 +118,4 @@ $0 Rations Used ProjectionHack = 0 [Video_Settings] SafeTextureCache = True -SafeTextureCacheColorSamples = 512 \ No newline at end of file +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/GGYP41.ini b/Data/User/GameConfig/GGYP41.ini index fbad8671ce..bf78a71214 100644 --- a/Data/User/GameConfig/GGYP41.ini +++ b/Data/User/GameConfig/GGYP41.ini @@ -19,4 +19,5 @@ PH_ZFar = UseXFB = True UseRealXFB = True SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/GHSY69.ini b/Data/User/GameConfig/GHSY69.ini index 71e901031d..7fc51c7467 100644 --- a/Data/User/GameConfig/GHSY69.ini +++ b/Data/User/GameConfig/GHSY69.ini @@ -15,4 +15,4 @@ PH_ZFar = [Gecko] [Video_Settings] UseXFB = True -UseRealXFB = True \ No newline at end of file +UseRealXFB = True diff --git a/Data/User/GameConfig/GKMP41.ini b/Data/User/GameConfig/GKMP41.ini index ff5211085f..eebd3610e8 100644 --- a/Data/User/GameConfig/GKMP41.ini +++ b/Data/User/GameConfig/GKMP41.ini @@ -11,3 +11,4 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/GKOP70.ini b/Data/User/GameConfig/GKOP70.ini index 239477ef97..f6d266817d 100644 --- a/Data/User/GameConfig/GKOP70.ini +++ b/Data/User/GameConfig/GKOP70.ini @@ -11,3 +11,4 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/GLCF52.ini b/Data/User/GameConfig/GLCF52.ini new file mode 100644 index 0000000000..8ba4333554 --- /dev/null +++ b/Data/User/GameConfig/GLCF52.ini @@ -0,0 +1,24 @@ +# GLCF52 - Lemony Snicket +[Core] Values set here will override the main dolphin settings. +CPUThread = 1 +SkipIdle = 1 +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Still encountering slowdowns, but no major issues so far. +EmulationStateId = 5 +[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] +SafeTextureCache = True +DstAlphaPass = True +[Video_Hacks] +EFBCopyEnable = True +EFBToTextureEnable = True diff --git a/Data/User/GameConfig/GMHF52.ini b/Data/User/GameConfig/GMHF52.ini index 35aa99260c..4579be63a3 100644 --- a/Data/User/GameConfig/GMHF52.ini +++ b/Data/User/GameConfig/GMHF52.ini @@ -15,4 +15,4 @@ PH_ZFar = [Gecko] [Video_Settings] UseXFB = True -UseRealXFB = True \ No newline at end of file +UseRealXFB = True diff --git a/Data/User/GameConfig/GMHP52.ini b/Data/User/GameConfig/GMHP52.ini index d718d7374f..346a0bca27 100644 --- a/Data/User/GameConfig/GMHP52.ini +++ b/Data/User/GameConfig/GMHP52.ini @@ -15,4 +15,4 @@ PH_ZFar = [Gecko] [Video_Settings] UseXFB = True -UseRealXFB = True \ No newline at end of file +UseRealXFB = True diff --git a/Data/User/GameConfig/GPTP41.ini b/Data/User/GameConfig/GPTP41.ini index 348f14ac12..25af32fe94 100644 --- a/Data/User/GameConfig/GPTP41.ini +++ b/Data/User/GameConfig/GPTP41.ini @@ -16,4 +16,4 @@ PH_ZFar = [Gecko] [Video_Settings] UseXFB = True -UseRealXFB = True \ No newline at end of file +UseRealXFB = True diff --git a/Data/User/GameConfig/GRKP7G.ini b/Data/User/GameConfig/GRKP7G.ini index 49a5f1d6cc..98715d9bed 100644 --- a/Data/User/GameConfig/GRKP7G.ini +++ b/Data/User/GameConfig/GRKP7G.ini @@ -15,4 +15,7 @@ PH_ZFar = [Gecko] [Video_Settings] UseXFB = True -SafeTextureCache = True \ No newline at end of file +SafeTextureCache = True +UseRealXFB = False +SafeTextureCacheColorSamples = 512 + diff --git a/Data/User/GameConfig/GSWP64.ini b/Data/User/GameConfig/GSWP64.ini index f97401019d..c580edee4f 100644 --- a/Data/User/GameConfig/GSWP64.ini +++ b/Data/User/GameConfig/GSWP64.ini @@ -21,4 +21,4 @@ PH_ZFar = UseXFB = True UseRealXFB = False [Video_Hacks] -EFBEmulateFormatChanges = True \ No newline at end of file +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/GSWS64.ini b/Data/User/GameConfig/GSWS64.ini index 314f6d3ad8..8bcb77f296 100644 --- a/Data/User/GameConfig/GSWS64.ini +++ b/Data/User/GameConfig/GSWS64.ini @@ -21,4 +21,4 @@ PH_ZFar = UseXFB = True UseRealXFB = False [Video_Hacks] -EFBEmulateFormatChanges = True \ No newline at end of file +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/GTEP01.ini b/Data/User/GameConfig/GTEP01.ini index e408698c5d..31bf519769 100644 --- a/Data/User/GameConfig/GTEP01.ini +++ b/Data/User/GameConfig/GTEP01.ini @@ -23,4 +23,4 @@ $Time Trial: Found 5 Coin Pieces GZ5T-HADH-NGPBM BAF8-QT5K-5N9WC [Video_Hacks] -DlistCachingEnable = False \ No newline at end of file +DlistCachingEnable = False diff --git a/Data/User/GameConfig/GUZP41.ini b/Data/User/GameConfig/GUZP41.ini index 868355222e..8aaca9f8d1 100644 --- a/Data/User/GameConfig/GUZP41.ini +++ b/Data/User/GameConfig/GUZP41.ini @@ -17,4 +17,4 @@ PH_ZFar = [Gecko] [Video_Settings] UseRealXFB = True -UseXFB = True \ No newline at end of file +UseXFB = True diff --git a/Data/User/GameConfig/GXOE69.ini b/Data/User/GameConfig/GXOE69.ini new file mode 100644 index 0000000000..9284e2b63c --- /dev/null +++ b/Data/User/GameConfig/GXOE69.ini @@ -0,0 +1,16 @@ +# GXOE69 - SSX On Tour +[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 = Has problematic intro videos (skip them). Use LLE audio to fix 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/GXOX69.ini b/Data/User/GameConfig/GXOX69.ini new file mode 100644 index 0000000000..16a87d0840 --- /dev/null +++ b/Data/User/GameConfig/GXOX69.ini @@ -0,0 +1,16 @@ +# GXOX69 - SSX On Tour +[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 = Has problematic intro videos (skip them). Use LLE audio to fix 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/R3NPH3.ini b/Data/User/GameConfig/R3NPH3.ini new file mode 100644 index 0000000000..3c02b59f1f --- /dev/null +++ b/Data/User/GameConfig/R3NPH3.ini @@ -0,0 +1,14 @@ +# R3NPH3 - Guilty Gear XX AC Plus +[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 +[Gecko] +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 + diff --git a/Data/User/GameConfig/R5IE4Q.ini b/Data/User/GameConfig/R5IE4Q.ini index 54dd70a5a4..3d7a37d075 100644 --- a/Data/User/GameConfig/R5IE4Q.ini +++ b/Data/User/GameConfig/R5IE4Q.ini @@ -16,4 +16,4 @@ PH_ZFar = [Video_Settings] SafeTextureCache = True [Video_Enhancements] -ForceFiltering = False \ No newline at end of file +ForceFiltering = False diff --git a/Data/User/GameConfig/R5IP4Q.ini b/Data/User/GameConfig/R5IP4Q.ini index 388dfa3394..a891668910 100644 --- a/Data/User/GameConfig/R5IP4Q.ini +++ b/Data/User/GameConfig/R5IP4Q.ini @@ -16,4 +16,4 @@ PH_ZFar = [Video_Settings] SafeTextureCache = True [Video_Enhancements] -ForceFiltering = False \ No newline at end of file +ForceFiltering = False diff --git a/Data/User/GameConfig/R5IX4Q.ini b/Data/User/GameConfig/R5IX4Q.ini index 2ef502fe6c..a4ea4ef22d 100644 --- a/Data/User/GameConfig/R5IX4Q.ini +++ b/Data/User/GameConfig/R5IX4Q.ini @@ -16,4 +16,4 @@ PH_ZFar = [Video_Settings] SafeTextureCache = True [Video_Enhancements] -ForceFiltering = False \ No newline at end of file +ForceFiltering = False diff --git a/Data/User/GameConfig/R5WJA4.ini b/Data/User/GameConfig/R5WJA4.ini index 686523108b..beb946ea56 100644 --- a/Data/User/GameConfig/R5WJA4.ini +++ b/Data/User/GameConfig/R5WJA4.ini @@ -17,4 +17,4 @@ PH_ZFar = SafeTextureCache = True SafeTextureCacheColorSamples = 512 [Wii] -DisableWiimoteSpeaker = 1 \ No newline at end of file +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/R6BJ78.ini b/Data/User/GameConfig/R6BJ78.ini index 84af37ad4e..dad405fa11 100644 --- a/Data/User/GameConfig/R6BJ78.ini +++ b/Data/User/GameConfig/R6BJ78.ini @@ -14,4 +14,4 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Enhancements] -ForceFiltering = False \ No newline at end of file +ForceFiltering = False diff --git a/Data/User/GameConfig/R6BK78.ini b/Data/User/GameConfig/R6BK78.ini index 3a03f806bb..21aa5f90af 100644 --- a/Data/User/GameConfig/R6BK78.ini +++ b/Data/User/GameConfig/R6BK78.ini @@ -14,4 +14,4 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Enhancements] -ForceFiltering = False \ No newline at end of file +ForceFiltering = False diff --git a/Data/User/GameConfig/R6BP78.ini b/Data/User/GameConfig/R6BP78.ini index 896923ba98..e49b9b4fca 100644 --- a/Data/User/GameConfig/R6BP78.ini +++ b/Data/User/GameConfig/R6BP78.ini @@ -14,4 +14,4 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Enhancements] -ForceFiltering = False \ No newline at end of file +ForceFiltering = False diff --git a/Data/User/GameConfig/R6BX78.ini b/Data/User/GameConfig/R6BX78.ini index ac228ddb40..d37400d0e0 100644 --- a/Data/User/GameConfig/R6BX78.ini +++ b/Data/User/GameConfig/R6BX78.ini @@ -14,4 +14,4 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Enhancements] -ForceFiltering = False \ No newline at end of file +ForceFiltering = False diff --git a/Data/User/GameConfig/RHOP8P.ini b/Data/User/GameConfig/RHOP8P.ini index e7ee75a97e..8e9d0e879d 100644 --- a/Data/User/GameConfig/RHOP8P.ini +++ b/Data/User/GameConfig/RHOP8P.ini @@ -9,4 +9,4 @@ EmulationIssues = Use dx11 plugin (r6945) ProjectionHack = 0 [Gecko] [Wii] -DisableWiimoteSpeaker = 1 \ No newline at end of file +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/RM8P01.ini b/Data/User/GameConfig/RM8P01.ini index ceabb2e077..36c8e60131 100644 --- a/Data/User/GameConfig/RM8P01.ini +++ b/Data/User/GameConfig/RM8P01.ini @@ -16,4 +16,4 @@ PH_ZFar = [Video_Enhancements] ForceFiltering = False [Video_Hacks] -DlistCachingEnable = False \ No newline at end of file +DlistCachingEnable = False diff --git a/Data/User/GameConfig/RMHP08.ini b/Data/User/GameConfig/RMHP08.ini index de90cf83c7..cbe5456828 100644 --- a/Data/User/GameConfig/RMHP08.ini +++ b/Data/User/GameConfig/RMHP08.ini @@ -12,3 +12,4 @@ ProjectionHack = 0 [Video_Hacks] EFBAccessEnable = False EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/RO3J99.ini b/Data/User/GameConfig/RO3J99.ini index 513f90f86b..cf2c59038e 100644 --- a/Data/User/GameConfig/RO3J99.ini +++ b/Data/User/GameConfig/RO3J99.ini @@ -9,4 +9,5 @@ EmulationStateId = 4 ProjectionHack = 0 [Gecko] [Video_Settings] -UseXFB = True \ No newline at end of file +UseXFB = True +UseRealXFB = False diff --git a/Data/User/GameConfig/RO3P99.ini b/Data/User/GameConfig/RO3P99.ini index 64f1488c3f..43a8f83bb3 100644 --- a/Data/User/GameConfig/RO3P99.ini +++ b/Data/User/GameConfig/RO3P99.ini @@ -9,4 +9,5 @@ EmulationStateId = 4 ProjectionHack = 0 [Gecko] [Video_Settings] -UseXFB = True \ No newline at end of file +UseXFB = True +UseRealXFB = False diff --git a/Data/User/GameConfig/RPBJ01.ini b/Data/User/GameConfig/RPBJ01.ini index 4701961228..e6a563da24 100644 --- a/Data/User/GameConfig/RPBJ01.ini +++ b/Data/User/GameConfig/RPBJ01.ini @@ -15,4 +15,4 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCache = True -SafeTextureCacheColorSamples = 0 \ No newline at end of file +SafeTextureCacheColorSamples = 0 diff --git a/Data/User/GameConfig/RT4JAF.ini b/Data/User/GameConfig/RT4JAF.ini index 726edac01d..19a6ce4cac 100644 --- a/Data/User/GameConfig/RT4JAF.ini +++ b/Data/User/GameConfig/RT4JAF.ini @@ -14,4 +14,4 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Hacks] -EFBEmulateFormatChanges = True \ No newline at end of file +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/RT4PAF.ini b/Data/User/GameConfig/RT4PAF.ini index 2c0e788c3d..885a15e4c4 100644 --- a/Data/User/GameConfig/RT4PAF.ini +++ b/Data/User/GameConfig/RT4PAF.ini @@ -14,4 +14,4 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Hacks] -EFBEmulateFormatChanges = True \ No newline at end of file +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/SD2J01.ini b/Data/User/GameConfig/SD2J01.ini index a5d922d877..00fc5f9ed9 100644 --- a/Data/User/GameConfig/SD2J01.ini +++ b/Data/User/GameConfig/SD2J01.ini @@ -18,4 +18,4 @@ EmulationIssues = [ActionReplay] [Gecko] [Wii] -DisableWiimoteSpeaker = 1 \ No newline at end of file +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/SD2P41.ini b/Data/User/GameConfig/SD2P41.ini index d446b13273..e8d047a675 100644 --- a/Data/User/GameConfig/SD2P41.ini +++ b/Data/User/GameConfig/SD2P41.ini @@ -18,4 +18,4 @@ EmulationIssues = [ActionReplay] [Gecko] [Wii] -DisableWiimoteSpeaker = 1 \ No newline at end of file +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/SD2Y41.ini b/Data/User/GameConfig/SD2Y41.ini index 3af0cc5950..d3c1bfb3ed 100644 --- a/Data/User/GameConfig/SD2Y41.ini +++ b/Data/User/GameConfig/SD2Y41.ini @@ -18,4 +18,4 @@ EmulationIssues = [ActionReplay] [Gecko] [Wii] -DisableWiimoteSpeaker = 1 \ No newline at end of file +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/SE2P69.ini b/Data/User/GameConfig/SE2P69.ini index 55d89a5b50..54a3f18e16 100644 --- a/Data/User/GameConfig/SE2P69.ini +++ b/Data/User/GameConfig/SE2P69.ini @@ -11,4 +11,4 @@ ProjectionHack = 0 [Video_Settings] SafeTextureCache = True [Video_Enhancements] -ForceFiltering = False \ No newline at end of file +ForceFiltering = False diff --git a/Data/User/GameConfig/SEAE69.ini b/Data/User/GameConfig/SEAE69.ini index f9fe4d44aa..67836c884d 100644 --- a/Data/User/GameConfig/SEAE69.ini +++ b/Data/User/GameConfig/SEAE69.ini @@ -11,4 +11,4 @@ ProjectionHack = 0 [Video_Settings] SafeTextureCache = True [Video_Enhancements] -ForceFiltering = False \ No newline at end of file +ForceFiltering = False diff --git a/Data/User/GameConfig/SEAJ13.ini b/Data/User/GameConfig/SEAJ13.ini index edf92d59d9..caa68320ca 100644 --- a/Data/User/GameConfig/SEAJ13.ini +++ b/Data/User/GameConfig/SEAJ13.ini @@ -11,4 +11,4 @@ ProjectionHack = 0 [Video_Settings] SafeTextureCache = True [Video_Enhancements] -ForceFiltering = False \ No newline at end of file +ForceFiltering = False diff --git a/Data/User/GameConfig/SEAP69.ini b/Data/User/GameConfig/SEAP69.ini index 81ca65bf49..1310ccc94f 100644 --- a/Data/User/GameConfig/SEAP69.ini +++ b/Data/User/GameConfig/SEAP69.ini @@ -11,4 +11,4 @@ ProjectionHack = 0 [Video_Settings] SafeTextureCache = True [Video_Enhancements] -ForceFiltering = False \ No newline at end of file +ForceFiltering = False diff --git a/Data/User/GameConfig/SF8P01.ini b/Data/User/GameConfig/SF8P01.ini index 5b2cf6121f..642c534cb1 100644 --- a/Data/User/GameConfig/SF8P01.ini +++ b/Data/User/GameConfig/SF8P01.ini @@ -18,4 +18,4 @@ PH_ZFar = SafeTextureCache = True SafeTextureCacheColorSamples = 512 [Wii] -DisableWiimoteSpeaker = 1 \ No newline at end of file +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/SHLPA4.ini b/Data/User/GameConfig/SHLPA4.ini index f56420bf8d..51f30f04aa 100644 --- a/Data/User/GameConfig/SHLPA4.ini +++ b/Data/User/GameConfig/SHLPA4.ini @@ -17,4 +17,4 @@ PH_ZFar = SafeTextureCache = True SafeTextureCacheColorSamples = 512 [Wii] -DisableWiimoteSpeaker = 1 \ No newline at end of file +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/SMNE01.ini b/Data/User/GameConfig/SMNE01.ini index 4e903aa999..1a838de6e5 100644 --- a/Data/User/GameConfig/SMNE01.ini +++ b/Data/User/GameConfig/SMNE01.ini @@ -40,4 +40,4 @@ PH_ZFar = [Video_Settings] SafeTextureCache = True [Video_Hacks] -DlistCachingEnable = False \ No newline at end of file +DlistCachingEnable = False diff --git a/Data/User/GameConfig/SMNJ01.ini b/Data/User/GameConfig/SMNJ01.ini index 5e182fc027..743ecca665 100644 --- a/Data/User/GameConfig/SMNJ01.ini +++ b/Data/User/GameConfig/SMNJ01.ini @@ -16,4 +16,4 @@ PH_ZFar = [Video_Settings] SafeTextureCache = True [Video_Hacks] -DlistCachingEnable = False \ No newline at end of file +DlistCachingEnable = False diff --git a/Data/User/GameConfig/SMNK01.ini b/Data/User/GameConfig/SMNK01.ini index b4701e7f9c..b6ead5e52c 100644 --- a/Data/User/GameConfig/SMNK01.ini +++ b/Data/User/GameConfig/SMNK01.ini @@ -16,4 +16,4 @@ PH_ZFar = [Video_Settings] SafeTextureCache = True [Video_Hacks] -DlistCachingEnable = False \ No newline at end of file +DlistCachingEnable = False diff --git a/Data/User/GameConfig/SMNW01.ini b/Data/User/GameConfig/SMNW01.ini index bf01c022b7..f0f8226d79 100644 --- a/Data/User/GameConfig/SMNW01.ini +++ b/Data/User/GameConfig/SMNW01.ini @@ -16,4 +16,4 @@ PH_ZFar = [Video_Settings] SafeTextureCache = True [Video_Hacks] -DlistCachingEnable = False \ No newline at end of file +DlistCachingEnable = False diff --git a/Data/User/GameConfig/SMOX41.ini b/Data/User/GameConfig/SMOX41.ini index d4be812cf0..d96d552390 100644 --- a/Data/User/GameConfig/SMOX41.ini +++ b/Data/User/GameConfig/SMOX41.ini @@ -18,4 +18,4 @@ EFBEmulateFormatChanges = True [Video_Enhancements] MaxAnisotropy = 0 [Wii] -DisableWiimoteSpeaker = 1 \ No newline at end of file +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/WMBP01.ini b/Data/User/GameConfig/WMBP01.ini index 1fe8a9966a..2c9249d4bc 100644 --- a/Data/User/GameConfig/WMBP01.ini +++ b/Data/User/GameConfig/WMBP01.ini @@ -15,4 +15,4 @@ PH_ZFar = [Gecko] [Video_Settings] UseXFB = True -UseRealXFB = True \ No newline at end of file +UseRealXFB = True From 29865e63664d5b513d0f06e9414fbe0b7a43bd49 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Wed, 30 Nov 2011 00:37:57 +0100 Subject: [PATCH 124/381] Avoid virtual memory range collision between JIT and emulated RAM. Passing MAP_FIXED to mmap causes already mapped pages in the requested region to be replaced. On Mac OS X this caused pages for JIT-generatd code to appear in the memory range previously auto-allocated for the RAM of the emulated machine. This led to a hang at boot time. The same problem can probably occur on FreeBSD, but not on Linux since MAP_32BIT is used there instead of MAP_FIXED. The solution is to not use MAP_FIXED, but instead rely on the OS honoring the hinted address which is below 4 GB: we don't need an exact match, just a low address. --- Source/Core/Common/Src/MemoryUtil.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Source/Core/Common/Src/MemoryUtil.cpp b/Source/Core/Common/Src/MemoryUtil.cpp index 2d64a434f1..3e3cafa335 100644 --- a/Source/Core/Common/Src/MemoryUtil.cpp +++ b/Source/Core/Common/Src/MemoryUtil.cpp @@ -43,18 +43,20 @@ void* AllocateExecutableMemory(size_t size, bool low) #else static char *map_hint = 0; #if defined(__x86_64__) && !defined(MAP_32BIT) + // This OS has no flag to enforce allocation below the 4 GB boundary, + // but if we hint that we want a low address it is very likely we will + // get one. + // An older version of this code used MAP_FIXED, but that has the side + // effect of discarding already mapped pages that happen to be in the + // requested virtual memory range (such as the emulated RAM, sometimes). if (low && (!map_hint)) map_hint = (char*)round_page(512*1024*1024); /* 0.5 GB rounded up to the next page */ #endif void* ptr = mmap(map_hint, size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_PRIVATE -#if defined(__x86_64__) -#if defined(MAP_32BIT) +#if defined(__x86_64__) && defined(MAP_32BIT) | (low ? MAP_32BIT : 0) -#else - | (low ? MAP_FIXED : 0) -#endif /* defined(MAP_32BIT) */ -#endif /* defined(__x86_64__) */ +#endif , -1, 0); #endif /* defined(_WIN32) */ From 88700e817accbf611ee974db76b4a03b4d3c3935 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 29 Nov 2011 21:50:31 -0600 Subject: [PATCH 125/381] make OpenGL ClearScreen use glClear --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 55 ++++++++----------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 792c14960e..c5f5212e95 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -595,7 +595,7 @@ 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); @@ -871,39 +871,31 @@ void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaE { ResetAPIState(); - GLenum ColorMask = GL_FALSE, AlphaMask = GL_FALSE; - if (colorEnable) ColorMask = GL_TRUE; - if (alphaEnable) AlphaMask = GL_TRUE; - glColorMask(ColorMask, ColorMask, ColorMask, AlphaMask); + // color + GLboolean const + color_mask = colorEnable ? GL_TRUE : GL_FALSE, + alpha_mask = alphaEnable ? GL_TRUE : GL_FALSE; + glColorMask(color_mask, color_mask, color_mask, alpha_mask); - if (zEnable) - { - glEnable(GL_DEPTH_TEST); - glDepthMask(GL_TRUE); - glDepthFunc(GL_ALWAYS); - } - else - { - glDisable(GL_DEPTH_TEST); - glDepthMask(GL_FALSE); - glDepthFunc(GL_NEVER); - } + glClearColor( + float((color >> 16) & 0xFF) / 255.0f, + float((color >> 8) & 0xFF) / 255.0f, + float((color >> 0) & 0xFF) / 255.0f, + float((color >> 24) & 0xFF) / 255.0f); - // Update viewport for clearing the picture - TargetRectangle targetRc = ConvertEFBRectangle(rc); - glViewport(targetRc.left, targetRc.bottom, targetRc.GetWidth(), targetRc.GetHeight()); - glDepthRange(0.0, (float)(z & 0xFFFFFF) / float(0xFFFFFF)); + // depth + glDepthMask(zEnable ? GL_TRUE : GL_FALSE); - 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(); + glClearDepth(float(z & 0xFFFFFF) / float(0xFFFFFF)); + + // Update rect for clearing the picture + glEnable(GL_SCISSOR_TEST); + + TargetRectangle const targetRc = ConvertEFBRectangle(rc); + glScissor(targetRc.left, targetRc.bottom, targetRc.GetWidth(), targetRc.GetHeight()); + + // glColorMask/glDepthMask/glScissor affect glClear (glViewport does not) + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); RestoreAPIState(); @@ -1436,6 +1428,7 @@ void Renderer::ResetAPIState() glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); // make sure to disable wireframe when drawing the clear quad + // TODO: ClearScreen no longer draws a quad. Can this be killed? glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); } From 0dfca1cf2be54efbc88adcbdece61830ea92f32b Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 29 Nov 2011 22:02:18 -0600 Subject: [PATCH 126/381] remove now unnecessary glPolygonMode from ResetAPIState --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index c5f5212e95..6a373dd4e8 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -1426,10 +1426,6 @@ void Renderer::ResetAPIState() glDisable(GL_BLEND); glDepthMask(GL_FALSE); glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); - - // make sure to disable wireframe when drawing the clear quad - // TODO: ClearScreen no longer draws a quad. Can this be killed? - glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); } void Renderer::RestoreAPIState() From 4fcd6994c6fe3e34c986d7701e75fc8e3f6c5937 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 29 Nov 2011 22:21:43 -0600 Subject: [PATCH 127/381] fix wireframe setting toggling --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 6a373dd4e8..03ae9bee47 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -1439,8 +1439,7 @@ void Renderer::RestoreAPIState() SetBlendMode(true); VertexShaderManager::SetViewportChanged(); - if (g_ActiveConfig.bWireFrame) - glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); + glPolygonMode(GL_FRONT_AND_BACK, g_ActiveConfig.bWireFrame ? GL_LINE : GL_FILL); VertexShaderCache::SetCurrentShader(0); PixelShaderCache::SetCurrentShader(0); From 98981cc72486657bc1e91b2c1e86a0f14d63e23f Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Thu, 1 Dec 2011 02:40:58 +0100 Subject: [PATCH 128/381] Fixed EFB cache index computations in OpenGL renderer. The previous computation was very likely to go out of array bounds, which could result in crashes on EFB access. Also, the cache size was rounded down instead of up. This is a problem since EFB_HEIGHT (528) is not a multiple of EFB_CACHE_RECT_SIZE (64). --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 792c14960e..6541188074 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -125,8 +125,8 @@ static std::thread scrshotThread; // EFB cache related const u32 EFB_CACHE_RECT_SIZE = 64; // Cache 64x64 blocks. -const u32 EFB_CACHE_WIDTH = EFB_WIDTH / EFB_CACHE_RECT_SIZE; -const u32 EFB_CACHE_HEIGHT = EFB_HEIGHT / EFB_CACHE_RECT_SIZE; +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 @@ -698,7 +698,8 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) if (!g_ActiveConfig.bEFBAccessEnable) return 0; - u32 cacheRectIdx = ((x / EFB_CACHE_RECT_SIZE) << 16) | (y / EFB_CACHE_RECT_SIZE); + u32 cacheRectIdx = (y / EFB_CACHE_RECT_SIZE) * EFB_CACHE_WIDTH + + (x / EFB_CACHE_RECT_SIZE); // Get the rectangular target region containing the EFB pixel EFBRectangle efbPixelRc; From 51127c1243dfe2b950c50c6e8536022c079fc937 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Thu, 1 Dec 2011 23:30:28 +0100 Subject: [PATCH 129/381] Added newlines at end of file. This avoids warnings when compiling with GCC. --- Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.cpp | 2 +- Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.h | 2 +- Source/Core/Core/Src/FifoPlayer/FifoDataFile.cpp | 2 +- Source/Core/Core/Src/FifoPlayer/FifoDataFile.h | 2 +- Source/Core/Core/Src/FifoPlayer/FifoFileStruct.h | 2 +- Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.cpp | 2 +- Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.h | 2 +- Source/Core/Core/Src/FifoPlayer/FifoPlayer.h | 2 +- Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.cpp | 2 +- Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.h | 2 +- Source/Core/Core/Src/FifoPlayer/FifoRecorder.h | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.cpp b/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.cpp index e18f26fe43..4b22e8f851 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.cpp +++ b/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.cpp @@ -232,4 +232,4 @@ void CalculateVertexElementSizes(int sizes[], int vatIndex, const CPMemory &cpMe } } -} \ No newline at end of file +} diff --git a/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.h b/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.h index eb9a978aca..ba2051f848 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.h +++ b/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.h @@ -51,4 +51,4 @@ namespace FifoAnalyzer void CalculateVertexElementSizes(int sizes[], int vatIndex, const CPMemory &cpMem); } -#endif \ No newline at end of file +#endif diff --git a/Source/Core/Core/Src/FifoPlayer/FifoDataFile.cpp b/Source/Core/Core/Src/FifoPlayer/FifoDataFile.cpp index 7933e67e64..cf252f5f82 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoDataFile.cpp +++ b/Source/Core/Core/Src/FifoPlayer/FifoDataFile.cpp @@ -282,4 +282,4 @@ void FifoDataFile::ReadMemoryUpdates(u64 fileOffset, u32 numUpdates, std::vector file.Seek(srcUpdate.dataOffset, SEEK_SET); file.ReadBytes(dstUpdate.data, srcUpdate.dataSize); } -} \ No newline at end of file +} diff --git a/Source/Core/Core/Src/FifoPlayer/FifoDataFile.h b/Source/Core/Core/Src/FifoPlayer/FifoDataFile.h index fc8ce516d6..a95a46c1fd 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoDataFile.h +++ b/Source/Core/Core/Src/FifoPlayer/FifoDataFile.h @@ -109,4 +109,4 @@ private: std::vector m_Frames; }; -#endif \ No newline at end of file +#endif diff --git a/Source/Core/Core/Src/FifoPlayer/FifoFileStruct.h b/Source/Core/Core/Src/FifoPlayer/FifoFileStruct.h index e35ebd31bf..97e84e7660 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoFileStruct.h +++ b/Source/Core/Core/Src/FifoPlayer/FifoFileStruct.h @@ -82,4 +82,4 @@ struct FileMemoryUpdate } -#endif \ No newline at end of file +#endif diff --git a/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.cpp b/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.cpp index 060ff4078b..4aea2acc98 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.cpp +++ b/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.cpp @@ -343,4 +343,4 @@ void FifoPlaybackAnalyzer::StoreWrittenRegion(u32 address, u32 size) m_WrittenMemory.push_back(range); } -} \ No newline at end of file +} diff --git a/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.h b/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.h index e8e582cf4c..7e345dd7f7 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.h +++ b/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.h @@ -61,4 +61,4 @@ private: FifoAnalyzer::CPMemory m_CpMem; }; -#endif \ No newline at end of file +#endif diff --git a/Source/Core/Core/Src/FifoPlayer/FifoPlayer.h b/Source/Core/Core/Src/FifoPlayer/FifoPlayer.h index 2a02544a20..486c3c69e4 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoPlayer.h +++ b/Source/Core/Core/Src/FifoPlayer/FifoPlayer.h @@ -118,4 +118,4 @@ private: std::vector m_FrameInfo; }; -#endif \ No newline at end of file +#endif diff --git a/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.cpp b/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.cpp index bb7b8e3d04..1c0cd7abe1 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.cpp +++ b/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.cpp @@ -302,4 +302,4 @@ void FifoRecordAnalyzer::WriteTexMapMemory(int texMap, u32 &writtenTexMaps) } FifoRecorder::GetInstance().WriteMemory(imageBase, textureSize, MemoryUpdate::TEXTURE_MAP); -} \ No newline at end of file +} diff --git a/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.h b/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.h index ccec314272..0ffc279bf3 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.h +++ b/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.h @@ -53,4 +53,4 @@ private: FifoAnalyzer::CPMemory m_CpMem; }; -#endif \ No newline at end of file +#endif diff --git a/Source/Core/Core/Src/FifoPlayer/FifoRecorder.h b/Source/Core/Core/Src/FifoPlayer/FifoRecorder.h index 44e7be5862..a07ba1fd15 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoRecorder.h +++ b/Source/Core/Core/Src/FifoPlayer/FifoRecorder.h @@ -77,4 +77,4 @@ private: FifoRecordAnalyzer m_RecordAnalyzer; }; -#endif \ No newline at end of file +#endif From f50ea590cead7cdd41e5d6c9d71922f1de8058d4 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Fri, 2 Dec 2011 00:05:44 +0100 Subject: [PATCH 130/381] Don't use the same name for two different local variables. This avoids a warning when compiling with GCC. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 6 +++--- 1 file changed, 3 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 cba8274347..83c7544734 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 @@ -509,11 +509,11 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) File::IOFile pFile(TicketFilename, "rb"); if (pFile) { - u8 Ticket[DiscIO::INANDContentLoader::TICKET_SIZE]; - for (unsigned int View = 0; View != maxViews && pFile.ReadBytes(Ticket, DiscIO::INANDContentLoader::TICKET_SIZE); ++View) + u8 FileTicket[DiscIO::INANDContentLoader::TICKET_SIZE]; + for (unsigned int View = 0; View != maxViews && pFile.ReadBytes(FileTicket, DiscIO::INANDContentLoader::TICKET_SIZE); ++View) { Memory::Write_U32(View, Buffer.PayloadBuffer[0].m_Address + View * 0xD8); - Memory::WriteBigEData(Ticket+0x1D0, Buffer.PayloadBuffer[0].m_Address + 4 + View * 0xD8, 212); + Memory::WriteBigEData(FileTicket+0x1D0, Buffer.PayloadBuffer[0].m_Address + 4 + View * 0xD8, 212); } } } From 045eb924d93b4532d5a91c8eab55e292e3a997ae Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Fri, 2 Dec 2011 00:33:45 +0100 Subject: [PATCH 131/381] Changed type of GetTicksPer(Line|Frame) to unsigned. Avoids a GCC warning about comparing signed and unsigned values in Source/Core/Core/Src/State.cpp. --- Source/Core/Core/Src/HW/VideoInterface.cpp | 4 ++-- Source/Core/Core/Src/HW/VideoInterface.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/HW/VideoInterface.cpp b/Source/Core/Core/Src/HW/VideoInterface.cpp index 93c48d92f9..8c8bc2e802 100644 --- a/Source/Core/Core/Src/HW/VideoInterface.cpp +++ b/Source/Core/Core/Src/HW/VideoInterface.cpp @@ -759,7 +759,7 @@ void UpdateParameters() } } -int GetTicksPerLine() +unsigned GetTicksPerLine() { if (s_lineCount == 0) { @@ -771,7 +771,7 @@ int GetTicksPerLine() } } -int GetTicksPerFrame() +unsigned GetTicksPerFrame() { return TicksPerFrame; } diff --git a/Source/Core/Core/Src/HW/VideoInterface.h b/Source/Core/Core/Src/HW/VideoInterface.h index 021e48efdf..72943ad855 100644 --- a/Source/Core/Core/Src/HW/VideoInterface.h +++ b/Source/Core/Core/Src/HW/VideoInterface.h @@ -357,8 +357,8 @@ union UVIDTVStatus // Change values pertaining to video mode void UpdateParameters(); - int GetTicksPerLine(); - int GetTicksPerFrame(); + unsigned GetTicksPerLine(); + unsigned GetTicksPerFrame(); }; #endif // _VIDEOINTERFACE_H From 748be364e5ee85cf92dfd0300468afc6bc36cbd2 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Fri, 2 Dec 2011 01:16:56 +0100 Subject: [PATCH 132/381] Fixed range check on TryParse() for u32. On x86-64, "unsigned long" is 64 bits wide, so it is possible for a number to not trigger a range error on strtoul() but still not fit inside an u32. An extra check is added to ensure that 32-bit and 64-bit builds will accept the same numbers. --- Source/Core/Common/Src/StringUtil.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Source/Core/Common/Src/StringUtil.cpp b/Source/Core/Common/Src/StringUtil.cpp index 18a3575086..94f01e66f8 100644 --- a/Source/Core/Common/Src/StringUtil.cpp +++ b/Source/Core/Common/Src/StringUtil.cpp @@ -125,7 +125,7 @@ std::string StripQuotes(const std::string& s) bool TryParse(const std::string &str, u32 *const output) { char *endptr = NULL; - u32 value = strtoul(str.c_str(), &endptr, 0); + unsigned long value = strtoul(str.c_str(), &endptr, 0); if (!endptr || *endptr) return false; @@ -133,7 +133,13 @@ bool TryParse(const std::string &str, u32 *const output) if (value == ULONG_MAX && errno == ERANGE) return false; - *output = value; + if (ULONG_MAX > UINT_MAX) { + // Leading bits must be either all 0 or all 1. + if ((~value | UINT_MAX) != ULONG_MAX && (value | UINT_MAX) != ULONG_MAX) + return false; + } + + *output = static_cast(value); return true; } From 252093295b24c7fdb98ff19b72b2b4c67396d29f Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 3 Dec 2011 23:24:10 +0100 Subject: [PATCH 133/381] Do not fail with strict drivers when compiling a not SM2.0 shader To enforce SM2.0 compatibility, the OpenGL plugin was made to crash when compiling a shader which does not fit in the SM2.0a limits. However, on some combinations of OS/drivers/GPU, our shaders already do not fit in these limits, causing artificial failures only to try to keep a non existant SM2.0a compat. Basically, this sucks. This commit increases the artificial limit to SM3.0. If you're using a GPU which does not support SM3.0 and Dolphin works properly, this should not cause any problem at all. --- Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp index 050b378d2f..61e41008b3 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp @@ -252,7 +252,7 @@ bool PixelShaderCache::CompilePixelShader(FRAGMENTSHADER& ps, const char* pstrpr #if defined HAVE_CG && HAVE_CG char stropt[128]; - sprintf(stropt, "MaxLocalParams=32,NumInstructionSlots=%d", s_nMaxPixelInstructions); + sprintf(stropt, "MaxLocalParams=224,NumInstructionSlots=%d", s_nMaxPixelInstructions); const char *opts[] = {"-profileopts", stropt, "-O2", "-q", NULL}; CGprogram tempprog = cgCreateProgram(g_cgcontext, CG_SOURCE, pstrprogram, g_cgfProf, "main", opts); From 7c92b94bc1e4c30e441ff3fd35169931cd11cfa6 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Sun, 4 Dec 2011 02:48:01 +0100 Subject: [PATCH 134/381] Use Cg from Externals if it is not found systemwide. --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index e870304dc4..e28cc901d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -371,6 +371,10 @@ else() endif(NOT GLEW_FOUND) check_lib(CG Cg Cg/cg.h) + if(NOT CG_FOUND) + message("Shared Cg not found, falling back to the static library") + include_directories(Externals) + endif(NOT CG_FOUND) check_lib(CGGL CgGL Cg/cgGL.h) endif() From ffb06c23acb78a905b39c0808316e9398def821d Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Sun, 4 Dec 2011 03:37:02 +0100 Subject: [PATCH 135/381] Added version check for wxWidgets. If the systemwide wxWidgets is too old, we can fall back to the version from Externals instead of letting the build fail. Note that while the version in Externals appears to be wxWidgets 2.8, it has post-2.8 features manually added to it (wxAuiToolBar), so the version check only accepts 2.9 or higher. --- CMakeLists.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index e28cc901d4..3648c82e52 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -388,6 +388,21 @@ if(NOT DISABLE_WX) 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.9.0") + message("At least 2.9.0 is required; ignoring found version") + unset(wxWidgets_FOUND) + endif() + endif(wxWidgets_FOUND) + if(wxWidgets_FOUND) include(${wxWidgets_USE_FILE}) From 7f578ce1aecd936f56053bebf901ade35e33b2d3 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Sun, 4 Dec 2011 03:59:42 +0100 Subject: [PATCH 136/381] Use Externals/wxWidgets3 instead of Externals/wxWidgets under OS X. The "3" variant has some extra stuff merged that helps under OS X. This split should not last longer than until the wxWidgets 3.0 release. --- CMakeLists.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3648c82e52..1e13aef68b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -433,8 +433,15 @@ if(NOT DISABLE_WX) message(FATAL_ERROR "wxWidgets not found. It is required to build the GUI") endif() message("Shared wxWidgets not found, falling back to the static library") - include_directories(Externals/wxWidgets/include) - add_subdirectory(Externals/wxWidgets) + if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + add_definitions(-D__WXOSX_COCOA__) + include_directories(Externals/wxWidgets3) + include_directories(Externals/wxWidgets3/include) + add_subdirectory(Externals/wxWidgets3) + else() + include_directories(Externals/wxWidgets/include) + add_subdirectory(Externals/wxWidgets) + endif() endif(wxWidgets_FOUND) add_definitions(-DHAVE_WX=1) endif(NOT DISABLE_WX) From d249ee599a8d0fc78013b8432c33a5eb1ed27e0c Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Sun, 4 Dec 2011 15:43:52 +0100 Subject: [PATCH 137/381] Added CMakeLists.txt for wxWidgets under OS X. The vast majority of the changes in this commit were originally done by Shawn Hoffman in commit c86846cf9c995d8e0463419bd9477b0dae884929. --- Externals/wxWidgets3/CMakeLists.txt | 1244 +++++++++++++++++++++++++++ 1 file changed, 1244 insertions(+) create mode 100644 Externals/wxWidgets3/CMakeLists.txt diff --git a/Externals/wxWidgets3/CMakeLists.txt b/Externals/wxWidgets3/CMakeLists.txt new file mode 100644 index 0000000000..09437f5b68 --- /dev/null +++ b/Externals/wxWidgets3/CMakeLists.txt @@ -0,0 +1,1244 @@ +# gtk, msw, osx and shared files as of r67291 + +set(SRCS_AUI + "src/aui/auibar.cpp" + "src/aui/auibook.cpp" + "src/aui/dockart.cpp" + "src/aui/floatpane.cpp" + "src/aui/framemanager.cpp" + "src/aui/tabmdi.cpp") + +set(SRCS_COMMON + "src/common/accelcmn.cpp" + #"src/common/accesscmn.cpp" + "src/common/anidecod.cpp" + "src/common/animatecmn.cpp" + "src/common/any.cpp" + "src/common/appbase.cpp" + "src/common/appcmn.cpp" + "src/common/arcall.cpp" + "src/common/arcfind.cpp" + "src/common/archive.cpp" + "src/common/arrstr.cpp" + "src/common/artprov.cpp" + "src/common/artstd.cpp" + "src/common/arttango.cpp" + "src/common/base64.cpp" + "src/common/bmpbase.cpp" + "src/common/bmpbtncmn.cpp" + "src/common/bmpcboxcmn.cpp" + "src/common/bookctrl.cpp" + "src/common/btncmn.cpp" + "src/common/cairo.cpp" + "src/common/calctrlcmn.cpp" + "src/common/checkboxcmn.cpp" + "src/common/checklstcmn.cpp" + "src/common/choiccmn.cpp" + "src/common/clipcmn.cpp" + "src/common/clntdata.cpp" + "src/common/clrpickercmn.cpp" + "src/common/cmdline.cpp" + "src/common/cmdproc.cpp" + "src/common/cmndata.cpp" + "src/common/colourcmn.cpp" + "src/common/colourdata.cpp" + "src/common/combocmn.cpp" + "src/common/config.cpp" + "src/common/containr.cpp" + "src/common/convauto.cpp" + "src/common/cshelp.cpp" + "src/common/ctrlcmn.cpp" + "src/common/ctrlsub.cpp" + "src/common/datavcmn.cpp" + "src/common/datetime.cpp" + "src/common/datetimefmt.cpp" + "src/common/datstrm.cpp" + "src/common/dcbase.cpp" + "src/common/dcbufcmn.cpp" + "src/common/dcgraph.cpp" + "src/common/dcsvg.cpp" + "src/common/debugrpt.cpp" + "src/common/dircmn.cpp" + "src/common/dirctrlcmn.cpp" + "src/common/dlgcmn.cpp" + "src/common/dndcmn.cpp" + "src/common/dobjcmn.cpp" + "src/common/docmdi.cpp" + "src/common/docview.cpp" + "src/common/dpycmn.cpp" + "src/common/dseldlg.cpp" + "src/common/dynarray.cpp" + "src/common/dynlib.cpp" + "src/common/dynload.cpp" + #"src/common/effects.cpp" + "src/common/encconv.cpp" + "src/common/event.cpp" + "src/common/evtloopcmn.cpp" + "src/common/extended.c" + "src/common/fddlgcmn.cpp" + "src/common/fdiodispatcher.cpp" + "src/common/ffile.cpp" + "src/common/file.cpp" + "src/common/fileback.cpp" + "src/common/fileconf.cpp" + "src/common/filectrlcmn.cpp" + "src/common/filefn.cpp" + "src/common/filehistorycmn.cpp" + "src/common/filename.cpp" + "src/common/filepickercmn.cpp" + "src/common/filesys.cpp" + "src/common/filtall.cpp" + "src/common/filtfind.cpp" + "src/common/fldlgcmn.cpp" + "src/common/fmapbase.cpp" + "src/common/fontcmn.cpp" + "src/common/fontdata.cpp" + "src/common/fontenumcmn.cpp" + "src/common/fontmap.cpp" + #"src/common/fontmgrcmn.cpp" + "src/common/fontpickercmn.cpp" + "src/common/fontutilcmn.cpp" + "src/common/framecmn.cpp" + "src/common/fs_arc.cpp" + "src/common/fs_filter.cpp" + "src/common/fs_inet.cpp" + "src/common/fs_mem.cpp" + #"src/common/fswatchercmn.cpp" + "src/common/ftp.cpp" + "src/common/gaugecmn.cpp" + "src/common/gbsizer.cpp" + "src/common/gdicmn.cpp" + "src/common/geometry.cpp" + "src/common/gifdecod.cpp" + "src/common/glcmn.cpp" + "src/common/graphcmn.cpp" + "src/common/gridcmn.cpp" + "src/common/hash.cpp" + "src/common/hashmap.cpp" + "src/common/headercolcmn.cpp" + "src/common/headerctrlcmn.cpp" + "src/common/helpbase.cpp" + "src/common/http.cpp" + "src/common/hyperlnkcmn.cpp" + "src/common/iconbndl.cpp" + "src/common/imagall.cpp" + "src/common/imagbmp.cpp" + "src/common/image.cpp" + "src/common/imagfill.cpp" + #"src/common/imaggif.cpp" + #"src/common/imagiff.cpp" + #"src/common/imagjpeg.cpp" + #"src/common/imagpcx.cpp" + "src/common/imagpng.cpp" + #"src/common/imagpnm.cpp" + #"src/common/imagtga.cpp" + #"src/common/imagtiff.cpp" + #"src/common/imagxpm.cpp" + "src/common/init.cpp" + "src/common/intl.cpp" + "src/common/ipcbase.cpp" + "src/common/languageinfo.cpp" + "src/common/layout.cpp" + "src/common/lboxcmn.cpp" + "src/common/list.cpp" + "src/common/listctrlcmn.cpp" + "src/common/log.cpp" + "src/common/longlong.cpp" + #"src/common/markupparser.cpp" + "src/common/matrix.cpp" + #"src/common/mediactrlcmn.cpp" + #"src/common/memory.cpp" + "src/common/menucmn.cpp" + "src/common/mimecmn.cpp" + "src/common/module.cpp" + "src/common/mousemanager.cpp" + "src/common/msgout.cpp" + "src/common/mstream.cpp" + "src/common/nbkbase.cpp" + "src/common/numformatter.cpp" + "src/common/object.cpp" + "src/common/odcombocmn.cpp" + "src/common/overlaycmn.cpp" + #"src/common/ownerdrwcmn.cpp" + "src/common/panelcmn.cpp" + "src/common/paper.cpp" + "src/common/persist.cpp" + "src/common/pickerbase.cpp" + "src/common/platinfo.cpp" + "src/common/popupcmn.cpp" + "src/common/powercmn.cpp" + "src/common/prntbase.cpp" + "src/common/process.cpp" + "src/common/protocol.cpp" + "src/common/quantize.cpp" + "src/common/radiobtncmn.cpp" + "src/common/radiocmn.cpp" + "src/common/rearrangectrl.cpp" + #"src/common/regex.cpp" + "src/common/rendcmn.cpp" + "src/common/rgncmn.cpp" + "src/common/sckaddr.cpp" + "src/common/sckfile.cpp" + "src/common/sckipc.cpp" + "src/common/sckstrm.cpp" + "src/common/scrolbarcmn.cpp" + "src/common/selectdispatcher.cpp" + "src/common/settcmn.cpp" + "src/common/sizer.cpp" + "src/common/slidercmn.cpp" + "src/common/socket.cpp" + "src/common/socketiohandler.cpp" + "src/common/spinbtncmn.cpp" + "src/common/spinctrlcmn.cpp" + "src/common/srchcmn.cpp" + "src/common/sstream.cpp" + "src/common/statbar.cpp" + "src/common/statbmpcmn.cpp" + "src/common/statboxcmn.cpp" + "src/common/statlinecmn.cpp" + "src/common/stattextcmn.cpp" + "src/common/stdpbase.cpp" + "src/common/stdstream.cpp" + "src/common/stockitem.cpp" + "src/common/stopwatch.cpp" + "src/common/strconv.cpp" + "src/common/stream.cpp" + "src/common/string.cpp" + "src/common/stringimpl.cpp" + "src/common/stringops.cpp" + "src/common/strvararg.cpp" + "src/common/sysopt.cpp" + "src/common/tarstrm.cpp" + "src/common/taskbarcmn.cpp" + "src/common/tbarbase.cpp" + "src/common/textbuf.cpp" + "src/common/textcmn.cpp" + "src/common/textentrycmn.cpp" + "src/common/textfile.cpp" + "src/common/timercmn.cpp" + "src/common/timerimpl.cpp" + "src/common/tokenzr.cpp" + "src/common/toplvcmn.cpp" + "src/common/translation.cpp" + "src/common/treebase.cpp" + "src/common/txtstrm.cpp" + "src/common/uiactioncmn.cpp" + "src/common/unichar.cpp" + "src/common/uri.cpp" + "src/common/url.cpp" + "src/common/ustring.cpp" + "src/common/utilscmn.cpp" + "src/common/valgen.cpp" + "src/common/validate.cpp" + "src/common/valnum.cpp" + "src/common/valtext.cpp" + "src/common/variant.cpp" + "src/common/wfstream.cpp" + "src/common/wincmn.cpp" + "src/common/windowid.cpp" + "src/common/wrapsizer.cpp" + "src/common/wxcrt.cpp" + "src/common/wxprintf.cpp" + "src/common/xlocale.cpp" + "src/common/xpmdecod.cpp" + #"src/common/xti.cpp" + #"src/common/xtistrm.cpp" + #"src/common/xtixml.cpp" + "src/common/zipstrm.cpp" + "src/common/zstream.cpp") + +set(SRCS_EXPAT + #"src/expat/lib/xmlparse.c" + #"src/expat/lib/xmlrole.c" + #"src/expat/lib/xmltok.c" + #"src/expat/lib/xmltok_impl.c" + #"src/expat/lib/xmltok_ns.c" + #"src/expat/xmlwf/codepage.c" + #"src/expat/xmlwf/ct.c" + #"src/expat/xmlwf/readfilemap.c" + #"src/expat/xmlwf/unixfilemap.c" + #"src/expat/xmlwf/win32filemap.c" + #"src/expat/xmlwf/xmlfile.c" + #"src/expat/xmlwf/xmlmime.c" + #"src/expat/xmlwf/xmlwf.c" + #"src/expat/xmlwf/xmlwin32url.cxx" +) + +set(SRCS_GENERIC + "src/generic/aboutdlgg.cpp" + "src/generic/bmpcboxg.cpp" + "src/generic/busyinfo.cpp" + "src/generic/buttonbar.cpp" + "src/generic/calctrlg.cpp" + "src/generic/caret.cpp" + "src/generic/choicbkg.cpp" + "src/generic/choicdgg.cpp" + #"src/generic/colour.cpp" + "src/generic/combog.cpp" + "src/generic/commandlinkbuttong.cpp" + "src/generic/datavgen.cpp" + "src/generic/datectlg.cpp" + #"src/generic/dbgrptg.cpp" + "src/generic/dcpsg.cpp" + "src/generic/dirctrlg.cpp" + "src/generic/dragimgg.cpp" + "src/generic/editlbox.cpp" + "src/generic/fdrepdlg.cpp" + "src/generic/filectrlg.cpp" + "src/generic/filepickerg.cpp" + "src/generic/fontdlgg.cpp" + #"src/generic/fswatcherg.cpp" + "src/generic/graphicc.cpp" + "src/generic/grid.cpp" + "src/generic/gridctrl.cpp" + "src/generic/grideditors.cpp" + "src/generic/gridsel.cpp" + "src/generic/headerctrlg.cpp" + "src/generic/helpext.cpp" + #"src/generic/htmllbox.cpp" + "src/generic/hyperlinkg.cpp" + "src/generic/infobar.cpp" + "src/generic/laywin.cpp" + "src/generic/listbkg.cpp" + "src/generic/listctrl.cpp" + "src/generic/logg.cpp" + #"src/generic/markuptext.cpp" + #"src/generic/mask.cpp" + "src/generic/mdig.cpp" + "src/generic/msgdlgg.cpp" + #"src/generic/notebook.cpp" + "src/generic/notifmsgg.cpp" + "src/generic/numdlgg.cpp" + "src/generic/odcombo.cpp" + "src/generic/panelg.cpp" + "src/generic/printps.cpp" + "src/generic/prntdlgg.cpp" + "src/generic/progdlgg.cpp" + "src/generic/propdlg.cpp" + #"src/generic/regiong.cpp" + "src/generic/renderg.cpp" + "src/generic/richmsgdlgg.cpp" + "src/generic/sashwin.cpp" + "src/generic/scrlwing.cpp" + "src/generic/selstore.cpp" + "src/generic/spinctlg.cpp" + "src/generic/splash.cpp" + "src/generic/splitter.cpp" + "src/generic/srchctlg.cpp" + "src/generic/statbmpg.cpp" + #"src/generic/statline.cpp" + "src/generic/stattextg.cpp" + "src/generic/statusbr.cpp" + "src/generic/tabg.cpp" + "src/generic/textdlgg.cpp" + #"src/generic/timer.cpp" + "src/generic/tipdlg.cpp" + "src/generic/tipwin.cpp" + "src/generic/toolbkg.cpp" + "src/generic/treebkg.cpp" + "src/generic/treectlg.cpp" + "src/generic/vlbox.cpp" + "src/generic/vscroll.cpp" + "src/generic/wizard.cpp") + +set(SRCS_GENERICGTK + "src/generic/accel.cpp" + "src/generic/icon.cpp" + "src/generic/imaglist.cpp" + "src/generic/paletteg.cpp") + +set(SRCS_GENERICOSX + "src/generic/animateg.cpp" + "src/generic/clrpickerg.cpp" + "src/generic/collpaneg.cpp" + "src/generic/colrdlgg.cpp" + "src/generic/dirdlgg.cpp" + "src/generic/filedlgg.cpp" + "src/generic/fontpickerg.cpp") + +set(SRCS_GTK + "src/gtk/aboutdlg.cpp" + "src/gtk/animate.cpp" + "src/gtk/app.cpp" + "src/gtk/artgtk.cpp" + "src/gtk/assertdlg_gtk.c" + "src/gtk/bitmap.cpp" + "src/gtk/bmpbuttn.cpp" + "src/gtk/bmpcbox.cpp" + "src/gtk/brush.cpp" + "src/gtk/button.cpp" + "src/gtk/calctrl.cpp" + "src/gtk/checkbox.cpp" + "src/gtk/checklst.cpp" + "src/gtk/choice.cpp" + "src/gtk/clipbrd.cpp" + "src/gtk/clrpicker.cpp" + "src/gtk/collpane.cpp" + "src/gtk/colordlg.cpp" + "src/gtk/colour.cpp" + "src/gtk/combobox.cpp" + "src/gtk/control.cpp" + "src/gtk/cursor.cpp" + "src/gtk/dataobj.cpp" + "src/gtk/dataview.cpp" + "src/gtk/dc.cpp" + "src/gtk/dcclient.cpp" + "src/gtk/dcmemory.cpp" + "src/gtk/dcscreen.cpp" + "src/gtk/dialog.cpp" + "src/gtk/dirdlg.cpp" + "src/gtk/dnd.cpp" + "src/gtk/eggtrayicon.c" + "src/gtk/evtloop.cpp" + "src/gtk/filectrl.cpp" + "src/gtk/filedlg.cpp" + "src/gtk/filehistory.cpp" + "src/gtk/filepicker.cpp" + "src/gtk/font.cpp" + "src/gtk/fontdlg.cpp" + "src/gtk/fontpicker.cpp" + "src/gtk/frame.cpp" + "src/gtk/gauge.cpp" + "src/gtk/glcanvas.cpp" + #"src/gtk/gnome/gprint.cpp" + #"src/gtk/gnome/gvfs.cpp" + #"src/gtk/hildon/notifmsg.cpp" + "src/gtk/hyperlink.cpp" + "src/gtk/infobar.cpp" + "src/gtk/listbox.cpp" + "src/gtk/mdi.cpp" + "src/gtk/menu.cpp" + "src/gtk/minifram.cpp" + "src/gtk/mnemonics.cpp" + "src/gtk/msgdlg.cpp" + "src/gtk/nativewin.cpp" + "src/gtk/notebook.cpp" + "src/gtk/pen.cpp" + "src/gtk/popupwin.cpp" + #"src/gtk/print.cpp" + "src/gtk/private.cpp" + "src/gtk/radiobox.cpp" + "src/gtk/radiobut.cpp" + "src/gtk/region.cpp" + "src/gtk/renderer.cpp" + "src/gtk/scrolbar.cpp" + "src/gtk/scrolwin.cpp" + "src/gtk/settings.cpp" + "src/gtk/slider.cpp" + "src/gtk/sockgtk.cpp" + "src/gtk/spinbutt.cpp" + "src/gtk/spinctrl.cpp" + "src/gtk/statbmp.cpp" + "src/gtk/statbox.cpp" + "src/gtk/statline.cpp" + "src/gtk/stattext.cpp" + "src/gtk/taskbar.cpp" + "src/gtk/textctrl.cpp" + "src/gtk/textentry.cpp" + "src/gtk/tglbtn.cpp" + "src/gtk/timer.cpp" + "src/gtk/toolbar.cpp" + "src/gtk/tooltip.cpp" + "src/gtk/toplevel.cpp" + "src/gtk/treeentry_gtk.c" + "src/gtk/utilsgtk.cpp" + "src/gtk/win_gtk.cpp" + "src/gtk/window.cpp") + +set(SRCS_HTML + "src/html/chm.cpp" + "src/html/helpctrl.cpp" + "src/html/helpdata.cpp" + "src/html/helpdlg.cpp" + "src/html/helpfrm.cpp" + "src/html/helpwnd.cpp" + "src/html/htmlcell.cpp" + #"src/html/htmlctrl/webkit/webkit.mm" + "src/html/htmlfilt.cpp" + "src/html/htmlpars.cpp" + "src/html/htmltag.cpp" + "src/html/htmlwin.cpp" + "src/html/htmprint.cpp" + "src/html/m_dflist.cpp" + "src/html/m_fonts.cpp" + "src/html/m_hline.cpp" + "src/html/m_image.cpp" + "src/html/m_layout.cpp" + "src/html/m_links.cpp" + "src/html/m_list.cpp" + "src/html/m_pre.cpp" + "src/html/m_span.cpp" + "src/html/m_style.cpp" + "src/html/m_tables.cpp" + "src/html/styleparams.cpp" + "src/html/winpars.cpp") + +set(SRCS_JPEG + "src/jpeg/jcapimin.c" + "src/jpeg/jcapistd.c" + "src/jpeg/jccoefct.c" + "src/jpeg/jccolor.c" + "src/jpeg/jcdctmgr.c" + "src/jpeg/jchuff.c" + "src/jpeg/jcinit.c" + "src/jpeg/jcmainct.c" + "src/jpeg/jcmarker.c" + "src/jpeg/jcmaster.c" + "src/jpeg/jcomapi.c" + "src/jpeg/jcparam.c" + "src/jpeg/jcphuff.c" + "src/jpeg/jcprepct.c" + "src/jpeg/jcsample.c" + "src/jpeg/jctrans.c" + "src/jpeg/jdapimin.c" + "src/jpeg/jdapistd.c" + "src/jpeg/jdatadst.c" + "src/jpeg/jdatasrc.c" + "src/jpeg/jdcoefct.c" + "src/jpeg/jdcolor.c" + "src/jpeg/jddctmgr.c" + "src/jpeg/jdhuff.c" + "src/jpeg/jdinput.c" + "src/jpeg/jdmainct.c" + "src/jpeg/jdmarker.c" + "src/jpeg/jdmaster.c" + "src/jpeg/jdmerge.c" + "src/jpeg/jdphuff.c" + "src/jpeg/jdpostct.c" + "src/jpeg/jdsample.c" + "src/jpeg/jdtrans.c" + "src/jpeg/jerror.c" + "src/jpeg/jfdctflt.c" + "src/jpeg/jfdctfst.c" + "src/jpeg/jfdctint.c" + "src/jpeg/jidctflt.c" + "src/jpeg/jidctfst.c" + "src/jpeg/jidctint.c" + "src/jpeg/jidctred.c" + "src/jpeg/jmemansi.c" + "src/jpeg/jmemmgr.c" + "src/jpeg/jmemname.c" + "src/jpeg/jmemnobs.c" + "src/jpeg/jquant1.c" + "src/jpeg/jquant2.c" + "src/jpeg/jutils.c") + +set(SRCS_MSW + "src/msw/aboutdlg.cpp" + "src/msw/accel.cpp" + "src/msw/app.cpp" + "src/msw/artmsw.cpp" + "src/msw/basemsw.cpp" + "src/msw/bitmap.cpp" + "src/msw/bmpbuttn.cpp" + "src/msw/bmpcbox.cpp" + "src/msw/brush.cpp" + "src/msw/button.cpp" + "src/msw/calctrl.cpp" + "src/msw/caret.cpp" + "src/msw/checkbox.cpp" + "src/msw/checklst.cpp" + "src/msw/choice.cpp" + "src/msw/clipbrd.cpp" + "src/msw/colordlg.cpp" + "src/msw/colour.cpp" + "src/msw/combo.cpp" + "src/msw/combobox.cpp" + "src/msw/commandlinkbutton.cpp" + "src/msw/control.cpp" + "src/msw/crashrpt.cpp" + "src/msw/cursor.cpp" + "src/msw/data.cpp" + "src/msw/datecontrols.cpp" + "src/msw/datectrl.cpp" + "src/msw/dc.cpp" + "src/msw/dcclient.cpp" + "src/msw/dcmemory.cpp" + "src/msw/dcprint.cpp" + "src/msw/dcscreen.cpp" + "src/msw/dde.cpp" + "src/msw/debughlp.cpp" + "src/msw/dialog.cpp" + "src/msw/dialup.cpp" + "src/msw/dib.cpp" + "src/msw/dir.cpp" + "src/msw/dirdlg.cpp" + "src/msw/display.cpp" + "src/msw/dlmsw.cpp" + "src/msw/dragimag.cpp" + "src/msw/enhmeta.cpp" + "src/msw/evtloop.cpp" + "src/msw/fdrepdlg.cpp" + "src/msw/filedlg.cpp" + "src/msw/font.cpp" + "src/msw/fontdlg.cpp" + "src/msw/fontenum.cpp" + "src/msw/fontutil.cpp" + "src/msw/frame.cpp" + #"src/msw/fswatcher.cpp" + "src/msw/gauge.cpp" + "src/msw/gdiimage.cpp" + "src/msw/gdiobj.cpp" + "src/msw/gdiplus.cpp" + "src/msw/glcanvas.cpp" + "src/msw/graphics.cpp" + "src/msw/headerctrl.cpp" + "src/msw/helpbest.cpp" + "src/msw/helpchm.cpp" + "src/msw/helpwin.cpp" + "src/msw/hyperlink.cpp" + "src/msw/icon.cpp" + "src/msw/imaglist.cpp" + "src/msw/iniconf.cpp" + #"src/msw/joystick.cpp" + "src/msw/listbox.cpp" + "src/msw/listctrl.cpp" + "src/msw/main.cpp" + "src/msw/mdi.cpp" + #"src/msw/mediactrl_am.cpp" + #"src/msw/mediactrl_qt.cpp" + #"src/msw/mediactrl_wmp10.cpp" + "src/msw/menu.cpp" + "src/msw/menuitem.cpp" + "src/msw/metafile.cpp" + "src/msw/microwin.c" + "src/msw/mimetype.cpp" + "src/msw/minifram.cpp" + "src/msw/msgdlg.cpp" + "src/msw/mslu.cpp" + "src/msw/nativdlg.cpp" + "src/msw/nativewin.cpp" + "src/msw/notebook.cpp" + "src/msw/notifmsg.cpp" + "src/msw/ole/access.cpp" + "src/msw/ole/activex.cpp" + "src/msw/ole/automtn.cpp" + "src/msw/ole/dataobj.cpp" + "src/msw/ole/dropsrc.cpp" + "src/msw/ole/droptgt.cpp" + "src/msw/ole/oleutils.cpp" + "src/msw/ole/uuid.cpp" + "src/msw/ownerdrw.cpp" + "src/msw/palette.cpp" + "src/msw/panel.cpp" + "src/msw/pen.cpp" + "src/msw/penwin.cpp" + "src/msw/popupwin.cpp" + "src/msw/power.cpp" + "src/msw/printdlg.cpp" + "src/msw/printwin.cpp" + "src/msw/progdlg.cpp" + "src/msw/radiobox.cpp" + "src/msw/radiobut.cpp" + "src/msw/regconf.cpp" + "src/msw/region.cpp" + "src/msw/registry.cpp" + "src/msw/renderer.cpp" + "src/msw/richmsgdlg.cpp" + "src/msw/scrolbar.cpp" + "src/msw/settings.cpp" + "src/msw/slider.cpp" + "src/msw/snglinst.cpp" + "src/msw/sockmsw.cpp" + "src/msw/sound.cpp" + "src/msw/spinbutt.cpp" + "src/msw/spinctrl.cpp" + #"src/msw/stackwalk.cpp" + "src/msw/statbmp.cpp" + "src/msw/statbox.cpp" + "src/msw/statline.cpp" + "src/msw/stattext.cpp" + "src/msw/statusbar.cpp" + "src/msw/stdpaths.cpp" + "src/msw/taskbar.cpp" + "src/msw/textctrl.cpp" + "src/msw/textentry.cpp" + "src/msw/tglbtn.cpp" + "src/msw/thread.cpp" + "src/msw/timer.cpp" + "src/msw/toolbar.cpp" + "src/msw/tooltip.cpp" + "src/msw/toplevel.cpp" + "src/msw/treectrl.cpp" + "src/msw/uiaction.cpp" + "src/msw/urlmsw.cpp" + "src/msw/utils.cpp" + "src/msw/utilsexc.cpp" + "src/msw/utilsgui.cpp" + "src/msw/uxtheme.cpp" + "src/msw/version.rc" + "src/msw/volume.cpp" + "src/msw/wince/checklst.cpp" + "src/msw/wince/choicece.cpp" + "src/msw/wince/crt.cpp" + "src/msw/wince/filedlgwce.cpp" + "src/msw/wince/filefnwce.cpp" + "src/msw/wince/helpwce.cpp" + "src/msw/wince/menuce.cpp" + "src/msw/wince/net.cpp" + "src/msw/wince/tbarwce.cpp" + "src/msw/wince/textctrlce.cpp" + "src/msw/wince/time.cpp" + "src/msw/window.cpp" + "src/msw/winestub.c") + +set(SRCS_OSX + "src/osx/accel.cpp" + "src/osx/artmac.cpp" + "src/osx/bmpbuttn_osx.cpp" + "src/osx/brush.cpp" + "src/osx/button_osx.cpp" + "src/osx/checkbox_osx.cpp" + "src/osx/checklst_osx.cpp" + "src/osx/choice_osx.cpp" + "src/osx/combobox_osx.cpp" + "src/osx/dataview_osx.cpp" + "src/osx/dialog_osx.cpp" + "src/osx/dnd_osx.cpp" + "src/osx/fontutil.cpp" + "src/osx/gauge_osx.cpp" + "src/osx/glcanvas_osx.cpp" + "src/osx/imaglist.cpp" + "src/osx/listbox_osx.cpp" + "src/osx/menu_osx.cpp" + "src/osx/menuitem_osx.cpp" + "src/osx/minifram.cpp" + "src/osx/nonownedwnd_osx.cpp" + "src/osx/notebook_osx.cpp" + "src/osx/palette.cpp" + "src/osx/pen.cpp" + "src/osx/printdlg_osx.cpp" + "src/osx/radiobox_osx.cpp" + "src/osx/radiobut_osx.cpp" + "src/osx/scrolbar_osx.cpp" + "src/osx/slider_osx.cpp" + "src/osx/sound_osx.cpp" + "src/osx/spinbutt_osx.cpp" + "src/osx/spinctrl_osx.cpp" + "src/osx/srchctrl_osx.cpp" + "src/osx/statbox_osx.cpp" + "src/osx/statline_osx.cpp" + "src/osx/stattext_osx.cpp" + "src/osx/textctrl_osx.cpp" + "src/osx/textentry_osx.cpp" + "src/osx/tglbtn_osx.cpp" + "src/osx/toolbar_osx.cpp" + "src/osx/toplevel_osx.cpp" + "src/osx/uiaction_osx.cpp" + "src/osx/utils_osx.cpp" + "src/osx/window_osx.cpp" + #"src/osx/carbon/aboutdlg.cpp" + "src/osx/carbon/app.cpp" + #"src/osx/carbon/bmpbuttn.cpp" + #"src/osx/carbon/button.cpp" + #"src/osx/carbon/checkbox.cpp" + #"src/osx/carbon/choice.cpp" + "src/osx/carbon/clipbrd.cpp" + #"src/osx/carbon/colordlg.cpp" + "src/osx/carbon/colordlgosx.mm" + #"src/osx/carbon/combobox.cpp" + #"src/osx/carbon/combobxc.cpp" + "src/osx/carbon/control.cpp" + "src/osx/carbon/cursor.cpp" + "src/osx/carbon/dataobj.cpp" + #"src/osx/carbon/dataview.cpp" + "src/osx/carbon/dcclient.cpp" + "src/osx/carbon/dcprint.cpp" + "src/osx/carbon/dcscreen.cpp" + #"src/osx/carbon/dialog.cpp" + #"src/osx/carbon/dirdlg.cpp" + #"src/osx/carbon/dirmac.cpp" + #"src/osx/carbon/dnd.cpp" + #"src/osx/carbon/drawer.cpp" + #"src/osx/carbon/evtloop.cpp" + #"src/osx/carbon/filedlg.cpp" + "src/osx/carbon/font.cpp" + "src/osx/carbon/fontdlg.cpp" + "src/osx/carbon/fontdlgosx.mm" + "src/osx/carbon/frame.cpp" + #"src/osx/carbon/gauge.cpp" + "src/osx/carbon/gdiobj.cpp" + #"src/osx/carbon/glcanvas.cpp" + "src/osx/carbon/graphics.cpp" + #"src/osx/carbon/helpxxxx.cpp" + "src/osx/carbon/icon.cpp" + #"src/osx/carbon/joystick.cpp" + #"src/osx/carbon/listbox.cpp" + #"src/osx/carbon/listctrl_mac.cpp" + #"src/osx/carbon/main.cpp" + "src/osx/carbon/mdi.cpp" + #"src/osx/carbon/mediactrl.cpp" + #"src/osx/carbon/menu.cpp" + #"src/osx/carbon/menuitem.cpp" + "src/osx/carbon/metafile.cpp" + #"src/osx/carbon/mimetmac.cpp" + #"src/osx/carbon/msgdlg.cpp" + #"src/osx/carbon/nonownedwnd.cpp" + #"src/osx/carbon/notebmac.cpp" + #"src/osx/carbon/overlay.cpp" + "src/osx/carbon/popupwin.cpp" + #"src/osx/carbon/printdlg.cpp" + #"src/osx/carbon/radiobut.cpp" + "src/osx/carbon/region.cpp" + "src/osx/carbon/renderer.cpp" + #"src/osx/carbon/scrolbar.cpp" + "src/osx/carbon/settings.cpp" + #"src/osx/carbon/slider.cpp" + #"src/osx/carbon/sound.cpp" + #"src/osx/carbon/spinbutt.cpp" + #"src/osx/carbon/srchctrl.cpp" + #"src/osx/carbon/statbmp.cpp" + #"src/osx/carbon/statbox.cpp" + "src/osx/carbon/statbrma.cpp" + #"src/osx/carbon/statline.cpp" + #"src/osx/carbon/statlmac.cpp" + #"src/osx/carbon/stattext.cpp" + #"src/osx/carbon/taskbar.cpp" + #"src/osx/carbon/textctrl.cpp" + #"src/osx/carbon/tglbtn.cpp" + #"src/osx/carbon/thread.cpp" + #"src/osx/carbon/timer.cpp" + #"src/osx/carbon/toolbar.cpp" + #"src/osx/carbon/tooltip.cpp" + #"src/osx/carbon/uma.cpp" + #"src/osx/carbon/utils.cpp" + "src/osx/carbon/utilscocoa.mm" + #"src/osx/carbon/window.cpp" + "src/osx/cocoa/aboutdlg.mm" + "src/osx/cocoa/button.mm" + "src/osx/cocoa/checkbox.mm" + "src/osx/cocoa/choice.mm" + "src/osx/cocoa/colour.mm" + "src/osx/cocoa/combobox.mm" + "src/osx/cocoa/dataview.mm" + "src/osx/cocoa/dialog.mm" + "src/osx/cocoa/dirdlg.mm" + "src/osx/cocoa/dnd.mm" + "src/osx/cocoa/evtloop.mm" + "src/osx/cocoa/filedlg.mm" + "src/osx/cocoa/gauge.mm" + "src/osx/cocoa/glcanvas.mm" + "src/osx/cocoa/listbox.mm" + #"src/osx/cocoa/mediactrl.mm" + "src/osx/cocoa/menu.mm" + "src/osx/cocoa/menuitem.mm" + "src/osx/cocoa/msgdlg.mm" + "src/osx/cocoa/nonownedwnd.mm" + "src/osx/cocoa/notebook.mm" + "src/osx/cocoa/overlay.mm" + "src/osx/cocoa/printdlg.mm" + "src/osx/cocoa/radiobut.mm" + "src/osx/cocoa/scrolbar.mm" + "src/osx/cocoa/slider.mm" + "src/osx/cocoa/spinbutt.mm" + "src/osx/cocoa/srchctrl.mm" + "src/osx/cocoa/statbox.mm" + "src/osx/cocoa/statline.mm" + "src/osx/cocoa/stattext.mm" + "src/osx/cocoa/taskbar.mm" + "src/osx/cocoa/textctrl.mm" + "src/osx/cocoa/tglbtn.mm" + "src/osx/cocoa/toolbar.mm" + "src/osx/cocoa/tooltip.mm" + "src/osx/cocoa/utils.mm" + "src/osx/cocoa/window.mm" + "src/osx/core/bitmap.cpp" + "src/osx/core/cfstring.cpp" + "src/osx/core/colour.cpp" + "src/osx/core/dcmemory.cpp" + "src/osx/core/display.cpp" + "src/osx/core/evtloop_cf.cpp" + "src/osx/core/fontenum.cpp" + "src/osx/core/glgrab.cpp" + "src/osx/core/hid.cpp" + #"src/osx/core/hidjoystick.cpp" + "src/osx/core/mimetype.cpp" + "src/osx/core/printmac.cpp" + "src/osx/core/sockosx.cpp" + "src/osx/core/sound.cpp" + "src/osx/core/stdpaths_cf.cpp" + "src/osx/core/strconv_cf.cpp" + "src/osx/core/timer.cpp" + "src/osx/core/utilsexc_base.cpp" + "src/osx/core/utilsexc_cf.cpp" + #"src/osx/iphone/button.mm" + #"src/osx/iphone/checkbox.mm" + #"src/osx/iphone/dialog.mm" + #"src/osx/iphone/evtloop.mm" + #"src/osx/iphone/gauge.mm" + #"src/osx/iphone/glcanvas.mm" + #"src/osx/iphone/msgdlg.mm" + #"src/osx/iphone/nonownedwnd.mm" + #"src/osx/iphone/scrolbar.mm" + #"src/osx/iphone/slider.mm" + #"src/osx/iphone/stattext.mm" + #"src/osx/iphone/textctrl.mm" + #"src/osx/iphone/toolbar.mm" + #"src/osx/iphone/utils.mm" + #"src/osx/iphone/window.mm" +) + +set(SRCS_PNG + "src/png/png.c" + "src/png/pngerror.c" + "src/png/pngget.c" + "src/png/pngmem.c" + "src/png/pngpread.c" + "src/png/pngread.c" + "src/png/pngrio.c" + "src/png/pngrtran.c" + "src/png/pngrutil.c" + "src/png/pngset.c" + "src/png/pngtrans.c" + "src/png/pngwio.c" + "src/png/pngwrite.c" + "src/png/pngwtran.c" + "src/png/pngwutil.c") + +set(SRCS_PROPGRID + "src/propgrid/advprops.cpp" + "src/propgrid/editors.cpp" + "src/propgrid/manager.cpp" + "src/propgrid/property.cpp" + "src/propgrid/propgrid.cpp" + "src/propgrid/propgridiface.cpp" + "src/propgrid/propgridpagestate.cpp" + "src/propgrid/props.cpp") + +set(SRCS_REGEX + "src/regex/regcomp.c" + "src/regex/regerror.c" + "src/regex/regexec.c" + "src/regex/regfree.c") + +set(SRCS_RIBBON + "src/ribbon/art_aui.cpp" + "src/ribbon/art_internal.cpp" + "src/ribbon/art_msw.cpp" + "src/ribbon/bar.cpp" + "src/ribbon/buttonbar.cpp" + "src/ribbon/control.cpp" + "src/ribbon/gallery.cpp" + "src/ribbon/page.cpp" + "src/ribbon/panel.cpp" + "src/ribbon/toolbar.cpp") + +set(SRCS_RICHTEXT + #"src/richtext/richtextbackgroundpage.cpp" + #"src/richtext/richtextborderspage.cpp" + "src/richtext/richtextbuffer.cpp" + #"src/richtext/richtextbulletspage.cpp" + "src/richtext/richtextctrl.cpp" + #"src/richtext/richtextfontpage.cpp" + "src/richtext/richtextformatdlg.cpp" + "src/richtext/richtexthtml.cpp" + "src/richtext/richtextimagedlg.cpp" + #"src/richtext/richtextindentspage.cpp" + #"src/richtext/richtextliststylepage.cpp" + #"src/richtext/richtextmarginspage.cpp" + "src/richtext/richtextprint.cpp" + #"src/richtext/richtextsizepage.cpp" + "src/richtext/richtextstyledlg.cpp" + #"src/richtext/richtextstylepage.cpp" + "src/richtext/richtextstyles.cpp" + "src/richtext/richtextsymboldlg.cpp" + #"src/richtext/richtexttabspage.cpp" + "src/richtext/richtextxml.cpp") + +set(SRCS_STC + "src/stc/PlatWX.cpp" + "src/stc/ScintillaWX.cpp" + "src/stc/scintilla/src/AutoComplete.cxx" + "src/stc/scintilla/src/CallTip.cxx" + "src/stc/scintilla/src/CellBuffer.cxx" + "src/stc/scintilla/src/CharClassify.cxx" + "src/stc/scintilla/src/ContractionState.cxx" + "src/stc/scintilla/src/Decoration.cxx" + "src/stc/scintilla/src/Document.cxx" + "src/stc/scintilla/src/DocumentAccessor.cxx" + "src/stc/scintilla/src/Editor.cxx" + "src/stc/scintilla/src/ExternalLexer.cxx" + "src/stc/scintilla/src/Indicator.cxx" + "src/stc/scintilla/src/KeyMap.cxx" + "src/stc/scintilla/src/KeyWords.cxx" + "src/stc/scintilla/src/LexAPDL.cxx" + "src/stc/scintilla/src/LexASY.cxx" + "src/stc/scintilla/src/LexAU3.cxx" + "src/stc/scintilla/src/LexAVE.cxx" + "src/stc/scintilla/src/LexAbaqus.cxx" + "src/stc/scintilla/src/LexAda.cxx" + "src/stc/scintilla/src/LexAsm.cxx" + "src/stc/scintilla/src/LexAsn1.cxx" + "src/stc/scintilla/src/LexBaan.cxx" + "src/stc/scintilla/src/LexBash.cxx" + "src/stc/scintilla/src/LexBasic.cxx" + "src/stc/scintilla/src/LexBullant.cxx" + "src/stc/scintilla/src/LexCLW.cxx" + "src/stc/scintilla/src/LexCOBOL.cxx" + "src/stc/scintilla/src/LexCPP.cxx" + "src/stc/scintilla/src/LexCSS.cxx" + "src/stc/scintilla/src/LexCaml.cxx" + "src/stc/scintilla/src/LexCmake.cxx" + "src/stc/scintilla/src/LexConf.cxx" + "src/stc/scintilla/src/LexCrontab.cxx" + "src/stc/scintilla/src/LexCsound.cxx" + "src/stc/scintilla/src/LexD.cxx" + "src/stc/scintilla/src/LexEScript.cxx" + "src/stc/scintilla/src/LexEiffel.cxx" + "src/stc/scintilla/src/LexErlang.cxx" + "src/stc/scintilla/src/LexFlagship.cxx" + "src/stc/scintilla/src/LexForth.cxx" + "src/stc/scintilla/src/LexFortran.cxx" + "src/stc/scintilla/src/LexGAP.cxx" + "src/stc/scintilla/src/LexGui4Cli.cxx" + "src/stc/scintilla/src/LexHTML.cxx" + "src/stc/scintilla/src/LexHaskell.cxx" + "src/stc/scintilla/src/LexInno.cxx" + "src/stc/scintilla/src/LexKix.cxx" + "src/stc/scintilla/src/LexLisp.cxx" + "src/stc/scintilla/src/LexLout.cxx" + "src/stc/scintilla/src/LexLua.cxx" + "src/stc/scintilla/src/LexMMIXAL.cxx" + "src/stc/scintilla/src/LexMPT.cxx" + "src/stc/scintilla/src/LexMSSQL.cxx" + "src/stc/scintilla/src/LexMagik.cxx" + "src/stc/scintilla/src/LexMarkdown.cxx" + "src/stc/scintilla/src/LexMatlab.cxx" + "src/stc/scintilla/src/LexMetapost.cxx" + "src/stc/scintilla/src/LexMySQL.cxx" + "src/stc/scintilla/src/LexNimrod.cxx" + "src/stc/scintilla/src/LexNsis.cxx" + "src/stc/scintilla/src/LexOpal.cxx" + "src/stc/scintilla/src/LexOthers.cxx" + "src/stc/scintilla/src/LexPB.cxx" + "src/stc/scintilla/src/LexPLM.cxx" + "src/stc/scintilla/src/LexPOV.cxx" + "src/stc/scintilla/src/LexPS.cxx" + "src/stc/scintilla/src/LexPascal.cxx" + "src/stc/scintilla/src/LexPerl.cxx" + "src/stc/scintilla/src/LexPowerPro.cxx" + "src/stc/scintilla/src/LexPowerShell.cxx" + "src/stc/scintilla/src/LexProgress.cxx" + "src/stc/scintilla/src/LexPython.cxx" + "src/stc/scintilla/src/LexR.cxx" + "src/stc/scintilla/src/LexRebol.cxx" + "src/stc/scintilla/src/LexRuby.cxx" + "src/stc/scintilla/src/LexSML.cxx" + "src/stc/scintilla/src/LexSQL.cxx" + "src/stc/scintilla/src/LexScriptol.cxx" + "src/stc/scintilla/src/LexSmalltalk.cxx" + "src/stc/scintilla/src/LexSorcus.cxx" + "src/stc/scintilla/src/LexSpecman.cxx" + "src/stc/scintilla/src/LexSpice.cxx" + "src/stc/scintilla/src/LexTACL.cxx" + "src/stc/scintilla/src/LexTADS3.cxx" + "src/stc/scintilla/src/LexTAL.cxx" + "src/stc/scintilla/src/LexTCL.cxx" + "src/stc/scintilla/src/LexTeX.cxx" + "src/stc/scintilla/src/LexVB.cxx" + "src/stc/scintilla/src/LexVHDL.cxx" + "src/stc/scintilla/src/LexVerilog.cxx" + "src/stc/scintilla/src/LexYAML.cxx" + "src/stc/scintilla/src/LineMarker.cxx" + "src/stc/scintilla/src/PerLine.cxx" + "src/stc/scintilla/src/PositionCache.cxx" + "src/stc/scintilla/src/PropSet.cxx" + "src/stc/scintilla/src/RESearch.cxx" + "src/stc/scintilla/src/RunStyles.cxx" + "src/stc/scintilla/src/ScintillaBase.cxx" + "src/stc/scintilla/src/Selection.cxx" + "src/stc/scintilla/src/Style.cxx" + "src/stc/scintilla/src/StyleContext.cxx" + "src/stc/scintilla/src/UniConversion.cxx" + "src/stc/scintilla/src/ViewStyle.cxx" + "src/stc/scintilla/src/WindowAccessor.cxx" + "src/stc/scintilla/src/XPM.cxx" + "src/stc/stc.cpp") + +set(SRCS_TIFF + "src/tiff/libtiff/tif_aux.c" + "src/tiff/libtiff/tif_close.c" + "src/tiff/libtiff/tif_codec.c" + "src/tiff/libtiff/tif_color.c" + "src/tiff/libtiff/tif_compress.c" + "src/tiff/libtiff/tif_dir.c" + "src/tiff/libtiff/tif_dirinfo.c" + "src/tiff/libtiff/tif_dirread.c" + "src/tiff/libtiff/tif_dirwrite.c" + "src/tiff/libtiff/tif_dumpmode.c" + "src/tiff/libtiff/tif_error.c" + "src/tiff/libtiff/tif_extension.c" + "src/tiff/libtiff/tif_fax3.c" + "src/tiff/libtiff/tif_fax3sm.c" + "src/tiff/libtiff/tif_flush.c" + "src/tiff/libtiff/tif_getimage.c" + "src/tiff/libtiff/tif_jpeg.c" + "src/tiff/libtiff/tif_luv.c" + "src/tiff/libtiff/tif_lzw.c" + "src/tiff/libtiff/tif_next.c" + "src/tiff/libtiff/tif_ojpeg.c" + "src/tiff/libtiff/tif_open.c" + "src/tiff/libtiff/tif_packbits.c" + "src/tiff/libtiff/tif_pixarlog.c" + "src/tiff/libtiff/tif_predict.c" + "src/tiff/libtiff/tif_print.c" + "src/tiff/libtiff/tif_read.c" + "src/tiff/libtiff/tif_strip.c" + "src/tiff/libtiff/tif_swab.c" + "src/tiff/libtiff/tif_thunder.c" + "src/tiff/libtiff/tif_tile.c" + "src/tiff/libtiff/tif_unix.c" + "src/tiff/libtiff/tif_version.c" + "src/tiff/libtiff/tif_warning.c" + "src/tiff/libtiff/tif_write.c" + "src/tiff/libtiff/tif_zip.c") + +set(SRCS_UNIX + "src/unix/apptraits.cpp" + "src/unix/appunix.cpp" + "src/unix/dir.cpp" + "src/unix/dlunix.cpp" + #"src/unix/epolldispatcher.cpp" + "src/unix/evtloopunix.cpp" + "src/unix/fdiounix.cpp" + #"src/unix/fswatcher_kqueue.cpp" + #"src/unix/net.cpp" + "src/unix/snglinst.cpp" + "src/unix/sockunix.cpp" + #"src/unix/stackwalk.cpp" + "src/unix/stdpaths.cpp" + "src/unix/threadpsx.cpp" + "src/unix/timerunx.cpp" + "src/unix/utilsunx.cpp") + +set(SRCS_UNIXGTK + "src/unix/dialup.cpp" + "src/unix/displayx11.cpp" + "src/unix/fontenum.cpp" + "src/unix/fontutil.cpp" + #"src/unix/fswatcher_inotify.cpp" + "src/unix/glx11.cpp" + #"src/unix/joystick.cpp" + #"src/unix/mediactrl.cpp" + "src/unix/mimetype.cpp" + "src/unix/sound.cpp" + #"src/unix/sound_sdl.cpp" + #"src/unix/taskbarx11.cpp" + "src/unix/uiactionx11.cpp" + "src/unix/utilsx11.cpp") + +set(SRCS_XRC + "src/xml/xml.cpp" + "src/xrc/xh_animatctrl.cpp" + "src/xrc/xh_bmp.cpp" + "src/xrc/xh_bmpbt.cpp" + "src/xrc/xh_bmpcbox.cpp" + "src/xrc/xh_bttn.cpp" + "src/xrc/xh_cald.cpp" + "src/xrc/xh_chckb.cpp" + "src/xrc/xh_chckl.cpp" + "src/xrc/xh_choic.cpp" + "src/xrc/xh_choicbk.cpp" + "src/xrc/xh_clrpicker.cpp" + "src/xrc/xh_cmdlinkbn.cpp" + "src/xrc/xh_collpane.cpp" + "src/xrc/xh_combo.cpp" + "src/xrc/xh_comboctrl.cpp" + "src/xrc/xh_datectrl.cpp" + "src/xrc/xh_dirpicker.cpp" + "src/xrc/xh_dlg.cpp" + "src/xrc/xh_editlbox.cpp" + "src/xrc/xh_filectrl.cpp" + "src/xrc/xh_filepicker.cpp" + "src/xrc/xh_fontpicker.cpp" + "src/xrc/xh_frame.cpp" + "src/xrc/xh_gauge.cpp" + "src/xrc/xh_gdctl.cpp" + "src/xrc/xh_grid.cpp" + "src/xrc/xh_html.cpp" + "src/xrc/xh_htmllbox.cpp" + "src/xrc/xh_hyperlink.cpp" + "src/xrc/xh_listb.cpp" + "src/xrc/xh_listbk.cpp" + "src/xrc/xh_listc.cpp" + "src/xrc/xh_mdi.cpp" + "src/xrc/xh_menu.cpp" + "src/xrc/xh_notbk.cpp" + "src/xrc/xh_odcombo.cpp" + "src/xrc/xh_panel.cpp" + "src/xrc/xh_propdlg.cpp" + "src/xrc/xh_radbt.cpp" + "src/xrc/xh_radbx.cpp" + "src/xrc/xh_richtext.cpp" + "src/xrc/xh_scrol.cpp" + "src/xrc/xh_scwin.cpp" + "src/xrc/xh_sizer.cpp" + "src/xrc/xh_slidr.cpp" + "src/xrc/xh_spin.cpp" + "src/xrc/xh_split.cpp" + "src/xrc/xh_srchctrl.cpp" + "src/xrc/xh_statbar.cpp" + "src/xrc/xh_stbmp.cpp" + "src/xrc/xh_stbox.cpp" + "src/xrc/xh_stlin.cpp" + "src/xrc/xh_sttxt.cpp" + "src/xrc/xh_text.cpp" + "src/xrc/xh_tglbtn.cpp" + "src/xrc/xh_toolb.cpp" + "src/xrc/xh_toolbk.cpp" + "src/xrc/xh_tree.cpp" + "src/xrc/xh_treebk.cpp" + "src/xrc/xh_unkwn.cpp" + "src/xrc/xh_wizrd.cpp" + "src/xrc/xmladv.cpp" + "src/xrc/xmlres.cpp" + "src/xrc/xmlrsall.cpp") + +set(SRCS_ZLIB + "src/zlib/adler32.c" + "src/zlib/compress.c" + "src/zlib/crc32.c" + "src/zlib/deflate.c" + "src/zlib/gzio.c" + "src/zlib/infback.c" + "src/zlib/inffast.c" + "src/zlib/inflate.c" + "src/zlib/inftrees.c" + "src/zlib/trees.c" + "src/zlib/uncompr.c" + "src/zlib/zutil.c") + +include_directories(.) +include_directories(include) +include_directories(../libpng) + +set(SRCS + ${SRCS_AUI} + ${SRCS_COMMON} + ${SRCS_GENERIC}) + +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(SRCS + ${SRCS} + ${SRCS_GENERICOSX} + ${SRCS_OSX} + ${SRCS_UNIX}) +elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + set(SRCS + ${SRCS} + ${SRCS_GENERICGTK} + ${SRCS_GTK} + ${SRCS_UNIX} + ${SRCS_UNIXGTK}) +else() + set(SRCS + ${SRCS} + ${SRCS_MSW}) +endif() + +add_definitions(-D__WXOSX_COCOA__) +add_definitions(-DWXBUILDING) +add_definitions(-Wno-deprecated-declarations) +add_definitions(-Wno-shadow) + +add_library(wx STATIC ${SRCS}) From 7417ecf67fc03e7ff06678523f4add4f1e0a365d Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Mon, 5 Dec 2011 00:57:51 +0100 Subject: [PATCH 138/381] Tell the linker to not treat its input as Objective C/C++ source. Flags in CMAKE_CXX_FLAGS are passed to both compile and link commands. A cleaner solution would be to use set_source_files_properties(). However, currently there are headers (StdThread.h, maybe more) that contain Objective syntax. So it is not easy to determine exactly which source files should be compiled as Objective C/C++ and that set can quickly change when certain #include directives are modified. The solution for that would be to move all uses of Objective syntax to implementation (.cpp) files and then apply set_source_files_properties() to those. --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e13aef68b..d9f5471033 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,6 +102,7 @@ endif() if (APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -x objective-c++") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -x objective-c") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -x none") FIND_LIBRARY(ATB_LIBRARY AudioToolbox) FIND_LIBRARY(AU_LIBRARY AudioUnit) FIND_LIBRARY(CARBON_LIBRARY Carbon) From 20fa8bb9f227c3e694410b145311513e8299bf6e Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Mon, 5 Dec 2011 01:10:45 +0100 Subject: [PATCH 139/381] Fixed linking to wxWidgets built from Externals under OS X. --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index d9f5471033..dcef6157bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -439,10 +439,12 @@ if(NOT DISABLE_WX) include_directories(Externals/wxWidgets3) include_directories(Externals/wxWidgets3/include) add_subdirectory(Externals/wxWidgets3) + set(wxWidgets_LIBRARIES "${CMAKE_BINARY_DIR}/Externals/wxWidgets3/libwx.a") else() include_directories(Externals/wxWidgets/include) add_subdirectory(Externals/wxWidgets) endif() + set(wxWidgets_FOUND TRUE) endif(wxWidgets_FOUND) add_definitions(-DHAVE_WX=1) endif(NOT DISABLE_WX) From 8c3775ee6ff4adf94497068587648582731eebe4 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Mon, 5 Dec 2011 01:12:09 +0100 Subject: [PATCH 140/381] Under OS X, link GL plugin against Cg framework instead of Cg library. --- Source/Plugins/Plugin_VideoOGL/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt b/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt index c57106645f..b506087106 100644 --- a/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt +++ b/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt @@ -22,8 +22,10 @@ if(wxWidgets_FOUND) set(LIBS ${LIBS} ${wxWidgets_LIBRARIES}) endif(wxWidgets_FOUND) -if(APPLE OR WIN32 OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux") +if(WIN32 OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux") set(LIBS ${LIBS} Cg CgGL) +elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + list(APPEND LIBS "${CMAKE_SOURCE_DIR}/Externals/Cg/Cg.framework") endif() if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") From 7ebb0e526f96f4889eeb5366fad7a66110573cf3 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Mon, 5 Dec 2011 05:10:21 +0100 Subject: [PATCH 141/381] Added CMakeLists.txt for libpng. The vast majority of the changes in this commit were originally done by Shawn Hoffman in commit c86846cf9c995d8e0463419bd9477b0dae884929. --- Externals/libpng/CMakeLists.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Externals/libpng/CMakeLists.txt diff --git a/Externals/libpng/CMakeLists.txt b/Externals/libpng/CMakeLists.txt new file mode 100644 index 0000000000..52d34af6a7 --- /dev/null +++ b/Externals/libpng/CMakeLists.txt @@ -0,0 +1,19 @@ +set(SRCS + "png.c" + "pngerror.c" + "pngget.c" + "pngmem.c" + "pngpread.c" + "pngread.c" + "pngrio.c" + "pngrtran.c" + "pngrutil.c" + "pngset.c" + "pngtrans.c" + "pngwio.c" + "pngwrite.c" + "pngwtran.c" + "pngwutil.c" + ) + +add_library(png STATIC ${SRCS}) From bb182d88b7f7b8f577709bd34811f474237e4355 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Mon, 5 Dec 2011 05:26:28 +0100 Subject: [PATCH 142/381] Link against systemwide OpenCL on OS X. --- CMakeLists.txt | 4 +++- Source/Core/VideoCommon/CMakeLists.txt | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dcef6157bb..1878897105 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -379,7 +379,9 @@ else() check_lib(CGGL CgGL Cg/cgGL.h) endif() -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + find_library(CL OpenCL) +else() include_directories(Externals/CLRun/include) add_subdirectory(Externals/CLRun) endif() diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt index 481ced250a..d0e28f571c 100644 --- a/Source/Core/VideoCommon/CMakeLists.txt +++ b/Source/Core/VideoCommon/CMakeLists.txt @@ -40,6 +40,10 @@ set(SRCS Src/BPFunctions.cpp Src/memcpy_amd.cpp) set(LIBS core) +if(NOT ${CL} STREQUAL CL-NOTFOUND) + list(APPEND LIBS ${CL}) +endif() + if(wxWidgets_FOUND AND WIN32) set(SRCS ${SRCS} Src/EmuWindow.cpp) endif() From d440dfe9b2a10d67e4cc547a030f58b53b0a141f Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Mon, 5 Dec 2011 05:33:35 +0100 Subject: [PATCH 143/381] Link against systemwide LZO using the info gathered by check_lib(). --- CMakeLists.txt | 1 + Source/Core/DolphinWX/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1878897105..416637e580 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -311,6 +311,7 @@ else() message("Shared lzo not found, falling back to the static library") add_subdirectory(Externals/LZO) include_directories(Externals/LZO) + set(LZO lzo2) endif() include(FindSDL OPTIONAL) diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 438ee9ce82..837b58a528 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -1,5 +1,5 @@ set(LIBS core - lzo2 + ${LZO} discio bdisasm inputcommon From 54ea98b0a9a9c30fbe7ec05539d1795ed6385979 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Mon, 5 Dec 2011 05:39:41 +0100 Subject: [PATCH 144/381] Refer to the wxWidgets libary as "wx" instead of its full path name. This ensures that additional library dependencies declared for "wx" using target_link_libraries() are applied. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 416637e580..9e84217892 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -442,7 +442,7 @@ if(NOT DISABLE_WX) include_directories(Externals/wxWidgets3) include_directories(Externals/wxWidgets3/include) add_subdirectory(Externals/wxWidgets3) - set(wxWidgets_LIBRARIES "${CMAKE_BINARY_DIR}/Externals/wxWidgets3/libwx.a") + set(wxWidgets_LIBRARIES "wx") else() include_directories(Externals/wxWidgets/include) add_subdirectory(Externals/wxWidgets) From 24dcb7922c8b659844c4e531121219782dff3532 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Mon, 5 Dec 2011 05:42:02 +0100 Subject: [PATCH 145/381] On OS X, compile only against standard system libs and Externals. Libraries from MacPorts, Fink or manually installed stuff in /usr/local will be ignored. This ensures the binary will work on other machines as well. --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e84217892..3611a7cf56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,6 +100,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(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -x objective-c++") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -x objective-c") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -x none") From 958891b4ebd463253d85c51577f52a23237b8208 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Mon, 5 Dec 2011 05:49:08 +0100 Subject: [PATCH 146/381] Compile with OpenAL support on OS X. --- Source/Core/AudioCommon/CMakeLists.txt | 50 ++++++++++++------------- Source/Core/AudioCommon/Src/aldlist.cpp | 3 ++ 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/Source/Core/AudioCommon/CMakeLists.txt b/Source/Core/AudioCommon/CMakeLists.txt index 51476a6ea6..be8c58d14a 100644 --- a/Source/Core/AudioCommon/CMakeLists.txt +++ b/Source/Core/AudioCommon/CMakeLists.txt @@ -6,33 +6,33 @@ set(SRCS Src/AudioCommon.cpp set(LIBS "") +if(ALSA_FOUND) + set(SRCS ${SRCS} Src/AlsaSoundStream.cpp) + set(LIBS ${LIBS} ${ALSA_LIBRARIES}) +endif(ALSA_FOUND) + +if(AO_FOUND) + set(SRCS ${SRCS} Src/AOSoundStream.cpp) + set(LIBS ${LIBS} ${AO_LIBRARIES}) +endif(AO_FOUND) + +if(OPENAL_FOUND) + set(SRCS ${SRCS} Src/OpenALStream.cpp Src/aldlist.cpp) + set(LIBS ${LIBS} ${OPENAL_LIBRARY}) +endif(OPENAL_FOUND) + +if(PULSEAUDIO_FOUND) + set(SRCS ${SRCS} Src/PulseAudioStream.cpp) + set(LIBS ${LIBS} ${PULSEAUDIO_LIBRARIES}) +endif(PULSEAUDIO_FOUND) + +if(WIN32) + set(SRCS ${SRCS} Src/DSoundStream.cpp) + set(SRCS ${SRCS} Src/XAudio2Stream.cpp) +endif(WIN32) + if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(SRCS ${SRCS} Src/CoreAudioSoundStream.cpp) -else() - if(ALSA_FOUND) - set(SRCS ${SRCS} Src/AlsaSoundStream.cpp) - set(LIBS ${LIBS} ${ALSA_LIBRARIES}) - endif(ALSA_FOUND) - - if(AO_FOUND) - set(SRCS ${SRCS} Src/AOSoundStream.cpp) - set(LIBS ${LIBS} ${AO_LIBRARIES}) - endif(AO_FOUND) - - if(OPENAL_FOUND) - set(SRCS ${SRCS} Src/OpenALStream.cpp Src/aldlist.cpp) - set(LIBS ${LIBS} openal) - endif(OPENAL_FOUND) - - if(PULSEAUDIO_FOUND) - set(SRCS ${SRCS} Src/PulseAudioStream.cpp) - set(LIBS ${LIBS} ${PULSEAUDIO_LIBRARIES}) - endif(PULSEAUDIO_FOUND) - - if(WIN32) - set(SRCS ${SRCS} Src/DSoundStream.cpp) - set(SRCS ${SRCS} Src/XAudio2Stream.cpp) - endif(WIN32) endif() add_library(audiocommon STATIC ${SRCS}) diff --git a/Source/Core/AudioCommon/Src/aldlist.cpp b/Source/Core/AudioCommon/Src/aldlist.cpp index 2008842486..69d42148ae 100644 --- a/Source/Core/AudioCommon/Src/aldlist.cpp +++ b/Source/Core/AudioCommon/Src/aldlist.cpp @@ -27,6 +27,9 @@ #ifdef _WIN32 #include "../../../../Externals/OpenAL/include/al.h" #include "../../../../Externals/OpenAL/include/alc.h" +#elif defined(__APPLE__) +#include +#include #else #include #include From 2621d89a41a38732d3bf9f4633f5db5b20407079 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Mon, 5 Dec 2011 06:07:10 +0100 Subject: [PATCH 147/381] Link OS X version of wxWidgets against libpng and libiconv. --- Externals/wxWidgets3/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Externals/wxWidgets3/CMakeLists.txt b/Externals/wxWidgets3/CMakeLists.txt index 09437f5b68..f7570c15d5 100644 --- a/Externals/wxWidgets3/CMakeLists.txt +++ b/Externals/wxWidgets3/CMakeLists.txt @@ -1210,7 +1210,6 @@ set(SRCS_ZLIB include_directories(.) include_directories(include) -include_directories(../libpng) set(SRCS ${SRCS_AUI} @@ -1240,5 +1239,11 @@ add_definitions(-D__WXOSX_COCOA__) add_definitions(-DWXBUILDING) add_definitions(-Wno-deprecated-declarations) add_definitions(-Wno-shadow) +set(LIBS iconv) + +include_directories(../libpng) +add_subdirectory(../libpng ../libpng) +list(APPEND LIBS png) add_library(wx STATIC ${SRCS}) +target_link_libraries(wx ${LIBS}) From 8a75351674d60fea94012cdd5e959e4a61d593e8 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Mon, 5 Dec 2011 06:18:04 +0100 Subject: [PATCH 148/381] Link against OpenGL using the info gathered by the FindOpenGL module. --- Source/Core/DolphinWX/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 837b58a528..61b1b2a20c 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -8,7 +8,7 @@ set(LIBS core z sfml-network SDL - GL + ${OPENGL_LIBRARIES} ${XRANDR_LIBRARIES} ${X11_LIBRARIES}) From c04c3bd9d3a2b7642b8a7ac4b052598b2a856a28 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Wed, 7 Dec 2011 07:10:31 +0100 Subject: [PATCH 149/381] Use "unsigned int" instead of "unsigned". By request of hrydgard. See commit 045eb924d93b4532d5a91c8eab55e292e3a997ae. --- Source/Core/Core/Src/HW/VideoInterface.cpp | 4 ++-- Source/Core/Core/Src/HW/VideoInterface.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/HW/VideoInterface.cpp b/Source/Core/Core/Src/HW/VideoInterface.cpp index 8c8bc2e802..40b95f53f9 100644 --- a/Source/Core/Core/Src/HW/VideoInterface.cpp +++ b/Source/Core/Core/Src/HW/VideoInterface.cpp @@ -759,7 +759,7 @@ void UpdateParameters() } } -unsigned GetTicksPerLine() +unsigned int GetTicksPerLine() { if (s_lineCount == 0) { @@ -771,7 +771,7 @@ unsigned GetTicksPerLine() } } -unsigned GetTicksPerFrame() +unsigned int GetTicksPerFrame() { return TicksPerFrame; } diff --git a/Source/Core/Core/Src/HW/VideoInterface.h b/Source/Core/Core/Src/HW/VideoInterface.h index 72943ad855..0eba189851 100644 --- a/Source/Core/Core/Src/HW/VideoInterface.h +++ b/Source/Core/Core/Src/HW/VideoInterface.h @@ -357,8 +357,8 @@ union UVIDTVStatus // Change values pertaining to video mode void UpdateParameters(); - unsigned GetTicksPerLine(); - unsigned GetTicksPerFrame(); + unsigned int GetTicksPerLine(); + unsigned int GetTicksPerFrame(); }; #endif // _VIDEOINTERFACE_H From f9133a7376f2f3a6874ce5044c1af2e8b5f4ccd0 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Wed, 7 Dec 2011 08:26:44 +0100 Subject: [PATCH 150/381] Link to the required OS X frameworks. Previously, there was just one list of frameworks regardless of which part of the code depended on which frameworks. Now we keep separate lists for the Dolphin core, the Dolphin GUI and internal use by wxWidgets. --- CMakeLists.txt | 29 +++++++++++++--------------- Externals/wxWidgets3/CMakeLists.txt | 12 +++++++++++- Source/Core/DolphinWX/CMakeLists.txt | 20 +++++++++++++++---- 3 files changed, 40 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3611a7cf56..de5e795044 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,23 +107,20 @@ if (APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -x objective-c++") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -x objective-c") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -x none") - FIND_LIBRARY(ATB_LIBRARY AudioToolbox) - FIND_LIBRARY(AU_LIBRARY AudioUnit) - FIND_LIBRARY(CARBON_LIBRARY Carbon) - FIND_LIBRARY(COCOA_LIBRARY Cocoa) - FIND_LIBRARY(COREAUDIO_LIBRARY CoreAudio) - FIND_LIBRARY(COREFUND_LIBRARY CoreFoundation) - FIND_LIBRARY(CORESERV_LIBRARY CoreServices) - FIND_LIBRARY(IOB_LIBRARY IOBluetooth) - FIND_LIBRARY(IOK_LIBRARY IOKit) - FIND_LIBRARY(OGL_LIBRARY OpenGL) - FIND_LIBRARY(WEBKIT_LIBRARY WebKit) - SET(EXTRA_LIBS ${ATB_LIBRARY} ${AU_LIBRARY} ${CARBON_LIBRARY} - ${COCOA_LIBRARY} ${COREAUDIO_LIBRARY} ${COREFUND_LIBRARY} - ${CORESERV_LIBRARY} ${IOB_LIBRARY} ${IOK_LIBRARY} ${OGL_LIBRARY} - ${WEBKIT_LIBRARY}) + find_library(APPKIT_LIBRARY AppKit) + find_library(APPSERV_LIBRARY ApplicationServices) + find_library(ATB_LIBRARY AudioToolbox) + find_library(AU_LIBRARY AudioUnit) + find_library(CARBON_LIBRARY Carbon) + find_library(COCOA_LIBRARY Cocoa) + find_library(COREAUDIO_LIBRARY CoreAudio) + find_library(COREFUND_LIBRARY CoreFoundation) + find_library(CORESERV_LIBRARY CoreServices) + find_library(IOB_LIBRARY IOBluetooth) + find_library(IOK_LIBRARY IOKit) + find_library(WEBKIT_LIBRARY WebKit) endif() - + if(WIN32) add_definitions(-D_SECURE_SCL=0) add_definitions(-D_CRT_SECURE_NO_WARNINGS) diff --git a/Externals/wxWidgets3/CMakeLists.txt b/Externals/wxWidgets3/CMakeLists.txt index f7570c15d5..3281e55955 100644 --- a/Externals/wxWidgets3/CMakeLists.txt +++ b/Externals/wxWidgets3/CMakeLists.txt @@ -1239,7 +1239,17 @@ add_definitions(-D__WXOSX_COCOA__) add_definitions(-DWXBUILDING) add_definitions(-Wno-deprecated-declarations) add_definitions(-Wno-shadow) -set(LIBS iconv) +set(LIBS + iconv + ${APPKIT_LIBRARY} + ${APPSERV_LIBRARY} + ${ATB_LIBRARY} + ${CARBON_LIBRARY} + ${COCOA_LIBRARY} + ${COREFUND_LIBRARY} + ${CORESERV_LIBRARY} + ${IOK_LIBRARY} + ) include_directories(../libpng) add_subdirectory(../libpng ../libpng) diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 61b1b2a20c..3d6e8df9ca 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -71,10 +71,22 @@ endif() if(WIN32) set(SRCS ${SRCS} Src/stdafx.cpp) -elseif((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND NOT wxWidgets_FOUND) - # TODO -elseif((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND wxWidgets_FOUND) - # TODO +elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + list(APPEND LIBS + ${APPKIT_LIBRARY} + ${AU_LIBRARY} + ${COREAUDIO_LIBRARY} + ${COREFUND_LIBRARY} + ${CORESERV_LIBRARY} + ${IOB_LIBRARY} + ${IOK_LIBRARY} + ) + if(wxWidgets_FOUND) + list(APPEND LIBS + ${APPSERV_LIBRARY} + ${COCOA_LIBRARY} + ) + endif() else() set(SRCS ${SRCS} Src/X11Utils.cpp) endif() From 3d9c35f58e84aa2c1b69bf4dfe381a9b526a3dd2 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 10 Dec 2011 16:08:26 +0100 Subject: [PATCH 151/381] VideoCommon: Fix upper and lower depth bytes being switched when performing Z16L EFB copies (EFB to texture only). Fixes issue 4989. Fixes issue 5056. --- Source/Core/VideoCommon/Src/TextureCacheBase.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index d3b7ca14ba..3550227389 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -429,7 +429,7 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat float colmat[28] = {0}; float *const fConstAdd = colmat + 16; float *const ColorMask = colmat + 20; - ColorMask[0] = ColorMask[1] = ColorMask[2] = ColorMask[3] = 255.0f; + ColorMask[0] = ColorMask[1] = ColorMask[2] = ColorMask[3] = 255.0f; ColorMask[4] = ColorMask[5] = ColorMask[6] = ColorMask[7] = 1.0f / 255.0f; unsigned int cbufid = -1; @@ -437,7 +437,7 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat { switch (dstFormat) { - case 0: // Z4 + case 0: // Z4 colmat[3] = colmat[7] = colmat[11] = colmat[15] = 1.0f; cbufid = 0; break; @@ -447,7 +447,7 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat cbufid = 1; break; - case 3: // Z16 + case 3: // Z16 colmat[1] = colmat[5] = colmat[9] = colmat[12] = 1.0f; cbufid = 24; break; @@ -472,8 +472,10 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat cbufid = 5; break; - case 12: // Z16L - colmat[2] = colmat[6] = colmat[10] = colmat[13] = 1.0f; + case 12: // Z16L - copy lower 16 depth bits + // expected to be used as an IA8 texture (upper 8 bits stored as intensity, lower 8 bits stored as alpha) + // Used e.g. in Zelda: Skyward Sword + colmat[1] = colmat[5] = colmat[9] = colmat[14] = 1.0f; cbufid = 6; break; @@ -483,7 +485,6 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat cbufid = 7; break; } - } else if (isIntensity) { From 62858c8c140a281cc5145ca1b81b1aeffbb5015a Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sat, 10 Dec 2011 18:42:49 -0800 Subject: [PATCH 152/381] Small logging changes. Pause core if Jit64 tries to compile at 0. --- Source/Core/Core/Src/HLE/HLE_OS.cpp | 7 ++++--- Source/Core/Core/Src/HW/Memmap.cpp | 17 +++++++---------- Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 5 ++++- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Source/Core/Core/Src/HLE/HLE_OS.cpp b/Source/Core/Core/Src/HLE/HLE_OS.cpp index eebff67ece..3ced001268 100644 --- a/Source/Core/Core/Src/HLE/HLE_OS.cpp +++ b/Source/Core/Core/Src/HLE/HLE_OS.cpp @@ -69,9 +69,10 @@ void GetStringVA(std::string& _rOutBuffer, u32 strReg) char ArgumentBuffer[256]; u32 ParameterCounter = 4; u32 FloatingParameterCounter = 1; - char* pString = (char*)Memory::GetPointer(GPR(strReg)); - if (!pString) { - //PanicAlert("Invalid GetStringVA call"); + char *pString = (char*)Memory::GetPointer(GPR(strReg)); + if (!pString) + { + ERROR_LOG(OSREPORT, "r%i invalid", strReg); return; } diff --git a/Source/Core/Core/Src/HW/Memmap.cpp b/Source/Core/Core/Src/HW/Memmap.cpp index a0631a0fa3..980b080761 100644 --- a/Source/Core/Core/Src/HW/Memmap.cpp +++ b/Source/Core/Core/Src/HW/Memmap.cpp @@ -641,7 +641,7 @@ u8 *GetPointer(const u32 _Address) _dbg_assert_msg_(MEMMAP, 0, "GetPointer from IO Bridge doesnt work"); case 0xc8: // EFB. We don't want to return a pointer here since we have no memory mapped for it. - return 0; + break; default: return m_pPhysicalRAM + (_Address & RAM_MASK); @@ -653,25 +653,22 @@ u8 *GetPointer(const u32 _Address) if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii) return m_pPhysicalEXRAM + (_Address & EXRAM_MASK); else - return 0; + break; case 0xe: if (_Address < (0xE0000000 + L1_CACHE_SIZE)) return GetCachePtr() + (_Address & L1_CACHE_MASK); else - return 0; + break; default: if (bFakeVMEM) return m_pVirtualFakeVMEM + (_Address & FAKEVMEM_MASK); - else - { - if (!Core::g_CoreStartupParameter.bMMU && - !PanicYesNoT("Unknown pointer %#08x\nContinue?", _Address)) - Crash(); - return 0; - } } + + ERROR_LOG(MEMMAP, "Unknown Pointer %#8x PC %#8x LR %#8x", _Address, PC, LR); + + return NULL; } diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index f9fd3c4635..0d31893b53 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -418,7 +418,10 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc } if (em_address == 0) - PanicAlert("ERROR : Trying to compile at 0. LR=%08x", LR); + { + 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)) { From 9d2f589f014512565e800048cb0878a75187674b Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Sun, 11 Dec 2011 16:07:59 +0100 Subject: [PATCH 153/381] Create application bundle on OS X. --- Source/Core/DolphinWX/CMakeLists.txt | 51 ++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 3 deletions(-) diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 3d6e8df9ca..0f8fa53d7d 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -72,6 +72,7 @@ endif() if(WIN32) set(SRCS ${SRCS} Src/stdafx.cpp) elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + # Link against OS X system frameworks. list(APPEND LIBS ${APPKIT_LIBRARY} ${AU_LIBRARY} @@ -87,6 +88,11 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") ${COCOA_LIBRARY} ) endif() + # Add resource files to application bundle. + set(RESOURCES resources/Dolphin.icns) + list(APPEND SRCS ${RESOURCES}) + set_source_files_properties(${RESOURCES} PROPERTIES + MACOSX_PACKAGE_LOCATION Resources) else() set(SRCS ${SRCS} Src/X11Utils.cpp) endif() @@ -96,13 +102,52 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR set(LIBS ${LIBS} usbhid) endif() -if(wxWidgets_FOUND) - set(DOLPHIN_EXE dolphin-emu) +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(DOLPHIN_EXE_BASE Dolphin) else() - set(DOLPHIN_EXE dolphin-emu-nogui) + set(DOLPHIN_EXE_BASE dolphin-emu) +endif() +if(wxWidgets_FOUND) + set(DOLPHIN_EXE ${DOLPHIN_EXE_BASE}) +else() + set(DOLPHIN_EXE ${DOLPHIN_EXE_BASE}-nogui) endif() add_executable(${DOLPHIN_EXE} ${SRCS}) target_link_libraries(${DOLPHIN_EXE} ${LIBS} ${WXLIBS}) install(TARGETS ${DOLPHIN_EXE} RUNTIME DESTINATION ${bindir}) +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_BUNDLE_NAME Dolphin + MACOSX_BUNDLE_ICON_FILE Dolphin.icns + MACOSX_BUNDLE_GUI_IDENTIFIER com.dolphin-emulator.dolphin + MACOSX_BUNDLE_SHORT_VERSION_STRING ${DOLPHIN_WC_DESCRIBE} + MACOSX_BUNDLE_LONG_VERSION_STRING ${DOLPHIN_WC_REVISION} + ) + + # 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}\") + fixup_bundle(\"${BUNDLE_PATH}\" \"\" \"\") + ") + add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD + COMMAND ${CMAKE_COMMAND} -P postprocess_bundle.cmake + ) +endif() From c1cf4f80cfb03e9961adecc4f4518d89879b9fed Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Sun, 11 Dec 2011 16:21:17 +0100 Subject: [PATCH 154/381] Added bundle version and copyright string to OS X bundle info. --- CMakeLists.txt | 20 ++++++++++++-------- Source/Core/DolphinWX/CMakeLists.txt | 2 ++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index de5e795044..823bc6c618 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,6 +67,15 @@ if(GIT_FOUND AND NOT DOLPHIN_WC_REVISION) OUTPUT_STRIP_TRAILING_WHITESPACE) endif() +# version number +set(DOLPHIN_VERSION_MAJOR "3") +set(DOLPHIN_VERSION_MINOR "0") +if(DOLPHIN_IS_STABLE) + set(DOLPHIN_VERSION_PATCH "0") +else() + set(DOLPHIN_VERSION_PATCH ${DOLPHIN_WC_REVISION}) +endif() + # Various compile flags add_definitions(-msse2) @@ -503,14 +512,9 @@ endif() # packaging information set(CPACK_PACKAGE_NAME "dolphin-emu") set(CPACK_PACKAGE_VENDOR "Dolphin Team") -set(CPACK_PACKAGE_VERSION_MAJOR "3") -set(CPACK_PACKAGE_VERSION_MINOR "0") - -if(DOLPHIN_IS_STABLE) - set(CPACK_PACKAGE_VERSION_PATCH "0") -else() - set(CPACK_PACKAGE_VERSION_PATCH ${DOLPHIN_WC_REVISION}) -endif() +set(CPACK_PACKAGE_VERSION_MAJOR ${DOLPHIN_VERSION_MAJOR}) +set(CPACK_PACKAGE_VERSION_MINOR ${DOLPHIN_VERSION_MINOR}) +set(CPACK_PACKAGE_VERSION_PATCH ${DOLPHIN_VERSION_PATCH}) # TODO: CPACK_PACKAGE_DESCRIPTION_FILE # TODO: CPACK_PACKAGE_DESCRIPTION_SUMMARY diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 0f8fa53d7d..7979b5cc58 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -129,6 +129,8 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") MACOSX_BUNDLE_GUI_IDENTIFIER com.dolphin-emulator.dolphin MACOSX_BUNDLE_SHORT_VERSION_STRING ${DOLPHIN_WC_DESCRIBE} MACOSX_BUNDLE_LONG_VERSION_STRING ${DOLPHIN_WC_REVISION} + MACOSX_BUNDLE_BUNDLE_VERSION "${DOLPHIN_VERSION_MAJOR}.${DOLPHIN_VERSION_MINOR}" + MACOSX_BUNDLE_COPYRIGHT "Licensed under GPL version 2" ) # Install Cg framework into application bundle. From 780e5e7244b0e2e35eef71c058259caf8aa1d620 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Sun, 11 Dec 2011 16:54:37 +0100 Subject: [PATCH 155/381] Use a custom template to generate the Info.plist for the OS X bundle. This allows us to add keys that don't exist in the CMake template. I added the keys from the Info.plist that was generated by our SCons build to the new template. --- Source/Core/DolphinWX/CMakeLists.txt | 8 +--- Source/Core/DolphinWX/Info.plist.in | 63 ++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 7 deletions(-) create mode 100644 Source/Core/DolphinWX/Info.plist.in diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 7979b5cc58..91c1c1b58f 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -124,13 +124,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # Ask for an application bundle. set_target_properties(${DOLPHIN_EXE} PROPERTIES MACOSX_BUNDLE true - MACOSX_BUNDLE_BUNDLE_NAME Dolphin - MACOSX_BUNDLE_ICON_FILE Dolphin.icns - MACOSX_BUNDLE_GUI_IDENTIFIER com.dolphin-emulator.dolphin - MACOSX_BUNDLE_SHORT_VERSION_STRING ${DOLPHIN_WC_DESCRIBE} - MACOSX_BUNDLE_LONG_VERSION_STRING ${DOLPHIN_WC_REVISION} - MACOSX_BUNDLE_BUNDLE_VERSION "${DOLPHIN_VERSION_MAJOR}.${DOLPHIN_VERSION_MINOR}" - MACOSX_BUNDLE_COPYRIGHT "Licensed under GPL version 2" + MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in ) # Install Cg framework into application bundle. diff --git a/Source/Core/DolphinWX/Info.plist.in b/Source/Core/DolphinWX/Info.plist.in new file mode 100644 index 0000000000..e365e462ae --- /dev/null +++ b/Source/Core/DolphinWX/Info.plist.in @@ -0,0 +1,63 @@ + + + + + CFBundleDocumentTypes + + + CFBundleTypeExtensions + + ciso + dol + elf + gcm + gcz + iso + wad + + CFBundleTypeIconFile + Dolphin.icns + CFBundleTypeName + Nintendo GC/Wii file + CFBundleTypeRole + Viewer + + + CFBundleExecutable + Dolphin + CFBundleIconFile + Dolphin.icns + CFBundleIdentifier + com.dolphin-emulator.dolphin + CFBundleDevelopmentRegion + English + CFBundleLocalizations + + ar + el + en + es + fr + hu + pt + pt_BR + tr + + CFBundlePackageType + APPL + CFBundleShortVersionString + ${DOLPHIN_WC_DESCRIBE} + CFBundleLongVersionString + ${DOLPHIN_WC_REVISION} + CFBundleVersion + ${DOLPHIN_VERSION_MAJOR}.${DOLPHIN_VERSION_MINOR} + NSHumanReadableCopyright + Licensed under GPL version 2 + LSMinimumSystemVersion + 10.5.4 + LSRequiresCarbon + + CSResourcesFileMapped + + + From 9ede977a56017ee6d67f4f83601a89f495ab4d82 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Sun, 11 Dec 2011 21:24:40 +0100 Subject: [PATCH 156/381] Added QuickTime framework as dependency for wxWidgets on OS X. It seems that the required functions are in an already included framework on x86_64, but on i386 we depend on QuickTime. --- CMakeLists.txt | 1 + Externals/wxWidgets3/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 823bc6c618..a1a28c4109 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,6 +127,7 @@ if (APPLE) find_library(CORESERV_LIBRARY CoreServices) find_library(IOB_LIBRARY IOBluetooth) find_library(IOK_LIBRARY IOKit) + find_library(QUICKTIME_LIBRARY QuickTime) find_library(WEBKIT_LIBRARY WebKit) endif() diff --git a/Externals/wxWidgets3/CMakeLists.txt b/Externals/wxWidgets3/CMakeLists.txt index 3281e55955..29d349f179 100644 --- a/Externals/wxWidgets3/CMakeLists.txt +++ b/Externals/wxWidgets3/CMakeLists.txt @@ -1249,6 +1249,7 @@ set(LIBS ${COREFUND_LIBRARY} ${CORESERV_LIBRARY} ${IOK_LIBRARY} + ${QUICKTIME_LIBRARY} ) include_directories(../libpng) From 344ca5d360e7881204d3246e2790516b248a5a15 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Sun, 11 Dec 2011 21:27:06 +0100 Subject: [PATCH 157/381] Applied compile and link flags from SCons build for OS X to CMake build. The following changes were made: Restricted the "-march=core2" option to i386 because the first Intel Macs had Intel Core CPUs, not Core2. Removed the "-mdynamic-no-pic" flag as GCC lists it as a PPC specific flag. Removed "-Wl,-read_only_relocs,suppress" because it seems to be related to "-mdynamic-no-pic" and I see no need for it. Removed "-Wextra-tokens -Wnewline-eof" because they are GCC specific and not OS X specific. --- CMakeLists.txt | 37 ++++++++++++++++++++++++++++- Source/Core/DolphinWX/Info.plist.in | 2 +- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a1a28c4109..6139ba4080 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,9 +113,44 @@ if (APPLE) # might prevent building a distributable binary. set(CMAKE_SYSTEM_PREFIX_PATH /usr) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -x objective-c++") + # Some of our code contains Objective C constructs. set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -x objective-c") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -x objective-c++") + # Avoid mistaking an object file for a source file on the link command line. set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -x none") + + # Identify the target system: + # Ask for 32/64-bit fat binary. + set(TARGET_FLAGS "-arch x86_64 -arch i386") + # Minimum OS X version. + # 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(TARGET_FLAGS "${TARGET_FLAGS} -mmacosx-version-min=${OSX_MIN_VERSION}") + set(TARGET_FLAGS "${TARGET_FLAGS} -isysroot /Developer/SDKs/MacOSX10.6.sdk") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-syslibroot,/Developer/SDKs/MacOSX10.6.sdk") + # Specify target CPUs. + set(TARGET_FLAGS "${TARGET_FLAGS} -Xarch_i386 -msse3") + set(TARGET_FLAGS "${TARGET_FLAGS} -Xarch_i386 -march=prescott") + set(TARGET_FLAGS "${TARGET_FLAGS} -Xarch_x86_64 -mssse3") + set(TARGET_FLAGS "${TARGET_FLAGS} -Xarch_x86_64 -march=core2") + message("target flags: ${TARGET_FLAGS}") + # Target flags apply to both C and C++ compilation. + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TARGET_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TARGET_FLAGS}") + # TODO: It seems that CMake passes compile flags to the linker anyway. + #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${TARGET_FLAGS}") + message("C++ flags: ${CMAKE_CXX_FLAGS}") + + # Linker flags. + # Drop unreachable code and data. + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-dead_strip,-dead_strip_dylibs") + # Reserve the minimum size for the zero page. + # Our JIT requires virtual memory space below 2GB, while the default zero + # page on x86_64 is 4GB in size. + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-pagezero_size,0x1000") + find_library(APPKIT_LIBRARY AppKit) find_library(APPSERV_LIBRARY ApplicationServices) find_library(ATB_LIBRARY AudioToolbox) diff --git a/Source/Core/DolphinWX/Info.plist.in b/Source/Core/DolphinWX/Info.plist.in index e365e462ae..9a05a972c8 100644 --- a/Source/Core/DolphinWX/Info.plist.in +++ b/Source/Core/DolphinWX/Info.plist.in @@ -54,7 +54,7 @@ NSHumanReadableCopyright Licensed under GPL version 2 LSMinimumSystemVersion - 10.5.4 + ${OSX_MIN_VERSION} LSRequiresCarbon CSResourcesFileMapped From 7423c74deb5d1b092fc9386c11305d8983327288 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Mon, 12 Dec 2011 00:43:23 +0100 Subject: [PATCH 158/381] Force the "ebx" argument to be mapped to a register (not necessarily EBX). Fixes crash on x86 under OS X. Thanks to kiesel for the fix and to shuffle2 for remembering the problem. --- Source/Core/Common/Src/CPUDetect.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Common/Src/CPUDetect.cpp b/Source/Core/Common/Src/CPUDetect.cpp index 7c231b0a69..33efef7c01 100644 --- a/Source/Core/Common/Src/CPUDetect.cpp +++ b/Source/Core/Common/Src/CPUDetect.cpp @@ -48,7 +48,7 @@ static inline void do_cpuid(unsigned int *eax, unsigned int *ebx, "movl %%ebx,%1;" "mov %%rdi,%%rbx;" : "=a" (*eax), - "=g" (*ebx), + "=r" (*ebx), "=c" (*ecx), "=d" (*edx) : "a" (*eax) @@ -61,7 +61,7 @@ static inline void do_cpuid(unsigned int *eax, unsigned int *ebx, "movl %%ebx,%1;" "movl %%edi,%%ebx;" : "=a" (*eax), - "=g" (*ebx), + "=r" (*ebx), "=c" (*ecx), "=d" (*edx) : "a" (*eax) From d75f45979b236713a232b7e86c481548eaa7fa5d Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Mon, 12 Dec 2011 01:30:42 +0100 Subject: [PATCH 159/381] Copy data files into OS X application bundle. --- Source/Core/DolphinWX/CMakeLists.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 91c1c1b58f..fe8b90ed80 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -146,4 +146,15 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") 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 + ) + ") + add_custom_target(CopyDataIntoBundle ALL + COMMAND ${CMAKE_COMMAND} -P copy_data_into_bundle.cmake + VERBATIM + ) endif() From ee5a29e6f2010eea7d9953a875f5ff7dc8149fda Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Mon, 12 Dec 2011 02:14:56 +0100 Subject: [PATCH 160/381] For CPUID, save EBX on the stack instead of in a register. This fixes GCC running out of registers when compiling for x86 in release mode. Thanks to kiesel. --- Source/Core/Common/Src/CPUDetect.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Source/Core/Common/Src/CPUDetect.cpp b/Source/Core/Common/Src/CPUDetect.cpp index 33efef7c01..99e43f5c46 100644 --- a/Source/Core/Common/Src/CPUDetect.cpp +++ b/Source/Core/Common/Src/CPUDetect.cpp @@ -43,29 +43,27 @@ static inline void do_cpuid(unsigned int *eax, unsigned int *ebx, // 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__ ( - "mov %%rbx,%%rdi;" + "pushq %%rbx;" "cpuid;" "movl %%ebx,%1;" - "mov %%rdi,%%rbx;" + "popq %%rbx;" : "=a" (*eax), - "=r" (*ebx), + "=S" (*ebx), "=c" (*ecx), "=d" (*edx) : "a" (*eax) - : "rdi", "rbx" ); #else - __asm__( - "movl %%ebx,%%edi;" + __asm__ ( + "pushl %%ebx;" "cpuid;" - "movl %%ebx,%1;" - "movl %%edi,%%ebx;" + "movl %%ebx,%1;" + "popl %%ebx;" : "=a" (*eax), - "=r" (*ebx), + "=S" (*ebx), "=c" (*ecx), "=d" (*edx) : "a" (*eax) - : "edi", "ebx" ); #endif } From 2c2ef9a96197dd047be021c004c16f42be05663f Mon Sep 17 00:00:00 2001 From: nitsuja Date: Sun, 11 Dec 2011 21:08:26 -0800 Subject: [PATCH 161/381] made frame advance act normal (so it advances 1 frame each time instead of waiting for further unpause commands), and did some minor improvements to the read-only command (making the UI behavior a little nicer, no actual changes to what read-only does at this point) --- Source/Core/Core/Src/Movie.cpp | 20 ++++++++++++++++++-- Source/Core/Core/Src/Movie.h | 2 +- Source/Core/DolphinWX/Src/FrameTools.cpp | 17 +++++++++++++---- 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 818d77cd35..8df17b5910 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -77,7 +77,10 @@ void FrameUpdate() g_lagCounter++; if (g_bFrameStep) + { Core::SetState(Core::CORE_PAUSE); + g_bFrameStep = false; + } // ("framestop") the only purpose of this is to cause interpreter/jit Run() to return temporarily. // after that we set it back to CPU_RUNNING and continue as normal. @@ -113,9 +116,19 @@ void SetPolledDevice() g_bPolled = true; } -void SetFrameStepping(bool bEnabled) +void DoFrameStep() { - g_bFrameStep = bEnabled; + if(Core::GetState() == Core::CORE_PAUSE) + { + // if already paused, frame advance for 1 frame + Core::SetState(Core::CORE_RUN); + g_bFrameStep = true; + } + else + { + // if not paused yet, pause immediately instead + Core::SetState(Core::CORE_PAUSE); + } } void SetFrameStopping(bool bEnabled) @@ -125,6 +138,9 @@ void SetFrameStopping(bool bEnabled) void SetReadOnly(bool bEnabled) { + if (g_bReadOnly != bEnabled) + Core::DisplayMessage(bEnabled ? "Read-only mode." : "Read+Write mode.", 1000); + g_bReadOnly = bEnabled; } diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h index 55ccf3a8da..4956c59de9 100644 --- a/Source/Core/Core/Src/Movie.h +++ b/Source/Core/Core/Src/Movie.h @@ -111,7 +111,7 @@ bool IsUsingWiimote(int wiimote); void ChangePads(bool instantly = false); void ChangeWiiPads(bool instantly = false); -void SetFrameStepping(bool bEnabled); +void DoFrameStep(); void SetFrameStopping(bool bEnabled); void SetReadOnly(bool bEnabled); diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 32b7d48477..eddaae4748 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -145,7 +145,7 @@ void CFrame::CreateMenu() emulationMenu->Check(IDM_RECORDREADONLY, true); emulationMenu->AppendSeparator(); - emulationMenu->Append(IDM_FRAMESTEP, GetMenuLabel(HK_FRAME_ADVANCE), wxEmptyString, wxITEM_CHECK); + emulationMenu->Append(IDM_FRAMESTEP, GetMenuLabel(HK_FRAME_ADVANCE), wxEmptyString); wxMenu *skippingMenu = new wxMenu; emulationMenu->AppendSubMenu(skippingMenu, _("Frame S&kipping")); @@ -704,7 +704,13 @@ void CFrame::OnTASInput(wxCommandEvent& event) void CFrame::OnFrameStep(wxCommandEvent& event) { - Movie::SetFrameStepping(event.IsChecked()); + bool wasPaused = (Core::GetState() == Core::CORE_PAUSE); + + Movie::DoFrameStep(); + + bool isPaused = (Core::GetState() == Core::CORE_PAUSE); + if(isPaused && !wasPaused) // don't update on unpause, otherwise the status would be wrong when pausing next frame + UpdateGUI(); } void CFrame::OnChangeDisc(wxCommandEvent& WXUNUSED (event)) @@ -718,8 +724,11 @@ void CFrame::OnRecord(wxCommandEvent& WXUNUSED (event)) if (Movie::IsReadOnly()) { - PanicAlertT("Cannot record movies in read-only mode."); - return; + //PanicAlertT("Cannot record movies in read-only mode."); + //return; + // the user just chose to record a movie, so that should take precedence + Movie::SetReadOnly(false); + GetMenuBar()->FindItem(IDM_RECORDREADONLY)->Check(false); } for (int i = 0; i < 4; i++) { From f3325036be4623b6c1e5a0babdb2c7e3cb643baa Mon Sep 17 00:00:00 2001 From: nitsuja Date: Sun, 11 Dec 2011 21:54:50 -0800 Subject: [PATCH 162/381] fixed hotkeys getting ignored after tab is pressed --- Source/Core/DolphinWX/Src/Frame.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 261d3d6d6d..4dc7928375 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -116,7 +116,7 @@ CPanel::CPanel( wxWindow *parent, wxWindowID id ) - : wxPanel(parent, id) + : wxPanel(parent, id, wxDefaultPosition, wxDefaultSize, 0) // disables wxTAB_TRAVERSAL because it was breaking hotkeys { } From 27bda2c054f38cdd8b6a04fe939ea006535ae532 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Tue, 13 Dec 2011 02:02:31 +0100 Subject: [PATCH 163/381] Fixed range check on TryParse() for u32, again. The code from 748be364e5ee incorrectly accepted -0x100000000 on x86_64. Also if ERANGE is returned by strtoul(), reject the parsed value regardless of what that value is. This fixes invalid values being returned when compiling with Visual C++. Thanks to "cotton" for testing this. --- Source/Core/Common/Src/StringUtil.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Core/Common/Src/StringUtil.cpp b/Source/Core/Common/Src/StringUtil.cpp index 94f01e66f8..cdd1016210 100644 --- a/Source/Core/Common/Src/StringUtil.cpp +++ b/Source/Core/Common/Src/StringUtil.cpp @@ -130,12 +130,13 @@ bool TryParse(const std::string &str, u32 *const output) if (!endptr || *endptr) return false; - if (value == ULONG_MAX && errno == ERANGE) + if (errno == ERANGE) return false; if (ULONG_MAX > UINT_MAX) { - // Leading bits must be either all 0 or all 1. - if ((~value | UINT_MAX) != ULONG_MAX && (value | UINT_MAX) != ULONG_MAX) + // Note: The typecasts avoid GCC warnings when long is 32 bits wide. + if (value >= static_cast(0x100000000ull) + && value <= static_cast(0xFFFFFFFF00000000ull)) return false; } From 09d2301fed1f55989e937bcc45897426347e3b44 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Mon, 12 Dec 2011 23:24:10 -0600 Subject: [PATCH 164/381] detect input at 55% to catch silly c-stick range --- .../InputCommon/Src/ControllerInterface/ControllerInterface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp index e6f2f508d2..82cfe2469e 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp @@ -20,7 +20,7 @@ namespace { -const float INPUT_DETECT_THRESHOLD = 0.65f; +const float INPUT_DETECT_THRESHOLD = 0.55f; } ControllerInterface g_controller_interface; From 4c7c29b8b6bfe810f298d0007c505720beaa1c36 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Wed, 14 Dec 2011 02:50:36 +0100 Subject: [PATCH 165/381] Let "make install" on OS X copy the bundle to /Applications. The "dsptool" executable is not included in the bundle. The "tester" executable is not included in the bundle and it no longer installed on other platforms, since it is neither expected nor useful to install unit tests. --- CMakeLists.txt | 20 ++++++++++++++------ Source/Core/DolphinWX/CMakeLists.txt | 8 +++++++- Source/DSPTool/CMakeLists.txt | 4 +++- Source/UnitTests/CMakeLists.txt | 1 - 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6139ba4080..a30fbcdd9f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,11 +7,17 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests) set(DOLPHIN_IS_STABLE FALSE) # Set up paths -set(bindir ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "bindir") -set(datadir ${CMAKE_INSTALL_PREFIX}/share/dolphin-emu CACHE PATH "datadir") +if((${CMAKE_SYSTEM_NAME} MATCHES "Darwin")) + # The gettext module will install the translations unconditionally. + # Redirect the installation to a build directory where it does no harm. + set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install-dummy) +else() + set(bindir ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "bindir") + set(datadir ${CMAKE_INSTALL_PREFIX}/share/dolphin-emu CACHE PATH "datadir") + add_definitions(-DDATA_DIR="${datadir}/") +endif() set(userdir ".dolphin-emu" CACHE STRING "User directory") add_definitions(-DUSER_DIR="${userdir}") -add_definitions(-DDATA_DIR="${datadir}/") # Set where the binary files will be built. The program will not execute from # here. You must run "make install" to install these to the proper location @@ -534,14 +540,16 @@ add_subdirectory(Source) ######################################## # Install shared data files # -install(DIRECTORY Data/User/ DESTINATION ${datadir}/user PATTERN .svn EXCLUDE) -install(DIRECTORY Data/Sys/ DESTINATION ${datadir}/sys PATTERN .svn EXCLUDE) +if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")) + install(DIRECTORY Data/User/ DESTINATION ${datadir}/user PATTERN) + install(DIRECTORY Data/Sys/ DESTINATION ${datadir}/sys PATTERN) +endif() include(FindGettext) if(GETTEXT_FOUND AND NOT DISABLE_WX) file(GLOB LINGUAS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} Languages/po/*.po) GETTEXT_CREATE_TRANSLATIONS(Languages/po/dolphin-emu.pot ALL ${LINGUAS}) endif() -if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux") AND (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")) +if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|Darwin")) install(FILES Data/license.txt DESTINATION ${datadir}) endif() diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index fe8b90ed80..07df3a096d 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -115,7 +115,6 @@ endif() add_executable(${DOLPHIN_EXE} ${SRCS}) target_link_libraries(${DOLPHIN_EXE} ${LIBS} ${WXLIBS}) -install(TARGETS ${DOLPHIN_EXE} RUNTIME DESTINATION ${bindir}) if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") include(BundleUtilities) @@ -157,4 +156,11 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") 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() diff --git a/Source/DSPTool/CMakeLists.txt b/Source/DSPTool/CMakeLists.txt index 2e26125fbc..b7415ff703 100644 --- a/Source/DSPTool/CMakeLists.txt +++ b/Source/DSPTool/CMakeLists.txt @@ -1,3 +1,5 @@ add_executable(dsptool Src/DSPTool.cpp) target_link_libraries(dsptool core) -install(TARGETS dsptool RUNTIME DESTINATION ${bindir}) +if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")) + install(TARGETS dsptool RUNTIME DESTINATION ${bindir}) +endif() diff --git a/Source/UnitTests/CMakeLists.txt b/Source/UnitTests/CMakeLists.txt index 323c4f65c7..f86742555e 100644 --- a/Source/UnitTests/CMakeLists.txt +++ b/Source/UnitTests/CMakeLists.txt @@ -4,4 +4,3 @@ set(SRCS AudioJitTests.cpp add_executable(tester ${SRCS}) target_link_libraries(tester core) -install(TARGETS tester RUNTIME DESTINATION ${bindir}) From 9470f9545ff0316c620449e598b27dd29470e30f Mon Sep 17 00:00:00 2001 From: nitsuja Date: Wed, 14 Dec 2011 04:03:05 -0800 Subject: [PATCH 166/381] many movie fixes (mainly for readonly mode), and some wii input display support --- Source/Core/Core/Src/Core.cpp | 17 +- Source/Core/Core/Src/Core.h | 1 + .../Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp | 6 +- Source/Core/Core/Src/Movie.cpp | 425 ++++++++++++------ Source/Core/Core/Src/Movie.h | 22 +- Source/Core/Core/Src/State.cpp | 33 +- 6 files changed, 345 insertions(+), 159 deletions(-) diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index 06fe496eb6..fe5fddbdd5 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -101,6 +101,7 @@ std::string g_stateFileName; std::thread g_EmuThread; static std::thread g_cpu_thread; +static bool g_requestRefreshInfo; SCoreStartupParameter g_CoreStartupParameter; @@ -261,7 +262,7 @@ void Stop() // - Hammertime! SConfig::GetInstance().m_SYSCONF->Reload(); INFO_LOG(CONSOLE, "Stop [Main Thread]\t\t---- Shutdown complete ----"); - Movie::g_InputCounter = 0; + Movie::g_currentInputCount = 0; g_bStopping = false; } @@ -537,6 +538,11 @@ void SaveScreenShot() SetState(CORE_RUN); } +void RequestRefreshInfo() +{ + g_requestRefreshInfo = true; +} + // Apply Frame Limit and Display FPS info // This should only be called from VI void VideoThrottle() @@ -561,8 +567,9 @@ void VideoThrottle() // Update info per second u32 ElapseTime = (u32)Timer.GetTimeDifference(); - if ((ElapseTime >= 1000 && DrawnVideo > 0) || Movie::g_bFrameStep) + if ((ElapseTime >= 1000 && DrawnVideo > 0) || g_requestRefreshInfo) { + g_requestRefreshInfo = false; SCoreStartupParameter& _CoreParameter = SConfig::GetInstance().m_LocalCoreStartupParameter; u32 FPS = Common::AtomicLoad(DrawnFrame) * 1000 / ElapseTime; @@ -599,8 +606,10 @@ void VideoThrottle() #else // Summary information std::string SFPS; - if (Movie::IsPlayingInput() || Movie::IsRecordingInput()) - SFPS = StringFromFormat("VI: %u - Frame: %u - FPS: %u - VPS: %u - SPEED: %u%%", Movie::g_frameCounter, Movie::g_InputCounter, FPS, VPS, Speed); + 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 diff --git a/Source/Core/Core/Src/Core.h b/Source/Core/Core/Src/Core.h index 4b45d4bad2..8bfccc13b5 100644 --- a/Source/Core/Core/Src/Core.h +++ b/Source/Core/Core/Src/Core.h @@ -85,6 +85,7 @@ void StopTrace(); bool ShouldSkipFrame(int skipped); void VideoThrottle(); +void RequestRefreshInfo(); #ifdef RERECORDING diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp index 937f785feb..10084d9c39 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp @@ -637,9 +637,9 @@ void Wiimote::Update() Movie::SetPolledDevice(); - if (!Movie::IsPlayingInput() || !Movie::PlayWiimote(m_index, data, rptf_size)) + const ReportFeatures& rptf = reporting_mode_features[m_reporting_mode - WM_REPORT_CORE]; + if (!Movie::IsPlayingInput() || !Movie::PlayWiimote(m_index, data, rptf_size, rptf.core?(data+rptf.core):NULL, rptf.accel?(data+rptf.accel):NULL, rptf.ir?(data+rptf.ir):NULL)) { - const ReportFeatures& rptf = reporting_mode_features[m_reporting_mode - WM_REPORT_CORE]; rptf_size = rptf.size; data[0] = 0xA1; @@ -744,7 +744,7 @@ void Wiimote::Update() } if (Movie::IsRecordingInput()) { - Movie::RecordWiimote(m_index, data, rptf_size); + Movie::RecordWiimote(m_index, data, rptf_size, rptf.core?(data+rptf.core):NULL, rptf.accel?(data+rptf.accel):NULL, rptf.ir?(data+rptf.ir):NULL); } } diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 8df17b5910..46923dae9a 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -24,6 +24,8 @@ #include "PowerPC/PowerPC.h" #include "HW/SI.h" #include "HW/Wiimote.h" +#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" @@ -46,36 +48,43 @@ u32 g_framesToSkip = 0, g_frameSkipCounter = 0; u8 g_numPads = 0; ControllerState g_padState; DTMHeader tmpHeader; -u8 *tmpInput = NULL; -u64 inputOffset = 0, tmpLength = 0; +u8* tmpInput = NULL; +u64 g_currentByte = 0, g_totalBytes = 0; +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_frameCounter = 0, g_lagCounter = 0, g_totalFrameCount = 0, g_InputCounter = 0; bool g_bRecordingFromSaveState = false; bool g_bPolled = false; +int g_currentSaveVersion = 0; std::string tmpStateFilename = "dtm.sav"; -std::string g_InputDisplay[4]; +std::string g_InputDisplay[8]; ManipFunction mfunc = NULL; std::string GetInputDisplay() { std::string inputDisplay = ""; - for (int i = 0; i < 4; ++i) - inputDisplay.append(g_InputDisplay[i]); + for (int i = 0; i < 8; ++i) + if ((g_numPads & (1 << i)) != 0) + inputDisplay.append(g_InputDisplay[i]); return inputDisplay; } void FrameUpdate() { - g_frameCounter++; - if (IsRecordingInput()) - g_totalFrameCount = g_frameCounter; - + g_currentFrame++; if(!g_bPolled) - g_lagCounter++; - + g_currentLagCount++; + + if (IsRecordingInput()) + { + g_totalFrames = g_currentFrame; + g_totalLagCount = g_currentLagCount; + } + if (g_bFrameStep) { Core::SetState(Core::CORE_PAUSE); @@ -95,7 +104,9 @@ void FrameUpdate() void InputUpdate() { - g_InputCounter++; + g_currentInputCount++; + if (IsRecordingInput()) + g_totalInputCount = g_currentInputCount; } void SetFrameSkipping(unsigned int framesToSkip) @@ -122,9 +133,10 @@ void DoFrameStep() { // if already paused, frame advance for 1 frame Core::SetState(Core::CORE_RUN); + Core::RequestRefreshInfo(); g_bFrameStep = true; } - else + else if(!g_bFrameStep) { // if not paused yet, pause immediately instead Core::SetState(Core::CORE_PAUSE); @@ -169,6 +181,11 @@ bool IsRecordingInputFromSaveState() return g_bRecordingFromSaveState; } +bool IsJustStartingRecordingInputFromSaveState() +{ + return IsRecordingInputFromSaveState() && g_currentFrame == 0; +} + bool IsPlayingInput() { return (g_playMode == MODE_PLAYING); @@ -244,89 +261,175 @@ bool BeginRecordingInput(int controllers) } g_numPads = controllers; - - g_frameCounter = g_lagCounter = g_InputCounter = 0; + g_currentFrame = g_totalFrames = 0; + g_currentLagCount = g_totalLagCount = 0; + g_currentInputCount = g_totalInputCount = 0; g_rerecords = 0; g_playMode = MODE_RECORDING; - inputOffset = 0; + delete tmpInput; tmpInput = new u8[MAX_DTM_LENGTH]; - - + g_currentByte = g_totalBytes = 0; + Core::DisplayMessage("Starting movie recording", 2000); - return true; } +static void Analog2DToString(u8 x, u8 y, const char* prefix, char* str) +{ + if((x <= 1 || x == 128 || x >= 255) + && (y <= 1 || y == 128 || y >= 255)) + { + if(x != 128 || y != 128) + { + if(x != 128 && y != 128) + { + sprintf(str, "%s:%s,%s", prefix, x<128?"LEFT":"RIGHT", y<128?"DOWN":"UP"); + } + else if(x != 128) + { + sprintf(str, "%s:%s", prefix, x<128?"LEFT":"RIGHT"); + } + else + { + sprintf(str, "%s:%s", prefix, y<128?"DOWN":"UP"); + } + } + else + { + str[0] = '\0'; + } + } + else + { + sprintf(str, "%s:%d,%d", prefix, x, y); + } +} + +static void Analog1DToString(u8 v, const char* prefix, char* str) +{ + if(v > 0) + { + if(v == 255) + { + strcpy(str, prefix); + } + else + { + sprintf(str, "%s:%d", prefix, v); + } + } + else + { + str[0] = '\0'; + } +} + void SetInputDisplayString(ControllerState padState, int controllerID) { char inp[70]; - sprintf(inp, "%dP:", controllerID + 1); + sprintf(inp, "P%d:", controllerID + 1); g_InputDisplay[controllerID] = inp; - sprintf(inp, " X: %d Y: %d rX: %d rY: %d L: %d R: %d", - g_padState.AnalogStickX, - g_padState.AnalogStickY, - g_padState.CStickX, - g_padState.CStickY, - g_padState.TriggerL, - g_padState.TriggerR); - g_InputDisplay[controllerID].append(inp); - if(g_padState.A) - { g_InputDisplay[controllerID].append(" A"); - } if(g_padState.B) - { g_InputDisplay[controllerID].append(" B"); - } if(g_padState.X) - { g_InputDisplay[controllerID].append(" X"); - } if(g_padState.Y) - { g_InputDisplay[controllerID].append(" Y"); - } if(g_padState.Z) - { g_InputDisplay[controllerID].append(" Z"); - } if(g_padState.Start) - { g_InputDisplay[controllerID].append(" START"); - } if(g_padState.DPadUp) - { g_InputDisplay[controllerID].append(" UP"); - } if(g_padState.DPadDown) - { g_InputDisplay[controllerID].append(" DOWN"); - } if(g_padState.DPadLeft) - { g_InputDisplay[controllerID].append(" LEFT"); - } 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); + + Analog1DToString(g_padState.TriggerR, " R", inp); + g_InputDisplay[controllerID].append(inp); + + Analog2DToString(g_padState.AnalogStickX, g_padState.AnalogStickY, " ANA", inp); + g_InputDisplay[controllerID].append(inp); + + Analog2DToString(g_padState.CStickX, g_padState.CStickY, " C", inp); + g_InputDisplay[controllerID].append(inp); + + g_InputDisplay[controllerID].append("\n"); +} + +void SetWiiInputDisplayString(int remoteID, u8* const coreData, u8* const accelData, u8* const irData) +{ + int controllerID = remoteID + 4; + + char inp[70]; + sprintf(inp, "R%d:", remoteID + 1); + g_InputDisplay[controllerID] = inp; + + if(coreData) + { + wm_core buttons = *(wm_core*)coreData; + if(buttons & WiimoteEmu::Wiimote::PAD_LEFT) + g_InputDisplay[controllerID].append(" LEFT"); + if(buttons & WiimoteEmu::Wiimote::PAD_RIGHT) + g_InputDisplay[controllerID].append(" RIGHT"); + if(buttons & WiimoteEmu::Wiimote::PAD_DOWN) + g_InputDisplay[controllerID].append(" DOWN"); + if(buttons & WiimoteEmu::Wiimote::PAD_UP) + g_InputDisplay[controllerID].append(" UP"); + if(buttons & WiimoteEmu::Wiimote::BUTTON_A) + g_InputDisplay[controllerID].append(" A"); + if(buttons & WiimoteEmu::Wiimote::BUTTON_B) + g_InputDisplay[controllerID].append(" B"); + if(buttons & WiimoteEmu::Wiimote::BUTTON_PLUS) + g_InputDisplay[controllerID].append(" +"); + if(buttons & WiimoteEmu::Wiimote::BUTTON_MINUS) + g_InputDisplay[controllerID].append(" -"); + if(buttons & WiimoteEmu::Wiimote::BUTTON_ONE) + g_InputDisplay[controllerID].append(" 1"); + if(buttons & WiimoteEmu::Wiimote::BUTTON_TWO) + g_InputDisplay[controllerID].append(" 2"); + if(buttons & WiimoteEmu::Wiimote::BUTTON_HOME) + g_InputDisplay[controllerID].append(" HOME"); } - if(g_padState.L) + if(accelData) { - g_InputDisplay[controllerID].append(" L"); + wm_accel* dt = (wm_accel*)accelData; + sprintf(inp, " ACC:%d,%d,%d", dt->x, dt->y, dt->z); + g_InputDisplay[controllerID].append(inp); } - if(g_padState.R) + + if(irData) // incomplete { - g_InputDisplay[controllerID].append(" R"); + sprintf(inp, " IR:%d,%d", ((u8*)irData)[0], ((u8*)irData)[1]); + g_InputDisplay[controllerID].append(inp); } g_InputDisplay[controllerID].append("\n"); } + + void RecordInput(SPADStatus *PadStatus, int controllerID) { if(!IsRecordingInput() || !IsUsingPad(controllerID)) @@ -355,20 +458,23 @@ void RecordInput(SPADStatus *PadStatus, int controllerID) g_padState.CStickX = PadStatus->substickX; g_padState.CStickY = PadStatus->substickY; - memcpy(&(tmpInput[inputOffset]), &g_padState, 8); - inputOffset += 8; + memcpy(&(tmpInput[g_currentByte]), &g_padState, 8); + g_currentByte += 8; + g_totalBytes = g_currentByte; SetInputDisplayString(g_padState, controllerID); } -void RecordWiimote(int wiimote, u8 *data, s8 size) +void RecordWiimote(int wiimote, u8 *data, s8 size, u8* const coreData, u8* const accelData, u8* const irData) { if(!IsRecordingInput() || !IsUsingWiimote(wiimote)) return; - g_InputCounter++; - tmpInput[inputOffset++] = (u8) size; - memcpy(&(tmpInput[inputOffset]), data, size); - inputOffset += size; + InputUpdate(); + tmpInput[g_currentByte++] = (u8) size; + memcpy(&(tmpInput[g_currentByte]), data, size); + g_currentByte += size; + g_totalBytes = g_currentByte; + SetWiiInputDisplayString(wiimote, coreData, accelData, irData); } bool PlayInput(const char *filename) @@ -415,15 +521,18 @@ bool PlayInput(const char *filename) g_numPads = tmpHeader.numControllers; g_rerecords = tmpHeader.numRerecords; - g_totalFrameCount = tmpHeader.frameCount; - + + g_totalFrames = tmpHeader.frameCount; + g_totalLagCount = tmpHeader.lagCount; + g_totalInputCount = tmpHeader.inputCount; + g_playMode = MODE_PLAYING; - tmpLength = g_recordfd.GetSize() - 256; + g_totalBytes = g_recordfd.GetSize() - 256; delete tmpInput; tmpInput = new u8[MAX_DTM_LENGTH]; - g_recordfd.ReadArray(tmpInput, tmpLength); - inputOffset = 0; + g_recordfd.ReadArray(tmpInput, (size_t)g_totalBytes); + g_currentByte = 0; g_recordfd.Close(); return true; @@ -433,6 +542,27 @@ cleanup: return false; } +void DoState(PointerWrap &p, bool doNot) +{ + if(doNot) + { + if(p.GetMode() == PointerWrap::MODE_READ) + g_currentSaveVersion = 0; + return; + } + static const int MOVIE_STATE_VERSION = 1; + g_currentSaveVersion = MOVIE_STATE_VERSION; + p.Do(g_currentSaveVersion); + // many of these could be useful to save even when no movie is active, + // and the data is tiny, so let's just save it regardless of movie state. + p.Do(g_currentFrame); + p.Do(g_currentByte); + p.Do(g_currentLagCount); + p.Do(g_currentInputCount); + p.Do(g_bPolled); + // other variables (such as g_totalBytes and g_totalFrames) are set in LoadInput +} + void LoadInput(const char *filename) { File::IOFile t_record(filename, "r+b"); @@ -452,35 +582,89 @@ void LoadInput(const char *filename) t_record.Seek(0, SEEK_SET); t_record.WriteArray(&tmpHeader, 1); - g_frameCounter = tmpHeader.frameCount; - g_totalFrameCount = (tmpHeader.totalFrameCount ? tmpHeader.totalFrameCount : tmpHeader.frameCount); - g_InputCounter = tmpHeader.InputCount; - g_numPads = tmpHeader.numControllers; - ChangePads(true); - if (Core::g_CoreStartupParameter.bWii) ChangeWiiPads(true); - inputOffset = t_record.GetSize() - 256; - delete tmpInput; - tmpInput = new u8[MAX_DTM_LENGTH]; - t_record.ReadArray(tmpInput, inputOffset); + if (!g_bReadOnly) + { + g_totalFrames = tmpHeader.frameCount; + g_totalLagCount = tmpHeader.lagCount; + g_totalInputCount = tmpHeader.inputCount; + + g_totalBytes = t_record.GetSize() - 256; + delete tmpInput; + tmpInput = new u8[MAX_DTM_LENGTH]; + t_record.ReadArray(tmpInput, (size_t)g_totalBytes); + } + else if (g_currentByte > 0) + { + // verify identical up to g_currentByte + if (g_currentByte > g_totalBytes) + { + PanicAlertT("Warning: You loaded a save whose movie ends before the current frame (%u < %u). You should load another save before continuing, or load this state with read-only mode off.", (u32)g_totalFrames, (u32)g_currentFrame); + } + else if(g_currentByte > 0) + { + u32 len = (u32)g_currentByte; + u8* tmpTmpInput = new u8[len]; + t_record.ReadArray(tmpTmpInput, (size_t)len); + for (u32 i = 0; i < len; ++i) + { + if (tmpTmpInput[i] != tmpInput[i]) + { + if(Core::g_CoreStartupParameter.bWii) + 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, i); + else + PanicAlertT("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.", i/8); + break; + } + } + delete tmpTmpInput; + } + } t_record.Close(); + g_rerecords = tmpHeader.numRerecords; + if(g_currentSaveVersion == 0) + { + // attempt support for old savestates with movies but without movie-related data in DoState. + // I'm just guessing here and the old logic was kind of broken anyway, so this probably doesn't work well. + g_totalFrames = tmpHeader.frameCount; + if(g_totalFrames < tmpHeader.deprecated_totalFrameCount) + g_totalFrames = tmpHeader.deprecated_totalFrameCount; + u64 frameStart = tmpHeader.deprecated_frameStart ? tmpHeader.deprecated_frameStart : tmpHeader.frameCount; + g_currentFrame = frameStart; + g_currentByte = frameStart * 8; + g_currentLagCount = tmpHeader.lagCount; + g_currentInputCount = tmpHeader.inputCount; + } + if (g_bReadOnly) { - tmpLength = inputOffset; - inputOffset = tmpHeader.frameStart; - Core::DisplayMessage("Resuming movie playback", 2000); - g_playMode = MODE_PLAYING; + if(g_playMode != MODE_PLAYING) + { + g_playMode = MODE_PLAYING; + Core::DisplayMessage("Switched to playback", 2000); + } } else { - Core::DisplayMessage("Resuming movie recording", 2000); - g_playMode = MODE_RECORDING; + if(g_playMode != MODE_RECORDING) + { + g_playMode = MODE_RECORDING; + Core::DisplayMessage("Switched to recording", 2000); + } + } +} + +static void CheckInputEnd() +{ + if (g_currentFrame > g_totalFrames || g_currentByte >= g_totalBytes) + { + EndPlayInput(!g_bReadOnly); } } @@ -491,8 +675,9 @@ void PlayController(SPADStatus *PadStatus, int controllerID) if (!IsPlayingInput() || !IsUsingPad(controllerID) || tmpInput == NULL) return; - if (inputOffset + 8 > tmpLength) + if (g_currentByte + 8 > g_totalBytes) { + PanicAlertT("Premature movie end in PlayController. %u + 8 > %u", (u32)g_currentByte, (u32)g_totalBytes); EndPlayInput(!g_bReadOnly); return; } @@ -503,8 +688,8 @@ void PlayController(SPADStatus *PadStatus, int controllerID) memset(PadStatus, 0, sizeof(SPADStatus)); PadStatus->err = e; - memcpy(&g_padState, &(tmpInput[inputOffset]), 8); - inputOffset += 8; + memcpy(&g_padState, &(tmpInput[g_currentByte]), 8); + g_currentByte += 8; PadStatus->triggerLeft = g_padState.TriggerL; PadStatus->triggerRight = g_padState.TriggerR; @@ -528,88 +713,65 @@ void PlayController(SPADStatus *PadStatus, int controllerID) PadStatus->analogB = 0xFF; } if(g_padState.X) - { PadStatus->button |= PAD_BUTTON_X; - } if(g_padState.Y) - { PadStatus->button |= PAD_BUTTON_Y; - } if(g_padState.Z) - { PadStatus->button |= PAD_TRIGGER_Z; - } if(g_padState.Start) - { PadStatus->button |= PAD_BUTTON_START; - } if(g_padState.DPadUp) - { PadStatus->button |= PAD_BUTTON_UP; - } if(g_padState.DPadDown) - { PadStatus->button |= PAD_BUTTON_DOWN; - } if(g_padState.DPadLeft) - { PadStatus->button |= PAD_BUTTON_LEFT; - } if(g_padState.DPadRight) - { PadStatus->button |= PAD_BUTTON_RIGHT; - } if(g_padState.L) - { PadStatus->button |= PAD_TRIGGER_L; - } if(g_padState.R) - { PadStatus->button |= PAD_TRIGGER_R; - } SetInputDisplayString(g_padState, controllerID); - if (g_frameCounter >= g_totalFrameCount) - { - EndPlayInput(!g_bReadOnly); - } + CheckInputEnd(); } -bool PlayWiimote(int wiimote, u8 *data, s8 &size) +bool PlayWiimote(int wiimote, u8 *data, s8 &size, u8* const coreData, u8* const accelData, u8* const irData) { s8 count = 0; if(!IsPlayingInput() || !IsUsingWiimote(wiimote) || tmpInput == NULL) return false; - if (inputOffset > tmpLength) + if (g_currentByte > g_totalBytes) { + PanicAlertT("Premature movie end in PlayWiimote. %u > %u", (u32)g_currentByte, (u32)g_totalBytes); EndPlayInput(!g_bReadOnly); return false; } - count = (s8) (tmpInput[inputOffset++]); + count = (s8) (tmpInput[g_currentByte++]); - if (inputOffset + count > tmpLength) + if (g_currentByte + count > g_totalBytes) { + PanicAlertT("Premature movie end in PlayWiimote. %u + %d > %u", (u32)g_currentByte, count, (u32)g_totalBytes); EndPlayInput(!g_bReadOnly); return false; } - memcpy(data, &(tmpInput[inputOffset]), count); - inputOffset += count; + memcpy(data, &(tmpInput[g_currentByte]), count); + g_currentByte += count; size = (count > size) ? size : count; - g_InputCounter++; + SetWiiInputDisplayString(wiimote, coreData, accelData, irData); + + g_currentInputCount++; - // TODO: merge this with the above so that there's no duplicate code - if (g_frameCounter >= g_totalFrameCount) - { - EndPlayInput(!g_bReadOnly); - } + CheckInputEnd(); return true; } @@ -620,10 +782,10 @@ void EndPlayInput(bool cont) g_playMode = MODE_RECORDING; Core::DisplayMessage("Resuming movie recording", 2000); } - else + else if(g_playMode != MODE_NONE) { g_numPads = g_rerecords = 0; - g_totalFrameCount = g_frameCounter = g_lagCounter = 0; + g_totalFrames = g_totalBytes = g_currentByte = 0; g_playMode = MODE_NONE; delete tmpInput; tmpInput = NULL; @@ -645,10 +807,10 @@ void SaveRecording(const char *filename) header.numControllers = g_numPads & (Core::g_CoreStartupParameter.bWii ? 0xFF : 0x0F); header.bFromSaveState = g_bRecordingFromSaveState; - header.frameCount = g_frameCounter; - header.lagCount = g_lagCounter; + header.frameCount = g_totalFrames; + header.lagCount = g_totalLagCount; + header.inputCount = g_totalInputCount; header.numRerecords = g_rerecords; - header.InputCount = g_InputCounter; // TODO header.uniqueID = 0; @@ -656,20 +818,9 @@ void SaveRecording(const char *filename) // header.videoBackend; // header.audioEmulator; - if (g_bReadOnly) - { - header.frameStart = inputOffset; - header.totalFrameCount = g_totalFrameCount; - } - save_record.WriteArray(&header, 1); - bool success; - - if (g_bReadOnly) - success = save_record.WriteArray(tmpInput, tmpLength); - else - success = save_record.WriteArray(tmpInput, inputOffset); + bool success = save_record.WriteArray(tmpInput, (size_t)g_totalBytes); if (success && g_bRecordingFromSaveState) { diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h index 4956c59de9..080c608b29 100644 --- a/Source/Core/Core/Src/Movie.h +++ b/Source/Core/Core/Src/Movie.h @@ -24,6 +24,8 @@ #include +#include "ChunkFile.h" + // Per-(video )Movie actions namespace Movie { @@ -62,7 +64,10 @@ extern ControllerState *g_padStates; extern char g_playingFile[256]; extern std::string g_recordFile; -extern u64 g_frameCounter, g_lagCounter, g_InputCounter; +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 u32 g_rerecords; @@ -77,7 +82,7 @@ struct DTMHeader { bool bFromSaveState; // false indicates that the recording started from bootup, true for savestate u64 frameCount; // Number of frames in the recording - u64 InputCount; // Number of input frames in recording + u64 inputCount; // Number of input frames in recording u64 lagCount; // Number of lag frames in the recording u64 uniqueID; // A Unique ID comprised of: md5(time + Game ID) u32 numRerecords; // Number of rerecords/'cuts' of this TAS @@ -87,9 +92,10 @@ struct DTMHeader { u8 audioEmulator[16]; // UTF-8 representation of the audio emulator u8 padBackend[16]; // UTF-8 representation of the input backend - // only used in read-only savestates - u64 frameStart; // Offset to resume playback on - u64 totalFrameCount; // Total frames, same as normal dtm's frameCount + // hack, data that was only used for savestates and would more properly be stored in the savestate itself + // the hack has been removed, but these remain defined and reserved here for legacy support purposes + u64 deprecated_frameStart; // NOT USED ANYMORE (use g_currentFrame) + u64 deprecated_totalFrameCount; // NOT USED ANYMORE (use g_totalFrames or header.frameCount) u8 reserved[111]; // Make heading 256 bytes, just because we can }; @@ -103,6 +109,7 @@ void SetPolledDevice(); bool IsAutoFiring(); bool IsRecordingInput(); bool IsRecordingInputFromSaveState(); +bool IsJustStartingRecordingInputFromSaveState(); bool IsPlayingInput(); bool IsReadOnly(); @@ -120,14 +127,15 @@ void FrameSkipping(); bool BeginRecordingInput(int controllers); void RecordInput(SPADStatus *PadStatus, int controllerID); -void RecordWiimote(int wiimote, u8* data, s8 size); +void RecordWiimote(int wiimote, u8* data, s8 size, u8* const coreData, u8* const accelData, u8* const irData); bool PlayInput(const char *filename); void LoadInput(const char *filename); void PlayController(SPADStatus *PadStatus, int controllerID); -bool PlayWiimote(int wiimote, u8* data, s8 &size); +bool PlayWiimote(int wiimote, u8* data, s8 &size, u8* const coreData, u8* const accelData, u8* const irData); void EndPlayInput(bool cont); void SaveRecording(const char *filename); +void DoState(PointerWrap &p, bool doNot=false); std::string GetInputDisplay(); diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp index 650f5a788f..7cfcba66d5 100644 --- a/Source/Core/Core/Src/State.cpp +++ b/Source/Core/Core/Src/State.cpp @@ -74,7 +74,7 @@ static u64 lastCheckedStates[NUM_HOOKS]; static u8 hook; // Don't forget to increase this after doing changes on the savestate system -static const int STATE_VERSION = 5; +static const int STATE_VERSION = 6; struct StateHeader { @@ -98,13 +98,29 @@ void EnableCompression(bool compression) void DoState(PointerWrap &p) { - u32 cookie = 0xBAADBABE + STATE_VERSION; - p.Do(cookie); - if (cookie != 0xBAADBABE + STATE_VERSION) + u32 version = STATE_VERSION; { - p.SetMode(PointerWrap::MODE_MEASURE); - return; + u32 cookie = version + 0xBAADBABE; + p.Do(cookie); + version = cookie - 0xBAADBABE; } + + if (version != STATE_VERSION) + { + if (version == 5 && STATE_VERSION == 6) + { + // from version 5 to 6, the only difference was the addition of calling Movie::DoState, + // so (because it's easy) let's not break compatibility in this case + } + else + { + // if the version doesn't match, fail. + // this will trigger a message like "Can't load state from other revisions" + p.SetMode(PointerWrap::MODE_MEASURE); + return; + } + } + // Begin with video backend, so that it gets a chance to clear it's caches and writeback modified things to RAM // Pause the video thread in multi-threaded mode g_video_backend->RunLoop(false); @@ -116,6 +132,7 @@ void DoState(PointerWrap &p) PowerPC::DoState(p); HW::DoState(p); CoreTiming::DoState(p); + Movie::DoState(p, version<6); // Resume the video thread g_video_backend->RunLoop(true); @@ -253,7 +270,7 @@ void SaveFileStateCallback(u64 userdata, int cyclesLate) p.SetMode(PointerWrap::MODE_WRITE); DoState(p); - if ((Movie::IsRecordingInput() || Movie::IsPlayingInput()) && !Movie::IsRecordingInputFromSaveState()) + if ((Movie::IsRecordingInput() || Movie::IsPlayingInput()) && !Movie::IsJustStartingRecordingInputFromSaveState()) Movie::SaveRecording((g_current_filename + ".dtm").c_str()); else if (!Movie::IsRecordingInput() && !Movie::IsPlayingInput()) File::Delete(g_current_filename + ".dtm"); @@ -360,7 +377,7 @@ void LoadFileStateCallback(u64 userdata, int cyclesLate) if (File::Exists(g_current_filename + ".dtm")) Movie::LoadInput((g_current_filename + ".dtm").c_str()); - else if (!Movie::IsRecordingInputFromSaveState()) + else if (!Movie::IsJustStartingRecordingInputFromSaveState()) Movie::EndPlayInput(false); } From 27590c3a8f00e0ab1def59badf95afa55d20f6ba Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Thu, 15 Dec 2011 06:41:39 +0100 Subject: [PATCH 167/381] Suppress link warning about QuickTime being 32-bit only. If we are actually missing symbols because a required architecture is missing from a library, we'll get a link error as usual, so suppressing this warning is pretty safe. --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index a30fbcdd9f..cf0088e73e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,6 +136,9 @@ if (APPLE) set(TARGET_FLAGS "${TARGET_FLAGS} -mmacosx-version-min=${OSX_MIN_VERSION}") set(TARGET_FLAGS "${TARGET_FLAGS} -isysroot /Developer/SDKs/MacOSX10.6.sdk") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-syslibroot,/Developer/SDKs/MacOSX10.6.sdk") + # Do not warn about frameworks that are not available on all architectures. + # This avoids a warning when linking with QuickTime. + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-no_arch_warnings") # Specify target CPUs. set(TARGET_FLAGS "${TARGET_FLAGS} -Xarch_i386 -msse3") set(TARGET_FLAGS "${TARGET_FLAGS} -Xarch_i386 -march=prescott") From e13f4644bbe6b6234c621d62bead2d2af86bdcc7 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Thu, 15 Dec 2011 06:54:42 +0100 Subject: [PATCH 168/381] Link weakly to OpenCL on OS X. This makes sure Dolphin still loads when OpenCL is not available. OpenCL was added in OS X 10.6, while we also support 10.5. --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index cf0088e73e..42e3534672 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -437,6 +437,7 @@ endif() if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") find_library(CL OpenCL) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-weak_framework,OpenCL") else() include_directories(Externals/CLRun/include) add_subdirectory(Externals/CLRun) From d2f61fa1556ca0867a7d58b72bba63f8e7531180 Mon Sep 17 00:00:00 2001 From: nitsuja Date: Thu, 15 Dec 2011 09:22:16 -0800 Subject: [PATCH 169/381] some movie playback fixes --- .../Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp | 11 ++-- Source/Core/Core/Src/Movie.cpp | 53 +++++++++++++------ Source/Core/Core/Src/Movie.h | 9 +++- 3 files changed, 50 insertions(+), 23 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp index 10084d9c39..5afc5b522d 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp @@ -638,10 +638,9 @@ void Wiimote::Update() Movie::SetPolledDevice(); const ReportFeatures& rptf = reporting_mode_features[m_reporting_mode - WM_REPORT_CORE]; - if (!Movie::IsPlayingInput() || !Movie::PlayWiimote(m_index, data, rptf_size, rptf.core?(data+rptf.core):NULL, rptf.accel?(data+rptf.accel):NULL, rptf.ir?(data+rptf.ir):NULL)) + rptf_size = rptf.size; + if (!Movie::IsPlayingInput() || !Movie::PlayWiimote(m_index, data, rptf, m_reg_ir.mode)) { - rptf_size = rptf.size; - data[0] = 0xA1; data[1] = m_reporting_mode; @@ -661,8 +660,8 @@ void Wiimote::Update() if (rptf.ext) GetExtData(data + rptf.ext); - // hybrid wiimote stuff - if (WIIMOTE_SRC_HYBRID == g_wiimote_sources[m_index]) + // hybrid wiimote stuff (for now, it's not supported while recording) + if (WIIMOTE_SRC_HYBRID == g_wiimote_sources[m_index] && !Movie::IsRecordingInput()) { using namespace WiimoteReal; @@ -744,7 +743,7 @@ void Wiimote::Update() } if (Movie::IsRecordingInput()) { - Movie::RecordWiimote(m_index, data, rptf_size, rptf.core?(data+rptf.core):NULL, rptf.accel?(data+rptf.accel):NULL, rptf.ir?(data+rptf.ir):NULL); + Movie::RecordWiimote(m_index, data, rptf, m_reg_ir.mode); } } diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 46923dae9a..5438f1e5eb 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -457,7 +457,8 @@ void RecordInput(SPADStatus *PadStatus, int controllerID) g_padState.CStickX = PadStatus->substickX; g_padState.CStickY = PadStatus->substickY; - + + memcpy(&(tmpInput[g_currentByte]), &g_padState, 8); g_currentByte += 8; g_totalBytes = g_currentByte; @@ -465,12 +466,18 @@ void RecordInput(SPADStatus *PadStatus, int controllerID) SetInputDisplayString(g_padState, controllerID); } -void RecordWiimote(int wiimote, u8 *data, s8 size, u8* const coreData, u8* const accelData, u8* const irData) +void RecordWiimote(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; + InputUpdate(); - tmpInput[g_currentByte++] = (u8) size; + tmpInput[g_currentByte++] = size; memcpy(&(tmpInput[g_currentByte]), data, size); g_currentByte += size; g_totalBytes = g_currentByte; @@ -526,6 +533,10 @@ bool PlayInput(const char *filename) g_totalLagCount = tmpHeader.lagCount; g_totalInputCount = tmpHeader.inputCount; + g_currentFrame = 0; + g_currentLagCount = 0; + g_currentInputCount = 0; + g_playMode = MODE_PLAYING; g_totalBytes = g_recordfd.GetSize() - 256; @@ -687,7 +698,8 @@ void PlayController(SPADStatus *PadStatus, int controllerID) signed char e = PadStatus->err; memset(PadStatus, 0, sizeof(SPADStatus)); PadStatus->err = e; - + + memcpy(&g_padState, &(tmpInput[g_currentByte]), 8); g_currentByte += 8; @@ -740,32 +752,43 @@ void PlayController(SPADStatus *PadStatus, int controllerID) CheckInputEnd(); } -bool PlayWiimote(int wiimote, u8 *data, s8 &size, u8* const coreData, u8* const accelData, u8* const irData) +bool PlayWiimote(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf, int irMode) { - s8 count = 0; - if(!IsPlayingInput() || !IsUsingWiimote(wiimote) || tmpInput == NULL) return false; - + if (g_currentByte > g_totalBytes) { PanicAlertT("Premature movie end in PlayWiimote. %u > %u", (u32)g_currentByte, (u32)g_totalBytes); EndPlayInput(!g_bReadOnly); return false; } - - count = (s8) (tmpInput[g_currentByte++]); - if (g_currentByte + count > g_totalBytes) + 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; + + u8 sizeInMovie = tmpInput[g_currentByte]; + + if (size != sizeInMovie) { - PanicAlertT("Premature movie end in PlayWiimote. %u + %d > %u", (u32)g_currentByte, count, (u32)g_totalBytes); + PanicAlertT("Error in PlayWiimote. %u != %u, byte %d.\nSorry, Wii recording is temporarily broken.", sizeInMovie, size, g_currentByte); + EndPlayInput(!g_bReadOnly); + return false; + } + + g_currentByte++; + + if (g_currentByte + size > g_totalBytes) + { + PanicAlertT("Premature movie end in PlayWiimote. %u + %d > %u", (u32)g_currentByte, size, (u32)g_totalBytes); EndPlayInput(!g_bReadOnly); return false; } - memcpy(data, &(tmpInput[g_currentByte]), count); - g_currentByte += count; - size = (count > size) ? size : count; + memcpy(data, &(tmpInput[g_currentByte]), size); + g_currentByte += size; SetWiiInputDisplayString(wiimote, coreData, accelData, irData); diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h index 080c608b29..3df376270e 100644 --- a/Source/Core/Core/Src/Movie.h +++ b/Source/Core/Core/Src/Movie.h @@ -26,6 +26,11 @@ #include "ChunkFile.h" +namespace WiimoteEmu +{ +struct ReportFeatures; +} + // Per-(video )Movie actions namespace Movie { @@ -127,12 +132,12 @@ void FrameSkipping(); bool BeginRecordingInput(int controllers); void RecordInput(SPADStatus *PadStatus, int controllerID); -void RecordWiimote(int wiimote, u8* data, s8 size, u8* const coreData, u8* const accelData, u8* const irData); +void RecordWiimote(int wiimote, u8* data, const struct WiimoteEmu::ReportFeatures& rptf, int irMode); bool PlayInput(const char *filename); void LoadInput(const char *filename); void PlayController(SPADStatus *PadStatus, int controllerID); -bool PlayWiimote(int wiimote, u8* data, s8 &size, u8* const coreData, u8* const accelData, u8* const irData); +bool PlayWiimote(int wiimote, u8* data, const struct WiimoteEmu::ReportFeatures& rptf, int irMode); void EndPlayInput(bool cont); void SaveRecording(const char *filename); void DoState(PointerWrap &p, bool doNot=false); From 5cbc31b052e13857e74baf3523048ad2b5c6c6c6 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Fri, 16 Dec 2011 02:46:55 +0100 Subject: [PATCH 170/381] Lowered wxWidgets version number requirement to 2.8.9. I incorrectly assumed that since wx 2.8.8 lacked wxAuiToolBar, the entire 2.8.x series lacked it. In fact in wx 2.8.9 this feature was added. Thanks to Glenn Rice for spotting this issue. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 42e3534672..78a2789404 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -457,8 +457,8 @@ if(NOT DISABLE_WX) ERROR_QUIET ) message("Found wxWidgets version ${wxWidgets_VERSION}") - if(${wxWidgets_VERSION} VERSION_LESS "2.9.0") - message("At least 2.9.0 is required; ignoring found 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) From a58c46be814398fa44bdbe92453d547f0becced4 Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Fri, 16 Dec 2011 21:01:10 +0200 Subject: [PATCH 171/381] Gui change and an update to the gameini database. The "Notes" column is gone and in it's place an "Emulation Notes" column is placed (it contains the emulationissues lines from the game inis). Notes that contain useful info about the game can be seen with just a glance this way. Fixes issue 5043. --- Data/User/GameConfig/GLNP69.ini | 16 ++++++ Data/User/GameConfig/GUME52.ini | 14 ++++-- Data/User/GameConfig/GUMP52.ini | 10 ++-- Data/User/GameConfig/GXCE01.ini | 57 +++------------------- Data/User/GameConfig/REDE41.ini | 12 ++++- Data/User/GameConfig/REDJ41.ini | 16 ++++++ Data/User/GameConfig/REDP41.ini | 12 ++++- Data/User/GameConfig/RFBE01.ini | 19 ++++++++ Data/User/GameConfig/RFBJ01.ini | 19 ++++++++ Data/User/GameConfig/RFBP01.ini | 14 +++++- Data/User/GameConfig/RMHE08.ini | 3 +- Data/User/GameConfig/RMHJ08.ini | 3 +- Data/User/GameConfig/RMHP08.ini | 3 +- Data/User/GameConfig/RQREXJ.ini | 2 + Data/User/GameConfig/RQRJAF.ini | 2 + Data/User/GameConfig/RQRPAF.ini | 2 + Data/User/GameConfig/SOUE01.ini | 4 +- Data/User/GameConfig/SOUJ01.ini | 4 +- Data/User/GameConfig/SOUK01.ini | 4 +- Data/User/GameConfig/SOUP01.ini | 4 +- Data/User/GameConfig/SX4J01.ini | 3 +- Data/User/GameConfig/SX4P01.ini | 3 +- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 47 ++++++------------ Source/Core/DolphinWX/Src/GameListCtrl.h | 2 +- 24 files changed, 172 insertions(+), 103 deletions(-) create mode 100644 Data/User/GameConfig/GLNP69.ini create mode 100644 Data/User/GameConfig/REDJ41.ini create mode 100644 Data/User/GameConfig/RFBE01.ini create mode 100644 Data/User/GameConfig/RFBJ01.ini diff --git a/Data/User/GameConfig/GLNP69.ini b/Data/User/GameConfig/GLNP69.ini new file mode 100644 index 0000000000..b919c56baa --- /dev/null +++ b/Data/User/GameConfig/GLNP69.ini @@ -0,0 +1,16 @@ +# GLNP69 - Looney Tunes Back In Action +[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/GUME52.ini b/Data/User/GameConfig/GUME52.ini index 4fc9785ee0..396010c826 100644 --- a/Data/User/GameConfig/GUME52.ini +++ b/Data/User/GameConfig/GUME52.ini @@ -1,8 +1,16 @@ # GUME52 - Gun [Core] Values set here will override the main dolphin settings. -TLBHack = 1 +MMU = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = only see nintendo thingy -EmulationStateId = 1 +EmulationIssues = Needs MMU to run, it gives a black screen after the intro video though. +EmulationStateId = 2 [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/GUMP52.ini b/Data/User/GameConfig/GUMP52.ini index 8ce1c4ca5a..4265749160 100644 --- a/Data/User/GameConfig/GUMP52.ini +++ b/Data/User/GameConfig/GUMP52.ini @@ -1,12 +1,16 @@ # GUMP52 - Gun [Core] Values set here will override the main dolphin settings. -TLBHack = 1 +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 -Issues="Trying to compile error" -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/GXCE01.ini b/Data/User/GameConfig/GXCE01.ini index bc971922af..a5c9b88862 100644 --- a/Data/User/GameConfig/GXCE01.ini +++ b/Data/User/GameConfig/GXCE01.ini @@ -4,59 +4,14 @@ [EmuState] #The Emulation State. 1 is worst, 5 is best, 0 is not set. Last validated using ver. r1697 EmulationStateId = 4 -EmulationIssues = +EmulationIssues = Use direct 3d 11 for less glitches. [OnFrame] [ActionReplay] -$(M) -0556D8F4 88000000 -C416C860 0000FF01 -$Unlock Bonuses -0556D8F5 08000000 -04321D44 FFFFFFFF -$Robo 1: Infinite Health -0556D8F6 08000000 -0424E194 447A0000 -$Robo 1: Dies With 1 Hit -0556D8F7 08000000 -3424E194 3F800000 -0424E194 3F800000 -$Robo 2: Infinite Health -0556D8F8 08000000 -042816B4 447A0000 -$Robo 2: Dies With 1 Hit -0556D8F9 08000000 -342816B4 3F800000 -042816B4 3F800000 -$Robo 3: Infinite Health -0556D8FA 08000000 -042B4BD4 447A0000 -$Robo 3: Dies With 1 Hit -0556D8FB 08000000 -342B4BD4 3F800000 -042B4BD4 3F800000 -$Robo 4: Infinite Health -0556D8FC 08000000 -042E80F4 447A0000 -$Robo 4: Dies With 1 Hit -0556D8FD 08000000 -342E80F4 3F800000 -042E80F4 3F800000 -$All Body Types -0556D8FE 08000000 -023BFB9C 0003FFFF -$All Gun Parts -0556D8FF 08000000 -023BFBBC 0003FFFF -$All Bomb Parts -0556D900 08000000 -023BFBDC 0003FFFF -$All Pod Parts -0556D901 08000000 -023BFBFC 0003FFFF -$All Leg Parts -0556D902 08000000 -023BFC1C 0003FFFF [Video] ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = [Gecko] - diff --git a/Data/User/GameConfig/REDE41.ini b/Data/User/GameConfig/REDE41.ini index ca72301284..4d4cce340c 100644 --- a/Data/User/GameConfig/REDE41.ini +++ b/Data/User/GameConfig/REDE41.ini @@ -1,6 +1,16 @@ # REDE41 - RedSteel NTSC [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 +EmulationStateId = 3 +EmulationIssues = Nunchuck doesn't work (both real and emulated). [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/REDJ41.ini b/Data/User/GameConfig/REDJ41.ini new file mode 100644 index 0000000000..c0dc3d9b86 --- /dev/null +++ b/Data/User/GameConfig/REDJ41.ini @@ -0,0 +1,16 @@ +# REDJ41 - RedSteel NTSC +[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 = Nunchuck doesn't work (both real and emulated). +[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/REDP41.ini b/Data/User/GameConfig/REDP41.ini index b1b18e205e..28a37b3f0c 100644 --- a/Data/User/GameConfig/REDP41.ini +++ b/Data/User/GameConfig/REDP41.ini @@ -1,6 +1,16 @@ # REDP41 - RedSteel PAL [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 +EmulationStateId = 3 +EmulationIssues = Nunchuck doesn't work (both real and emulated). [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/RFBE01.ini b/Data/User/GameConfig/RFBE01.ini new file mode 100644 index 0000000000..9b3c8dd9de --- /dev/null +++ b/Data/User/GameConfig/RFBE01.ini @@ -0,0 +1,19 @@ +# RFBE01 - ENDLESS OCEAN +[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 photos to be developed. +[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 +DlistCachingEnable = False diff --git a/Data/User/GameConfig/RFBJ01.ini b/Data/User/GameConfig/RFBJ01.ini new file mode 100644 index 0000000000..2d603b29b0 --- /dev/null +++ b/Data/User/GameConfig/RFBJ01.ini @@ -0,0 +1,19 @@ +# RFBJ01 - Forever Blue +[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 photos to be developed. +[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 +DlistCachingEnable = False diff --git a/Data/User/GameConfig/RFBP01.ini b/Data/User/GameConfig/RFBP01.ini index c77844fef6..0208f62ec1 100644 --- a/Data/User/GameConfig/RFBP01.ini +++ b/Data/User/GameConfig/RFBP01.ini @@ -2,6 +2,18 @@ [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 efb to ram for photos to be developed. [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 +DlistCachingEnable = False diff --git a/Data/User/GameConfig/RMHE08.ini b/Data/User/GameConfig/RMHE08.ini index c9dd6910a0..aebbd4f7f8 100644 --- a/Data/User/GameConfig/RMHE08.ini +++ b/Data/User/GameConfig/RMHE08.ini @@ -2,7 +2,7 @@ [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 = Use Directx9 plugin. Disable(enable cpu access) in the graphics plugin for playable speed(r6676). +EmulationIssues = Skip efb access from cpu needs to be enabled for direct 3d 9 & 11 to have playable speeds. EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. +$Bloom OFF @@ -21,3 +21,4 @@ PH_ZFar = EFBAccessEnable = False EFBToTextureEnable = False EFBCopyEnable = True +EFBCopyCacheEnable = True diff --git a/Data/User/GameConfig/RMHJ08.ini b/Data/User/GameConfig/RMHJ08.ini index 924bc413fc..6a9b8231b8 100644 --- a/Data/User/GameConfig/RMHJ08.ini +++ b/Data/User/GameConfig/RMHJ08.ini @@ -2,7 +2,7 @@ [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 = Use Directx9 plugin. Disable(enable cpu access) in the graphics plugin for playable speed(r6676). +EmulationIssues = Skip efb access from cpu needs to be enabled for direct 3d 9 & 11 to have playable speeds. EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. 0x805DD6D4:dword:0x60000000 @@ -21,3 +21,4 @@ PH_ZFar = EFBAccessEnable = False EFBToTextureEnable = False EFBCopyEnable = True +EFBCopyCacheEnable = True diff --git a/Data/User/GameConfig/RMHP08.ini b/Data/User/GameConfig/RMHP08.ini index cbe5456828..d2f0179aa1 100644 --- a/Data/User/GameConfig/RMHP08.ini +++ b/Data/User/GameConfig/RMHP08.ini @@ -2,7 +2,7 @@ [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 = Use Directx9 plugin. Disable(enable cpu access) in the graphics plugin for playable speed(r6676). +EmulationIssues = Skip efb access from cpu needs to be enabled for direct 3d 9 & 11 to have playable speeds. EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. @@ -13,3 +13,4 @@ ProjectionHack = 0 EFBAccessEnable = False EFBToTextureEnable = False EFBCopyEnable = True +EFBCopyCacheEnable = True diff --git a/Data/User/GameConfig/RQREXJ.ini b/Data/User/GameConfig/RQREXJ.ini index 83b5f9f9ce..b3a8ed6f99 100644 --- a/Data/User/GameConfig/RQREXJ.ini +++ b/Data/User/GameConfig/RQREXJ.ini @@ -18,3 +18,5 @@ EmulationIssues = Needs single core to run properly(r7436). [OnFrame] [ActionReplay] [Gecko] +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/RQRJAF.ini b/Data/User/GameConfig/RQRJAF.ini index b60c421d9a..1a3d093110 100644 --- a/Data/User/GameConfig/RQRJAF.ini +++ b/Data/User/GameConfig/RQRJAF.ini @@ -18,3 +18,5 @@ EmulationIssues = Needs single core to run properly(r7436). [OnFrame] [ActionReplay] [Gecko] +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/RQRPAF.ini b/Data/User/GameConfig/RQRPAF.ini index 7253a3ac5f..58298f19e2 100644 --- a/Data/User/GameConfig/RQRPAF.ini +++ b/Data/User/GameConfig/RQRPAF.ini @@ -18,3 +18,5 @@ EmulationIssues = Needs single core to run properly(r7436). [OnFrame] [ActionReplay] [Gecko] +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/SOUE01.ini b/Data/User/GameConfig/SOUE01.ini index 5e9a8939d7..3a17851101 100644 --- a/Data/User/GameConfig/SOUE01.ini +++ b/Data/User/GameConfig/SOUE01.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 Direct 3d 11 backend and efb to ram for less graphic glitches. Needs real wiimote and motion plus. +EmulationIssues = Needs real wiimote and motion plus. Use direct 3d9 backend for less graphic issues. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -16,3 +16,5 @@ PH_ZFar = [Video_Hacks] EFBAccessEnable = True DlistCachingEnable = False +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/SOUJ01.ini b/Data/User/GameConfig/SOUJ01.ini index f868f5ccf2..67e67a1525 100644 --- a/Data/User/GameConfig/SOUJ01.ini +++ b/Data/User/GameConfig/SOUJ01.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 Direct 3d 11 backend and efb to ram for less graphic glitches. Needs real wiimote and motion plus. +EmulationIssues = Needs real wiimote and motion plus. Use direct 3d9 backend for less graphic issues. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -16,3 +16,5 @@ PH_ZFar = [Video_Hacks] EFBAccessEnable = True DlistCachingEnable = False +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/SOUK01.ini b/Data/User/GameConfig/SOUK01.ini index 800efb33d0..f169b324bf 100644 --- a/Data/User/GameConfig/SOUK01.ini +++ b/Data/User/GameConfig/SOUK01.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 Direct 3d 11 backend and efb to ram for less graphic glitches. Needs real wiimote and motion plus. +EmulationIssues = Needs real wiimote and motion plus. Use direct 3d9 backend for less graphic issues. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -16,3 +16,5 @@ PH_ZFar = [Video_Hacks] EFBAccessEnable = True DlistCachingEnable = False +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/SOUP01.ini b/Data/User/GameConfig/SOUP01.ini index 23f5acee83..0e80a81656 100644 --- a/Data/User/GameConfig/SOUP01.ini +++ b/Data/User/GameConfig/SOUP01.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 Direct 3d 11 backend and efb to ram for less graphic glitches. Needs real wiimote and motion plus. +EmulationIssues = Needs real wiimote and motion plus. Use direct 3d9 backend for less graphic issues. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -16,3 +16,5 @@ PH_ZFar = [Video_Hacks] EFBAccessEnable = True DlistCachingEnable = False +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/SX4J01.ini b/Data/User/GameConfig/SX4J01.ini index 2e2169a190..12d93d6744 100644 --- a/Data/User/GameConfig/SX4J01.ini +++ b/Data/User/GameConfig/SX4J01.ini @@ -1,10 +1,9 @@ # SX4J01 - Xenoblade [Core] Values set here will override the main dolphin settings. BlockMerging = 1 -SkipIdle = 0 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Disable idle skipping to solve sound issues or use LLE audio. Per pixel lighting creates a glitch in ether cave with direct 3d 9. The game randomly freezes. +EmulationIssues = The game randomly freezes. Use LLE audio for sound issues. Per pixel lighting creates a glitch in ether cave with direct 3d 9. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/SX4P01.ini b/Data/User/GameConfig/SX4P01.ini index b374dab682..b5988e291b 100644 --- a/Data/User/GameConfig/SX4P01.ini +++ b/Data/User/GameConfig/SX4P01.ini @@ -1,10 +1,9 @@ # SX4P01 - Xenoblade Chronicles [Core] Values set here will override the main dolphin settings. BlockMerging = 1 -SkipIdle = 0 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Disable idle skipping to solve sound issues or use LLE audio. Per pixel lighting creates a glitch in ether cave with direct 3d 9. The game randomly freezes. +EmulationIssues = The game randomly freezes. Use LLE audio for sound issues. Per pixel lighting creates a glitch in ether cave with direct 3d 9. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 05f8c8365a..e8e6ce75a4 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -91,16 +91,6 @@ static int CompareGameListItems(const GameListItem* iso1, const GameListItem* is case CGameListCtrl::COLUMN_TITLE: return strcasecmp(iso1->GetName(indexOne).c_str(), iso2->GetName(indexOther).c_str()) * t; - case CGameListCtrl::COLUMN_NOTES: - { - std::string cmp1 = - (iso1->GetPlatform() == GameListItem::GAMECUBE_DISC) ? - iso1->GetCompany() : iso1->GetDescription(indexOne); - std::string cmp2 = - (iso2->GetPlatform() == GameListItem::GAMECUBE_DISC) ? - iso2->GetCompany() : iso2->GetDescription(indexOther); - return strcasecmp(cmp1.c_str(), cmp2.c_str()) * t; - } case CGameListCtrl::COLUMN_COUNTRY: if(iso1->GetCountry() > iso2->GetCountry()) return 1 * t; @@ -133,7 +123,10 @@ static int CompareGameListItems(const GameListItem* iso1, const GameListItem* is else return 0; } - break; + case CGameListCtrl::COLUMN_EMULATION_NOTES: + return strcasecmp(iso1->GetIssues().c_str(), + iso2->GetIssues().c_str()) * t; + break; } return 0; @@ -294,19 +287,20 @@ void CGameListCtrl::Update() // Instead of showing the notes + the company, which is unknown with // wii titles We show in the same column : company for GC games and // description for wii/wad games - InsertColumn(COLUMN_NOTES, _("Notes")); + InsertColumn(COLUMN_EMULATION_NOTES, _("Emulation Notes")); InsertColumn(COLUMN_COUNTRY, _T("")); InsertColumn(COLUMN_SIZE, _("Size")); InsertColumn(COLUMN_EMULATION_STATE, _("State")); - + // set initial sizes for columns SetColumnWidth(COLUMN_PLATFORM, 35); SetColumnWidth(COLUMN_BANNER, 96); SetColumnWidth(COLUMN_TITLE, 200); - SetColumnWidth(COLUMN_NOTES, 200); + SetColumnWidth(COLUMN_EMULATION_NOTES, 200); SetColumnWidth(COLUMN_COUNTRY, 32); SetColumnWidth(COLUMN_EMULATION_STATE, 50); + // add all items for (int i = 0; i < (int)m_ISOFiles.size(); i++) @@ -483,18 +477,12 @@ void CGameListCtrl::InsertItemInReportView(long _Index) wxString name = wxString(rISOFile.GetName(0).c_str(), SJISConv); m_gameList.append(StringFromFormat("%s (J)\n", (const char *)name.c_str())); SetItem(_Index, COLUMN_TITLE, name, -1); - SetItem(_Index, COLUMN_NOTES, wxString(company.size() ? - company.c_str() : rISOFile.GetDescription(0).c_str(), - SJISConv), -1); } break; case DiscIO::IVolume::COUNTRY_USA: m_gameList.append(StringFromFormat("%s (U)\n", rISOFile.GetName(0).c_str())); SetItem(_Index, COLUMN_TITLE, wxString::From8BitData(rISOFile.GetName(0).c_str()), -1); - SetItem(_Index, COLUMN_NOTES, - wxString::From8BitData(company.size() ? - company.c_str() : rISOFile.GetDescription(0).c_str()), -1); break; default: m_gameList.append(StringFromFormat("%s (E)\n", @@ -503,11 +491,6 @@ void CGameListCtrl::InsertItemInReportView(long _Index) wxString::From8BitData( rISOFile.GetName(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str()), -1); - SetItem(_Index, COLUMN_NOTES, - wxString::From8BitData(company.size() ? - company.c_str() : - rISOFile.GetDescription(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str()), - -1); break; } } @@ -516,8 +499,6 @@ void CGameListCtrl::InsertItemInReportView(long _Index) m_gameList.append(StringFromFormat("%s (WAD)\n", rISOFile.GetName(0).c_str())); SetItem(_Index, COLUMN_TITLE, wxString(rISOFile.GetName(0).c_str(), SJISConv), -1); - SetItem(_Index, COLUMN_NOTES, - wxString(rISOFile.GetDescription(0).c_str(), SJISConv), -1); } #ifndef _WIN32 @@ -531,6 +512,10 @@ void CGameListCtrl::InsertItemInReportView(long _Index) // File size SetItem(_Index, COLUMN_SIZE, NiceSizeFormat(rISOFile.GetFileSize()), -1); + // Emulation notes + SetItem(_Index, COLUMN_EMULATION_NOTES, wxString::From8BitData(rISOFile.GetIssues().c_str()), -1); + SetColumnWidth(COLUMN_SIZE, wxLIST_AUTOSIZE); + // Background color SetBackgroundColor(); @@ -713,7 +698,7 @@ void CGameListCtrl::ScanForISOs() void CGameListCtrl::OnColBeginDrag(wxListEvent& event) { - if (event.GetColumn() != COLUMN_TITLE && event.GetColumn() != COLUMN_NOTES) + if (event.GetColumn() != COLUMN_TITLE && event.GetColumn() != COLUMN_EMULATION_NOTES) event.Veto(); } @@ -1331,13 +1316,13 @@ void CGameListCtrl::AutomaticColumnWidth() // We hide the Notes column if the window is too small if (resizable > 400) { - SetColumnWidth(COLUMN_TITLE, resizable / 2); - SetColumnWidth(COLUMN_NOTES, resizable / 2); + SetColumnWidth(COLUMN_TITLE, resizable / 2 ); + SetColumnWidth(COLUMN_EMULATION_NOTES, resizable / 2 ); } else { SetColumnWidth(COLUMN_TITLE, resizable); - SetColumnWidth(COLUMN_NOTES, 0); + SetColumnWidth(COLUMN_EMULATION_NOTES, 0); } } } diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.h b/Source/Core/DolphinWX/Src/GameListCtrl.h index 8fca14f632..48b1a118c4 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.h +++ b/Source/Core/DolphinWX/Src/GameListCtrl.h @@ -60,7 +60,7 @@ public: COLUMN_PLATFORM = 0, COLUMN_BANNER, COLUMN_TITLE, - COLUMN_NOTES, + COLUMN_EMULATION_NOTES, COLUMN_COUNTRY, COLUMN_SIZE, COLUMN_EMULATION_STATE, From 74d552f3cae97d7beb643f52e378a4258dca0772 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Sat, 17 Dec 2011 15:31:36 +0100 Subject: [PATCH 172/381] Removed debug prints. --- CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 78a2789404..cb1f17d2b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,13 +144,10 @@ if (APPLE) set(TARGET_FLAGS "${TARGET_FLAGS} -Xarch_i386 -march=prescott") set(TARGET_FLAGS "${TARGET_FLAGS} -Xarch_x86_64 -mssse3") set(TARGET_FLAGS "${TARGET_FLAGS} -Xarch_x86_64 -march=core2") - message("target flags: ${TARGET_FLAGS}") # Target flags apply to both C and C++ compilation. + # CMake passes these to the compiler on the link command line as well. set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TARGET_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TARGET_FLAGS}") - # TODO: It seems that CMake passes compile flags to the linker anyway. - #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${TARGET_FLAGS}") - message("C++ flags: ${CMAKE_CXX_FLAGS}") # Linker flags. # Drop unreachable code and data. From 83bf5790a66363d445b4e4e53cba91c260781e75 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Sat, 17 Dec 2011 16:26:52 +0100 Subject: [PATCH 173/381] Copy translation files into OS X bundle. --- Source/Core/DolphinWX/CMakeLists.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 07df3a096d..2d7ed7e0ce 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -151,6 +151,24 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") 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 From 98d22d0e03ba22092ebd550ee0e6be9afd95f687 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sat, 17 Dec 2011 23:44:09 -0600 Subject: [PATCH 174/381] Revert the latest GUI change (Emulation Notes column). We don't care for it. --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 47 ++++++++++++++-------- Source/Core/DolphinWX/Src/GameListCtrl.h | 2 +- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index e8e6ce75a4..05f8c8365a 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -91,6 +91,16 @@ static int CompareGameListItems(const GameListItem* iso1, const GameListItem* is case CGameListCtrl::COLUMN_TITLE: return strcasecmp(iso1->GetName(indexOne).c_str(), iso2->GetName(indexOther).c_str()) * t; + case CGameListCtrl::COLUMN_NOTES: + { + std::string cmp1 = + (iso1->GetPlatform() == GameListItem::GAMECUBE_DISC) ? + iso1->GetCompany() : iso1->GetDescription(indexOne); + std::string cmp2 = + (iso2->GetPlatform() == GameListItem::GAMECUBE_DISC) ? + iso2->GetCompany() : iso2->GetDescription(indexOther); + return strcasecmp(cmp1.c_str(), cmp2.c_str()) * t; + } case CGameListCtrl::COLUMN_COUNTRY: if(iso1->GetCountry() > iso2->GetCountry()) return 1 * t; @@ -123,10 +133,7 @@ static int CompareGameListItems(const GameListItem* iso1, const GameListItem* is else return 0; } - case CGameListCtrl::COLUMN_EMULATION_NOTES: - return strcasecmp(iso1->GetIssues().c_str(), - iso2->GetIssues().c_str()) * t; - break; + break; } return 0; @@ -287,20 +294,19 @@ void CGameListCtrl::Update() // Instead of showing the notes + the company, which is unknown with // wii titles We show in the same column : company for GC games and // description for wii/wad games - InsertColumn(COLUMN_EMULATION_NOTES, _("Emulation Notes")); + InsertColumn(COLUMN_NOTES, _("Notes")); InsertColumn(COLUMN_COUNTRY, _T("")); InsertColumn(COLUMN_SIZE, _("Size")); InsertColumn(COLUMN_EMULATION_STATE, _("State")); - + // set initial sizes for columns SetColumnWidth(COLUMN_PLATFORM, 35); SetColumnWidth(COLUMN_BANNER, 96); SetColumnWidth(COLUMN_TITLE, 200); - SetColumnWidth(COLUMN_EMULATION_NOTES, 200); + SetColumnWidth(COLUMN_NOTES, 200); SetColumnWidth(COLUMN_COUNTRY, 32); SetColumnWidth(COLUMN_EMULATION_STATE, 50); - // add all items for (int i = 0; i < (int)m_ISOFiles.size(); i++) @@ -477,12 +483,18 @@ void CGameListCtrl::InsertItemInReportView(long _Index) wxString name = wxString(rISOFile.GetName(0).c_str(), SJISConv); m_gameList.append(StringFromFormat("%s (J)\n", (const char *)name.c_str())); SetItem(_Index, COLUMN_TITLE, name, -1); + SetItem(_Index, COLUMN_NOTES, wxString(company.size() ? + company.c_str() : rISOFile.GetDescription(0).c_str(), + SJISConv), -1); } break; case DiscIO::IVolume::COUNTRY_USA: m_gameList.append(StringFromFormat("%s (U)\n", rISOFile.GetName(0).c_str())); SetItem(_Index, COLUMN_TITLE, wxString::From8BitData(rISOFile.GetName(0).c_str()), -1); + SetItem(_Index, COLUMN_NOTES, + wxString::From8BitData(company.size() ? + company.c_str() : rISOFile.GetDescription(0).c_str()), -1); break; default: m_gameList.append(StringFromFormat("%s (E)\n", @@ -491,6 +503,11 @@ void CGameListCtrl::InsertItemInReportView(long _Index) wxString::From8BitData( rISOFile.GetName(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str()), -1); + SetItem(_Index, COLUMN_NOTES, + wxString::From8BitData(company.size() ? + company.c_str() : + rISOFile.GetDescription(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str()), + -1); break; } } @@ -499,6 +516,8 @@ void CGameListCtrl::InsertItemInReportView(long _Index) m_gameList.append(StringFromFormat("%s (WAD)\n", rISOFile.GetName(0).c_str())); SetItem(_Index, COLUMN_TITLE, wxString(rISOFile.GetName(0).c_str(), SJISConv), -1); + SetItem(_Index, COLUMN_NOTES, + wxString(rISOFile.GetDescription(0).c_str(), SJISConv), -1); } #ifndef _WIN32 @@ -512,10 +531,6 @@ void CGameListCtrl::InsertItemInReportView(long _Index) // File size SetItem(_Index, COLUMN_SIZE, NiceSizeFormat(rISOFile.GetFileSize()), -1); - // Emulation notes - SetItem(_Index, COLUMN_EMULATION_NOTES, wxString::From8BitData(rISOFile.GetIssues().c_str()), -1); - SetColumnWidth(COLUMN_SIZE, wxLIST_AUTOSIZE); - // Background color SetBackgroundColor(); @@ -698,7 +713,7 @@ void CGameListCtrl::ScanForISOs() void CGameListCtrl::OnColBeginDrag(wxListEvent& event) { - if (event.GetColumn() != COLUMN_TITLE && event.GetColumn() != COLUMN_EMULATION_NOTES) + if (event.GetColumn() != COLUMN_TITLE && event.GetColumn() != COLUMN_NOTES) event.Veto(); } @@ -1316,13 +1331,13 @@ void CGameListCtrl::AutomaticColumnWidth() // We hide the Notes column if the window is too small if (resizable > 400) { - SetColumnWidth(COLUMN_TITLE, resizable / 2 ); - SetColumnWidth(COLUMN_EMULATION_NOTES, resizable / 2 ); + SetColumnWidth(COLUMN_TITLE, resizable / 2); + SetColumnWidth(COLUMN_NOTES, resizable / 2); } else { SetColumnWidth(COLUMN_TITLE, resizable); - SetColumnWidth(COLUMN_EMULATION_NOTES, 0); + SetColumnWidth(COLUMN_NOTES, 0); } } } diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.h b/Source/Core/DolphinWX/Src/GameListCtrl.h index 48b1a118c4..8fca14f632 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.h +++ b/Source/Core/DolphinWX/Src/GameListCtrl.h @@ -60,7 +60,7 @@ public: COLUMN_PLATFORM = 0, COLUMN_BANNER, COLUMN_TITLE, - COLUMN_EMULATION_NOTES, + COLUMN_NOTES, COLUMN_COUNTRY, COLUMN_SIZE, COLUMN_EMULATION_STATE, From c68c8c388cc29cfd4e97be8fc7f5ea7534508672 Mon Sep 17 00:00:00 2001 From: nitsuja Date: Sat, 17 Dec 2011 16:49:24 -0800 Subject: [PATCH 175/381] made savestate loads less fragile by adding some markers and rolling back on a mismatch. This should make it so if you try to load an incompatible save, it simply doesn't load, instead of crashing dolphin. (I can't guarantee no crash but it's much less likely now) --- Source/Core/Common/Src/ChunkFile.h | 11 ++++++++++ Source/Core/Core/Src/CoreTiming.cpp | 2 ++ Source/Core/Core/Src/HW/HW.cpp | 12 +++++++++++ Source/Core/Core/Src/HW/Memmap.cpp | 3 +++ Source/Core/Core/Src/State.cpp | 33 +++++++++++++++++++++++------ 5 files changed, 55 insertions(+), 6 deletions(-) diff --git a/Source/Core/Common/Src/ChunkFile.h b/Source/Core/Common/Src/ChunkFile.h index 03216deaf1..b0662d2517 100644 --- a/Source/Core/Common/Src/ChunkFile.h +++ b/Source/Core/Common/Src/ChunkFile.h @@ -170,6 +170,17 @@ public: // TODO PanicAlert("Do(linked list<>) does not yet work."); } + + void DoMarker(const char* prevName, u32 arbitraryNumber=0x42) + { + u32 cookie = arbitraryNumber; + Do(cookie); + if(mode == PointerWrap::MODE_READ && cookie != arbitraryNumber) + { + PanicAlertT("Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). Aborting savestate load...", prevName, cookie, cookie, arbitraryNumber, arbitraryNumber); + mode = PointerWrap::MODE_MEASURE; + } + } }; diff --git a/Source/Core/Core/Src/CoreTiming.cpp b/Source/Core/Core/Src/CoreTiming.cpp index 9aacea5847..979add358b 100644 --- a/Source/Core/Core/Src/CoreTiming.cpp +++ b/Source/Core/Core/Src/CoreTiming.cpp @@ -163,6 +163,7 @@ void DoState(PointerWrap &p) p.Do(fakeDecStartTicks); p.Do(fakeTBStartValue); p.Do(fakeTBStartTicks); + p.DoMarker("CoreTimingData"); // OK, here we're gonna need to specialize depending on the mode. // Should do something generic to serialize linked lists. switch (p.GetMode()) { @@ -209,6 +210,7 @@ void DoState(PointerWrap &p) break; } } + p.DoMarker("CoreTimingEvents"); } u64 GetTicks() diff --git a/Source/Core/Core/Src/HW/HW.cpp b/Source/Core/Core/Src/HW/HW.cpp index ec8aa7063f..a078955815 100644 --- a/Source/Core/Core/Src/HW/HW.cpp +++ b/Source/Core/Core/Src/HW/HW.cpp @@ -89,18 +89,30 @@ namespace HW void DoState(PointerWrap &p) { Memory::DoState(p); + p.DoMarker("Memory"); VideoInterface::DoState(p); + p.DoMarker("VideoInterface"); SerialInterface::DoState(p); + p.DoMarker("SerialInterface"); ProcessorInterface::DoState(p); + p.DoMarker("ProcessorInterface"); DSP::DoState(p); + p.DoMarker("DSP"); DVDInterface::DoState(p); + p.DoMarker("DVDInterface"); GPFifo::DoState(p); + p.DoMarker("GPFifo"); ExpansionInterface::DoState(p); + p.DoMarker("ExpansionInterface"); AudioInterface::DoState(p); + p.DoMarker("AudioInterface"); if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii) { WII_IPCInterface::DoState(p); + p.DoMarker("WII_IPCInterface"); WII_IPC_HLE_Interface::DoState(p); + p.DoMarker("WII_IPC_HLE_Interface"); } + p.DoMarker("WIIHW"); } } diff --git a/Source/Core/Core/Src/HW/Memmap.cpp b/Source/Core/Core/Src/HW/Memmap.cpp index 980b080761..f26ac76a14 100644 --- a/Source/Core/Core/Src/HW/Memmap.cpp +++ b/Source/Core/Core/Src/HW/Memmap.cpp @@ -373,10 +373,13 @@ void DoState(PointerWrap &p) p.DoArray(m_pPhysicalRAM, RAM_SIZE); // p.DoArray(m_pVirtualEFB, EFB_SIZE); p.DoArray(m_pVirtualL1Cache, L1_CACHE_SIZE); + p.DoMarker("Memory RAM"); if (bFakeVMEM) p.DoArray(m_pVirtualFakeVMEM, FAKEVMEM_SIZE); + p.DoMarker("Memory FakeVMEM"); if (wii) p.DoArray(m_pEXRAM, EXRAM_SIZE); + p.DoMarker("Memory EXRAM"); } void Shutdown() diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp index 7cfcba66d5..e8dcddcb62 100644 --- a/Source/Core/Core/Src/State.cpp +++ b/Source/Core/Core/Src/State.cpp @@ -64,6 +64,7 @@ static std::string g_current_filename, g_last_filename; // Temporary undo state buffer static std::vector g_undo_load_buffer; static std::vector g_current_buffer; +static int g_loadDepth = 0; static std::thread g_save_thread; @@ -74,7 +75,7 @@ static u64 lastCheckedStates[NUM_HOOKS]; static u8 hook; // Don't forget to increase this after doing changes on the savestate system -static const int STATE_VERSION = 6; +static const int STATE_VERSION = 7; struct StateHeader { @@ -121,18 +122,26 @@ void DoState(PointerWrap &p) } } + p.DoMarker("Version"); + // Begin with video backend, so that it gets a chance to clear it's caches and writeback modified things to RAM // Pause the video thread in multi-threaded mode g_video_backend->RunLoop(false); g_video_backend->DoState(p); + p.DoMarker("video_backend"); if (Core::g_CoreStartupParameter.bWii) Wiimote::DoState(p.GetPPtr(), p.GetMode()); + p.DoMarker("Wiimote"); PowerPC::DoState(p); + p.DoMarker("PowerPC"); HW::DoState(p); + p.DoMarker("HW"); CoreTiming::DoState(p); + p.DoMarker("CoreTiming"); Movie::DoState(p, version<6); + p.DoMarker("Movie"); // Resume the video thread g_video_backend->RunLoop(true); @@ -353,6 +362,8 @@ void LoadFileStateCallback(u64 userdata, int cyclesLate) // Stop the core while we load the state CCPU::EnableStepping(true); + g_loadDepth++; + Flush(); // Save temp buffer for undo load state @@ -371,20 +382,30 @@ void LoadFileStateCallback(u64 userdata, int cyclesLate) DoState(p); if (p.GetMode() == PointerWrap::MODE_READ) + { Core::DisplayMessage(StringFromFormat("Loaded state from %s", g_current_filename.c_str()).c_str(), 2000); + if (File::Exists(g_current_filename + ".dtm")) + Movie::LoadInput((g_current_filename + ".dtm").c_str()); + else if (!Movie::IsJustStartingRecordingInputFromSaveState()) + Movie::EndPlayInput(false); + } else + { + // failed to load Core::DisplayMessage("Unable to Load : Can't load state from other revisions !", 4000); - - if (File::Exists(g_current_filename + ".dtm")) - Movie::LoadInput((g_current_filename + ".dtm").c_str()); - else if (!Movie::IsJustStartingRecordingInputFromSaveState()) - Movie::EndPlayInput(false); + + // since we're probably in an inconsistent state now (and might crash or whatever), undo. + if(g_loadDepth < 2) + UndoLoadState(); + } } ResetCounters(); g_op_in_progress = false; + g_loadDepth--; + // resume dat core CCPU::EnableStepping(false); } From 1e4e05fdc3475a7873ec2806cad00a8671201a23 Mon Sep 17 00:00:00 2001 From: nitsuja Date: Sat, 17 Dec 2011 16:56:23 -0800 Subject: [PATCH 176/381] made ucode saving more reliable (especially for the case of loading across boundaries where the ucode changes). I think this is related to the occasional memory corruption I was seeing upon loading a savestate. --- Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp | 46 ++++++++++++++++++- .../Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp | 8 +--- .../Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h | 1 - .../Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp | 8 +--- .../Core/Src/HW/DSPHLE/UCodes/UCode_CARD.cpp | 4 +- .../Core/Src/HW/DSPHLE/UCodes/UCode_CARD.h | 2 +- .../Core/Src/HW/DSPHLE/UCodes/UCode_GBA.cpp | 4 +- .../Core/Src/HW/DSPHLE/UCodes/UCode_GBA.h | 2 +- .../DSPHLE/UCodes/UCode_InitAudioSystem.cpp | 4 +- .../HW/DSPHLE/UCodes/UCode_InitAudioSystem.h | 2 +- .../Core/Src/HW/DSPHLE/UCodes/UCode_ROM.cpp | 10 +++- .../Core/Src/HW/DSPHLE/UCodes/UCode_ROM.h | 4 +- .../Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.cpp | 7 +-- .../Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.h | 2 - .../Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp | 11 +++-- .../Core/Core/Src/HW/DSPHLE/UCodes/UCodes.h | 14 ++++-- 16 files changed, 88 insertions(+), 41 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp b/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp index 069bbedc63..65362a19a0 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp @@ -131,7 +131,51 @@ void DSPHLE::SwapUCode(u32 _crc) void DSPHLE::DoState(PointerWrap &p) { p.Do(m_InitMixer); - GetUCode()->DoState(p); + p.Do(m_DSPControl); + p.Do(m_dspState); + + int ucode_crc = IUCode::GetCRC(m_pUCode); + int ucode_crc_beforeLoad = ucode_crc; + int lastucode_crc = IUCode::GetCRC(m_lastUCode); + int lastucode_crc_beforeLoad = lastucode_crc; + + p.Do(ucode_crc); + p.Do(lastucode_crc); + + // if a different type of ucode was being used when the savestate was created, + // we have to reconstruct the old type of ucode so that we have a valid thing to call DoState on. + IUCode* ucode = (ucode_crc == ucode_crc_beforeLoad) ? m_pUCode : UCodeFactory( ucode_crc, this, m_bWii); + IUCode* lastucode = (lastucode_crc != lastucode_crc_beforeLoad) ? m_lastUCode : UCodeFactory(lastucode_crc, this, m_bWii); + + if (ucode) + ucode->DoState(p); + if (lastucode) + lastucode->DoState(p); + + // if a different type of ucode was being used when the savestate was created, + // discard it if we're not loading, otherwise discard the old one and keep the new one. + if (ucode != m_pUCode) + { + if (p.GetMode() != PointerWrap::MODE_READ) + delete ucode; + else + { + delete m_pUCode; + m_pUCode = ucode; + } + } + if (lastucode != m_lastUCode) + { + if (p.GetMode() != PointerWrap::MODE_READ) + delete lastucode; + else + { + delete m_lastUCode; + m_lastUCode = lastucode; + } + } + + m_MailHandler.DoState(p); } // Mailbox fuctions 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 8c88217494..33f0d2f1e6 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp @@ -28,9 +28,8 @@ #include "UCode_AX_Voice.h" CUCode_AX::CUCode_AX(DSPHLE *dsp_hle, u32 l_CRC) - : IUCode(dsp_hle) + : IUCode(dsp_hle, l_CRC) , m_addressPBs(0xFFFFFFFF) - , _CRC(l_CRC) { // we got loaded m_rMailHandler.PushMail(DSP_INIT); @@ -175,7 +174,7 @@ void CUCode_AX::MixAdd(short* _pBuffer, int _iSize) ProcessUpdates(PB); - if (_CRC != 0x3389a79e) + if (m_CRC != 0x3389a79e) VoiceHacks(PB); MixAddVoice(PB, templbuffer, temprbuffer, _iSize); @@ -463,11 +462,8 @@ void CUCode_AX::DoState(PointerWrap &p) { std::lock_guard lk(m_csMix); - p.Do(_CRC); p.Do(numPBaddr); p.Do(m_addressPBs); p.Do(PBaddr); p.Do(m_UploadSetupInProgress); - - m_rMailHandler.DoState(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 6386e3ce6a..edb52a2801 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h @@ -41,7 +41,6 @@ public: u8 numPBaddr; u32 PBaddr[8]; //2 needed for MP2 u32 m_addressPBs; - u32 _CRC; private: enum 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 41f044f9be..6300b35b4a 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp @@ -28,9 +28,8 @@ CUCode_AXWii::CUCode_AXWii(DSPHLE *dsp_hle, u32 l_CRC) - : IUCode(dsp_hle) + : IUCode(dsp_hle, l_CRC) , m_addressPBs(0xFFFFFFFF) - , _CRC(l_CRC) { // we got loaded m_rMailHandler.PushMail(DSP_INIT); @@ -38,7 +37,7 @@ CUCode_AXWii::CUCode_AXWii(DSPHLE *dsp_hle, u32 l_CRC) templbuffer = new int[1024 * 1024]; temprbuffer = new int[1024 * 1024]; - wiisportsHack = _CRC == 0xfa450138; + wiisportsHack = m_CRC == 0xfa450138; } CUCode_AXWii::~CUCode_AXWii() @@ -260,10 +259,7 @@ void CUCode_AXWii::DoState(PointerWrap &p) { std::lock_guard lk(m_csMix); - p.Do(_CRC); p.Do(m_addressPBs); p.Do(wiisportsHack); p.Do(m_UploadSetupInProgress); - - m_rMailHandler.DoState(p); } diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.cpp index 442d77ab85..dcd4e24e3f 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.cpp @@ -21,8 +21,8 @@ #include "../../DSP.h" -CUCode_CARD::CUCode_CARD(DSPHLE *dsp_hle) - : IUCode(dsp_hle) +CUCode_CARD::CUCode_CARD(DSPHLE *dsp_hle, u32 crc) + : IUCode(dsp_hle, crc) { DEBUG_LOG(DSPHLE, "CUCode_CARD - initialized"); m_rMailHandler.PushMail(DSP_INIT); diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.h index 0246d4680a..a6f90124ad 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.h @@ -23,7 +23,7 @@ class CUCode_CARD : public IUCode { public: - CUCode_CARD(DSPHLE *dsp_hle); + CUCode_CARD(DSPHLE *dsp_hle, u32 crc); virtual ~CUCode_CARD(); void HandleMail(u32 _uMail); diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.cpp index b82c7ac0b2..42bc18ff49 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.cpp @@ -20,8 +20,8 @@ #include "../../DSP.h" -CUCode_GBA::CUCode_GBA(DSPHLE *dsp_hle) -: IUCode(dsp_hle) +CUCode_GBA::CUCode_GBA(DSPHLE *dsp_hle, u32 crc) +: IUCode(dsp_hle, crc) { m_rMailHandler.PushMail(DSP_INIT); } diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.h index 412036835d..c61917339f 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.h @@ -21,7 +21,7 @@ struct CUCode_GBA : public IUCode { - CUCode_GBA(DSPHLE *dsp_hle); + CUCode_GBA(DSPHLE *dsp_hle, u32 crc); virtual ~CUCode_GBA(); void HandleMail(u32 _uMail); diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp index 663d4beadd..ae7716012a 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp @@ -18,8 +18,8 @@ #include "UCodes.h" #include "UCode_InitAudioSystem.h" -CUCode_InitAudioSystem::CUCode_InitAudioSystem(DSPHLE *dsp_hle) - : IUCode(dsp_hle) +CUCode_InitAudioSystem::CUCode_InitAudioSystem(DSPHLE *dsp_hle, u32 crc) + : IUCode(dsp_hle, crc) { DEBUG_LOG(DSPHLE, "CUCode_InitAudioSystem - initialized"); } diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h index 09b54a4a4b..8dc237f1d0 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h @@ -23,7 +23,7 @@ class CUCode_InitAudioSystem : public IUCode { public: - CUCode_InitAudioSystem(DSPHLE *dsp_hle); + CUCode_InitAudioSystem(DSPHLE *dsp_hle, u32 crc); virtual ~CUCode_InitAudioSystem(); void HandleMail(u32 _uMail); diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.cpp index 48dba7e28b..c1544792f5 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.cpp @@ -20,8 +20,8 @@ #include "Hash.h" #include "../../Memmap.h" -CUCode_Rom::CUCode_Rom(DSPHLE *dsp_hle) - : IUCode(dsp_hle) +CUCode_Rom::CUCode_Rom(DSPHLE *dsp_hle, u32 crc) + : IUCode(dsp_hle, crc) , m_CurrentUCode() , m_BootTask_numSteps(0) , m_NextParameter(0) @@ -117,4 +117,10 @@ void CUCode_Rom::BootUCode() m_DSPHLE->SetUCode(ector_crc); } +void CUCode_Rom::DoState(PointerWrap &p) +{ + p.Do(m_CurrentUCode); + p.Do(m_BootTask_numSteps); + p.Do(m_NextParameter); +} diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.h index ecec9f87ea..f1e7b8ec7a 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.h @@ -23,12 +23,14 @@ class CUCode_Rom : public IUCode { public: - CUCode_Rom(DSPHLE *dsp_hle); + CUCode_Rom(DSPHLE *dsp_hle, u32 _crc); virtual ~CUCode_Rom(); void HandleMail(u32 _uMail); void Update(int cycles); + void DoState(PointerWrap &p); + private: struct SUCode { diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.cpp index 913de7107b..713236180d 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.cpp @@ -31,8 +31,7 @@ CUCode_Zelda::CUCode_Zelda(DSPHLE *dsp_hle, u32 _CRC) : - IUCode(dsp_hle), - m_CRC(_CRC), + IUCode(dsp_hle, _CRC), m_bSyncInProgress(false), m_MaxVoice(0), @@ -572,8 +571,6 @@ void CUCode_Zelda::DoState(PointerWrap &p) // It's bad if we try to save during Mix() std::lock_guard lk(m_csMix); - p.Do(m_CRC); - p.Do(m_AFCCoefTable); p.Do(m_MiscTable); @@ -616,6 +613,4 @@ void CUCode_Zelda::DoState(PointerWrap &p) p.Do(m_PBAddress2); p.Do(m_UploadSetupInProgress); - - m_rMailHandler.DoState(p); } diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.h index 3abe711c5b..f8a69536c2 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.h @@ -212,8 +212,6 @@ private: } } - u32 m_CRC; - // These are the only dynamically allocated things allowed in the ucode. s32* m_VoiceBuffer; s16* m_ResampleBuffer; diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp index c982b97f51..62620253aa 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp @@ -32,19 +32,19 @@ IUCode* UCodeFactory(u32 _CRC, DSPHLE *dsp_hle, bool bWii) { case UCODE_ROM: INFO_LOG(DSPHLE, "Switching to ROM ucode"); - return new CUCode_Rom(dsp_hle); + return new CUCode_Rom(dsp_hle, _CRC); case UCODE_INIT_AUDIO_SYSTEM: INFO_LOG(DSPHLE, "Switching to INIT ucode"); - return new CUCode_InitAudioSystem(dsp_hle); + return new CUCode_InitAudioSystem(dsp_hle, _CRC); case 0x65d6cc6f: // CARD INFO_LOG(DSPHLE, "Switching to CARD ucode"); - return new CUCode_CARD(dsp_hle); + return new CUCode_CARD(dsp_hle, _CRC); case 0xdd7e72d5: INFO_LOG(DSPHLE, "Switching to GBA ucode"); - return new CUCode_GBA(dsp_hle); + return new CUCode_GBA(dsp_hle, _CRC); case 0x3ad3b7ac: // Naruto3, Paper Mario - The Thousand Year Door case 0x3daf59b9: // Alien Hominid @@ -103,6 +103,9 @@ IUCode* UCodeFactory(u32 _CRC, DSPHLE *dsp_hle, bool bWii) PanicAlert("DSPHLE: Unknown ucode (CRC = %08x) - forcing AX.\n\nTry LLE emulator if this is homebrew.", _CRC); return new CUCode_AX(dsp_hle, _CRC); } + + case UCODE_NULL: + break; } return NULL; diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.h index cb3bc6a4f0..faea895609 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.h @@ -25,8 +25,9 @@ #include "../DSPHLE.h" #include "../../Memmap.h" -#define UCODE_ROM 0x0000000 -#define UCODE_INIT_AUDIO_SYSTEM 0x0000001 +#define UCODE_ROM 0x00000000 +#define UCODE_INIT_AUDIO_SYSTEM 0x00000001 +#define UCODE_NULL 0xFFFFFFFF class CMailHandler; @@ -73,10 +74,11 @@ inline void* HLEMemory_Get_Pointer(u32 _uAddress) class IUCode { public: - IUCode(DSPHLE *dsphle) + IUCode(DSPHLE *dsphle, u32 _crc) : m_rMailHandler(dsphle->AccessMailHandler()) , m_UploadSetupInProgress(false) , m_DSPHLE(dsphle) + , m_CRC(_crc) , m_NextUCode() , m_NextUCode_steps(0) , m_NeedsResumeMail(false) @@ -93,6 +95,8 @@ public: virtual void DoState(PointerWrap &p) {} + static u32 GetCRC(IUCode* pUCode) { return pUCode ? pUCode->m_CRC : UCODE_NULL; } + protected: void PrepareBootUCode(u32 mail); @@ -121,6 +125,10 @@ protected: // Need a pointer back to DSPHLE to switch ucodes. DSPHLE *m_DSPHLE; + // used for reconstruction when loading saves, + // and for variations within certain ucodes. + u32 m_CRC; + private: struct SUCode { From c6ea5f31f5245e9a44c2be110922079bcad6b9d5 Mon Sep 17 00:00:00 2001 From: nitsuja Date: Sat, 17 Dec 2011 17:26:38 -0800 Subject: [PATCH 177/381] remove some suspect code in PowerPC::DoState which I think has already been supplanted by more correct code in CoreTiming::DoState --- Source/Core/Core/Src/PowerPC/PowerPC.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/PowerPC.cpp b/Source/Core/Core/Src/PowerPC/PowerPC.cpp index bd24d2d87d..a247ec5035 100644 --- a/Source/Core/Core/Src/PowerPC/PowerPC.cpp +++ b/Source/Core/Core/Src/PowerPC/PowerPC.cpp @@ -75,13 +75,17 @@ void ExpandCR() void DoState(PointerWrap &p) { - rSPR(SPR_DEC) = SystemTimers::GetFakeDecrementer(); - *((u64 *)&TL) = SystemTimers::GetFakeTimeBase(); //works since we are little endian and TL comes first :) + // some of this code has been disabled, because + // it changes registers even in MODE_MEASURE (which is suspicious and seems like it could cause desyncs) + // and because the values it's changing have been added to CoreTiming::DoState, so it might conflict to mess with them here. + +// rSPR(SPR_DEC) = SystemTimers::GetFakeDecrementer(); +// *((u64 *)&TL) = SystemTimers::GetFakeTimeBase(); //works since we are little endian and TL comes first :) p.Do(ppcState); - SystemTimers::DecrementerSet(); - SystemTimers::TimeBaseSet(); +// SystemTimers::DecrementerSet(); +// SystemTimers::TimeBaseSet(); if (jit && p.GetMode() == PointerWrap::MODE_READ) jit->GetBlockCache()->ClearSafe(); From e5286e04064d8a0e691a8eee813b615d2188c563 Mon Sep 17 00:00:00 2001 From: nitsuja Date: Sat, 17 Dec 2011 23:27:11 -0800 Subject: [PATCH 178/381] improve the movie savestate load verification a bit more --- Source/Core/Core/Src/Movie.cpp | 104 ++++++++++++++++++++++++--------- 1 file changed, 75 insertions(+), 29 deletions(-) diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 5438f1e5eb..07564c69a8 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -588,51 +588,88 @@ void LoadInput(const char *filename) } if (!g_bReadOnly) + { tmpHeader.numRerecords++; - - t_record.Seek(0, SEEK_SET); - t_record.WriteArray(&tmpHeader, 1); + t_record.Seek(0, SEEK_SET); + t_record.WriteArray(&tmpHeader, 1); + } g_numPads = tmpHeader.numControllers; ChangePads(true); if (Core::g_CoreStartupParameter.bWii) ChangeWiiPads(true); - if (!g_bReadOnly) + u64 totalSavedBytes = t_record.GetSize() - 256; + + bool afterEnd = false; + if (g_currentByte > totalSavedBytes) + { + //PanicAlertT("Warning: You loaded a save whose movie ends before the current frame in the save (byte %u < %u) (frame %u < %u). You should load another save before continuing.", (u32)totalSavedBytes+256, (u32)g_currentByte+256, (u32)tmpHeader.frameCount, (u32)g_currentFrame); + afterEnd = true; + } + + if (!g_bReadOnly || tmpInput == NULL) { g_totalFrames = tmpHeader.frameCount; g_totalLagCount = tmpHeader.lagCount; g_totalInputCount = tmpHeader.inputCount; - g_totalBytes = t_record.GetSize() - 256; + g_totalBytes = totalSavedBytes; delete tmpInput; tmpInput = new u8[MAX_DTM_LENGTH]; t_record.ReadArray(tmpInput, (size_t)g_totalBytes); } else if (g_currentByte > 0) { - // verify identical up to g_currentByte - if (g_currentByte > g_totalBytes) + if (g_currentByte > totalSavedBytes) { - PanicAlertT("Warning: You loaded a save whose movie ends before the current frame (%u < %u). You should load another save before continuing, or load this state with read-only mode off.", (u32)g_totalFrames, (u32)g_currentFrame); } - else if(g_currentByte > 0) + else if (g_currentByte > g_totalBytes) { + PanicAlertT("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.", (u32)g_currentByte+256, (u32)g_totalBytes+256, (u32)g_currentFrame, (u32)g_totalFrames); + } + else if(g_currentByte > 0 && g_totalBytes > 0) + { + // verify identical from movie start to thee save's current frame u32 len = (u32)g_currentByte; - u8* tmpTmpInput = new u8[len]; - t_record.ReadArray(tmpTmpInput, (size_t)len); + u8* movInput = new u8[len]; + t_record.ReadArray(movInput, (size_t)len); for (u32 i = 0; i < len; ++i) { - if (tmpTmpInput[i] != tmpInput[i]) + if (movInput[i] != tmpInput[i]) { + // 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) - 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, i); + { + // 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); + } else - PanicAlertT("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.", i/8); + { + int frame = i/8; + ControllerState curPadState; + memcpy(&curPadState, &(tmpInput[frame*8]), 8); + ControllerState movPadState; + memcpy(&movPadState, &(movInput[frame*8]), 8); + PanicAlertT("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\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\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", + (int)frame, + (int)g_totalFrames, (int)tmpHeader.frameCount, + (int)frame, + (int)curPadState.Start, (int)curPadState.A, (int)curPadState.B, (int)curPadState.X, (int)curPadState.Y, (int)curPadState.Z, (int)curPadState.DPadUp, (int)curPadState.DPadDown, (int)curPadState.DPadLeft, (int)curPadState.DPadRight, (int)curPadState.L, (int)curPadState.R, (int)curPadState.TriggerL, (int)curPadState.TriggerR, (int)curPadState.AnalogStickX, (int)curPadState.AnalogStickY, (int)curPadState.CStickX, (int)curPadState.CStickY, + (int)frame, + (int)movPadState.Start, (int)movPadState.A, (int)movPadState.B, (int)movPadState.X, (int)movPadState.Y, (int)movPadState.Z, (int)movPadState.DPadUp, (int)movPadState.DPadDown, (int)movPadState.DPadLeft, (int)movPadState.DPadRight, (int)movPadState.L, (int)movPadState.R, (int)movPadState.TriggerL, (int)movPadState.TriggerR, (int)movPadState.AnalogStickX, (int)movPadState.AnalogStickY, (int)movPadState.CStickX, (int)movPadState.CStickY); + } break; } } - delete tmpTmpInput; + delete movInput; } } t_record.Close(); @@ -653,21 +690,28 @@ void LoadInput(const char *filename) g_currentInputCount = tmpHeader.inputCount; } - if (g_bReadOnly) + if (!afterEnd) { - if(g_playMode != MODE_PLAYING) + if (g_bReadOnly) { - g_playMode = MODE_PLAYING; - Core::DisplayMessage("Switched to playback", 2000); + if(g_playMode != MODE_PLAYING) + { + g_playMode = MODE_PLAYING; + Core::DisplayMessage("Switched to playback", 2000); + } + } + else + { + if(g_playMode != MODE_RECORDING) + { + g_playMode = MODE_RECORDING; + Core::DisplayMessage("Switched to recording", 2000); + } } } else { - if(g_playMode != MODE_RECORDING) - { - g_playMode = MODE_RECORDING; - Core::DisplayMessage("Switched to recording", 2000); - } + EndPlayInput(false); } } @@ -803,16 +847,18 @@ void EndPlayInput(bool cont) if (cont) { g_playMode = MODE_RECORDING; - Core::DisplayMessage("Resuming movie recording", 2000); + Core::DisplayMessage("Reached movie end. Resuming recording.", 2000); } else if(g_playMode != MODE_NONE) { g_numPads = g_rerecords = 0; - g_totalFrames = g_totalBytes = g_currentByte = 0; + g_currentByte = 0; g_playMode = MODE_NONE; - delete tmpInput; - tmpInput = NULL; - Core::DisplayMessage("Movie End", 2000); + Core::DisplayMessage("Movie End.", 2000); + // 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; } } From cfad00d6e03941283d34dd8ec4731ed6c9daebe3 Mon Sep 17 00:00:00 2001 From: nitsuja Date: Sat, 17 Dec 2011 22:33:50 -0800 Subject: [PATCH 179/381] added missing ExpansionInterface data to savestates, and related fixes (for savestate robustness) --- Source/Core/Core/Src/HW/EXI.cpp | 14 ++-- Source/Core/Core/Src/HW/EXI.h | 1 + Source/Core/Core/Src/HW/EXI_Channel.cpp | 69 +++++++++++++++++-- Source/Core/Core/Src/HW/EXI_Channel.h | 3 + Source/Core/Core/Src/HW/EXI_Device.cpp | 25 ++++--- Source/Core/Core/Src/HW/EXI_Device.h | 32 +++++---- Source/Core/Core/Src/HW/EXI_DeviceAD16.cpp | 7 ++ Source/Core/Core/Src/HW/EXI_DeviceAD16.h | 1 + .../Core/Src/HW/EXI_DeviceAMBaseboard.cpp | 7 ++ .../Core/Core/Src/HW/EXI_DeviceAMBaseboard.h | 1 + .../Core/Core/Src/HW/EXI_DeviceEthernet.cpp | 22 ++++++ Source/Core/Core/Src/HW/EXI_DeviceEthernet.h | 1 + Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp | 8 ++- .../Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp | 46 +++++++++++-- .../Core/Core/Src/HW/EXI_DeviceMemoryCard.h | 2 +- Source/Core/Core/Src/HW/HW.cpp | 5 ++ Source/Core/Core/Src/HW/HW.h | 1 + Source/Core/Core/Src/State.cpp | 2 + 18 files changed, 202 insertions(+), 45 deletions(-) diff --git a/Source/Core/Core/Src/HW/EXI.cpp b/Source/Core/Core/Src/HW/EXI.cpp index 109e955e8c..bfc5c28819 100644 --- a/Source/Core/Core/Src/HW/EXI.cpp +++ b/Source/Core/Core/Src/HW/EXI.cpp @@ -64,12 +64,14 @@ void Shutdown() void DoState(PointerWrap &p) { - // TODO: Complete DoState for each IEXIDevice - g_Channels[0]->GetDevice(1)->DoState(p); - g_Channels[0]->GetDevice(2)->DoState(p); - g_Channels[0]->GetDevice(4)->DoState(p); - g_Channels[1]->GetDevice(1)->DoState(p); - g_Channels[2]->GetDevice(1)->DoState(p); + for (int c = 0; c < NUM_CHANNELS; ++c) + g_Channels[c]->DoState(p); +} + +void OnAfterLoad() +{ + for (int c = 0; c < NUM_CHANNELS; ++c) + g_Channels[c]->OnAfterLoad(); } void ChangeDeviceCallback(u64 userdata, int cyclesLate) diff --git a/Source/Core/Core/Src/HW/EXI.h b/Source/Core/Core/Src/HW/EXI.h index fbd5b2e788..1b913b7da1 100644 --- a/Source/Core/Core/Src/HW/EXI.h +++ b/Source/Core/Core/Src/HW/EXI.h @@ -28,6 +28,7 @@ namespace ExpansionInterface void Init(); void Shutdown(); void DoState(PointerWrap &p); +void OnAfterLoad(); void Update(); void UpdateInterrupts(); diff --git a/Source/Core/Core/Src/HW/EXI_Channel.cpp b/Source/Core/Core/Src/HW/EXI_Channel.cpp index cb729d21ff..c29a6f2bb2 100644 --- a/Source/Core/Core/Src/HW/EXI_Channel.cpp +++ b/Source/Core/Core/Src/HW/EXI_Channel.cpp @@ -18,6 +18,8 @@ #include "EXI_Channel.h" #include "EXI_Device.h" #include "EXI.h" +#include "../ConfigManager.h" +#include "../Movie.h" #define EXI_READ 0 #define EXI_WRITE 1 @@ -60,6 +62,12 @@ void CEXIChannel::RemoveDevices() } void CEXIChannel::AddDevice(const TEXIDevices device_type, const int device_num) +{ + IEXIDevice* pNewDevice = EXIDevice_Create(device_type, m_ChannelId); + AddDevice(pNewDevice, device_num); +} + +void CEXIChannel::AddDevice(IEXIDevice* pDevice, const int device_num, bool notifyPresenceChanged) { _dbg_assert_(EXPANSIONINTERFACE, device_num < NUM_DEVICES); @@ -70,15 +78,18 @@ void CEXIChannel::AddDevice(const TEXIDevices device_type, const int device_num) m_pDevices[device_num] = NULL; } - // create the new one - m_pDevices[device_num] = EXIDevice_Create(device_type, m_ChannelId); + // replace it with the new one + m_pDevices[device_num] = pDevice; - // This means "device presence changed", software has to check - // m_Status.EXT to see if it is now present or not - if (m_ChannelId != 2) + if(notifyPresenceChanged) { - m_Status.EXTINT = 1; - UpdateInterrupts(); + // This means "device presence changed", software has to check + // m_Status.EXT to see if it is now present or not + if (m_ChannelId != 2) + { + m_Status.EXTINT = 1; + UpdateInterrupts(); + } } } @@ -264,3 +275,47 @@ void CEXIChannel::Write32(const u32 _iValue, const u32 _iRegister) break; } } + +void CEXIChannel::DoState(PointerWrap &p) +{ + p.Do(m_Status); + p.Do(m_DMAMemoryAddress); + p.Do(m_DMALength); + p.Do(m_Control); + p.Do(m_ImmData); + + bool reloadOnState = SConfig::GetInstance().b_reloadMCOnState; + + for (int d = 0; d < NUM_DEVICES; ++d) + { + IEXIDevice* pDevice = m_pDevices[d]; + TEXIDevices type = pDevice->m_deviceType; + p.Do(type); + IEXIDevice* pSaveDevice = (type == pDevice->m_deviceType) ? pDevice : EXIDevice_Create(type, m_ChannelId); + pSaveDevice->DoState(p); + if(pSaveDevice != pDevice) + { + // if we had to create a temporary device, discard it if we're not loading. + // also, if no movie is active, we'll assume the user wants to keep their current devices + // instead of the ones they had when the savestate was created, + // unless the device is NONE (since ChangeDevice sets that temporarily). + if(p.GetMode() != PointerWrap::MODE_READ || + (pDevice->m_deviceType != EXIDEVICE_NONE && + reloadOnState && !Movie::IsRecordingInput() && !Movie::IsPlayingInput())) + { + delete pSaveDevice; + } + else + { + AddDevice(pSaveDevice, d, false); + } + } + } +} + +void CEXIChannel::OnAfterLoad() +{ + for (int d = 0; d < NUM_DEVICES; ++d) + m_pDevices[d]->OnAfterLoad(); +} + diff --git a/Source/Core/Core/Src/HW/EXI_Channel.h b/Source/Core/Core/Src/HW/EXI_Channel.h index 8109de6fc1..21925f52e5 100644 --- a/Source/Core/Core/Src/HW/EXI_Channel.h +++ b/Source/Core/Core/Src/HW/EXI_Channel.h @@ -118,6 +118,7 @@ public: ~CEXIChannel(); void AddDevice(const TEXIDevices device_type, const int device_num); + void AddDevice(IEXIDevice* pDevice, const int device_num, bool notifyPresenceChanged=true); // Remove all devices void RemoveDevices(); @@ -128,6 +129,8 @@ public: void Update(); bool IsCausingInterrupt(); void UpdateInterrupts(); + void DoState(PointerWrap &p); + void OnAfterLoad(); // This should only be used to transition interrupts from SP1 to Channel 2 void SetEXIINT(bool exiint) { m_Status.EXIINT = !!exiint; } diff --git a/Source/Core/Core/Src/HW/EXI_Device.cpp b/Source/Core/Core/Src/HW/EXI_Device.cpp index aa24148f59..9c40a8f4d1 100644 --- a/Source/Core/Core/Src/HW/EXI_Device.cpp +++ b/Source/Core/Core/Src/HW/EXI_Device.cpp @@ -104,43 +104,50 @@ public: // F A C T O R Y IEXIDevice* EXIDevice_Create(TEXIDevices device_type, const int channel_num) { + IEXIDevice* result = NULL; + switch (device_type) { case EXIDEVICE_DUMMY: - return new CEXIDummy("Dummy"); + result = new CEXIDummy("Dummy"); break; case EXIDEVICE_MEMORYCARD: - return new CEXIMemoryCard(channel_num); + result = new CEXIMemoryCard(channel_num); break; case EXIDEVICE_MASKROM: - return new CEXIIPL(); + result = new CEXIIPL(); break; case EXIDEVICE_AD16: - return new CEXIAD16(); + result = new CEXIAD16(); break; case EXIDEVICE_MIC: - return new CEXIMic(channel_num); + result = new CEXIMic(channel_num); break; case EXIDEVICE_ETH: - return new CEXIETHERNET(SConfig::GetInstance().m_bba_mac); + result = new CEXIETHERNET(SConfig::GetInstance().m_bba_mac); break; case EXIDEVICE_AM_BASEBOARD: - return new CEXIAMBaseboard(); + result = new CEXIAMBaseboard(); break; case EXIDEVICE_GECKO: - return new CEXIGecko(); + result = new CEXIGecko(); break; case EXIDEVICE_NONE: default: - return new IEXIDevice(); + result = new IEXIDevice(); break; } + + if (result != NULL) + result->m_deviceType = device_type; + + return result; } diff --git a/Source/Core/Core/Src/HW/EXI_Device.h b/Source/Core/Core/Src/HW/EXI_Device.h index 15cd79d77c..8cb2f99a64 100644 --- a/Source/Core/Core/Src/HW/EXI_Device.h +++ b/Source/Core/Core/Src/HW/EXI_Device.h @@ -21,6 +21,19 @@ #include "Common.h" #include "ChunkFile.h" +enum TEXIDevices +{ + EXIDEVICE_DUMMY, + EXIDEVICE_MEMORYCARD, + EXIDEVICE_MASKROM, + EXIDEVICE_AD16, + EXIDEVICE_MIC, + EXIDEVICE_ETH, + EXIDEVICE_AM_BASEBOARD, + EXIDEVICE_GECKO, + EXIDEVICE_NONE = (u8)-1 +}; + class IEXIDevice { private: @@ -40,27 +53,18 @@ public: virtual bool IsPresent() {return false;} virtual void SetCS(int) {} virtual void DoState(PointerWrap&) {} + virtual void OnAfterLoad() {} // Update virtual void Update() {} // Is generating interrupt ? virtual bool IsInterruptSet() {return false;} - virtual ~IEXIDevice() {}; + virtual ~IEXIDevice() {} -}; - -enum TEXIDevices -{ - EXIDEVICE_DUMMY, - EXIDEVICE_MEMORYCARD, - EXIDEVICE_MASKROM, - EXIDEVICE_AD16, - EXIDEVICE_MIC, - EXIDEVICE_ETH, - EXIDEVICE_AM_BASEBOARD, - EXIDEVICE_GECKO, - EXIDEVICE_NONE = (u8)-1 + // for savestates. storing it here seemed cleaner than requiring each implementation to report its type. + // I know this class is set up like an interface, but no code requires it to be strictly such. + TEXIDevices m_deviceType; }; extern IEXIDevice* EXIDevice_Create(const TEXIDevices device_type, const int channel_num); diff --git a/Source/Core/Core/Src/HW/EXI_DeviceAD16.cpp b/Source/Core/Core/Src/HW/EXI_DeviceAD16.cpp index 3b1b234d41..f65749865b 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceAD16.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceAD16.cpp @@ -90,3 +90,10 @@ void CEXIAD16::TransferByte(u8& _byte) m_uPosition++; } + +void CEXIAD16::DoState(PointerWrap &p) +{ + p.Do(m_uPosition); + p.Do(m_uCommand); + p.Do(m_uAD16Register); +} diff --git a/Source/Core/Core/Src/HW/EXI_DeviceAD16.h b/Source/Core/Core/Src/HW/EXI_DeviceAD16.h index 094b26974a..62b7da0592 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceAD16.h +++ b/Source/Core/Core/Src/HW/EXI_DeviceAD16.h @@ -24,6 +24,7 @@ public: CEXIAD16(); virtual void SetCS(int _iCS); virtual bool IsPresent(); + virtual void DoState(PointerWrap &p); private: enum diff --git a/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.cpp b/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.cpp index a1b8be2eee..762c87a7d4 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.cpp @@ -128,3 +128,10 @@ bool CEXIAMBaseboard::IsInterruptSet() ERROR_LOG(SP1, "AM-BB IRQ"); return m_have_irq; } + +void CEXIAMBaseboard::DoState(PointerWrap &p) +{ + p.Do(m_position); + p.Do(m_have_irq); + p.Do(m_command); +} diff --git a/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.h b/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.h index 091b478688..92a2ac4a8f 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.h +++ b/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.h @@ -26,6 +26,7 @@ public: virtual void SetCS(int _iCS); virtual bool IsPresent(); virtual bool IsInterruptSet(); + virtual void DoState(PointerWrap &p); private: virtual void TransferByte(u8& _uByte); diff --git a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp index 72a84d12b2..6572233b20 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp @@ -415,4 +415,26 @@ void CEXIETHERNET::DMARead(u32 addr, u32 size) ERROR_LOG(SP1, "Unhandled BBA DMA read: %i, %08x", size, addr); } + +void CEXIETHERNET::DoState(PointerWrap &p) +{ + p.Do(m_uPosition); + p.Do(m_uCommand); + p.Do(m_bInterruptSet); + p.Do(mWriteP); + p.Do(mReadP); + p.Do(mExpectSpecialImmRead); + p.Do(mSpecialImmData); + p.Do(Activated); + p.Do(mRBRPP); + p.Do(mRBEmpty); + p.Do(mBbaMem); + p.Do(mExpectVariableLengthImmWrite); + p.Do(mReadyToSend); + p.Do(RegisterBlock); + // TODO? + //mWriteBuffer.DoState(p); + //mCbw.DoState(p); +} + //#pragma optimize("",on) diff --git a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h index ad70f9462b..3fa3a42d34 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h +++ b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h @@ -246,6 +246,7 @@ public: u32 ImmRead(u32 size); void DMAWrite(u32 addr, u32 size); void DMARead(u32 addr, u32 size); + void DoState(PointerWrap &p); //private: // STATE_TO_SAVE diff --git a/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp b/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp index 620b7e79b8..85bfd2428e 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp @@ -152,7 +152,13 @@ CEXIIPL::~CEXIIPL() } void CEXIIPL::DoState(PointerWrap &p) { - p.DoArray(m_RTC, 4); + p.Do(m_RTC); + p.Do(m_uPosition); + p.Do(m_uAddress); + p.Do(m_uRWOffset); + p.Do(m_szBuffer); + p.Do(m_count); + p.Do(m_FontsLoaded); } void CEXIIPL::LoadFileToIPL(std::string filename, u32 offset) diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp index a1b2301caf..88116e9c7c 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp @@ -22,6 +22,7 @@ #include "../CoreTiming.h" #include "../ConfigManager.h" +#include "../Movie.h" #include "EXI.h" #include "EXI_Device.h" #include "EXI_DeviceMemoryCard.h" @@ -37,11 +38,10 @@ #define SIZE_TO_Mb (1024 * 8 * 16) #define MC_HDR_SIZE 0xA000 -static CEXIMemoryCard *cards[2]; - void CEXIMemoryCard::FlushCallback(u64 userdata, int cyclesLate) { - CEXIMemoryCard *ptr = cards[userdata]; + // casting userdata seems less error-prone than indexing a static (creation order issues, etc.) + CEXIMemoryCard *ptr = (CEXIMemoryCard*)userdata; ptr->Flush(); } @@ -50,7 +50,7 @@ CEXIMemoryCard::CEXIMemoryCard(const int index) , m_bDirty(false) { m_strFilename = (card_index == 0) ? SConfig::GetInstance().m_strMemoryCardA : SConfig::GetInstance().m_strMemoryCardB; - cards[card_index] = this; + // 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); reloadOnState = SConfig::GetInstance().b_reloadMCOnState; @@ -158,6 +158,7 @@ void CEXIMemoryCard::Flush(bool exiting) CEXIMemoryCard::~CEXIMemoryCard() { + CoreTiming::RemoveEvent(et_this_card); Flush(true); delete[] memory_card_content; memory_card_content = NULL; @@ -237,7 +238,7 @@ void CEXIMemoryCard::SetCS(int cs) // Page written to memory card, not just to buffer - let's schedule a flush 0.5b cycles into the future (1 sec) // But first we unschedule already scheduled flushes - no point in flushing once per page for a large write. CoreTiming::RemoveEvent(et_this_card); - CoreTiming::ScheduleEvent(500000000, et_this_card, card_index); + CoreTiming::ScheduleEvent(500000000, et_this_card, (u64)this); break; } } @@ -423,10 +424,41 @@ void CEXIMemoryCard::TransferByte(u8 &byte) DEBUG_LOG(EXPANSIONINTERFACE, "EXI MEMCARD: < %02x", byte); } -void CEXIMemoryCard::DoState(PointerWrap &p) +void CEXIMemoryCard::OnAfterLoad() { - if (reloadOnState) + // hack for memory card switching, so you can load an old savestate and expect your newer memcard data to show up. + // it breaks movie sync, so we disable it if a movie is active. + // this was moved out of DoState because other things that got loaded later conflicted with it. + // note: the reloadOnState flag is almost always true. maybe only a few TASers have it off. + if (reloadOnState && !Movie::IsRecordingInput() && !Movie::IsPlayingInput()) { ExpansionInterface::ChangeDevice(card_index, EXIDEVICE_MEMORYCARD, 0); } } + +void CEXIMemoryCard::DoState(PointerWrap &p) +{ + // for movie sync, we need to save/load memory card contents (and other data) in savestates. + // otherwise, we'll assume the user wants to keep their memcards and saves separate, + // unless we're loading (in which case we let the savestate contents decide, in order to stay aligned with them). + bool storeContents = (!reloadOnState || Movie::IsRecordingInput() || Movie::IsPlayingInput()); + p.Do(storeContents); + + if (storeContents) + { + p.Do(interruptSwitch); + p.Do(m_bInterruptSet); + p.Do(command); + p.Do(status); + p.Do(m_uPosition); + p.Do(programming_buffer); + p.Do(formatDelay); + p.Do(m_bDirty); + p.Do(address); + + p.Do(nintendo_card_id); + p.Do(card_id); + p.Do(memory_card_size); + p.DoArray(memory_card_content, memory_card_size); + } +} diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h index e61a3d99a7..ac2cdd69f8 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h +++ b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h @@ -39,6 +39,7 @@ public: bool IsInterruptSet(); bool IsPresent(); void DoState(PointerWrap &p); + void OnAfterLoad(); private: // This is scheduled whenever a page write is issued. The this pointer is passed @@ -82,7 +83,6 @@ private: u8 programming_buffer[128]; u32 formatDelay; bool m_bDirty; - //! memory card parameters unsigned int nintendo_card_id, card_id; unsigned int address; diff --git a/Source/Core/Core/Src/HW/HW.cpp b/Source/Core/Core/Src/HW/HW.cpp index a078955815..ad5ecc404a 100644 --- a/Source/Core/Core/Src/HW/HW.cpp +++ b/Source/Core/Core/Src/HW/HW.cpp @@ -115,4 +115,9 @@ namespace HW } p.DoMarker("WIIHW"); } + + void OnAfterLoad() + { + ExpansionInterface::OnAfterLoad(); + } } diff --git a/Source/Core/Core/Src/HW/HW.h b/Source/Core/Core/Src/HW/HW.h index cd3375d3ac..3c4478ac2b 100644 --- a/Source/Core/Core/Src/HW/HW.h +++ b/Source/Core/Core/Src/HW/HW.h @@ -26,6 +26,7 @@ namespace HW void Init(); void Shutdown(); void DoState(PointerWrap &p); + void OnAfterLoad(); } #endif diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp index e8dcddcb62..2643530264 100644 --- a/Source/Core/Core/Src/State.cpp +++ b/Source/Core/Core/Src/State.cpp @@ -402,6 +402,8 @@ void LoadFileStateCallback(u64 userdata, int cyclesLate) ResetCounters(); + HW::OnAfterLoad(); + g_op_in_progress = false; g_loadDepth--; From c88e4a097e460e0ad99cec476a0852ed0045246c Mon Sep 17 00:00:00 2001 From: nitsuja Date: Sun, 18 Dec 2011 01:15:59 -0800 Subject: [PATCH 180/381] update ui after savestate load (because loading a savestate can affect whether certain items should be grayed out in the menu) --- Source/Core/Core/Src/State.cpp | 10 ++++++++++ Source/Core/Core/Src/State.h | 4 ++++ Source/Core/DolphinWX/Src/Frame.cpp | 8 ++++++++ Source/Core/DolphinWX/Src/Frame.h | 2 ++ 4 files changed, 24 insertions(+) diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp index 2643530264..8ba238f2d7 100644 --- a/Source/Core/Core/Src/State.cpp +++ b/Source/Core/Core/Src/State.cpp @@ -61,6 +61,8 @@ static int ev_FileSave, ev_BufferSave, ev_FileLoad, ev_BufferLoad, ev_FileVerify static std::string g_current_filename, g_last_filename; +static CallbackFunc g_onAfterLoadCb = NULL; + // Temporary undo state buffer static std::vector g_undo_load_buffer; static std::vector g_current_buffer; @@ -406,12 +408,20 @@ void LoadFileStateCallback(u64 userdata, int cyclesLate) g_op_in_progress = false; + if (g_onAfterLoadCb) + g_onAfterLoadCb(); + g_loadDepth--; // resume dat core CCPU::EnableStepping(false); } +void SetOnAfterLoadCallback(CallbackFunc callback) +{ + g_onAfterLoadCb = callback; +} + void VerifyFileStateCallback(u64 userdata, int cyclesLate) { Flush(); diff --git a/Source/Core/Core/Src/State.h b/Source/Core/Core/Src/State.h index 111c4e24f0..2c3a38cd8c 100644 --- a/Source/Core/Core/Src/State.h +++ b/Source/Core/Core/Src/State.h @@ -56,6 +56,10 @@ void UndoLoadState(); void Flush(); // wait until previously scheduled savestate event (if any) is done +// for calling back into UI code without introducing a dependency on it in core +typedef void(*CallbackFunc)(void); +void SetOnAfterLoadCallback(CallbackFunc callback); + } #endif diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 4dc7928375..846971e884 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -410,6 +410,8 @@ CFrame::CFrame(wxFrame* parent, g_TASInputDlg = new TASInputDlg(this); Movie::SetInputManip(TASManipFunction); + State::SetOnAfterLoadCallback(OnAfterLoadCallback); + // Setup perspectives if (g_pCodeWindow) { @@ -859,6 +861,12 @@ int GetCmdForHotkey(unsigned int key) return -1; } +void OnAfterLoadCallback() +{ + if(main_frame) + main_frame->UpdateGUI(); +} + void TASManipFunction(SPADStatus *PadStatus, int controllerID) { if (main_frame) diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h index 526e52f3c9..770d459220 100644 --- a/Source/Core/DolphinWX/Src/Frame.h +++ b/Source/Core/DolphinWX/Src/Frame.h @@ -361,6 +361,8 @@ private: int GetCmdForHotkey(unsigned int key); +void OnAfterLoadCallback(); + // For TASInputDlg void TASManipFunction(SPADStatus *PadStatus, int controllerID); From d44fc0c82002e932932a931189eb5dfa6d14a9cd Mon Sep 17 00:00:00 2001 From: nitsuja Date: Sun, 18 Dec 2011 02:23:59 -0800 Subject: [PATCH 181/381] small fixes for some recording-related menu items --- Source/Core/DolphinWX/Src/FrameTools.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index eddaae4748..59a9687dde 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -756,6 +756,13 @@ void CFrame::OnPlayRecording(wxCommandEvent& WXUNUSED (event)) if(path.IsEmpty()) return; + if (!Movie::IsReadOnly()) + { + // let's make the read-only flag consistent at the start of a movie. + Movie::SetReadOnly(true); + GetMenuBar()->FindItem(IDM_RECORDREADONLY)->Check(true); + } + if(Movie::PlayInput(path.mb_str())) BootGame(std::string("")); } @@ -1570,7 +1577,7 @@ void CFrame::UpdateGUI() GetMenuBar()->FindItem(IDM_RESET)->Enable(Running || Paused); GetMenuBar()->FindItem(IDM_RECORD)->Enable(!Movie::IsRecordingInput()); GetMenuBar()->FindItem(IDM_PLAYRECORD)->Enable(!Initialized); - GetMenuBar()->FindItem(IDM_RECORDEXPORT)->Enable(Movie::IsRecordingInput()); + GetMenuBar()->FindItem(IDM_RECORDEXPORT)->Enable(Movie::IsPlayingInput() || Movie::IsRecordingInput()); GetMenuBar()->FindItem(IDM_FRAMESTEP)->Enable(Running || Paused); GetMenuBar()->FindItem(IDM_SCREENSHOT)->Enable(Running || Paused); GetMenuBar()->FindItem(IDM_TOGGLE_FULLSCREEN)->Enable(Running || Paused); @@ -1624,6 +1631,8 @@ void CFrame::UpdateGUI() m_ToolBar->SetToolLabel(IDM_PLAY, _("Play")); } } + + GetMenuBar()->FindItem(IDM_RECORDREADONLY)->Enable(Running); if (!Initialized && !m_bGameLoading) { From d00b719966eda3c27b5fcb96bce50038f52611d5 Mon Sep 17 00:00:00 2001 From: nitsuja Date: Sun, 18 Dec 2011 02:25:50 -0800 Subject: [PATCH 182/381] give the audio thread a name (this doesn't really matter, but it was bugging me) --- Source/Core/AudioCommon/Src/DSoundStream.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Core/AudioCommon/Src/DSoundStream.cpp b/Source/Core/AudioCommon/Src/DSoundStream.cpp index 38fbc2a851..78e79e1057 100644 --- a/Source/Core/AudioCommon/Src/DSoundStream.cpp +++ b/Source/Core/AudioCommon/Src/DSoundStream.cpp @@ -96,6 +96,8 @@ bool DSound::WriteDataToBuffer(DWORD dwOffset, // Our own write // The audio thread. void DSound::SoundLoop() { + Common::SetCurrentThreadName("Audio thread"); + currentPos = 0; lastPos = 0; dsBuffer->Play(0, 0, DSBPLAY_LOOPING); From 9829beab42d6774ddc6f6b01950489ced40eec72 Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Sun, 18 Dec 2011 14:52:40 +0200 Subject: [PATCH 183/381] Gameini database update, mainly changes to the emulation issues lines (make them shorter, with more substance and less bla bla, update outdated stuff). The emulation issues lines can be further improved(this is a start). Also re - implement the emulation issues column that was reverted, make it a bit bigger since sentences need more words and delete the issues portion of the emustate tooltip since it is unnecessary now. --- Data/User/GameConfig/G9SE8P.ini | 3 +- Data/User/GameConfig/G9SJ8P.ini | 2 +- Data/User/GameConfig/G9SP8P.ini | 2 +- Data/User/GameConfig/GBME7F.ini | 3 +- Data/User/GameConfig/GBMP7F.ini | 2 +- Data/User/GameConfig/GFZE01.ini | 2 +- Data/User/GameConfig/GFZP01.ini | 2 +- Data/User/GameConfig/GIZE52.ini | 15 ++++++ Data/User/GameConfig/GYWD41.ini | 15 ++++++ Data/User/GameConfig/GYWEE9.ini | 10 +++- Data/User/GameConfig/GYWP41.ini | 15 ++++++ Data/User/GameConfig/R7FEGD.ini | 2 +- Data/User/GameConfig/R7FJGD.ini | 2 +- Data/User/GameConfig/R7FPGD.ini | 2 +- Data/User/GameConfig/R8AJ01.ini | 2 +- Data/User/GameConfig/R8AP01.ini | 8 +++- Data/User/GameConfig/R8LE20.ini | 2 +- Data/User/GameConfig/R8LP7J.ini | 2 +- Data/User/GameConfig/RBWE01.ini | 8 +++- Data/User/GameConfig/RBWJ01.ini | 2 +- Data/User/GameConfig/RBWP01.ini | 2 +- Data/User/GameConfig/RD2E41.ini | 2 +- Data/User/GameConfig/RD2J41.ini | 2 +- Data/User/GameConfig/RD2K41.ini | 2 +- Data/User/GameConfig/RD2P41.ini | 2 +- Data/User/GameConfig/RD2X41.ini | 2 +- Data/User/GameConfig/RHAE01.ini | 3 +- Data/User/GameConfig/RHAJ01.ini | 2 +- Data/User/GameConfig/RHAK01.ini | 2 +- Data/User/GameConfig/RHAP01.ini | 2 +- Data/User/GameConfig/RHAW01.ini | 2 +- Data/User/GameConfig/RMCE01.ini | 3 +- Data/User/GameConfig/RMCJ01.ini | 2 +- Data/User/GameConfig/RMCK01.ini | 2 +- Data/User/GameConfig/RMCP01.ini | 2 +- Data/User/GameConfig/ROAE36.ini | 18 ++++++++ Data/User/GameConfig/ROAP36.ini | 18 ++++++++ Data/User/GameConfig/RSXE69.ini | 2 +- Data/User/GameConfig/RSXJ13.ini | 2 +- Data/User/GameConfig/RSXK69.ini | 2 +- Data/User/GameConfig/RSXP69.ini | 2 +- Data/User/GameConfig/RTME41.ini | 2 +- Data/User/GameConfig/RTMP41.ini | 2 +- Data/User/GameConfig/RZTE01.ini | 10 +++- Data/User/GameConfig/RZTJ01.ini | 15 ++++++ Data/User/GameConfig/RZTK01.ini | 15 ++++++ Data/User/GameConfig/RZTP01.ini | 15 ++++++ Data/User/GameConfig/RZTW01.ini | 15 ++++++ Data/User/GameConfig/SDWE18.ini | 2 +- Data/User/GameConfig/SDWJ18.ini | 2 +- Data/User/GameConfig/SDWP18.ini | 3 +- Data/User/GameConfig/SMNE01.ini | 2 +- Data/User/GameConfig/SMNJ01.ini | 2 +- Data/User/GameConfig/SMNK01.ini | 2 +- Data/User/GameConfig/SMNP01.ini | 3 +- Data/User/GameConfig/SMNW01.ini | 2 +- Data/User/GameConfig/SMOE41.ini | 2 +- Data/User/GameConfig/SMOP41.ini | 2 +- Data/User/GameConfig/SMOX41.ini | 2 +- Data/User/GameConfig/SNCE8P.ini | 2 +- Data/User/GameConfig/SNCJ8P.ini | 2 +- Data/User/GameConfig/SNCP8P.ini | 2 +- Data/User/GameConfig/SVME01.ini | 2 +- Data/User/GameConfig/SVMJ01.ini | 2 +- Data/User/GameConfig/SVMP01.ini | 2 +- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 53 ++++++++-------------- Source/Core/DolphinWX/Src/GameListCtrl.h | 2 +- 67 files changed, 240 insertions(+), 102 deletions(-) create mode 100644 Data/User/GameConfig/GIZE52.ini create mode 100644 Data/User/GameConfig/GYWD41.ini create mode 100644 Data/User/GameConfig/GYWP41.ini create mode 100644 Data/User/GameConfig/ROAE36.ini create mode 100644 Data/User/GameConfig/ROAP36.ini create mode 100644 Data/User/GameConfig/RZTJ01.ini create mode 100644 Data/User/GameConfig/RZTK01.ini create mode 100644 Data/User/GameConfig/RZTP01.ini create mode 100644 Data/User/GameConfig/RZTW01.ini diff --git a/Data/User/GameConfig/G9SE8P.ini b/Data/User/GameConfig/G9SE8P.ini index 94e91c3c37..0ae956aad6 100644 --- a/Data/User/GameConfig/G9SE8P.ini +++ b/Data/User/GameConfig/G9SE8P.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 directx11 plugin set at 1x efb scale to deal with black textures. Safe texture cache to "safe" for some garbled text(r6479) +EmulationIssues = Use directx11 backend with efb scale set at 1x to deal with black textures ingame. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -17,4 +17,3 @@ PH_ZFar = SafeTextureCache = True SafeTextureCacheColorSamples = 0 EFBScale = 2 - diff --git a/Data/User/GameConfig/G9SJ8P.ini b/Data/User/GameConfig/G9SJ8P.ini index 3a65ad401b..6785f4cd4b 100644 --- a/Data/User/GameConfig/G9SJ8P.ini +++ b/Data/User/GameConfig/G9SJ8P.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 directx11 plugin set at 1x efb scale to deal with black textures. Safe texture cache to "safe" for some garbled text(r6479) +EmulationIssues = Use directx11 backend with efb scale set at 1x to deal with black textures ingame. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/G9SP8P.ini b/Data/User/GameConfig/G9SP8P.ini index 397dcbdf6f..8bc5c2a9ad 100644 --- a/Data/User/GameConfig/G9SP8P.ini +++ b/Data/User/GameConfig/G9SP8P.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 directx11 plugin set at 1x efb scale to deal with black textures. Safe texture cache to "safe" for some garbled text(r6479) +EmulationIssues = Use directx11 backend with efb scale set at 1x to deal with black textures ingame. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GBME7F.ini b/Data/User/GameConfig/GBME7F.ini index b99ffb350c..c02bf0fc8b 100644 --- a/Data/User/GameConfig/GBME7F.ini +++ b/Data/User/GameConfig/GBME7F.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 direct3d 9 backend or disable dual core. Needs real xfb for videos to show up and "LLE audio" to hear audio during videos.(r7446) +EmulationIssues = Needs real xfb for videos to show up and "LLE audio" for sound during videos. [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] UseXFB = True UseRealXFB = True - diff --git a/Data/User/GameConfig/GBMP7F.ini b/Data/User/GameConfig/GBMP7F.ini index 27d10b8cde..6daf1691f3 100644 --- a/Data/User/GameConfig/GBMP7F.ini +++ b/Data/User/GameConfig/GBMP7F.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 direct3d 9 backend or disable dual core. Needs real xfb for videos to show up and "LLE audio" to hear audio during videos.(r7446) +EmulationIssues = Needs real xfb for videos to show up and "LLE audio" for sound during videos. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GFZE01.ini b/Data/User/GameConfig/GFZE01.ini index 94821a5ff1..450553aa06 100644 --- a/Data/User/GameConfig/GFZE01.ini +++ b/Data/User/GameConfig/GFZE01.ini @@ -5,7 +5,7 @@ TLBHack = 1 CPUThread = 0 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Dual core is very unstable/doesn't even boot with most video plugins. Efb to ram is needed for proper shadows. Because of the things mentioned, the game runs slow. +EmulationIssues = Dual core is very unstable/doesn't even boot with most video plugins. Efb to ram is needed for proper shadows. [OnFrame] Add memory patches to be applied every frame here. [Video] ProjectionHack = 1 diff --git a/Data/User/GameConfig/GFZP01.ini b/Data/User/GameConfig/GFZP01.ini index 9dce5345c8..70c517ef4a 100644 --- a/Data/User/GameConfig/GFZP01.ini +++ b/Data/User/GameConfig/GFZP01.ini @@ -5,7 +5,7 @@ TLBHack = 1 CPUThread = 0 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Dual core is very unstable/doesn't even boot with most video plugins. Efb to ram is needed for proper shadows. Because of the things mentioned, the game runs slow. +EmulationIssues = Dual core is very unstable/doesn't even boot with most video plugins. Efb to ram is needed for proper shadows. [OnFrame] Add memory patches to be applied every frame here. [Video] ProjectionHack = 1 diff --git a/Data/User/GameConfig/GIZE52.ini b/Data/User/GameConfig/GIZE52.ini new file mode 100644 index 0000000000..c38ae6fb01 --- /dev/null +++ b/Data/User/GameConfig/GIZE52.ini @@ -0,0 +1,15 @@ +# GIZE52 - Ty3 +[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 = Text is broken ingame. Fixed in tex-preload Dolphin branch. +[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/GYWD41.ini b/Data/User/GameConfig/GYWD41.ini new file mode 100644 index 0000000000..2056d831a7 --- /dev/null +++ b/Data/User/GameConfig/GYWD41.ini @@ -0,0 +1,15 @@ +# GYWD41 - Harvest Moon: A Wonderful Life +[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 = Text is broken ingame. Fixed in tex-preload dolphin branch. +[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/GYWEE9.ini b/Data/User/GameConfig/GYWEE9.ini index 8198c51477..906558b987 100644 --- a/Data/User/GameConfig/GYWEE9.ini +++ b/Data/User/GameConfig/GYWEE9.ini @@ -1,9 +1,15 @@ # GYWEE9 - Harvest Moon: A Wonderful Life [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 = 3 +EmulationIssues = Text is broken ingame. Fixed in tex-preload dolphin branch. [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/GYWP41.ini b/Data/User/GameConfig/GYWP41.ini new file mode 100644 index 0000000000..35634452c2 --- /dev/null +++ b/Data/User/GameConfig/GYWP41.ini @@ -0,0 +1,15 @@ +# GYWP41 - Harvest Moon: A Wonderful Life +[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 = Text is broken ingame. Fixed in tex-preload dolphin branch. +[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/R7FEGD.ini b/Data/User/GameConfig/R7FEGD.ini index c2587bd483..412475526c 100644 --- a/Data/User/GameConfig/R7FEGD.ini +++ b/Data/User/GameConfig/R7FEGD.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 Direct 3d 11 or Opengl plugin and have pixel depth disabled in the graphics settings. Map is a bit broken (r7422) +EmulationIssues = Use Direct 3d 11 or OpenGL backend for less issues. Map is a bit broken. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/R7FJGD.ini b/Data/User/GameConfig/R7FJGD.ini index 00b95c33aa..427f2f8544 100644 --- a/Data/User/GameConfig/R7FJGD.ini +++ b/Data/User/GameConfig/R7FJGD.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 Direct 3d 11 or Opengl plugin and have pixel depth disabled in the graphics settings. Map is a bit broken (r7422) +EmulationIssues = Use Direct 3d 11 or OpenGL backend for less issues. Map is a bit broken. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/R7FPGD.ini b/Data/User/GameConfig/R7FPGD.ini index 85987a103d..c209b265fd 100644 --- a/Data/User/GameConfig/R7FPGD.ini +++ b/Data/User/GameConfig/R7FPGD.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 Direct 3d 11 or Opengl plugin and have pixel depth disabled in the graphics settings. Map is a bit broken (r7422) +EmulationIssues = Use Direct 3d 11 or OpenGL backend for less issues. Map is a bit broken. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/R8AJ01.ini b/Data/User/GameConfig/R8AJ01.ini index aed6b12654..546d2f51ca 100644 --- a/Data/User/GameConfig/R8AJ01.ini +++ b/Data/User/GameConfig/R8AJ01.ini @@ -2,6 +2,6 @@ [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 = Stuck on loading screen after movie +EmulationIssues = Stuck on loading screen after movie (see issue 2917). [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. diff --git a/Data/User/GameConfig/R8AP01.ini b/Data/User/GameConfig/R8AP01.ini index 141a199f7d..a1863578f0 100644 --- a/Data/User/GameConfig/R8AP01.ini +++ b/Data/User/GameConfig/R8AP01.ini @@ -2,10 +2,14 @@ [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 = +EmulationIssues = Stuck on loading screen after movie (see issue 2917). [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/R8LE20.ini b/Data/User/GameConfig/R8LE20.ini index a38514bc43..31b9abd642 100644 --- a/Data/User/GameConfig/R8LE20.ini +++ b/Data/User/GameConfig/R8LE20.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 = Needs Real XFB in order to be playable. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/R8LP7J.ini b/Data/User/GameConfig/R8LP7J.ini index 532178c53b..74b67647b1 100644 --- a/Data/User/GameConfig/R8LP7J.ini +++ b/Data/User/GameConfig/R8LP7J.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 = Needs Real XFB in order to be playable. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RBWE01.ini b/Data/User/GameConfig/RBWE01.ini index 49c72178af..3a8f5fc212 100644 --- a/Data/User/GameConfig/RBWE01.ini +++ b/Data/User/GameConfig/RBWE01.ini @@ -2,11 +2,15 @@ [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 = Needs an older rev to play like r6461. Set to 600 watermark tightness and don't use xaudio2 otherwise it crashes. Sound issues. (r6598) +EmulationIssues = Recent revs crash ingame, use an older rev like r6461 with watermark tightness set to 600. [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] - diff --git a/Data/User/GameConfig/RBWJ01.ini b/Data/User/GameConfig/RBWJ01.ini index 5cc47a3e4f..0cfcdb0c24 100644 --- a/Data/User/GameConfig/RBWJ01.ini +++ b/Data/User/GameConfig/RBWJ01.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 = 3 -EmulationIssues = Needs an older rev to play like r6461. Set to 600 watermark tightness and don't use xaudio2 otherwise it crashes. Sound issues. (r6598) +EmulationIssues = Recent revs crash ingame, use an older rev like r6461 with watermark tightness set to 600. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RBWP01.ini b/Data/User/GameConfig/RBWP01.ini index b195dad2f5..df90e22bfc 100644 --- a/Data/User/GameConfig/RBWP01.ini +++ b/Data/User/GameConfig/RBWP01.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 = 3 -EmulationIssues = Needs an older rev to play like r6461. Set to 600 watermark tightness and don't use xaudio2 otherwise it crashes. Sound issues. (r6598) +EmulationIssues = Recent revs crash ingame, use an older rev like r6461 with watermark tightness set to 600. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RD2E41.ini b/Data/User/GameConfig/RD2E41.ini index 00c7625c3a..a93f6359e6 100644 --- a/Data/User/GameConfig/RD2E41.ini +++ b/Data/User/GameConfig/RD2E41.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 = Needs real wiimote and motion plus. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RD2J41.ini b/Data/User/GameConfig/RD2J41.ini index fe9c9c2c82..8fccc41c35 100644 --- a/Data/User/GameConfig/RD2J41.ini +++ b/Data/User/GameConfig/RD2J41.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 = Needs real wiimote and motion plus. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RD2K41.ini b/Data/User/GameConfig/RD2K41.ini index 6cbc8d1f62..aa0e90f2b2 100644 --- a/Data/User/GameConfig/RD2K41.ini +++ b/Data/User/GameConfig/RD2K41.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 = Needs real wiimote and motion plus. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RD2P41.ini b/Data/User/GameConfig/RD2P41.ini index 881dff4c0f..7cbf91b22d 100644 --- a/Data/User/GameConfig/RD2P41.ini +++ b/Data/User/GameConfig/RD2P41.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 = Needs real wiimote and motion plus. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RD2X41.ini b/Data/User/GameConfig/RD2X41.ini index 3a7e7849f6..6748136cad 100644 --- a/Data/User/GameConfig/RD2X41.ini +++ b/Data/User/GameConfig/RD2X41.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 = Needs real wiimote and motion plus. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RHAE01.ini b/Data/User/GameConfig/RHAE01.ini index cb938123b2..344f6075be 100644 --- a/Data/User/GameConfig/RHAE01.ini +++ b/Data/User/GameConfig/RHAE01.ini @@ -4,7 +4,7 @@ [EmuState] #The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = (r6633) +EmulationIssues = [OnLoad] #Add memory patches to be loaded once on boot here. [OnFrame] @@ -19,4 +19,3 @@ PH_ZFar = [Gecko] [Video_Hacks] DlistCachingEnable = False - diff --git a/Data/User/GameConfig/RHAJ01.ini b/Data/User/GameConfig/RHAJ01.ini index da80927a44..2f127fb886 100644 --- a/Data/User/GameConfig/RHAJ01.ini +++ b/Data/User/GameConfig/RHAJ01.ini @@ -4,7 +4,7 @@ [EmuState] #The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = (r6633) +EmulationIssues = [OnLoad] #Add memory patches to be loaded once on boot here. [OnFrame] diff --git a/Data/User/GameConfig/RHAK01.ini b/Data/User/GameConfig/RHAK01.ini index e88728f273..26b4b2184f 100644 --- a/Data/User/GameConfig/RHAK01.ini +++ b/Data/User/GameConfig/RHAK01.ini @@ -4,7 +4,7 @@ [EmuState] #The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = (r6633) +EmulationIssues = [OnLoad] #Add memory patches to be loaded once on boot here. [OnFrame] diff --git a/Data/User/GameConfig/RHAP01.ini b/Data/User/GameConfig/RHAP01.ini index f1d9f70361..f97d9943ed 100644 --- a/Data/User/GameConfig/RHAP01.ini +++ b/Data/User/GameConfig/RHAP01.ini @@ -4,7 +4,7 @@ [EmuState] #The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = (r6633) +EmulationIssues = [OnLoad] #Add memory patches to be loaded once on boot here. [OnFrame] diff --git a/Data/User/GameConfig/RHAW01.ini b/Data/User/GameConfig/RHAW01.ini index 8fd70fe838..b7abca7b7b 100644 --- a/Data/User/GameConfig/RHAW01.ini +++ b/Data/User/GameConfig/RHAW01.ini @@ -4,7 +4,7 @@ [EmuState] #The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = (r6633) +EmulationIssues = [OnLoad] #Add memory patches to be loaded once on boot here. [OnFrame] diff --git a/Data/User/GameConfig/RMCE01.ini b/Data/User/GameConfig/RMCE01.ini index 0282cf1c77..00825c8d51 100644 --- a/Data/User/GameConfig/RMCE01.ini +++ b/Data/User/GameConfig/RMCE01.ini @@ -4,7 +4,7 @@ [EmuState] #The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Disable "emulate format changes" for increased speed and "disable fog" for the upper left faint blue square to disappear if you unchecked emulate format changes(r7379) +EmulationIssues = Disable "Ignore format changes" to fix some graphic issues (it will cause a slowdown though). [OnLoad] #Add memory patches to be loaded once on boot here. [OnFrame] @@ -19,4 +19,3 @@ PH_ZFar = [Gecko] [Video_Settings] [Video_Hacks] - diff --git a/Data/User/GameConfig/RMCJ01.ini b/Data/User/GameConfig/RMCJ01.ini index da1d021ca8..766474e9e8 100644 --- a/Data/User/GameConfig/RMCJ01.ini +++ b/Data/User/GameConfig/RMCJ01.ini @@ -4,7 +4,7 @@ [EmuState] #The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Disable "emulate format changes" for increased speed and "disable fog" for the upper left faint blue square to disappear if you unchecked emulate format changes(r7379) +EmulationIssues = Disable "Ignore format changes" to fix some graphic issues (it will cause a slowdown though). [OnLoad] #Add memory patches to be loaded once on boot here. [OnFrame] diff --git a/Data/User/GameConfig/RMCK01.ini b/Data/User/GameConfig/RMCK01.ini index 251947861c..308618a0f5 100644 --- a/Data/User/GameConfig/RMCK01.ini +++ b/Data/User/GameConfig/RMCK01.ini @@ -4,7 +4,7 @@ [EmuState] #The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Disable "emulate format changes" for increased speed and "disable fog" for the upper left faint blue square to disappear if you unchecked emulate format changes(r7379) +EmulationIssues = Disable "Ignore format changes" to fix some graphic issues (it will cause a slowdown though). [OnLoad] #Add memory patches to be loaded once on boot here. [OnFrame] diff --git a/Data/User/GameConfig/RMCP01.ini b/Data/User/GameConfig/RMCP01.ini index ba665583d8..65d4d8f37c 100644 --- a/Data/User/GameConfig/RMCP01.ini +++ b/Data/User/GameConfig/RMCP01.ini @@ -4,7 +4,7 @@ [EmuState] #The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Disable "emulate format changes" for increased speed and "disable fog" for the upper left faint blue square to disappear if you unchecked emulate format changes(r7379) +EmulationIssues = Disable "Ignore format changes" to fix some graphic issues (it will cause a slowdown though). [OnLoad] #Add memory patches to be loaded once on boot here. [OnFrame] diff --git a/Data/User/GameConfig/ROAE36.ini b/Data/User/GameConfig/ROAE36.ini new file mode 100644 index 0000000000..1171f7fda3 --- /dev/null +++ b/Data/User/GameConfig/ROAE36.ini @@ -0,0 +1,18 @@ +# ROAE36 - Overlord: Dark Legend +[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 = Accessing the map will crash the game (see issue 3953). +[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] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/ROAP36.ini b/Data/User/GameConfig/ROAP36.ini new file mode 100644 index 0000000000..d9c884ba5a --- /dev/null +++ b/Data/User/GameConfig/ROAP36.ini @@ -0,0 +1,18 @@ +# ROAP36 - Overlord: Dark Legend +[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 = Accessing the map will crash the game (see issue 3953). +[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] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RSXE69.ini b/Data/User/GameConfig/RSXE69.ini index ddb7622874..7934f8b283 100644 --- a/Data/User/GameConfig/RSXE69.ini +++ b/Data/User/GameConfig/RSXE69.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 = 3 -EmulationIssues = Needs Wii nand dump (wii menu installed) to get ingame(reconnect wiimote if necessary) and LLE for proper audio. Enabling EFB cpu access will give a proper bloom effect but the game will slow down substantially. Due to the above it is a very demanding game in order to be emulated properly. +EmulationIssues = Needs Wii nand dump and LLE for proper audio (reconnect wiimote if necessary). EFB cpu access gives proper bloom for a speed hit. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RSXJ13.ini b/Data/User/GameConfig/RSXJ13.ini index 2df1775517..a1cf8f5497 100644 --- a/Data/User/GameConfig/RSXJ13.ini +++ b/Data/User/GameConfig/RSXJ13.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 = 3 -EmulationIssues = Needs Wii nand dump (wii menu installed) to get ingame(reconnect wiimote if necessary) and LLE for proper audio. Enabling EFB cpu access will give a proper bloom effect but the game will slow down substantially. Due to the above it is a very demanding game in order to be emulated properly. +EmulationIssues = Needs Wii nand dump and LLE for proper audio (reconnect wiimote if necessary). EFB cpu access gives proper bloom for a speed hit. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RSXK69.ini b/Data/User/GameConfig/RSXK69.ini index a0aa732f05..d3ccded18d 100644 --- a/Data/User/GameConfig/RSXK69.ini +++ b/Data/User/GameConfig/RSXK69.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 = 3 -EmulationIssues = Needs Wii nand dump (wii menu installed) to get ingame(reconnect wiimote if necessary) and LLE for proper audio. Enabling EFB cpu access will give a proper bloom effect but the game will slow down substantially. Due to the above it is a very demanding game in order to be emulated properly. +EmulationIssues = Needs Wii nand dump and LLE for proper audio (reconnect wiimote if necessary). EFB cpu access gives proper bloom for a speed hit. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RSXP69.ini b/Data/User/GameConfig/RSXP69.ini index eb2bb79eb0..c9b8ade9e5 100644 --- a/Data/User/GameConfig/RSXP69.ini +++ b/Data/User/GameConfig/RSXP69.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 = 3 -EmulationIssues = Needs Wii nand dump (wii menu installed) to get ingame(reconnect wiimote if necessary) and LLE for proper audio. Enabling EFB cpu access will give a proper bloom effect but the game will slow down substantially. Due to the above it is a very demanding game in order to be emulated properly. +EmulationIssues = Needs Wii nand dump and LLE for proper audio (reconnect wiimote if necessary). EFB cpu access gives proper bloom for a speed hit. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RTME41.ini b/Data/User/GameConfig/RTME41.ini index 1da1d64564..1c88349a8b 100644 --- a/Data/User/GameConfig/RTME41.ini +++ b/Data/User/GameConfig/RTME41.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 = Fog emulation creates problems with the game (see issue 4922). [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RTMP41.ini b/Data/User/GameConfig/RTMP41.ini index 3886311fc2..8debfc43fb 100644 --- a/Data/User/GameConfig/RTMP41.ini +++ b/Data/User/GameConfig/RTMP41.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 = Fog emulation creates problems with the game (see issue 4922). [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RZTE01.ini b/Data/User/GameConfig/RZTE01.ini index 58e95063b3..088ceec16e 100644 --- a/Data/User/GameConfig/RZTE01.ini +++ b/Data/User/GameConfig/RZTE01.ini @@ -1,9 +1,15 @@ -# RZTE01 - WSP2 US(P) +# RZTE01 - Wii Sports Resort [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 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] diff --git a/Data/User/GameConfig/RZTJ01.ini b/Data/User/GameConfig/RZTJ01.ini new file mode 100644 index 0000000000..789e8ff2dd --- /dev/null +++ b/Data/User/GameConfig/RZTJ01.ini @@ -0,0 +1,15 @@ +# RZTJ01 - Wii Sports Resort +[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] diff --git a/Data/User/GameConfig/RZTK01.ini b/Data/User/GameConfig/RZTK01.ini new file mode 100644 index 0000000000..30a25e17d3 --- /dev/null +++ b/Data/User/GameConfig/RZTK01.ini @@ -0,0 +1,15 @@ +# RZTK01 - Wii Sports Resort +[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] diff --git a/Data/User/GameConfig/RZTP01.ini b/Data/User/GameConfig/RZTP01.ini new file mode 100644 index 0000000000..c840e2236d --- /dev/null +++ b/Data/User/GameConfig/RZTP01.ini @@ -0,0 +1,15 @@ +# RZTP01 - Wii Sports Resort +[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] diff --git a/Data/User/GameConfig/RZTW01.ini b/Data/User/GameConfig/RZTW01.ini new file mode 100644 index 0000000000..ffbd46790b --- /dev/null +++ b/Data/User/GameConfig/RZTW01.ini @@ -0,0 +1,15 @@ +# RZTW01 - Wii Sports Resort +[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] diff --git a/Data/User/GameConfig/SDWE18.ini b/Data/User/GameConfig/SDWE18.ini index 76807c8b2e..38360dcc1f 100644 --- a/Data/User/GameConfig/SDWE18.ini +++ b/Data/User/GameConfig/SDWE18.ini @@ -1,7 +1,7 @@ # SDWE18 - A Shadow's Tale [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 = Needs efb to ram for proper shadows. EmulationStateId = 5 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. diff --git a/Data/User/GameConfig/SDWJ18.ini b/Data/User/GameConfig/SDWJ18.ini index 78db0a7acc..aa2ccf6477 100644 --- a/Data/User/GameConfig/SDWJ18.ini +++ b/Data/User/GameConfig/SDWJ18.ini @@ -1,7 +1,7 @@ # SDWJ18 - Kage no Tou [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 = Needs efb to ram for proper shadows. EmulationStateId = 5 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. diff --git a/Data/User/GameConfig/SDWP18.ini b/Data/User/GameConfig/SDWP18.ini index 29a0a42aa1..fef82e113e 100644 --- a/Data/User/GameConfig/SDWP18.ini +++ b/Data/User/GameConfig/SDWP18.ini @@ -1,7 +1,7 @@ # SDWP18 - A Shadow's Tale [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 = Needs efb to ram for proper shadows. EmulationStateId = 5 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. @@ -17,4 +17,3 @@ PH_ZFar = EFBToTextureEnable = False EFBCopyEnable = True [Video_Enhancements] - diff --git a/Data/User/GameConfig/SMNE01.ini b/Data/User/GameConfig/SMNE01.ini index 1a838de6e5..9cda92dadd 100644 --- a/Data/User/GameConfig/SMNE01.ini +++ b/Data/User/GameConfig/SMNE01.ini @@ -1,7 +1,7 @@ # SMNE01 - New SUPER MARIO BROS. 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. -EmulationIssues = Enable EFB to RAM for the coins to spin for the Directx9 and Opengl plugin(it will cause a big slowdown)(r6584) +EmulationIssues = Enable EFB to RAM for the coins to spin (it will cause a big slowdown). EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. diff --git a/Data/User/GameConfig/SMNJ01.ini b/Data/User/GameConfig/SMNJ01.ini index 743ecca665..7f1cfb06bf 100644 --- a/Data/User/GameConfig/SMNJ01.ini +++ b/Data/User/GameConfig/SMNJ01.ini @@ -1,7 +1,7 @@ # SMNJ01 - New SUPER MARIO BROS. 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. -EmulationIssues = Enable EFB to RAM for the coins to spin for the Directx9 and Opengl plugin(it will cause a big slowdown)(r6584) +EmulationIssues = Enable EFB to RAM for the coins to spin (it will cause a big slowdown). EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. diff --git a/Data/User/GameConfig/SMNK01.ini b/Data/User/GameConfig/SMNK01.ini index b6ead5e52c..30238bcbd4 100644 --- a/Data/User/GameConfig/SMNK01.ini +++ b/Data/User/GameConfig/SMNK01.ini @@ -1,7 +1,7 @@ # SMNK01 - New SUPER MARIO BROS. 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. -EmulationIssues = Enable EFB to RAM for the coins to spin for the Directx9 and Opengl plugin(it will cause a big slowdown)(r6584) +EmulationIssues = Enable EFB to RAM for the coins to spin (it will cause a big slowdown). EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. diff --git a/Data/User/GameConfig/SMNP01.ini b/Data/User/GameConfig/SMNP01.ini index f53b9e0f13..06240e2c36 100644 --- a/Data/User/GameConfig/SMNP01.ini +++ b/Data/User/GameConfig/SMNP01.ini @@ -1,7 +1,7 @@ # SMNP01 - New SUPER MARIO BROS. 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. -EmulationIssues = Enable EFB to RAM for the coins to spin for the Directx9 and Opengl plugin (it will cause a big slowdown)(r6584) +EmulationIssues = Enable EFB to RAM for the coins to spin (it will cause a big slowdown). EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. +$Speed hack @@ -27,4 +27,3 @@ SafeTextureCache = True SafeTextureCacheColorSamples = 512 [Video_Hacks] DlistCachingEnable = False - diff --git a/Data/User/GameConfig/SMNW01.ini b/Data/User/GameConfig/SMNW01.ini index f0f8226d79..0c6dfc2f57 100644 --- a/Data/User/GameConfig/SMNW01.ini +++ b/Data/User/GameConfig/SMNW01.ini @@ -1,7 +1,7 @@ # SMNW01 - New SUPER MARIO BROS. 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. -EmulationIssues = Enable EFB to RAM for the coins to spin for the Directx9 and Opengl plugin(it will cause a big slowdown)(r6584) +EmulationIssues = Enable EFB to RAM for the coins to spin (it will cause a big slowdown). EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. diff --git a/Data/User/GameConfig/SMOE41.ini b/Data/User/GameConfig/SMOE41.ini index 6bd9138084..15dc5a693e 100644 --- a/Data/User/GameConfig/SMOE41.ini +++ b/Data/User/GameConfig/SMOE41.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 = Sound noise eliminated using the LLE plugin and normal video speed (with hle disable idleskip for normal dance school speed). Use 1x anisotropic filtering with directx11 plugin (otherwise broken videos in dx11 and Opengl)(r6700) +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] diff --git a/Data/User/GameConfig/SMOP41.ini b/Data/User/GameConfig/SMOP41.ini index 11bdf34d48..6095cd9174 100644 --- a/Data/User/GameConfig/SMOP41.ini +++ b/Data/User/GameConfig/SMOP41.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 = Sound noise eliminated using the LLE plugin and normal video speed (with hle disable idleskip for normal dance school speed). Use 1x anisotropic filtering with directx11 plugin (otherwise broken videos in dx11 and Opengl)(r6700) +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] diff --git a/Data/User/GameConfig/SMOX41.ini b/Data/User/GameConfig/SMOX41.ini index d96d552390..88ba03da1c 100644 --- a/Data/User/GameConfig/SMOX41.ini +++ b/Data/User/GameConfig/SMOX41.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 = Sound noise eliminated using the LLE plugin and normal video speed (with hle disable idleskip for normal dance school speed). Use 1x anisotropic filtering with directx11 plugin (otherwise broken videos in dx11 and Opengl)(r6700) +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] diff --git a/Data/User/GameConfig/SNCE8P.ini b/Data/User/GameConfig/SNCE8P.ini index 67f8c5d7d1..c259d40061 100644 --- a/Data/User/GameConfig/SNCE8P.ini +++ b/Data/User/GameConfig/SNCE8P.ini @@ -1,7 +1,7 @@ # SNCE8P - Sonic2010 [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 = Set efb scale to integral for less graphical glitches. Enable "Use EuRGB60 mode" for higher brightness. Disabling efb to cpu for speedup seems safe(r6575) +EmulationIssues = Integral efb scale has less graphical glitches. Enable "Use EuRGB60 mode" for proper brightness level. EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. diff --git a/Data/User/GameConfig/SNCJ8P.ini b/Data/User/GameConfig/SNCJ8P.ini index ec4c1630ba..7de58c7a00 100644 --- a/Data/User/GameConfig/SNCJ8P.ini +++ b/Data/User/GameConfig/SNCJ8P.ini @@ -1,7 +1,7 @@ # SNCJ8P - Sonic2010 [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 = Set efb scale to integral for less graphical glitches. Enable "Use EuRGB60 mode" for higher brightness. Disabling efb to cpu for speedup seems safe(r6575) +EmulationIssues = Integral efb scale has less graphical glitches. Enable "Use EuRGB60 mode" for proper brightness level. EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. diff --git a/Data/User/GameConfig/SNCP8P.ini b/Data/User/GameConfig/SNCP8P.ini index f2cdc194dd..39a221d578 100644 --- a/Data/User/GameConfig/SNCP8P.ini +++ b/Data/User/GameConfig/SNCP8P.ini @@ -1,7 +1,7 @@ # SNCP8P - Sonic2010 [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 = Set efb scale to integral for less graphical glitches. Enable "Use EuRGB60 mode" for higher brightness. Disabling efb to cpu for speedup seems safe(r6575) +EmulationIssues = Integral efb scale has less graphical glitches. Enable "Use EuRGB60 mode" for proper brightness level. EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. diff --git a/Data/User/GameConfig/SVME01.ini b/Data/User/GameConfig/SVME01.ini index e4f82dac22..f5b581ab6a 100644 --- a/Data/User/GameConfig/SVME01.ini +++ b/Data/User/GameConfig/SVME01.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 LLE audio to fix sound. Use Opengl backend and set efb scale to integral for better image. Enable bilinear filtering for a more smooth but blurry image(r7482) +EmulationIssues = Use LLE audio to fix sound. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/SVMJ01.ini b/Data/User/GameConfig/SVMJ01.ini index 2014fcfdb1..52eb8b9311 100644 --- a/Data/User/GameConfig/SVMJ01.ini +++ b/Data/User/GameConfig/SVMJ01.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 LLE audio to fix sound. Use Opengl backend and set efb scale to integral for better image. Enable bilinear filtering for a more smooth but blurry image(r7482) +EmulationIssues = Use LLE audio to fix sound. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/SVMP01.ini b/Data/User/GameConfig/SVMP01.ini index e122dc00e1..68776a58ab 100644 --- a/Data/User/GameConfig/SVMP01.ini +++ b/Data/User/GameConfig/SVMP01.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 LLE audio to fix sound. Use Opengl backend and set efb scale to integral for better image. Enable bilinear filtering for a more smooth but blurry image(r7482) +EmulationIssues = Use LLE audio to fix sound. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 05f8c8365a..ac0b88269c 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -91,16 +91,6 @@ static int CompareGameListItems(const GameListItem* iso1, const GameListItem* is case CGameListCtrl::COLUMN_TITLE: return strcasecmp(iso1->GetName(indexOne).c_str(), iso2->GetName(indexOther).c_str()) * t; - case CGameListCtrl::COLUMN_NOTES: - { - std::string cmp1 = - (iso1->GetPlatform() == GameListItem::GAMECUBE_DISC) ? - iso1->GetCompany() : iso1->GetDescription(indexOne); - std::string cmp2 = - (iso2->GetPlatform() == GameListItem::GAMECUBE_DISC) ? - iso2->GetCompany() : iso2->GetDescription(indexOther); - return strcasecmp(cmp1.c_str(), cmp2.c_str()) * t; - } case CGameListCtrl::COLUMN_COUNTRY: if(iso1->GetCountry() > iso2->GetCountry()) return 1 * t; @@ -133,7 +123,10 @@ static int CompareGameListItems(const GameListItem* iso1, const GameListItem* is else return 0; } - break; + case CGameListCtrl::COLUMN_EMULATION_NOTES: + return strcasecmp(iso1->GetIssues().c_str(), + iso2->GetIssues().c_str()) * t; + break; } return 0; @@ -294,19 +287,20 @@ void CGameListCtrl::Update() // Instead of showing the notes + the company, which is unknown with // wii titles We show in the same column : company for GC games and // description for wii/wad games - InsertColumn(COLUMN_NOTES, _("Notes")); + InsertColumn(COLUMN_EMULATION_NOTES, _("Emulation Notes")); InsertColumn(COLUMN_COUNTRY, _T("")); InsertColumn(COLUMN_SIZE, _("Size")); InsertColumn(COLUMN_EMULATION_STATE, _("State")); - + // set initial sizes for columns SetColumnWidth(COLUMN_PLATFORM, 35); SetColumnWidth(COLUMN_BANNER, 96); SetColumnWidth(COLUMN_TITLE, 200); - SetColumnWidth(COLUMN_NOTES, 200); + SetColumnWidth(COLUMN_EMULATION_NOTES, 200); SetColumnWidth(COLUMN_COUNTRY, 32); SetColumnWidth(COLUMN_EMULATION_STATE, 50); + // add all items for (int i = 0; i < (int)m_ISOFiles.size(); i++) @@ -483,18 +477,12 @@ void CGameListCtrl::InsertItemInReportView(long _Index) wxString name = wxString(rISOFile.GetName(0).c_str(), SJISConv); m_gameList.append(StringFromFormat("%s (J)\n", (const char *)name.c_str())); SetItem(_Index, COLUMN_TITLE, name, -1); - SetItem(_Index, COLUMN_NOTES, wxString(company.size() ? - company.c_str() : rISOFile.GetDescription(0).c_str(), - SJISConv), -1); } break; case DiscIO::IVolume::COUNTRY_USA: m_gameList.append(StringFromFormat("%s (U)\n", rISOFile.GetName(0).c_str())); SetItem(_Index, COLUMN_TITLE, wxString::From8BitData(rISOFile.GetName(0).c_str()), -1); - SetItem(_Index, COLUMN_NOTES, - wxString::From8BitData(company.size() ? - company.c_str() : rISOFile.GetDescription(0).c_str()), -1); break; default: m_gameList.append(StringFromFormat("%s (E)\n", @@ -503,11 +491,6 @@ void CGameListCtrl::InsertItemInReportView(long _Index) wxString::From8BitData( rISOFile.GetName(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str()), -1); - SetItem(_Index, COLUMN_NOTES, - wxString::From8BitData(company.size() ? - company.c_str() : - rISOFile.GetDescription(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str()), - -1); break; } } @@ -516,8 +499,6 @@ void CGameListCtrl::InsertItemInReportView(long _Index) m_gameList.append(StringFromFormat("%s (WAD)\n", rISOFile.GetName(0).c_str())); SetItem(_Index, COLUMN_TITLE, wxString(rISOFile.GetName(0).c_str(), SJISConv), -1); - SetItem(_Index, COLUMN_NOTES, - wxString(rISOFile.GetDescription(0).c_str(), SJISConv), -1); } #ifndef _WIN32 @@ -531,6 +512,10 @@ void CGameListCtrl::InsertItemInReportView(long _Index) // File size SetItem(_Index, COLUMN_SIZE, NiceSizeFormat(rISOFile.GetFileSize()), -1); + // Emulation notes + SetItem(_Index, COLUMN_EMULATION_NOTES, wxString::From8BitData(rISOFile.GetIssues().c_str()), -1); + SetColumnWidth(COLUMN_SIZE, wxLIST_AUTOSIZE); + // Background color SetBackgroundColor(); @@ -713,7 +698,7 @@ void CGameListCtrl::ScanForISOs() void CGameListCtrl::OnColBeginDrag(wxListEvent& event) { - if (event.GetColumn() != COLUMN_TITLE && event.GetColumn() != COLUMN_NOTES) + if (event.GetColumn() != COLUMN_TITLE && event.GetColumn() != COLUMN_EMULATION_NOTES) event.Veto(); } @@ -855,14 +840,12 @@ void CGameListCtrl::OnMouseMotion(wxMouseEvent& event) const GameListItem& rISO = *m_ISOFiles[GetItemData(item)]; const int emu_state = rISO.GetEmuState(); - const std::string& issues = rISO.GetIssues(); - + // Show a tooltip containing the EmuState and the state description if (emu_state > 0 && emu_state < 6) { char temp[2048]; - sprintf(temp, "^ %s%s%s", emuState[emu_state - 1], - issues.size() > 0 ? " :\n" : "", issues.c_str()); + sprintf(temp, "^ %s", emuState[emu_state - 1]); toolTip = new wxEmuStateTip(this, wxString(temp, *wxConvCurrent), &toolTip); } else @@ -1331,13 +1314,13 @@ void CGameListCtrl::AutomaticColumnWidth() // We hide the Notes column if the window is too small if (resizable > 400) { - SetColumnWidth(COLUMN_TITLE, resizable / 2); - SetColumnWidth(COLUMN_NOTES, resizable / 2); + SetColumnWidth(COLUMN_TITLE, resizable * 0.4); + SetColumnWidth(COLUMN_EMULATION_NOTES, resizable * 0.6); } else { SetColumnWidth(COLUMN_TITLE, resizable); - SetColumnWidth(COLUMN_NOTES, 0); + SetColumnWidth(COLUMN_EMULATION_NOTES, 0); } } } diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.h b/Source/Core/DolphinWX/Src/GameListCtrl.h index 8fca14f632..48b1a118c4 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.h +++ b/Source/Core/DolphinWX/Src/GameListCtrl.h @@ -60,7 +60,7 @@ public: COLUMN_PLATFORM = 0, COLUMN_BANNER, COLUMN_TITLE, - COLUMN_NOTES, + COLUMN_EMULATION_NOTES, COLUMN_COUNTRY, COLUMN_SIZE, COLUMN_EMULATION_STATE, From b20c26f0b7e4112a3d73732ddf7588bdf16efc7d Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 18 Dec 2011 13:58:44 +0100 Subject: [PATCH 184/381] Adding more drama to the git history. --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 53 ++++++++++++++-------- Source/Core/DolphinWX/Src/GameListCtrl.h | 2 +- 2 files changed, 36 insertions(+), 19 deletions(-) diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index ac0b88269c..05f8c8365a 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -91,6 +91,16 @@ static int CompareGameListItems(const GameListItem* iso1, const GameListItem* is case CGameListCtrl::COLUMN_TITLE: return strcasecmp(iso1->GetName(indexOne).c_str(), iso2->GetName(indexOther).c_str()) * t; + case CGameListCtrl::COLUMN_NOTES: + { + std::string cmp1 = + (iso1->GetPlatform() == GameListItem::GAMECUBE_DISC) ? + iso1->GetCompany() : iso1->GetDescription(indexOne); + std::string cmp2 = + (iso2->GetPlatform() == GameListItem::GAMECUBE_DISC) ? + iso2->GetCompany() : iso2->GetDescription(indexOther); + return strcasecmp(cmp1.c_str(), cmp2.c_str()) * t; + } case CGameListCtrl::COLUMN_COUNTRY: if(iso1->GetCountry() > iso2->GetCountry()) return 1 * t; @@ -123,10 +133,7 @@ static int CompareGameListItems(const GameListItem* iso1, const GameListItem* is else return 0; } - case CGameListCtrl::COLUMN_EMULATION_NOTES: - return strcasecmp(iso1->GetIssues().c_str(), - iso2->GetIssues().c_str()) * t; - break; + break; } return 0; @@ -287,20 +294,19 @@ void CGameListCtrl::Update() // Instead of showing the notes + the company, which is unknown with // wii titles We show in the same column : company for GC games and // description for wii/wad games - InsertColumn(COLUMN_EMULATION_NOTES, _("Emulation Notes")); + InsertColumn(COLUMN_NOTES, _("Notes")); InsertColumn(COLUMN_COUNTRY, _T("")); InsertColumn(COLUMN_SIZE, _("Size")); InsertColumn(COLUMN_EMULATION_STATE, _("State")); - + // set initial sizes for columns SetColumnWidth(COLUMN_PLATFORM, 35); SetColumnWidth(COLUMN_BANNER, 96); SetColumnWidth(COLUMN_TITLE, 200); - SetColumnWidth(COLUMN_EMULATION_NOTES, 200); + SetColumnWidth(COLUMN_NOTES, 200); SetColumnWidth(COLUMN_COUNTRY, 32); SetColumnWidth(COLUMN_EMULATION_STATE, 50); - // add all items for (int i = 0; i < (int)m_ISOFiles.size(); i++) @@ -477,12 +483,18 @@ void CGameListCtrl::InsertItemInReportView(long _Index) wxString name = wxString(rISOFile.GetName(0).c_str(), SJISConv); m_gameList.append(StringFromFormat("%s (J)\n", (const char *)name.c_str())); SetItem(_Index, COLUMN_TITLE, name, -1); + SetItem(_Index, COLUMN_NOTES, wxString(company.size() ? + company.c_str() : rISOFile.GetDescription(0).c_str(), + SJISConv), -1); } break; case DiscIO::IVolume::COUNTRY_USA: m_gameList.append(StringFromFormat("%s (U)\n", rISOFile.GetName(0).c_str())); SetItem(_Index, COLUMN_TITLE, wxString::From8BitData(rISOFile.GetName(0).c_str()), -1); + SetItem(_Index, COLUMN_NOTES, + wxString::From8BitData(company.size() ? + company.c_str() : rISOFile.GetDescription(0).c_str()), -1); break; default: m_gameList.append(StringFromFormat("%s (E)\n", @@ -491,6 +503,11 @@ void CGameListCtrl::InsertItemInReportView(long _Index) wxString::From8BitData( rISOFile.GetName(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str()), -1); + SetItem(_Index, COLUMN_NOTES, + wxString::From8BitData(company.size() ? + company.c_str() : + rISOFile.GetDescription(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str()), + -1); break; } } @@ -499,6 +516,8 @@ void CGameListCtrl::InsertItemInReportView(long _Index) m_gameList.append(StringFromFormat("%s (WAD)\n", rISOFile.GetName(0).c_str())); SetItem(_Index, COLUMN_TITLE, wxString(rISOFile.GetName(0).c_str(), SJISConv), -1); + SetItem(_Index, COLUMN_NOTES, + wxString(rISOFile.GetDescription(0).c_str(), SJISConv), -1); } #ifndef _WIN32 @@ -512,10 +531,6 @@ void CGameListCtrl::InsertItemInReportView(long _Index) // File size SetItem(_Index, COLUMN_SIZE, NiceSizeFormat(rISOFile.GetFileSize()), -1); - // Emulation notes - SetItem(_Index, COLUMN_EMULATION_NOTES, wxString::From8BitData(rISOFile.GetIssues().c_str()), -1); - SetColumnWidth(COLUMN_SIZE, wxLIST_AUTOSIZE); - // Background color SetBackgroundColor(); @@ -698,7 +713,7 @@ void CGameListCtrl::ScanForISOs() void CGameListCtrl::OnColBeginDrag(wxListEvent& event) { - if (event.GetColumn() != COLUMN_TITLE && event.GetColumn() != COLUMN_EMULATION_NOTES) + if (event.GetColumn() != COLUMN_TITLE && event.GetColumn() != COLUMN_NOTES) event.Veto(); } @@ -840,12 +855,14 @@ void CGameListCtrl::OnMouseMotion(wxMouseEvent& event) const GameListItem& rISO = *m_ISOFiles[GetItemData(item)]; const int emu_state = rISO.GetEmuState(); - + const std::string& issues = rISO.GetIssues(); + // Show a tooltip containing the EmuState and the state description if (emu_state > 0 && emu_state < 6) { char temp[2048]; - sprintf(temp, "^ %s", emuState[emu_state - 1]); + sprintf(temp, "^ %s%s%s", emuState[emu_state - 1], + issues.size() > 0 ? " :\n" : "", issues.c_str()); toolTip = new wxEmuStateTip(this, wxString(temp, *wxConvCurrent), &toolTip); } else @@ -1314,13 +1331,13 @@ void CGameListCtrl::AutomaticColumnWidth() // We hide the Notes column if the window is too small if (resizable > 400) { - SetColumnWidth(COLUMN_TITLE, resizable * 0.4); - SetColumnWidth(COLUMN_EMULATION_NOTES, resizable * 0.6); + SetColumnWidth(COLUMN_TITLE, resizable / 2); + SetColumnWidth(COLUMN_NOTES, resizable / 2); } else { SetColumnWidth(COLUMN_TITLE, resizable); - SetColumnWidth(COLUMN_EMULATION_NOTES, 0); + SetColumnWidth(COLUMN_NOTES, 0); } } } diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.h b/Source/Core/DolphinWX/Src/GameListCtrl.h index 48b1a118c4..8fca14f632 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.h +++ b/Source/Core/DolphinWX/Src/GameListCtrl.h @@ -60,7 +60,7 @@ public: COLUMN_PLATFORM = 0, COLUMN_BANNER, COLUMN_TITLE, - COLUMN_EMULATION_NOTES, + COLUMN_NOTES, COLUMN_COUNTRY, COLUMN_SIZE, COLUMN_EMULATION_STATE, From c4eb150c7eaa11a75b6624dd0cabfe676ea694ad Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Sun, 18 Dec 2011 14:30:08 +0100 Subject: [PATCH 185/381] Skip XRANDR check if X11 is not found. Our code does not compile when HAVE_XRANDR=1 and HAVE_X11=0. This combination would not normally exist, but on OS X we skip the X11 check so it is possible for X11 to be "not found" even when the OS does support it. On OS X 10.6 this was not a problem because XRANDR is not detected there, but apparently on OS X 10.7 XRANDR is available. --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index cb1f17d2b3..8d9addeb58 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -287,7 +287,9 @@ else() add_definitions(-DHAVE_X11=0) endif() +if(X11_FOUND) check_lib(XRANDR Xrandr) +endif() if(XRANDR_FOUND) add_definitions(-DHAVE_XRANDR=1) else() From 1917af4bab972b77ffc514accf13a1f41536f836 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 11 Oct 2011 23:25:14 -0500 Subject: [PATCH 186/381] Update translation files for recent changes in the code. --- Languages/po/ar.po | 606 ++++++++-------- Languages/po/ca.po | 618 +++++++++-------- Languages/po/cs.po | 613 +++++++++-------- Languages/po/de.po | 544 ++++++++------- Languages/po/dolphin-emu.pot | 514 ++++++++------ Languages/po/el.po | 525 ++++++++------ Languages/po/en.po | 514 ++++++++------ Languages/po/es.po | 1222 +++++++++++++++++++------------- Languages/po/fr.po | 1262 +++++++++++++++++++++------------- Languages/po/he.po | 514 ++++++++------ Languages/po/hu.po | 618 +++++++++-------- Languages/po/it.po | 544 ++++++++------- Languages/po/ja.po | 616 +++++++++-------- Languages/po/ko.po | 609 ++++++++-------- Languages/po/nb.po | 612 +++++++++-------- Languages/po/nl.po | 549 ++++++++------- Languages/po/pl.po | 1100 +++++++++++++++++------------ Languages/po/pt.po | 619 +++++++++-------- Languages/po/pt_BR.po | 619 +++++++++-------- Languages/po/ru.po | 534 +++++++------- Languages/po/sr.po | 531 +++++++------- Languages/po/tr.po | 614 +++++++++-------- Languages/po/zh_CN.po | 544 ++++++++------- Languages/po/zh_TW.po | 544 ++++++++------- 24 files changed, 8594 insertions(+), 6991 deletions(-) diff --git a/Languages/po/ar.po b/Languages/po/ar.po index cfdd3101b4..3aab54781e 100644 --- a/Languages/po/ar.po +++ b/Languages/po/ar.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-10 08:30-0500\n" +"POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-07-20 13:33+0300\n" "Last-Translator: \n" "Language-Team: \n" @@ -25,7 +25,7 @@ msgstr " لعبة : " msgid "! NOT" msgstr "! لا" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -67,21 +67,21 @@ msgstr "%s موجود بالÙعل، الكتابة Ùوقة؟" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s Ùشل ÙÙŠ أن تكون نقيت. ربما كانت الصورة معطوب." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" " Card file size is invalid (0x%x bytes)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" " Card size is invalid (0x%x bytes)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -295,7 +295,7 @@ msgstr "" msgid "(UNKNOWN)" msgstr "(معروÙ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(ايقاÙ)" @@ -307,7 +307,7 @@ msgstr "16 بت" msgid "32 bit" msgstr "32 بت" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "الرؤية ثلاثية الأبعاد" @@ -319,7 +319,7 @@ msgstr "8 بت" msgid "" msgstr "<أدخل اسم هنا>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "<لم يتم العثور على القرارات>" @@ -403,17 +403,22 @@ msgstr "ترجمة البرنامج بواسطة الررائع" msgid "Acceleration" msgstr "تسريع" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "ضبط:" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#, fuzzy msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" "تحاكي بدقة الصادرات للنسخ.\n" "بعض الألعاب تعتمد على هذا بالنسبة للتأثيرات رسومية معينة أو وظائ٠اللعب.\n" @@ -497,12 +502,12 @@ msgstr "" msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "كرت الشاشه :" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "أضÙ" @@ -518,9 +523,9 @@ msgstr "أض٠باتش" msgid "Add new pane" msgstr "إضاÙØ© جزء جديد" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "أضÙ" @@ -554,7 +559,7 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "ضبط السيطرة على ضغط التناظرية المطلوبة لتنشيط الأزرار." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "متقدم" @@ -574,8 +579,8 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "جميع ملÙات الجيم كيوب (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "All Save States (sav, s##)" msgstr "Ø­Ùظ جميع الحالات (sav, s##)" @@ -591,7 +596,7 @@ msgstr "جميع مضغوط GC/Wii ISO files (gcz)" msgid "All files (*.*)|*.*" msgstr "جميع الملÙات (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -603,11 +608,16 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "محاكاة ويموت" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" msgstr "تصÙية متباينة الخواص :" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "تنعيم الحواÙ:" @@ -627,7 +637,7 @@ msgstr "" msgid "Apply" msgstr "تطبيق" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -657,7 +667,7 @@ msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙات؟" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "نسبة العرض :" @@ -678,19 +688,19 @@ msgid "AudioCommon: Error opening AO device.\n" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "تلقائي" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "تلقائي حجم الناÙذة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "ضبط حجم الناÙذة تلقائي " @@ -704,6 +714,18 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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/WXInputBase.cpp:27 msgid "Back" msgstr "رجوع" @@ -712,8 +734,8 @@ msgstr "رجوع" msgid "Backend Settings" msgstr "إعدادات الخلÙية" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "الخلÙية:" @@ -747,7 +769,7 @@ msgstr "بنر:" msgid "Bar" msgstr "شريط" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "الأساسية" @@ -759,7 +781,7 @@ msgstr "إعدادات أساسية" msgid "Bass" msgstr "صوت عميق" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "كتلة الاختباري جدول تخصيص Ùشل" @@ -779,8 +801,8 @@ msgstr "اليسار أزرق" msgid "Blue Right" msgstr "اليمين أزرق" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 msgid "Bottom" msgstr "أسÙÙ„" @@ -813,9 +835,9 @@ msgstr "لاستعراض الدليل الإخراج" msgid "Buffer:" msgstr "العازلة :" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "أزرار" @@ -831,11 +853,11 @@ msgstr "العصا الأيمن " msgid "CPU Emulator Engine" msgstr "محرك محاكي المعالج" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "شاشة القوائم المؤقته" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 " @@ -851,7 +873,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا التحقق." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -865,8 +887,8 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "إلغاء" @@ -913,10 +935,10 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "غير قادر على العثور ويموت بواسطة معالج الاتصال %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "" @@ -1036,10 +1058,10 @@ msgstr "" msgid "Classic" msgstr "الكلاسيكية" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "أزال" @@ -1055,10 +1077,10 @@ msgstr "" "أثناء قطع الاتصال اللعبة العميل قيد التشغيل! يتم تعطيل اللعب شبكة. يجب عليك " "يدويا إيقا٠اللعبة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "إغلاق" @@ -1162,7 +1184,7 @@ msgstr "توصيل ويموت 3" msgid "Connect Wiimote 4" msgstr "توصيل ويموت 4" -#: Source/Core/DolphinWX/Src/Main.cpp:608 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Connecting..." msgstr "توصيل" @@ -1230,7 +1252,7 @@ msgstr "" "تعذر تعيين منصات. وغادر لاعب أو لعبة قيد التشغيل حاليا!\n" "(منصات الإعداد أثناء قيد التشغيل اللعبة غير معتمد حتى الآن)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1303,11 +1325,11 @@ msgstr "المنشئ :" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "محصول" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1354,8 +1376,8 @@ msgstr "الصوت" msgid "DSP Emulator Engine" msgstr "محرك محاكي الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulation (سريع)" @@ -1404,7 +1426,7 @@ msgstr "" msgid "Debug" msgstr "التصحيح" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Debugging" msgstr "التصحيح" @@ -1437,8 +1459,8 @@ msgstr "ايزو الاÙتراضية :" msgid "Default font" msgstr "الخط الاÙتراضي" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "حذÙ" @@ -1446,12 +1468,12 @@ msgstr "حذÙ" msgid "Delete Save" msgstr "حذ٠الحÙظ" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "حذ٠المل٠الموجود '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 msgid "Description" msgstr "الوصÙ" @@ -1480,15 +1502,15 @@ msgstr "إعدادات الجهاز" msgid "Dial" msgstr "الاتصال الهاتÙÙŠ" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1496,32 +1518,28 @@ msgstr "" "Ùشل الدليل الاختباري\n" " Ùˆ Ùشل دليل الاختباري الاحتياطية" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 msgid "Disable" msgstr "تعطيل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "تعطيل الضباب" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "تعطيل إضاءة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "تعطيل العمق لكل بكسل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "Texturesتعطيل " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "تعطيل سماعات ويموت" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1535,7 +1553,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا التحقق." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1551,7 +1569,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1570,11 +1588,11 @@ msgstr "القرص" msgid "Disc Read Error" msgstr "خطأ قراءة القرص" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "العرض" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1588,7 +1606,7 @@ msgstr "" msgid "Divide" msgstr "انقسام" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Do you want to stop the current emulation?" msgstr "هل تريد اغلق اللعبة الحالية؟" @@ -1596,7 +1614,7 @@ msgstr "هل تريد اغلق اللعبة الحالية؟" msgid "Dolphin" msgstr "دولÙين" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s إعدادات الرسومات" @@ -1617,12 +1635,12 @@ msgstr "إعدادات تحكم الوي" msgid "Dolphin FIFO" msgstr "دولÙين" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 msgid "Dolphin GCPad Configuration" msgstr "إعدادات تحكم الجيم كيوب" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1648,8 +1666,8 @@ msgid "" msgstr "" "تم تعيين دولÙين حاليا إخÙاء جميع الألعاب. دبل كليك هنا لإظهار جميع الألعاب..." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "أسÙÙ„" @@ -1674,19 +1692,19 @@ msgstr "وهمي " msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "تÙريغ الإطارات" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1696,7 +1714,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1706,7 +1724,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1716,9 +1734,9 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "Dutch" @@ -1726,7 +1744,7 @@ msgstr "Dutch" msgid "E&xit" msgstr "خروج" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" msgstr "" @@ -1776,7 +1794,7 @@ msgstr "تحرير" msgid "Effect" msgstr "تأثير" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "عازل الإطار المضمن " @@ -1784,7 +1802,7 @@ msgstr "عازل الإطار المضمن " msgid "Emu Thread already running" msgstr "المحاكي قيد التشغيل بالÙعل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1793,7 +1811,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1821,7 +1839,7 @@ msgstr "حالة المحاكاه: " msgid "Enable" msgstr "تمكين" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1854,6 +1872,10 @@ msgstr "BAT تمكين" msgid "Enable Block Merging" msgstr "تمكين منع الدمج" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +msgid "Enable Cache" +msgstr "تمكين التخزين المؤقت" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "تمكين الاسرار " @@ -1870,7 +1892,7 @@ msgstr "" msgid "Enable Dual Core (speedup)" msgstr "Enable Dual Core (لزيادة السرعة)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "تمكين الاختصارات" @@ -1886,8 +1908,8 @@ msgstr "Enable Idle Skipping (لزيادة السرعة)" msgid "Enable MMU" msgstr "MMU تمكين" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "تمكين المسح التقدمي" @@ -1899,7 +1921,7 @@ msgstr "تمكين شاشة التوقÙ" msgid "Enable WideScreen" msgstr "تمكين شاشة عريضة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "تمكين الإطار السلكي" @@ -1988,7 +2010,7 @@ msgid "" "OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2002,14 +2024,14 @@ msgstr "" msgid "End" msgstr "نهاية" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "English" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "تحسينات" @@ -2031,13 +2053,13 @@ msgstr "دخول 1/%d" msgid "Equal" msgstr "المساواة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "خطأ" -#: Source/Core/DolphinWX/Src/Main.cpp:356 +#: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "خطأ ÙÙŠ تحميل اللغة المختارة. يتراجع إلى النظام الاÙتراضية." @@ -2111,7 +2133,7 @@ msgstr "تصدير Ø­Ùظ باسم" msgid "Extension" msgstr "تمديد" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "عزل الاطار الخارجي" @@ -2224,13 +2246,13 @@ msgstr "Ùشل تحميل hid.dll" msgid "Failed to read banner.bin" msgstr "Ùشل ÙÙŠ قراءة banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2241,25 +2263,25 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Ùشل ÙÙŠ قراءة البيانات من مل٠%d" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2288,6 +2310,14 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "Ùشل لكتابة عنوان لمل٠%d" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "سريع" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "Mipmaps سريع" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr " لا يعمل ÙÙŠ كل لعبة MMU إصدار سريع من." @@ -2316,7 +2346,7 @@ msgstr "" "قد لا يمكن Ùتح ملÙ\n" "أو لا يكون امتداد صالح" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2354,11 +2384,11 @@ msgstr "أول بلوك" msgid "Fix Checksums" msgstr "الإصلاح اختبارية" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "العرض 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "العرض 4:3" @@ -2366,11 +2396,11 @@ msgstr "العرض 4:3" msgid "Force Console as NTSC-J" msgstr "Ùرض وحدة التحكم على النظام الياباني" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2401,7 +2431,7 @@ msgid "" "setting when playing Japanese games." msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2424,7 +2454,7 @@ msgstr "الإطار" msgid "Frame Advance" msgstr "الإطار المسبق" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "" @@ -2444,13 +2474,13 @@ msgstr "حد الإطار:" msgid "Frames To Record" msgstr "إطارات لتسجيل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "تحكم بكاميرا اللعبة" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "French" @@ -2467,7 +2497,7 @@ msgstr "من" msgid "FullScr" msgstr "شاشه كامله" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 msgid "Fullscreen resolution:" msgstr "دقة العرض :" @@ -2511,8 +2541,8 @@ msgstr "جيم كيوب" msgid "Gamecube &Pad Settings" msgstr "إعدادات تحكم جيم كيوب" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "بطاقه ذاكره الجيم كيوب (*.raw,*.gcp) " @@ -2534,9 +2564,9 @@ msgstr "" "GeckoCode Ùشل تشغيل (CT%i CST%i) (%s)\n" "(إما غير رمز سيئة أو نوع رمز غير مدعومة حتى الآن.)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "عام" @@ -2544,9 +2574,9 @@ msgstr "عام" msgid "General Settings" msgstr "الإعدادات العامة" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "German" @@ -2567,11 +2597,14 @@ msgstr "إعدادات الرسومات" msgid "Greater Than" msgstr "أكبر من" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#, fuzzy msgid "" -"Greatly increases quality of textures generated using render-to-texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2604,11 +2637,11 @@ msgstr "غيتار" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "هاك" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "عنوان اختباري Ùشل" @@ -2638,7 +2671,7 @@ msgstr "" msgid "Hide" msgstr "إخÙاء" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "إخÙاء مؤشر الماوس" @@ -2665,8 +2698,8 @@ msgstr "هوست" msgid "Hotkey Configuration" msgstr "إعدادات الاختصارات" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 msgid "Hotkeys" msgstr "الاختصارات" @@ -2741,11 +2774,11 @@ msgstr "" "لجعلها Ùعالة Audio Throttle يجب عليك تعطيل NTSC:60, PAL:50 إذا قمت بتعيين " "حد الإطار أعلى من السرعة لعبة الاÙتراضية " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" msgstr "تجاهل تنسيق التغييرات " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2759,7 +2792,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا التحقق." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 " @@ -2797,7 +2830,7 @@ msgid "" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2809,7 +2842,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا ترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -2827,8 +2860,8 @@ msgstr "ÙÙŠ اللعبة" msgid "In-Game" msgstr "ÙÙŠ اللعبة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "معلومات" @@ -2869,7 +2902,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 msgid "Installing WAD..." msgstr "wad تثبيت" @@ -2898,7 +2931,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 msgid "Internal Resolution:" msgstr "الدقة الداخلية :" @@ -2948,9 +2981,9 @@ msgstr "تسجيل المل٠غير صالح" msgid "Invalid state" msgstr "غير صالح حالة" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "Italian" @@ -3011,8 +3044,8 @@ msgstr "الكتابة Ùوق آخر حالة" msgid "Last Saved State" msgstr "آخر حالة محÙوظة" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "اليسار" @@ -3051,7 +3084,7 @@ msgstr "الحد من عدد الإطارات ÙÙŠ الثانية " msgid "Load" msgstr "تحميل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Load Custom Textures" msgstr "تحميل القوام المخصص" @@ -3091,16 +3124,16 @@ msgstr "8 تحميل حالة" msgid "Load State..." msgstr "تحميل حالة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Load Wii System Menu" msgstr "تحميل قائمة نظام الوي" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 #, 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:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3142,8 +3175,8 @@ msgstr "نوع السجل" msgid "Logger Outputs" msgstr "مختلÙان النواتج" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "تسجيل" @@ -3175,8 +3208,8 @@ msgstr "MMU سرعة هاك" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "العصا الأيسر" @@ -3205,8 +3238,8 @@ msgstr "بطاقة الذاكرة Ùتحت بالÙعل" msgid "Memory Byte" msgstr "ذاكرة بايت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 msgid "Memory Card" msgstr "بطاقة الذاكرة" @@ -3227,7 +3260,7 @@ msgid "" "Would you like to copy the old file to this new location?\n" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "" @@ -3244,7 +3277,7 @@ msgstr "الميكروÙون" msgid "Min" msgstr "منخÙض" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "متÙرقات" @@ -3257,7 +3290,7 @@ msgstr "إعدادات منوعة" msgid "Modifier" msgstr "معدل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3282,7 +3315,7 @@ msgstr "موشن بلس" msgid "Motor" msgstr "محرك" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3396,9 +3429,9 @@ msgstr "التبويب" msgid "NP Up" msgstr "Ùوق" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "الاسم :" @@ -3483,7 +3516,7 @@ msgstr "لا يساوي" msgid "Not Set" msgstr "غير مجموعة" -#: Source/Core/DolphinWX/Src/Main.cpp:607 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Not connected" msgstr "غير متصل" @@ -3512,8 +3545,8 @@ msgstr "ارقام القÙÙ„" msgid "Number Of Codes: " msgstr "عدد من رموز :" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "ننشوك" @@ -3542,8 +3575,8 @@ msgstr "تعويض :" msgid "Only %d blocks available" msgstr "Ùقط %d كتل متاحة" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Open" msgstr "Ùتح" @@ -3573,11 +3606,11 @@ msgstr "OpenAL : لا يمكن العثور على أجهزة الصوت" msgid "OpenAL: can't open device %s" msgstr "OpenAL : لا يمكن Ùتح الجهاز %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "" @@ -3608,8 +3641,8 @@ msgstr "" "انقر بالزر الأيمن للتصدير كاÙØ© Ø­Ùظ,\n" "واستيراد وحÙظ لبطاقة ذاكرة جديدة\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "أخرى" @@ -3674,13 +3707,13 @@ msgstr "باتش" msgid "Paths" msgstr "مسارات" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "وقÙØ©" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Per-Pixel Lighting" msgstr "لكل بكسل إضاءة" @@ -3693,10 +3726,10 @@ msgstr "مثالي" msgid "Perspective %d" msgstr "مشهد %d" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 msgid "Play" msgstr "بدأ اللعبه" @@ -3720,7 +3753,7 @@ msgstr "خيارات التشغيل" msgid "Players" msgstr "لاعبين" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 msgid "Please confirm..." msgstr "يرجى تأكيد" @@ -3765,7 +3798,7 @@ msgstr "Portuguese" msgid "Portuguese (Brazilian)" msgstr "Portuguese (Brazilian)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "بعد معالجة تأثير:" @@ -3824,7 +3857,7 @@ msgstr "" msgid "R-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "" @@ -3840,7 +3873,7 @@ msgstr "قوه" msgid "Read-only mode" msgstr "وضع القراءة Ùقط" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "حقيقي" @@ -3901,9 +3934,9 @@ msgstr "" "\n" "إذا لم تكن متأكدا حدد لا شيء." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "تحديث" @@ -3915,14 +3948,14 @@ msgstr "تحديث قائمة" msgid "Refresh game list" msgstr "تحديث القائمة" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Remove" msgstr "إزالة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -3932,12 +3965,12 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "تقدم إلى الشاشة الرئيسية" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "إعادة ضبط" @@ -3949,8 +3982,8 @@ msgstr "النتائج" msgid "Return" msgstr "Enter" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "اليمين" @@ -3975,13 +4008,17 @@ msgstr "Russian" msgid "Sa&ve State" msgstr "Ø­Ùظ الحالة" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "آمنة" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "معدل العينة :" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Ø­Ùظ" @@ -4047,6 +4084,10 @@ msgstr "Ø­Ùظ الضغط GCM/ISO" msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +msgid "Scaled EFB Copy" +msgstr "" + #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format msgid "Scanning %s" @@ -4082,17 +4123,17 @@ msgstr "البحث ÙÙŠ المجلدات الÙرعية" msgid "Section %s not found in SYSCONF" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "حدد" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "اختر مل٠تسجيل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 msgid "Select a Wii WAD file to install" msgstr "لتثبيت wad حدد ملÙ" @@ -4118,15 +4159,15 @@ msgstr "اختر النواÙØ° العائمة" msgid "Select the file to load" msgstr "حدد المل٠لتحميل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Select the save file" msgstr "حدد Ø­Ùظ الملÙ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "حدد حالة التحميل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "Select the state to save" msgstr "حدد حالة الحÙظ" @@ -4263,11 +4304,11 @@ msgstr "أظهر شريط الأدوات" msgid "Show Drives" msgstr "اظهر محرك الاقراص" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "إظهار نسخة الصادرات للمناطق" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "أظهر عدد الاطارات" @@ -4279,7 +4320,7 @@ msgstr "Ùرنسا" msgid "Show GameCube" msgstr "جيم كيوب" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "إظهار مدخلات العرض" @@ -4315,7 +4356,7 @@ msgstr "عرض الاجهزه" msgid "Show Regions" msgstr "إظهار المناطق" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "إظهار الإحصاءات" @@ -4369,7 +4410,7 @@ msgstr "إظهار أيقونة الحÙظ " msgid "Show save title" msgstr "إظهارعنوان الحÙظ " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4388,7 +4429,7 @@ msgstr "إظهار رسالة المساعدة" msgid "Show unknown" msgstr "غير معروÙ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -4414,15 +4455,15 @@ msgstr "الحجم" msgid "Skip BIOS" msgstr "تخطي البيوس" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "Skip EFB Access from CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4433,6 +4474,22 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"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" +"\n" +"إذا لم تكن متأكدا اترك هذا غير محددة." + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4484,9 +4541,9 @@ msgstr "Ùشل إنشاء المخزن المؤقت الصوت : %s" msgid "Space" msgstr "مجال" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "Spanish" @@ -4494,7 +4551,7 @@ msgstr "Spanish" msgid "Speaker Volume:" msgstr "مكبر الصوت:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 " @@ -4530,9 +4587,9 @@ msgstr "" msgid "Standard Controller" msgstr "وحدة تحكم القياسية" +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Start" @@ -4560,14 +4617,28 @@ msgstr "Ø­Ùظ الحالة" msgid "Stick" msgstr "عصا" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "اغلق اللعبه" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" +"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" +"\n" +"إذا لم تكن متأكدا اترك هذا التحقق." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "امتداد لناÙذة" @@ -4601,8 +4672,8 @@ msgstr "نظام اللغة :" msgid "TAIWAN" msgstr "تايوان" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "الإدخال" @@ -4622,9 +4693,9 @@ msgstr "الجدول الأيسر" msgid "Table Right" msgstr "الجدول الأيمن" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "اخذ لقطه من الشاشه" @@ -4632,7 +4703,17 @@ msgstr "اخذ لقطه من الشاشه" msgid "Test" msgstr "اختبار" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#, fuzzy +msgid "Texture" +msgstr "Texturesتعطيل " + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +#, fuzzy +msgid "Texture Cache" +msgstr "إزالة التخزين المؤقت" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" msgstr "" @@ -4674,7 +4755,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:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "لا وجود له (%s) المل٠الذي حددته" @@ -4691,11 +4772,23 @@ msgstr "يمكن أن يكون اسم لا تحتوي على الأحر٠'ØŒ'" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +msgstr "" +"أكثر أمانا ضبط هذا، Ùإن على الأرجح أقل المضاهاة تكون Ù…Ùقودة أي تحديثات " +"الملمس من ذاكرة الوصول العشوائي.\n" +"\n" +"إذا لم تكن متأكدا، استخدم القيمة الثانية الأسرع من الجهة اليمنى." + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" msgstr "Ø­Ùظ تحاول نسخة له حجم مل٠غير صالح" -#: Source/Core/DolphinWX/Src/Main.cpp:363 +#: Source/Core/DolphinWX/Src/Main.cpp:353 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4757,7 +4850,7 @@ msgstr "" 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:119 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. " @@ -4824,13 +4917,13 @@ msgstr "إلى" msgid "Toggle All Log Types" msgstr "تبديل جميع أنواع السجل" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "اللعب بالشاشة كاملة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Top" msgstr "أعلى" @@ -4838,7 +4931,7 @@ msgstr "أعلى" msgid "Traditional Chinese" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "حاول تحميل نوع مل٠غير معروÙ." @@ -4872,8 +4965,8 @@ msgstr "نوع" msgid "UDP Port:" msgstr "UDP منÙØ° :" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "" @@ -4941,8 +5034,8 @@ msgstr "" "مؤشر غير معرو٠%#08x\n" "مواصلة?" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "أعلى" @@ -4959,7 +5052,7 @@ msgstr "ويموت مستقيم" msgid "Use EuRGB60 Mode (PAL60)" msgstr "(PAL60) استخدم وضع " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 msgid "Use Fullscreen" msgstr "استخدام شاشة كاملة" @@ -4971,7 +5064,7 @@ msgstr "استخدام الهيكس" msgid "Use Panic Handlers" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -4984,7 +5077,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -4998,11 +5091,11 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "Ùائدة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "تحديد أقصى معدل الاطار" @@ -5026,8 +5119,7 @@ msgstr "" msgid "Video" msgstr "Ùديو" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "الظاهري" @@ -5054,21 +5146,21 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "التنبيه" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "تحذير -- ايزو ابتداء من الخطأ وضع وحدة التحكم!" @@ -5101,7 +5193,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "شاشة واسعة هاك" @@ -5125,7 +5217,7 @@ msgstr "" msgid "Wii Save Import" msgstr "استيراد Ø­Ùظ الوي" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 msgid "Wii save files (*.bin)|*.bin" msgstr "ملÙات Ø­Ùظ الوي (*.bin)|*.bin" @@ -5133,8 +5225,8 @@ msgstr "ملÙات Ø­Ùظ الوي (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: لا يمكن القراءة من الملÙ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "تحكم الوي" @@ -5156,7 +5248,7 @@ msgstr "" "أو ربما هو بسبب الخمول وقت مستقطع أو لسبب آخر.\n" "هل تريد إعادة الاتصال على الÙور?" -#: Source/Core/DolphinWX/Src/Main.cpp:609 +#: Source/Core/DolphinWX/Src/Main.cpp:599 msgid "Wiimote Connected" msgstr "ويموت متصل" @@ -5189,7 +5281,7 @@ msgstr "نواÙØ° اليمين" msgid "Word Wrap" msgstr "كلمة ختامية" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5288,7 +5380,7 @@ msgstr "" msgid "[ waiting ]" msgstr "[انتظار]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5304,7 +5396,7 @@ msgstr "" msgid "[Custom]" msgstr "[مخصص]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5322,7 +5414,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5401,9 +5493,6 @@ msgstr "أو" #~ msgid "< as Default Profile >" #~ msgstr "< الوضع الاÙتراضي >" -#~ msgid "Accuracy:" -#~ msgstr "ضبط:" - #~ msgid "Accurate Texture Cache" #~ msgstr "دقة المظهر السطحي المؤقت" @@ -5419,17 +5508,6 @@ 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 "Configuration profile" #~ msgstr "التكوين الشخصي" @@ -5448,6 +5526,9 @@ msgstr "أو" #~ msgid "Danish" #~ msgstr "Danish" +#~ msgid "Disable Wiimote Speaker" +#~ msgstr "تعطيل سماعات ويموت" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -5468,21 +5549,12 @@ msgstr "أو" #~ msgid "Enable CPU Access" #~ msgstr "CPU Access تمكين" -#~ msgid "Enable Cache" -#~ msgstr "تمكين التخزين المؤقت" - #~ msgid "Enable OpenCL" #~ msgstr "OpenCL تمكين " #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "تمكين شاشة التوقÙ" -#~ msgid "Fast" -#~ msgstr "سريع" - -#~ msgid "Fast Mipmaps" -#~ msgstr "Mipmaps سريع" - #~ msgid "Fractional" #~ msgstr "جزئي" @@ -5548,9 +5620,6 @@ msgstr "أو" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "اللازمة لاستعمال الخط القرص اليابانية." -#~ msgid "Safe" -#~ msgstr "آمنة" - #~ msgid "Scale:" #~ msgstr "النطاق :" @@ -5581,51 +5650,12 @@ msgstr "أو" #~ "عرض إحصاءات مختلÙØ©.\n" #~ "وهذا Ù…Ùيد Ùقط لأغراض التصحيح." -#~ 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" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "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" -#~ "\n" -#~ "إذا لم تكن متأكدا اترك هذا غير محددة." - #~ msgid "Start Renderer in Fullscreen" #~ msgstr "بدء ÙÙŠ كمال ملء الشاشة" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "بدء التقديم ÙÙŠ إطار وضع ملء الشاشة." -#~ 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" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "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" -#~ "\n" -#~ "إذا لم تكن متأكدا اترك هذا التحقق." - -#~ msgid "" -#~ "The safer you adjust this, the less likely the emulator will be missing " -#~ "any texture updates from RAM.\n" -#~ "\n" -#~ "If unsure, use the second-fastest value from the right." -#~ msgstr "" -#~ "أكثر أمانا ضبط هذا، Ùإن على الأرجح أقل المضاهاة تكون Ù…Ùقودة أي تحديثات " -#~ "الملمس من ذاكرة الوصول العشوائي.\n" -#~ "\n" -#~ "إذا لم تكن متأكدا، استخدم القيمة الثانية الأسرع من الجهة اليمنى." - #~ msgid "Use FPS For Limiting" #~ msgstr "لحد عدد الاطارات" diff --git a/Languages/po/ca.po b/Languages/po/ca.po index eff9dc01a5..9869f00aed 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: 2011-08-10 08:30-0500\n" +"POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-08-19 08:36-0500\n" "Last-Translator: Jordi Coma \n" "Language-Team: Catalan \n" @@ -36,7 +36,7 @@ msgstr "Joc:" msgid "! NOT" msgstr "! NO" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -78,7 +78,7 @@ msgstr "%s ja existeix, voleu sobreescriure?" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s no s'ha pogut esborrar. Probablement, la imatge està danyada." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -87,7 +87,7 @@ msgstr "" "%s ha fallat la càrrega com a targeta de memòria\n" "La mida del fitxer no és vàlida (0x%x bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -96,7 +96,7 @@ msgstr "" "%s ha fallat la càrrega com a targeta de memòria\n" "La mida de la targeta no és vàlida (0x%x bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -315,7 +315,7 @@ msgstr "(-) + ZAprop" msgid "(UNKNOWN)" msgstr "(DESCONEGUT)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(Deshabilitat)" @@ -327,7 +327,7 @@ msgstr "16 bits" msgid "32 bit" msgstr "32 bits" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "3D Vision" @@ -339,7 +339,7 @@ msgstr "8 bits" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "" @@ -426,17 +426,22 @@ msgstr "Sobre Dolphin" msgid "Acceleration" msgstr "Acceleració" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "Precisió:" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "Emulació acurada de Vbeam" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#, fuzzy msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" "Emulació precisa de les còpies EFB.\n" "Alguns jocs depenen d'això per alguns efectes gràfics o funcionalitat del " @@ -536,12 +541,12 @@ msgstr "Action Replay: Codi Normal %i: %08x subtipus invàlid (%s)" 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:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "Adaptador:" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "Afegeix" @@ -557,9 +562,9 @@ msgstr "Afegeix Pegat" msgid "Add new pane" msgstr "Afegeix un nou panell" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "Afegir ..." @@ -607,7 +612,7 @@ 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:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "Avançada" @@ -627,8 +632,8 @@ msgstr "Totes les imatges GC / Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tots els fitxers GameCube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "All Save States (sav, s##)" msgstr "Tots els Estats (savi, s##\")" @@ -644,7 +649,7 @@ msgstr "Tots els fitxers ISO comprimits de GC o Wii (gcz)" msgid "All files (*.*)|*.*" msgstr "Tots els fitxers (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -656,11 +661,16 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Wiimote emulat" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" msgstr "Filtrat anisotròpic:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "Anti-Aliasing:" @@ -680,7 +690,7 @@ msgstr "Apploader:" msgid "Apply" msgstr "Aplicar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -713,7 +723,7 @@ msgstr "" "Estàs segur d'eliminar aquest fitxer? Aquesta acció serà irrecuperable!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relació d'aspecte:" @@ -734,19 +744,19 @@ msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error en obrir el dispositiu AO \n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Múltiple de 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "Auto (Mida de la finestra)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "Ajust automàtic de la mida de la finestra" @@ -760,6 +770,19 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desactivat." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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/WXInputBase.cpp:27 msgid "Back" msgstr "Tornar" @@ -768,8 +791,8 @@ msgstr "Tornar" msgid "Backend Settings" msgstr "Configuració del Suport" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Suport:" @@ -803,7 +826,7 @@ msgstr "Imatge:" msgid "Bar" msgstr "Barra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "Bàsic" @@ -815,7 +838,7 @@ msgstr "Configuració bàsica" msgid "Bass" msgstr "Baix" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "La comprovació de la «checksum» de la taula de blocs ha fallat" @@ -835,8 +858,8 @@ msgstr "Blau esquerra" msgid "Blue Right" msgstr "Blau dret" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 msgid "Bottom" msgstr "Abaix" @@ -869,9 +892,9 @@ msgstr "Examineu el directori de sortida" msgid "Buffer:" msgstr "Buffer:" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "Botons" @@ -887,11 +910,11 @@ msgstr "Palanca-C" msgid "CPU Emulator Engine" msgstr "Motor d'emulació de CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "Llistes de memòria cau de pantalla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 " @@ -913,7 +936,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -934,8 +957,8 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Cancel·lar" @@ -983,10 +1006,10 @@ msgstr "No es pot trobar WiiMote per bd: %02x:%02x:%02x:%02x:%02x:%02x" 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:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "No es pot llegir des del connector DVD - Interfície DVD: Error greu" @@ -1108,10 +1131,10 @@ msgstr "Palanca Cercle" msgid "Classic" msgstr "Clàssic" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "Esborrar" @@ -1127,10 +1150,10 @@ msgstr "" "Client desconnectat mentre el joc s'estava executant! NetPlay s'ha " "desactivat. Haurà d'aturar manualment el joc." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Tancar" @@ -1234,7 +1257,7 @@ msgstr "Connectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Connectar Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:608 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Connecting..." msgstr "Connectant ..." @@ -1303,7 +1326,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:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1373,11 +1396,11 @@ msgstr "Creador:" msgid "Critical" msgstr "Crític" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "Retallar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1424,8 +1447,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Motor d'emulació DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "DSP HLE emulation (fast)" msgstr "Emulació DSP HLE (ràpid)" @@ -1474,7 +1497,7 @@ msgstr "Zona morta" msgid "Debug" msgstr "Depuració" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Debugging" msgstr "Depuració" @@ -1507,8 +1530,8 @@ msgstr "ISO per defecte:" msgid "Default font" msgstr "Font per defecte" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "Eliminar" @@ -1516,12 +1539,12 @@ msgstr "Eliminar" msgid "Delete Save" msgstr "Eliminar partida desada" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "Eliminar el fitxer existent '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 msgid "Description" msgstr "Descripció" @@ -1551,15 +1574,15 @@ msgstr "Configuració del dispositiu" msgid "Dial" msgstr "Dial" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1567,32 +1590,28 @@ 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:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 msgid "Disable" msgstr "Deshabilitar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "Deshabilitar boira" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "Deshabilitar l'il·luminació" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "Deshabilitar la profunditat per-pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "Deshabilitar Textures" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "Desactivar l'altaveu del «Wiimote»" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1607,7 +1626,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1623,7 +1642,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1642,11 +1661,11 @@ msgstr "Disc" msgid "Disc Read Error" msgstr "Error de lectura de disc" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "Pantalla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1660,7 +1679,7 @@ msgstr "" msgid "Divide" msgstr "Divideix" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Do you want to stop the current emulation?" msgstr "Voleu aturar l'emulació actual?" @@ -1668,7 +1687,7 @@ msgstr "Voleu aturar l'emulació actual?" msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Configuració de gràfics de Dolphin %s" @@ -1689,12 +1708,12 @@ msgstr "Configuració de Wiimote emulat" msgid "Dolphin FIFO" msgstr "FIFO Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 msgid "Dolphin GCPad Configuration" msgstr "Configuració del control GC Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin Pel·lícules TAS (*.dtm)" @@ -1722,8 +1741,8 @@ msgstr "" "Dolphin està actualment configurat per ocultar tots els jocs. Feu doble clic " "aquí per mostrar tots-los ..." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Avall" @@ -1748,19 +1767,19 @@ msgstr "Maniquí" msgid "Dump Audio" msgstr "Bolcat d'àudio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "Bolcat de destinació EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "Bolcat d'imatges" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "Bolcat de textures" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1771,7 +1790,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1781,7 +1800,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1791,9 +1810,9 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "Holandès" @@ -1801,7 +1820,7 @@ msgstr "Holandès" msgid "E&xit" msgstr "&Sortir" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" msgstr "Còpies EFB" @@ -1855,7 +1874,7 @@ msgstr "Modificació ..." msgid "Effect" msgstr "Efecte" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "Activar la memòria cau d'imatge («Frame Buffer»)" @@ -1863,7 +1882,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:111 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1877,7 +1896,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:110 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1905,7 +1924,7 @@ msgstr "Estat d'emulació:" msgid "Enable" msgstr "Habilitar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1938,6 +1957,10 @@ msgstr "Habilitar les millors tècniques disponibles" msgid "Enable Block Merging" msgstr "Habilitar fusió de Bloc" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +msgid "Enable Cache" +msgstr "Habilitar memòria cau" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "Activar Trucs" @@ -1954,7 +1977,7 @@ msgstr "Habilitar Doble nucli" msgid "Enable Dual Core (speedup)" msgstr "Habilitar Doble nucli (acceleració)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "Activar tecles d'accés ràpid" @@ -1970,8 +1993,8 @@ msgstr "Habilitar salt d'inactiu (acceleració)" msgid "Enable MMU" msgstr "Habilitar MMU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "Habilitar exploració &Progressiva" @@ -1983,7 +2006,7 @@ msgstr "Habilitar el protector de pantalla" msgid "Enable WideScreen" msgstr "Habilitar pantalla panoràmica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "Habilitar malla" @@ -2077,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:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2091,14 +2114,14 @@ msgstr "" msgid "End" msgstr "Fi" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "Anglès" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "Millores" @@ -2120,13 +2143,13 @@ msgstr "Entrada 1/%d" msgid "Equal" msgstr "Igual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "Error" -#: Source/Core/DolphinWX/Src/Main.cpp:356 +#: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Error en carregar l'idioma seleccionat. Es retorna a l'idioma per defecte " @@ -2203,7 +2226,7 @@ msgstr "Desar exportació com a..." msgid "Extension" msgstr "Extensió" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "Memòria cau d'imatge externa" @@ -2324,7 +2347,7 @@ msgstr "No s'ha pogut carregar hid.dll" msgid "Failed to read banner.bin" msgstr "No s'ha pogut llegir Imatge.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2332,7 +2355,7 @@ msgstr "" "No s'ha pogut llegir la còpia de taula d'assignació de blocs correctament \n" "(0x8000-0x9FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2345,7 +2368,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "No s'ha pogut llegir les dades des del fitxer% d" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2353,7 +2376,7 @@ msgstr "" "No s'ha pogut llegir la carpeta de còpia correctament \n" "(0x4000-0x5FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2361,7 +2384,7 @@ msgstr "" "No es pot llegir el directori correctament \n" "(0x2000-0x3fff)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2369,7 +2392,7 @@ msgstr "" "No s'ha pogut llegir la capçalera correctament \n" "(0x0000-0x1FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2401,6 +2424,14 @@ 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/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "Ràpid" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "Mipmaps ràpids" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 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." @@ -2429,7 +2460,7 @@ msgstr "" "L'arxiu no s'ha pogut obrir \n" "o no té una extensió vàlida" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2467,11 +2498,11 @@ msgstr "Primer Bloc" msgid "Fix Checksums" msgstr "Arregla les sumes de comprovació" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "Forçar 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "Forçar 4:3" @@ -2479,11 +2510,11 @@ msgstr "Forçar 4:3" msgid "Force Console as NTSC-J" msgstr "Força la consola com NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" msgstr "Forçar Filtrat de textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2518,7 +2549,7 @@ msgstr "" "Sent desactivat, dolphin posa per defecte NTSC-U i automàticament ho activa " "quant es juga amb jocs Japonesos." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2543,7 +2574,7 @@ msgstr "Imatge" msgid "Frame Advance" msgstr "Avançar imatges" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "Bolcat d'imatges utilitzant FFV1" @@ -2563,13 +2594,13 @@ msgstr "Limit d'imatges/s:" msgid "Frames To Record" msgstr "Imatges a Enregistrar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "Visió lliure" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "Francès" @@ -2586,7 +2617,7 @@ msgstr "de" msgid "FullScr" msgstr "Pantalla completa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 msgid "Fullscreen resolution:" msgstr "Resolució de pantalla a pantalla completa:" @@ -2630,8 +2661,8 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Configuració control «&Gamecube»" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Targetes de memòria per GameCube (*.raw, *.gcp)" @@ -2653,9 +2684,9 @@ 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/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -2663,9 +2694,9 @@ msgstr "General" msgid "General Settings" msgstr "Configuració General" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "Alemany" @@ -2688,11 +2719,14 @@ msgstr "Configuració de gràfics" msgid "Greater Than" msgstr "Més gran que" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#, fuzzy msgid "" -"Greatly increases quality of textures generated using render-to-texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2727,11 +2761,11 @@ msgstr "Guitarra" 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:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "Modificacions" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Comprovació de la checksum de capçalera ha fallat" @@ -2768,7 +2802,7 @@ msgstr "" msgid "Hide" msgstr "Oculta" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "Ocultar el cursor del ratolí" @@ -2795,8 +2829,8 @@ msgstr "Amfitrió" msgid "Hotkey Configuration" msgstr "Tecla d'accés de configuració" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 msgid "Hotkeys" msgstr "Tecles d'accés" @@ -2880,11 +2914,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:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" msgstr "Ignora els canvis de format" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2898,7 +2932,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 +2974,7 @@ msgstr "" "L'Arxiu importat té extensio sav \n" "però la capçalera és incorrecte" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2952,7 +2986,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -2971,8 +3005,8 @@ msgstr "En Joc" msgid "In-Game" msgstr "En-joc" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "Info" @@ -3015,7 +3049,7 @@ msgstr "" "InstallExceptionHandler cridat, però aquesta plataforma no està suportada " "encara." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 msgid "Installing WAD..." msgstr "Instal·lant WAD ..." @@ -3044,7 +3078,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "Error intern LZO - lzo_init () ha fallat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 msgid "Internal Resolution:" msgstr "Resolució Interna:" @@ -3097,9 +3131,9 @@ msgstr "Enregistrament de fitxer invàlid" msgid "Invalid state" msgstr "Estat invàlid" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "Italià" @@ -3160,8 +3194,8 @@ msgstr "Últim estat sobreescrit" msgid "Last Saved State" msgstr "Últim estat desat" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "Esquerra" @@ -3207,7 +3241,7 @@ msgstr "Limitar per FPS " msgid "Load" msgstr "Carregar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Load Custom Textures" msgstr "Carrega textures personalitzades" @@ -3247,16 +3281,16 @@ msgstr "Carregar ranura d'estat 8" msgid "Load State..." msgstr "Carregar Estat..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Load Wii System Menu" msgstr "Carregar el menú del sistema Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 #, 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:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3298,8 +3332,8 @@ msgstr "Tipus de registre Log" msgid "Logger Outputs" msgstr "Sortides del registrador Log" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "Inici de sessió" @@ -3333,8 +3367,8 @@ msgstr "Modificació de velocitat MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Arxius MadCatz Gameshark (*.gcs)" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Palanca principal" @@ -3363,8 +3397,8 @@ msgstr "Targeta de memòria ja oberta." msgid "Memory Byte" msgstr "Byte de memòria" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 msgid "Memory Card" msgstr "Targeta de memòria" @@ -3393,7 +3427,7 @@ msgstr "" "%s \n" "Voleu copiar el fitxer antic a aquesta nova ubicació? \n" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "" "La mida de la targeta de memòria no correspon a la mida de la capçalera" @@ -3411,7 +3445,7 @@ msgstr "Micròfon" msgid "Min" msgstr "Mínim" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "Altres" @@ -3424,7 +3458,7 @@ msgstr "Altres Configuracions" msgid "Modifier" msgstr "Modificador" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3449,7 +3483,7 @@ msgstr "Motion Plus®" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3564,9 +3598,9 @@ msgstr "NP Tabulador" msgid "NP Up" msgstr "NP Amunt" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Nom:" @@ -3651,7 +3685,7 @@ msgstr "No igual" msgid "Not Set" msgstr "Sense establir" -#: Source/Core/DolphinWX/Src/Main.cpp:607 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Not connected" msgstr "No està connectat" @@ -3680,8 +3714,8 @@ msgstr "Bloq Numèric" msgid "Number Of Codes: " msgstr "Nombre de codis:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "Nunchukâ„¢" @@ -3710,8 +3744,8 @@ msgstr "Desplaçament:" msgid "Only %d blocks available" msgstr "Només queden %d blocs disponibles" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Open" msgstr "Obrir" @@ -3741,11 +3775,11 @@ 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:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "Descodificador de textura OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "Activar descodificador de textura OpenMP" @@ -3776,8 +3810,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:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "Altres" @@ -3842,13 +3876,13 @@ msgstr "Pegats" msgid "Paths" msgstr "Camins" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "Pausa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Per-Pixel Lighting" msgstr "Il·luminació per píxel" @@ -3861,10 +3895,10 @@ msgstr "Perfecte" msgid "Perspective %d" msgstr "Perspectiva %d" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 msgid "Play" msgstr "Executar" @@ -3888,7 +3922,7 @@ msgstr "Opcions de reproducció" msgid "Players" msgstr "Jugadors" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 msgid "Please confirm..." msgstr "Confirmeu ..." @@ -3933,7 +3967,7 @@ msgstr "Portuguès" msgid "Portuguese (Brazilian)" msgstr "Portuguès (Brasil)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "Efectes de post-procés:" @@ -3992,7 +4026,7 @@ msgstr "Botó R" msgid "R-Analog" msgstr "R-Analògic" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "RAM" @@ -4008,7 +4042,7 @@ msgstr "Rang" msgid "Read-only mode" msgstr "Només lectura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "Real" @@ -4069,9 +4103,9 @@ msgstr "" "\n" "Si no n'esteu segurs, seleccioneu Cap" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Actualitzar" @@ -4083,14 +4117,14 @@ msgstr "Actualitzar llista" msgid "Refresh game list" msgstr "Actualitza la llista de jocs" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Remove" msgstr "Treure" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4100,12 +4134,12 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "Renderitzar a la finestra principal" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -4117,8 +4151,8 @@ msgstr "Resultats" msgid "Return" msgstr "Tornar" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "Dreta" @@ -4143,13 +4177,17 @@ msgstr "Rússia" msgid "Sa&ve State" msgstr "&Desa l'estat" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "Segur" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "Freqüència de mostreig:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Desar" @@ -4215,6 +4253,10 @@ msgstr "Desar GCM/ISO descomprimit" 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:401 +msgid "Scaled EFB Copy" +msgstr "Copia EFB escalada" + #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format msgid "Scanning %s" @@ -4250,17 +4292,17 @@ msgstr "Cercar en subcarpetes" msgid "Section %s not found in SYSCONF" msgstr "La secció %s no trobada a SYSCONF" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "Seleccionar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "Seleccionar el fitxer de gravació" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 msgid "Select a Wii WAD file to install" msgstr "Seleccionar un fitxer WAD de Wii per instal·lar" @@ -4285,15 +4327,15 @@ msgstr "Seleccioneu finestres flotants" msgid "Select the file to load" msgstr "Seleccioneu el fitxer a carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Select the save file" msgstr "Seleccioneu el fitxer de partida desada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Seleccioneu l'estat a carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "Select the state to save" msgstr "Seleccioneu l'estat a desar" @@ -4434,11 +4476,11 @@ msgstr "Mostrar Barra d'&eines" msgid "Show Drives" msgstr "Mostrar unitats" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "Mostrar regions de copia EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "Mostra FPS (imatges/s)" @@ -4450,7 +4492,7 @@ msgstr "Mostrar França" msgid "Show GameCube" msgstr "Mostrar GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "Mostrar entrada" @@ -4486,7 +4528,7 @@ msgstr "Mostrar Plataformes" msgid "Show Regions" msgstr "Mostrar Regions" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "Mostrar estadístiques" @@ -4540,7 +4582,7 @@ msgstr "Mostra icona de desar" msgid "Show save title" msgstr "Mostra títol desat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4560,7 +4602,7 @@ msgstr "Mostra aquest missatge d'ajuda" msgid "Show unknown" msgstr "Mostrar desconeguda" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -4586,15 +4628,15 @@ msgstr "Mida" msgid "Skip BIOS" msgstr "Saltar BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "Salta pas Dest. Alpha" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "Salta l'accés d'EFB des de la CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4606,6 +4648,23 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Augmenta lleugerament la velocitat del EFB a la RAM, reduint així la " +"precisió d'emulació.\n" +"Alguns vegades fins i tot, pot millorar la qualitat visual.\n" +"Si detecteu problemes, proveu d'augmentar la precisió de la memòria cau de " +"textura o desactivar aquesta opció.\n" +"\n" +"Si no n'esteu segurs, deixeu-ho desmarcat." + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4659,9 +4718,9 @@ msgstr "Ha fallat la creació del buffer de so: %s" msgid "Space" msgstr "Espai" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "Espanyol" @@ -4669,7 +4728,7 @@ msgstr "Espanyol" msgid "Speaker Volume:" msgstr "Volum de l'altaveu:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 " @@ -4706,9 +4765,9 @@ msgstr "Palanca quadrada" msgid "Standard Controller" msgstr "Control estàndard" +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Start" @@ -4736,14 +4795,28 @@ msgstr "Estats desats" msgid "Stick" msgstr "Palanca" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Aturar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" +"Guarda les còpies del EFB en objectes de textura de la GPU.\n" +"Això no és precís, però funciona suficientment bé per la majoria de jocs i " +"millora de forma important la velocitat en comparació de l'EFB a la RAM.\n" +"\n" +"Si no n'esteu segurs, deixeu-ho desmarcat." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "Ajustar a la finestra" @@ -4777,8 +4850,8 @@ msgstr "Idioma del sistema:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "Entrada TAS" @@ -4798,9 +4871,9 @@ msgstr "Taula esquerra" msgid "Table Right" msgstr "Taula dreta" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "Capturar pantalla" @@ -4808,7 +4881,15 @@ msgstr "Capturar pantalla" msgid "Test" msgstr "Prova" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "Textura" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +msgid "Texture Cache" +msgstr "Memòria cau de textura" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" msgstr "Superposició del format de textura" @@ -4853,7 +4934,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:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "L'arxiu especificat (%s) no existeix" @@ -4870,12 +4951,24 @@ 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:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +msgstr "" +"Quant més segura ajusteu això, més probablement l'emulador no es saltarà " +"actualitzacions de textura de la RAM.\n" +"\n" +"Si no n'esteu segur, deixeu-ho al segon valor més ràpid de la dreta." + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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:363 +#: Source/Core/DolphinWX/Src/Main.cpp:353 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4944,7 +5037,7 @@ msgstr "" 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:119 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. " @@ -5020,13 +5113,13 @@ msgstr "a" msgid "Toggle All Log Types" msgstr "Activar tots els tipus de registre de Log" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Activar pantalla completa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Top" msgstr "Dalt" @@ -5034,7 +5127,7 @@ msgstr "Dalt" msgid "Traditional Chinese" msgstr "Xinés tradicional" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "S'ha intentat de carregar un tipus de fitxer desconegut." @@ -5070,8 +5163,8 @@ msgstr "Tipus" msgid "UDP Port:" msgstr "Port UDP:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "Wiimote UDP" @@ -5145,8 +5238,8 @@ msgstr "" "Punter desconegud %#08x\n" "Voleu continuar?" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "Amunt" @@ -5163,7 +5256,7 @@ msgstr "Wiimote vertical" msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utilitzar mode EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 msgid "Use Fullscreen" msgstr "Utilitzar pantalla completa" @@ -5175,7 +5268,7 @@ msgstr "Utilitzeu hexagonal" msgid "Use Panic Handlers" msgstr "Utilitzar advertències" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5188,7 +5281,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5203,11 +5296,11 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "Utilitat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "Sincronització Vertical" @@ -5231,8 +5324,7 @@ msgstr "Verbositat" msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "Virtual" @@ -5259,21 +5351,21 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Advertència" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 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:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "Advertència - Inicialitzant ELF en mode de consola incorrecte!" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "Advertència - Inicialitzant ISO en mode de consola incorrecte!" @@ -5312,7 +5404,7 @@ msgstr "WaveFileWriter - Fitxer no obert." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "Modificació de pantalla panoràmica" @@ -5336,7 +5428,7 @@ msgstr "Arrel de la NAND:" msgid "Wii Save Import" msgstr "Importar partida guardada Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 msgid "Wii save files (*.bin)|*.bin" msgstr "Arxius de partida guardada Wii (*.bin)|*.bin" @@ -5344,8 +5436,8 @@ 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/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "Wiimote" @@ -5367,7 +5459,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:609 +#: Source/Core/DolphinWX/Src/Main.cpp:599 msgid "Wiimote Connected" msgstr "Wiimote connectat" @@ -5399,7 +5491,7 @@ msgstr "Finestra dreta" msgid "Word Wrap" msgstr "Envoltant de paraula" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5505,7 +5597,7 @@ msgstr "Codi Zero desconegut per Dolphin: %08x" msgid "[ waiting ]" msgstr "[ Esperant ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5521,7 +5613,7 @@ msgstr "" msgid "[Custom]" msgstr "[ Personalitzar ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5540,7 +5632,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5626,9 +5718,6 @@ msgstr "| O" #~ msgid "< as Default Profile >" #~ msgstr "< com a perfil per defecte >" -#~ msgid "Accuracy:" -#~ msgstr "Precisió:" - #~ msgid "Accurate Texture Cache" #~ msgstr "memòria cau de textura acurada" @@ -5660,18 +5749,6 @@ 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" @@ -5702,6 +5779,9 @@ msgstr "| O" #~ msgid "Debug Only" #~ msgstr "Només per depuració" +#~ msgid "Disable Wiimote Speaker" +#~ msgstr "Desactivar l'altaveu del «Wiimote»" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -5756,9 +5836,6 @@ msgstr "| O" #~ msgid "Enable CPU Access" #~ msgstr "Habilitar l'accés a CPU" -#~ msgid "Enable Cache" -#~ msgstr "Habilitar memòria cau" - #~ msgid "Enable OpenCL" #~ msgstr "Habilitar OpenCL" @@ -5803,12 +5880,6 @@ msgstr "| O" #~ "%s\n" #~ "Aquest fitxer és necessari per a utilitzar DSP LLE" -#~ msgid "Fast" -#~ msgstr "Ràpid" - -#~ msgid "Fast Mipmaps" -#~ msgstr "Mipmaps ràpids" - #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -5920,15 +5991,9 @@ msgstr "| O" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "Requerit per a l'ús de la font japonesa." -#~ msgid "Safe" -#~ msgstr "Segur" - #~ msgid "Scale:" #~ msgstr "Escala:" -#~ msgid "Scaled EFB Copy" -#~ msgstr "Copia EFB escalada" - #~ msgid "Select resolution for fullscreen mode" #~ msgstr "Seleccioneu la resolució pel mode pantalla completa" @@ -5969,22 +6034,6 @@ msgstr "| O" #~ "Mostra diverses estadístiques. \n" #~ "Això només és útil per a propòsits de depuració." -#~ 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" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Augmenta lleugerament la velocitat del EFB a la RAM, reduint així la " -#~ "precisió d'emulació.\n" -#~ "Alguns vegades fins i tot, pot millorar la qualitat visual.\n" -#~ "Si detecteu problemes, proveu d'augmentar la precisió de la memòria cau " -#~ "de textura o desactivar aquesta opció.\n" -#~ "\n" -#~ "Si no n'esteu segurs, deixeu-ho desmarcat." - #~ msgid "" #~ "Specifies the resolution used to render at. A high resolution will " #~ "improve visual quality but is also quite heavy on performance and might " @@ -6016,37 +6065,6 @@ msgstr "| O" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Iniciar la finestra de renderitzat a pantalla completa." -#~ 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" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "Guarda les còpies del EFB en objectes de textura de la GPU.\n" -#~ "Això no és precís, però funciona suficientment bé per la majoria de jocs " -#~ "i millora de forma important la velocitat en comparació de l'EFB a la " -#~ "RAM.\n" -#~ "\n" -#~ "Si no n'esteu segurs, deixeu-ho desmarcat." - -#~ msgid "Texture" -#~ msgstr "Textura" - -#~ msgid "Texture Cache" -#~ msgstr "Memòria cau de textura" - -#~ msgid "" -#~ "The safer you adjust this, the less likely the emulator will be missing " -#~ "any texture updates from RAM.\n" -#~ "\n" -#~ "If unsure, use the second-fastest value from the right." -#~ msgstr "" -#~ "Quant més segura ajusteu això, més probablement l'emulador no es saltarà " -#~ "actualitzacions de textura de la RAM.\n" -#~ "\n" -#~ "Si no n'esteu segur, deixeu-ho al segon valor més ràpid de la dreta." - #~ msgid "Use FPS For Limiting" #~ msgstr "Limitar imatges/s (FPS)" diff --git a/Languages/po/cs.po b/Languages/po/cs.po index c2fd0e0c0f..bae31930e7 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: 2011-08-10 08:30-0500\n" +"POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-08-10 20:37+0100\n" "Last-Translator: ZbynÄ›k Schwarz \n" "Language-Team: \n" @@ -30,7 +30,7 @@ msgstr " Hra : " msgid "! NOT" msgstr "! NE" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -72,7 +72,7 @@ msgstr "%s už existuje, pÅ™epsat?" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s nelze vyÄistit. Obraz je pravdÄ›podobnÄ› poÅ¡kozen." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -81,7 +81,7 @@ msgstr "" "%s nelze naÄíst jako paměťovou kartu\n" "Soubor karty je neplatný (0x%x bajtů)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -90,7 +90,7 @@ msgstr "" "%s nelze naÄíst jako paměťovou kartu\n" "Velikost karty je neplatná (0x%x bajtů)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -307,7 +307,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(NEZNÃMÃ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(vypnuto)" @@ -319,7 +319,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "3D Vision" @@ -331,7 +331,7 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "<Žádné rozliÅ¡ení nenalezeno>" @@ -417,17 +417,22 @@ msgstr "O Dolphinu" msgid "Acceleration" msgstr "Zrychlení" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "PÅ™esnost:" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "Precizní emulace VBeam" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#, fuzzy msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" "PÅ™esnÄ› emulovat EFB kopie.\n" "NÄ›které hry na tomto závisí pro urÄité grafické efekty nebo herní funkce.\n" @@ -525,12 +530,12 @@ msgstr "Action Replay: Normální Kód %i: Neplatný podtyp %08x (%s)" 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:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "Adaptér:" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "PÅ™idat" @@ -546,9 +551,9 @@ msgstr "PÅ™idat Záplatu" msgid "Add new pane" msgstr "PÅ™idat nový panel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "PÅ™idat..." @@ -596,7 +601,7 @@ 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:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "PokroÄilé" @@ -616,8 +621,8 @@ msgstr "VÅ¡echny obrazy GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "All Save States (sav, s##)" msgstr "VÅ¡echny Uložené Stavy (sav, s##)" @@ -633,7 +638,7 @@ msgstr "VÅ¡echny komprimované soubory GC/WII ISO (gcz)" msgid "All files (*.*)|*.*" msgstr "VÅ¡echny soubory (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -645,11 +650,16 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Emulovaný Wiimote" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" msgstr "Anizotropní Filtrování:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "Vyhlazení okrajů" @@ -669,7 +679,7 @@ msgstr "ZavadÄ›Ä aplikace:" msgid "Apply" msgstr "Použít" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -701,7 +711,7 @@ 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:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "PomÄ›r Stran:" @@ -722,19 +732,19 @@ 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:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Násobek 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "Auto (Velikost Okna)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "Automaticky upravovat Velikost Okna" @@ -748,6 +758,18 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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/WXInputBase.cpp:27 msgid "Back" msgstr "ZpÄ›t" @@ -756,8 +778,8 @@ msgstr "ZpÄ›t" msgid "Backend Settings" msgstr "Nastavení Backendu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Backend:" @@ -791,7 +813,7 @@ msgstr "Plakát:" msgid "Bar" msgstr "Vibráto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "Základní" @@ -803,7 +825,7 @@ msgstr "Základní nastavení" msgid "Bass" msgstr "Basy" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Kontrolní souÄet AlokaÄní Tabulky Bloku selhal" @@ -823,8 +845,8 @@ msgstr "Modrá vlevo" msgid "Blue Right" msgstr "Modrá vpravo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 msgid "Bottom" msgstr "Dole" @@ -857,9 +879,9 @@ msgstr "Procházet pro výstupní adresář" msgid "Buffer:" msgstr "Vyrovnávací paměť:" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "TlaÄítka" @@ -875,11 +897,11 @@ msgstr "Kr-Stick" msgid "CPU Emulator Engine" msgstr "Jádro Emulátoru Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "Ukládat pÅ™edvyt. obj. do vyr. pam." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 " @@ -894,7 +916,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -909,8 +931,8 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "ZruÅ¡it" @@ -958,10 +980,10 @@ msgstr "Nelze najít Wiimote podle bz: %02x:%02x:%02x:%02x:%02x:%02x" 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:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 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" @@ -1083,10 +1105,10 @@ msgstr "Kruhový Stick" msgid "Classic" msgstr "Klasické" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "VyÄistit" @@ -1101,10 +1123,10 @@ msgid "" msgstr "" "Klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru musíte ukonÄit ruÄnÄ›." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Zavřít" @@ -1208,7 +1230,7 @@ msgstr "PÅ™ipojit Wiimote 3" msgid "Connect Wiimote 4" msgstr "PÅ™ipojit Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:608 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Connecting..." msgstr "PÅ™ipojuji..." @@ -1276,7 +1298,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:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1346,11 +1368,11 @@ msgstr "Tvůrce:" msgid "Critical" msgstr "Kritické" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "Oříznout" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1397,8 +1419,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Jádro Emulátoru DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulace (rychlé)" @@ -1447,7 +1469,7 @@ msgstr "Mrtvá Zóna" msgid "Debug" msgstr "LadÄ›ní" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Debugging" msgstr "LadÄ›ní" @@ -1480,8 +1502,8 @@ msgstr "Výchozí ISO:" msgid "Default font" msgstr "Výchozí typ písma" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "Smazat" @@ -1489,12 +1511,12 @@ msgstr "Smazat" msgid "Delete Save" msgstr "Smazat Uloženou Hru" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "Vymazat existující soubor '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 msgid "Description" msgstr "Popis" @@ -1525,15 +1547,15 @@ msgstr "Nastavení Zařízení" msgid "Dial" msgstr "Kruhová stupnice" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1541,32 +1563,28 @@ msgstr "" "Kontrolní souÄet adresáře\n" "i záložní kontrolní souÄet Adresáře selhal" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 msgid "Disable" msgstr "Zakázat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "Zakázat Mlhu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "Zakázat OsvÄ›tlení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "Zakázat Hloubku Podle Pixelu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "Zakázat Textury" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "Zakázat Reproduktor Wiimote" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1580,7 +1598,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1596,7 +1614,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1615,11 +1633,11 @@ msgstr "Disk" msgid "Disc Read Error" msgstr "Chyba Ätení disku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1633,7 +1651,7 @@ msgstr "" msgid "Divide" msgstr "RozdÄ›lit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Do you want to stop the current emulation?" msgstr "Chcete souÄasnou emulaci zastavit?" @@ -1641,7 +1659,7 @@ msgstr "Chcete souÄasnou emulaci zastavit?" msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafická Nastavení" @@ -1662,12 +1680,12 @@ msgstr "Nastavení Emulovaného Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Nastavení" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" @@ -1695,8 +1713,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/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Dolů" @@ -1721,19 +1739,19 @@ msgstr "Atrapa" msgid "Dump Audio" msgstr "Vypsat Zvuk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "Vypsat Cíl EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "Vypsat Snímky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "Vypsat Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1743,7 +1761,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1753,7 +1771,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1763,9 +1781,9 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "NizozemÅ¡tina" @@ -1773,7 +1791,7 @@ msgstr "NizozemÅ¡tina" msgid "E&xit" msgstr "O&dejít" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" msgstr "EFB Kopie" @@ -1826,7 +1844,7 @@ msgstr "Upravit" msgid "Effect" msgstr "Efekt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "VnoÅ™ená Vyr. PamÄ›t Snímků" @@ -1834,7 +1852,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:111 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1848,7 +1866,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:110 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1876,7 +1894,7 @@ msgstr "Stav Emulace:" msgid "Enable" msgstr "Povolit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1908,6 +1926,10 @@ msgstr "Zapnout BAT" msgid "Enable Block Merging" msgstr "Zapnout SluÄování Bloků" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +msgid "Enable Cache" +msgstr "Povolit vyrovnávací paměť" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "Povolit Cheaty" @@ -1924,7 +1946,7 @@ msgstr "Povolit dvojité jádro" msgid "Enable Dual Core (speedup)" msgstr "Zapnout dvojité jádro (zrychlení)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "Povolit klávesové zkratky" @@ -1940,8 +1962,8 @@ msgstr "Povolit PÅ™eskakování NeÄinných Příkazů (zrychlení)" msgid "Enable MMU" msgstr "Zapnout MMU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "Povolit Progresivní Skenování" @@ -1953,7 +1975,7 @@ msgstr "Povolit SpoÅ™iÄ Obrazovky" msgid "Enable WideScreen" msgstr "Povolit Å irokoúhlou obrazovku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "Povolit DrátÄ›ný Model" @@ -2050,7 +2072,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:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2064,14 +2086,14 @@ msgstr "" msgid "End" msgstr "End" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "AngliÄtina" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "VylepÅ¡ení" @@ -2093,13 +2115,13 @@ msgstr "Záznam 1/%d" msgid "Equal" msgstr "Rovná se" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "Chyba" -#: Source/Core/DolphinWX/Src/Main.cpp:356 +#: Source/Core/DolphinWX/Src/Main.cpp:346 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." @@ -2174,7 +2196,7 @@ msgstr "Exportovat Uloženou hru jako..." msgid "Extension" msgstr "Rozšíření" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "VnÄ›jší Vyr. Paměť Snímků" @@ -2296,7 +2318,7 @@ msgstr "Nelze nahrát hid.dll" msgid "Failed to read banner.bin" msgstr "Nelze Äíst z banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2304,7 +2326,7 @@ msgstr "" "Nelze správnÄ› Äíst zálohu alokaÄní tabulky bloku\n" "(0x8000-0x9FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2317,7 +2339,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Nelze Äíst data ze souboru %d" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2325,7 +2347,7 @@ msgstr "" "Nelze správnÄ› Äíst zálohu adresáře\n" "(0x4000-0x5FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2333,7 +2355,7 @@ msgstr "" "Nelze správnÄ› Äíst adresář\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2341,7 +2363,7 @@ msgstr "" "Nelze správnÄ› Äíst hlaviÄku\n" "(0x0000-0x1FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2373,6 +2395,14 @@ 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/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "Rychlá" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "Rychlé Mipmapy" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rychlá verze MMU. Nefunguje v každé hÅ™e." @@ -2401,7 +2431,7 @@ msgstr "" "Soubor nelze otevřít\n" "nebo nemá platnou příponu" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2439,11 +2469,11 @@ msgstr "První blok" msgid "Fix Checksums" msgstr "Spravit Kontrolní SouÄty" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "Vynutit 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "Vynutit 4:3" @@ -2451,11 +2481,11 @@ msgstr "Vynutit 4:3" msgid "Force Console as NTSC-J" msgstr "Donutit konzoli být jako NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" msgstr "Vynutit Filtrování Textur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2489,7 +2519,7 @@ msgstr "" "Pokud není zaÅ¡krtnuto, Dolphin standardnÄ› pÅ™ejde na NTSC-U a automaticky " "zapne toto nastavení pÅ™i hraní Japonských her." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2514,7 +2544,7 @@ msgstr "Snímek" msgid "Frame Advance" msgstr "Postup Snímkem" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "Uložení snímků použije FFV1" @@ -2534,13 +2564,13 @@ msgstr "Limit Snímků:" msgid "Frames To Record" msgstr "Snímky k Nahrání" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "Rozhlížení pomocí myÅ¡i" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "FrancouzÅ¡tina" @@ -2557,7 +2587,7 @@ msgstr "Z" msgid "FullScr" msgstr "CelObr" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 msgid "Fullscreen resolution:" msgstr "RozliÅ¡ení celé obrazovky:" @@ -2601,8 +2631,8 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Nastavení Gamecube &Pad" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" @@ -2624,9 +2654,9 @@ msgstr "" "Nelze spustit GeckoKód (CT%i CST%i) (%s)\n" "(buÄ Å¡patný kód, nebo typ kódu není jeÅ¡tÄ› podporován.)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Obecné" @@ -2634,9 +2664,9 @@ msgstr "Obecné" msgid "General Settings" msgstr "Obecná Nastavení" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "NÄ›mÄina" @@ -2657,11 +2687,14 @@ msgstr "Grafická nastavení" msgid "Greater Than" msgstr "VÄ›tší než" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#, fuzzy msgid "" -"Greatly increases quality of textures generated using render-to-texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2695,11 +2728,11 @@ msgstr "Kytara" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Byl zavolán HCI_CMD_INQUIRY, prosím ohlaste!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "Hacky" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Kontrolní souÄet hlaviÄky selhal" @@ -2735,7 +2768,7 @@ msgstr "" msgid "Hide" msgstr "Skrýt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "Skrýt kurzor myÅ¡i" @@ -2762,8 +2795,8 @@ msgstr "Hostovat" msgid "Hotkey Configuration" msgstr "Nastavení klávesových zkratek" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 msgid "Hotkeys" msgstr "Klávesové zkratky" @@ -2844,11 +2877,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:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" msgstr "Ignorovat ZmÄ›ny Formátu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2862,7 +2895,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 " @@ -2904,7 +2937,7 @@ msgstr "" "\"Importovaný soubor má příponu sav\n" "ale nemá správnou hlaviÄku\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2916,7 +2949,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -2934,8 +2967,8 @@ msgstr "Ve HÅ™e" msgid "In-Game" msgstr "Ve HÅ™e" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "Info" @@ -2978,7 +3011,7 @@ msgstr "" "Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› " "nepodporuje." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 msgid "Installing WAD..." msgstr "Instaluji WAD..." @@ -3007,7 +3040,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "VnitÅ™ní chyba LZO - lzo_init() selhalo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 msgid "Internal Resolution:" msgstr "VnitÅ™ní RozliÅ¡ení:" @@ -3060,9 +3093,9 @@ msgstr "Neplatný soubor s nahrávkou" msgid "Invalid state" msgstr "Neplatný stav" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "ItalÅ¡tina" @@ -3123,8 +3156,8 @@ msgstr "Poslední PÅ™epsaný Stav" msgid "Last Saved State" msgstr "Poslední Uložený Stav" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "Vlevo" @@ -3170,7 +3203,7 @@ msgstr "Limitovat podle SzS" msgid "Load" msgstr "Nahrát" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Load Custom Textures" msgstr "Nahrát Vlastní Textury" @@ -3210,16 +3243,16 @@ msgstr "Nahrát Slot Stavu 8" msgid "Load State..." msgstr "Nahrát Stav..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Load Wii System Menu" msgstr "Nahrát Systémové Menu Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 #, 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:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3261,8 +3294,8 @@ msgstr "Typy Záznamu" msgid "Logger Outputs" msgstr "Výstup ZapisovaÄe" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "Protokolování" @@ -3296,8 +3329,8 @@ msgstr "MMU Hack Rychlosti" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Soubory MadCatz Gameshark (*.gcs)" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Hlavní Stick" @@ -3326,8 +3359,8 @@ msgstr "Pam. karta již otevÅ™ena" msgid "Memory Byte" msgstr "Bajt PamÄ›ti" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 msgid "Memory Card" msgstr "Paměťová karta" @@ -3356,7 +3389,7 @@ msgstr "" "%s\n" "ChtÄ›li byste starý soubor zkopírovat do nového umístÄ›ní?\n" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "Velikost paměťové karty se neshoduje s velikosti hlaviÄky" @@ -3373,7 +3406,7 @@ msgstr "Mikrofon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "Ostatní" @@ -3386,7 +3419,7 @@ msgstr "Ostatní Nastavení" msgid "Modifier" msgstr "Modifikátor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3411,7 +3444,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3525,9 +3558,9 @@ msgstr "NK Tab" msgid "NP Up" msgstr "NK Nahoru" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Jméno:" @@ -3612,7 +3645,7 @@ msgstr "Nerovná se" msgid "Not Set" msgstr "Nenastaven" -#: Source/Core/DolphinWX/Src/Main.cpp:607 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Not connected" msgstr "NepÅ™ipojen" @@ -3641,8 +3674,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "PoÄet Kódů:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "NunÄak" @@ -3671,8 +3704,8 @@ msgstr "Logická Adresa:" msgid "Only %d blocks available" msgstr "Pouze bloky %d jsou dostupné" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Open" msgstr "Otevřít" @@ -3702,11 +3735,11 @@ 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:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "OpenCL Dekodér Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "OpenMP Dekodér Textury" @@ -3737,8 +3770,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:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "Jiné" @@ -3802,13 +3835,13 @@ msgstr "Záplaty" msgid "Paths" msgstr "Cesty" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "Pozastavit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Per-Pixel Lighting" msgstr "OsvÄ›tlení Podle Pixelu" @@ -3821,10 +3854,10 @@ msgstr "Dokonalá" msgid "Perspective %d" msgstr "Perspektiva %d" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 msgid "Play" msgstr "Spustit" @@ -3848,7 +3881,7 @@ msgstr "Možnosti PÅ™ehrávání" msgid "Players" msgstr "HráÄi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 msgid "Please confirm..." msgstr "Prosím potvrÄte..." @@ -3893,7 +3926,7 @@ msgstr "PortugalÅ¡tina" msgid "Portuguese (Brazilian)" msgstr "PortugalÅ¡tina (Brazilská)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "Efekt Následného Zpracování:" @@ -3952,7 +3985,7 @@ msgstr "TlaÄítko R" msgid "R-Analog" msgstr "Pravý Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "RAM" @@ -3968,7 +4001,7 @@ msgstr "Rozsah" msgid "Read-only mode" msgstr "Režim pouze pro Ätení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "Opravdová" @@ -4028,9 +4061,9 @@ msgstr "" "\n" "Pokud si nejste jisti, vyberte Žádný." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Obnovit" @@ -4042,14 +4075,14 @@ msgstr "Obnovit Seznam" msgid "Refresh game list" msgstr "Obnovit seznam her" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Remove" msgstr "Odstranit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4059,12 +4092,12 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "Vykreslit do Hlavního okna" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Resetovat" @@ -4076,8 +4109,8 @@ msgstr "Výsledky" msgid "Return" msgstr "Enter" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "Vpravo" @@ -4102,13 +4135,17 @@ msgstr "RuÅ¡tina" msgid "Sa&ve State" msgstr "Uložit Sta&v" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "BezpeÄná" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "Vzorkovací frekvence:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Uložit" @@ -4174,6 +4211,10 @@ msgstr "Uložit dekomprimované GCM/ISO" 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:401 +msgid "Scaled EFB Copy" +msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" + #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format msgid "Scanning %s" @@ -4209,17 +4250,17 @@ msgstr "Hledat Podadresáře" msgid "Section %s not found in SYSCONF" msgstr "Sekce %s nebyla v SYSCONF nalezena" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "Vybrat" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "Vyberte Soubor s Nahrávkou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" @@ -4245,15 +4286,15 @@ msgstr "Vybrat plovoucí okna" msgid "Select the file to load" msgstr "Vyberte soubor k nahrání" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Vyberte stav k nahrání" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "Select the state to save" msgstr "Vyberte stav k uložení" @@ -4391,11 +4432,11 @@ msgstr "Zobrazit Panel Nás&trojů" msgid "Show Drives" msgstr "Zobrazit Disky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "Zobrazit EFB Regiony Kopie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "Zobrazit Snímky za Sekundu" @@ -4407,7 +4448,7 @@ msgstr "Zobrazit Francii" msgid "Show GameCube" msgstr "Zobrazit GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "Zobrazit Obrazovku Vstupu" @@ -4443,7 +4484,7 @@ msgstr "Zobrazit Platformy" msgid "Show Regions" msgstr "Zobrazit Regiony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "Zobrazit Statistiky" @@ -4497,7 +4538,7 @@ msgstr "Zobrazit ikonu uložení" msgid "Show save title" msgstr "Zobrazit název uložení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4517,7 +4558,7 @@ msgstr "Zobrazit tuto zprávu nápovÄ›dy" msgid "Show unknown" msgstr "Zobrazit neznámé" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -4543,15 +4584,15 @@ msgstr "Velikost" msgid "Skip BIOS" msgstr "PÅ™eskoÄit BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "Vypnout Průchod Cíl. Průhl." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "PÅ™eskoÄit EFB Přístup z Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4563,6 +4604,22 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Lehce zrychlí kopie EFB do RAM obÄ›továním pÅ™esnosti emulace.\n" +"NÄ›kdy také zvýší kvalitu obrazu.\n" +"Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit pÅ™esnost textury, " +"nebo tuto možnost vypnout.\n" +"\n" +"Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4616,9 +4673,9 @@ msgstr "VytvoÅ™ení vyrovnávací pamÄ›ti zvuku selhalo: %s" msgid "Space" msgstr "Mezerník" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "Å panÄ›lÅ¡tina" @@ -4626,7 +4683,7 @@ msgstr "Å panÄ›lÅ¡tina" msgid "Speaker Volume:" msgstr "Hlasitost Reproduktoru:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 " @@ -4662,9 +4719,9 @@ msgstr "ÄŒtvercový Stick" msgid "Standard Controller" msgstr "Standardní OvladaÄ" +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Start" @@ -4692,14 +4749,28 @@ msgstr "Ukládání stavu" msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Zastavit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" +"Ukládat EFB kopie do objektů textury grafického procesoru.\n" +"Toto není pÅ™esné, ale pro vÄ›tÅ¡inu her funguje dostateÄnÄ› dobÅ™e a dává vÄ›tší " +"zrychlení než EFB do RAM.\n" +"\n" +"Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "Roztáhnout do Okna" @@ -4733,8 +4804,8 @@ msgstr "Jazyk Systému:" msgid "TAIWAN" msgstr "TCHAJ-WAN" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS Vstup" @@ -4754,9 +4825,9 @@ msgstr "Deska vlevo" msgid "Table Right" msgstr "Deska vpravo" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "VytvoÅ™it Snímek Obrazovky" @@ -4764,7 +4835,15 @@ msgstr "VytvoÅ™it Snímek Obrazovky" msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "Textura" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +msgid "Texture Cache" +msgstr "Vyrovnávací Paměť Textur" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" msgstr "PÅ™ekryv Formátu Textury" @@ -4809,7 +4888,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:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Zadaný soubor (%s) neexistuje" @@ -4826,11 +4905,23 @@ 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:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +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." + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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:363 +#: Source/Core/DolphinWX/Src/Main.cpp:353 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4899,7 +4990,7 @@ msgstr "" 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:119 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. " @@ -4974,13 +5065,13 @@ msgstr "Do" msgid "Toggle All Log Types" msgstr "Zapnout VÅ¡echny Typy Záznamů" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "PÅ™epnout na Celou Obrazovku" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Top" msgstr "NahoÅ™e" @@ -4988,7 +5079,7 @@ msgstr "NahoÅ™e" msgid "Traditional Chinese" msgstr "TradiÄní ČínÅ¡tina" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "Pokus o naÄtení souboru neznámého typu." @@ -5024,8 +5115,8 @@ msgstr "Typ" msgid "UDP Port:" msgstr "UDP Port:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5098,8 +5189,8 @@ msgstr "" "Neznámý ukazatel %#08x\n" "PokraÄovat?" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "Nahoru" @@ -5116,7 +5207,7 @@ msgstr "Svislý Wiimote" msgid "Use EuRGB60 Mode (PAL60)" msgstr "Použít režim EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 msgid "Use Fullscreen" msgstr "Použít Celou Obrazovku" @@ -5128,7 +5219,7 @@ msgstr "Použít Å estnáctkovou soustavu" msgid "Use Panic Handlers" msgstr "Použít Obslužné Rutiny Paniky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5141,7 +5232,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5155,11 +5246,11 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "Pomůcky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "V-Synch" @@ -5183,8 +5274,7 @@ msgstr "Úroveň" msgid "Video" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "Virtuální" @@ -5211,21 +5301,21 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Varování" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 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:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "Varování - ELF se spouÅ¡tí ve Å¡patném režimu konzole!" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "Varování - ISO se spouÅ¡tí ve Å¡patném režimu konzole!" @@ -5262,7 +5352,7 @@ msgstr "WaveFileWriter - soubor není otevÅ™en." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "Hack Å irokoúhlého obrazu" @@ -5286,7 +5376,7 @@ msgstr "Wii KoÅ™en NAND:" msgid "Wii Save Import" msgstr "Import uložených pozic Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -5294,8 +5384,8 @@ msgstr "Wii soubory s uložením (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD Nelze Äíst ze souboru" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "Wiimote" @@ -5317,7 +5407,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:609 +#: Source/Core/DolphinWX/Src/Main.cpp:599 msgid "Wiimote Connected" msgstr "Wiimote PÅ™ipojen" @@ -5349,7 +5439,7 @@ msgstr "Klávesa Windows Vpravo" msgid "Word Wrap" msgstr "Zalamování textu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5457,7 +5547,7 @@ msgstr "Nulový kód, který dolphin nezná: %08x" msgid "[ waiting ]" msgstr "[ Äekám ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5473,7 +5563,7 @@ msgstr "" msgid "[Custom]" msgstr "[Vlastní]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5492,7 +5582,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5599,9 +5689,6 @@ msgstr "| NEBO" #~ msgid "< as Default Profile >" #~ msgstr "< jako Výchozí Profil >" -#~ msgid "Accuracy:" -#~ msgstr "PÅ™esnost:" - #~ msgid "Accurate Texture Cache" #~ msgstr "Precizní Vyrovnávací Paměť Textur" @@ -5633,17 +5720,6 @@ 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" @@ -5677,6 +5753,9 @@ msgstr "| NEBO" #~ msgid "Danish" #~ msgstr "DánÅ¡tina" +#~ msgid "Disable Wiimote Speaker" +#~ msgstr "Zakázat Reproduktor Wiimote" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -5722,9 +5801,6 @@ msgstr "| NEBO" #~ msgid "Enable CPU Access" #~ msgstr "Povolit Přístup k Procesoru" -#~ msgid "Enable Cache" -#~ msgstr "Povolit vyrovnávací paměť" - #~ msgid "Enable Copy to EFB" #~ msgstr "Povolit Kopírování do EFB" @@ -5783,12 +5859,6 @@ msgstr "| NEBO" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Nelze nahrát DSP ROM : %s" -#~ msgid "Fast" -#~ msgstr "Rychlá" - -#~ msgid "Fast Mipmaps" -#~ msgstr "Rychlé Mipmapy" - #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -5902,15 +5972,9 @@ msgstr "| NEBO" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "Nutné pro použití Japonského písma ROM" -#~ msgid "Safe" -#~ msgstr "BezpeÄná" - #~ msgid "Scale:" #~ msgstr "ZmÄ›na Velikosti:" -#~ msgid "Scaled EFB Copy" -#~ msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" - #~ msgid "Select resolution for fullscreen mode" #~ msgstr "Vyberte rozliÅ¡ení v režimu celé obrazovky" @@ -5955,21 +6019,6 @@ msgstr "| NEBO" #~ "Zobrazí různé statistiky.\n" #~ "Jsou užiteÄné pouze pro úÄely ladÄ›ní." -#~ 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" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Lehce zrychlí kopie EFB do RAM obÄ›továním pÅ™esnosti emulace.\n" -#~ "NÄ›kdy také zvýší kvalitu obrazu.\n" -#~ "Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit pÅ™esnost " -#~ "textury, nebo tuto možnost vypnout.\n" -#~ "\n" -#~ "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." - #~ msgid "Slot" #~ msgstr "Slot" @@ -6003,36 +6052,6 @@ msgstr "| NEBO" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Spustí vykreslovací okno v režimu celé obrazovky." -#~ 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" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "Ukládat EFB kopie do objektů textury grafického procesoru.\n" -#~ "Toto není pÅ™esné, ale pro vÄ›tÅ¡inu her funguje dostateÄnÄ› dobÅ™e a dává " -#~ "vÄ›tší zrychlení než EFB do RAM.\n" -#~ "\n" -#~ "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." - -#~ msgid "Texture" -#~ msgstr "Textura" - -#~ msgid "Texture Cache" -#~ msgstr "Vyrovnávací Paměť Textur" - -#~ msgid "" -#~ "The safer you adjust this, the less likely the emulator will be missing " -#~ "any texture updates from RAM.\n" -#~ "\n" -#~ "If unsure, use the second-fastest value from the right." -#~ 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." - #~ msgid "Use FPS For Limiting" #~ msgstr "Použít SzS pro Omezení" diff --git a/Languages/po/de.po b/Languages/po/de.po index c3fa802fdd..836afc91d3 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: 2011-08-10 08:30-0500\n" +"POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-02-17 01:23+0100\n" "Last-Translator: LucasX \n" "Language-Team: \n" @@ -30,7 +30,7 @@ msgstr " Spiel: " msgid "! NOT" msgstr "! NICHT" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -74,7 +74,7 @@ msgstr "" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s konnte nicht komprimiert werden, weil das Image fehlerhaft ist." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, fuzzy, c-format msgid "" "%s failed to load as a memorycard \n" @@ -83,7 +83,7 @@ msgstr "" "Memorycard konnte nicht geladen werden,\n" " Die Card-Größe (%04X) ist ungültig." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, fuzzy, c-format msgid "" "%s failed to load as a memorycard \n" @@ -92,7 +92,7 @@ msgstr "" "Memorycard konnte nicht geladen werden,\n" " Die Card-Größe (%04X) ist ungültig." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -307,7 +307,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(UNBEKANNT)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(aus)" @@ -319,7 +319,7 @@ msgstr "16 Bit" msgid "32 bit" msgstr "32 Bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "" @@ -331,7 +331,7 @@ msgstr "8 Bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "" @@ -418,17 +418,21 @@ msgstr "Ãœber Dolphin" msgid "Acceleration" msgstr "Beschleunigung" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "Genaue VBeam Emulation" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 @@ -524,12 +528,12 @@ msgstr "Action Replay: _Normal-Code_ %i: Fehlerhafte _subtype_ %08x (%s)" 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:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "Grafikkarte:" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "Hinzufügen" @@ -545,9 +549,9 @@ msgstr "Patch hinzufügen" msgid "Add new pane" msgstr "Neue Palette hinzufügen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "Hinzufügen..." @@ -595,7 +599,7 @@ 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:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "Erweitert" @@ -616,8 +620,8 @@ msgstr "Alle GC/Wii Images (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM Dateien (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "All Save States (sav, s##)" msgstr "Alle Speicherstände (sav, s##)" @@ -633,7 +637,7 @@ msgstr "Alle komprimierten GC/Wii ISO Dateien (gcz)" msgid "All files (*.*)|*.*" msgstr "Alle Dateien (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -641,11 +645,16 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Emulierte Wiimote" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" msgstr "Anisotropische Filterung:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "Anti-Aliasing:" @@ -666,7 +675,7 @@ msgstr "Apploader:" msgid "Apply" msgstr "Ãœbernehmen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -696,7 +705,7 @@ msgstr "" "Soll die Datei gelöscht werden? Löschen kann nicht Rückgängig gemacht werden." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Seitenverhältnis:" @@ -717,20 +726,20 @@ msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisch" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 #, fuzzy msgid "Auto (Window Size)" msgstr "Fenstergröße:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 #, fuzzy msgid "Auto adjust Window Size" msgstr "Fenstergröße:" @@ -745,6 +754,14 @@ msgstr "" "Nebel Deaktivieren. Verbessert die Performance aber verursacht Fehler in " "Spielen, die richtige Nebel-Emulation benötigen." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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/WXInputBase.cpp:27 msgid "Back" msgstr "Zurück" @@ -753,8 +770,8 @@ msgstr "Zurück" msgid "Backend Settings" msgstr "Backend Einstellungen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 #, fuzzy msgid "Backend:" msgstr "Audio Backend:" @@ -789,7 +806,7 @@ msgstr "Banner:" msgid "Bar" msgstr "Leiste" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "Standard" @@ -801,7 +818,7 @@ msgstr "Grundeinstellungen" msgid "Bass" msgstr "Bass" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Blockzuteilungs-Tabellen-Prüfsumme fehlerhaft." @@ -821,8 +838,8 @@ msgstr "Blau links" msgid "Blue Right" msgstr "Blau rechts" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 msgid "Bottom" msgstr "Unten" @@ -855,9 +872,9 @@ msgstr "Ausgabeverzeichnis auswählen" msgid "Buffer:" msgstr "Buffer:" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "Tasten" @@ -874,12 +891,12 @@ msgstr "C-Stick" msgid "CPU Emulator Engine" msgstr "CPU Emulator Engine" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 #, fuzzy msgid "Cache Display Lists" msgstr "Anzeigeliste zwischenspeichern" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 " @@ -889,7 +906,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -898,8 +915,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Abbrechen" @@ -948,10 +965,10 @@ msgstr "Kann WiiMote bei BD: %02x:%02x:%02x:%02x:%02x:%02x nicht finden." msgid "Cant find WiiMote by connection handle %02x" msgstr "Kann Wiimote bei Verbindungs-Handle %02x nicht finden." -#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Kann von DVD_Plugin/DVD-Schnittstelle nicht lesen: Fataler Fehler" @@ -1076,10 +1093,10 @@ msgstr "" msgid "Classic" msgstr "Klassik" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "Löschen" @@ -1095,10 +1112,10 @@ 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/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Schließen" @@ -1203,7 +1220,7 @@ msgstr "Wiimote 3 verbinden" msgid "Connect Wiimote 4" msgstr "Wiimote 4 verbinden" -#: Source/Core/DolphinWX/Src/Main.cpp:608 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Connecting..." msgstr "Verbinden..." @@ -1273,7 +1290,7 @@ msgstr "" "derzeit!\n" "(Pads während der Emulation einzustellen, wird noch nicht unterstützt.)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1345,11 +1362,11 @@ msgstr "Ersteller: " msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "Abschneiden" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1394,8 +1411,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emulation (schnell)" @@ -1445,7 +1462,7 @@ msgstr "Tote Zone" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 #, fuzzy msgid "Debugging" msgstr "Debug" @@ -1479,8 +1496,8 @@ msgstr "Standard ISO:" msgid "Default font" msgstr "Standard Schriftart" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "Löschen" @@ -1488,12 +1505,12 @@ msgstr "Löschen" msgid "Delete Save" msgstr "Spielstand löschen" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "Wollen Sie die vorhandende Datei '%s' löschen?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 #, fuzzy msgid "Description" msgstr "Frage" @@ -1523,15 +1540,15 @@ msgstr "Geräteeinstellungen" msgid "Dial" msgstr "" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1539,34 +1556,30 @@ msgstr "" "Die Verzeichnis-Prüfsumme ist fehlerhaft,\n" "und ebenfalls die Backup-Verzeichnis-Prüfsumme." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 #, fuzzy msgid "Disable" msgstr "kein Nebel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "kein Nebel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "keine Beleuchtung" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 #, fuzzy msgid "Disable Per-Pixel Depth" msgstr "Farbtiefe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "keine Texturen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1575,7 +1588,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1585,7 +1598,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1601,11 +1614,11 @@ msgstr "Disc" msgid "Disc Read Error" msgstr "Disc Lesefehler" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "Anzeige" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1616,7 +1629,7 @@ msgstr "" msgid "Divide" msgstr "Dividieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Do you want to stop the current emulation?" msgstr "Laufende Emulation stoppen?" @@ -1624,7 +1637,7 @@ msgstr "Laufende Emulation stoppen?" msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafik Einstellungen" @@ -1646,12 +1659,12 @@ msgstr "Dolphin Emulierte-Wiimote Einstellungen" msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Konfiguration" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filme (*.dtm)" @@ -1679,8 +1692,8 @@ msgstr "" "Dolphin ist so eingestellt, dass alle Spiele versteckt werden. Hier " "doppelklicken um alle Spiele anzuzeigen..." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Runter" @@ -1705,26 +1718,26 @@ msgstr "Dummy" msgid "Dump Audio" msgstr "Audio dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "EFB-Target dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "Frames dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "Texturen dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 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:112 #, fuzzy msgid "" "Dump decoded game textures to User/Dump/Textures//\n" @@ -1732,16 +1745,16 @@ 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:114 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:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "Holländisch" @@ -1749,7 +1762,7 @@ msgstr "Holländisch" msgid "E&xit" msgstr "&Beenden" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 #, fuzzy msgid "EFB Copies" msgstr "EFB Kopie-Regionen" @@ -1804,7 +1817,7 @@ msgstr "Bearbeiten..." msgid "Effect" msgstr "Effekt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "" @@ -1812,7 +1825,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:111 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1821,7 +1834,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1843,7 +1856,7 @@ msgstr "Emulierbarkeit:" msgid "Enable" msgstr "Aktivieren" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1869,6 +1882,11 @@ msgstr "BAT aktivieren" msgid "Enable Block Merging" msgstr "Blockvereinigung aktivieren" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#, fuzzy +msgid "Enable Cache" +msgstr "Cache verwenden" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "Cheats aktivieren" @@ -1885,7 +1903,7 @@ msgstr "Dual Core aktivieren" msgid "Enable Dual Core (speedup)" msgstr "Dual Core aktivieren (Beschleunigung)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "Tastenkürzel aktivieren" @@ -1901,8 +1919,8 @@ msgstr "Idle-Skipping aktivieren (Beschleunigung)" msgid "Enable MMU" msgstr "MMU aktivieren" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "Vollbildverfahren aktivieren" @@ -1915,7 +1933,7 @@ msgstr "Breitbildmodus" msgid "Enable WideScreen" msgstr "Breitbildmodus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "Drahtgitter aktivieren" @@ -1997,7 +2015,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:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2008,14 +2026,14 @@ msgstr "" msgid "End" msgstr "Ende" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "Englisch" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "Erweiterungen" @@ -2037,13 +2055,13 @@ msgstr "Eintrag 1/%d" msgid "Equal" msgstr "Gleich" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "Fehler" -#: Source/Core/DolphinWX/Src/Main.cpp:356 +#: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Fehler beim Laden der ausgewählten Sprache. Kehre nun zu dem Systemstandart " @@ -2121,7 +2139,7 @@ msgstr "Spielstand exportieren als..." msgid "Extension" msgstr "Erweiterung" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 #, fuzzy msgid "External Frame Buffer" msgstr "Extra Parameter" @@ -2238,7 +2256,7 @@ msgstr "Fehler beim Laden von hid.dll" msgid "Failed to read banner.bin" msgstr "Fehler beim Lesen von banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2246,7 +2264,7 @@ msgstr "" "Konnte das Blockzuteilungtabellen-Backup nicht richtig lesen\n" "(0x8000-0x9FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2259,7 +2277,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Fehler beim Lesen von Daten aus Datei %d" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2267,7 +2285,7 @@ msgstr "" "Konnte das Backup-Verzeichnis nicht richtig lesen\n" "(0x4000-0x5FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2275,7 +2293,7 @@ msgstr "" "Konnte das Verzeichnis nicht richtig lesen\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2283,7 +2301,7 @@ msgstr "" "Konnte den Header nicht richtig lesen\n" "(0x0000-0x1FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2315,6 +2333,15 @@ 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/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "Schnell" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#, fuzzy +msgid "Fast Mipmaps" +msgstr "Native Mipmaps laden" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "Schnellere Version der MMU. Funktioniert nicht mit allen Spielen." @@ -2345,7 +2372,7 @@ msgstr "" "Datei konnte nicht geöffnet werden\n" "oder hat keine gültige Erweiterung" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2383,11 +2410,11 @@ msgstr "Erster Block" msgid "Fix Checksums" msgstr "Prüfsummen korrigieren" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "16:9 erzwingen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "4:3 erzwingen" @@ -2396,12 +2423,12 @@ msgstr "4:3 erzwingen" msgid "Force Console as NTSC-J" msgstr "Konsole auf NTSC-J umschalten" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 #, fuzzy msgid "Force Texture Filtering" msgstr "Filterung erzwingen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 #, fuzzy msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" @@ -2432,7 +2459,7 @@ msgid "" "setting when playing Japanese games." msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2459,7 +2486,7 @@ msgstr "Einzelbildwiedergabe" msgid "Frame Advance" msgstr "Einzelbildwiedergabe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "Frame-Dumps verwenden FFV1" @@ -2481,13 +2508,13 @@ msgstr "Framelimit:" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "Frei Umsehen" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "Französisch" @@ -2504,7 +2531,7 @@ msgstr "" msgid "FullScr" msgstr "Vollbild" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 #, fuzzy msgid "Fullscreen resolution:" msgstr "Vollbildauflösung:" @@ -2550,8 +2577,8 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Gamecube-&Pad Einstellungen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Cards (*.raw,*.gcp)" @@ -2574,9 +2601,9 @@ msgstr "" "(Entweder ist der Code Fehlerhafter oder der Code-Typ wird noch nicht " "unterstützt.)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Allgemein" @@ -2585,9 +2612,9 @@ msgstr "Allgemein" msgid "General Settings" msgstr "Interface Einstellungen" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "Deutsch" @@ -2608,11 +2635,13 @@ msgstr "Grafik Einstellungen" msgid "Greater Than" msgstr "Größer als" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" -"Greatly increases quality of textures generated using render-to-texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2641,11 +2670,11 @@ msgstr "Gitarre" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY wurde aufgerufen, bitte berichten!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Header-Prüfsumme fehlerhaft" @@ -2682,7 +2711,7 @@ msgstr "" msgid "Hide" msgstr "Verbergen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "Mauszeiger verstecken" @@ -2709,8 +2738,8 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Tastenkürzel Einstellungen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 msgid "Hotkeys" msgstr "Tastenkürzel" @@ -2794,12 +2823,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:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 #, fuzzy msgid "Ignore Format Changes" msgstr "Formatänderungen emulieren" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2808,7 +2837,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 " @@ -2845,7 +2874,7 @@ msgstr "" "Importierte Datei hat die Erweiterung sav,\n" "aber besitzt keinen korrekten Header." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 #, fuzzy msgid "" "Improves performance but causes glitches in most games which rely on proper " @@ -2856,7 +2885,7 @@ msgstr "" "Nebel Deaktivieren. Verbessert die Performance aber verursacht Fehler in " "Spielen, die richtige Nebel-Emulation benötigen." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 #, fuzzy msgid "" "Improves performance but causes lighting to disappear in most games.\n" @@ -2874,8 +2903,8 @@ msgstr "Ingame" msgid "In-Game" msgstr "In-Game" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "Info" @@ -2919,7 +2948,7 @@ msgstr "" "InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesn " "noch nicht." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 #, fuzzy msgid "Installing WAD..." msgstr "WAD ins Wii-Menü installieren..." @@ -2951,7 +2980,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "Internationaler LZO-Fehler - lzo_init() fehlerhaft" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 #, fuzzy msgid "Internal Resolution:" msgstr "Vollbildauflösung:" @@ -3005,9 +3034,9 @@ msgstr "Ungültige Aufnahmedatei" msgid "Invalid state" msgstr "Ungültiger Status" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "Italienisch" @@ -3068,8 +3097,8 @@ msgstr "Letzter überschriebener Status" msgid "Last Saved State" msgstr "Letzter gespeicherter Status" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "Links" @@ -3115,7 +3144,7 @@ msgstr "" msgid "Load" msgstr "Laden" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 #, fuzzy msgid "Load Custom Textures" msgstr "Hochauflösende Texturen laden" @@ -3156,17 +3185,17 @@ msgstr "Status aus Slot 8 laden" msgid "Load State..." msgstr "Status laden..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 #, fuzzy msgid "Load Wii System Menu" msgstr "Wii-Menü laden (%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 #, 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:113 #, fuzzy msgid "" "Load custom textures from User/Load/Textures//\n" @@ -3211,8 +3240,8 @@ msgstr "Typ" msgid "Logger Outputs" msgstr "Ausgabe" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "Logging" @@ -3246,8 +3275,8 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark Dateien(*.gcs)" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Main Stick" @@ -3277,8 +3306,8 @@ msgstr "Memorycard ist bereits geöffnet" msgid "Memory Byte" msgstr "Speicher" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 msgid "Memory Card" msgstr "Memory Card" @@ -3307,7 +3336,7 @@ msgstr "" "%s\n" "Möchten Sie die alte Datei, zu diesem neuen Speicherort kopieren?\n" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "" @@ -3325,7 +3354,7 @@ msgstr "Mikrofon" msgid "Min" msgstr "Mikrofon" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "Sonstiges" @@ -3338,7 +3367,7 @@ msgstr "Sonstige Einstellungen" msgid "Modifier" msgstr "Modifikator" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3359,7 +3388,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3465,9 +3494,9 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Hoch" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Name:" @@ -3553,7 +3582,7 @@ msgstr "Ungleich" msgid "Not Set" msgstr "Nicht Festgelegt" -#: Source/Core/DolphinWX/Src/Main.cpp:607 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Not connected" msgstr "Nicht Verbunden" @@ -3582,8 +3611,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "Anzahl von Codes: " -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "Nunchuk" @@ -3612,8 +3641,8 @@ msgstr "Offset:" msgid "Only %d blocks available" msgstr "Nur %d Blöcke verfügbar" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Open" msgstr "Öffnen" @@ -3643,11 +3672,11 @@ 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:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "" @@ -3679,8 +3708,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:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "" @@ -3745,13 +3774,13 @@ msgstr "Patches" msgid "Paths" msgstr "Pfade" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "Pause" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 #, fuzzy msgid "Per-Pixel Lighting" msgstr "Pixel Beleuchtung" @@ -3765,10 +3794,10 @@ msgstr "Perfekt" msgid "Perspective %d" msgstr "Perspektive %d" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 msgid "Play" msgstr "Start" @@ -3793,7 +3822,7 @@ msgstr "Optionen" msgid "Players" msgstr "Spieler" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 msgid "Please confirm..." msgstr "Bitte Bestätigen..." @@ -3838,7 +3867,7 @@ msgstr "Portugiesisch" msgid "Portuguese (Brazilian)" msgstr "Portugiesisch (Brasilianisch)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 #, fuzzy msgid "Post-Processing Effect:" msgstr "Post-Processing Shader:" @@ -3898,7 +3927,7 @@ msgstr "R Taste" msgid "R-Analog" msgstr "R-Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "RAM" @@ -3914,7 +3943,7 @@ msgstr "Weite" msgid "Read-only mode" msgstr "Nur-Lese-Modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "Echt" @@ -3978,9 +4007,9 @@ msgstr "" "Lässt das gerenderte Bild feiner aussehen, aber führt auch zu starkem Abfall " "der Performance." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Aktualisieren" @@ -3992,14 +4021,14 @@ msgstr "Liste aktualisieren" msgid "Refresh game list" msgstr "Spieleliste aktualisieren" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Remove" msgstr "Entfernen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 #, fuzzy msgid "" "Render the scene as a wireframe.\n" @@ -4009,12 +4038,12 @@ msgstr "" "Szene als Drahtgittermodell rendern.\n" "Dies ist nur für Debugging nützlich." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "Im Hauptfenster Rendern" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Zurücksetzen" @@ -4026,8 +4055,8 @@ msgstr "Ergebnisse" msgid "Return" msgstr "Enter" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "Rechts" @@ -4052,13 +4081,17 @@ msgstr "Russisch" msgid "Sa&ve State" msgstr "S&tatus speichern" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "Sicher" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "Abtastrate:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Speichern" @@ -4124,6 +4157,11 @@ msgstr "Dekomprimierte GCM/ISO speichern" 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:401 +#, fuzzy +msgid "Scaled EFB Copy" +msgstr "EFB Scaled Copy" + #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, fuzzy, c-format msgid "Scanning %s" @@ -4159,17 +4197,17 @@ msgstr "Unterordner durchsuchen" msgid "Section %s not found in SYSCONF" msgstr "Ausgewähltes %s nicht gefunden in SYSCONF" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "Auswählen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "Aufnahmedatei auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Speicherdatei zum Importieren auswählen" @@ -4196,15 +4234,15 @@ msgstr "Wähle unverankerte Fenster" msgid "Select the file to load" msgstr "Datei zum Laden auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Select the save file" msgstr "Wii-Spielstand auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Status zum Laden auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "Select the state to save" msgstr "Status zum Speichern auswählen" @@ -4332,12 +4370,12 @@ msgstr "&Werkzeugleiste anzeigen" msgid "Show Drives" msgstr "Laufwerke anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 #, fuzzy msgid "Show EFB Copy Regions" msgstr "EFB Kopie-Regionen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "FPS anzeigen" @@ -4349,7 +4387,7 @@ msgstr "Frankreich anzeigen" msgid "Show GameCube" msgstr "GameCube anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 #, fuzzy msgid "Show Input Display" msgstr "Italien anzeigen" @@ -4387,7 +4425,7 @@ msgstr "Plattformen anzeigen" msgid "Show Regions" msgstr "Regionen anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 #, fuzzy msgid "Show Statistics" msgstr "Statistiken" @@ -4444,7 +4482,7 @@ msgstr "Symbol anzeigen" msgid "Show save title" msgstr "Namen anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4460,7 +4498,7 @@ msgstr "Diese Hilfetexte anzeigen" msgid "Show unknown" msgstr "Unbekannte Anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -4485,16 +4523,16 @@ msgstr "Größe" msgid "Skip BIOS" msgstr "GC-BIOS überspringen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "Dest. Alpha Pass ausschalten" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4502,6 +4540,16 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4550,9 +4598,9 @@ msgstr "Erstellen des Sound-Buffer fehlgeschlagen: %s" msgid "Space" msgstr "Leertaste" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "Spanisch" @@ -4560,7 +4608,7 @@ msgstr "Spanisch" msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 " @@ -4588,9 +4636,9 @@ msgstr "" msgid "Standard Controller" msgstr "Standard-Controller" +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Start" @@ -4618,14 +4666,23 @@ msgstr "Status" msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stopp" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "An Fenstergröße anpassen" @@ -4659,8 +4716,8 @@ msgstr "Systemsprache:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #, fuzzy msgid "TAS Input" msgstr "Eingabe" @@ -4681,9 +4738,9 @@ msgstr "" msgid "Table Right" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "Screenshot erstellen" @@ -4691,7 +4748,16 @@ msgstr "Screenshot erstellen" msgid "Test" msgstr "Testen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "Textur" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +#, fuzzy +msgid "Texture Cache" +msgstr "Cache löschen" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 #, fuzzy msgid "Texture Format Overlay" msgstr "Texturformat" @@ -4739,7 +4805,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:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Die angegebene Datei (%s) existiert nicht" @@ -4756,13 +4822,21 @@ 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:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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:363 +#: Source/Core/DolphinWX/Src/Main.cpp:353 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4833,7 +4907,7 @@ msgstr "" 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:119 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. " @@ -4906,13 +4980,13 @@ msgstr "Oben" msgid "Toggle All Log Types" msgstr "Alle umschalten" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Vollbildmodus wechseln" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Top" msgstr "Oben" @@ -4920,7 +4994,7 @@ msgstr "Oben" msgid "Traditional Chinese" msgstr "Traditionelles Chinesisch" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "Versuche gerade einen unbekannten Dateityp zu Laden." @@ -4956,8 +5030,8 @@ msgstr "Typ" msgid "UDP Port:" msgstr "UDP Port:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5026,8 +5100,8 @@ msgstr "" "Unbekanter Pointer %#08x\n" "Fortfahren?" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "Hoch" @@ -5044,7 +5118,7 @@ msgstr "" msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 Modus (PAL60) verwenden" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 #, fuzzy msgid "Use Fullscreen" msgstr "&Vollbild" @@ -5057,7 +5131,7 @@ msgstr "Hex verwenden" msgid "Use Panic Handlers" msgstr "Warnmeldungen anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5065,7 +5139,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5074,11 +5148,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "Hilfsmittel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "V-Sync" @@ -5102,8 +5176,7 @@ msgstr "Ausführung" msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "Virtuell" @@ -5126,21 +5199,21 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Warnungen" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 msgid "Warning - starting DOL in wrong console mode!" msgstr "Warnung - Starte DOL im falschen Consolen-Modus!" -#: Source/Core/Core/Src/Boot/Boot.cpp:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "Warnung - Starte ELF im falschen Consolen-Modus!" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "Warnung - Starte ISO im falschen Consolen-Modus!" @@ -5177,7 +5250,7 @@ msgstr "WaveFileWriter - Konnte Datei nicht öffnen." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "Breitbild Hack" @@ -5202,7 +5275,7 @@ msgstr "DVD Laufwerk:" msgid "Wii Save Import" msgstr "Wii Spielstand importieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii Speicherdateien (*.bin)|*.bin" @@ -5210,8 +5283,8 @@ msgstr "Wii Speicherdateien (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Konnte die Datei nicht lesen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "Wiimote" @@ -5233,7 +5306,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:609 +#: Source/Core/DolphinWX/Src/Main.cpp:599 msgid "Wiimote Connected" msgstr "Wiimote Verbunden" @@ -5266,7 +5339,7 @@ msgstr "Windows Rechts" msgid "Word Wrap" msgstr "Zeilenumbruch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5370,7 +5443,7 @@ msgstr "Der Zero Code ist in Dolphin unbekannt: %08x" msgid "[ waiting ]" msgstr "[ warte ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5382,7 +5455,7 @@ msgstr "" msgid "[Custom]" msgstr "[Benutzerdefiniert]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5393,7 +5466,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5731,10 +5804,6 @@ msgstr "| ODER" #~ msgid "Enable CPU Access" #~ msgstr "CPU-Zugriff aktivieren" -#, fuzzy -#~ msgid "Enable Cache" -#~ msgstr "Cache verwenden" - #~ msgid "Enable Copy to EFB" #~ msgstr "Copy to EFB aktivieren" @@ -5804,13 +5873,6 @@ msgstr "| ODER" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Fehler beim Laden von DSP-ROM: %s" -#~ msgid "Fast" -#~ msgstr "Schnell" - -#, fuzzy -#~ msgid "Fast Mipmaps" -#~ msgstr "Native Mipmaps laden" - #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -5999,19 +6061,12 @@ msgstr "| ODER" #~ msgid "Running script...\n" #~ msgstr "Script ausführen...\n" -#~ msgid "Safe" -#~ msgstr "Sicher" - #~ msgid "Save code" #~ msgstr "Code speichern" #~ msgid "Scale:" #~ msgstr "Skalierung:" -#, fuzzy -#~ msgid "Scaled EFB Copy" -#~ msgstr "EFB Scaled Copy" - #~ msgid "Search" #~ msgstr "Suche" @@ -6123,13 +6178,6 @@ msgstr "| ODER" #~ msgid "Take Screenshot\t" #~ msgstr "Screenshot speichern\t" -#~ msgid "Texture" -#~ msgstr "Textur" - -#, fuzzy -#~ msgid "Texture Cache" -#~ msgstr "Cache löschen" - #~ msgid "Textures" #~ msgstr "Texturen" diff --git a/Languages/po/dolphin-emu.pot b/Languages/po/dolphin-emu.pot index c54ca80fd1..4c30844e45 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: 2011-08-10 08:30-0500\n" +"POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -31,7 +31,7 @@ msgstr "" msgid "! NOT" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -71,21 +71,21 @@ msgstr "" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" " Card file size is invalid (0x%x bytes)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" " Card size is invalid (0x%x bytes)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -296,7 +296,7 @@ msgstr "" msgid "(UNKNOWN)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "" @@ -308,7 +308,7 @@ msgstr "" msgid "32 bit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "" @@ -320,7 +320,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "" @@ -389,17 +389,21 @@ msgstr "" msgid "Acceleration" msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 @@ -479,12 +483,12 @@ msgstr "" msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "" @@ -500,9 +504,9 @@ msgstr "" msgid "Add new pane" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "" @@ -536,7 +540,7 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "" @@ -556,8 +560,8 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "All Save States (sav, s##)" msgstr "" @@ -573,7 +577,7 @@ msgstr "" msgid "All files (*.*)|*.*" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -581,11 +585,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +msgid "Alternate Wiimote Timing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "" @@ -605,7 +613,7 @@ msgstr "" msgid "Apply" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -632,7 +640,7 @@ msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -653,19 +661,19 @@ msgid "AudioCommon: Error opening AO device.\n" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "" @@ -676,6 +684,14 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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/WXInputBase.cpp:27 msgid "Back" msgstr "" @@ -684,8 +700,8 @@ msgstr "" msgid "Backend Settings" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "" @@ -719,7 +735,7 @@ msgstr "" msgid "Bar" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "" @@ -731,7 +747,7 @@ msgstr "" msgid "Bass" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "" @@ -751,8 +767,8 @@ msgstr "" msgid "Blue Right" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 msgid "Bottom" msgstr "" @@ -785,9 +801,9 @@ msgstr "" msgid "Buffer:" msgstr "" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "" @@ -803,11 +819,11 @@ msgstr "" msgid "CPU Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 " @@ -817,7 +833,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -826,8 +842,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "" @@ -870,10 +886,10 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "" @@ -991,10 +1007,10 @@ msgstr "" msgid "Classic" msgstr "" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "" @@ -1008,10 +1024,10 @@ msgid "" "manually stop the game." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "" @@ -1115,7 +1131,7 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:608 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Connecting..." msgstr "" @@ -1178,7 +1194,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1241,11 +1257,11 @@ msgstr "" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1289,8 +1305,8 @@ msgstr "" msgid "DSP Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "DSP HLE emulation (fast)" msgstr "" @@ -1339,7 +1355,7 @@ msgstr "" msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Debugging" msgstr "" @@ -1372,8 +1388,8 @@ msgstr "" msgid "Default font" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "" @@ -1381,12 +1397,12 @@ msgstr "" msgid "Delete Save" msgstr "" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 msgid "Description" msgstr "" @@ -1415,46 +1431,42 @@ msgstr "" msgid "Dial" msgstr "" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 msgid "Disable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1463,7 +1475,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1473,7 +1485,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1489,11 +1501,11 @@ msgstr "" msgid "Disc Read Error" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1504,7 +1516,7 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Do you want to stop the current emulation?" msgstr "" @@ -1512,7 +1524,7 @@ msgstr "" msgid "Dolphin" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "" @@ -1533,12 +1545,12 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 msgid "Dolphin GCPad Configuration" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1562,8 +1574,8 @@ msgid "" "games..." msgstr "" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "" @@ -1588,42 +1600,42 @@ msgstr "" msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 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:112 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:114 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:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "" @@ -1631,7 +1643,7 @@ msgstr "" msgid "E&xit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" msgstr "" @@ -1681,7 +1693,7 @@ msgstr "" msgid "Effect" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "" @@ -1689,7 +1701,7 @@ msgstr "" msgid "Emu Thread already running" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1698,7 +1710,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1720,7 +1732,7 @@ msgstr "" msgid "Enable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1746,6 +1758,10 @@ msgstr "" msgid "Enable Block Merging" msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +msgid "Enable Cache" +msgstr "" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "" @@ -1762,7 +1778,7 @@ msgstr "" msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "" @@ -1778,8 +1794,8 @@ msgstr "" msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "" @@ -1791,7 +1807,7 @@ msgstr "" msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "" @@ -1861,7 +1877,7 @@ msgid "" "OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -1872,14 +1888,14 @@ msgstr "" msgid "End" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "" @@ -1901,13 +1917,13 @@ msgstr "" msgid "Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:356 +#: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -1979,7 +1995,7 @@ msgstr "" msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "" @@ -2092,13 +2108,13 @@ msgstr "" msgid "Failed to read banner.bin" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2109,25 +2125,25 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2156,6 +2172,14 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "" @@ -2182,7 +2206,7 @@ msgid "" "or does not have a valid extension" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2218,11 +2242,11 @@ msgstr "" msgid "Fix Checksums" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "" @@ -2230,11 +2254,11 @@ msgstr "" msgid "Force Console as NTSC-J" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2257,7 +2281,7 @@ msgid "" "setting when playing Japanese games." msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2280,7 +2304,7 @@ msgstr "" msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "" @@ -2300,13 +2324,13 @@ msgstr "" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "" @@ -2323,7 +2347,7 @@ msgstr "" msgid "FullScr" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 msgid "Fullscreen resolution:" msgstr "" @@ -2367,8 +2391,8 @@ msgstr "" msgid "Gamecube &Pad Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2388,9 +2412,9 @@ msgid "" "(either a bad code or the code type is not yet supported.)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2398,9 +2422,9 @@ msgstr "" msgid "General Settings" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "" @@ -2421,11 +2445,13 @@ msgstr "" msgid "Greater Than" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" -"Greatly increases quality of textures generated using render-to-texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2454,11 +2480,11 @@ msgstr "" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "" @@ -2488,7 +2514,7 @@ msgstr "" msgid "Hide" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "" @@ -2512,8 +2538,8 @@ msgstr "" msgid "Hotkey Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 msgid "Hotkeys" msgstr "" @@ -2586,11 +2612,11 @@ msgid "" "also have to disable Audio Throttle in DSP to make it effective." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2599,7 +2625,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 " @@ -2632,7 +2658,7 @@ msgid "" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2640,7 +2666,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -2655,8 +2681,8 @@ msgstr "" msgid "In-Game" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "" @@ -2697,7 +2723,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 msgid "Installing WAD..." msgstr "" @@ -2724,7 +2750,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 msgid "Internal Resolution:" msgstr "" @@ -2774,9 +2800,9 @@ msgstr "" msgid "Invalid state" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "" @@ -2837,8 +2863,8 @@ msgstr "" msgid "Last Saved State" msgstr "" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "" @@ -2877,7 +2903,7 @@ msgstr "" msgid "Load" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Load Custom Textures" msgstr "" @@ -2917,16 +2943,16 @@ msgstr "" msgid "Load State..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 #, c-format msgid "Load Wii System Menu %d%c" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -2965,8 +2991,8 @@ msgstr "" msgid "Logger Outputs" msgstr "" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "" @@ -2998,8 +3024,8 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3028,8 +3054,8 @@ msgstr "" msgid "Memory Byte" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 msgid "Memory Card" msgstr "" @@ -3050,7 +3076,7 @@ msgid "" "Would you like to copy the old file to this new location?\n" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "" @@ -3067,7 +3093,7 @@ msgstr "" msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "" @@ -3080,7 +3106,7 @@ msgstr "" msgid "Modifier" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3101,7 +3127,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3206,9 +3232,9 @@ msgstr "" msgid "NP Up" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "" @@ -3293,7 +3319,7 @@ msgstr "" msgid "Not Set" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:607 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Not connected" msgstr "" @@ -3322,8 +3348,8 @@ msgstr "" msgid "Number Of Codes: " msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "" @@ -3352,8 +3378,8 @@ msgstr "" msgid "Only %d blocks available" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Open" msgstr "" @@ -3383,11 +3409,11 @@ msgstr "" msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "" @@ -3415,8 +3441,8 @@ msgid "" "and import the the saves to a new memcard\n" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "" @@ -3479,13 +3505,13 @@ msgstr "" msgid "Paths" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Per-Pixel Lighting" msgstr "" @@ -3498,10 +3524,10 @@ msgstr "" msgid "Perspective %d" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 msgid "Play" msgstr "" @@ -3525,7 +3551,7 @@ msgstr "" msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 msgid "Please confirm..." msgstr "" @@ -3570,7 +3596,7 @@ msgstr "" msgid "Portuguese (Brazilian)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "" @@ -3629,7 +3655,7 @@ msgstr "" msgid "R-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "" @@ -3645,7 +3671,7 @@ msgstr "" msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "" @@ -3700,9 +3726,9 @@ msgid "" "If unsure, select None." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "" @@ -3714,26 +3740,26 @@ msgstr "" msgid "Refresh game list" msgstr "" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Remove" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -3745,8 +3771,8 @@ msgstr "" msgid "Return" msgstr "" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "" @@ -3771,13 +3797,17 @@ msgstr "" msgid "Sa&ve State" msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "" @@ -3843,6 +3873,10 @@ msgstr "" msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +msgid "Scaled EFB Copy" +msgstr "" + #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format msgid "Scanning %s" @@ -3878,17 +3912,17 @@ msgstr "" msgid "Section %s not found in SYSCONF" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 msgid "Select a Wii WAD file to install" msgstr "" @@ -3911,15 +3945,15 @@ msgstr "" msgid "Select the file to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "Select the state to save" msgstr "" @@ -4037,11 +4071,11 @@ msgstr "" msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "" @@ -4053,7 +4087,7 @@ msgstr "" msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "" @@ -4089,7 +4123,7 @@ msgstr "" msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "" @@ -4140,7 +4174,7 @@ msgstr "" msgid "Show save title" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4156,7 +4190,7 @@ msgstr "" msgid "Show unknown" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -4179,15 +4213,15 @@ msgstr "" msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4195,6 +4229,16 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4243,9 +4287,9 @@ msgstr "" msgid "Space" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "" @@ -4253,7 +4297,7 @@ msgstr "" msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 " @@ -4281,9 +4325,9 @@ msgstr "" msgid "Standard Controller" msgstr "" +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "" @@ -4311,14 +4355,23 @@ msgstr "" msgid "Stick" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "" @@ -4352,8 +4405,8 @@ msgstr "" msgid "TAIWAN" msgstr "" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "" @@ -4373,9 +4426,9 @@ msgstr "" msgid "Table Right" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "" @@ -4383,7 +4436,15 @@ msgstr "" msgid "Test" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +msgid "Texture Cache" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" msgstr "" @@ -4424,7 +4485,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -4441,11 +4502,19 @@ msgstr "" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:363 +#: Source/Core/DolphinWX/Src/Main.cpp:353 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4506,7 +4575,7 @@ msgstr "" 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:119 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. " @@ -4565,13 +4634,13 @@ msgstr "" msgid "Toggle All Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Top" msgstr "" @@ -4579,7 +4648,7 @@ msgstr "" msgid "Traditional Chinese" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "" @@ -4613,8 +4682,8 @@ msgstr "" msgid "UDP Port:" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "" @@ -4680,8 +4749,8 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "" @@ -4698,7 +4767,7 @@ msgstr "" msgid "Use EuRGB60 Mode (PAL60)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 msgid "Use Fullscreen" msgstr "" @@ -4710,7 +4779,7 @@ msgstr "" msgid "Use Panic Handlers" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -4718,7 +4787,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -4727,11 +4796,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "" @@ -4755,8 +4824,7 @@ msgstr "" msgid "Video" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "" @@ -4779,21 +4847,21 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "" @@ -4823,7 +4891,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "" @@ -4847,7 +4915,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -4855,8 +4923,8 @@ msgstr "" msgid "WiiWAD: Could not read from file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "" @@ -4874,7 +4942,7 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:609 +#: Source/Core/DolphinWX/Src/Main.cpp:599 msgid "Wiimote Connected" msgstr "" @@ -4906,7 +4974,7 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5005,7 +5073,7 @@ msgstr "" msgid "[ waiting ]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5017,7 +5085,7 @@ msgstr "" msgid "[Custom]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5028,7 +5096,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" diff --git a/Languages/po/el.po b/Languages/po/el.po index 70aac51e67..072f3b0990 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: 2011-08-10 08:30-0500\n" -"PO-Revision-Date: 2011-09-13 17:28+0200\n" +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-12-18 13:37-0600\n" "Last-Translator: Linktothepast \n" "Language-Team: Gpower2 \n" "Language: Greek\n" @@ -32,7 +32,7 @@ msgstr "Παιχνίδι : " msgid "! NOT" msgstr "! NOT" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -76,7 +76,7 @@ msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "" "%s απέτυχε να γίνει scrubbed. Πιθανότατα το αÏχείο εικόνας είναι φθαÏμένο." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -85,7 +85,7 @@ msgstr "" "%s απέτυχε να φοÏτώσει ως κάÏτα μνήμης\n" " Το μέγεθος του αÏχείου της κάÏτας δεν είναι έγκυÏο (0x%x bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -94,7 +94,7 @@ msgstr "" "%s απέτυχε να φοÏτώσει ως κάÏτα μνήμης\n" " Το μέγεθος της κάÏτας δεν είναι έγκυÏο (0x%x bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -313,7 +313,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(ΑΓÎΩΣΤΟ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(ανενεÏγό)" @@ -325,7 +325,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "3D Vision" @@ -337,7 +337,7 @@ msgstr "8 bit" msgid "" msgstr "<Εισάγετε όνομα εδώ>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "<Δε βÏέθηκαν αναλÏσεις>" @@ -423,17 +423,22 @@ msgstr "Σχετικά με το Dolphin" msgid "Acceleration" msgstr "Επιτάχυνση" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "ΑκÏιβής VBeam εξομοίωση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#, fuzzy msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" "Εξομοιώνει με ακÏίβεια τα EFB αντίγÏαφα.\n" "Κάποια παιχνίδια βασίζονται σε αυτό για οÏισμένα εφέ γÏαφικών ή λειτουÏγίες " @@ -533,12 +538,12 @@ msgstr "Action Replay: Normal Code %i: Μη έγκυÏο subtype %08x (%s)" 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:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "ΠÏοσαÏμογέας:" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "ΠÏοσθήκη" @@ -554,9 +559,9 @@ msgstr "ΠÏοσθήκη Patch" msgid "Add new pane" msgstr "ΠÏοσθήκη νέου pane" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "ΠÏοσθήκη..." @@ -592,7 +597,7 @@ msgstr "" "ΡÏθμιση της απαιτοÏμενης πίεσης του Î±Î½Î±Î»Î¿Î³Î¹ÎºÎ¿Ï Ï‡ÎµÎ¹ÏιστηÏίου για την " "ενεÏγοποίηση των κουμπιών." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "Για Ï€ÏοχωÏημένους" @@ -612,8 +617,8 @@ msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" @@ -629,7 +634,7 @@ msgstr "Όλα τα συμπιεσμένα αÏχεία GC/Wii ISO (gcz)" msgid "All files (*.*)|*.*" msgstr "Όλα τα αÏχεία (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -641,11 +646,16 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Εξομοιωμένο Wiimote" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" msgstr "ΑνισοτÏοπικό ΦιλτÏάÏισμα:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "Εξομάλυνση ΟÏίων:" @@ -665,7 +675,7 @@ msgstr "Apploader:" msgid "Apply" msgstr "ΕφαÏμογή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -699,7 +709,7 @@ msgstr "" "πάντα!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Αναλογία Οθόνης:" @@ -720,19 +730,19 @@ msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Αυτόματα" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "Αυτόματα (Πολλαπλάσιο του 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "Αυτόματα (Μέγεθος ΠαÏαθÏÏου)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "Αυτόματη ΠÏοσαÏμογή Μεγέθους ΠαÏαθÏÏου" @@ -747,6 +757,14 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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/WXInputBase.cpp:27 msgid "Back" msgstr "Πίσω" @@ -755,8 +773,8 @@ msgstr "Πίσω" msgid "Backend Settings" msgstr "Backend Ρυθμίσεις" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Backend:" @@ -790,7 +808,7 @@ msgstr "Εικονίδιο:" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "Βασικές" @@ -802,7 +820,7 @@ msgstr "Βασικές Ρυθμίσεις" msgid "Bass" msgstr "Μπάσο" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Αποτυχία ελέγχου checksum για τον BAT" @@ -822,8 +840,8 @@ msgstr "ΑÏιστεÏÏŒ Μπλε" msgid "Blue Right" msgstr "Δεξί Μπλε" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 msgid "Bottom" msgstr "Βάση" @@ -856,9 +874,9 @@ msgstr "ΕÏÏεση φακέλου Ï€ÏοοÏισμοÏ" msgid "Buffer:" msgstr "Buffer:" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "Κουμπιά" @@ -874,11 +892,11 @@ msgstr "Stick ΚάμεÏας" msgid "CPU Emulator Engine" msgstr "Μηχανή Εξομοίωσης CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "Cache Display Lists" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 " @@ -894,7 +912,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -909,8 +927,8 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "ΆκυÏο" @@ -958,10 +976,10 @@ msgstr "Αποτυχία εÏÏεσης WiiMote με bd: %02x:%02x:%02x:%02x:%02 msgid "Cant find WiiMote by connection handle %02x" msgstr "Αδυναμία εÏÏεσης του WiiMote με handle σÏνδεσης %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Αδυναμία ανάγνωσης από το DVD_Plugin - DVD-Interface: ΚÏίσιμο Σφάλμα" @@ -1083,10 +1101,10 @@ msgstr "Κυκλικό Stick" msgid "Classic" msgstr "Κλασικό ΧειÏιστήÏιο" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "ΚαθάÏισ." @@ -1102,10 +1120,10 @@ msgstr "" "Ο Client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει " "απενεÏγοποιηθεί. Θα Ï€Ïέπει να σταματήσετε χειÏοκίνητα το παιχνίδι." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Κλείσιμο" @@ -1209,7 +1227,7 @@ msgstr "ΣÏνδεση Wiimote 3" msgid "Connect Wiimote 4" msgstr "ΣÏνδεση Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:608 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Connecting..." msgstr "Γίνεται ΣÏνδεση..." @@ -1280,7 +1298,7 @@ msgstr "" "(ο καθοÏισμός των χειÏιστηÏίων ενώ το παιχνίδι Ï„Ïέχει δεν υποστηÏίζεται Ï€Ïος " "το παÏόν)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1353,11 +1371,11 @@ msgstr "ΔημιουÏγός: " msgid "Critical" msgstr "ΚÏίσιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "Κόψιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1404,8 +1422,8 @@ msgstr "Ήχος (DSP)" msgid "DSP Emulator Engine" msgstr "Μηχανή Εξομοίωσης DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE εξομοίωση (γÏήγοÏη)" @@ -1454,7 +1472,7 @@ msgstr "ÎεκÏή Ζώνη" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Debugging" msgstr "Debugging" @@ -1487,8 +1505,8 @@ msgstr "ΠÏοεπιλεγμένο ISO:" msgid "Default font" msgstr "ΠÏοεπιλεγμένη γÏαμματοσειÏά" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "ΔιαγÏαφή" @@ -1496,12 +1514,12 @@ msgstr "ΔιαγÏαφή" msgid "Delete Save" msgstr "ΔιαγÏαφή Αποθήκευσης" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "ΔιαγÏαφή του υπάÏχοντος αÏχείου '%s';" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 msgid "Description" msgstr "ΠεÏιγÏαφή" @@ -1532,15 +1550,15 @@ msgstr "Ρυθμίσεις Συσκευής" msgid "Dial" msgstr "Dial" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1548,32 +1566,28 @@ msgstr "" "Το checksum του Καταλόγου απέτυχε\n" " καθώς και το checksum του εφεδÏÎ¹ÎºÎ¿Ï ÎšÎ±Ï„Î±Î»ÏŒÎ³Î¿Ï… απέτυχε" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 msgid "Disable" msgstr "ΑπενεÏγοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "ΑπενεÏγοποίηση Ομίχλης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "ΑπενεÏγοποίηση ΦωτισμοÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "ΑπενεÏγοποίηση Βάθους ανά Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "ΑπενεÏγοποίηση Υφών" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "ΑπενεÏγοποίηση Ηχείου Wiimote" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1587,7 +1601,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1603,7 +1617,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1622,11 +1636,11 @@ msgstr "Δίσκος" msgid "Disc Read Error" msgstr "Σφάλμα Ανάγνωσης Δίσκου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "Οθόνη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1640,7 +1654,7 @@ msgstr "" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξομοίωση;" @@ -1648,7 +1662,7 @@ msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξο msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Ρυθμίσεις ΓÏαφικών Dolphin %s" @@ -1669,12 +1683,12 @@ msgstr "Ρυθμίσεις Εξοιμοιωμένου Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 msgid "Dolphin GCPad Configuration" msgstr "Ρυθμίσεις Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" @@ -1702,8 +1716,8 @@ msgstr "" "Το Dolphin είναι Ïυθμισμένο να αποκÏÏπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ " "εδώ για να εμφανιστοÏν όλα τα παιχνίδια..." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Κάτω" @@ -1728,19 +1742,19 @@ msgstr "Dummy" msgid "Dump Audio" msgstr "Εξαγωγή Ήχου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "Εξαγωγή EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "Εξαγωγή ΚαÏέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "Εξαγωγή Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1751,7 +1765,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1762,7 +1776,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1772,9 +1786,9 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "Ολλανδικά" @@ -1782,7 +1796,7 @@ msgstr "Ολλανδικά" msgid "E&xit" msgstr "Έ&ξοδος" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" msgstr "EFB ΑντίγÏαφα" @@ -1836,7 +1850,7 @@ msgstr "ΕπεξεÏγασία..." msgid "Effect" msgstr "Εφέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer" @@ -1844,7 +1858,7 @@ msgstr "Embedded Frame Buffer" msgid "Emu Thread already running" msgstr "Το νήμα εξομοίωσης εκτελείται ήδη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1859,7 +1873,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε εικονική XFB εξομοίωση." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1887,7 +1901,7 @@ msgstr "Κατάσταση ΛειτουÏγίας:" msgid "Enable" msgstr "ΕνεÏγοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1919,6 +1933,11 @@ msgstr "ΕνεÏγοποίηση BAT" msgid "Enable Block Merging" msgstr "ΕνεÏγοποίηση Block Merging" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#, fuzzy +msgid "Enable Cache" +msgstr "ΕνεÏγοποίηση Cheat" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "ΕνεÏγοποίηση Cheat" @@ -1935,7 +1954,7 @@ msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα" msgid "Enable Dual Core (speedup)" msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα (επιτάχυνση)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "ΕνεÏγοποίηση ΣυντομεÏσεων" @@ -1951,8 +1970,8 @@ msgstr "ΕνεÏγοποίηση Idle Skipping (επιτάχυνση)" msgid "Enable MMU" msgstr "ΕνεÏγοποίηση MMU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "ΕνεÏγοποίηση ΠÏοοδευτικής ΣάÏωσης" @@ -1964,7 +1983,7 @@ msgstr "ΕνεÏγοποίηση ΠÏοφÏλαξης Οθόνης" msgid "Enable WideScreen" msgstr "ΕνεÏγοποίηση ΕυÏείας Οθόνης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "ΕνεÏγοποίηση Wireframe" @@ -2062,7 +2081,7 @@ msgstr "" "ΕνεÏγοποιεί τη Μονάδα ΔιαχείÏισης Μνήμης, απαÏαίτητο για μεÏικά παιχνίδια. " "(ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2076,14 +2095,14 @@ msgstr "" msgid "End" msgstr "Τέλος" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "Αγγλικά" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "Βελτιώσεις" @@ -2105,13 +2124,13 @@ msgstr "ΕγγÏαφή 1/%d" msgid "Equal" msgstr "Ίσο" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "Σφάλμα" -#: Source/Core/DolphinWX/Src/Main.cpp:356 +#: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή " @@ -2189,7 +2208,7 @@ msgstr "Εξαγωγή αποθήκευσης ως..." msgid "Extension" msgstr "Επέκταση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "ΕξωτεÏικό Frame Buffer" @@ -2312,7 +2331,7 @@ msgstr "Αποτυχία φόÏτωσης hid.dll" msgid "Failed to read banner.bin" msgstr "Αποτυχία ανάγνωσης banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2320,7 +2339,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης του αντιγÏάφου ασφαλείας του BAT\n" "(0x8000-0x9FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2333,7 +2352,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Αποτυχία ανάγνωσης δεδομένων από το αÏχείο %d" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2341,7 +2360,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης του αντιγÏάφου ασφαλείας των φακέλων\n" "(0x4000-0x5FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2349,7 +2368,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης των φακέλων\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2357,7 +2376,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης της κεφαλίδας\n" "(0x0000-0x1FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2386,6 +2405,14 @@ msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το msgid "Failed to write header for file %d" msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το αÏχείο %d" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "ΓÏήγοÏη έκδοση του MMU. Δε δουλεÏει για όλα τα παιχνίδια." @@ -2414,7 +2441,7 @@ msgstr "" "Το αÏχείο απέτυχε στο άνοιγμα\n" "ή δεν έχει έγκυÏη επέκταση" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2452,11 +2479,11 @@ msgstr "ΠÏώτο Μπλοκ" msgid "Fix Checksums" msgstr "ΕπιδιόÏθωση Checksum" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "Επιβολή 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "Επιβολή 4:3" @@ -2464,11 +2491,11 @@ msgstr "Επιβολή 4:3" msgid "Force Console as NTSC-J" msgstr "Επιβολή της Κονσόλας ως NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" msgstr "Επιβολή ΦιλτÏαÏίσματος Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2504,7 +2531,7 @@ msgstr "" "Άμα αφεθεί αποεπιλεγμένο, το dolphin Ï€Ïοεπιλέγει τη NTSC-U και ενεÏγοποιεί " "αυτόματα αυτήν την ÏÏθμιση όταν παίζονται Ιαπωνικά παιχνίδια." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2529,7 +2556,7 @@ msgstr "ΚαÏέ" msgid "Frame Advance" msgstr "ΠÏοώθηση ανά ΚαÏέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "FFV1 Για Τα Εξαγώμενα ΚαÏέ" @@ -2549,13 +2576,13 @@ msgstr "ΠεÏιοÏισμός ΚαÏέ:" msgid "Frames To Record" msgstr "ΚαÏέ ΠÏος ΕγγÏαφή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "ΕλεÏθεÏη Ματιά" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "Γαλλικά" @@ -2572,7 +2599,7 @@ msgstr "Από" msgid "FullScr" msgstr "ΠλήÏης Οθόνη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 msgid "Fullscreen resolution:" msgstr "Ανάλυση ΠλήÏους Οθόνης:" @@ -2616,8 +2643,8 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Ρυθμίσεις Gamecube &Pad" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "ΚάÏτες Μνήμης Gamecube (*.raw,*.gcp)" @@ -2639,9 +2666,9 @@ msgstr "" "Ο Κωδικός Gecko απέτυχε να εκτελεστεί (CT%i CST%i) (%s)\n" "(ή είναι ένας κακός κωδικός ή ο Ï„Ïπος του ÎºÏ‰Î´Î¹ÎºÎ¿Ï Î´ÎµÎ½ υποστηÏίζεται.)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Γενικά" @@ -2649,9 +2676,9 @@ msgstr "Γενικά" msgid "General Settings" msgstr "Γενικές Ρυθμίσεις" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "ΓεÏμανικά" @@ -2674,11 +2701,14 @@ msgstr "Ρυθμίσεις ΓÏαφικών" msgid "Greater Than" msgstr "ΜεγαλÏτεÏο από" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#, fuzzy msgid "" -"Greatly increases quality of textures generated using render-to-texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2712,11 +2742,11 @@ msgstr "ΚιθάÏα" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Γίνεται κλήση του HCI_CMD_INQUIRY, παÏακαλώ αναφέÏετε!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "Hacks" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Αποτυχία ελέγχου κεφαλίδας" @@ -2752,7 +2782,7 @@ msgstr "" msgid "Hide" msgstr "ΑπόκÏυψη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "ΑπόκÏυψη Δείκτη ΠοντικιοÏ" @@ -2780,8 +2810,8 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Ρυθμίσεις ΠλήκτÏων Συντόμευσης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 msgid "Hotkeys" msgstr "ΠλήκτÏα Συντόμευσης" @@ -2866,11 +2896,11 @@ msgstr "" "θα Ï€Ïέπει επίσης να απενεÏγοποιήσετε το Throttle Ήχου στο DSP για να έχει " "αποτέλεσμα. " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" msgstr "Αγνόηση Αλλαγών Format" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2884,7 +2914,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 " @@ -2927,7 +2957,7 @@ msgstr "" "Το εισαγώμενο αÏχείο έχει sav επέκταση\n" "άλλα δεν έχει σωστή κεφαλίδα." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2939,7 +2969,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -2958,8 +2988,8 @@ msgstr "Εντός ΠαιχνιδιοÏ" msgid "In-Game" msgstr "Εντός ΠαιχνιδιοÏ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "ΠληÏοφοÏίες" @@ -3002,7 +3032,7 @@ msgstr "" "InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόÏμα δεν το υποστηÏίζει " "ακόμα." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." @@ -3031,7 +3061,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "ΕσωτεÏικό Σφάλμα LZO - αποτυχία lzo_init()" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 msgid "Internal Resolution:" msgstr "ΕσωτεÏική Ανάλυση:" @@ -3084,9 +3114,9 @@ msgstr "Μη έγκυÏο αÏχείο εγγÏαφής" msgid "Invalid state" msgstr "Μη έγκυÏο κατάσταση" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "Ιταλικά" @@ -3147,8 +3177,8 @@ msgstr "Τελευταίο ΕπαναγÏαμμένο Σημείο Αποθ." msgid "Last Saved State" msgstr "Τελευταίο Αποθηκευμένο Σημείο Αποθ." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "ΑÏιστεÏά" @@ -3194,7 +3224,7 @@ msgstr "ΠεÏιοÏισμός με βάση τα ΚαÏέ" msgid "Load" msgstr "ΦόÏτωσ." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Load Custom Textures" msgstr "ΦόÏτωση ΤÏοποποιημένων Υφών" @@ -3234,16 +3264,16 @@ msgstr "ΦόÏτωση Σημείου Αποθήκευσης 8" msgid "Load State..." msgstr "ΦόÏτωση Σημείου Αποθήκευσης..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Load Wii System Menu" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 #, 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:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3285,8 +3315,8 @@ msgstr "ΤÏποι ΚαταγÏαφής" msgid "Logger Outputs" msgstr "Έξοδοι ΚαταγÏαφής" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "ΚαταγÏαφή" @@ -3320,8 +3350,8 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "ΑÏχεία MadCatz Gameshark (*.gcs)" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "ΚÏÏιο Stick" @@ -3350,8 +3380,8 @@ msgstr "Η κάÏτα μνήμης είναι ήδη ανοιχτή" msgid "Memory Byte" msgstr "Memory Byte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 msgid "Memory Card" msgstr "ΚάÏτα Μνήμης" @@ -3380,7 +3410,7 @@ msgstr "" "%s\n" "Θέλετε να αντιγÏάψετε το παλιό αÏχείο σε αυτή την νέα τοποθεσία;\n" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "" "Το μέγεθος του αÏχείου της κάÏτας μνήμης δεν ταιÏιάζει με το μέγεθος της " @@ -3399,7 +3429,7 @@ msgstr "ΜικÏόφωνο" msgid "Min" msgstr "Ελάχιστη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "ΔιάφοÏα" @@ -3412,7 +3442,7 @@ msgstr "ΔιάφοÏες Ρυθμίσεις" msgid "Modifier" msgstr "Modifier" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3438,7 +3468,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "ΜοτέÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3551,9 +3581,9 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Όνομα:" @@ -3638,7 +3668,7 @@ msgstr "Όχι ίσο" msgid "Not Set" msgstr "Μη ΟÏισμένο" -#: Source/Core/DolphinWX/Src/Main.cpp:607 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Not connected" msgstr "Μη Συνδεδεμένο" @@ -3667,8 +3697,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "ΑÏιθμός Κωδικών: " -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "Nunchuk" @@ -3697,8 +3727,8 @@ msgstr "Offset:" msgid "Only %d blocks available" msgstr "Διαθέσιμα μόνο %d μπλοκ" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Open" msgstr "Άνοιγμα" @@ -3728,11 +3758,11 @@ msgstr "OpenAL: αδυναμία εÏÏεσης συσκευών ήχου" msgid "OpenAL: can't open device %s" msgstr "OpenAL: αδυναμία ανοίγματος της συσκευής %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "OpenCL Αποκωδικοποιητής Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "OpenMP Αποκωδικοποιητής Υφών" @@ -3764,8 +3794,8 @@ msgstr "" "Κάντε δεξί κλίκ, εξάγετε όλα τα αÏχεία αποθήκευσης\n" "και εισάγετέ τα σε μία νέα κάÏτα μνήμης.\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "Άλλα" @@ -3830,13 +3860,13 @@ msgstr "Patches" msgid "Paths" msgstr "Φάκελοι" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "ΠαÏση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Per-Pixel Lighting" msgstr "Φωτισμός ανά Pixel" @@ -3849,10 +3879,10 @@ msgstr "Τέλειο" msgid "Perspective %d" msgstr "Οπτική %d" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 msgid "Play" msgstr "ΑναπαÏαγωγή" @@ -3876,7 +3906,7 @@ msgstr "Ρυθμίσεις ΑναπαÏαγωγής" msgid "Players" msgstr "Παίχτες" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 msgid "Please confirm..." msgstr "ΠαÏακαλώ επιβεβαιώστε..." @@ -3921,7 +3951,7 @@ msgstr "ΠοÏτογαλικά" msgid "Portuguese (Brazilian)" msgstr "ΠοÏτογαλικά (Î’Ïαζιλιάνικα)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "Post-Processing Εφέ:" @@ -3980,7 +4010,7 @@ msgstr "R Button" msgid "R-Analog" msgstr "R-Αναλογική" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "RAM" @@ -3996,7 +4026,7 @@ msgstr "ΕÏÏος" msgid "Read-only mode" msgstr "Μόνο Για Ανάγνωση (ΕγγÏαφής)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "ΠÏαγματικό" @@ -4056,9 +4086,9 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε Καμία." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Ανανέωση" @@ -4070,14 +4100,14 @@ msgstr "Ανανέωση Λίστας" msgid "Refresh game list" msgstr "Ανανέωση λίστας παιχνιδιών" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Remove" msgstr "ΑφαίÏεση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4087,12 +4117,12 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "ΑναπαÏαγωγή στο ΚεντÏικό ΠαÏάθυÏο" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Επανεκκίνηση" @@ -4104,8 +4134,8 @@ msgstr "Αποτελέσματα" msgid "Return" msgstr "Return" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "Δεξιά" @@ -4130,13 +4160,17 @@ msgstr "Ρώσικα" msgid "Sa&ve State" msgstr "Απ&οθήκευση Σημείου Αποθήκευσης" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "Ρυθμός Δειγματοληψίας:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Αποθήκ." @@ -4204,6 +4238,10 @@ msgstr "" "Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της " "εγγÏαφής της ταινίας..." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +msgid "Scaled EFB Copy" +msgstr "" + #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format msgid "Scanning %s" @@ -4239,17 +4277,17 @@ msgstr "Αναζήτηση σε Υποφακέλους" msgid "Section %s not found in SYSCONF" msgstr "Η ενότητα %s δε βÏέθηκε στο SYSCONF" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "Επιλογή" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αÏχείο για εγκατάσταση" @@ -4275,15 +4313,15 @@ msgstr "Επιλέξτε αιωÏοÏμενα παÏάθυÏα" msgid "Select the file to load" msgstr "Επιλέξτε το αÏχείο για φόÏτωση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Select the save file" msgstr "Επιλέξτε αÏχείο αποθήκευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Επιλέξτε το σημείο φόÏτωσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" @@ -4426,11 +4464,11 @@ msgstr "Εμφάνιση ΓÏαμμής &ΕÏγαλείων" msgid "Show Drives" msgstr "Εμφάνιση Οδηγών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "Εμφάνιση ΠεÏιοχών EFB ΑντιγÏαφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "Εμφάνιση FPS" @@ -4442,7 +4480,7 @@ msgstr "Εμφάνιση Γαλλίας" msgid "Show GameCube" msgstr "Εμφάνιση GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "Εμφάνιση ΠÏοβολής ΧειÏισμών" @@ -4478,7 +4516,7 @@ msgstr "Εμφάνιση ΠλατφόÏμας" msgid "Show Regions" msgstr "Εμφάνιση ΠεÏιοχών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "Εμφάνιση Στατιστικών" @@ -4533,7 +4571,7 @@ msgstr "Εμφάνιση αποθηκευμένου εικονιδίου" msgid "Show save title" msgstr "Εμφάνιση αποθηκευμένου τίτλου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4553,7 +4591,7 @@ msgstr "Εμφάνιση Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος βοήθειας" msgid "Show unknown" msgstr "Εμφάνιση Αγνώστων" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -4579,15 +4617,15 @@ msgstr "Μέγεθος" msgid "Skip BIOS" msgstr "ΠαÏάλειψη BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "ΠαÏάλειψη Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "ΠαÏάλειψη EFB ΠÏόσβασης από τη CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4599,6 +4637,16 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4652,9 +4700,9 @@ msgstr "Αποτυχία δημιουÏγίας buffer ήχου: %s" msgid "Space" msgstr "Space" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "Ισπανικά" @@ -4662,7 +4710,7 @@ msgstr "Ισπανικά" msgid "Speaker Volume:" msgstr "Ένταση ηχείου:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 " @@ -4699,9 +4747,9 @@ msgstr "ΤετÏάγωνο Stick" msgid "Standard Controller" msgstr "Τυπικός Controller" +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Εκκίνηση" @@ -4729,14 +4777,23 @@ msgstr "Σημεία Αποθήκευσης" msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Διακοπή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "ΠÏοσαÏμογή στο ΠαÏάθυÏο" @@ -4770,8 +4827,8 @@ msgstr "Γλώσσα Συστήματος:" msgid "TAIWAN" msgstr "ΤΑΪΒΑÎ" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS Είσοδος" @@ -4791,9 +4848,9 @@ msgstr "ΑÏιστεÏÏŒ Table" msgid "Table Right" msgstr "Δεξί Table" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "ΔημιουÏγία Στιγμιότυπου" @@ -4801,7 +4858,17 @@ msgstr "ΔημιουÏγία Στιγμιότυπου" msgid "Test" msgstr "Τέστ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#, fuzzy +msgid "Texture" +msgstr "Εξαγωγή Υφών" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +#, fuzzy +msgid "Texture Cache" +msgstr "ΚαθαÏισμός Cache" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" msgstr "Επικάλυψη Του Format Υφών" @@ -4846,7 +4913,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:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Το αÏχείο που επιλέξατε (%s) δεν υπάÏχει" @@ -4864,12 +4931,20 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" "Το αποτέλεσμα αποκÏυπτογÏάφησης του ÎºÏ‰Î´Î¹ÎºÎ¿Ï AR δεν πεÏιέχει καθόλου γÏαμμές." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" msgstr "" "Το σημείο αποθήκευσης που Ï€Ïοσπαθείτε να αντιγÏάψετε έχει μη έγκυÏο μέγεθος" -#: Source/Core/DolphinWX/Src/Main.cpp:363 +#: Source/Core/DolphinWX/Src/Main.cpp:353 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4941,7 +5016,7 @@ msgstr "" "Αυτό μποÏεί να Ï€Ïοκαλέσει καθυστεÏήσεις στο ÎœÎµÎ½Î¿Ï Wii και σε μεÏικά " "παιχνίδια." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 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. " @@ -5022,13 +5097,13 @@ msgstr "Εώς" msgid "Toggle All Log Types" msgstr "Εναλλαγή Όλων ΤÏπων ΚαταγÏαφής " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Εναλλαγή ΠλήÏους Οθόνης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Top" msgstr "ΚοÏυφή" @@ -5036,7 +5111,7 @@ msgstr "ΚοÏυφή" msgid "Traditional Chinese" msgstr "Κινέζικα ΠαÏαδοσιακά " -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "ΠÏοσπάθεια φόÏτωσης ενός άγνωστου Ï„Ïπου αÏχείο." @@ -5072,8 +5147,8 @@ msgstr "ΤÏπος" msgid "UDP Port:" msgstr "ΠόÏτα UDP:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5147,8 +5222,8 @@ msgstr "" "Άγνωστος δείκτης %#08x\n" "Συνέχεια;" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "Πάνω" @@ -5165,7 +5240,7 @@ msgstr "Κάθετη Θέση Wiimote" msgid "Use EuRGB60 Mode (PAL60)" msgstr "ΧÏήση ΛειτουÏγίας EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 msgid "Use Fullscreen" msgstr "ΧÏήση ΠλήÏους Οθόνης" @@ -5177,7 +5252,7 @@ msgstr "ΧÏήση Hex" msgid "Use Panic Handlers" msgstr "ΧÏήση Οθονών ΠανικοÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5190,7 +5265,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5205,11 +5280,11 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "ΕÏγαλεία" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "Κάθετος ΣυγχÏονισμός" @@ -5233,8 +5308,7 @@ msgstr "Αναλυτικότητα" msgid "Video" msgstr "Βίντεο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "Εικονικό" @@ -5262,21 +5336,21 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "ΠÏοειδοποίηση" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 msgid "Warning - starting DOL in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση DOL σε λάθος λειτουÏγία κονσόλας!" -#: Source/Core/Core/Src/Boot/Boot.cpp:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση ELF σε λάθος λειτουÏγία κονσόλας!" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση ISO σε λάθος λειτουÏγία κονσόλας!" @@ -5315,7 +5389,7 @@ msgstr "WaveFileWriter - το αÏχείο δεν είναι ανοιχτό." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "Hack ΕυÏείας Οθόνης" @@ -5339,7 +5413,7 @@ msgstr "Wii NAND Ρίζα:" msgid "Wii Save Import" msgstr "Εισαγωγή Αποθήκευσης Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 msgid "Wii save files (*.bin)|*.bin" msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -5347,8 +5421,8 @@ msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Αδυναμία ανάγνωσης από αÏχείο" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "Wiimote" @@ -5370,7 +5444,7 @@ msgstr "" "ή πιθανόν να οφείλεται σε χÏόνο αδÏάνειας ή κάποιον άλλο λόγο.\n" "Θέλετε να γίνει άμεση επανασÏνδεση;" -#: Source/Core/DolphinWX/Src/Main.cpp:609 +#: Source/Core/DolphinWX/Src/Main.cpp:599 msgid "Wiimote Connected" msgstr "Συνδεδεμένο Wiimote" @@ -5402,7 +5476,7 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Αναδίπλωση Λέξεων" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5509,7 +5583,7 @@ msgstr "Άγνωστος Zero code: %08x" msgid "[ waiting ]" msgstr "[ σε αναμονή ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5525,7 +5599,7 @@ msgstr "" msgid "[Custom]" msgstr "[ΠÏοσαÏμοζόμενο]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5544,7 +5618,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5615,3 +5689,6 @@ msgstr "zNear ΔιόÏθωση: " #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 msgid "| OR" msgstr "| OR" + +#~ msgid "Disable Wiimote Speaker" +#~ msgstr "ΑπενεÏγοποίηση Ηχείου Wiimote" diff --git a/Languages/po/en.po b/Languages/po/en.po index 305d945ec1..2ad1f8dd5b 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: 2011-08-10 08:30-0500\n" +"POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-01-06 14:53+0100\n" "Last-Translator: BhaaL \n" "Language-Team: \n" @@ -30,7 +30,7 @@ msgstr "" msgid "! NOT" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -70,21 +70,21 @@ msgstr "" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" " Card file size is invalid (0x%x bytes)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" " Card size is invalid (0x%x bytes)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -295,7 +295,7 @@ msgstr "" msgid "(UNKNOWN)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "" @@ -307,7 +307,7 @@ msgstr "" msgid "32 bit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "" @@ -319,7 +319,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "" @@ -388,17 +388,21 @@ msgstr "" msgid "Acceleration" msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 @@ -478,12 +482,12 @@ msgstr "" msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "" @@ -499,9 +503,9 @@ msgstr "" msgid "Add new pane" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "" @@ -535,7 +539,7 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "" @@ -555,8 +559,8 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "All Save States (sav, s##)" msgstr "" @@ -572,7 +576,7 @@ msgstr "" msgid "All files (*.*)|*.*" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -580,11 +584,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +msgid "Alternate Wiimote Timing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "" @@ -604,7 +612,7 @@ msgstr "" msgid "Apply" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -631,7 +639,7 @@ msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -652,19 +660,19 @@ msgid "AudioCommon: Error opening AO device.\n" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "" @@ -675,6 +683,14 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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/WXInputBase.cpp:27 msgid "Back" msgstr "" @@ -683,8 +699,8 @@ msgstr "" msgid "Backend Settings" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "" @@ -718,7 +734,7 @@ msgstr "" msgid "Bar" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "" @@ -730,7 +746,7 @@ msgstr "" msgid "Bass" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "" @@ -750,8 +766,8 @@ msgstr "" msgid "Blue Right" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 msgid "Bottom" msgstr "" @@ -784,9 +800,9 @@ msgstr "" msgid "Buffer:" msgstr "" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "" @@ -802,11 +818,11 @@ msgstr "" msgid "CPU Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 " @@ -816,7 +832,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -825,8 +841,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "" @@ -869,10 +885,10 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "" @@ -990,10 +1006,10 @@ msgstr "" msgid "Classic" msgstr "" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "" @@ -1007,10 +1023,10 @@ msgid "" "manually stop the game." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "" @@ -1114,7 +1130,7 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:608 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Connecting..." msgstr "" @@ -1177,7 +1193,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1240,11 +1256,11 @@ msgstr "" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1288,8 +1304,8 @@ msgstr "" msgid "DSP Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "DSP HLE emulation (fast)" msgstr "" @@ -1338,7 +1354,7 @@ msgstr "" msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Debugging" msgstr "" @@ -1371,8 +1387,8 @@ msgstr "" msgid "Default font" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "" @@ -1380,12 +1396,12 @@ msgstr "" msgid "Delete Save" msgstr "" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 msgid "Description" msgstr "" @@ -1414,46 +1430,42 @@ msgstr "" msgid "Dial" msgstr "" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 msgid "Disable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1462,7 +1474,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1472,7 +1484,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1488,11 +1500,11 @@ msgstr "" msgid "Disc Read Error" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1503,7 +1515,7 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Do you want to stop the current emulation?" msgstr "" @@ -1511,7 +1523,7 @@ msgstr "" msgid "Dolphin" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "" @@ -1532,12 +1544,12 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 msgid "Dolphin GCPad Configuration" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1561,8 +1573,8 @@ msgid "" "games..." msgstr "" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "" @@ -1587,42 +1599,42 @@ msgstr "" msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 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:112 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:114 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:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "" @@ -1630,7 +1642,7 @@ msgstr "" msgid "E&xit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" msgstr "" @@ -1680,7 +1692,7 @@ msgstr "" msgid "Effect" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "" @@ -1688,7 +1700,7 @@ msgstr "" msgid "Emu Thread already running" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1697,7 +1709,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1719,7 +1731,7 @@ msgstr "" msgid "Enable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1745,6 +1757,10 @@ msgstr "" msgid "Enable Block Merging" msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +msgid "Enable Cache" +msgstr "" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "" @@ -1761,7 +1777,7 @@ msgstr "" msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "" @@ -1777,8 +1793,8 @@ msgstr "" msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "" @@ -1790,7 +1806,7 @@ msgstr "" msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "" @@ -1860,7 +1876,7 @@ msgid "" "OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -1871,14 +1887,14 @@ msgstr "" msgid "End" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "" @@ -1900,13 +1916,13 @@ msgstr "" msgid "Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:356 +#: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -1978,7 +1994,7 @@ msgstr "" msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "" @@ -2091,13 +2107,13 @@ msgstr "" msgid "Failed to read banner.bin" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2108,25 +2124,25 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2155,6 +2171,14 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "" @@ -2181,7 +2205,7 @@ msgid "" "or does not have a valid extension" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2217,11 +2241,11 @@ msgstr "" msgid "Fix Checksums" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "" @@ -2229,11 +2253,11 @@ msgstr "" msgid "Force Console as NTSC-J" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2256,7 +2280,7 @@ msgid "" "setting when playing Japanese games." msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2279,7 +2303,7 @@ msgstr "" msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "" @@ -2299,13 +2323,13 @@ msgstr "" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "" @@ -2322,7 +2346,7 @@ msgstr "" msgid "FullScr" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 msgid "Fullscreen resolution:" msgstr "" @@ -2366,8 +2390,8 @@ msgstr "" msgid "Gamecube &Pad Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2387,9 +2411,9 @@ msgid "" "(either a bad code or the code type is not yet supported.)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2397,9 +2421,9 @@ msgstr "" msgid "General Settings" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "" @@ -2420,11 +2444,13 @@ msgstr "" msgid "Greater Than" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" -"Greatly increases quality of textures generated using render-to-texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2453,11 +2479,11 @@ msgstr "" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "" @@ -2487,7 +2513,7 @@ msgstr "" msgid "Hide" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "" @@ -2511,8 +2537,8 @@ msgstr "" msgid "Hotkey Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 msgid "Hotkeys" msgstr "" @@ -2585,11 +2611,11 @@ msgid "" "also have to disable Audio Throttle in DSP to make it effective." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2598,7 +2624,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 " @@ -2631,7 +2657,7 @@ msgid "" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2639,7 +2665,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -2654,8 +2680,8 @@ msgstr "" msgid "In-Game" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "" @@ -2696,7 +2722,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 msgid "Installing WAD..." msgstr "" @@ -2723,7 +2749,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 msgid "Internal Resolution:" msgstr "" @@ -2773,9 +2799,9 @@ msgstr "" msgid "Invalid state" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "" @@ -2836,8 +2862,8 @@ msgstr "" msgid "Last Saved State" msgstr "" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "" @@ -2876,7 +2902,7 @@ msgstr "" msgid "Load" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Load Custom Textures" msgstr "" @@ -2916,16 +2942,16 @@ msgstr "" msgid "Load State..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 #, c-format msgid "Load Wii System Menu %d%c" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -2964,8 +2990,8 @@ msgstr "" msgid "Logger Outputs" msgstr "" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "" @@ -2997,8 +3023,8 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3027,8 +3053,8 @@ msgstr "" msgid "Memory Byte" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 msgid "Memory Card" msgstr "" @@ -3049,7 +3075,7 @@ msgid "" "Would you like to copy the old file to this new location?\n" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "" @@ -3066,7 +3092,7 @@ msgstr "" msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "" @@ -3079,7 +3105,7 @@ msgstr "" msgid "Modifier" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3100,7 +3126,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3205,9 +3231,9 @@ msgstr "" msgid "NP Up" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "" @@ -3292,7 +3318,7 @@ msgstr "" msgid "Not Set" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:607 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Not connected" msgstr "" @@ -3321,8 +3347,8 @@ msgstr "" msgid "Number Of Codes: " msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "" @@ -3351,8 +3377,8 @@ msgstr "" msgid "Only %d blocks available" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Open" msgstr "" @@ -3382,11 +3408,11 @@ msgstr "" msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "" @@ -3414,8 +3440,8 @@ msgid "" "and import the the saves to a new memcard\n" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "" @@ -3478,13 +3504,13 @@ msgstr "" msgid "Paths" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Per-Pixel Lighting" msgstr "" @@ -3497,10 +3523,10 @@ msgstr "" msgid "Perspective %d" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 msgid "Play" msgstr "" @@ -3524,7 +3550,7 @@ msgstr "" msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 msgid "Please confirm..." msgstr "" @@ -3569,7 +3595,7 @@ msgstr "" msgid "Portuguese (Brazilian)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "" @@ -3628,7 +3654,7 @@ msgstr "" msgid "R-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "" @@ -3644,7 +3670,7 @@ msgstr "" msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "" @@ -3699,9 +3725,9 @@ msgid "" "If unsure, select None." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "" @@ -3713,26 +3739,26 @@ msgstr "" msgid "Refresh game list" msgstr "" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Remove" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -3744,8 +3770,8 @@ msgstr "" msgid "Return" msgstr "" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "" @@ -3770,13 +3796,17 @@ msgstr "" msgid "Sa&ve State" msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "" @@ -3842,6 +3872,10 @@ msgstr "" msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +msgid "Scaled EFB Copy" +msgstr "" + #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format msgid "Scanning %s" @@ -3877,17 +3911,17 @@ msgstr "" msgid "Section %s not found in SYSCONF" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 msgid "Select a Wii WAD file to install" msgstr "" @@ -3910,15 +3944,15 @@ msgstr "" msgid "Select the file to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "Select the state to save" msgstr "" @@ -4036,11 +4070,11 @@ msgstr "" msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "" @@ -4052,7 +4086,7 @@ msgstr "" msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "" @@ -4088,7 +4122,7 @@ msgstr "" msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "" @@ -4139,7 +4173,7 @@ msgstr "" msgid "Show save title" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4155,7 +4189,7 @@ msgstr "" msgid "Show unknown" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -4178,15 +4212,15 @@ msgstr "" msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4194,6 +4228,16 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4242,9 +4286,9 @@ msgstr "" msgid "Space" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "" @@ -4252,7 +4296,7 @@ msgstr "" msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 " @@ -4280,9 +4324,9 @@ msgstr "" msgid "Standard Controller" msgstr "" +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "" @@ -4310,14 +4354,23 @@ msgstr "" msgid "Stick" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "" @@ -4351,8 +4404,8 @@ msgstr "" msgid "TAIWAN" msgstr "" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "" @@ -4372,9 +4425,9 @@ msgstr "" msgid "Table Right" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "" @@ -4382,7 +4435,15 @@ msgstr "" msgid "Test" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +msgid "Texture Cache" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" msgstr "" @@ -4423,7 +4484,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -4440,11 +4501,19 @@ msgstr "" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:363 +#: Source/Core/DolphinWX/Src/Main.cpp:353 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4505,7 +4574,7 @@ msgstr "" 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:119 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. " @@ -4564,13 +4633,13 @@ msgstr "" msgid "Toggle All Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Top" msgstr "" @@ -4578,7 +4647,7 @@ msgstr "" msgid "Traditional Chinese" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "" @@ -4612,8 +4681,8 @@ msgstr "" msgid "UDP Port:" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "" @@ -4679,8 +4748,8 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "" @@ -4697,7 +4766,7 @@ msgstr "" msgid "Use EuRGB60 Mode (PAL60)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 msgid "Use Fullscreen" msgstr "" @@ -4709,7 +4778,7 @@ msgstr "" msgid "Use Panic Handlers" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -4717,7 +4786,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -4726,11 +4795,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "" @@ -4754,8 +4823,7 @@ msgstr "" msgid "Video" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "" @@ -4778,21 +4846,21 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "" @@ -4822,7 +4890,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "" @@ -4846,7 +4914,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -4854,8 +4922,8 @@ msgstr "" msgid "WiiWAD: Could not read from file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "" @@ -4873,7 +4941,7 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:609 +#: Source/Core/DolphinWX/Src/Main.cpp:599 msgid "Wiimote Connected" msgstr "" @@ -4905,7 +4973,7 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5004,7 +5072,7 @@ msgstr "" msgid "[ waiting ]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5016,7 +5084,7 @@ msgstr "" msgid "[Custom]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5027,7 +5095,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" diff --git a/Languages/po/es.po b/Languages/po/es.po index 4c0ad67ad6..b2b2a44c3d 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: 2011-08-10 08:30-0500\n" +"POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-08-11 15:30+0100\n" "Last-Translator: Petiso Carambanal \n" "Language-Team: DARIO_FF \n" @@ -31,7 +31,7 @@ msgstr " Juego:" msgid "! NOT" msgstr "! NO" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -73,7 +73,7 @@ msgstr "%s ya existe. ¿Remplazar?" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s falló al ser \"scrubbed\". Probablemente la imagen esté corrupta." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -82,7 +82,7 @@ msgstr "" "%s falló al cargar como una tarjeta de memoria.\n" "El tamaño de la tarjeta no es válido (0x%x bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -91,14 +91,15 @@ msgstr "" "%s falló al cargar como una tarjeta de memoria.\n" "El tamaño de la tarjeta no es válido (0x%x bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format 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 falló ala cargar como una tarjeta de memoria.\n" -"El fichero no es suficientemente grande para ser un fichero de tarjeta de memoria válido(0x%x bytes)" +"El fichero no es suficientemente grande para ser un fichero de tarjeta de " +"memoria válido(0x%x bytes)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -129,7 +130,9 @@ msgstr "¡%s ya está comprimido! No puede comprimirse má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 es muy largo para el nombre del archivo, la cantidad máxima de caracteres es 45" +msgstr "" +"%s es muy largo para el nombre del archivo, la cantidad máxima de caracteres " +"es 45" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:199 #, c-format @@ -307,7 +310,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(DESCONOCIDO)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(off)" @@ -319,7 +322,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "Visión 3D" @@ -331,7 +334,7 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "" @@ -369,11 +372,13 @@ 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" @@ -387,10 +392,13 @@ msgstr "" " - Núcleo doble [OFF]\n" " - Audio regulado [OFF]\n" " - DSP-HLE con \"Audio Nulo\" o DSP-LLE\n" -" - Configurar manualmente el número exacto de controles que se usarán a [Control Estándar]\n" +" - Configurar manualmente el número exacto de controles que se usarán a " +"[Control Estándar]\n" "\n" -"Todos los jugadores deben intentar tener la misma versión de Dolphin y la misma configuración.\n" -"Deshabilite todas las tarjetas de memoria, o envíeselas a los jugadores antes de comenzar.\n" +"Todos los jugadores deben intentar tener la misma versión de Dolphin y la " +"misma configuración.\n" +"Deshabilite todas las tarjetas de memoria, o envíeselas a los jugadores " +"antes de comenzar.\n" "El soporte para wiimote no ha sido implementado.\n" "\n" "¡¡Debe redireccionar el puerto TCP para hostear!!" @@ -413,19 +421,26 @@ msgstr "Acerca de Dolphin" msgid "Acceleration" msgstr "Aceleración" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "Exactitud:" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "Emulación de VBeam Precisa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#, fuzzy 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, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" "Permite emular con precisión las copias EFB.\n" -"Algunos juegos dependen de esto para algunos efectos gráficos o funcionalidad del juego.\n" +"Algunos juegos dependen de esto para algunos efectos gráficos o " +"funcionalidad del juego.\n" "\n" "Si está inseguro, déjelo marcado." @@ -450,33 +465,52 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" -msgstr "Error de Action Replay: Tamaño no válido (%08x : dirección = %08x) en Añadido de código (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +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 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)" -msgstr "Error de Action Replay: Tamaño no válido (%08x : dirección = %08x) en Fill and Slide (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " +"(%s)" +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 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)" -msgstr "Error de Action Replay: Tamaño no válido (%08x : dirección = %08x) en escritura y llenadado de Ram (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " +"Fill (%s)" +msgstr "" +"Error de Action Replay: Tamaño no válido (%08x : dirección = %08x) en " +"escritura y llenadado de Ram (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:609 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Write To Pointer (%s)" -msgstr "Error de Action Replay: Tamaño no válido (%08x : dirección = %08x) en Escribir con el puntero (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Write To " +"Pointer (%s)" +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 #, 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)" +msgstr "" +"Error de Action Replay: Valor no válido (%08x) en copia de la memoria (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:684 #, c-format -msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "Error de Action Replay: Código maestro y Escribir a CCXXXXXX no han sido implementados (%s)" +msgid "" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgstr "" +"Error de Action Replay: Código maestro y Escribir a CCXXXXXX no han sido " +"implementados (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -503,12 +537,12 @@ msgstr "Action Replay: Código Normal %i: Subtipo no válido %08x (%s)" 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:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "Adaptador:" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "Añadir" @@ -524,9 +558,9 @@ msgstr "Añadir Parche" msgid "Add new pane" msgstr "Añadir nueva ventana" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "Añadir..." @@ -538,14 +572,16 @@ msgstr "Dirección:" 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 "" "Añade el valor especificado al parámetro zFar.\n" "Dos maneras de expresar valores de coma flotante.\n" -"Ejemplo: introduciendo \"200\" o \"0.0002\" directamente, produce efectos iguales, el valor adquirido será \"0.0002\"\n" +"Ejemplo: introduciendo \"200\" o \"0.0002\" directamente, produce efectos " +"iguales, el valor adquirido será \"0.0002\"\n" "Valores: (0->+/-Integer) or (0->+/-FP[6 dígitos de precisión])\n" "\n" "NOTA: Lea LogWindow/Consola para ver los valores adquiridos." @@ -554,23 +590,26 @@ 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 "" "Añade el valor especificado al parámetro zNear.\n" "Dos maneras de expresar valores de coma flotante.\n" -"Ejemplo: introduciendo \"200\" o \"0.0002\" directamente, produce efectos iguales, el valor adquirido será \"0.0002\"\n" +"Ejemplo: introduciendo \"200\" o \"0.0002\" directamente, produce efectos " +"iguales, el valor adquirido será \"0.0002\"\n" "Valores: (0->+/-Integer) or (0->+/-FP[6 dígitos de precisión])\n" "\n" "NOTA: Lea LogWindow/Consola para ver los valores adquiridos." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 msgid "Adjust the analog control pressure required to activate buttons." -msgstr "Ajuste la presión requerida del control analógico para activar los botones." +msgstr "" +"Ajuste la presión requerida del control analógico para activar los botones." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "Avanzado" @@ -590,8 +629,8 @@ msgstr "Todas las imágenes GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Todos los archivos Gamecube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "All Save States (sav, s##)" msgstr "Todos los estados guardados (sav, s##)" @@ -607,21 +646,28 @@ msgstr "Todos los archivos ISO comprimidos de GC/Wii (gcz)" msgid "All files (*.*)|*.*" msgstr "Todos los archivos (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"emulation window.\n" "\n" "If unsure, leave this unchecked." 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" +"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 está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Wiimote emulado" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" msgstr "Filtro anisotrópico:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "Antialias:" @@ -641,7 +687,7 @@ msgstr "Apploader:" msgid "Apply" msgstr "Aplicar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -673,7 +719,7 @@ msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "¿Seguro que quiere borrar este archivo? ¡Desaparecerá para siempre!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relación de aspecto:" @@ -694,19 +740,19 @@ msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error al abrir dispositivo AO.\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "Auto (múltiplo de 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "Auto (tamaño de ventana)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "Autoajuste del tamaño de la ventana" @@ -720,6 +766,19 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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á seguro, deje esta marcada." + #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" msgstr "Atrás" @@ -728,8 +787,8 @@ msgstr "Atrás" msgid "Backend Settings" msgstr "Configuración del motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Motor:" @@ -763,7 +822,7 @@ msgstr "Banner:" msgid "Bar" msgstr "Barra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "Básico" @@ -775,7 +834,7 @@ msgstr "Configuración básica" msgid "Bass" msgstr "Bajo" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "La suma de verificación de la Tabla de Localización de Bloques falló" @@ -795,8 +854,8 @@ msgstr "Azul izquierda" msgid "Blue Right" msgstr "Azul derecha" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 msgid "Bottom" msgstr "Inferior" @@ -829,9 +888,9 @@ msgstr "Busca un directorio de salida" msgid "Buffer:" msgstr "Búfer" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "Botones" @@ -847,23 +906,28 @@ msgstr "C-Stick" msgid "CPU Emulator Engine" msgstr "Emulador de CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "Caché de listas de visualización" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 "" -"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" +"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á seguro, deje esta marcada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -871,14 +935,17 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Calcular la iluminación de los gráficos 3D por píxel en lugar de por vértice.\n" -"Disminuye la velocidad de emulación en un pequeño porcentaje (dependiendo de la GPU).\n" -"Esto generalmente es una mejora segura, pero a veces puede causar problemas.\n" +"Calcular la iluminación de los gráficos 3D por píxel en lugar de por " +"vértice.\n" +"Disminuye la velocidad de emulación en un pequeño porcentaje (dependiendo de " +"la GPU).\n" +"Esto generalmente es una mejora segura, pero a veces puede causar " +"problemas.\n" "\n" "Si no está seguro, deje esta casilla sin marcar." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Cancelar" @@ -926,10 +993,10 @@ msgstr "No se puede encontrar el WiiMote por bd: %02x:%02x:%02x:%02x:%02x:%02x" 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:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "No se puede leer del DVD_Plugin - DVD-Interface: Error Fatal" @@ -980,7 +1047,8 @@ msgstr "Cambia el signo del parámetro zNear (después de la corrección)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 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!" +msgstr "" +"¡Cambiar esto no tendrá ningún efecto mientras el emulador esté ejecutandose!" #: Source/Core/DolphinWX/Src/NetWindow.cpp:282 msgid "Chat" @@ -1031,8 +1099,12 @@ msgid "Choose a memory card:" msgstr "Escoge una tarjeta de memoria:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 -msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" -msgstr "Escoja el archivo que usar como apploader (se aplica a los discos armados a partir de directorios solamente):" +msgid "" +"Choose file to use as apploader: (applies to discs constructed from " +"directories only)" +msgstr "" +"Escoja el archivo que usar como apploader (se aplica a los discos armados a " +"partir de directorios solamente):" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:764 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 @@ -1047,10 +1119,10 @@ msgstr "Circle Stick" msgid "Classic" msgstr "Clásico" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "Limpiar" @@ -1059,13 +1131,17 @@ msgid "Clear failed." msgstr "Fallo al borrar." #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." -msgstr "¡¡El cliente se desconectó mientras el juego estaba ejecutándose!! NetPlay ha sido deshabilitado. Debe detener el juego manualmente." +msgid "" +"Client disconnect while game is running!! NetPlay is disabled. You must " +"manually stop the game." +msgstr "" +"¡¡El cliente se desconectó mientras el juego estaba ejecutándose!! NetPlay " +"ha sido deshabilitado. Debe detener el juego manualmente." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Cerrar" @@ -1169,7 +1245,7 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:608 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Connecting..." msgstr "Conectando..." @@ -1210,8 +1286,14 @@ msgstr "No se pudo inicializar el motor %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 "No se pudo leer \"%s\". No hay disco en la unidad, o no es un backup de GC/Wii. Tenga en cuenta que discos de Gamecube o Wii originales no pueden ser leídos en la mayoría de las lectoras DVD." +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 "" +"No se pudo leer \"%s\". No hay disco en la unidad, o no es un backup de GC/" +"Wii. Tenga en cuenta que discos de Gamecube o Wii originales no pueden ser " +"leídos en la mayoría de las lectoras DVD." #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format @@ -1228,19 +1310,23 @@ 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 "" -"No se pudieron definir los pads. ¡El jugador se fue, o el juego está ejecutándose todavía!\n" -"(definir los pads mientras el juego está ejecutándose no está permitido todavía)" +"No se pudieron definir los pads. ¡El jugador se fue, o el juego está " +"ejecutándose todavía!\n" +"(definir los pads mientras el juego está ejecutándose no está permitido " +"todavía)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, 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 "" "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á protegido contra escritura?" +"¿Está ejecutando Dolphin desde un CD/DVD, o el archivo de guardado está " +"protegido contra escritura?" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 msgid "Couldn't find open command for extension 'ini'!" @@ -1278,8 +1364,10 @@ msgid "Created by KDE-Look.org" msgstr "Creado por KDE-Look.org" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 -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 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:492 msgid "Created by VistaIcons.com" @@ -1297,11 +1385,11 @@ msgstr "Creador:" msgid "Critical" msgstr "Critico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "Cortar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1348,8 +1436,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Motor de emulación DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "DSP HLE emulation (fast)" msgstr "Emulación DSP HLE (rápido)" @@ -1398,7 +1486,7 @@ msgstr "Zona muerta" msgid "Debug" msgstr "Depurar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Debugging" msgstr "Depurarando" @@ -1431,8 +1519,8 @@ msgstr "ISO por defecto:" msgid "Default font" msgstr "Fuente por defecto" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "Borrar" @@ -1440,12 +1528,12 @@ msgstr "Borrar" msgid "Delete Save" msgstr "Borrar guardado" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "¿Borrar el archivo existente '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 msgid "Description" msgstr "Descripción" @@ -1455,8 +1543,12 @@ msgstr "Detectar" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -msgid "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp." -msgstr "Se detectó un intento de leer más datos del DVD de los que entran en el búfer. Truncando." +msgid "" +"Detected attempt to read more data from the DVD than fit inside the out " +"buffer. Clamp." +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 @@ -1472,15 +1564,15 @@ msgstr "Configuración del dispositivo" msgid "Dial" msgstr "Marcar" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1488,56 +1580,58 @@ 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:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 msgid "Disable" msgstr "Deshabilitar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "Deshabilitar niebla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "Deshabilitar iluminación" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "Desactivar profundidad por píxel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "Deshabilitar texturas" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "Desactivar altavoz del Wiimote" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 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 "" "Desactivar cualquier emulación de XFB.\n" -"Aumenta la velocidad de la emulación en gran medida pero causa fallos graves en muchos juegos que confian en él (especialmente aplicaciones caseras).\n" +"Aumenta la velocidad de la emulación en gran medida pero causa fallos graves " +"en muchos juegos que confian en él (especialmente aplicaciones caseras).\n" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 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 "" "Desactivar 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" +"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 está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1556,11 +1650,11 @@ msgstr "Disco" msgid "Disc Read Error" msgstr "Error de lectura de disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "Pantalla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1574,7 +1668,7 @@ msgstr "" msgid "Divide" msgstr "Dividir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Do you want to stop the current emulation?" msgstr "¿Quieres detener la emulación actual?" @@ -1582,7 +1676,7 @@ msgstr "¿Quieres detener la emulación actual?" msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Configuración gráfica %s de Dolphin" @@ -1603,12 +1697,12 @@ msgstr "Configuración de wiimote emulado de Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 msgid "Dolphin GCPad Configuration" msgstr "Configuración de GCPad Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Películas TAS de Dolphin (*.dtm)" @@ -1621,15 +1715,23 @@ msgid "Dolphin at &Google Code" msgstr "Dolphin en &Google Code" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 -msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." -msgstr "Dolphin no pudo encontrar ninguna ISO de GC/Wii. Haz doble clic aquí para buscar..." +msgid "" +"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " +"files..." +msgstr "" +"Dolphin no pudo encontrar ninguna ISO de GC/Wii. Haz doble clic aquí para " +"buscar..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 -msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." -msgstr "Dolphin está configurado actualmente para esconder todos los juegos. Haz doble clic aquí para mostrarlos..." +msgid "" +"Dolphin is currently set to hide all games. Doubleclick here to show all " +"games..." +msgstr "" +"Dolphin está configurado actualmente para esconder todos los juegos. Haz " +"doble clic aquí para mostrarlos..." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Abajo" @@ -1654,19 +1756,19 @@ msgstr "Dummy" msgid "Dump Audio" msgstr "Depósito de audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "Volcar objetivo EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "Volcar frames" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "Volcar texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1676,7 +1778,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1686,7 +1788,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1696,9 +1798,9 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "Alemán" @@ -1706,14 +1808,22 @@ msgstr "Alemán" msgid "E&xit" msgstr "&Salir" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" msgstr "Copias de EFB" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, 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 "ERROR: Esta versión de Dolphin requiere un controlador TAP-Win32 que sea por lo menos de versión %d.%d. Si recientemente actualizó su distribución de Dolphin, puede que se necesite reiniciar para que Windows reconozca el nuevo controlador." +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 "" +"ERROR: Esta versión de Dolphin requiere un controlador TAP-Win32 que sea por " +"lo menos de versión %d.%d. Si recientemente actualizó su distribución de " +"Dolphin, puede que se necesite reiniciar para que Windows reconozca el nuevo " +"controlador." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 msgid "EUROPE" @@ -1752,7 +1862,7 @@ msgstr "Editar..." msgid "Effect" msgstr "Efecto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "Bufer de frames embebido" @@ -1760,22 +1870,27 @@ msgstr "Bufer de frames embebido" msgid "Emu Thread already running" msgstr "El proceso de Emulación ya está ejecutandose" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 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 "" "Emular XFB con exactitud.\n" -"Ralentiza la emulación en gran medida e impide el renderizado en resoluciones altas, pero es necesario para emular un número de juegos de forma adecuada.\n" +"Ralentiza la emulación en gran medida e impide el renderizado en " +"resoluciones altas, pero es necesario para emular un número de juegos de " +"forma adecuada.\n" "\n" "Si está inseguro, active Emulación virtual de XFB." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 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 "Emular XFB usando texturas de objetos de la GPU" @@ -1792,15 +1907,17 @@ msgstr "Estado de emulación:" msgid "Enable" msgstr "Habilitar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 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 "" -"Activa el 3D esteroscópico usando la tecnología NVIDIA 3D Vision si su tarjeta gráfica lo soporta.\n" +"Activa el 3D esteroscópico usando la tecnología NVIDIA 3D Vision si su " +"tarjeta gráfica lo soporta.\n" "Probablemente cause problemas.\n" "Requiere pantalla completa para funcionar.\n" "\n" @@ -1822,6 +1939,10 @@ msgstr "Habilitar BAT" msgid "Enable Block Merging" msgstr "Habilitar asociación de bloques" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +msgid "Enable Cache" +msgstr "Habilitar caché" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "Habilitar trucos" @@ -1838,7 +1959,7 @@ msgstr "Habilitar doble núcleo" msgid "Enable Dual Core (speedup)" msgstr "Habilitar doble núcleo (mejora)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "Habilitar atajos" @@ -1854,8 +1975,8 @@ msgstr "Habilitar salto de fotogramas inactivos (mejora)" msgid "Enable MMU" msgstr "Habilitar MMU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "Habilitar escaneado progresivo" @@ -1867,7 +1988,7 @@ msgstr "Habilitar salvapantallas" msgid "Enable WideScreen" msgstr "Habilitar pantalla panorámica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "Habilitar \"alambrado\" (wireframe)" @@ -1886,8 +2007,12 @@ msgstr "" "Si está inseguro, déjelo sin marcar." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -msgid "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)" -msgstr "Habilitar acceso rápido al disco. Es necesario para algunos juegos. (ON = Rápido, OFF=Compatible)" +msgid "" +"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " +"Compatible)" +msgstr "" +"Habilitar acceso rápido al disco. Es necesario para algunos juegos. (ON = " +"Rápido, OFF=Compatible)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Enable pages" @@ -1900,28 +2025,41 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Habilitar esta opción si desea que se use la pantalla completa para la representación.\n" +"Habilitar esta opción si desea 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á seguro, déjelo sin marcar." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 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 "" -"Active esto si quiere usar la ventana principal de Dolphin para renderizar en vez de una ventana aparte.\n" +"Active esto si quiere usar la ventana principal de Dolphin para renderizar " +"en vez de una ventana aparte.\n" "\n" "Si está inseguro, déjelo sin marcar." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 -msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." -msgstr "Habilitar esto para acelerar The Legend of Zelda: Twilight Princess. Deshabilitar para CUALQUIER OTRO juego." +msgid "" +"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " +"ANY other game." +msgstr "" +"Habilitar esto para acelerar The Legend of Zelda: Twilight Princess. " +"Deshabilitar para CUALQUIER OTRO juego." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 -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 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:334 msgid "Enables Custom Projection Hack" @@ -1939,10 +2077,14 @@ msgstr "" "Si está inseguro, déjelo sin marcar." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" -msgstr "Habilita la Unidad de Manejo de Memoria(MMU), necesario para algunos juegos. (ON = Compatible, OFF = Rápido)" +msgid "" +"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " +"OFF = Fast)" +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:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -1956,14 +2098,14 @@ msgstr "" msgid "End" msgstr "Fin" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "Inglés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "Mejoras" @@ -1985,20 +2127,25 @@ msgstr "Entrada 1/%d" msgid "Equal" msgstr "Igual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "Error" -#: Source/Core/DolphinWX/Src/Main.cpp:356 +#: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." -msgstr "Error al cargar el idioma seleccionado. Volviendo al defecto del sistema." +msgstr "" +"Error al cargar el idioma seleccionado. Volviendo al defecto del sistema." #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 #, c-format -msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." -msgstr "Error: Se intentó acceder a %s fuentes, pero no han sido cargadas. Los juegos pueden no mostrar las fuentes correctamente, o tener errores." +msgid "" +"Error: Trying to access %s fonts but they are not loaded. Games may not show " +"fonts correctly, or crash." +msgstr "" +"Error: Se intentó acceder a %s fuentes, pero no han sido cargadas. Los " +"juegos pueden no mostrar las fuentes correctamente, o tener errores." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2061,7 +2208,7 @@ msgstr "Exportar guardado como..." msgid "Extension" msgstr "Extensión" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "Buffer de frames externo" @@ -2182,7 +2329,7 @@ msgstr "Fallo al cargar hid.dll" msgid "Failed to read banner.bin" msgstr "Fallo al leer banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2190,7 +2337,7 @@ msgstr "" "Falló leer la tabla de asignación de bloques de respaldo correctamente\n" "(0x8000-0x9FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2203,7 +2350,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Fallo al leer los datos del archivo %d" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2211,7 +2358,7 @@ msgstr "" "Falló leer el directorio de respaldo correctamente\n" "(0x4000-0x5FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2219,7 +2366,7 @@ msgstr "" "Falló leer el directorio correctamente\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2227,7 +2374,7 @@ msgstr "" "Falló leer la cabecera correctamente\n" "(0x0000-0x1FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2259,6 +2406,14 @@ 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/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "Rápido" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "Mipmaps rápidos" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 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." @@ -2287,7 +2442,7 @@ msgstr "" "El archivo no pudo ser abierto\n" "o no tiene una extensión válida" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2325,11 +2480,11 @@ msgstr "Primer bloque" msgid "Fix Checksums" msgstr "Reparar sumas de verificación" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "Forzar 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "Forzar 4:3" @@ -2337,19 +2492,21 @@ msgstr "Forzar 4:3" msgid "Force Console as NTSC-J" msgstr "Forzar consola como NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" msgstr "Forzar filtrado de texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Fuerza el filtro bilinear de textura, incluso aunque el juego lo deshabilite explícitamente.\n" -"Mejora la calidad de textura (especialmente cuando se usa una resolución interna alta), pero puede causar errores gráficos en algunos juegos.\n" +"Fuerza el filtro bilinear de textura, incluso aunque el juego lo deshabilite " +"explícitamente.\n" +"Mejora la calidad de textura (especialmente cuando se usa una resolución " +"interna alta), pero puede causar errores gráficos en algunos juegos.\n" "\n" "Si está inseguro, déjelo sin marcar." @@ -2360,7 +2517,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Obliga al juego a producir gráficos para resoluciones panorámicas (widescreen).\n" +"Obliga al juego a producir gráficos para resoluciones panorámicas " +"(widescreen).\n" "Tenga en cuenta que esto puede causar errores gráficos.\n" "\n" "Si está inseguro, déjelo sin marcar." @@ -2368,12 +2526,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 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 "" "Fuerza el modo NTSC-J para usar la ROM de la fuente japonesa.\n" -"Sin marcar, Dolphin por defecto usa NTSC-U y activa automáticamente esta característica cuando se juega a juegos japoneses." +"Sin marcar, Dolphin por defecto usa NTSC-U y activa automáticamente esta " +"característica cuando se juega a juegos japoneses." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2398,7 +2558,7 @@ msgstr "Frame " msgid "Frame Advance" msgstr "Avanzar &fotogramas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "Volcado de fotogramas usa FFV1" @@ -2418,13 +2578,13 @@ msgstr "Límite de fotogramas:" msgid "Frames To Record" msgstr "Frames a grabar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "Cámara libre" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "Francés" @@ -2441,7 +2601,7 @@ msgstr "Desde" msgid "FullScr" msgstr "Pant. compl." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 msgid "Fullscreen resolution:" msgstr "Resolución en pantalla completa:" @@ -2485,8 +2645,8 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "&Configuración del mando Gamecube" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Tarjetas de memoria de Gamecube (*.raw,*.gcp)" @@ -2508,9 +2668,9 @@ msgstr "" "GeckoCode falló al ejecutarse (CT%i CST%i) (%s)\n" "(puede ser un código incorrecto o su tipo no es soportado todavía.)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -2518,16 +2678,17 @@ msgstr "General" msgid "General Settings" msgstr "Ajustes generales" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "Alemán" #: Source/Core/Core/Src/ActionReplay.cpp:451 #, 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" +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 msgid "Graphics" @@ -2541,16 +2702,22 @@ msgstr "Configuración gráfica" msgid "Greater Than" msgstr "Mayor que" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#, fuzzy 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" "\n" "If unsure, leave this checked." msgstr "" -"Aumenta bastante la calidad de las texturas generadas utilizando los efectos de renderización para la textura.\n" +"Aumenta bastante la calidad de las texturas generadas utilizando los efectos " +"de renderización para la textura.\n" "Aumentar la resolución interna va a mejorar el efecto de esta definición.\n" -"Diminuye ligeramente el desempenño y probablemente provoca fallos (aunque es improbable).\n" +"Diminuye ligeramente el desempenño y probablemente provoca fallos (aunque es " +"improbable).\n" "\n" "Si está inseguro, déjelo marcado." @@ -2578,11 +2745,11 @@ msgstr "Guitarra" 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:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "Hacks" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Falló la suma de verificación de cabecera" @@ -2618,7 +2785,7 @@ msgstr "" msgid "Hide" msgstr "Esconder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "Esconder cursor" @@ -2628,7 +2795,8 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Esconde el cursor del ratón si está en la parte de arriba de la ventana del emulador.\n" +"Esconde el cursor del ratón si está en la parte de arriba de la ventana del " +"emulador.\n" "\n" "Si está inseguro, déjelo marcado." @@ -2645,8 +2813,8 @@ msgstr "Hostear" msgid "Hotkey Configuration" msgstr "Configuración de atajos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 msgid "Hotkeys" msgstr "Atajos" @@ -2661,16 +2829,20 @@ msgstr "Wiimote híbrido" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 #, 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" +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:795 #, 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: El juego intentó recargar el ios o un título que no está disponible en su volcado nand\n" +"IOCTL_ES_LAUNCH: El juego intentó recargar el ios o un título que no está " +"disponible en su volcado nand\n" "TitleID %016llx.\n" " Dolphin probablemente se bloqueará ahora" @@ -2711,38 +2883,50 @@ msgid "Icon" msgstr "Icono" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -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)" +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:481 -msgid "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." -msgstr "Si define un límite de fotogramas por segunda mayor que la velocidad de juego completa (NTSC: 60, PAL: 50), también debe deshabilitar la regulación de audio en DSP para que tenga efecto." +msgid "" +"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." +msgstr "" +"Si define un límite de fotogramas por segunda mayor que la velocidad de " +"juego completa (NTSC: 60, PAL: 50), también debe deshabilitar la regulación " +"de audio en DSP para que tenga efecto." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" msgstr "Ignorar cambios de formato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 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 "" "Ignorar cualquier cambio hacia el formato EFB.\n" -"Mejora el rendimiento en muchos juegos sin ningún efecto negativo. Causa errores gráficos en un pequeño número de juegos.\n" +"Mejora el rendimiento en muchos juegos sin ningún efecto negativo. Causa " +"errores gráficos en un pequeño número de juegos.\n" "\n" "Si esta inseguro, déjelo marcado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 "" "Ignorar cualquier petición de la CPU de leer o escribir el EFB.\n" -"Mejora el rendimiento en algunos juegos, pero puede desactivar algunas características relacionadas con el juego o efectos gráficos.\n" +"Mejora el rendimiento en algunos juegos, pero puede desactivar algunas " +"características relacionadas con el juego o efectos gráficos.\n" "\n" "Si está inseguro, déjelo sin marcar." @@ -2774,23 +2958,26 @@ msgstr "" "El archivo importado tiene extensión .sav,\n" "pero no tiene la cabecera correcta" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 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 "" -"Mejora el rendimiento, pero puede provocar fallos en juegos que requieran de emulación adecuada de la niebla.\n" +"Mejora el rendimiento, pero puede provocar fallos en juegos que requieran de " +"emulación adecuada de la niebla.\n" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 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" +"Mejora el rendimiento, pero causa que desaparezca la iluminación en juegos " +"que la utilicen.\n" "\n" "Si está inseguro, déjelo sin marcar." @@ -2802,8 +2989,8 @@ msgstr "En juego" msgid "In-Game" msgstr "En juego" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "Información" @@ -2840,10 +3027,13 @@ msgid "Install to Wii Menu" msgstr "Instalar al menú de la Wii" #: Source/Core/Core/Src/MemTools.cpp:248 -msgid "InstallExceptionHandler called, but this platform does not yet support it." -msgstr "Se ha llamado InstallExceptionHandler, pero esta plataforma no lo soporta todavía." +msgid "" +"InstallExceptionHandler called, but this platform does not yet support it." +msgstr "" +"Se ha llamado InstallExceptionHandler, pero esta plataforma no lo soporta " +"todavía." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 msgid "Installing WAD..." msgstr "Instalando WAD..." @@ -2872,7 +3062,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "Error Interno de LZO - lzo_init() falló" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 msgid "Internal Resolution:" msgstr "Resolución interna:" @@ -2925,9 +3115,9 @@ msgstr "Archivo de grabación no válido" msgid "Invalid state" msgstr "Estado no válido" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "Italiano" @@ -2988,8 +3178,8 @@ msgstr "Último estado sobrescrito" msgid "Last Saved State" msgstr "Último estado guardado" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "Izquierda" @@ -3035,7 +3225,7 @@ msgstr "Usar FPS para limitar" msgid "Load" msgstr "Cargar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Load Custom Textures" msgstr "Cargar texturas personalizadas" @@ -3075,16 +3265,16 @@ msgstr "&Cargar estado 8" msgid "Load State..." msgstr "Cargar estado..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Load Wii System Menu" msgstr "Cargar Menú de sistema Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 #, 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:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3126,8 +3316,8 @@ msgstr "Tipos de registro" msgid "Logger Outputs" msgstr "Salida de registro" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "Registrando" @@ -3161,8 +3351,8 @@ msgstr "Hack de velocidad MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Archivos MadCatz Gameshark (*.gcs)" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick principal" @@ -3191,14 +3381,18 @@ msgstr "La tarjeta de memoria ya está abierta" msgid "Memory Byte" msgstr "Byte de memoria" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 msgid "Memory Card" msgstr "Tarjeta de memoria" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" -msgstr "Administrador de tarjetas de memoria. ADVERTENCIA: Haga copias antes de usarlo; debería estar arreglado, ¡pero puede que estropee cosas!" +msgid "" +"Memory Card Manager WARNING-Make backups before using, should be fixed but " +"could mangle stuff!" +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 #, c-format @@ -3217,9 +3411,11 @@ msgstr "" "%s\n" "¿Deseas copiar el viejo archivo a esta nueva dirección?\n" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" -msgstr "El tamaño del fichero de la tarjeta de memoria no corresponde con el tamaño de la cabecera." +msgstr "" +"El tamaño del fichero de la tarjeta de memoria no corresponde con el tamaño " +"de la cabecera." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:47 msgid "Menu" @@ -3234,7 +3430,7 @@ msgstr "Mic" msgid "Min" msgstr "Mín." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "Varios" @@ -3247,13 +3443,15 @@ msgstr "Configuraciones varias" msgid "Modifier" msgstr "Modificador" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 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 "" -"Modifica las texturas para mostrar el formato en el que están codificadas. Necesita un reinicio de la emulación en la mayoría de los casos.\n" +"Modifica las texturas para mostrar el formato en el que están codificadas. " +"Necesita un reinicio de la emulación en la mayoría de los casos.\n" "\n" "Si está inseguro, déjelo sin marcar." @@ -3270,7 +3468,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3280,7 +3478,8 @@ msgid "" "\n" "\n" msgstr "" -"Mueva el puntero del ratón sobre una opción para obtener una descripción detallada.\n" +"Mueva el puntero del ratón sobre una opción para obtener una descripción " +"detallada.\n" "\n" "\n" "\n" @@ -3290,8 +3489,12 @@ msgid "Multiply" msgstr "Multiplicar" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." -msgstr "Silencia el altavoz del Wiimote. Arregla las desconexiones aleatorias en wiimotes reales. No tiene ningún efecto en wiimotes emulados." +msgid "" +"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " +"effect on emulated wiimotes." +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/WXInputBase.cpp:126 msgid "NP Add" @@ -3377,9 +3580,9 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Arriba" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Nombre:" @@ -3464,7 +3667,7 @@ msgstr "No Igual" msgid "Not Set" msgstr "No Definido" -#: Source/Core/DolphinWX/Src/Main.cpp:607 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Not connected" msgstr "Sin conectar" @@ -3493,8 +3696,8 @@ msgstr "Bloq Num" msgid "Number Of Codes: " msgstr "Número de códigos:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "Nunchuk" @@ -3523,8 +3726,8 @@ msgstr "Offset:" msgid "Only %d blocks available" msgstr "Solo %d bloques disponibles" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Open" msgstr "Abrir" @@ -3554,11 +3757,11 @@ 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:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "Descodificador de texturas OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "Descodificador de texturas OpenMP" @@ -3585,18 +3788,23 @@ msgid "" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" msgstr "" -"El orden de los archivos en el directorio no corresponden con el orden de bloques\n" +"El orden de los archivos en el directorio no corresponden con el orden de " +"bloques\n" "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:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "Otros" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." -msgstr "¡¡El otro cliente se ha desconectado mientras el juego estaba ejecutándose!! NetPlay ha sido deshabilitado. Debe detener el juego manualmente." +msgid "" +"Other client disconnected while game is running!! NetPlay is disabled. You " +"manually stop the game." +msgstr "" +"¡¡El otro cliente se ha desconectado mientras el juego estaba ejecutándose!! " +"NetPlay ha sido deshabilitado. Debe detener el juego manualmente." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 msgid "Output" @@ -3651,13 +3859,13 @@ msgstr "Parches" msgid "Paths" msgstr "Directorios" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "Pausa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Per-Pixel Lighting" msgstr "Iluminación por píxel" @@ -3670,10 +3878,10 @@ msgstr "Perfecto" msgid "Perspective %d" msgstr "Perspectiva %d" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 msgid "Play" msgstr "Reproducir" @@ -3697,7 +3905,7 @@ msgstr "Opciones de reproducción" msgid "Players" msgstr "Jugadores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 msgid "Please confirm..." msgstr "Confirme, por favor..." @@ -3742,7 +3950,7 @@ msgstr "Portugués" msgid "Portuguese (Brazilian)" msgstr "Portugués (Brasil)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "Efecto de posprocesado:" @@ -3801,7 +4009,7 @@ msgstr "R Botón" msgid "R-Analog" msgstr "R-Analógico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "RAM" @@ -3817,7 +4025,7 @@ msgstr "Rango" msgid "Read-only mode" msgstr "Solo lectura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "Real" @@ -3877,9 +4085,9 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Actualizar" @@ -3891,14 +4099,14 @@ msgstr "Actualizar lista" msgid "Refresh game list" msgstr "Actualizar lista de juegos" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Remove" msgstr "Eliminar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -3908,12 +4116,12 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "Renderizar a ventana principal" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -3925,8 +4133,8 @@ msgstr "Resultados" msgid "Return" msgstr "Volver" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "Derecha" @@ -3951,13 +4159,17 @@ msgstr "Ruso" msgid "Sa&ve State" msgstr "Guardar estado" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "Seguro" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "Frecuencia del sonido:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Guardar" @@ -4021,7 +4233,13 @@ msgstr "Guardar GCM/ISO descomprimido" #: Source/Core/Core/Src/Movie.cpp:428 #, 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..." +msgstr "" +"El estado guardado de la película %s está corrupto, deteniendo la " +"grabación..." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +msgid "Scaled EFB Copy" +msgstr "EFB Copia a escala" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format @@ -4052,25 +4270,23 @@ msgstr "Filtro de búsqueda" msgid "Search Subfolders" msgstr "Buscar en subcarpetas" -#: Source/Core/Common/Src/SysConf.h:104 -#: Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 -#: Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 +#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 #, c-format msgid "Section %s not found in SYSCONF" msgstr "No se ha encontrado la sección %s en SYSCONF" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "Seleccionar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "Seleccionar archivo de grabación" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 msgid "Select a Wii WAD file to install" msgstr "Elige un WAD de Wii para instalar" @@ -4096,15 +4312,15 @@ msgstr "Selecciona las ventanas flotantes" msgid "Select the file to load" msgstr "Selecciona el archivo para cargar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Select the save file" msgstr "Selecciona el archivo de guardado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Selecciona el estado para cargar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "Select the state to save" msgstr "Selecciona el estado para guardar" @@ -4133,13 +4349,16 @@ msgstr "Fuente seleccionada" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 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 "" -"Selecciona la resolución de la pantalla usada en el modo de pantalla completa.\n" -"Debería ser siempre mayor o igual que la resolución interna. La pérdida de rendimiento es insignificante.\n" +"Selecciona la resolución de la pantalla usada en el modo de pantalla " +"completa.\n" +"Debería ser siempre mayor o igual que la resolución interna. La pérdida de " +"rendimiento es insignificante.\n" "\n" "Si está inseguro, elija la resolución que use en el escritorio.\n" "Si sigue inseguro, elija la mayor resolución que le funcione." @@ -4147,13 +4366,15 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 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 "" "Elije la aplicación gráfica para ser usada internamente.\n" -"Direct3D9 habitualmente es la más rápida. OpenGL es más exacta. Direct3D11 está entre medias de las dos.\n" +"Direct3D9 habitualmente es la más rápida. OpenGL es más exacta. Direct3D11 " +"está entre medias de las dos.\n" "Los sistemas Direct3D solo están disponibles en Windows.\n" "\n" "Si está inseguro, use Direct3D9." @@ -4175,8 +4396,11 @@ msgid "Serbian" msgstr "Serbio" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -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." +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 msgid "Set" @@ -4194,7 +4418,9 @@ msgstr "Definir como Memory Card por defecto %c" #: Source/Core/Core/Src/ActionReplay.cpp:462 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" -msgstr "SetARCode_IsActive: El índice es mayor que el tamaño de la lista de códigos AR %lu" +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:335 msgid "Settings..." @@ -4236,11 +4462,11 @@ msgstr "Mostrar barra de herramien&tas" msgid "Show Drives" msgstr "Mostrar unidades" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "Mostrar regiones de copiado de EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "Mostrar FPS" @@ -4252,7 +4478,7 @@ msgstr "Mostrar Francia" msgid "Show GameCube" msgstr "Mostrar Gamecube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "Mostrar entrada" @@ -4288,7 +4514,7 @@ msgstr "Mostrar plataformas" msgid "Show Regions" msgstr "Mostrar regiones" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "Mostar estadísticas" @@ -4315,10 +4541,13 @@ msgstr "Mostrar una ventana de confirmación antes de detener un juego." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 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 "" "Mostrar un mensaje cuando un posible error severo ha ocurrido.\n" -"Deshabilitar esto puede evitar ver mensajes que no son fatales, y molestos, pero también significa que Dolphin puede cerrarse ante un error sin ninguna explicación." +"Deshabilitar esto puede evitar ver mensajes que no son fatales, y molestos, " +"pero también significa que Dolphin puede cerrarse ante un error sin ninguna " +"explicación." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Show first block" @@ -4340,13 +4569,15 @@ msgstr "Mostrar icono del guardado" msgid "Show save title" msgstr "Mostrar título del guardado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 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 "" -"Mostar el número de frames renderizados por segundo como una medida de la velocidad de la emulación.\n" +"Mostar el número de frames renderizados por segundo como una medida de la " +"velocidad de la emulación.\n" "\n" "Si está inseguro, déjelo sin marcar." @@ -4358,7 +4589,7 @@ msgstr "Mostrar este mensaje de ayuda" msgid "Show unknown" msgstr "Mostrar desconocido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -4384,21 +4615,40 @@ msgstr "Tamaño" msgid "Skip BIOS" msgstr "Saltar BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "Saltar pase de alpha en dest." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "Saltar el acceso al EFB desde la CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 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 "" -"Salta el destino del pase alfa usado en muchos juegos para varios efectos gráficos.\n" +"Salta el destino del pase alfa usado en muchos juegos para varios efectos " +"gráficos.\n" +"\n" +"Si está inseguro, déjelo sin marcar." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Aumenta ligeramente las copias de EFB a la RAM al sacrificar exactitud de " +"emulación.\n" +"A veces también aumenta la calidad visual.\n" +"Si experimenta cualquier problema, pruebe aumentar la precisión de la cache " +"de textura o desactive esta opción.\n" "\n" "Si está inseguro, déjelo sin marcar." @@ -4426,13 +4676,15 @@ msgstr "Renderizado por software" #: 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 "" "Renderizado por software es bastante más lento que usar los otros sistemas.\n" "Solo es útil para depurar código.\n" -"¿Realmente quieres activar renderizado por software? Si está inseguro, escoja No." +"¿Realmente quieres activar renderizado por software? Si está inseguro, " +"escoja No." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 msgid "Sound Settings" @@ -4452,9 +4704,9 @@ msgstr "Falló la creación del búfer de sonido: %s" msgid "Space" msgstr "Espacio" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "Español" @@ -4462,15 +4714,23 @@ msgstr "Español" msgid "Speaker Volume:" msgstr "Volumen del altavoz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 "" -"Especifica la resolución usada para renderizar. Una resolución alta mejorará mucho la calidad visual, pero reducirá el rendimiento y puede causar errores gráficos en algunos juegos.\n" -"\"Múltiplo de 640x528\" es un poco más lento que \"Tamaño de la ventana\", pero provoca menos errores. De forma general, a menor resolución interna obtendrá mejor rendimiento.\n" +"Especifica la resolución usada para renderizar. Una resolución alta mejorará " +"mucho la calidad visual, pero reducirá el rendimiento y puede causar errores " +"gráficos en algunos juegos.\n" +"\"Múltiplo de 640x528\" es un poco más lento que \"Tamaño de la ventana\", " +"pero provoca menos errores. De forma general, a menor resolución interna " +"obtendrá mejor rendimiento.\n" "\n" "Si está inseguro, elija 640x528." @@ -4490,9 +4750,9 @@ msgstr "Stick cuadrado" msgid "Standard Controller" msgstr "Control estándar" +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Comenzar" @@ -4520,14 +4780,31 @@ msgstr "Estados guardados" msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Detener" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" +"Calcular la iluminación de los gráficos 3D por píxel en lugar de por " +"vértice.\n" +"Disminuye la velocidad de emulación en un pequeño porcentaje (dependiendo de " +"la GPU).\n" +"Esto generalmente es una mejora segura, pero a veces podría causar " +"problemas.\n" +"\n" +"Si no está seguro, deje esta casilla sin marcar." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "Estirar a la ventana" @@ -4561,8 +4838,8 @@ msgstr "Idioma del sistema:" msgid "TAIWAN" msgstr "TAIWÃN" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "Entrada TAS" @@ -4582,9 +4859,9 @@ msgstr "Tabla izquierda" msgid "Table Right" msgstr "Tabla derecha" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "Captura de pantalla" @@ -4592,7 +4869,15 @@ msgstr "Captura de pantalla" msgid "Test" msgstr "Prueba" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "Textura" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +msgid "Texture Cache" +msgstr "Caché de texturas" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" msgstr "Superposición del formato de la textura" @@ -4625,15 +4910,20 @@ 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 "El archivo %s no pudo ser abierto para su escritura. Por favor, revisa si no está ya abierto por otro programa." +msgid "" +"The file %s could not be opened for writing. Please check if it's already " +"opened by another program." +msgstr "" +"El archivo %s no pudo ser abierto para su escritura. Por favor, revisa si no " +"está ya abierto por otro programa." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format 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." +msgstr "" +"El archivo %s ya estaba abierto, la cabecera de archivo no será escrita." -#: Source/Core/Core/Src/Boot/Boot.cpp:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "El archivo especificado (%s) no existe" @@ -4650,13 +4940,30 @@ msgstr "El nombre no puede tener el carácter «,»" 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:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +msgstr "" +"Cuanto más seguro ajuste esto, es menos probable que el emulador se pierda " +"las actualizaciones de la textura de la memoria RAM.\n" +"\n" +"Si no está seguro, utilice el segundo valor más rápido de la derecha." + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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" +msgstr "" +"El guardado que está tratando de copiar tiene un tamaño de archivo no válido" -#: Source/Core/DolphinWX/Src/Main.cpp:363 -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." +#: Source/Core/DolphinWX/Src/Main.cpp:353 +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." #: Source/Core/Core/Src/NetPlayClient.cpp:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -4692,8 +4999,12 @@ 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:467 -msgid "There must be a ticket for 00000001/00000002. Your NAND dump is probably incomplete." -msgstr "Debe haber un ticket para 00000001/00000002. Probablemente su volcado de NAND esté incompleto." +msgid "" +"There must be a ticket for 00000001/00000002. Your NAND dump is probably " +"incomplete." +msgstr "" +"Debe haber un ticket para 00000001/00000002. Probablemente su volcado de " +"NAND esté incompleto." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "" @@ -4704,23 +5015,35 @@ msgstr "" "Sin determinar significa que el juego usa la configuración de Dolphin." #: Source/Core/Core/Src/ActionReplay.cpp:356 -msgid "This action replay simulator does not support codes that modify Action Replay itself." -msgstr "El simulador de Action Replay no soporta códigos que modifiquen al Action Replay." +msgid "" +"This action replay simulator does not support codes that modify Action " +"Replay itself." +msgstr "" +"El simulador de Action Replay no soporta códigos que modifiquen al Action " +"Replay." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 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." +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:119 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 "" "Esta característica le 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 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 la cámara. \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 " +"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 " +"la cámara. \n" "\n" "Si no está seguro, deje esta casilla sin marcar." @@ -4736,19 +5059,25 @@ msgstr "" "Deshabilitar esto puede causar velocidad de juego anormal, como muy rápido.\n" "Pero a veces puede provocar ruido constante.\n" "\n" -"Atajo de Teclado : Mantén la tecla presionada para desabilitar la regulación instantáneamente." +"Atajo de Teclado : Mantén la tecla presionada para desabilitar la " +"regulación instantáneamente." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "This is used to play music tracks, like BGM." -msgstr "Esto es usado para reproducir pistas de música, como música de fondo (BGM)." +msgstr "" +"Esto es usado para reproducir pistas de música, como música de fondo (BGM)." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 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 "" -"Esto divide los procesos de vídeo y CPU para que se ejecuten en núcleos separados.\n" -"Provoca mejoras de velocidad muy grandes en PC con mas de un núcleo, pero puede ocasionar errores gráficos o del programa." +"Esto divide los procesos de vídeo y CPU para que se ejecuten en núcleos " +"separados.\n" +"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:283 msgid "This will let you Manually Edit the INI config file" @@ -4777,13 +5106,13 @@ msgstr "A" msgid "Toggle All Log Types" msgstr "Alternar todos los tipos de registro" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Cambiar a pantalla completa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Top" msgstr "Superior" @@ -4791,7 +5120,7 @@ msgstr "Superior" msgid "Traditional Chinese" msgstr "Chino tradicional" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "Se trató de cargar un archivo de tipo desconocido." @@ -4799,8 +5128,7 @@ msgstr "Se trató de cargar un archivo de tipo desconocido." msgid "Triggers" msgstr "Gatillos" -#: Source/Core/Common/Src/SysConf.h:92 -#: Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 msgid "Trying to read from invalid SYSCONF" msgstr "Intentando leer de un SYSCONF no válido" @@ -4828,8 +5156,8 @@ msgstr "Tipo" msgid "UDP Port:" msgstr "Puerto UDP:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -4852,10 +5180,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 "" -"No es posible analizar la línea %lu del código AR introducido como un código válido cifrado o descifrado. Asegúrese de que la ha escrito correctamente.\n" +"No es posible analizar la línea %lu del código AR introducido como un código " +"válido cifrado o descifrado. Asegúrese de que la ha 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 @@ -4889,7 +5219,8 @@ msgstr "Se recibió un mensaje desconocido de id: %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" -msgstr "Mensaje desconocido con id:%d recibido del jugador:%d ¡Echando al jugador!" +msgstr "" +"Mensaje desconocido con id:%d recibido del jugador:%d ¡Echando al jugador!" #: Source/Core/Core/Src/HW/Memmap.cpp:633 #, c-format @@ -4900,8 +5231,8 @@ msgstr "" "Puntero desconocido %#08x\n" "¿Continuar?" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "Arriba" @@ -4918,7 +5249,7 @@ msgstr "Wiimote parado" msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar Modo EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 msgid "Use Fullscreen" msgstr "Usar pantalla completa" @@ -4930,7 +5261,7 @@ msgstr "Usar hexadecimal" msgid "Use Panic Handlers" msgstr "Usar advertencias" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -4938,27 +5269,31 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Usa múltiples hilos para decodificar texturas.\n" -"Debería obtenerse una mejora de velocidad (especialmente en CPU con más de dos núcleos).\n" +"Debería obtenerse una mejora de velocidad (especialmente en CPU con más de " +"dos núcleos).\n" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 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 "" -"Habitualmente, si la compilación de los sombreadores falla, se muestra un error.\n" -"Sin embargo, pueden omitirse la ventanas emergentes para permitir el juego libre de la interrupción marcando esta opción.\n" +"Habitualmente, si la compilación de los sombreadores falla, se muestra un " +"error.\n" +"Sin embargo, pueden omitirse la ventanas emergentes para permitir el juego " +"libre de la interrupción marcando esta opción.\n" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "Utilidad" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "V-Sync" @@ -4982,8 +5317,7 @@ msgstr "Verbosidad" msgid "Video" msgstr "Vídeo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "Virtual" @@ -5005,26 +5339,27 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Sincroniza los intervalos verticales para reducir el efecto de imagen partida.\n" +"Sincroniza los intervalos verticales para reducir el efecto de imagen " +"partida.\n" "Disminuye el rendimiento si la emulacion no es del 100%.\n" "\n" "Si está inseguro, déjelo sin marcar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Advertencia" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 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:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "Advertencia - arrancando un ELF en un modo de consola incorrecto!" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "Advertencia - arrancando un ISO en un modo de consola incorrecto!" @@ -5035,7 +5370,8 @@ msgid "" "%s\n" "Do you wish to continue?" msgstr "" -"¡Advertencia! Es recomendable hacer una copia de todos los archivos en la carpeta:\n" +"¡Advertencia! Es recomendable hacer una copia de todos los archivos en la " +"carpeta:\n" "%s\n" "¿Quiere continuar?" @@ -5047,7 +5383,8 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" -"Advertencia: Esto sobrescribirá todos los guardados existentes que están en la carpeta:\n" +"Advertencia: Esto sobrescribirá todos los guardados existentes que están en " +"la carpeta:\n" "%s\n" "y tienen el mismo nombre que el archivo en tu memcard\n" "Continuar?" @@ -5061,7 +5398,7 @@ msgstr "WaveFileWriter - el archivo no está abierto." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "Hack de pantalla ancha (widescreen)" @@ -5085,7 +5422,7 @@ msgstr "Raíz de la NAND de Wii:" msgid "Wii Save Import" msgstr "Importar guardado de Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 msgid "Wii save files (*.bin)|*.bin" msgstr "Archivos de guardado Wii (*.bin)|*.bin" @@ -5093,8 +5430,8 @@ msgstr "Archivos de guardado Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: No se pudo leer el archivo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "Wiimote" @@ -5116,7 +5453,7 @@ msgstr "" "o mucho tiempo de espera, o alguna otra razón.\n" "¿Desea reconectarlo inmediatamente?" -#: Source/Core/DolphinWX/Src/Main.cpp:609 +#: Source/Core/DolphinWX/Src/Main.cpp:599 msgid "Wiimote Connected" msgstr "Wiimote conectado" @@ -5148,7 +5485,7 @@ msgstr "Windows Derecha" msgid "Word Wrap" msgstr "Word Wrap" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5254,7 +5591,7 @@ msgstr "Código cero desconocido para Dolphin: %08x" msgid "[ waiting ]" msgstr "[ esperando ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5270,20 +5607,26 @@ msgstr "" msgid "[Custom]" msgstr "[Personalizado]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 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" -"Tiene como objetivo aumentar la velocidad de emulación al transferir la tarea de decodificación de texturas para la GPU utilizando la tecnologia OpenCL.\n" -"Actualmente se sabe que provoca defectos al nivel de texturas en varios juegos. Es tambén más lento que la descodificación normal de la textura por la CPU en la mayoría de los casos.\n" +"Tiene como objetivo aumentar la velocidad de emulación al transferir la " +"tarea de decodificación de texturas para la GPU utilizando la tecnologia " +"OpenCL.\n" +"Actualmente se sabe que provoca defectos al nivel de texturas en varios " +"juegos. Es tambén más lento que la descodificación normal de la textura por " +"la CPU en la mayoría de los casos.\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5326,7 +5669,9 @@ msgstr "iCacheJIT: Leyendo Opcode desde %x. Por favor, comuníquelo." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108 #, c-format msgid "not a wii save or read failure for file header size %x" -msgstr "no es un guardado de Wii o fallo de lectura para la cabecera de archivo de tamaño %x" +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:461 msgid "s" @@ -5382,9 +5727,6 @@ msgstr "| OR" #~ msgid "AOSound" #~ msgstr "&Sonido" -#~ msgid "Accuracy:" -#~ msgstr "Exactitud:" - #~ msgid "Accurate Texture Cache" #~ msgstr "Caché de texturas preciso" @@ -5422,19 +5764,6 @@ 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á seguro, deje esta marcada." - #~ msgid "Bad gameini filename" #~ msgstr "Nombre de archivo gameini incorrecto" @@ -5496,6 +5825,9 @@ msgstr "| OR" #~ msgid "Danish" #~ msgstr "Danés" +#~ msgid "Disable Wiimote Speaker" +#~ msgstr "Desactivar altavoz del Wiimote" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -5559,9 +5891,6 @@ msgstr "| OR" #~ msgid "Enable CPU Access" #~ msgstr "Habilitar acceso a la CPU" -#~ msgid "Enable Cache" -#~ msgstr "Habilitar caché" - #~ msgid "Enable Copy to EFB" #~ msgstr "Habilitar Copiado al EFB" @@ -5640,12 +5969,6 @@ msgstr "| OR" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Fallo al cargar ROM DSP: %s" -#~ msgid "Fast" -#~ msgstr "Rápido" - -#~ msgid "Fast Mipmaps" -#~ msgstr "Mipmaps rápidos" - #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -5803,15 +6126,9 @@ msgstr "| OR" #~ msgid "Running script...\n" #~ msgstr "Ejecutando script...\n" -#~ msgid "Safe" -#~ msgstr "Seguro" - #~ msgid "Scale:" #~ msgstr "Escala:" -#~ msgid "Scaled EFB Copy" -#~ msgstr "EFB Copia a escala" - #~ msgid "Select resolution for fullscreen mode" #~ msgstr "Selecciona resolución para pantalla completa" @@ -5866,22 +6183,6 @@ msgstr "| OR" #~ msgid "Skies of Arcadia" #~ msgstr "Skies of Arcadia" -#~ 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" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Aumenta ligeramente las copias de EFB a la RAM al sacrificar exactitud de " -#~ "emulación.\n" -#~ "A veces también aumenta la calidad visual.\n" -#~ "Si experimenta cualquier problema, pruebe aumentar la precisión de la " -#~ "cache de textura o desactive esta opción.\n" -#~ "\n" -#~ "Si está inseguro, déjelo sin marcar." - #~ msgid "Slot" #~ msgstr "Casilla" @@ -5922,42 +6223,9 @@ msgstr "| OR" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Comenzar la ventana de renderizado en pantalla completa." -#~ 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" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "Calcular la iluminación de los gráficos 3D por píxel en lugar de por " -#~ "vértice.\n" -#~ "Disminuye la velocidad de emulación en un pequeño porcentaje (dependiendo " -#~ "de la GPU).\n" -#~ "Esto generalmente es una mejora segura, pero a veces podría causar " -#~ "problemas.\n" -#~ "\n" -#~ "Si no está seguro, deje esta casilla sin marcar." - -#~ msgid "Texture" -#~ msgstr "Textura" - -#~ msgid "Texture Cache" -#~ msgstr "Caché de texturas" - #~ msgid "The file " #~ msgstr "El archivo " -#~ msgid "" -#~ "The safer you adjust this, the less likely the emulator will be missing " -#~ "any texture updates from RAM.\n" -#~ "\n" -#~ "If unsure, use the second-fastest value from the right." -#~ msgstr "" -#~ "Cuanto más seguro ajuste esto, es menos probable que el emulador se " -#~ "pierda las actualizaciones de la textura de la memoria RAM.\n" -#~ "\n" -#~ "Si no está seguro, utilice el segundo valor más rápido de la derecha." - #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Esto es usado comunmente para reproducir voces y efectos de sonido." diff --git a/Languages/po/fr.po b/Languages/po/fr.po index 6b4961d527..a477cf2a90 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: 2011-08-10 08:30-0500\n" +"POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-08-10 17:42+0100\n" "Last-Translator: Pascal\n" "Language-Team: \n" @@ -30,7 +30,7 @@ msgstr "Jeu :" msgid "! NOT" msgstr "! NOT" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -42,7 +42,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\" 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/MemcardManager.cpp:193 #, c-format @@ -72,7 +73,7 @@ msgstr "%s existe déjà. Voulez-vous le remplacer ?" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s n'a pas pu être compressé. L'image est probablement corrompue." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -81,7 +82,7 @@ msgstr "" "%s n'a pu être lu en tant que carte mémoire.\n" " La taille du fichier de la carte n'est pas valide (0x%x octets)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -90,14 +91,15 @@ msgstr "" "%s n'a pu être lu en tant que carte mémoire.\n" " La taille de la carte n'est pas valide (0x%x octets)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format 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'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 @@ -306,7 +308,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "Inconnu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(aucun)" @@ -318,7 +320,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "3D Vision" @@ -330,7 +332,7 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "" @@ -368,11 +370,13 @@ 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" @@ -386,10 +390,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 !!" @@ -412,19 +419,26 @@ msgstr "A propos de Dolphin" msgid "Acceleration" msgstr "Accéleration" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "Précision :" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "Emulation fidèle VBeam" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#, fuzzy 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, leave this checked." +"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 cette case." @@ -449,33 +463,51 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, 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:756 #, 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:549 #, 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:609 #, 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:803 #, 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:684 #, c-format -msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "Erreur Action Replay : Master Code et Write To CCXXXXXX non implémentés (%s)" +msgid "" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgstr "" +"Erreur Action Replay : Master Code et Write To CCXXXXXX non implémentés (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -502,12 +534,12 @@ msgstr "Action Replay ; Code Normal %i : Sous-type non valide %08x (%s)" 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:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "Carte :" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "Ajouter" @@ -523,9 +555,9 @@ msgstr "Ajouter un patch" msgid "Add new pane" msgstr "Ajouter un nouveau panneau" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "Ajouter..." @@ -537,14 +569,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." @@ -553,23 +587,26 @@ 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:759 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:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "Avancé" @@ -589,8 +626,8 @@ msgstr "Toutes les images GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tous les fichiers GameCube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "All Save States (sav, s##)" msgstr "Tous les états sauvegardés (sav, s##)" @@ -606,21 +643,28 @@ msgstr "Tous les fichiers ISO compressés GC/Wii (gcz)" msgid "All files (*.*)|*.*" msgstr "Tous les fichiers (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 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, 6 et " +"7 dans la fenêtre d'émulation.\n" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Wiimote émulée" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" msgstr "Filtrage anisotropique :" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "Anti-Aliasing :" @@ -640,13 +684,14 @@ msgstr "Apploader :" msgid "Apply" msgstr "Appliquer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\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)." @@ -669,10 +714,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 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:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Format d'écran :" @@ -693,19 +740,19 @@ msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Multiple de 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "Auto (taille de la fenêtre)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "Ajuster auto. la taille de la fenêtre" @@ -719,6 +766,20 @@ msgstr "" "\n" "Dans le doute, décochez cette case." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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/WXInputBase.cpp:27 msgid "Back" msgstr "Retour" @@ -727,8 +788,8 @@ msgstr "Retour" msgid "Backend Settings" msgstr "Paramètres de l'interface audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Moteur :" @@ -762,7 +823,7 @@ msgstr "Bannière :" msgid "Bar" msgstr "Barre" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "Paramètres de base" @@ -774,9 +835,11 @@ msgstr "Paramètres de base" msgid "Bass" msgstr "Basse" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 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:628 msgid "Blocks" @@ -794,8 +857,8 @@ msgstr "Bleu Gauche" msgid "Blue Right" msgstr "Bleu Droite" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 msgid "Bottom" msgstr "Bas" @@ -828,9 +891,9 @@ msgstr "Parcourir un dossier de destination" msgid "Buffer:" msgstr "Buffer :" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "Boutons" @@ -846,23 +909,28 @@ msgstr "Stick-C" msgid "CPU Emulator Engine" msgstr "Moteur d'émulation du CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "Cache des listes d'affichage" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 "" -"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" +"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:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -871,13 +939,15 @@ 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." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Annuler" @@ -894,7 +964,8 @@ msgstr "Impossible d'enregistrer des films en mode Lecture seule." #: Source/Core/Core/Src/CoreTiming.cpp:122 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:1016 #, c-format @@ -918,19 +989,21 @@ msgstr "" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858 #, 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:1872 #, 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:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 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:49 msgid "Caps Lock" @@ -1030,8 +1103,12 @@ msgid "Choose a memory card:" msgstr "Choisir une carte mémoire :" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 -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:764 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 @@ -1046,10 +1123,10 @@ msgstr "Stick circulaire" msgid "Classic" msgstr "Classique" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "Effacer" @@ -1058,13 +1135,17 @@ msgid "Clear failed." msgstr "Echec de l'éffacement" #: 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/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fermer" @@ -1168,7 +1249,7 @@ msgstr "Connecter la 3è Wiimote" msgid "Connect Wiimote 4" msgstr "Connecter la 4è Wiimote" -#: Source/Core/DolphinWX/Src/Main.cpp:608 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Connecting..." msgstr "Connexion..." @@ -1209,8 +1290,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 @@ -1227,19 +1315,23 @@ 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:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, 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:1044 msgid "Couldn't find open command for extension 'ini'!" @@ -1277,8 +1369,10 @@ msgid "Created by KDE-Look.org" msgstr "Créé par KDE-Look.org" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 -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 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:492 msgid "Created by VistaIcons.com" @@ -1296,11 +1390,11 @@ msgstr "Créateur :" msgid "Critical" msgstr "Critique" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "Couper" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1347,8 +1441,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Moteur d'émulation du DSP (Audio)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "DSP HLE emulation (fast)" msgstr "Emulation du DSP en HLE (rapide)" @@ -1397,7 +1491,7 @@ msgstr "Zone morte" msgid "Debug" msgstr "Débug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Debugging" msgstr "Débug" @@ -1430,8 +1524,8 @@ msgstr "ISO par défaut :" msgid "Default font" msgstr "Police par défaut" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "Supprimer" @@ -1439,12 +1533,12 @@ msgstr "Supprimer" msgid "Delete Save" msgstr "Supprimer la sauvegarde" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "Supprimer le fichier '%s' ?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 msgid "Description" msgstr "Description" @@ -1454,8 +1548,12 @@ msgstr "Détecter" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -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:131 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 @@ -1471,15 +1569,15 @@ msgstr "Paramètres de la console virtuelle" msgid "Dial" msgstr "Appel" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1487,56 +1585,58 @@ 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:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 msgid "Disable" msgstr "Désactiver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "Désactiver la fumée" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "Désactiver l'éclairage" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "Désactiver la profondeur / pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "Désactiver les textures" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "Désactiver le haut-parleur de la Wiimote." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 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:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 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." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1555,11 +1655,11 @@ msgstr "Disque" msgid "Disc Read Error" msgstr "Erreur de lecture du disque" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "Vidéo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1573,7 +1673,7 @@ msgstr "" msgid "Divide" msgstr "Diviser" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Do you want to stop the current emulation?" msgstr "Voulez-vous arrêter l'émulation en cours ?" @@ -1581,7 +1681,7 @@ msgstr "Voulez-vous arrêter l'émulation en cours ?" msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Configuration des graphismes %s pour Dolphin" @@ -1602,12 +1702,12 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 msgid "Dolphin GCPad Configuration" msgstr "Configuration de la manette GC pour Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Films TAS Dolphin (*.dtm)" @@ -1620,15 +1720,23 @@ msgid "Dolphin at &Google Code" msgstr "Dolphin dans &Google Code" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 -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:307 -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/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Bas" @@ -1653,29 +1761,30 @@ msgstr "Factice" msgid "Dump Audio" msgstr "Enregistrer le son" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "Copier l'EFB cible" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "Copier les images" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "Copier les textures" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\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." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1685,7 +1794,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1695,9 +1804,9 @@ msgstr "" "\n" "Dans le doute, décochez cette case." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "Néerlandais" @@ -1705,14 +1814,22 @@ msgstr "Néerlandais" msgid "E&xit" msgstr "&Quitter" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" msgstr "Copies de l'EFB" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, 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:162 msgid "EUROPE" @@ -1751,7 +1868,7 @@ msgstr "Editer..." msgid "Effect" msgstr "Effets" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "Buffer d'image embarqué" @@ -1759,27 +1876,34 @@ 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:111 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:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 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:33 @@ -1794,15 +1918,17 @@ msgstr "Etat de l'émulation :" msgid "Enable" msgstr "Activer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 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" @@ -1824,6 +1950,10 @@ msgstr "Activer BAT" msgid "Enable Block Merging" msgstr "Activer l'assemblage de blocs" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +msgid "Enable Cache" +msgstr "Activer le cache" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "Activer les Cheats" @@ -1840,7 +1970,7 @@ msgstr "Activer le Dual Core" msgid "Enable Dual Core (speedup)" msgstr "Activer le Dual Core (plus rapide)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "Activer les touches de raccourci" @@ -1856,8 +1986,8 @@ msgstr "Activer le saut d'inactivité (plus rapide)" msgid "Enable MMU" msgstr "Activer le MMU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "Activer le Progressive Scan" @@ -1869,7 +1999,7 @@ msgstr "Activer l'économiseur d'écran" msgid "Enable WideScreen" msgstr "Activer l'écran large (16/9è)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "Activer le rendu en fil de fer" @@ -1882,14 +2012,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:317 -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:799 msgid "Enable pages" @@ -1902,28 +2037,41 @@ 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:79 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:329 -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:311 -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:334 msgid "Enables Custom Projection Hack" @@ -1942,10 +2090,14 @@ msgstr "" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -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:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -1959,14 +2111,14 @@ msgstr "" msgid "End" msgstr "Fin" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "Anglais" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "Améliorations" @@ -1988,20 +2140,26 @@ msgstr "Entrée 1/%d" msgid "Equal" msgstr "Egal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "Erreur" -#: Source/Core/DolphinWX/Src/Main.cpp:356 +#: Source/Core/DolphinWX/Src/Main.cpp:346 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/Core/Src/HW/EXI_DeviceIPL.cpp:273 #, 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" @@ -2014,7 +2172,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:58 msgid "Execute" @@ -2064,7 +2223,7 @@ msgstr "Exporter l'enregistrement sous..." msgid "Extension" msgstr "Extension" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "Buffer d'image externe" @@ -2168,7 +2327,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 @@ -2185,15 +2345,16 @@ msgstr "Impossible de charger hid.dll" msgid "Failed to read banner.bin" msgstr "Impossible de lire banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 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/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2206,7 +2367,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Impossible de lire les données du fichier %d" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2214,7 +2375,7 @@ msgstr "" "Impossible de lire correctement la sauvegarde des dossiers\n" "(0x4000-0x5FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2222,7 +2383,7 @@ msgstr "" "Impossible de lire le dossier correctement\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2230,7 +2391,7 @@ msgstr "" "Impossible de lire l'entête correctement\n" "(0x0000-0x1FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2262,6 +2423,14 @@ 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/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "Rapide" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "Mipmaps rapides" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 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." @@ -2290,7 +2459,7 @@ msgstr "" "Le fichier n'a pu être ouvert\n" "ou n'a pas d'extension valide" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2328,11 +2497,11 @@ msgstr "Premier bloc" msgid "Fix Checksums" msgstr "Corriger les sommes de contôle" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "Forcer 16/9è" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "Forcer 4/3" @@ -2340,11 +2509,11 @@ msgstr "Forcer 4/3" msgid "Force Console as NTSC-J" msgstr "Forcer la console comme NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" msgstr "Forcer le filtrage de texture" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2352,7 +2521,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." @@ -2363,7 +2533,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." @@ -2371,12 +2542,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 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/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2401,7 +2574,7 @@ msgstr "Image " msgid "Frame Advance" msgstr "Avancement d'image" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "L'enregistrement d'images utilise FFV1" @@ -2421,13 +2594,13 @@ msgstr "Image/s max :" msgid "Frames To Record" msgstr "Images à enregistrer :" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "Vue libre" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "Français" @@ -2444,7 +2617,7 @@ msgstr "De" msgid "FullScr" msgstr "Plein écran" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 msgid "Fullscreen resolution:" msgstr "Résolution en Plein écran :" @@ -2488,8 +2661,8 @@ msgstr "GameCube" msgid "Gamecube &Pad Settings" msgstr "Paramètres de la &manette GameCube" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Carte mémoires de GameCube (*.raw,*.gcp)" @@ -2511,9 +2684,9 @@ msgstr "" "Echec de l'exécution dy GeckoCode (CT%i CST%i) (%s)\n" "(ou c'est un mauvais code, ou il n'est pas encore pris en charge.)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Général" @@ -2521,16 +2694,17 @@ msgstr "Général" msgid "General Settings" msgstr "Paramètres généraux" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "Allemand" #: Source/Core/Core/Src/ActionReplay.cpp:451 #, 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:443 msgid "Graphics" @@ -2544,15 +2718,21 @@ msgstr "Paramètres graphiques" msgid "Greater Than" msgstr "Plus grand que" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#, fuzzy 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" "\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" +"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" "\n" "Dans le doute, cochez cette case." @@ -2580,11 +2760,11 @@ msgstr "Guitare" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Appel de HCI_CMD_INQUIRY, veuillez nous le signaler !" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "Hacks" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Echec de la vérification de la somme de contrôle de l'entête" @@ -2611,8 +2791,10 @@ 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" @@ -2620,7 +2802,7 @@ msgstr "" msgid "Hide" msgstr "Cacher" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "Masquer le curseur de la souris" @@ -2630,7 +2812,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." @@ -2647,8 +2830,8 @@ msgstr "Hôte" msgid "Hotkey Configuration" msgstr "Configuration des raccourcis clavier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 msgid "Hotkeys" msgstr "Raccourcis clavier" @@ -2663,16 +2846,20 @@ msgstr "Wiimote hybride" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 #, 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:795 #, 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" @@ -2713,38 +2900,50 @@ msgid "Icon" msgstr "Icône" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -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:481 -msgid "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." -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), vous devez aussi désactiver le contrôle audio dans le DSP pour que cela fonctionne." +msgid "" +"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." +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), vous devez aussi désactiver " +"le contrôle audio dans le DSP pour que cela fonctionne." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" msgstr "Ignorer les changements de formats" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 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:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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." @@ -2776,23 +2975,26 @@ msgstr "" "Le fichier importé a l'extension SAV\n" "mais n'a pas une entête valide" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 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." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 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" +"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." @@ -2804,8 +3006,8 @@ msgstr "Dans le jeu" msgid "In-Game" msgstr "Dans le jeu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "Info" @@ -2842,10 +3044,13 @@ 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:1361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 msgid "Installing WAD..." msgstr "Installation du WAD..." @@ -2874,7 +3079,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "Erreur interne LZO - échec de lzo_init()" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 msgid "Internal Resolution:" msgstr "Résolution interne :" @@ -2927,9 +3132,9 @@ msgstr "Fichier d'enregitrement non valide" msgid "Invalid state" msgstr "Etat non valide" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "Italien" @@ -2990,8 +3195,8 @@ msgstr "Dernier état écrasé" msgid "Last Saved State" msgstr "Dernier état sauvegardé" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "Gauche" @@ -3037,7 +3242,7 @@ msgstr "Nb de FPS comme limite" msgid "Load" msgstr "Charger" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Load Custom Textures" msgstr "Charger textures personnalisées" @@ -3077,16 +3282,16 @@ msgstr "Charger l'état du Slot 8" msgid "Load State..." msgstr "Charger un état..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Load Wii System Menu" msgstr "Charger le Menu Système Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 #, 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:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3098,7 +3303,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/Main.cpp:134 msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" @@ -3128,8 +3335,8 @@ msgstr "Types de journaux" msgid "Logger Outputs" msgstr "Sorties des journalisations" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "Journalisation" @@ -3163,8 +3370,8 @@ msgstr "Hack de vitesse pour le MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Fichiers MadCatz Gameshark (*.gcs)" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick principal" @@ -3193,14 +3400,18 @@ msgstr "Carte mémoire déjà chargée" msgid "Memory Byte" msgstr "Octet mémoire" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 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 @@ -3219,9 +3430,11 @@ msgstr "" "%s\n" "Voulez-vous copier l'ancien fichier vers ce nouvel endroit ?\n" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 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:47 msgid "Menu" @@ -3236,7 +3449,7 @@ msgstr "Micro" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "Divers" @@ -3249,13 +3462,16 @@ msgstr "Paramètres divers" msgid "Modifier" msgstr "Modif." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 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." @@ -3272,7 +3488,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Vibreur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3295,8 +3511,12 @@ msgid "Multiply" msgstr "Multiplier" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -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/WXInputBase.cpp:126 msgid "NP Add" @@ -3382,9 +3602,9 @@ msgstr "NP Tabulation" msgid "NP Up" msgstr "NP Haut" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Nom :" @@ -3469,7 +3689,7 @@ msgstr "Différent" msgid "Not Set" msgstr "Non défini" -#: Source/Core/DolphinWX/Src/Main.cpp:607 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Not connected" msgstr "Non connectée" @@ -3498,8 +3718,8 @@ msgstr "Verr. Num" msgid "Number Of Codes: " msgstr "Nombre de codes :" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "Nunchuck" @@ -3528,8 +3748,8 @@ msgstr "Offset :" msgid "Only %d blocks available" msgstr "%d blocs disponibles seulement" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Open" msgstr "Ouvrir" @@ -3559,11 +3779,11 @@ 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:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "Décodeur de texture OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "Décodeur de texture OpenMP" @@ -3590,18 +3810,23 @@ 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" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 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:485 msgid "Output" @@ -3656,13 +3881,13 @@ msgstr "Patchs" msgid "Paths" msgstr "Chemins" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "Pause" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Per-Pixel Lighting" msgstr "Eclairage par pixel" @@ -3675,10 +3900,10 @@ msgstr "Parfait" msgid "Perspective %d" msgstr "Perspective %d" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 msgid "Play" msgstr "Démarrer" @@ -3702,7 +3927,7 @@ msgstr "Options de lecture" msgid "Players" msgstr "Joueurs" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 msgid "Please confirm..." msgstr "Veuillez confirmer..." @@ -3747,7 +3972,7 @@ msgstr "Portugais" msgid "Portuguese (Brazilian)" msgstr "Portugais (brésilien)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "Effet de Post-processing :" @@ -3806,7 +4031,7 @@ msgstr "Bouton R" msgid "R-Analog" msgstr "R Analog." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "RAM" @@ -3822,7 +4047,7 @@ msgstr "Etendue" msgid "Read-only mode" msgstr "Mode Lecture seule" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "Réel" @@ -3878,13 +4103,14 @@ 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." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Rafraîchir" @@ -3896,14 +4122,14 @@ msgstr "Rafraîchir la liste" msgid "Refresh game list" msgstr "Rafraîchir la liste des jeux" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Remove" msgstr "Retirer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -3913,12 +4139,12 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "Rendu dans la fenêtre principale" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -3930,8 +4156,8 @@ msgstr "Résultats" msgid "Return" msgstr "Entrée" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "Droite" @@ -3956,13 +4182,17 @@ msgstr "Russe" msgid "Sa&ve State" msgstr "Sau&vegarder l'état" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "Sûr " + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "Echantillonnage :" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Sauver" @@ -4026,7 +4256,13 @@ msgstr "Sauvegarder le fichier GCM/ISO décompressé" #: Source/Core/Core/Src/Movie.cpp:428 #, 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:401 +msgid "Scaled EFB Copy" +msgstr "Copie à l'échelle de l'EFB" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format @@ -4057,25 +4293,23 @@ msgstr "Fitre de recherche" msgid "Search Subfolders" msgstr "Chercher dans sous-dossiers" -#: Source/Core/Common/Src/SysConf.h:104 -#: Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 -#: Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 +#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 #, c-format msgid "Section %s not found in SYSCONF" msgstr "La section %s n'a pas été trouvée dans SYSCONF" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "Select" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "Sélectionner le fichier d'enregistrement" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 msgid "Select a Wii WAD file to install" msgstr "Sélectionner un fichier WAD de Wii à installer" @@ -4101,15 +4335,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:1306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Select the save file" msgstr "Sélectionner le fichier à enregistrer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Sélectionner l'état à charger" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "Select the state to save" msgstr "Sélectionner l'état à enregistrer" @@ -4126,7 +4360,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." @@ -4138,27 +4373,32 @@ msgstr "Police sélectionnée" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 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:73 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." @@ -4180,8 +4420,11 @@ msgid "Serbian" msgstr "Serbe" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -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:492 msgid "Set" @@ -4199,7 +4442,9 @@ msgstr "Définir comme carte mémoire par défaut : %c" #: Source/Core/Core/Src/ActionReplay.cpp:462 #, 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/ISOProperties.cpp:335 msgid "Settings..." @@ -4241,11 +4486,11 @@ msgstr "Afficher la barre d'&outils" msgid "Show Drives" msgstr "Afficher les lecteurs" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "Afficher les régions copiées d'EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "Afficher les FPS" @@ -4257,7 +4502,7 @@ msgstr "Afficher France" msgid "Show GameCube" msgstr "Afficher GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "Afficher le graphisme en entrée" @@ -4293,7 +4538,7 @@ msgstr "Afficher les plateformes" msgid "Show Regions" msgstr "Afficher les régions" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "Afficher les statistiques" @@ -4320,10 +4565,13 @@ msgstr "Demande confirmation avant d'arrêter le jeu." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 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 "" "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:812 msgid "Show first block" @@ -4345,13 +4593,15 @@ msgstr "Afficher l'icône de la sauvegarde" msgid "Show save title" msgstr "Afficher le titre de sauvegarde" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 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." @@ -4363,7 +4613,7 @@ msgstr "Affiche ce message d'aide" msgid "Show unknown" msgstr "Afficher les inconnus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -4389,21 +4639,40 @@ msgstr "Taille" msgid "Skip BIOS" msgstr "Ne pas exécuter le BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "Ignorer Passe Alpha de dest." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "Ignorer l'accès à l'EFB depuis le CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 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." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\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" +"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" "\n" "Dans le doute, décochez cette case." @@ -4431,13 +4700,16 @@ 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:618 msgid "Sound Settings" @@ -4457,9 +4729,9 @@ msgstr "Echec de la création du buffer audio : %s" msgid "Space" msgstr "Espace" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "Espagnol" @@ -4467,15 +4739,23 @@ msgstr "Espagnol" msgid "Speaker Volume:" msgstr "Volume du haut-parleur :" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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." @@ -4495,9 +4775,9 @@ msgstr "Stick carré" msgid "Standard Controller" msgstr "Contrôleur standard" +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Start" @@ -4525,14 +4805,28 @@ msgstr "Etats" msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Arrêter" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\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" +"\n" +"Dans le doute, sélectionnez cette case." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "Etirer à la fenêtre" @@ -4566,8 +4860,8 @@ msgstr "Langue du système :" msgid "TAIWAN" msgstr "Taïwan" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "Entrée TAS" @@ -4587,9 +4881,9 @@ msgstr "Table Gauche" msgid "Table Right" msgstr "Table Droite" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "Capture d'écran" @@ -4597,7 +4891,15 @@ msgstr "Capture d'écran" msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "Texture" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +msgid "Texture Cache" +msgstr "Cache de texture" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" msgstr "Infos de format de texture" @@ -4630,15 +4932,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 "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 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:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Le fichier que vous avez spécifié (%s) n'existe pas" @@ -4655,13 +4961,30 @@ 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:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +msgstr "" +"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 deuxième position depuis la droite." + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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:363 -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/DolphinWX/Src/Main.cpp:353 +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!" @@ -4697,8 +5020,12 @@ 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:467 -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:304 msgid "" @@ -4709,22 +5036,33 @@ msgstr "" "Indéterminé signifie que les paramètres de Dolphin sont appliqués." #: Source/Core/Core/Src/ActionReplay.cpp:356 -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:509 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:119 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." @@ -4737,10 +5075,12 @@ msgid "" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" "Ceci est utiliser pour contrôler la vitesse du jeu par la constance du son.\n" -"Désactiver cette option peut causer une vitesse anormale du jeu, par exemple trop rapide.\n" +"Désactiver cette option peut causer une vitesse anormale du jeu, par exemple " +"trop rapide.\n" "Mais il se peut parfois qu'activer cette option produise un bruit constant.\n" "\n" -"Raccourci clavier : Appuyer pour instantanément désactiver cette option." +"Raccourci clavier : Appuyer pour instantanément désactiver cette " +"option." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "This is used to play music tracks, like BGM." @@ -4748,15 +5088,21 @@ msgstr "Ceci est utilisé pour lire les pistes de musique, comme les BGM." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 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:283 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 @@ -4781,13 +5127,13 @@ msgstr "A" msgid "Toggle All Log Types" msgstr "Activer tous les types de journaux" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Activer le plein écran" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Top" msgstr "Haut" @@ -4795,7 +5141,7 @@ msgstr "Haut" msgid "Traditional Chinese" msgstr "Chinois traditionnel" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "Echec de chargement d'un type de fichier inconnu." @@ -4803,8 +5149,7 @@ msgstr "Echec de chargement d'un type de fichier inconnu." msgid "Triggers" msgstr "Déclencheurs" -#: Source/Core/Common/Src/SysConf.h:92 -#: Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 msgid "Trying to read from invalid SYSCONF" msgstr "Essai de lecture d'un fichier SYSCONF non valide" @@ -4832,8 +5177,8 @@ msgstr "Type" msgid "UDP Port:" msgstr "Port UDP :" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "Wiimote UDP :" @@ -4856,10 +5201,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:404 @@ -4893,7 +5240,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/Core/Src/HW/Memmap.cpp:633 #, c-format @@ -4904,8 +5252,8 @@ msgstr "" "Pointeur inconnu %#08x\n" "Continuer ?" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "Haut" @@ -4922,7 +5270,7 @@ msgstr "Wiimote debout" msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utiliser le mode EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 msgid "Use Fullscreen" msgstr "&Plein écran" @@ -4934,7 +5282,7 @@ msgstr "Utiliser Hexa" msgid "Use Panic Handlers" msgstr "Utiliser les gestionnaires de panique" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -4942,27 +5290,31 @@ 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:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 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." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "Utilitaires" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "Synchro verticale" @@ -4986,8 +5338,7 @@ msgstr "Verbosité" msgid "Video" msgstr "Vidéo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "Virtuel" @@ -5014,21 +5365,21 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Attention" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 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:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "Attention : démarrage de l'ELF dans un mauvais mode de console !" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "Attention : démarrage d\" l'ISO dans un mauvais mode de console !" @@ -5039,7 +5390,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 ?" @@ -5051,7 +5403,8 @@ 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 ?" @@ -5065,7 +5418,7 @@ msgstr "WaveFileWriter - fichier non ouvert." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "Hack écran large (16/9è)" @@ -5089,7 +5442,7 @@ msgstr "Racine de la NAND (Wii) :" msgid "Wii Save Import" msgstr "Importer une sauvegarde Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 msgid "Wii save files (*.bin)|*.bin" msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin" @@ -5097,8 +5450,8 @@ msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD : impossible de lire le fichier" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "Wiimote" @@ -5120,7 +5473,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:609 +#: Source/Core/DolphinWX/Src/Main.cpp:599 msgid "Wiimote Connected" msgstr "Wiimote connectée" @@ -5152,7 +5505,7 @@ msgstr "Windows Droit" msgid "Word Wrap" msgstr "Casse" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5195,7 +5548,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." @@ -5258,7 +5612,7 @@ msgstr "Zero code inconnu pour Dolphin : %08x" msgid "[ waiting ]" msgstr "[ attente ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5274,21 +5628,26 @@ msgstr "" msgid "[Custom]" msgstr "[Personnalisé]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 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." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5331,7 +5690,9 @@ 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:461 msgid "s" @@ -5390,9 +5751,6 @@ msgstr "| OR" #~ msgid "AOSound" #~ msgstr "AOSound" -#~ msgid "Accuracy:" -#~ msgstr "Précision :" - #~ msgid "Accurate Texture Cache" #~ msgstr "Cache de texture précis" @@ -5430,19 +5788,6 @@ 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" @@ -5506,6 +5851,9 @@ msgstr "| OR" #~ msgid "Danish" #~ msgstr "Danois" +#~ msgid "Disable Wiimote Speaker" +#~ msgstr "Désactiver le haut-parleur de la Wiimote." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -5569,9 +5917,6 @@ msgstr "| OR" #~ msgid "Enable CPU Access" #~ msgstr "Activer l'accès CPU" -#~ msgid "Enable Cache" -#~ msgstr "Activer le cache" - #~ msgid "Enable Copy to EFB" #~ msgstr "Activer Copie vers EFB" @@ -5651,12 +5996,6 @@ msgstr "| OR" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Impossible de charger la ROM DSP %s" -#~ msgid "Fast" -#~ msgstr "Rapide" - -#~ msgid "Fast Mipmaps" -#~ msgstr "Mipmaps rapides" - #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -5822,15 +6161,9 @@ msgstr "| OR" #~ msgid "Running script...\n" #~ msgstr "Exécution du script...\n" -#~ msgid "Safe" -#~ msgstr "Sûr " - #~ msgid "Scale:" #~ msgstr "Echelle :" -#~ msgid "Scaled EFB Copy" -#~ msgstr "Copie à l'échelle de l'EFB" - #~ msgid "Select resolution for fullscreen mode" #~ msgstr "Sélectionner une résolution pour le mode Plein écran" @@ -5885,22 +6218,6 @@ msgstr "| OR" #~ msgid "Skies of Arcadia" #~ msgstr "Skies of Arcadia" -#~ 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" -#~ "\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" -#~ "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" -#~ "\n" -#~ "Dans le doute, décochez cette case." - #~ msgid "Slot" #~ msgstr "Slot" @@ -5941,40 +6258,9 @@ msgstr "| OR" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Démarrer la fenêtre de rendu en plein écran." -#~ 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" -#~ "\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" -#~ "\n" -#~ "Dans le doute, sélectionnez cette case." - -#~ msgid "Texture" -#~ msgstr "Texture" - -#~ msgid "Texture Cache" -#~ msgstr "Cache de texture" - #~ msgid "The file " #~ msgstr "Le fichier " -#~ msgid "" -#~ "The safer you adjust this, the less likely the emulator will be missing " -#~ "any texture updates from RAM.\n" -#~ "\n" -#~ "If unsure, use the second-fastest value from the right." -#~ msgstr "" -#~ "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 deuxième position depuis la droite." - #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "" #~ "Ceci est habituellement utilisé pour lire la voix et les effets sonores." diff --git a/Languages/po/he.po b/Languages/po/he.po index a2adafe8da..912e1b2f45 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: 2011-08-10 08:30-0500\n" +"POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-01-08 20:50+0200\n" "Last-Translator: Ely \n" "Language-Team: \n" @@ -30,7 +30,7 @@ msgstr "משחק:" msgid "! NOT" msgstr "! ל×" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -70,21 +70,21 @@ msgstr "כבר קיי×.×”×× ×תה רוצה להחליף?" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" " Card file size is invalid (0x%x bytes)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" " Card size is invalid (0x%x bytes)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -296,7 +296,7 @@ msgstr "" msgid "(UNKNOWN)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "" @@ -308,7 +308,7 @@ msgstr "" msgid "32 bit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "" @@ -320,7 +320,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "" @@ -389,17 +389,21 @@ msgstr "" msgid "Acceleration" msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 @@ -479,12 +483,12 @@ msgstr "" msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "" @@ -500,9 +504,9 @@ msgstr "" msgid "Add new pane" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "" @@ -536,7 +540,7 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "" @@ -556,8 +560,8 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "All Save States (sav, s##)" msgstr "" @@ -573,7 +577,7 @@ msgstr "" msgid "All files (*.*)|*.*" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -581,11 +585,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +msgid "Alternate Wiimote Timing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "" @@ -605,7 +613,7 @@ msgstr "" msgid "Apply" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -632,7 +640,7 @@ msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -653,19 +661,19 @@ msgid "AudioCommon: Error opening AO device.\n" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "" @@ -676,6 +684,14 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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/WXInputBase.cpp:27 msgid "Back" msgstr "" @@ -685,8 +701,8 @@ msgstr "" msgid "Backend Settings" msgstr "הגדרות קול" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "" @@ -720,7 +736,7 @@ msgstr "" msgid "Bar" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "" @@ -732,7 +748,7 @@ msgstr "" msgid "Bass" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "" @@ -752,8 +768,8 @@ msgstr "" msgid "Blue Right" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 msgid "Bottom" msgstr "" @@ -786,9 +802,9 @@ msgstr "" msgid "Buffer:" msgstr "" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "" @@ -804,11 +820,11 @@ msgstr "" msgid "CPU Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 " @@ -818,7 +834,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -827,8 +843,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "" @@ -871,10 +887,10 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "" @@ -992,10 +1008,10 @@ msgstr "" msgid "Classic" msgstr "" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "" @@ -1009,10 +1025,10 @@ msgid "" "manually stop the game." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "" @@ -1116,7 +1132,7 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:608 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Connecting..." msgstr "" @@ -1179,7 +1195,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1242,11 +1258,11 @@ msgstr "" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1290,8 +1306,8 @@ msgstr "קול" msgid "DSP Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "DSP HLE emulation (fast)" msgstr "" @@ -1340,7 +1356,7 @@ msgstr "" msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Debugging" msgstr "" @@ -1373,8 +1389,8 @@ msgstr "" msgid "Default font" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "" @@ -1382,12 +1398,12 @@ msgstr "" msgid "Delete Save" msgstr "" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 msgid "Description" msgstr "" @@ -1416,46 +1432,42 @@ msgstr "" msgid "Dial" msgstr "" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 msgid "Disable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1464,7 +1476,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1474,7 +1486,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1490,11 +1502,11 @@ msgstr "" msgid "Disc Read Error" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1505,7 +1517,7 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Do you want to stop the current emulation?" msgstr "" @@ -1513,7 +1525,7 @@ msgstr "" msgid "Dolphin" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, fuzzy, c-format msgid "Dolphin %s Graphics Configuration" msgstr "הגדרות גרפיקה" @@ -1534,13 +1546,13 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 #, fuzzy msgid "Dolphin GCPad Configuration" msgstr "הגדרות גרפיקה" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1564,8 +1576,8 @@ msgid "" "games..." msgstr "" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "" @@ -1590,42 +1602,42 @@ msgstr "" msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 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:112 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:114 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:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "" @@ -1633,7 +1645,7 @@ msgstr "" msgid "E&xit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" msgstr "" @@ -1683,7 +1695,7 @@ msgstr "" msgid "Effect" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "" @@ -1691,7 +1703,7 @@ msgstr "" msgid "Emu Thread already running" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1700,7 +1712,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1722,7 +1734,7 @@ msgstr "" msgid "Enable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1748,6 +1760,10 @@ msgstr "" msgid "Enable Block Merging" msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +msgid "Enable Cache" +msgstr "" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "" @@ -1764,7 +1780,7 @@ msgstr "" msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "" @@ -1780,8 +1796,8 @@ msgstr "" msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "" @@ -1793,7 +1809,7 @@ msgstr "" msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "" @@ -1863,7 +1879,7 @@ msgid "" "OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -1874,14 +1890,14 @@ msgstr "" msgid "End" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "" @@ -1903,13 +1919,13 @@ msgstr "" msgid "Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:356 +#: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -1981,7 +1997,7 @@ msgstr "" msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "" @@ -2094,13 +2110,13 @@ msgstr "" msgid "Failed to read banner.bin" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2111,25 +2127,25 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2158,6 +2174,14 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "" @@ -2184,7 +2208,7 @@ msgid "" "or does not have a valid extension" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2220,11 +2244,11 @@ msgstr "" msgid "Fix Checksums" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "" @@ -2232,11 +2256,11 @@ msgstr "" msgid "Force Console as NTSC-J" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2259,7 +2283,7 @@ msgid "" "setting when playing Japanese games." msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2282,7 +2306,7 @@ msgstr "" msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "" @@ -2302,13 +2326,13 @@ msgstr "" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "" @@ -2325,7 +2349,7 @@ msgstr "" msgid "FullScr" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 #, fuzzy msgid "Fullscreen resolution:" msgstr "&מסך מל×" @@ -2371,8 +2395,8 @@ msgstr "" msgid "Gamecube &Pad Settings" msgstr "הגדרות קול" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2392,9 +2416,9 @@ msgid "" "(either a bad code or the code type is not yet supported.)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2403,9 +2427,9 @@ msgstr "" msgid "General Settings" msgstr "הגדרות קול" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "" @@ -2426,11 +2450,13 @@ msgstr "" msgid "Greater Than" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" -"Greatly increases quality of textures generated using render-to-texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2459,11 +2485,11 @@ msgstr "" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "" @@ -2493,7 +2519,7 @@ msgstr "" msgid "Hide" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "" @@ -2517,8 +2543,8 @@ msgstr "" msgid "Hotkey Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 msgid "Hotkeys" msgstr "" @@ -2591,11 +2617,11 @@ msgid "" "also have to disable Audio Throttle in DSP to make it effective." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2604,7 +2630,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 " @@ -2637,7 +2663,7 @@ msgid "" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2645,7 +2671,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -2660,8 +2686,8 @@ msgstr "" msgid "In-Game" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "" @@ -2702,7 +2728,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 msgid "Installing WAD..." msgstr "" @@ -2729,7 +2755,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 msgid "Internal Resolution:" msgstr "" @@ -2779,9 +2805,9 @@ msgstr "" msgid "Invalid state" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "" @@ -2842,8 +2868,8 @@ msgstr "" msgid "Last Saved State" msgstr "" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "" @@ -2882,7 +2908,7 @@ msgstr "" msgid "Load" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Load Custom Textures" msgstr "" @@ -2922,16 +2948,16 @@ msgstr "" msgid "Load State..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 #, c-format msgid "Load Wii System Menu %d%c" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -2971,8 +2997,8 @@ msgstr "" msgid "Logger Outputs" msgstr "" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "" @@ -3004,8 +3030,8 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3034,8 +3060,8 @@ msgstr "" msgid "Memory Byte" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 msgid "Memory Card" msgstr "" @@ -3056,7 +3082,7 @@ msgid "" "Would you like to copy the old file to this new location?\n" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "" @@ -3073,7 +3099,7 @@ msgstr "" msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "" @@ -3086,7 +3112,7 @@ msgstr "" msgid "Modifier" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3107,7 +3133,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3212,9 +3238,9 @@ msgstr "" msgid "NP Up" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "" @@ -3299,7 +3325,7 @@ msgstr "" msgid "Not Set" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:607 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Not connected" msgstr "" @@ -3328,8 +3354,8 @@ msgstr "" msgid "Number Of Codes: " msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "" @@ -3358,8 +3384,8 @@ msgstr "" msgid "Only %d blocks available" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Open" msgstr "" @@ -3389,11 +3415,11 @@ msgstr "" msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "" @@ -3421,8 +3447,8 @@ msgid "" "and import the the saves to a new memcard\n" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "" @@ -3485,13 +3511,13 @@ msgstr "" msgid "Paths" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Per-Pixel Lighting" msgstr "" @@ -3504,10 +3530,10 @@ msgstr "" msgid "Perspective %d" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 msgid "Play" msgstr "" @@ -3531,7 +3557,7 @@ msgstr "" msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 msgid "Please confirm..." msgstr "" @@ -3576,7 +3602,7 @@ msgstr "" msgid "Portuguese (Brazilian)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "" @@ -3635,7 +3661,7 @@ msgstr "" msgid "R-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "" @@ -3651,7 +3677,7 @@ msgstr "" msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "" @@ -3706,9 +3732,9 @@ msgid "" "If unsure, select None." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "" @@ -3720,26 +3746,26 @@ msgstr "" msgid "Refresh game list" msgstr "" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Remove" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -3751,8 +3777,8 @@ msgstr "" msgid "Return" msgstr "" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "" @@ -3777,13 +3803,17 @@ msgstr "" msgid "Sa&ve State" msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "" @@ -3849,6 +3879,10 @@ msgstr "" msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +msgid "Scaled EFB Copy" +msgstr "" + #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format msgid "Scanning %s" @@ -3884,17 +3918,17 @@ msgstr "" msgid "Section %s not found in SYSCONF" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 msgid "Select a Wii WAD file to install" msgstr "" @@ -3917,15 +3951,15 @@ msgstr "" msgid "Select the file to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "Select the state to save" msgstr "" @@ -4044,11 +4078,11 @@ msgstr "" msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "" @@ -4060,7 +4094,7 @@ msgstr "" msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "" @@ -4097,7 +4131,7 @@ msgstr "" msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "" @@ -4148,7 +4182,7 @@ msgstr "" msgid "Show save title" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4164,7 +4198,7 @@ msgstr "" msgid "Show unknown" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -4187,15 +4221,15 @@ msgstr "" msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4203,6 +4237,16 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4251,9 +4295,9 @@ msgstr "" msgid "Space" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "" @@ -4261,7 +4305,7 @@ msgstr "" msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 " @@ -4289,9 +4333,9 @@ msgstr "" msgid "Standard Controller" msgstr "" +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "" @@ -4319,14 +4363,23 @@ msgstr "" msgid "Stick" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "" @@ -4360,8 +4413,8 @@ msgstr "" msgid "TAIWAN" msgstr "" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "" @@ -4381,9 +4434,9 @@ msgstr "" msgid "Table Right" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "" @@ -4391,7 +4444,15 @@ msgstr "" msgid "Test" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +msgid "Texture Cache" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" msgstr "" @@ -4432,7 +4493,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -4449,11 +4510,19 @@ msgstr "" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:363 +#: Source/Core/DolphinWX/Src/Main.cpp:353 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4514,7 +4583,7 @@ msgstr "" 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:119 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. " @@ -4573,13 +4642,13 @@ msgstr "" msgid "Toggle All Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Top" msgstr "" @@ -4587,7 +4656,7 @@ msgstr "" msgid "Traditional Chinese" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "" @@ -4621,8 +4690,8 @@ msgstr "" msgid "UDP Port:" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "" @@ -4688,8 +4757,8 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "" @@ -4706,7 +4775,7 @@ msgstr "" msgid "Use EuRGB60 Mode (PAL60)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 #, fuzzy msgid "Use Fullscreen" msgstr "&מסך מל×" @@ -4719,7 +4788,7 @@ msgstr "" msgid "Use Panic Handlers" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -4727,7 +4796,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -4736,11 +4805,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "" @@ -4764,8 +4833,7 @@ msgstr "" msgid "Video" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "" @@ -4788,21 +4856,21 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "" @@ -4832,7 +4900,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "" @@ -4856,7 +4924,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -4864,8 +4932,8 @@ msgstr "" msgid "WiiWAD: Could not read from file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "" @@ -4883,7 +4951,7 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:609 +#: Source/Core/DolphinWX/Src/Main.cpp:599 msgid "Wiimote Connected" msgstr "" @@ -4915,7 +4983,7 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5014,7 +5082,7 @@ msgstr "" msgid "[ waiting ]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5026,7 +5094,7 @@ msgstr "" msgid "[Custom]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5037,7 +5105,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" diff --git a/Languages/po/hu.po b/Languages/po/hu.po index 4aece4fae1..05ea00680c 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: 2011-08-10 08:30-0500\n" +"POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-06-04 14:29+0100\n" "Last-Translator: Delirious \n" "Language-Team: Delirious \n" @@ -31,7 +31,7 @@ msgstr "Játék:" msgid "! NOT" msgstr "! NEM" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -73,7 +73,7 @@ msgstr "%s már van, felülírod?" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s tisztítása sikertelen. Valószínűleg a képfájl sérült." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, fuzzy, c-format msgid "" "%s failed to load as a memorycard \n" @@ -82,7 +82,7 @@ msgstr "" "A memóriakártya betöltése sikertelen\n" " A kártya mérete nem megfelelÅ‘ (%04X)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, fuzzy, c-format msgid "" "%s failed to load as a memorycard \n" @@ -91,7 +91,7 @@ msgstr "" "A memóriakártya betöltése sikertelen\n" " A kártya mérete nem megfelelÅ‘ (%04X)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -305,7 +305,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(ISMERETLEN)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(ki)" @@ -317,7 +317,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "3D Vision" @@ -329,7 +329,7 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "" @@ -416,18 +416,22 @@ msgstr "A Dolphin névjegye" msgid "Acceleration" msgstr "Gyorsítás" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "Pontosság:" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "Pontos VBeam emuláció" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 #, fuzzy msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" "EFB másolatok pontos emulációja.\n" "Néhány játék számára elengedhetetlen bizonyos grafikai effektushoz vagy a " @@ -525,12 +529,12 @@ msgstr "Action Replay: Szabályszerű kód %i: Érvénytelen alfaj %08x (%s)" 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:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "Adapter:" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "Hozzáadás" @@ -546,9 +550,9 @@ msgstr "Patch hozzáadása" msgid "Add new pane" msgstr "Új mezÅ‘ hozzáadása" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "Hozzáadás..." @@ -598,7 +602,7 @@ 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:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "Haladó" @@ -618,8 +622,8 @@ msgstr "Minden GC/Wii képfájl (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Minden Gamecube GCM fájl (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "All Save States (sav, s##)" msgstr "Minden állásmentés (sav, s##)" @@ -635,7 +639,7 @@ 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:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -647,11 +651,16 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Emulált Wiimote" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" msgstr "Anizotrópikus szűrés:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "Élsimítás:" @@ -672,7 +681,7 @@ msgstr "BetöltÅ‘ program:" msgid "Apply" msgstr "Elfogadás" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -704,7 +713,7 @@ 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:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Képarány:" @@ -725,19 +734,19 @@ msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Hiba az AO eszköz megnyitásakor.\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatikus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "Automatikus (640x528 többszöröse)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "Automatikus (ablak méret)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "Ablak méret automatikus állítása" @@ -751,6 +760,20 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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/WXInputBase.cpp:27 msgid "Back" msgstr "Hátra" @@ -759,8 +782,8 @@ msgstr "Hátra" msgid "Backend Settings" msgstr "Hang feldolgozó beállításai" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Feldolgozó:" @@ -794,7 +817,7 @@ msgstr "Játék kép:" msgid "Bar" msgstr "VevÅ‘" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "Alap" @@ -806,7 +829,7 @@ msgstr "Alap beállítások" msgid "Bass" msgstr "Basszus" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Block Allocation Table ellenÅ‘rzÅ‘ összege nem megfelelÅ‘" @@ -826,8 +849,8 @@ msgstr "Kék balra" msgid "Blue Right" msgstr "Kék jobbra" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 msgid "Bottom" msgstr "Lent" @@ -860,9 +883,9 @@ msgstr "Kimeneti könyvtár tallózása" msgid "Buffer:" msgstr "Puffer:" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "Gombok" @@ -879,11 +902,11 @@ msgstr "C-kar" msgid "CPU Emulator Engine" msgstr "Processzor emulátor motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "KijelzÅ‘ listák gyorsítótárazása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 " @@ -900,7 +923,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelölve." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -915,8 +938,8 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Mégsem" @@ -963,10 +986,10 @@ msgstr "Nem található WiiMote bd szerint: %02x:%02x:%02x:%02x:%02x:%02x" 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:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Sikertelen beolvasás a DVD_Plugin - DVD-felületbÅ‘l: végzetes hiba" @@ -1088,10 +1111,10 @@ msgstr "Körös kar" msgid "Classic" msgstr "Klasszikus" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "Törlés" @@ -1107,10 +1130,10 @@ 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/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Bezárás" @@ -1214,7 +1237,7 @@ msgstr "Wiimote 3 csatlakoztatása" msgid "Connect Wiimote 4" msgstr "Wiimote 4 csatlakoztatása" -#: Source/Core/DolphinWX/Src/Main.cpp:608 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Connecting..." msgstr "Csatlakozás..." @@ -1282,7 +1305,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:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1352,11 +1375,11 @@ msgstr "KészítÅ‘:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "Levágás" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1403,8 +1426,8 @@ msgstr "Hang" msgid "DSP Emulator Engine" msgstr "DSP emulátor motor" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emuláció (gyors)" @@ -1453,7 +1476,7 @@ msgstr "Holtsáv" msgid "Debug" msgstr "HibakeresÅ‘" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Debugging" msgstr "Hibakeresés" @@ -1486,8 +1509,8 @@ msgstr "Alapértelmezett ISO:" msgid "Default font" msgstr "Alap betűtípus" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "Törlés" @@ -1495,12 +1518,12 @@ msgstr "Törlés" msgid "Delete Save" msgstr "Mentés törlése" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "Törlöd a meglévÅ‘ '%s' fájlt?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 msgid "Description" msgstr "Leírás" @@ -1531,15 +1554,15 @@ msgstr "Eszköz beállítások" msgid "Dial" msgstr "Tárcsa" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1547,32 +1570,28 @@ 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:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 msgid "Disable" msgstr "Kikapcsolás" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "Köd kikapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "Fényhatások kikapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "Képpont mélység kikapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "Textúrák kikapcsolása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "Wiimote hangszóró kikapcsolása" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1587,7 +1606,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelölve." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1604,7 +1623,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1623,11 +1642,11 @@ msgstr "Lemez" msgid "Disc Read Error" msgstr "Lemez olvasási hiba" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "KijelzÅ‘" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1641,7 +1660,7 @@ msgstr "" msgid "Divide" msgstr "Megosztás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Do you want to stop the current emulation?" msgstr "Le akarod állítani az éppen működÅ‘ emulációt?" @@ -1649,7 +1668,7 @@ msgstr "Le akarod állítani az éppen működÅ‘ emulációt?" msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s grafikai beállítások" @@ -1670,12 +1689,12 @@ msgstr "Dolphin emulált Wiimote beállítások" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad beállítások" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS videók (*.dtm)" @@ -1703,8 +1722,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/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Le" @@ -1729,19 +1748,19 @@ msgstr "Utánzat" msgid "Dump Audio" msgstr "Hang mentése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "EFB cél letárolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "Képkockák letárolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "Textúrák letárolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1752,7 +1771,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1762,7 +1781,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1772,9 +1791,9 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "Holland" @@ -1782,7 +1801,7 @@ msgstr "Holland" msgid "E&xit" msgstr "K&ilépés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" msgstr "EFB másolatok" @@ -1836,7 +1855,7 @@ msgstr "Szerkesztés..." msgid "Effect" msgstr "Effektus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "Beágyazott képkocka puffer" @@ -1844,7 +1863,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:111 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1858,7 +1877,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:110 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1886,7 +1905,7 @@ msgstr "Emuláció állapota:" msgid "Enable" msgstr "Használat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1918,6 +1937,10 @@ msgstr "BAT használata" msgid "Enable Block Merging" msgstr "Blokk csatlakozás használata" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +msgid "Enable Cache" +msgstr "Gyorsítótár használata" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "Csalások használata" @@ -1934,7 +1957,7 @@ msgstr "Dual Core használata" msgid "Enable Dual Core (speedup)" msgstr "Dual Core használata (gyorsítás)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "Gyorsbillentyűk használata" @@ -1950,8 +1973,8 @@ msgstr "Tétlen állapot mellÅ‘zése (gyorsítás)" msgid "Enable MMU" msgstr "MMU használata" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "Progresszív pásztázás használata" @@ -1963,7 +1986,7 @@ msgstr "KépernyÅ‘védÅ‘ bekapcsolása" msgid "Enable WideScreen" msgstr "SzéleskijelzÅ‘ bekapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "Vonalháló bekapcsolása" @@ -2060,7 +2083,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:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2074,14 +2097,14 @@ msgstr "" msgid "End" msgstr "Vége" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "Angol" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "Kép javítások" @@ -2103,13 +2126,13 @@ msgstr "1/%d bejegyzés" msgid "Equal" msgstr "EgyenlÅ‘" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "Hiba" -#: Source/Core/DolphinWX/Src/Main.cpp:356 +#: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Hiba a kiválasztott nyelv betöltése közben. Rendszer alapértelmezett " @@ -2186,7 +2209,7 @@ msgstr "Exportálás mentése másként..." msgid "Extension" msgstr "KiegészítÅ‘" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "KülsÅ‘ képkocka puffer" @@ -2307,7 +2330,7 @@ msgstr "A hid.dll betöltése sikertelen" msgid "Failed to read banner.bin" msgstr "A banner.bin beolvasása sikertelen" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2316,7 +2339,7 @@ msgstr "" "sikertelen\n" "(0x8000-0x9FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2329,7 +2352,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "%d fájlból történÅ‘ adatok kiolvasása nem sikerült" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2337,7 +2360,7 @@ msgstr "" "A könyvtár biztonsági mentés pontos visszaolvasása nem sikerült\n" "(0x4000-0x5FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2345,7 +2368,7 @@ msgstr "" "A könyvtár pontos kiolvasása nem sikerült\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2353,7 +2376,7 @@ msgstr "" "A fejléc pontos kiolvasása nem sikerült\n" "(0x0000-0x1FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2385,6 +2408,14 @@ 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/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "Gyors" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "Gyors mipmapek" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 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." @@ -2413,7 +2444,7 @@ msgstr "" "A fájl nem nyitható meg\n" "vagy a kiterjesztése nem megfelelÅ‘" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2451,11 +2482,11 @@ msgstr "ElsÅ‘ blokk" msgid "Fix Checksums" msgstr "Ãllandó ellenÅ‘rzőösszeg" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "Kényszerített 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "Kényszerített 4:3" @@ -2463,11 +2494,11 @@ msgstr "Kényszerített 4:3" msgid "Force Console as NTSC-J" msgstr "Konzol kényszerítése NTSC-J típusra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 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:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2502,7 +2533,7 @@ msgstr "" "Hagyd kijelöletlenül, a Dolphin alapértelmezett az NTSC-U és automatikusan " "bekapcsolódik ez a beállítás japán játékok használatakor." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2527,7 +2558,7 @@ msgstr "Képkocka" msgid "Frame Advance" msgstr "Képkocka léptetés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "Képkocka mentések FFV1 használatával" @@ -2547,13 +2578,13 @@ msgstr "Képkocka korlát:" msgid "Frames To Record" msgstr "RögzítendÅ‘ képkockák" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "Szabad nézet" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "Francia" @@ -2570,7 +2601,7 @@ msgstr "EttÅ‘l:" msgid "FullScr" msgstr "Teljes méret" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 msgid "Fullscreen resolution:" msgstr "Teljes kijelzÅ‘s felbontás:" @@ -2614,8 +2645,8 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Gamecube &irányító beállítások" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube memóriakártyák (*.raw,*.gcp)" @@ -2637,9 +2668,9 @@ 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/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Ãltalános" @@ -2647,9 +2678,9 @@ msgstr "Ãltalános" msgid "General Settings" msgstr "Ãltalános beállítások" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "Német" @@ -2670,12 +2701,14 @@ msgstr "Grafikai beállítások" msgid "Greater Than" msgstr "Nagyobb mint" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 #, fuzzy msgid "" -"Greatly increases quality of textures generated using render-to-texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2711,11 +2744,11 @@ msgstr "Gitár" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY kiadva, kérlek jelentsd!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "Hackek" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "A fejléc ellenÅ‘rzÅ‘ összege hibás" @@ -2752,7 +2785,7 @@ msgstr "" msgid "Hide" msgstr "Elrejtés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "Egérmutató elrejtése" @@ -2779,8 +2812,8 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Gyorsbillentyű beállítások" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 msgid "Hotkeys" msgstr "Gyorsbill." @@ -2864,11 +2897,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:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 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:94 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2882,7 +2915,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelölve." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 " @@ -2925,7 +2958,7 @@ msgstr "" "Az importált fájl sav kiterjesztésű\n" "de nem rendelkezik megfelelÅ‘ fejléccel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2937,7 +2970,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -2956,8 +2989,8 @@ msgstr "Elindul" msgid "In-Game" msgstr "Elindul" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "Infó" @@ -2999,7 +3032,7 @@ msgid "" msgstr "" "InstallExceptionHandler elÅ‘idézve, de ez a platform még nem támogatja azt." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 msgid "Installing WAD..." msgstr "WAD telepítése..." @@ -3028,7 +3061,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "BelsÅ‘ LZO hiba - lzo_init() sikertelen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 msgid "Internal Resolution:" msgstr "BelsÅ‘ felbontás:" @@ -3081,9 +3114,9 @@ msgstr "Nem megfelelÅ‘ rögzített fájl" msgid "Invalid state" msgstr "Nem megfelelÅ‘ mentés" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "Olasz" @@ -3144,8 +3177,8 @@ msgstr "Az utolsó felülírt mentés" msgid "Last Saved State" msgstr "Utolsó mentett állás" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "Balra" @@ -3191,7 +3224,7 @@ msgstr "FPS alapú korlátozás" msgid "Load" msgstr "Betöltés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Load Custom Textures" msgstr "Egyedi textúrák betöltése" @@ -3231,16 +3264,16 @@ 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:1400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Load Wii System Menu" msgstr "Wii rendszer menü betöltése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 #, 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:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3282,8 +3315,8 @@ msgstr "Napló típus" msgid "Logger Outputs" msgstr "Napló kimenetek" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "Naplózás" @@ -3317,8 +3350,8 @@ msgstr "MMU sebesség növelÅ‘ hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark fájlok (*.gcs)" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "FÅ‘kar" @@ -3347,8 +3380,8 @@ msgstr "A memóriakártya már meg van nyitva" msgid "Memory Byte" msgstr "Memória bájt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 msgid "Memory Card" msgstr "Memóriakártya" @@ -3377,7 +3410,7 @@ msgstr "" "%s\n" "Ãt akarod másolni a régi fájlt erre az új helyre?\n" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "" @@ -3394,7 +3427,7 @@ msgstr "Mikrofon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "Egyebek" @@ -3407,7 +3440,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:107 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3432,7 +3465,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3546,9 +3579,9 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Cím:" @@ -3633,7 +3666,7 @@ msgstr "Nem egyenlÅ‘" msgid "Not Set" msgstr "Nincs beállítva" -#: Source/Core/DolphinWX/Src/Main.cpp:607 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Not connected" msgstr "Nincs csatlakoztatva" @@ -3662,8 +3695,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "Kódok száma:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "Nunchuk" @@ -3692,8 +3725,8 @@ msgstr "Eltolás:" msgid "Only %d blocks available" msgstr "Csak %d blokk szabad" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Open" msgstr "Megnyitás" @@ -3723,11 +3756,11 @@ 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:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "OpenCL textúra dekódoló" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "OpenMP textúra dekódoló" @@ -3758,8 +3791,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:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "Egyéb" @@ -3824,13 +3857,13 @@ msgstr "Javítások" msgid "Paths" msgstr "Mappák" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "Szünet" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Per-Pixel Lighting" msgstr "Képpont alapú fényhatások" @@ -3843,10 +3876,10 @@ msgstr "Tökéletes" msgid "Perspective %d" msgstr "%d perspektíva" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 msgid "Play" msgstr "Indítás" @@ -3870,7 +3903,7 @@ msgstr "Visszajátszási lehetÅ‘ségek" msgid "Players" msgstr "Játékosok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 msgid "Please confirm..." msgstr "Változtatás jóváhagyása..." @@ -3915,7 +3948,7 @@ msgstr "Portugál" msgid "Portuguese (Brazilian)" msgstr "Portugál (brazíliai)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "Utófeldolgozási effektus:" @@ -3974,7 +4007,7 @@ msgstr "R gomb" msgid "R-Analog" msgstr "Jobb analóg" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "RAM" @@ -3990,7 +4023,7 @@ msgstr "Hatótáv" msgid "Read-only mode" msgstr "Ãrásvédett mód" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "Valódi" @@ -4051,9 +4084,9 @@ 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/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Frissítés" @@ -4065,14 +4098,14 @@ msgstr "A lista frissítése" msgid "Refresh game list" msgstr "Játéklista frissítése" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Remove" msgstr "Törlés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4082,12 +4115,12 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "Megjelenítés a fÅ‘ablakban" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Alapra állítás" @@ -4099,8 +4132,8 @@ msgstr "Eredmények" msgid "Return" msgstr "Return" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "Jobbra" @@ -4125,13 +4158,17 @@ msgstr "Orosz" msgid "Sa&ve State" msgstr "Ãl&lás mentése" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "Biztonságos" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "Mintavételezési frekvencia:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Mentés" @@ -4197,6 +4234,10 @@ msgstr "Kitömörített GCM/ISO mentése" 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:401 +msgid "Scaled EFB Copy" +msgstr "Méretezett EFB másolat" + #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format msgid "Scanning %s" @@ -4232,17 +4273,17 @@ msgstr "Keresés az almappákban" msgid "Section %s not found in SYSCONF" msgstr "%s rész nem található a SYSCONF fájlban" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "Választás" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "Válassz rögzítendÅ‘ fájlt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 msgid "Select a Wii WAD file to install" msgstr "Válassz telepítendÅ‘ Wii WAD fájlt" @@ -4268,15 +4309,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:1306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Select the save file" msgstr "Válassz mentési fájlt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Válassz betöltendÅ‘ állásmentést" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "Select the state to save" msgstr "Válassz mentendÅ‘ állást" @@ -4417,11 +4458,11 @@ msgstr "Eszközsor &mutatása" msgid "Show Drives" msgstr "Meghajtók mutatása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "EFB másolat régiók megjelenítése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "FPS kijelzése" @@ -4433,7 +4474,7 @@ msgstr "Franciaország mutatása" msgid "Show GameCube" msgstr "GameCube mutatása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "Bemeneti kijelzÅ‘ megjelenítése" @@ -4469,7 +4510,7 @@ msgstr "Platformok mutatása" msgid "Show Regions" msgstr "Régiók mutatása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "Statisztikák megjelenítése" @@ -4524,7 +4565,7 @@ msgstr "MentendÅ‘ ikonok megjelenítése" msgid "Show save title" msgstr "MentendÅ‘ címek megjelenítése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4544,7 +4585,7 @@ msgstr "A súgó üzenet megjelenítése" msgid "Show unknown" msgstr "Ismeretlen mutatása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -4570,15 +4611,15 @@ msgstr "Méret" msgid "Skip BIOS" msgstr "BIOS kihagyása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "Dest. Alpha Pass kihagyása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "Az EFB processzor hozzáférésének átugrása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4590,6 +4631,22 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Kissé gyorsítja az EFB RAM másolatokat az emuláció pontosságának rovására.\n" +"Néha a vizuális minÅ‘séget is növeli.\n" +"Ha bármely hibát tapasztalsz, próbáld növelni a textúra gyorsítótár " +"pontosságát vagy kapcsold ki ezt az opciót.\n" +"\n" +"Ha bizonytalan vagy, hagyd kijelöletlenül." + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4643,9 +4700,9 @@ msgstr "Hang puffer létrehozása sikertelen: %s" msgid "Space" msgstr "Szóköz" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "Spanyol" @@ -4653,7 +4710,7 @@ msgstr "Spanyol" msgid "Speaker Volume:" msgstr "Hangszóró hangerÅ‘:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 " @@ -4689,9 +4746,9 @@ msgstr "Negyzetes kar" msgid "Standard Controller" msgstr "Normál irányító" +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Indítás" @@ -4719,14 +4776,29 @@ msgstr "Ãllás mentések" msgid "Stick" msgstr "Kar" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Leállítás" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" +"Az EFB másolatokat a grafikai processzor textúra objektumaiban tárolja.\n" +"Ez nem annyira pontos, de elég jól működik a legtöbb játék esetén és " +"jelentÅ‘s sebességnövekedést okoz az EFB RAM-ban történÅ‘ tárolásával " +"szemben.\n" +"\n" +"Ha bizonytalan vagy, hagyd kijelölve." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "Ablakhoz igazítás" @@ -4760,8 +4832,8 @@ msgstr "Rendszer nyelv:" msgid "TAIWAN" msgstr "TAJVAN" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #, fuzzy msgid "TAS Input" msgstr "Bemenet" @@ -4782,9 +4854,9 @@ msgstr "Tábla balra" msgid "Table Right" msgstr "Tábla jobbra" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "Pillanatkép készítése" @@ -4792,7 +4864,15 @@ msgstr "Pillanatkép készítése" msgid "Test" msgstr "Teszt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "Textúra" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +msgid "Texture Cache" +msgstr "Textúra gyorsítótár" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" msgstr "Textúra formátum átfedés" @@ -4837,7 +4917,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:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Az általad megadott (%s) fájl nem létezik" @@ -4854,11 +4934,23 @@ 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:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +msgstr "" +"Minél biztonságosabb a beállítás, annál kevésbé valószínű, hogy az emulátor " +"textúra frissítést fog a RAM-ból hiányolni.\n" +"\n" +"Ha bizonytalan vagy, használd a második leggyorsabb értéket jobbról." + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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:363 +#: Source/Core/DolphinWX/Src/Main.cpp:353 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4927,7 +5019,7 @@ msgstr "" 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:119 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. " @@ -5004,13 +5096,13 @@ msgstr "eddig:" msgid "Toggle All Log Types" msgstr "Minden napló típus kijelölése" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Váltás teljes nézetre" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Top" msgstr "Fent" @@ -5018,7 +5110,7 @@ msgstr "Fent" msgid "Traditional Chinese" msgstr "Hagyományos kínai" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "Próbálkozás egy ismeretlen fájltípus betöltésével. " @@ -5054,8 +5146,8 @@ msgstr "Típus" msgid "UDP Port:" msgstr "UDP port:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5128,8 +5220,8 @@ msgstr "" "Ismeretlen mutató %#08x\n" "Folytatod?" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "Fel" @@ -5146,7 +5238,7 @@ msgstr "ElÅ‘re tartott Wiimote" msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 mód (PAL60) használata" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 msgid "Use Fullscreen" msgstr "Teljes nézet használata" @@ -5158,7 +5250,7 @@ msgstr "Hexa használat" msgid "Use Panic Handlers" msgstr "Hibaüzenetek megjelenítése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5171,7 +5263,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5186,11 +5278,11 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "Kellékek" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "Várakozás a képfrissítésre" @@ -5214,8 +5306,7 @@ msgstr "Verbosity" msgid "Video" msgstr "Kép" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "Virtuális" @@ -5242,21 +5333,21 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Figyelem" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 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:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "Figyelem - ELF indítása nem megfelelÅ‘ konzol módban!" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "Figyelem - ISO indítása nem megfelelÅ‘ konzol módban!" @@ -5293,7 +5384,7 @@ msgstr "WaveFileWriter - fájl nincs megnyitva." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "Szélesvásznú hack" @@ -5317,7 +5408,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:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii mentés fájlok (*.bin)|*.bin" @@ -5325,8 +5416,8 @@ 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/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "Wiimote" @@ -5348,7 +5439,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:609 +#: Source/Core/DolphinWX/Src/Main.cpp:599 msgid "Wiimote Connected" msgstr "Wiimote csatlakoztatva" @@ -5381,7 +5472,7 @@ msgstr "Jobb Windows" msgid "Word Wrap" msgstr "Word Wrap" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5487,7 +5578,7 @@ msgstr "Zero ismeretlen az emulátor számára: %08x" msgid "[ waiting ]" msgstr "[ várakozás ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5503,7 +5594,7 @@ msgstr "" msgid "[Custom]" msgstr "[Egyedi]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5522,7 +5613,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5624,9 +5715,6 @@ msgstr "| VAGY" #~ msgid "AOSound" #~ msgstr "AOSound" -#~ msgid "Accuracy:" -#~ msgstr "Pontosság:" - #~ msgid "Accurate Texture Cache" #~ msgstr "Pontos textúra gyorsítótár" @@ -5665,19 +5753,6 @@ 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" @@ -5738,6 +5813,9 @@ msgstr "| VAGY" #~ msgid "Danish" #~ msgstr "Dán" +#~ msgid "Disable Wiimote Speaker" +#~ msgstr "Wiimote hangszóró kikapcsolása" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -5801,9 +5879,6 @@ msgstr "| VAGY" #~ msgid "Enable CPU Access" #~ msgstr "Processzor hozzáférés engedélyezése" -#~ msgid "Enable Cache" -#~ msgstr "Gyorsítótár használata" - #~ msgid "Enable Copy to EFB" #~ msgstr "EFB-be másolás engedélyezése" @@ -5882,12 +5957,6 @@ msgstr "| VAGY" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "DSP ROM betöltése sikertelen: %s" -#~ msgid "Fast" -#~ msgstr "Gyors" - -#~ msgid "Fast Mipmaps" -#~ msgstr "Gyors mipmapek" - #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6047,15 +6116,9 @@ msgstr "| VAGY" #~ msgid "Running script...\n" #~ msgstr "Parancsfájl futtatása...\n" -#~ msgid "Safe" -#~ msgstr "Biztonságos" - #~ msgid "Scale:" #~ msgstr "Arányosítás:" -#~ msgid "Scaled EFB Copy" -#~ msgstr "Méretezett EFB másolat" - #~ msgid "Select resolution for fullscreen mode" #~ msgstr "Teljes kijelzÅ‘s felbontás kiválasztása" @@ -6111,22 +6174,6 @@ msgstr "| VAGY" #~ msgid "Skies of Arcadia" #~ msgstr "Skies of Arcadia" -#~ 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" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Kissé gyorsítja az EFB RAM másolatokat az emuláció pontosságának " -#~ "rovására.\n" -#~ "Néha a vizuális minÅ‘séget is növeli.\n" -#~ "Ha bármely hibát tapasztalsz, próbáld növelni a textúra gyorsítótár " -#~ "pontosságát vagy kapcsold ki ezt az opciót.\n" -#~ "\n" -#~ "Ha bizonytalan vagy, hagyd kijelöletlenül." - #~ msgid "Slot" #~ msgstr "Hely" @@ -6166,40 +6213,9 @@ msgstr "| VAGY" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "A megjelenítési ablak teljes képernyÅ‘s módban indul." -#~ 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" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "Az EFB másolatokat a grafikai processzor textúra objektumaiban tárolja.\n" -#~ "Ez nem annyira pontos, de elég jól működik a legtöbb játék esetén és " -#~ "jelentÅ‘s sebességnövekedést okoz az EFB RAM-ban történÅ‘ tárolásával " -#~ "szemben.\n" -#~ "\n" -#~ "Ha bizonytalan vagy, hagyd kijelölve." - -#~ msgid "Texture" -#~ msgstr "Textúra" - -#~ msgid "Texture Cache" -#~ msgstr "Textúra gyorsítótár" - #~ msgid "The file " #~ msgstr "A fájl" -#~ msgid "" -#~ "The safer you adjust this, the less likely the emulator will be missing " -#~ "any texture updates from RAM.\n" -#~ "\n" -#~ "If unsure, use the second-fastest value from the right." -#~ msgstr "" -#~ "Minél biztonságosabb a beállítás, annál kevésbé valószínű, hogy az " -#~ "emulátor textúra frissítést fog a RAM-ból hiányolni.\n" -#~ "\n" -#~ "Ha bizonytalan vagy, használd a második leggyorsabb értéket jobbról." - #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Ez a játék hangok és hang effektusok lejátszásra szolgál." diff --git a/Languages/po/it.po b/Languages/po/it.po index e01489c0db..f9e2001f04 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: 2011-08-10 08:30-0500\n" +"POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-04-08 20:40+0100\n" "Last-Translator: RebuMan, Dolphin Team\n" "Language-Team: \n" @@ -30,7 +30,7 @@ msgstr " Gioco : " msgid "! NOT" msgstr "! NOT" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -74,7 +74,7 @@ msgstr "" "Fallito il tentativio di ripulire %s. E' possibile che l'immagine sia " "corrotta." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, fuzzy, c-format msgid "" "%s failed to load as a memorycard \n" @@ -83,7 +83,7 @@ msgstr "" "Caricamento Memcard non riuscito\n" "Dimensioni scheda non valide (%04X)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, fuzzy, c-format msgid "" "%s failed to load as a memorycard \n" @@ -92,7 +92,7 @@ msgstr "" "Caricamento Memcard non riuscito\n" "Dimensioni scheda non valide (%04X)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -306,7 +306,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(SCONOSCIUTO)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(nessuno)" @@ -318,7 +318,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "" @@ -330,7 +330,7 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "" @@ -418,17 +418,21 @@ msgstr "A proposito di Dolphin" msgid "Acceleration" msgstr "Accellerazione" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "Emulazione VBeam accurata" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 @@ -525,12 +529,12 @@ msgstr "Action Replay - Codice Regolare %i: Sottotipo %08x (%s) non valido" 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:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "Adattatore:" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "Aggiungi" @@ -546,9 +550,9 @@ msgstr "Aggiungi Patch" msgid "Add new pane" msgstr "Aggiungi nuovo riquadro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "Aggiungi..." @@ -600,7 +604,7 @@ msgstr "" "Regolare la pressione del comando analogico necessaria per attivare i " "pulsanti." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "Avanzate" @@ -620,8 +624,8 @@ msgstr "Tutti i file di immagine GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tutti i file GCM GameCube (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "All Save States (sav, s##)" msgstr "Tutti gli Stati di Gioco Salvati (sav, s##)" @@ -637,7 +641,7 @@ msgstr "Tutti i file compressi GC/Wii (gcz)" msgid "All files (*.*)|*.*" msgstr "Tutti i file (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -645,11 +649,16 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Wiimote Emulato" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" msgstr "Filtro Anisotropico:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "Anti-Aliasing:" @@ -671,7 +680,7 @@ msgstr "Programma di Caricamento (Apploader):" msgid "Apply" msgstr "Applica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -701,7 +710,7 @@ msgstr "" "Sei sicuro di voler eliminare questo file? Sarà cancellato definitivamente!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspetto:" @@ -722,20 +731,20 @@ msgid "AudioCommon: Error opening AO device.\n" msgstr "Audiocommon: Errore nell'apertura della periferica AO.\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 #, fuzzy msgid "Auto (Window Size)" msgstr "Dimensioni Finestra:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 #, fuzzy msgid "Auto adjust Window Size" msgstr "Dimensioni Finestra:" @@ -748,6 +757,14 @@ msgid "" "If unsure, leave this unchecked." msgstr "Visualizza i tasti di input letti dall'emulatore." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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/WXInputBase.cpp:27 msgid "Back" msgstr "Indietro" @@ -756,8 +773,8 @@ msgstr "Indietro" msgid "Backend Settings" msgstr "Impostazioni Interfaccia" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 #, fuzzy msgid "Backend:" msgstr "Interfaccia Audio:" @@ -792,7 +809,7 @@ msgstr "Banner:" msgid "Bar" msgstr "Barra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "Impostazioni di Base" @@ -804,7 +821,7 @@ msgstr "Impostazioni di Base" msgid "Bass" msgstr "Bass" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "" "Verifica somma di controllo della Tabella di Allocazione Blocchi non riuscita" @@ -825,8 +842,8 @@ msgstr "Blu Sinistro" msgid "Blue Right" msgstr "Blu Destro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 msgid "Bottom" msgstr "Sotto" @@ -859,9 +876,9 @@ msgstr "Cerca una directory di destinazione" msgid "Buffer:" msgstr "Buffer:" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "Pulsanti" @@ -878,12 +895,12 @@ msgstr "Levetta di Controllo" msgid "CPU Emulator Engine" msgstr "Motore di Emulazione CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 #, fuzzy msgid "Cache Display Lists" msgstr "Attiva Display List Caching" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 " @@ -893,7 +910,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -902,8 +919,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Annulla" @@ -951,10 +968,10 @@ msgstr "" 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:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Impossibile leggere da DVD_Plugin - Interfaccia DVD: Errore Fatale" @@ -1079,10 +1096,10 @@ msgstr "Levetta Circolare" msgid "Classic" msgstr "Controller Classico" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "Cancella" @@ -1098,10 +1115,10 @@ msgstr "" "Client disconnesso durante l'esecuzione del gioco!! La modalità di Gioco-" "Online è disabilitata. E' necessario arrestare il gioco manualmente." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Chiudi" @@ -1206,7 +1223,7 @@ msgstr "Collega Wiimote 3" msgid "Connect Wiimote 4" msgstr "Collega Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:608 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Connecting..." msgstr "Connessione in corso..." @@ -1276,7 +1293,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:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1346,11 +1363,11 @@ msgstr "Creatore: " msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "Taglia Immagine lungo i Bordi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1394,8 +1411,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Motore di Emulazione DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "DSP HLE emulation (fast)" msgstr "Emulazione DSP HLE (veloce)" @@ -1445,7 +1462,7 @@ msgstr "Zona Morta" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 #, fuzzy msgid "Debugging" msgstr "Debug" @@ -1479,8 +1496,8 @@ msgstr "ISO Predefinita:" msgid "Default font" msgstr "Carattere predefinito" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "Elimina" @@ -1488,12 +1505,12 @@ msgstr "Elimina" msgid "Delete Save" msgstr "Elimina Save" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "Elimina l'esistente file di salvataggio '%s'" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 #, fuzzy msgid "Description" msgstr "Descrizione Vertex" @@ -1525,15 +1542,15 @@ msgstr "Impostazioni Periferica" msgid "Dial" msgstr "Disco/Piatto" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1541,34 +1558,30 @@ msgstr "" "Falliti 'checksum' Directory\n" " e 'checksum' Directory di backup" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 #, fuzzy msgid "Disable" msgstr "Disabilita Nebbia" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "Disabilita Nebbia" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "Disabilita Illuminazione" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 #, fuzzy msgid "Disable Per-Pixel Depth" msgstr "Profondità Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "Disabilita Trame" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1577,7 +1590,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1587,7 +1600,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1603,11 +1616,11 @@ msgstr "Disco" msgid "Disc Read Error" msgstr "Errore Lettura Disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "Aspetto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 #, fuzzy msgid "" "Display the inputs read by the emulator.\n" @@ -1619,7 +1632,7 @@ msgstr "Visualizza i tasti di input letti dall'emulatore." msgid "Divide" msgstr "/" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Do you want to stop the current emulation?" msgstr "Vuoi interrompere l'emulazione in corso?" @@ -1627,7 +1640,7 @@ msgstr "Vuoi interrompere l'emulazione in corso?" msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin - Configurazione Video %s" @@ -1648,12 +1661,12 @@ msgstr "Dolphin - Configurazione Wiimote Emulato" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 msgid "Dolphin GCPad Configuration" msgstr "Dolphin - Configurazione Controlli GC" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmati TAS Dolphin (*.dtm)" @@ -1680,8 +1693,8 @@ msgstr "" "Dolphin è attualmente impostato per nascondere tutti i giochi. Doppio click " "qui per mostrare tutti i giochi..." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Giù" @@ -1706,26 +1719,26 @@ msgstr "Fittizio/a" msgid "Dump Audio" msgstr "Immagazzina Audio su disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "Immagazzina Oggetti EFB su disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "Immagazzina Fotogrammi su disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "Immagazzina Trame su disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 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:112 #, fuzzy msgid "" "Dump decoded game textures to User/Dump/Textures//\n" @@ -1735,16 +1748,16 @@ 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:114 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:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "Olandese" @@ -1752,7 +1765,7 @@ msgstr "Olandese" msgid "E&xit" msgstr "&Esci" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 #, fuzzy msgid "EFB Copies" msgstr "Individua Copie EFB" @@ -1807,7 +1820,7 @@ msgstr "Modifica..." msgid "Effect" msgstr "Effetto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 #, fuzzy msgid "Embedded Frame Buffer" msgstr "Frame Buffer" @@ -1816,7 +1829,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:111 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1825,7 +1838,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1847,7 +1860,7 @@ msgstr "Stato dell'Emulazione: " msgid "Enable" msgstr "Attiva" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1873,6 +1886,11 @@ msgstr "Attiva BAT" msgid "Enable Block Merging" msgstr "Attiva Unione Blocchi" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#, fuzzy +msgid "Enable Cache" +msgstr "Attiva Cache" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "Abilita Trucchi" @@ -1889,7 +1907,7 @@ msgstr "Attiva Dual Core" msgid "Enable Dual Core (speedup)" msgstr "Attiva Dual Core (aumenta la velocità)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "Attiva Tasti di Scelta Rapida" @@ -1905,8 +1923,8 @@ msgstr "Salta pause dovute a inattività (aumenta la velocità)" msgid "Enable MMU" msgstr "Attiva MMU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "Attiva Scansione Progressiva" @@ -1919,7 +1937,7 @@ msgstr "Attiva WideScreen" msgid "Enable WideScreen" msgstr "Attiva WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "Attiva Rappres. Vettoriale" @@ -2003,7 +2021,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:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2014,14 +2032,14 @@ msgstr "" msgid "End" msgstr "Fine" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "Inglese" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "Miglioramenti" @@ -2043,13 +2061,13 @@ msgstr "Voce 1/%d" msgid "Equal" msgstr "Uguale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "Errore/i" -#: Source/Core/DolphinWX/Src/Main.cpp:356 +#: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Errore caricamento della lingua selezionata. Ritorno alla predefinita di " @@ -2127,7 +2145,7 @@ msgstr "Esporta salvataggio come..." msgid "Extension" msgstr "Estensione" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 #, fuzzy msgid "External Frame Buffer" msgstr "Frame Buffer" @@ -2252,7 +2270,7 @@ msgstr "Caricamento hid.dll non riuscito" msgid "Failed to read banner.bin" msgstr "Accesso al banner.bin non riuscito" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2261,7 +2279,7 @@ msgstr "" "riuscito\n" "(0x8000-0x9FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2274,7 +2292,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Accesso ai dati dal file %d non riuscito" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2282,7 +2300,7 @@ msgstr "" "Accesso alla directory di backup non riuscito\n" "(0x4000-0x5FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2290,7 +2308,7 @@ msgstr "" "Accesso alla directory non riuscito\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2298,7 +2316,7 @@ msgstr "" "Accesso all'intestazione non riuscito\n" "(0x0000-0x1FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2330,6 +2348,15 @@ 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/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "Veloce" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#, fuzzy +msgid "Fast Mipmaps" +msgstr "Carica Mip Maps precalcolate" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "Versione veloce della MMU. Non funziona con qualsiasi gioco." @@ -2358,7 +2385,7 @@ msgstr "" "Il file non puo' essere aperto\n" "o non possiede un'estensione valida" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2396,11 +2423,11 @@ msgstr "Primo Blocco" msgid "Fix Checksums" msgstr "Ripara Somme di Controllo (Checksums)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "Forza 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "Forza 4:3" @@ -2409,12 +2436,12 @@ msgstr "Forza 4:3" msgid "Force Console as NTSC-J" msgstr "Imposta come Console NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 #, fuzzy msgid "Force Texture Filtering" msgstr "Forza Filtro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 #, fuzzy msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" @@ -2445,7 +2472,7 @@ msgid "" "setting when playing Japanese games." msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2470,7 +2497,7 @@ msgstr "Fotogramma " msgid "Frame Advance" msgstr "Fotogramma per Fotogramma" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "Usa FFV1 per immagazzinare i fotogrammi" @@ -2491,13 +2518,13 @@ msgstr "Limite FPS:" msgid "Frames To Record" msgstr "Fotogrammi da Registrare:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "Visuale Libera" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "Francese" @@ -2514,7 +2541,7 @@ msgstr "Da" msgid "FullScr" msgstr "Schermo Intero" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 #, fuzzy msgid "Fullscreen resolution:" msgstr "Risoluzione video a Schermo Intero:" @@ -2559,8 +2586,8 @@ msgstr "GameCube" msgid "Gamecube &Pad Settings" msgstr "Impostazioni &Controlli GameCube" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Schede di Memoria GameCube (*.raw,*.gcp)" @@ -2582,9 +2609,9 @@ 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/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generale" @@ -2593,9 +2620,9 @@ msgstr "Generale" msgid "General Settings" msgstr "Impostazioni Interfaccia" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "Tedesco" @@ -2618,11 +2645,13 @@ msgstr "Impostazioni Video" msgid "Greater Than" msgstr "Maggiore di" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" -"Greatly increases quality of textures generated using render-to-texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2651,11 +2680,11 @@ msgstr "Chitarra" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Chiamata a HCI_CMD_INQUIRY, per favore segnalare!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Somma di controllo dell'intestazione non riuscita" @@ -2692,7 +2721,7 @@ msgstr "" msgid "Hide" msgstr "Nascondi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "Nascondi il Cursore del Mouse" @@ -2717,8 +2746,8 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Configurazione Tasti di Scelta Rapida" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 msgid "Hotkeys" msgstr "Tasti di Scelta Rapida" @@ -2802,12 +2831,12 @@ msgstr "" "bisogna disabilitare l'Autoregolazione Audio in DSP per rendere efficace " "l'impostazione." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 #, fuzzy msgid "Ignore Format Changes" msgstr "Emula i Cambiamenti di Formato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2816,7 +2845,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 " @@ -2853,7 +2882,7 @@ msgstr "" "Il file importato possiede l'estensione .sav\n" "ma non una corretta intestazione" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 #, fuzzy msgid "" "Improves performance but causes glitches in most games which rely on proper " @@ -2864,7 +2893,7 @@ msgstr "" "Disabilita nebbia. Migliora le prestazioni ma provoca difetti nei giochi che " "richiedono l'effetto nebbia" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 #, fuzzy msgid "" "Improves performance but causes lighting to disappear in most games.\n" @@ -2882,8 +2911,8 @@ msgstr "In Game" msgid "In-Game" msgstr "In-Game" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "Info" @@ -2926,7 +2955,7 @@ msgstr "" "E' stata sollevata un'Eccezione all'Installazione, tuttavia questa " "piattaforma non la supporta ancora." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 msgid "Installing WAD..." msgstr "Installazione WAD..." @@ -2956,7 +2985,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "Errore Interno LZO - lzo_init() non riuscita" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 #, fuzzy msgid "Internal Resolution:" msgstr "Risoluzione video a Schermo Intero:" @@ -3010,9 +3039,9 @@ msgstr "File di registrazione non valido" msgid "Invalid state" msgstr "Stato non valido" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "Italiano" @@ -3073,8 +3102,8 @@ msgstr "Ultimo stato di gioco sovrascritto" msgid "Last Saved State" msgstr "Ultimo stato di gioco salvato" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "Sinistra" @@ -3120,7 +3149,7 @@ msgstr "" msgid "Load" msgstr "Carica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 #, fuzzy msgid "Load Custom Textures" msgstr "Carica Trame ad Alta Risoluzione" @@ -3161,17 +3190,17 @@ msgstr "Carica Stato di Gioco dall'Ingresso 8" msgid "Load State..." msgstr "Carica Stato di Gioco..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 #, fuzzy msgid "Load Wii System Menu" msgstr "Carica il Menu di Sistema Wii %d%c" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 #, 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:113 #, fuzzy msgid "" "Load custom textures from User/Load/Textures//\n" @@ -3214,8 +3243,8 @@ msgstr "Tipi di Log" msgid "Logger Outputs" msgstr "Destinazione Logger" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "Registrazione Eventi" @@ -3249,8 +3278,8 @@ msgstr "Hack Velocità MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "File MadCatz Gameshark(*.gcs)" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Levetta Principale" @@ -3279,8 +3308,8 @@ msgstr "La Memcard è già aperta" msgid "Memory Byte" msgstr "Byte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 msgid "Memory Card" msgstr "Scheda di Memoria" @@ -3309,7 +3338,7 @@ msgstr "" "%s\n" "Si desidera copiare il precedente file in questa nuova locazione?\n" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "" @@ -3327,7 +3356,7 @@ msgstr "Mic" msgid "Min" msgstr "Mic" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "Varie" @@ -3340,7 +3369,7 @@ msgstr "Impostazioni Varie" msgid "Modifier" msgstr "Modificatore" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3361,7 +3390,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motore" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3466,9 +3495,9 @@ msgstr "TN Tab" msgid "NP Up" msgstr "TN Su" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Nome:" @@ -3553,7 +3582,7 @@ msgstr "Diverso" msgid "Not Set" msgstr "Non Impostato" -#: Source/Core/DolphinWX/Src/Main.cpp:607 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Not connected" msgstr "Non collegato" @@ -3582,8 +3611,8 @@ msgstr "Bloc Num" msgid "Number Of Codes: " msgstr "Numero Di Codici:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "Nunchuk" @@ -3612,8 +3641,8 @@ msgstr "Offset:" msgid "Only %d blocks available" msgstr "Solo %d blocchi disponibili" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Open" msgstr "Apri" @@ -3643,12 +3672,12 @@ 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:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 #, fuzzy msgid "OpenCL Texture Decoder" msgstr "Decodificatore Trama OpenMP" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "Decodificatore Trama OpenMP" @@ -3681,8 +3710,8 @@ msgstr "" "successivamente eseguire l'importazione di questi ultimi in una nuova " "memcard\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "" @@ -3747,13 +3776,13 @@ msgstr "Patches" msgid "Paths" msgstr "Percorsi" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "Pausa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 #, fuzzy msgid "Per-Pixel Lighting" msgstr "Illuminazione Pixel" @@ -3767,10 +3796,10 @@ msgstr "Perfetto" msgid "Perspective %d" msgstr "Prospettiva %d" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 msgid "Play" msgstr "Gioca" @@ -3794,7 +3823,7 @@ msgstr "Opzioni di Riproduzione" msgid "Players" msgstr "Giocatori" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 msgid "Please confirm..." msgstr "Per favore confermare..." @@ -3839,7 +3868,7 @@ msgstr "Portoghese" msgid "Portuguese (Brazilian)" msgstr "Portoghese (Brasiliano)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 #, fuzzy msgid "Post-Processing Effect:" msgstr "Effetti di Post-Processing:" @@ -3899,7 +3928,7 @@ msgstr "Pulsante R" msgid "R-Analog" msgstr "R-Analogico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "RAM" @@ -3915,7 +3944,7 @@ msgstr "Gamma" msgid "Read-only mode" msgstr "Modalità in Sola-lettura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "Reale" @@ -3977,9 +4006,9 @@ msgstr "" "Questo produce contorni e immagini meno spigolose, ma riduce pesantemente le " "prestazioni." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Aggiorna" @@ -3991,14 +4020,14 @@ msgstr "Aggiorna Elenco" msgid "Refresh game list" msgstr "Aggiorna elenco giochi" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Remove" msgstr "Rimuovi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 #, fuzzy msgid "" "Render the scene as a wireframe.\n" @@ -4008,12 +4037,12 @@ msgstr "" "Renderizza la scena in modalità vettoriale (wireframe).\n" "Utile solo per il debug." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "Rendering nella finestra Principale" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Resetta" @@ -4025,8 +4054,8 @@ msgstr "Risultati" msgid "Return" msgstr "Invio" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "Destra" @@ -4051,13 +4080,17 @@ msgstr "Russo" msgid "Sa&ve State" msgstr "Sa&lva Stato di Gioco" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "Accurata" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "Frequenza di Campionamento:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Salva" @@ -4123,6 +4156,11 @@ msgstr "Salva GCM/ISO decompressi" msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#, fuzzy +msgid "Scaled EFB Copy" +msgstr "Scala Copie EFB" + #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, fuzzy, c-format msgid "Scanning %s" @@ -4158,17 +4196,17 @@ msgstr "Cerca nelle Sottocartelle" msgid "Section %s not found in SYSCONF" msgstr "Sezione %s non trovata in SYSCONF" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "Seleziona" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "Seleziona il File di Registrazione" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 msgid "Select a Wii WAD file to install" msgstr "Seleziona un file WAD Wii da installare" @@ -4194,15 +4232,15 @@ msgstr "Seleziona finestre libere/mobili" msgid "Select the file to load" msgstr "Seleziona il file da caricare" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Select the save file" msgstr "Seleziona il file di salvataggio" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Seleziona lo stato di gioco da caricare" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "Select the state to save" msgstr "Seleziona lo stato di gioco da salvare" @@ -4332,12 +4370,12 @@ msgstr "Mostra Barra degli St&rumenti" msgid "Show Drives" msgstr "Mostra Unità a Disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 #, fuzzy msgid "Show EFB Copy Regions" msgstr "Individua Copie EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "Mostra FPS" @@ -4349,7 +4387,7 @@ msgstr "Mostra Francia" msgid "Show GameCube" msgstr "Mostra GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "Mostra Tasti di Input" @@ -4385,7 +4423,7 @@ msgstr "Mostra Piattaforme" msgid "Show Regions" msgstr "Mostra Regioni" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 #, fuzzy msgid "Show Statistics" msgstr "Statistiche" @@ -4442,7 +4480,7 @@ msgstr "Mostra icona salvata" msgid "Show save title" msgstr "Mostra titolo salvato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4458,7 +4496,7 @@ msgstr "Mostra questo messaggio di aiuto" msgid "Show unknown" msgstr "Mostra sconosciuto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -4482,16 +4520,16 @@ msgstr "Dimensioni" msgid "Skip BIOS" msgstr "Salta Caricamento BIOS GC" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "Disabilita Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4499,6 +4537,16 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4547,9 +4595,9 @@ msgstr "Creazione buffer audio non riuscita: %s" msgid "Space" msgstr "Spazio" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "Spagnolo" @@ -4557,7 +4605,7 @@ msgstr "Spagnolo" msgid "Speaker Volume:" msgstr "Volume Altoparlante:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 " @@ -4585,9 +4633,9 @@ msgstr "Levetta Quadrata" msgid "Standard Controller" msgstr "Controller Standard" +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Start" @@ -4615,14 +4663,23 @@ msgstr "Stati di Gioco" msgid "Stick" msgstr "Levetta" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Arresta" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "Adatta a Finestra" @@ -4656,8 +4713,8 @@ msgstr "Lingua di Sistema:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #, fuzzy msgid "TAS Input" msgstr "Input" @@ -4678,9 +4735,9 @@ msgstr "Semipiano sinistro" msgid "Table Right" msgstr "Semipiano destro" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "Genera un'Istantanea di Gioco" @@ -4688,7 +4745,16 @@ msgstr "Genera un'Istantanea di Gioco" msgid "Test" msgstr "Prova" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "Trama" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +#, fuzzy +msgid "Texture Cache" +msgstr "Cmd Trama" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 #, fuzzy msgid "Texture Format Overlay" msgstr "Formato Trama" @@ -4733,7 +4799,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:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Il file %s specificato non esiste" @@ -4750,13 +4816,21 @@ 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:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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:363 +#: Source/Core/DolphinWX/Src/Main.cpp:353 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4827,7 +4901,7 @@ 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:119 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. " @@ -4902,13 +4976,13 @@ msgstr "a" msgid "Toggle All Log Types" msgstr "Seleziona/Deseleziona tutti i Tipi di Log" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Commuta a Schermo Intero" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Top" msgstr "Sopra" @@ -4916,7 +4990,7 @@ msgstr "Sopra" msgid "Traditional Chinese" msgstr "Cinese Tradizionale" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "Tentativo di caricamento di un tipo di file sconosciuto." @@ -4952,8 +5026,8 @@ msgstr "Tipo" msgid "UDP Port:" msgstr "Porta UDP:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "Wiimote UDP" @@ -5023,8 +5097,8 @@ msgstr "" "Puntatore %#08x sconosciuto\n" "Continuare?" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "Su" @@ -5041,7 +5115,7 @@ msgstr "Wiimote in posizione verticale" msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utilizza Modalità EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 #, fuzzy msgid "Use Fullscreen" msgstr "&Schermo Intero" @@ -5054,7 +5128,7 @@ msgstr "Usa Hex" msgid "Use Panic Handlers" msgstr "Avvisi di Errore" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5062,7 +5136,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5071,11 +5145,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "Utilità" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "V-Sync" @@ -5099,8 +5173,7 @@ msgstr "Verboso" msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "Virtuale" @@ -5123,21 +5196,21 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Allarme/i" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 msgid "Warning - starting DOL in wrong console mode!" msgstr "Attenzione - avvio DOL in modalità console errata!" -#: Source/Core/Core/Src/Boot/Boot.cpp:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "Attenzione - avvio ELF in modalità console errata!" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "Attenzione - avvio ISO in modalità console errata!" @@ -5176,7 +5249,7 @@ msgstr "WaweFileWriter - file non aperto." msgid "Whammy" msgstr "Tremolo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "Hack Widescreen" @@ -5201,7 +5274,7 @@ msgstr "Origine DVD:" msgid "Wii Save Import" msgstr "Importa Salvataggi Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 msgid "Wii save files (*.bin)|*.bin" msgstr "Salva i file Wii (*.bin)|*.bin" @@ -5209,8 +5282,8 @@ msgstr "Salva i file Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Impossibile leggere dal file" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "Wiimote" @@ -5232,7 +5305,7 @@ msgstr "" " o forse è dovuto ad altri motivi. \n" "Vuoi riconnettersi immediatamente?" -#: Source/Core/DolphinWX/Src/Main.cpp:609 +#: Source/Core/DolphinWX/Src/Main.cpp:599 msgid "Wiimote Connected" msgstr "Wiimote Collegato" @@ -5265,7 +5338,7 @@ msgstr "Windows Destro" msgid "Word Wrap" msgstr "Adatta Testo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5370,7 +5443,7 @@ msgstr "Zero codice sconosciuto per dolphin: %08x" msgid "[ waiting ]" msgstr "[ attesa ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5382,7 +5455,7 @@ msgstr "" msgid "[Custom]" msgstr "[Personalizzata]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5393,7 +5466,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5880,10 +5953,6 @@ msgstr "| OR" #~ msgid "Enable CPU Access" #~ msgstr "Attiva Accesso alla CPU" -#, fuzzy -#~ msgid "Enable Cache" -#~ msgstr "Attiva Cache" - #~ msgid "Enable Copy to EFB" #~ msgstr "Abilita Copie EFB" @@ -5960,13 +6029,6 @@ msgstr "| OR" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Caricamento ROM DSP: %s non riuscito" -#~ msgid "Fast" -#~ msgstr "Veloce" - -#, fuzzy -#~ msgid "Fast Mipmaps" -#~ msgstr "Carica Mip Maps precalcolate" - #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6205,19 +6267,12 @@ msgstr "| OR" #~ msgid "Running script...\n" #~ msgstr "Esecuzione script...\n" -#~ msgid "Safe" -#~ msgstr "Accurata" - #~ msgid "Save code" #~ msgstr "Salva codice" #~ msgid "Scale:" #~ msgstr "Scala:" -#, fuzzy -#~ msgid "Scaled EFB Copy" -#~ msgstr "Scala Copie EFB" - #~ msgid "Search" #~ msgstr "Cerca" @@ -6354,13 +6409,6 @@ msgstr "| OR" #~ msgid "Take Screenshot\t" #~ msgstr "Genera Istantanea\t" -#~ msgid "Texture" -#~ msgstr "Trama" - -#, fuzzy -#~ msgid "Texture Cache" -#~ msgstr "Cmd Trama" - #~ msgid "Textures" #~ msgstr "Trame" diff --git a/Languages/po/ja.po b/Languages/po/ja.po index c81d148766..31f1cf1b66 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: 2011-08-10 08:30-0500\n" +"POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-08-19 08:37-0500\n" "Last-Translator: DanbSky\n" "Language-Team: \n" @@ -30,7 +30,7 @@ msgstr "タイトル：" msgid "! NOT" msgstr "! (...ã§ç„¡ã„)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -72,7 +72,7 @@ msgstr " %s ã¯ã™ã§ã«å­˜åœ¨ã—ã¾ã™ã€‚上書ãã—ã¾ã™ã‹ï¼Ÿ" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s ã®ã‚¹ã‚¯ãƒ©ãƒ“ングã«å¤±æ•—ã—ã¾ã—ãŸã€‚ãŠãらã壊れã¦ã„ã¾ã™ã€‚" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -81,7 +81,7 @@ msgstr "" "%s メモリーカードã®èª­ã¿è¾¼ã¿ã«å¤±æ•—\n" " ä¸æ­£ãªã‚«ãƒ¼ãƒ‰å®¹é‡ã§ã™ (0x%x ãƒã‚¤ãƒˆ)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -90,7 +90,7 @@ msgstr "" "%s メモリーカードã®èª­ã¿è¾¼ã¿ã«å¤±æ•—\n" " ä¸æ­£ãªã‚«ãƒ¼ãƒ‰å®¹é‡ã§ã™ (0x%x ãƒã‚¤ãƒˆ)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -307,7 +307,7 @@ msgstr "補正有効" msgid "(UNKNOWN)" msgstr "(ä¸æ˜Ž)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "オフ" @@ -319,7 +319,7 @@ msgstr "16 ビット" msgid "32 bit" msgstr "32 ビット" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "3D Vision" @@ -331,7 +331,7 @@ msgstr "8 ビット" msgid "" msgstr "コードåを入力ã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "<対応解åƒåº¦ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“>" @@ -416,17 +416,22 @@ msgstr "Dolphinã«ã¤ã„ã¦" msgid "Acceleration" msgstr "加速度" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "精度：" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulation" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#, fuzzy msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" "より正確ãªEFBコピーエミュレーションを行ã„ã¾ã™ã€‚\n" "ã„ãã¤ã‹ã®ã‚²ãƒ¼ãƒ ã®ç”»é¢åŠ¹æžœã‚„ゲームプレイ性ã¯ã“ã®æ©Ÿèƒ½ã«ä¾ã£ã¦ã„ã¾ã™ã€‚\n" @@ -523,12 +528,12 @@ msgstr "Action Replay: 通常コード %i: ä¸æ­£ãªã‚µãƒ–タイプ %08x (%s)" msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: 通常コード 0: ä¸æ­£ãªã‚µãƒ–タイプ %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "ビデオカード：" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "" @@ -544,9 +549,9 @@ msgstr "パッãƒã‚’追加" msgid "Add new pane" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "追加" @@ -594,7 +599,7 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "ボタンãŒåå¿œã™ã‚‹æ„Ÿåº¦ã‚’調整ã—ã¾ã™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "高度ãªè¨­å®š" @@ -614,8 +619,8 @@ msgstr "å…¨ã¦ã® GC/Wii イメージ (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "GC GCMファイル (gcm)|*.gcm" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "All Save States (sav, s##)" msgstr "å…¨ã¦ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイル (sav, s##)" @@ -631,7 +636,7 @@ msgstr "圧縮ã•ã‚ŒãŸGC/Wii ISOファイル (gcz)" msgid "All files (*.*)|*.*" msgstr "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ« (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -643,11 +648,16 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Wii リモコンをエミュレート" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" msgstr "異方性フィルタリング：" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "アンãƒã‚¨ã‚¤ãƒªã‚¢ã‚¹ï¼š" @@ -668,7 +678,7 @@ msgstr "Apploader" msgid "Apply" msgstr "é©ç”¨" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -700,7 +710,7 @@ msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ファイルを削除ã—ã¾ã™ã‹ï¼Ÿå…ƒã«æˆ»ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“ï¼" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "アスペクト比：" @@ -721,19 +731,19 @@ msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error opening AO device.\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "自動 (ゲーム解åƒåº¦ã®å€æ•°)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "自動 (ウィンドウサイズã«æ‹¡å¤§)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "ウィンドウサイズを自動調整" @@ -747,6 +757,18 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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/WXInputBase.cpp:27 msgid "Back" msgstr "Back" @@ -755,8 +777,8 @@ msgstr "Back" msgid "Backend Settings" msgstr "出力設定" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "æç”»API：" @@ -790,7 +812,7 @@ msgstr "ãƒãƒŠãƒ¼è¡¨ç¤º" msgid "Bar" msgstr "ãƒãƒ¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "基本設定" @@ -802,7 +824,7 @@ msgstr "基本設定" msgid "Bass" msgstr "ãƒã‚¹ãƒ‰ãƒ©" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Block Allocation Table ã®ãƒã‚§ãƒƒã‚¯ã‚µãƒ ãŒä¸é©åˆ" @@ -822,8 +844,8 @@ msgstr "é’ - å·¦" msgid "Blue Right" msgstr "é’ - å³" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 msgid "Bottom" msgstr "下部" @@ -856,9 +878,9 @@ msgstr "出力先をé¸æŠž" msgid "Buffer:" msgstr "ãƒãƒƒãƒ•ã‚¡ï¼š" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "ボタン" @@ -874,11 +896,11 @@ msgstr "C-スティック" msgid "CPU Emulator Engine" msgstr "CPUエミュレーション方å¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "Cache Display Lists" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 " @@ -894,7 +916,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’外ã•ãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -908,8 +930,8 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "キャンセル" @@ -957,10 +979,10 @@ msgstr "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Cant find WiiMote by connection handle %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "DVD_Pluginã‹ã‚‰ã®èª­ã¿è¾¼ã¿ãŒä¸å¯èƒ½ - DVD-Interface: 致命的ãªã‚¨ãƒ©ãƒ¼" @@ -1085,10 +1107,10 @@ msgstr "丸ã¿" msgid "Classic" msgstr "クラシックコントローラ" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "全消去" @@ -1104,10 +1126,10 @@ msgstr "" "クライアントã¨ã®æŽ¥ç¶šãŒåˆ‡æ–­ã•ã‚Œã¾ã—ãŸï¼ãƒãƒƒãƒˆãƒ—レイã¯ç¾åœ¨ç„¡åŠ¹ã§ã™ã€‚ゲームをåœ" "æ­¢ã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "é–‰ã˜ã‚‹" @@ -1211,7 +1233,7 @@ msgstr "3Pã®Wii リモコンを接続ï¼åˆ‡æ–­" msgid "Connect Wiimote 4" msgstr "4Pã®Wii リモコンを接続ï¼åˆ‡æ–­" -#: Source/Core/DolphinWX/Src/Main.cpp:608 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Connecting..." msgstr "接続中..." @@ -1279,7 +1301,7 @@ msgstr "" "ç¾åœ¨ãƒ‘ッド設定を行ãˆã¾ã›ã‚“。 プレーヤーãŒæ®‹ã£ã¦ã„ã‚‹ã‹ã‚²ãƒ¼ãƒ ãŒèµ·å‹•ä¸­ã§ã™ï¼\n" "(ゲーム中ã®ãƒ‘ッド設定ã¯ç¾åœ¨ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1349,11 +1371,11 @@ msgstr "制作者： " msgid "Critical" msgstr "致命的ãªã‚¨ãƒ©ãƒ¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "クロッピング" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1401,8 +1423,8 @@ msgstr "サウンド" msgid "DSP Emulator Engine" msgstr "DSPエミュレーション方å¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "DSP HLE emulation (fast)" msgstr "DSP-HLE エミュレーション (高速)" @@ -1451,7 +1473,7 @@ msgstr "'éŠã³'ã®èª¿æ•´" msgid "Debug" msgstr "デãƒãƒƒã‚°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Debugging" msgstr "デãƒãƒƒã‚°ç”¨é …ç›®" @@ -1484,8 +1506,8 @@ msgstr "デフォルトISO" msgid "Default font" msgstr "既定ã®ãƒ•ã‚©ãƒ³ãƒˆ" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "削除" @@ -1493,12 +1515,12 @@ msgstr "削除" msgid "Delete Save" msgstr "ã“ã®ã‚»ãƒ¼ãƒ–データを削除" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "既存ファイル '%s' を削除ã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 msgid "Description" msgstr "説明" @@ -1530,15 +1552,15 @@ msgstr "デãƒã‚¤ã‚¹è¨­å®š" msgid "Dial" msgstr "ダイアル" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1546,32 +1568,28 @@ msgstr "" "ディレクトリã®ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã«å¤±æ•—\n" "ディレクトリãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã®ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã«ã‚‚失敗" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 msgid "Disable" msgstr "無効化" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "Disable Fog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "Disable Lighting" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "Disable Per-Pixel Depth" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "テクスãƒãƒ£ç„¡åŠ¹åŒ–" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "Wii リモコンスピーカー無効 (Disable Wiimote Speaker)" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1585,7 +1603,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’外ã•ãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1600,7 +1618,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1619,11 +1637,11 @@ msgstr "Disc" msgid "Disc Read Error" msgstr "ディスク読ã¿å–りエラー" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "表示設定" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1637,7 +1655,7 @@ msgstr "" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Do you want to stop the current emulation?" msgstr "動作中ã®ã‚²ãƒ¼ãƒ ã‚’åœæ­¢ã—ã¾ã™ã‹ï¼Ÿ" @@ -1645,7 +1663,7 @@ msgstr "動作中ã®ã‚²ãƒ¼ãƒ ã‚’åœæ­¢ã—ã¾ã™ã‹ï¼Ÿ" msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s グラフィック設定" @@ -1666,12 +1684,12 @@ msgstr "Wii リモコンã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³è¨­å®š" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 msgid "Dolphin GCPad Configuration" msgstr "GCコントローラ設定" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS ムービー (*.dtm)" @@ -1699,8 +1717,8 @@ msgstr "" "リスト中ã®å…¨ã¦ã®ã‚²ãƒ¼ãƒ ãŒè¨­å®šã«ã‚ˆã‚Šè¡¨ç¤ºã•ã‚Œã¦ã„ã¾ã›ã‚“。ã“ã®æ–‡ç« ã‚’ダブルクリッ" "クã™ã‚‹ã¨è¡¨ç¤ºã•ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Down" @@ -1725,19 +1743,19 @@ msgstr "ダミーデãƒã‚¤ã‚¹" msgid "Dump Audio" msgstr "サウンドã®ãƒ€ãƒ³ãƒ—" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "EFBターゲットをダンプ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "フレームをダンプ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "テクスãƒãƒ£ã‚’ダンプ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1748,7 +1766,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1758,7 +1776,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1769,9 +1787,9 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "オランダ語" @@ -1779,7 +1797,7 @@ msgstr "オランダ語" msgid "E&xit" msgstr "終了" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" msgstr "EFB Copies" @@ -1832,7 +1850,7 @@ msgstr "編集" msgid "Effect" msgstr "エフェクト" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer (内蔵フレームãƒãƒƒãƒ•ã‚¡)" @@ -1840,7 +1858,7 @@ msgstr "Embedded Frame Buffer (内蔵フレームãƒãƒƒãƒ•ã‚¡)" msgid "Emu Thread already running" msgstr "エミュレーションスレッドã¯ã™ã§ã«ç¨¼åƒä¸­ã§ã™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1854,7 +1872,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€Virtual】をé¸æŠžã—ãŸã¾ã¾ã«ã—ã¦ãŠã„ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1883,7 +1901,7 @@ msgstr "動作状æ³ï¼š" msgid "Enable" msgstr "有効" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1915,6 +1933,10 @@ msgstr "Enable BAT" msgid "Enable Block Merging" msgstr "Enable Block Merging" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +msgid "Enable Cache" +msgstr "Enable Cache" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ã‚’有効化" @@ -1931,7 +1953,7 @@ msgstr "Enable Dual Core" msgid "Enable Dual Core (speedup)" msgstr "デュアルコア動作を行ㆠ(速度å‘上)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "ホットキーを使用" @@ -1947,8 +1969,8 @@ msgstr "アイドルスキップ処ç†ã‚’行ㆠ(速度å‘上)" msgid "Enable MMU" msgstr "Enable MMU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "プログレッシブ表示を有効化" @@ -1960,7 +1982,7 @@ msgstr "スクリーンセーãƒãƒ¼ã‚’有効化" msgid "Enable WideScreen" msgstr "Enable WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "ワイヤーフレーム有効化" @@ -2055,7 +2077,7 @@ msgstr "" "メモリ管ç†æ©Ÿæ§‹ã‚’有効ã«ã—ã¾ã™ã€‚ã„ãã¤ã‹ã®ã‚²ãƒ¼ãƒ ã§å¿…è¦ã§ã™ [有効ï¼äº’æ›æ€§ãƒ»å®‰å®š" "性é‡è¦–ï¼ç„¡åŠ¹ï¼å‹•ä½œé€Ÿåº¦å‘上]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2069,14 +2091,14 @@ msgstr "" msgid "End" msgstr "End" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "英語" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "画質å‘上ã®è¨­å®š" @@ -2098,13 +2120,13 @@ msgstr "エントリ 1/%d" msgid "Equal" msgstr "ã«ä¸€è‡´ã™ã‚‹" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "エラー" -#: Source/Core/DolphinWX/Src/Main.cpp:356 +#: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "é¸æŠžã—ãŸè¨€èªžã®èª­ã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸã€‚＜システムã®è¨€èªžï¼žã«è¨­å®šã‚’戻ã—ã¾ã™" @@ -2179,7 +2201,7 @@ msgstr "セーブデータã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆå…ˆã‚’é¸æŠž" msgid "Extension" msgstr "拡張コントローラ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "External Frame Buffer (外部フレームãƒãƒƒãƒ•ã‚¡)" @@ -2300,7 +2322,7 @@ msgstr "hid.dll ã®èª­ã¿è¾¼ã¿ã«å¤±æ•—" msgid "Failed to read banner.bin" msgstr "banner.bin ã®èª­ã¿è¾¼ã¿ã«å¤±æ•—" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2308,7 +2330,7 @@ msgstr "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2321,7 +2343,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "ファイル %d ã‹ã‚‰ã®ãƒ‡ãƒ¼ã‚¿ã®èª­ã¿å–ã‚Šã«å¤±æ•—" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2329,7 +2351,7 @@ msgstr "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2337,7 +2359,7 @@ msgstr "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2345,7 +2367,7 @@ msgstr "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2377,6 +2399,14 @@ 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/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "Fast" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "Fast Mipmaps" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "高速ãªMMUを使用ã—ã¾ã™ã€‚å…¨ã¦ã®ã‚²ãƒ¼ãƒ ã§ã†ã¾ãå‹•ãã‚ã‘ã§ã¯ã‚ã‚Šã¾ã›ã‚“" @@ -2405,7 +2435,7 @@ msgstr "" "ファイルを開ãã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸ\n" "ã‚‚ã—ãã¯æœ‰åŠ¹ãªæ‹¡å¼µå­ã§ã¯ã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2443,11 +2473,11 @@ msgstr "ブロック開始ä½ç½®" msgid "Fix Checksums" msgstr "ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã‚’修正" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "Force 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "Force 4:3" @@ -2455,11 +2485,11 @@ msgstr "Force 4:3" msgid "Force Console as NTSC-J" msgstr "コンソールを日本å‘ã‘ (NTSC-J) ã«è¨­å®š" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" msgstr "Force Texture Filtering" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2496,7 +2526,7 @@ msgstr "" "ãƒã‚§ãƒƒã‚¯ã‚’外ã—ãŸçŠ¶æ…‹ã§ã¯Dolphin㯠NTSC-U を使用ã—ã¾ã™ãŒã€æ—¥æœ¬ã®ã‚¿ã‚¤ãƒˆãƒ«ã‚’プレ" "イ時ã«ã¯è‡ªå‹•çš„ã«ã“ã®è¨­å®šã¯æœ‰åŠ¹ã«ãªã‚Šã¾ã™" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2521,7 +2551,7 @@ msgstr "フレーム" msgid "Frame Advance" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "FFV1を使用ã—ã¦ãƒ•ãƒ¬ãƒ¼ãƒ ã‚’ダンプ" @@ -2541,13 +2571,13 @@ msgstr "フレームリミット：" msgid "Frames To Record" msgstr "録画フレーム数設定" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "フリールック" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "フランス語" @@ -2564,7 +2594,7 @@ msgstr "開始" msgid "FullScr" msgstr "全画é¢è¡¨ç¤º" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 msgid "Fullscreen resolution:" msgstr "フルスクリーン表示時解åƒåº¦ï¼š" @@ -2608,8 +2638,8 @@ msgstr "ゲームキューブ" msgid "Gamecube &Pad Settings" msgstr "ゲームキューブ入力設定(&P)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "メモリーカードファイル (*.raw,*.gcp)|*.raw;*.gcp" @@ -2631,9 +2661,9 @@ msgstr "" "Geckoコードã®å®Ÿè¡Œã«å¤±æ•— (CT%i CST%i) (%s)\n" "(コードã«å•é¡ŒãŒã‚ã‚‹ã‹ã€ã¾ã ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„タイプã®ã‚³ãƒ¼ãƒ‰ã§ã™)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -2641,9 +2671,9 @@ msgstr "一般" msgid "General Settings" msgstr "一般" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "ドイツ語" @@ -2665,11 +2695,14 @@ msgstr "æç”»ã«é–¢ã™ã‚‹è¨­å®šã‚’è¡Œã„ã¾ã™" msgid "Greater Than" msgstr "より大ãã„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#, fuzzy msgid "" -"Greatly increases quality of textures generated using render-to-texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2703,11 +2736,11 @@ msgstr "ギターコントローラ" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY is called, please report!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "高速化(Hacks)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "ヘッダã®ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã«å¤±æ•—" @@ -2744,7 +2777,7 @@ msgstr "" msgid "Hide" msgstr "éš ã™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "マウスカーソルを隠ã™" @@ -2772,8 +2805,8 @@ msgstr "ホスト" msgid "Hotkey Configuration" msgstr "ホットキーã®è¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 msgid "Hotkeys" msgstr "ホットキー" @@ -2853,11 +2886,11 @@ msgstr "" "実機(NTSC:60ï¼PAL:50)より高ã„FPSã§åˆ¶é™ã‚’ã‹ã‘ã‚‹å ´åˆã€ã‚µã‚¦ãƒ³ãƒ‰è¨­å®šã§ã€ŒAudio " "Throttleã€ã‚’無効ã«ã—ãªã„ã¨åŠ¹æžœãŒç¾ã‚Œã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" msgstr "Ignore Format Changes" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2871,7 +2904,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’外ã•ãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 " @@ -2913,7 +2946,7 @@ msgstr "" "インãƒãƒ¼ãƒˆã•ã‚ŒãŸã®ã¯'sav'ファイルã®ã‚ˆã†ã§ã™\n" "ã—ã‹ã—æ­£ã—ã„ヘッダã§ã¯ã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2926,7 +2959,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -2946,8 +2979,8 @@ msgstr "ソコソコ" msgid "In-Game" msgstr "ゲーム内" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "情報" @@ -2990,7 +3023,7 @@ msgstr "" "InstallExceptionHandler ãŒå‘¼ã³å‡ºã•ã‚Œã¾ã—ãŸãŒã€ã“ã®ãƒ—ラットフォームã¯ã¾ã ã‚µ" "ãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 msgid "Installing WAD..." msgstr "WADファイルを追加ã—ã¦ã„ã¾ã™..." @@ -3019,7 +3052,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "Internal LZO Error - lzo_init() failed" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 msgid "Internal Resolution:" msgstr "内部解åƒåº¦ã®å¤‰æ›´ï¼š" @@ -3072,9 +3105,9 @@ msgstr "ä¸æ­£ãªéŒ²ç”»ãƒ•ã‚¡ã‚¤ãƒ«" msgid "Invalid state" msgstr "ä¸æ­£ãªã‚»ãƒ¼ãƒ–ï¼ãƒ­ãƒ¼ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "イタリア語" @@ -3135,8 +3168,8 @@ msgstr "最後ã«ä¸Šæ›¸ãã—ãŸã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–" msgid "Last Saved State" msgstr "最新ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "Left" @@ -3182,7 +3215,7 @@ msgstr "FPSã«ã‚ˆã‚‹åˆ¶é™ã‚’有効化" msgid "Load" msgstr "読込" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Load Custom Textures" msgstr "カスタムテクスãƒãƒ£ã‚’読ã¿è¾¼ã‚€" @@ -3222,16 +3255,16 @@ msgstr "ステートロード - スロット 8" msgid "Load State..." msgstr "ファイルã‹ã‚‰ãƒ­ãƒ¼ãƒ‰" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Load Wii System Menu" msgstr "Wiiメニューを起動" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 #, 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:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3274,8 +3307,8 @@ msgstr "表示ã™ã‚‹ãƒ­ã‚°æƒ…å ±" msgid "Logger Outputs" msgstr "ログ出力先" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "ログ" @@ -3309,8 +3342,8 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark セーブファイル(*.gcs)" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "コントロールスティック" @@ -3339,8 +3372,8 @@ msgstr "ã™ã§ã«é–‹ã„ã¦ã„ã¾ã™" msgid "Memory Byte" msgstr "メモリãƒã‚¤ãƒˆ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 msgid "Memory Card" msgstr "メモリーカード" @@ -3367,7 +3400,7 @@ msgstr "" "%s\n" "ã“ã®å ´æ‰€ã«å¤ã„ファイルをコピーã—ã¾ã™ã‹ï¼Ÿ\n" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "メモリカードã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚µã‚¤ã‚ºãŒã€ãƒ˜ãƒƒãƒ€ã®ã‚µã‚¤ã‚ºã«ä¸€è‡´ã—ã¦ã„ã¾ã›ã‚“" @@ -3384,7 +3417,7 @@ msgstr "マイク" msgid "Min" msgstr "最å°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "ãã®ä»–" @@ -3397,7 +3430,7 @@ msgstr "ãã®ä»–ã®è¨­å®š" msgid "Modifier" msgstr "感度変更" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3422,7 +3455,7 @@ msgstr "モーションプラス" msgid "Motor" msgstr "モーター" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3536,9 +3569,9 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "åå‰" @@ -3623,7 +3656,7 @@ msgstr "ã«ä¸€è‡´ã—ãªã„" msgid "Not Set" msgstr "未確èª" -#: Source/Core/DolphinWX/Src/Main.cpp:607 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Not connected" msgstr "未接続" @@ -3652,8 +3685,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "行数：" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "ヌンãƒãƒ£ã‚¯" @@ -3682,8 +3715,8 @@ msgstr "オフセット値：" msgid "Only %d blocks available" msgstr "残り %d ブロックã—ã‹ã‚ã‚Šã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Open" msgstr "é–‹ã" @@ -3713,11 +3746,11 @@ msgstr "OpenAL: サウンドデãƒã‚¤ã‚¹ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" msgid "OpenAL: can't open device %s" msgstr "OpenAL: デãƒã‚¤ã‚¹ %s ãŒé–‹ã‘ã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "OpenCL Texture Decoder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decoder" @@ -3748,8 +3781,8 @@ msgstr "" "å³ã‚¯ãƒªãƒƒã‚¯ã‹ã‚‰ã€Žå…¨ã¦ã®ã‚»ãƒ¼ãƒ–データをエクスãƒãƒ¼ãƒˆã€ã‚’実行ã—ã¦ã€\n" "æ–°ã—ã„メモリーカードã«ã‚»ãƒ¼ãƒ–データを移行ã—ã¦ãã ã•ã„\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "ãã®ä»–" @@ -3814,13 +3847,13 @@ msgstr "パッãƒ" msgid "Paths" msgstr "フォルダ" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "一時åœæ­¢" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Per-Pixel Lighting" msgstr "Per-Pixel Lighting" @@ -3833,10 +3866,10 @@ msgstr "カンペキï¼" msgid "Perspective %d" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 msgid "Play" msgstr "開始" @@ -3860,7 +3893,7 @@ msgstr "å†ç”Ÿã‚ªãƒ—ション" msgid "Players" msgstr "プレイヤー一覧" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 msgid "Please confirm..." msgstr "確èª" @@ -3905,7 +3938,7 @@ msgstr "ãƒãƒ«ãƒˆã‚¬ãƒ«èªž" msgid "Portuguese (Brazilian)" msgstr "ブラジル語" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" @@ -3964,7 +3997,7 @@ msgstr "Rボタン" msgid "R-Analog" msgstr "R (åŠæŠ¼ã—)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "RAM" @@ -3980,7 +4013,7 @@ msgstr "å¼·ã•" msgid "Read-only mode" msgstr "読ã¿è¾¼ã¿å°‚用 有効ï¼ç„¡åŠ¹" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "Real" @@ -4041,9 +4074,9 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€ãªã—】ã®ã¾ã¾ã«ã—ã¦ãŠã„ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "å†æ›´æ–°" @@ -4055,14 +4088,14 @@ msgstr "ゲームリストをå†æ›´æ–°" msgid "Refresh game list" msgstr "ゲームリストをå†æ›´æ–°ã—ã¾ã™" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Remove" msgstr "削除" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4072,12 +4105,12 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "メインウィンドウ部分ã«æç”»" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "åˆæœŸåŒ–" @@ -4089,8 +4122,8 @@ msgstr "çµæžœè¡¨ç¤ºæ¬„" msgid "Return" msgstr "Enter" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "Right" @@ -4115,13 +4148,17 @@ msgstr "ロシア語" msgid "Sa&ve State" msgstr "ステートセーブ(&V)" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "Safe" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "サンプルレート" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "ä¿å­˜" @@ -4187,6 +4224,10 @@ msgstr "解å‡ã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã®ä¿å­˜å…ˆã‚’é¸æŠž" msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Savestate movie %s ã®ç ´æを確èªã—ã¾ã—ãŸã€‚録画を中止ã—ã¦ã„ã¾ã™..." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +msgid "Scaled EFB Copy" +msgstr "Scaled EFB Copy" + #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format msgid "Scanning %s" @@ -4222,17 +4263,17 @@ msgstr "サブフォルダも検索" msgid "Section %s not found in SYSCONF" msgstr "Section %s not found in SYSCONF" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "é¸æŠž" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "録画ファイルをé¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 msgid "Select a Wii WAD file to install" msgstr "追加ã™ã‚‹WADファイルをé¸æŠž" @@ -4258,15 +4299,15 @@ msgstr "" msgid "Select the file to load" msgstr "ロードã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Select the save file" msgstr "セーブファイルをé¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "ロードã™ã‚‹ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイルをé¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "Select the state to save" msgstr "ステートセーブã®ä¿å­˜å…ˆã‚’é¸æŠž" @@ -4405,11 +4446,11 @@ msgstr "ツールãƒãƒ¼(&T)" msgid "Show Drives" msgstr "DVDドライブ内ã®ã‚½ãƒ•ãƒˆã‚’表示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "Show EFB Copy Regions" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "FPSを表示" @@ -4421,7 +4462,7 @@ msgstr "フランス" msgid "Show GameCube" msgstr "ゲームキューブ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "キー入力を表示" @@ -4457,7 +4498,7 @@ msgstr "特定機種ã®ã‚½ãƒ•ãƒˆã ã‘を表示" msgid "Show Regions" msgstr "特定リージョンã®ã‚½ãƒ•ãƒˆã ã‘を表示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "統計情報を表示" @@ -4511,7 +4552,7 @@ msgstr "アイコンを表示" msgid "Show save title" msgstr "タイトルを表示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4531,7 +4572,7 @@ msgstr "ã“ã®ãƒ˜ãƒ«ãƒ—メッセージを表示" msgid "Show unknown" msgstr "ä¸æ˜Ž" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -4557,15 +4598,15 @@ msgstr "サイズ" msgid "Skip BIOS" msgstr "BIOSをスキップ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "Skip Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "Skip EFB Access from CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4577,6 +4618,23 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"RAM設定時ã€ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ç²¾åº¦ã‚’å°‘ã—犠牲ã«ã€å‹•ä½œé€Ÿåº¦å‘上を è¡Œã†ã‚ªãƒ—ションã§" +"ã™ã€‚\n" +"時ã«ç”»è³ªã‚’å‘上ã•ã›ã‚‹ã“ã¨ã‚‚ã‚るよã†ã§ã™ã€‚\n" +"何ã‹ä¸å…·åˆãŒç™ºç”Ÿã—ãŸå ´åˆã¯ã“ã®ã‚ªãƒ—ションを無効ã«ã™ã‚‹ã‹ã€ 『Texture Cacheã€ã‚’" +"ã€Safe】å´ã«è¨­å®šã—ã¦ãã ã•ã„。\n" +"\n" +"よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4628,9 +4686,9 @@ msgstr "Sound buffer creation failed: %s" msgid "Space" msgstr "Space" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "スペイン語" @@ -4638,7 +4696,7 @@ msgstr "スペイン語" msgid "Speaker Volume:" msgstr "リモコンスピーカーã®éŸ³é‡" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 " @@ -4674,9 +4732,9 @@ msgstr "丸ã¿" msgid "Standard Controller" msgstr "標準コントローラ" +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "スタート" @@ -4704,14 +4762,28 @@ msgstr "ステートセーブï¼ãƒ­ãƒ¼ãƒ‰" msgid "Stick" msgstr "スティック" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "åœæ­¢" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" +"EFBコピーをGPUã«ãƒ†ã‚¯ã‚¹ãƒãƒ£ã‚ªãƒ–ジェクトã¨ã—ã¦æ ¼ç´ã—ã¾ã™ã€‚\n" +"ã“ã‚Œã¯ä¸æ­£ç¢ºãªå‡¦ç†ã§ã™ãŒã€ã»ã¨ã‚“ã©ã®ã‚²ãƒ¼ãƒ ã§ä¸Šæ‰‹ãåƒã〠ã¾ãŸã€RAM】設定より" +"も高速ã«å‹•ä½œã—ã¾ã™ã€‚\n" +"\n" +"よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã“ã¡ã‚‰ã‚’é¸æŠžã—ã¦ãŠã„ã¦ãã ã•ã„" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "ウィンドウã«åˆã‚ã›ã‚‹" @@ -4745,8 +4817,8 @@ msgstr "システムã®è¨€èªžï¼š" msgid "TAIWAN" msgstr "å°æ¹¾" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS Input" @@ -4766,9 +4838,9 @@ msgstr "左テーブル" msgid "Table Right" msgstr "å³ãƒ†ãƒ¼ãƒ–ル" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "スクリーンショット" @@ -4776,7 +4848,15 @@ msgstr "スクリーンショット" msgid "Test" msgstr "テスト" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "Texture" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +msgid "Texture Cache" +msgstr "Texture Cache" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" msgstr "テクスãƒãƒ£ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆæƒ…報表示" @@ -4822,7 +4902,7 @@ msgid "The file %s was already open, the file header will not be written." msgstr "" "ファイル %s ã¯æ—¢ã«é–‹ã‹ã‚Œã¦ã„ã‚‹ãŸã‚ã€ãƒ•ã‚¡ã‚¤ãƒ«ãƒ˜ãƒƒãƒ€ãƒ¼ã¯æ›¸ãè¾¼ã¾ã‚Œã¾ã›ã‚“。" -#: Source/Core/Core/Src/Boot/Boot.cpp:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "指定ã—ãŸãƒ•ã‚¡ã‚¤ãƒ« (%s) ã¯å­˜åœ¨ã—ã¾ã›ã‚“" @@ -4839,11 +4919,23 @@ msgstr "',' ã‚’å«ã‚€åå‰ã¯ä½¿ç”¨ã§ãã¾ã›ã‚“" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "復å·åŒ–ã—ã¾ã—ãŸãŒã€ã“ã®ã‚³ãƒ¼ãƒ‰ã«ã¯ä¸€ã¤ã‚‚è¡ŒãŒå«ã¾ã‚Œã¦ã„ã¾ã›ã‚“。" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +msgstr "" +"ã“ã®ã‚¹ãƒ©ã‚¤ãƒ€ã‚’Safeå´ã«è¨­å®šã—ã¦ãŠãã¨ã€RAMã‹ã‚‰ã®ãƒ†ã‚¯ã‚¹ãƒãƒ£æ›´æ–°ã« 失敗ã—ã«ãã" +"ãªã‚Šã¾ã™ã€‚\n" +"\n" +"よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€å³ã‹ã‚‰2番目ã«åˆã‚ã›ã¦ãŠã„ã¦ãã ã•ã„。" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" msgstr "コピーã—よã†ã¨ã—ã¦ã„るセーブファイルã¯ãƒ‡ãƒ¼ã‚¿ã‚µã‚¤ã‚ºãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/Main.cpp:363 +#: Source/Core/DolphinWX/Src/Main.cpp:353 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4916,7 +5008,7 @@ msgstr "" "有効ã«ã—ã¦ã„ã‚‹ã¨Wiiメニューやã„ãã¤ã‹ã®ã‚¿ã‚¤ãƒˆãƒ«ã§å‹•ä½œé€Ÿåº¦ãŒä½Žä¸‹ã™ã‚‹å ´åˆãŒã‚ã‚Š" "ã¾ã™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 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. " @@ -4993,13 +5085,13 @@ msgstr "終了" msgid "Toggle All Log Types" msgstr "å…¨ã¦ã®ãƒ­ã‚°æƒ…報をé¸æŠžï¼è§£é™¤" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "フルスクリーン表示切り替ãˆ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Top" msgstr "上部" @@ -5007,7 +5099,7 @@ msgstr "上部" msgid "Traditional Chinese" msgstr "ç¹ä½“字中国語" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "ä¸æ˜Žãªãƒ•ã‚¡ã‚¤ãƒ«ã‚¿ã‚¤ãƒ—を読ã¿è¾¼ã‚‚ã†ã¨ã—ã¾ã—ãŸ" @@ -5043,8 +5135,8 @@ msgstr "å½¢å¼" msgid "UDP Port:" msgstr "UDPãƒãƒ¼ãƒˆ:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "UDPã§æŽ¥ç¶š" @@ -5117,8 +5209,8 @@ msgstr "" "ä¸æ˜Žãªãƒã‚¤ãƒ³ã‚¿ %#08x\n" "続ã‘ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "Up" @@ -5135,7 +5227,7 @@ msgstr "直立状態(Upright)ã§ä½¿ç”¨" msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 (PAL60) モードを使用" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 msgid "Use Fullscreen" msgstr "フルスクリーンã§è¡¨ç¤º" @@ -5147,7 +5239,7 @@ msgstr "16進" msgid "Use Panic Handlers" msgstr "パニックãƒãƒ³ãƒ‰ãƒ©ã‚’使用" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5159,7 +5251,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5174,11 +5266,11 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "ユーティリティ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "åž‚ç›´åŒæœŸ (V-Sync)" @@ -5202,8 +5294,7 @@ msgstr "Verbosityモード" msgid "Video" msgstr "æç”»" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "Virtual" @@ -5231,21 +5322,21 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "警告" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 msgid "Warning - starting DOL in wrong console mode!" msgstr "警告 - 誤ã£ãŸãƒ¢ãƒ¼ãƒ‰ã§DOLãŒèµ·å‹•ã•ã‚Œã¦ã„ã¾ã™ï¼" -#: Source/Core/Core/Src/Boot/Boot.cpp:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "警告 - 誤ã£ãŸãƒ¢ãƒ¼ãƒ‰ã§ELFãŒèµ·å‹•ã•ã‚Œã¦ã„ã¾ã™ï¼" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "警告 - 誤ã£ãŸãƒ¢ãƒ¼ãƒ‰ã§ISOãŒèµ·å‹•ã•ã‚Œã¦ã„ã¾ã™ï¼" @@ -5282,7 +5373,7 @@ msgstr "WaveFileWriter - ファイルãŒé–‹ã‹ã‚Œã¦ã„ã¾ã›ã‚“" msgid "Whammy" msgstr "ワーミー" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "疑似ワイドスクリーン化" @@ -5306,7 +5397,7 @@ msgstr "Wii NANDルート" msgid "Wii Save Import" msgstr "Wiiã®ã‚»ãƒ¼ãƒ–データをインãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 msgid "Wii save files (*.bin)|*.bin" msgstr "Wiiセーブデータ (*.bin)|*.bin" @@ -5314,8 +5405,8 @@ msgstr "Wiiセーブデータ (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: ファイルã‹ã‚‰ã®èª­ã¿è¾¼ã¿ãŒã§ãã¾ã›ã‚“ã§ã—ãŸ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "入力(Wii)" @@ -5337,7 +5428,7 @@ msgstr "" "ã¾ãŸã¯ã—ã°ã‚‰ã入力ãŒãªã‹ã£ãŸãŸã‚çœé›»åŠ›ãƒ¢ãƒ¼ãƒ‰ã«å…¥ã£ãŸã®ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“\n" "å†æŽ¥ç¶šã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/Main.cpp:609 +#: Source/Core/DolphinWX/Src/Main.cpp:599 msgid "Wiimote Connected" msgstr "Wii リモコン接続中" @@ -5369,7 +5460,7 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ワードラップ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5475,7 +5566,7 @@ msgstr "Zero code unknown to dolphin: %08x" msgid "[ waiting ]" msgstr "[ 入力を待機... ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5491,7 +5582,7 @@ msgstr "" msgid "[Custom]" msgstr "[ カスタム設定 ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5509,7 +5600,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5625,9 +5716,6 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "A" #~ msgstr "A" -#~ msgid "Accuracy:" -#~ msgstr "精度：" - #~ msgid "Accurate Texture Cache" #~ msgstr "Accurate Texture Cache" @@ -5669,18 +5757,6 @@ 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 ãƒãƒ¼ã‚µã‚¹ãƒ»ã‚¯ãƒ«ã‚»ã‚¤ãƒ‰ - " @@ -5735,6 +5811,9 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Danish" #~ msgstr "デンマーク語" +#~ msgid "Disable Wiimote Speaker" +#~ msgstr "Wii リモコンスピーカー無効 (Disable Wiimote Speaker)" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -5794,9 +5873,6 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Enable CPU Access" #~ msgstr "Enable CPU Access" -#~ msgid "Enable Cache" -#~ msgstr "Enable Cache" - #~ msgid "Enable Copy to EFB" #~ msgstr "Enable Copy to EFB" @@ -5852,12 +5928,6 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "DSPロム (%s) ã®èª­ã¿è¾¼ã¿ã«å¤±æ•—" -#~ msgid "Fast" -#~ msgstr "Fast" - -#~ msgid "Fast Mipmaps" -#~ msgstr "Fast Mipmaps" - #~ msgid "Force Bi/Trilinear Filtering" #~ msgstr "Force Bi/Trilinear Filtering" @@ -5993,15 +6063,9 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Running script...\n" #~ msgstr "スクリプトを実行中..." -#~ msgid "Safe" -#~ msgstr "Safe" - #~ msgid "Scale:" #~ msgstr "内部解åƒåº¦" -#~ msgid "Scaled EFB Copy" -#~ msgstr "Scaled EFB Copy" - #~ msgid "Search" #~ msgstr "検索" @@ -6054,22 +6118,6 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Skies of Arcadia" #~ 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" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "RAM設定時ã€ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ç²¾åº¦ã‚’å°‘ã—犠牲ã«ã€å‹•ä½œé€Ÿåº¦å‘上を è¡Œã†ã‚ªãƒ—ション" -#~ "ã§ã™ã€‚\n" -#~ "時ã«ç”»è³ªã‚’å‘上ã•ã›ã‚‹ã“ã¨ã‚‚ã‚るよã†ã§ã™ã€‚\n" -#~ "何ã‹ä¸å…·åˆãŒç™ºç”Ÿã—ãŸå ´åˆã¯ã“ã®ã‚ªãƒ—ションを無効ã«ã™ã‚‹ã‹ã€ 『Texture Cacheã€" -#~ "ã‚’ã€Safe】å´ã«è¨­å®šã—ã¦ãã ã•ã„。\n" -#~ "\n" -#~ "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" - #~ msgid "Slot" #~ msgstr "スロット" @@ -6103,39 +6151,9 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "最åˆã‹ã‚‰å…¨ç”»é¢è¡¨ç¤ºã§èµ·å‹•ã—ã¾ã™" -#~ 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" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "EFBコピーをGPUã«ãƒ†ã‚¯ã‚¹ãƒãƒ£ã‚ªãƒ–ジェクトã¨ã—ã¦æ ¼ç´ã—ã¾ã™ã€‚\n" -#~ "ã“ã‚Œã¯ä¸æ­£ç¢ºãªå‡¦ç†ã§ã™ãŒã€ã»ã¨ã‚“ã©ã®ã‚²ãƒ¼ãƒ ã§ä¸Šæ‰‹ãåƒã〠ã¾ãŸã€RAM】設定よ" -#~ "りも高速ã«å‹•ä½œã—ã¾ã™ã€‚\n" -#~ "\n" -#~ "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã“ã¡ã‚‰ã‚’é¸æŠžã—ã¦ãŠã„ã¦ãã ã•ã„" - #~ msgid "Take Screenshot\t" #~ msgstr "スクリーンショット\t" -#~ msgid "Texture" -#~ msgstr "Texture" - -#~ msgid "Texture Cache" -#~ msgstr "Texture Cache" - -#~ msgid "" -#~ "The safer you adjust this, the less likely the emulator will be missing " -#~ "any texture updates from RAM.\n" -#~ "\n" -#~ "If unsure, use the second-fastest value from the right." -#~ msgstr "" -#~ "ã“ã®ã‚¹ãƒ©ã‚¤ãƒ€ã‚’Safeå´ã«è¨­å®šã—ã¦ãŠãã¨ã€RAMã‹ã‚‰ã®ãƒ†ã‚¯ã‚¹ãƒãƒ£æ›´æ–°ã« 失敗ã—ã«ã" -#~ "ããªã‚Šã¾ã™ã€‚\n" -#~ "\n" -#~ "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€å³ã‹ã‚‰2番目ã«åˆã‚ã›ã¦ãŠã„ã¦ãã ã•ã„。" - #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "音声や効果音ã®å†ç”Ÿã«ã‚ˆã使用ã•ã‚Œã¾ã™" diff --git a/Languages/po/ko.po b/Languages/po/ko.po index e9f2ee3773..b150a46898 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: 2011-08-10 08:30-0500\n" +"POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-07-07 10:24+0900\n" "Last-Translator: \n" "Language-Team: \n" @@ -31,7 +31,7 @@ msgstr "게임 :" msgid "! NOT" msgstr "! NOT" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -73,7 +73,7 @@ msgstr "%sê°€ ì´ë¯¸ 존재함, ë®ì–´ì”니까?" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s ê°€ 실패해서 취소ë˜ì—ˆìŠµë‹ˆë‹¤. ì´ë¯¸ì§€ê°€ ì†ìƒëœ 것 같습니다." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, fuzzy, c-format msgid "" "%s failed to load as a memorycard \n" @@ -82,7 +82,7 @@ msgstr "" "메모리카드가 ë¡œë“œì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤\n" " ì¹´ë“œ í¬ê¸°ê°€ 비ì í•©í•¨ (%04X)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, fuzzy, c-format msgid "" "%s failed to load as a memorycard \n" @@ -91,7 +91,7 @@ msgstr "" "메모리카드가 ë¡œë“œì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤\n" " ì¹´ë“œ í¬ê¸°ê°€ 비ì í•©í•¨ (%04X)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -305,7 +305,7 @@ msgstr "(-)+z근거리" msgid "(UNKNOWN)" msgstr "(알려지지 ì•ŠìŒ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(ë”)" @@ -317,7 +317,7 @@ msgstr "16 비트" msgid "32 bit" msgstr "32 비트" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "3D 비전" @@ -329,7 +329,7 @@ msgstr "8 비트" msgid "" msgstr "<ì—¬ê¸°ì— ì´ë¦„ì„ ë„£ìœ¼ì„¸ìš”>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "<ë°œê²¬ëœ í•´ìƒë„ê°€ ì—†ìŒ>" @@ -415,17 +415,22 @@ msgstr "ëŒí•€ì— 대해" msgid "Acceleration" msgstr "ê°€ì†" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "정확성:" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "정확한 VBeam ì—뮬레ì´ì…˜" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#, fuzzy msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" "정확하게 EFB 복사를 ì—뮬합니다.\n" "ì¼ë¶€ ê²Œìž„ë“¤ì€ ê·¸ëž˜í”½ 효과나 ê²Œìž„í”Œë ˆì´ ê¸°ëŠ¥ì„ ì´ê²ƒì— ì˜ì¡´í•©ë‹ˆë‹¤.\n" @@ -521,12 +526,12 @@ msgstr "ì•¡ì…˜ 리플레ì´: ì¼ë°˜ 코드 %i: 비ì í•© 서브타입 %08x (%s)" msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "ì•¡ì…˜ 리플레ì´: ì¼ë°˜ 코드 0: 비ì í•© 서브타입 %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "어댑터:" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "추가" @@ -542,9 +547,9 @@ msgstr "패치 추가" msgid "Add new pane" msgstr "새로운 ì°½ 추가" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "추가..." @@ -592,7 +597,7 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "버튼들 í™œì„±í™”ì— í•„ìš”í•œ 아날로그 컨트롤 ì••ë ¥ì„ ì¡°ì •í•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "고급" @@ -612,8 +617,8 @@ msgstr "모든 GC/Wii ì´ë¯¸ì§€ë“¤ (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "모든 게임í브 GCM 파ì¼ë“¤ (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "All Save States (sav, s##)" msgstr "모든 ìƒíƒœë“¤ 저장 (sav, s##)" @@ -629,7 +634,7 @@ msgstr "모든 ì••ì¶•ëœ GC/Wii ISO 파ì¼ë“¤ (gcz)" msgid "All files (*.*)|*.*" msgstr "모든 íŒŒì¼ (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -641,11 +646,16 @@ msgstr "" "\n" "확신 없으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "ì—ë®¬ëœ ìœ„ëª¨íŠ¸" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" msgstr "비등방성 í•„í„°ë§:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "안티-앨리어싱:" @@ -665,7 +675,7 @@ msgstr "앱로ë”:" msgid "Apply" msgstr "ì ìš©" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -697,7 +707,7 @@ msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ì´ íŒŒì¼ì„ ì •ë§ë¡œ 지우고 싶습니까? ê·¸ê²ƒì€ ì˜ì›ížˆ 사ë¼ì§‘니다!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "종횡비:" @@ -718,19 +728,19 @@ msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO 장치를 열기 ì—러.\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "ìžë™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "ìžë™ (640x528ì˜ ë°°ìˆ˜)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "ìžë™ (윈ë„ìš° í¬ê¸°)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "윈ë„ìš° í¬ê¸° ìžë™ ì¡°ì •" @@ -744,6 +754,18 @@ msgstr "" "\n" "확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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/WXInputBase.cpp:27 msgid "Back" msgstr "뒤로" @@ -752,8 +774,8 @@ msgstr "뒤로" msgid "Backend Settings" msgstr "백엔드 설정" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "백엔드:" @@ -787,7 +809,7 @@ msgstr "배너:" msgid "Bar" msgstr "ë°”" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "기본" @@ -799,7 +821,7 @@ msgstr "기본 설정" msgid "Bass" msgstr "ë² ì´ìŠ¤" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "블럭 할당 í…Œì´ë¸” ì²´í¬ì„¬ì„ 실패했습니다" @@ -819,8 +841,8 @@ msgstr "파랑 왼쪽" msgid "Blue Right" msgstr "파랑 오른쪽" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 msgid "Bottom" msgstr "아래" @@ -853,9 +875,9 @@ msgstr "출력 디렉토리 둘러보기" msgid "Buffer:" msgstr "버í¼:" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "버튼" @@ -871,11 +893,11 @@ msgstr "C-스틱" msgid "CPU Emulator Engine" msgstr "CPU ì—뮬레ì´í„° 엔진" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "화면표시 ëª©ë¡ ìºì‰¬" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 " @@ -890,7 +912,7 @@ msgstr "" "\n" "확신 없다면, ì´ê²ƒì„ ì²´í¬ìƒíƒœë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -904,8 +926,8 @@ msgstr "" "\n" "확신 없다면, ì–¸ì²´í¬ ìƒíƒœë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "취소" @@ -952,10 +974,10 @@ msgstr "bd: %02x:%02x:%02x:%02x:%02x:%02x ì— ì˜í•´ 위모트를 ì°¾ì„ ìˆ˜ ì—† msgid "Cant find WiiMote by connection handle %02x" msgstr "%02x ì—°ê²°í•¸ë“¤ì— ì˜í•´ 위모트를 ì°¾ì„ ìˆ˜ ì—†ìŒ." -#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "DVD_플러그ì¸ì—ì„œ ì½ì„ 수 ì—†ìŒ - DVD-ì¸í„°íŽ˜ì´ìŠ¤: ì¹˜ëª…ì  ì—러" @@ -1076,10 +1098,10 @@ msgstr "ì„œí´ ìŠ¤í‹±" msgid "Classic" msgstr "í´ëž˜ì‹" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "깨ë—ì´" @@ -1095,10 +1117,10 @@ msgstr "" "ê²Œìž„ì´ êµ¬ë™ë˜ëŠ” ì¤‘ì— í´ë¼ì´ì–¸íŠ¸ ì—°ê²°í•´ì œë¨!! ë„·í”Œë ˆì´ ë¶ˆê°€ëŠ¥. 수ë™ìœ¼ë¡œ 게임" "ì„ ì¤‘ì§€í•´ì•¼í•©ë‹ˆë‹¤." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "닫기" @@ -1202,7 +1224,7 @@ msgstr "위모트 3 ì—°ê²°" msgid "Connect Wiimote 4" msgstr "위모트 4 ì—°ê²°" -#: Source/Core/DolphinWX/Src/Main.cpp:608 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Connecting..." msgstr "연결중..." @@ -1270,7 +1292,7 @@ msgstr "" "íŒ¨ë“œë“¤ì„ ì„¤ì •í•  수 없었습니다. 플레ì´ì–´ê°€ 떠났거나 ê²Œìž„ì´ í˜„ìž¬ 구ë™ì¤‘!\n" "(ê²Œìž„ì´ êµ¬ë™ì¤‘ì¼ ë•Œ íŒ¨ë“œë“¤ì„ ì„¤ì •í•˜ê¸°ëŠ” ì•„ì§ ì§€ì›ë˜ì§€ 않습니다)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1341,11 +1363,11 @@ msgstr "만든ì´:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "ìžë¥´ê¸°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1392,8 +1414,8 @@ msgstr "오디오" msgid "DSP Emulator Engine" msgstr "DSP ì—뮬레ì´í„° 엔진" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE ì—뮬레ì´ì…˜ (빠름)" @@ -1442,7 +1464,7 @@ msgstr "ë°ë“œ ì¡´" msgid "Debug" msgstr "디버그" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Debugging" msgstr "디버깅" @@ -1475,8 +1497,8 @@ msgstr "기본 ISO:" msgid "Default font" msgstr "기본 í°íŠ¸" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "ì‚­ì œ" @@ -1484,12 +1506,12 @@ msgstr "ì‚­ì œ" msgid "Delete Save" msgstr "저장 지우기" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "기존 '%s'파ì¼ì„ 삭제합니까?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 msgid "Description" msgstr "설명" @@ -1520,15 +1542,15 @@ msgstr "장비 설정" msgid "Dial" msgstr "다ì´ì–¼" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1536,32 +1558,28 @@ msgstr "" "디렉토리 ì²´í¬ì„¬ì´ 실패했습니다\n" " 그리고 디렉토리 백업 ì²´í¬ì„¬ì´ 실패했습니다" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 msgid "Disable" msgstr "비활성" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "안개 ë”" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "ê´‘ì› ë”" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "픽셀 ê¹Šì´ ë¹„í™œì„±" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "í…스처들 ë”" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "위모트 스피커 비활성" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1575,7 +1593,7 @@ msgstr "" "\n" "확신 없다면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1589,7 +1607,7 @@ msgstr "" "í¬í•˜ë©´ 대단한 ì†ë„í–¥ìƒì„ 가져오지만 ê·¸ê²ƒì€ ê±°ì˜ í•­ìƒ ì´ìŠˆë“¤ë„ 유발합니다.\n" "확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1608,11 +1626,11 @@ msgstr "디스í¬" msgid "Disc Read Error" msgstr "ë””ìŠ¤í¬ ì½ê¸° ì—러" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "화면표시" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1626,7 +1644,7 @@ msgstr "" msgid "Divide" msgstr "나누기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Do you want to stop the current emulation?" msgstr "현재 ì—뮬레ì´ì…˜ì„ 중단하고 싶습니까?" @@ -1634,7 +1652,7 @@ msgstr "현재 ì—뮬레ì´ì…˜ì„ 중단하고 싶습니까?" msgid "Dolphin" msgstr "ëŒí•€" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "ëŒí•€ %s 그래픽 환경설정" @@ -1655,12 +1673,12 @@ msgstr "ëŒí•€ ì—ë®¬ëœ ìœ„ëª¨íŠ¸ 환경설정" msgid "Dolphin FIFO" msgstr "ëŒí•€ FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 msgid "Dolphin GCPad Configuration" msgstr "ëŒí•€ GC패드 환경설정" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 msgid "Dolphin TAS Movies (*.dtm)" msgstr "ëŒí•€ TAS ë™ì˜ìƒ (*.dtm)" @@ -1688,8 +1706,8 @@ msgstr "" "ëŒí•€ì´ 현재 모든 ê²Œìž„ë“¤ì„ ìˆ¨ê¸°ê²Œ 설정ë¨. 모든 ê²Œìž„ë“¤ì„ ë³´ë ¤ë©´ 여기를 ë”블í´" "릭..." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "아래" @@ -1714,19 +1732,19 @@ msgstr "ë”미" msgid "Dump Audio" msgstr "오디오 ë¤í”„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "EFB 타겟 ë¤í”„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "프레임들 ë¤í”„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "í…스처들 ë¤í”„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1736,7 +1754,7 @@ msgstr "" "\n" "확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1746,7 +1764,7 @@ msgstr "" "\n" "확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1756,9 +1774,9 @@ msgstr "" "\n" "확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "네ëœëž€ë“œì–´" @@ -1766,7 +1784,7 @@ msgstr "네ëœëž€ë“œì–´" msgid "E&xit" msgstr "종료(&x)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" msgstr "EFB 복사" @@ -1819,7 +1837,7 @@ msgstr "편집..." msgid "Effect" msgstr "효과" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "내장형 프레임 버í¼" @@ -1827,7 +1845,7 @@ msgstr "내장형 프레임 버í¼" msgid "Emu Thread already running" msgstr "ì—뮬 쓰레드가 ì´ë¯¸ 구ë™ì¤‘ìž„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1841,7 +1859,7 @@ msgstr "" "\n" "확신 없다면, ëŒ€ì‹ ì— \"ê°€ìƒ XFB ì—뮬레ì´ì…˜\"ì„ ì²´í¬í•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1869,7 +1887,7 @@ msgstr "ì—뮬레ì´ì…˜ ìƒíƒœ:" msgid "Enable" msgstr "활성" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1901,6 +1919,10 @@ msgstr "BAT 활성" msgid "Enable Block Merging" msgstr "ë¸”ë¡ í•©ì¹˜ê¸° 활성" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +msgid "Enable Cache" +msgstr "ìºì‰¬ 활성" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "치트 활성" @@ -1917,7 +1939,7 @@ msgstr "듀얼 코어 활성" msgid "Enable Dual Core (speedup)" msgstr "듀얼 코어 활성 (ì†ë„ìƒìŠ¹)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "단축키 활성(그래픽 컨트롤)" @@ -1933,8 +1955,8 @@ msgstr "ì•„ì´ë“¤ 스킵 활성 (ì†ë„ìƒìŠ¹)" msgid "Enable MMU" msgstr "MMU 활성" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "프로그레시브 스캔 활성" @@ -1946,7 +1968,7 @@ msgstr "스í¬ë¦° 세ì´ë²„ 활성" msgid "Enable WideScreen" msgstr "와ì´ë“œìŠ¤í¬ë¦° 활성" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "와ì´ì–´í”„레임 활성" @@ -2038,7 +2060,7 @@ msgid "" "OFF = Fast)" msgstr "ì¼ë¶€ ê²Œìž„ë“¤ì— í•„ìš”í•œ 메모리 관리 유닛 활성. (켬 = 호환성, ë” = 빠름)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2052,14 +2074,14 @@ msgstr "" msgid "End" msgstr "ë" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "ì˜ì–´" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "í–¥ìƒ" @@ -2081,13 +2103,13 @@ msgstr "엔트리 1/%d" msgid "Equal" msgstr "ê°™ìŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "ì—러" -#: Source/Core/DolphinWX/Src/Main.cpp:356 +#: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "ì„ íƒëœ 언어 로딩 ì—러. 시스템 기본으로 ëŒì•„갑니다." @@ -2161,7 +2183,7 @@ msgstr "ì €ìž¥ì„ ë‹¤ë¥¸ ì´ë¦„으로 내보내기..." msgid "Extension" msgstr "확장" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "외부 프레임 버í¼" @@ -2282,7 +2304,7 @@ msgstr "hid.dll ë¡œë“œì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" msgid "Failed to read banner.bin" msgstr "banner.bin ì½ê¸°ì— 실패했습니다" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2290,7 +2312,7 @@ msgstr "" "블럭 할당 í…Œì´ë¸” ë°±ì—…ì„ ì˜¬ë°”ë¥´ê²Œ ì½ê¸°ì— 실패했습니다\n" "(0x8000-0x9FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2303,7 +2325,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "%d 파ì¼ë¡œ 부터 ë°ì´í„° ì½ê¸° 실패" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2311,7 +2333,7 @@ msgstr "" "디렉토리 ë°±ì—…ì„ ì˜¬ë°”ë¥´ê²Œ ì½ê¸°ì— 실패했습니다\n" "(0x4000-0x5FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2319,7 +2341,7 @@ msgstr "" "디렉토리를 올바르게 ì½ê¸°ì— 실패했습니다\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2327,7 +2349,7 @@ msgstr "" "í•´ë”를 올바르게 ì½ê¸°ì— 실패했습니다\n" "(0x0000-0x1FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2359,6 +2381,14 @@ msgstr "%s ì— ëŒ€í•œ í—¤ë” ì“°ê¸°ì— ì‹¤íŒ¨" msgid "Failed to write header for file %d" msgstr "%d 파ì¼ì— 대한 í—¤ë” ì“°ê¸°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "빠름" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "빠른 밉맵" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMUì˜ ë¹ ë¥¸ 버전. 모든 ê²Œìž„ì— ëŒ€í•´ ìž‘ë™í•˜ì§€ëŠ” 않는다." @@ -2387,7 +2417,7 @@ msgstr "" "파ì¼ì„ ì—´ 수 없었습니다\n" "í˜¹ì€ ì í•©í•œ 확장ìžê°€ 아닙니다" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2425,11 +2455,11 @@ msgstr "첫번째 블럭" msgid "Fix Checksums" msgstr "ì²´í¬ì„¬ë“¤ 고침" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "ê°•ì œ 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "ê°•ì œ 4:3" @@ -2437,11 +2467,11 @@ msgstr "ê°•ì œ 4:3" msgid "Force Console as NTSC-J" msgstr "ì½˜ì†”ì„ NTSC-Jë¡œ 강제시킴" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" msgstr "ê°•ì œ í…스처 í•„í„°ë§" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2475,7 +2505,7 @@ msgstr "" "언체í¬ë¡œ ë‘ë©´, ëŒí•€ ê¸°ë³¸ì€ NTSC-U ì´ê³  ì¼ë³¸ ê²Œìž„ë“¤ì„ í”Œë ˆì´í•  ë•Œ ìžë™ì ìœ¼ë¡œ " "ì´ ì„¸íŒ…ì´ í™œì„±í™”ë©ë‹ˆë‹¤." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2500,7 +2530,7 @@ msgstr "프레임" msgid "Frame Advance" msgstr "프레임 진행" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "프레임 ë¤í”„ê°€ FFV1를 사용" @@ -2520,13 +2550,13 @@ msgstr "프레임제한:" msgid "Frames To Record" msgstr "녹화할 프레임" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "ìžìœ ë¡œìš´ 보기" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "프랑스어" @@ -2543,7 +2573,7 @@ msgstr "From" msgid "FullScr" msgstr "전체화면" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 msgid "Fullscreen resolution:" msgstr "전체화면 í•´ìƒë„:" @@ -2587,8 +2617,8 @@ msgstr "게임í브" msgid "Gamecube &Pad Settings" msgstr "게임í브 패드 설정(&P)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "게임í브 메모리 카드들 (*.raw,*.gcp)" @@ -2610,9 +2640,9 @@ msgstr "" "Gecko코드가 (CT%i CST%i) (%s) 구ë™ì— 실패했습니다\n" "(ìž˜ëª»ëœ ì½”ë“œì´ê±°ë‚˜ 코드 íƒ€ìž…ì´ ì•„ì§ ì§€ì›ì•Šëœë‹¤.)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "ì¼ë°˜" @@ -2620,9 +2650,9 @@ msgstr "ì¼ë°˜" msgid "General Settings" msgstr "ì¼ë°˜ 설정" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "ë…ì¼ì–´" @@ -2643,11 +2673,14 @@ msgstr "그래픽 설정" msgid "Greater Than" msgstr "보다 í°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#, fuzzy msgid "" -"Greatly increases quality of textures generated using render-to-texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2680,11 +2713,11 @@ msgstr "기타" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRYê°€ 호출ë¨, 보고해주세요!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "핵" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "í—¤ë” ì²´í¬ì„¬ 실패했습니다" @@ -2721,7 +2754,7 @@ msgstr "" msgid "Hide" msgstr "숨김" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "마우스 커서 숨김" @@ -2748,8 +2781,8 @@ msgstr "호스트" msgid "Hotkey Configuration" msgstr "단축키 설정" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 msgid "Hotkeys" msgstr "단축키들" @@ -2832,11 +2865,11 @@ msgstr "" "í”„ë ˆìž„ì œí•œì„ ê²Œìž„ í’€ 스피드 (NTSC:60, PAL:50)보다 ë” ë†’ê²Œ 설정하면, DSPì—ì„œ " "오디오 ë³‘ëª©ë„ êº¼ì•¼ ê·¸ê²ƒì´ íš¨ê³¼ë¥¼ 냅니다." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" msgstr "í¬ë©§ ë³€ê²½ë“¤ì„ ë¬´ì‹œ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2850,7 +2883,7 @@ msgstr "" "\n" "확신 없다면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 " @@ -2892,7 +2925,7 @@ msgstr "" "가져온 파ì¼ì´ sav 확장ìžë¥¼ 지닌다\n" "하지만 올바른 í•´ë”를 지니지 않는다" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2903,7 +2936,7 @@ msgstr "" "발합니다.\n" "확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -2921,8 +2954,8 @@ msgstr "게임안" msgid "In-Game" msgstr "게임-안" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "ì •ë³´" @@ -2965,7 +2998,7 @@ msgstr "" "InstallExceptionHandler 호출ë¨, 하지만 ì´ í”Œëž«í¼ì€ ì•„ì§ ê·¸ê²ƒì„ ì§€ì›í•˜ì§€ 않습" "니다." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 msgid "Installing WAD..." msgstr "WAD 설치하기..." @@ -2994,7 +3027,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "내부 LZO ì—러 - lzo_init() 실패했습니다" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 msgid "Internal Resolution:" msgstr "내부 í•´ìƒë„:" @@ -3047,9 +3080,9 @@ msgstr "비ì í•© ê¸°ë¡ íŒŒì¼" msgid "Invalid state" msgstr "비ì í•© ìƒíƒœ" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "ì´íƒˆë¦¬ì•„ì–´" @@ -3110,8 +3143,8 @@ msgstr "마지막 ë®ì–´ì¨ì§„ ìƒíƒœ" msgid "Last Saved State" msgstr "마지막 ì €ìž¥ëœ ìƒíƒœ" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "왼쪽" @@ -3157,7 +3190,7 @@ msgstr "FPSë¡œ 제한" msgid "Load" msgstr "로드" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Load Custom Textures" msgstr "커스텀 í…스처 로드" @@ -3197,16 +3230,16 @@ msgstr "슬롯8 ìƒíƒœ 로드" msgid "Load State..." msgstr "ìƒíƒœ 로드..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Load Wii System Menu" msgstr "Wii 시스템 메뉴 로드" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 #, 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:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3248,8 +3281,8 @@ msgstr "로그 타입" msgid "Logger Outputs" msgstr "로거 출력" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "로깅" @@ -3283,8 +3316,8 @@ msgstr "MMU 스피드 핵" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz ê²Œìž„ìƒ¤í¬ íŒŒì¼ë“¤(*.gcs)" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "ë©”ì¸ ìŠ¤í‹±" @@ -3313,8 +3346,8 @@ msgstr "메모리카드가 ì´ë¯¸ ì—´ë ¤ì§" msgid "Memory Byte" msgstr "메모리 ë°”ì´íŠ¸" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 msgid "Memory Card" msgstr "메모리 ì¹´ë“œ" @@ -3343,7 +3376,7 @@ msgstr "" "%së¡œ\n" "ì˜¤ëž˜ëœ íŒŒì¼ì„ ì´ ìƒˆë¡œìš´ 위치로 복사하고 싶습니까?\n" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "" @@ -3360,7 +3393,7 @@ msgstr "마ì´í¬" msgid "Min" msgstr "최소값" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "기타" @@ -3373,7 +3406,7 @@ msgstr "기타 설정" msgid "Modifier" msgstr "수정ìž" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3398,7 +3431,7 @@ msgstr "모션 플러스" msgid "Motor" msgstr "모터" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3512,9 +3545,9 @@ msgstr "NP 탭" msgid "NP Up" msgstr "NP 위" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "ì´ë¦„:" @@ -3599,7 +3632,7 @@ msgstr "같지 ì•ŠìŒ" msgid "Not Set" msgstr "설정 안함" -#: Source/Core/DolphinWX/Src/Main.cpp:607 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Not connected" msgstr "ì—°ê²°ë˜ì§€ ì•ŠìŒ" @@ -3628,8 +3661,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "코드 번호:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "눈처í¬" @@ -3658,8 +3691,8 @@ msgstr "오프셋:" msgid "Only %d blocks available" msgstr "%d 블럭들만 유용한" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Open" msgstr "열기" @@ -3689,11 +3722,11 @@ msgstr "OpenAL: 사운드 ìž¥ì¹˜ë“¤ì„ ì°¾ì„ ìˆ˜ ì—†ìŒ" msgid "OpenAL: can't open device %s" msgstr "OpenAL: %s 장치를 ì—´ 수 ì—†ìŒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "OpenCL í…스처 디코ë”" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "OpenMP í…스처 디코ë”" @@ -3721,8 +3754,8 @@ msgid "" "and import the the saves to a new memcard\n" msgstr "íŒŒì¼ ë””ë ‰í† ë¦¬ì•ˆì— íŒŒì¼ì˜ 순서가 블럭 순서와 맞지 않습니다\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "다른 것들" @@ -3787,13 +3820,13 @@ msgstr "패치" msgid "Paths" msgstr "경로" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "ì¼ì‹œì •ì§€" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Per-Pixel Lighting" msgstr "픽셀단위 ê´‘ì›" @@ -3806,10 +3839,10 @@ msgstr "완벽한" msgid "Perspective %d" msgstr "ê´€ì  %d" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 msgid "Play" msgstr " 실행 " @@ -3833,7 +3866,7 @@ msgstr "ìž¬ìƒ ì˜µì…˜" msgid "Players" msgstr "플레ì´ì–´" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 msgid "Please confirm..." msgstr "확ì¸í•´ì£¼ì„¸ìš”..." @@ -3878,7 +3911,7 @@ msgstr "í¬ë¥´íˆ¬ê°ˆì–´" msgid "Portuguese (Brazilian)" msgstr "í¬ë¥´íˆ¬ê°ˆì–´ (브ë¼ì§ˆ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "후-처리 효과:" @@ -3937,7 +3970,7 @@ msgstr "R 버튼" msgid "R-Analog" msgstr "R-아날로그" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "램" @@ -3953,7 +3986,7 @@ msgstr "범위" msgid "Read-only mode" msgstr "ì½ê¸°-ì „ìš© 모드" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "실제" @@ -4014,9 +4047,9 @@ msgstr "" "\n" "확신 없다면, ì—†ìŒì„ ì„ íƒí•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "갱신" @@ -4028,14 +4061,14 @@ msgstr "ëª©ë¡ ìƒˆë¡œ 고침" msgid "Refresh game list" msgstr "게임 ëª©ë¡ ìƒˆë¡œ 고침" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Remove" msgstr "제거" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4045,12 +4078,12 @@ msgstr "" "\n" "확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "ë©”ì¸ ìœˆë„ìš°ì— ë Œë”" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "리셋" @@ -4062,8 +4095,8 @@ msgstr "ê²°ê³¼" msgid "Return" msgstr "Enter" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "오른쪽" @@ -4088,13 +4121,17 @@ msgstr "러시아어" msgid "Sa&ve State" msgstr "ìƒíƒœ 저장(&v) " +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "안전" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "샘플율:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "저장" @@ -4160,6 +4197,10 @@ msgstr "압축풀린 GCM/ISO를 저장" msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "%s ì˜ìƒ ìƒíƒœì €ìž¥ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤, ì˜ìƒ ê¸°ë¡ ì¤‘ì§€..." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +msgid "Scaled EFB Copy" +msgstr "스케ì¼ëœ EFB 복사" + #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format msgid "Scanning %s" @@ -4195,17 +4236,17 @@ msgstr "하위í´ë”들 찾기" msgid "Section %s not found in SYSCONF" msgstr "섹션 %s를 SYSCONFì—ì„œ ì°¾ì„ ìˆ˜ ì—†ìŒ" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "ì„ íƒ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "ê¸°ë¡ íŒŒì¼ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 msgid "Select a Wii WAD file to install" msgstr "설치할 Wii WAD íŒŒì¼ ì„ íƒ" @@ -4231,15 +4272,15 @@ msgstr "유ë™ì ì¸ 윈ë„우즈 ì„ íƒ" msgid "Select the file to load" msgstr "로드할 íŒŒì¼ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Select the save file" msgstr "저장 파ì¼ì„ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "로드할 ìƒíƒœ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "Select the state to save" msgstr "저장할 ìƒíƒœ ì„ íƒ" @@ -4376,11 +4417,11 @@ msgstr "툴바 표시(&T)" msgid "Show Drives" msgstr "ë“œë¼ì´ë¸Œ 표시" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "EFB 복사 ì˜ì—­" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "FPS 보기" @@ -4392,7 +4433,7 @@ msgstr "프랑스" msgid "Show GameCube" msgstr "게임í브" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "ìž…ë ¥ 표시 보기" @@ -4428,7 +4469,7 @@ msgstr "í”Œëž«í¼ í‘œì‹œ" msgid "Show Regions" msgstr "지역 표시" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "통계들" @@ -4482,7 +4523,7 @@ msgstr "저장 ì•„ì´ì½˜ 보기" msgid "Show save title" msgstr "저장 타ì´í‹€ 보기" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4501,7 +4542,7 @@ msgstr "ì´ ë„움 메시지 보기" msgid "Show unknown" msgstr "알려지지 ì•ŠìŒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -4527,15 +4568,15 @@ msgstr "í¬ê¸°" msgid "Skip BIOS" msgstr "ë°”ì´ì˜¤ìŠ¤ 스킵" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "목ì ì§€. 알파 패스 스킵" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "CPUë¡œ 부터 EFB 엑세스를 스킵" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4547,6 +4588,22 @@ msgstr "" "\n" "확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"ì—뮬레ì´ì…˜ 정확ë„를 만족시킴으로 \"EFB를 ëž¨ì— ë³µì‚¬\"를 조금 ì†ë„í–¥ìƒì‹œí‚µë‹ˆ" +"다.\n" +"때때로 비주얼 í€„ë¦¬í‹°ë„ í–¥ìƒì‹œí‚µë‹ˆë‹¤.\n" +"ì–´ëŠ ì´ìŠˆë¥¼ 겪는다면, í…스처 ìºì‰¬ 정확ë„를 올려보거나 ì´ ì˜µì…˜ì„ ë„세요.\n" +"\n" +"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4598,9 +4655,9 @@ msgstr "사운드 ë²„í¼ ìƒì„± 실패했습니다: %s" msgid "Space" msgstr "스페ì´ìŠ¤" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "스페ì¸ì–´" @@ -4608,7 +4665,7 @@ msgstr "스페ì¸ì–´" msgid "Speaker Volume:" msgstr "스피커 볼륨:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 " @@ -4644,9 +4701,9 @@ msgstr "스퀘어 스틱" msgid "Standard Controller" msgstr "표준 컨트롤러" +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "시작" @@ -4674,14 +4731,27 @@ msgstr "ìƒíƒœ 저장" msgid "Stick" msgstr "스틱" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "중지" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" +"GPU í…스처 오브ì íŠ¸ì•ˆì˜ EFB ë³µì‚¬ë“¤ì„ ë‹´ìŠµë‹ˆë‹¤.\n" +"ì´ê²ƒì€ 그렇게 정확하지는 않습니다. 하지만 ëŒ€ë¶€ë¶„ì˜ ê²Œìž„ì—ì„œ 충분히 잘 ìž‘ë™í•˜" +"ê³  \"ëž¨ì— EFB\"를 넘는 대단한 ì†ë„í–¥ìƒì„ ì¤ë‹ˆë‹¤.\n" +"확신 없다면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "윈ë„ìš°ë¡œ 늘림" @@ -4715,8 +4785,8 @@ msgstr "시스템 언어:" msgid "TAIWAN" msgstr "타ì´ì™„" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS ìž…ë ¥" @@ -4736,9 +4806,9 @@ msgstr "í…Œì´ë¸” 왼쪽" msgid "Table Right" msgstr "í…Œì´ë¸” 오른쪽" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "스í¬ë¦°ìƒ· ì°ê¸°" @@ -4746,7 +4816,15 @@ msgstr "스í¬ë¦°ìƒ· ì°ê¸°" msgid "Test" msgstr "테스트" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "í…스처" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +msgid "Texture Cache" +msgstr "í…스처 ìºì‰¬" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" msgstr "í…스처 í¬ë©§ 오버레ì´" @@ -4791,7 +4869,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:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "ë‹¹ì‹ ì´ ê¸°ìˆ í•œ íŒŒì¼ (%s)는 존재하지 않습니다" @@ -4808,11 +4886,22 @@ msgstr "ì´ë¥¸ì€ ',' 문ìžë¥¼ í¬í•¨í•  수 없습니다" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "í•´ë…ëœ AR 코드 결과가 없습니다." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +msgstr "" +"ì´ê²ƒì„ 안전하게 ì •í•  수ë¡, ì—뮬레ì´í„°ê°€ 램으로 부터 í…스처 ì—…ë°ì´íŠ¸ë“¤ì„ ëœ ë†“" +"치는 ê²½í–¥ì´ ìžˆìŠµë‹ˆë‹¤.\n" +"확신 없다면, 오른쪽ì—ì„œ ë‘번째-ê°€ìž¥ë¹ ë¦„ì„ ì‚¬ìš©í•˜ì„¸ìš”." + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" msgstr "ë‹¹ì‹ ì´ ë³µì‚¬í•˜ë ¤ëŠ” ì €ìž¥ì€ ë¹„ì í•© íŒŒì¼ í¬ê¸°ìž…니다." -#: Source/Core/DolphinWX/Src/Main.cpp:363 +#: Source/Core/DolphinWX/Src/Main.cpp:353 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4881,7 +4970,7 @@ msgstr "" 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:119 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. " @@ -4955,13 +5044,13 @@ msgstr "To" msgid "Toggle All Log Types" msgstr "모든 로그 타입 토글" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "전체화면 토글" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Top" msgstr "위" @@ -4969,7 +5058,7 @@ msgstr "위" msgid "Traditional Chinese" msgstr "전통 중국어" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "알려지지 ì•Šì€ íŒŒì¼ íƒ€ìž…ì„ ë¡œë“œì‹œë„했다." @@ -5005,8 +5094,8 @@ msgstr "타입" msgid "UDP Port:" msgstr "UDP í¬íŠ¸:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "UDP 위모트" @@ -5078,8 +5167,8 @@ msgstr "" "알려지지 ì•Šì€ í¬ì¸í„° %#08x\n" "계ì†í•©ë‹ˆê¹Œ?" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "위" @@ -5096,7 +5185,7 @@ msgstr "ì—…ë¼ì´íŠ¸ 위모트" msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 모드 (PAL60) 사용" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 msgid "Use Fullscreen" msgstr "전체화면 사용" @@ -5108,7 +5197,7 @@ msgstr "16진수 사용" msgid "Use Panic Handlers" msgstr "패닉 핸들러 사용" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5120,7 +5209,7 @@ msgstr "" "\n" "확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5134,11 +5223,11 @@ msgstr "" "\n" "확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "유틸리티" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "수ì§-ë™ê¸°í™”" @@ -5162,8 +5251,7 @@ msgstr "ìƒì„¸ì„¤ëª…" msgid "Video" msgstr "비디오" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "ê°€ìƒ" @@ -5190,21 +5278,21 @@ msgstr "" "\n" "확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "경고" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 msgid "Warning - starting DOL in wrong console mode!" msgstr "경고 - ìž˜ëª»ëœ ì½˜ì†” 모드ì—ì„œ DOLì„ ì‹œìž‘!" -#: Source/Core/Core/Src/Boot/Boot.cpp:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "경고 - ìž˜ëª»ëœ ì½˜ì†” 모드ì—ì„œ ELF 시작!" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "경고 - ìž˜ëª»ëœ ì½˜ì†” 모드ì—ì„œ ISO 시작!" @@ -5241,7 +5329,7 @@ msgstr "WaveFileWriter - 파ì¼ì´ 열리지 않습니다." msgid "Whammy" msgstr "훼미" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "와ì´ë“œìŠ¤í¬ë¦° 핵" @@ -5265,7 +5353,7 @@ msgstr "Wii NAND 루트:" msgid "Wii Save Import" msgstr "Wii 저장 가져오기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 저장 파ì¼ë“¤ (*.bin)|*.bin" @@ -5273,8 +5361,8 @@ msgstr "Wii 저장 파ì¼ë“¤ (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: 파ì¼ë¡œ 부터 ì½ì„ 수 없었습니다" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "위모트" @@ -5296,7 +5384,7 @@ msgstr "" "í˜¹ì€ ì•„ë§ˆë„ ì•„ì´ë“¤ 타임 아웃ì´ê±°ë‚˜ 다른 ì›ì¸ ë•Œë¬¸ì¸ ê²ƒ 같습니다.\n" "ë‹¹ì‹ ì€ ì¦‰ì‹œ 재연결 하고 싶습니까?" -#: Source/Core/DolphinWX/Src/Main.cpp:609 +#: Source/Core/DolphinWX/Src/Main.cpp:599 msgid "Wiimote Connected" msgstr "위모트가 ì—°ê²°ë¨" @@ -5329,7 +5417,7 @@ msgstr "윈ë„우즈 오른쪽" msgid "Word Wrap" msgstr "ìžë™ 줄바꿈" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5433,7 +5521,7 @@ msgstr "ëŒí•€ì— 알려지지 ì•Šì€ Zero 코드: %08x" msgid "[ waiting ]" msgstr "[ 대기 ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5449,7 +5537,7 @@ msgstr "" msgid "[Custom]" msgstr "[ì‚¬ìš©ìž ì§€ì •]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5467,7 +5555,7 @@ msgstr "" "\n" "확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5567,9 +5655,6 @@ msgstr "| OR" #~ msgid "AOSound" #~ msgstr "AOSound" -#~ msgid "Accuracy:" -#~ msgstr "정확성:" - #~ msgid "Accurate Texture Cache" #~ msgstr "정확한 í…스처 ìºì‰¬" @@ -5605,17 +5690,6 @@ 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 파ì¼ì´ë¦„" @@ -5678,6 +5752,9 @@ msgstr "| OR" #~ msgid "Danish" #~ msgstr "ë´ë§ˆí¬ì–´" +#~ msgid "Disable Wiimote Speaker" +#~ msgstr "위모트 스피커 비활성" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -5741,9 +5818,6 @@ msgstr "| OR" #~ msgid "Enable CPU Access" #~ msgstr "CPU 엑세스 활성" -#~ msgid "Enable Cache" -#~ msgstr "ìºì‰¬ 활성" - #~ msgid "Enable Copy to EFB" #~ msgstr "EFBì— ë³µì‚¬ 활성" @@ -5820,12 +5894,6 @@ msgstr "| OR" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "DSP 롬: %s ë¡œë“œì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" -#~ msgid "Fast" -#~ msgstr "빠름" - -#~ msgid "Fast Mipmaps" -#~ msgstr "빠른 밉맵" - #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -5987,15 +6055,9 @@ msgstr "| OR" #~ msgid "Running script...\n" #~ msgstr "스í¬ë¦½íŠ¸ 구ë™ì¤‘...\n" -#~ msgid "Safe" -#~ msgstr "안전" - #~ msgid "Scale:" #~ msgstr "스케ì¼:" -#~ msgid "Scaled EFB Copy" -#~ msgstr "스케ì¼ëœ EFB 복사" - #~ msgid "Select resolution for fullscreen mode" #~ msgstr "전체화면 ëª¨ë“œì— ëŒ€í•œ í•´ìƒë„ ì„ íƒ" @@ -6048,21 +6110,6 @@ msgstr "| OR" #~ msgid "Skies of Arcadia" #~ msgstr "Skies of Arcadia" -#~ 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" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "ì—뮬레ì´ì…˜ 정확ë„를 만족시킴으로 \"EFB를 ëž¨ì— ë³µì‚¬\"를 조금 ì†ë„í–¥ìƒì‹œí‚µë‹ˆ" -#~ "다.\n" -#~ "때때로 비주얼 í€„ë¦¬í‹°ë„ í–¥ìƒì‹œí‚µë‹ˆë‹¤.\n" -#~ "ì–´ëŠ ì´ìŠˆë¥¼ 겪는다면, í…스처 ìºì‰¬ 정확ë„를 올려보거나 ì´ ì˜µì…˜ì„ ë„세요.\n" -#~ "\n" -#~ "확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." - #~ msgid "Slot" #~ msgstr "슬롯" @@ -6100,37 +6147,9 @@ msgstr "| OR" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "풀스í¬ë¦° 모드ì—ì„œ 윈ë„ìš° ë Œë”ë§ ì‹œìž‘" -#~ 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" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "GPU í…스처 오브ì íŠ¸ì•ˆì˜ EFB ë³µì‚¬ë“¤ì„ ë‹´ìŠµë‹ˆë‹¤.\n" -#~ "ì´ê²ƒì€ 그렇게 정확하지는 않습니다. 하지만 ëŒ€ë¶€ë¶„ì˜ ê²Œìž„ì—ì„œ 충분히 잘 ìž‘ë™" -#~ "하고 \"ëž¨ì— EFB\"를 넘는 대단한 ì†ë„í–¥ìƒì„ ì¤ë‹ˆë‹¤.\n" -#~ "확신 없다면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." - -#~ msgid "Texture" -#~ msgstr "í…스처" - -#~ msgid "Texture Cache" -#~ msgstr "í…스처 ìºì‰¬" - #~ msgid "The file " #~ msgstr "ê·¸ 파ì¼" -#~ msgid "" -#~ "The safer you adjust this, the less likely the emulator will be missing " -#~ "any texture updates from RAM.\n" -#~ "\n" -#~ "If unsure, use the second-fastest value from the right." -#~ msgstr "" -#~ "ì´ê²ƒì„ 안전하게 ì •í•  수ë¡, ì—뮬레ì´í„°ê°€ 램으로 부터 í…스처 ì—…ë°ì´íŠ¸ë“¤ì„ " -#~ "ëœ ë†“ì¹˜ëŠ” ê²½í–¥ì´ ìžˆìŠµë‹ˆë‹¤.\n" -#~ "확신 없다면, 오른쪽ì—ì„œ ë‘번째-ê°€ìž¥ë¹ ë¦„ì„ ì‚¬ìš©í•˜ì„¸ìš”." - #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "ì´ê²ƒì€ 보통 ìŒì„±ê³¼ 소리 효과들 재ìƒì— 사용ëœë‹¤." diff --git a/Languages/po/nb.po b/Languages/po/nb.po index d9f9df8285..6f1bd324ac 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: 2011-08-10 08:30-0500\n" +"POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-06-06 20:15+0100\n" "Last-Translator: Knut \n" "Language-Team: Norwegian \n" @@ -33,7 +33,7 @@ msgstr "Spill :" msgid "! NOT" msgstr "! IKKE" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -75,7 +75,7 @@ msgstr "%s eksisterer allerede. Overskriv?" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s mislykket i Ã¥ skrubbe. Sannsynligvis er bildefilen korrupt." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, fuzzy, c-format msgid "" "%s failed to load as a memorycard \n" @@ -84,7 +84,7 @@ msgstr "" "Minnekort mislyktes i Ã¥ lastes\n" " Kortstørrelse er ugyldig (%04X)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, fuzzy, c-format msgid "" "%s failed to load as a memorycard \n" @@ -93,7 +93,7 @@ msgstr "" "Minnekort mislyktes i Ã¥ lastes\n" " Kortstørrelse er ugyldig (%04X)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -307,7 +307,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(UKJENT)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(av)" @@ -319,7 +319,7 @@ msgstr "16-bit" msgid "32 bit" msgstr "32-bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "3D Vision" @@ -331,7 +331,7 @@ msgstr "8-bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "" @@ -418,18 +418,22 @@ msgstr "Om Dolphin" msgid "Acceleration" msgstr "Aksellerasjon" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "Nøyaktighet:" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "Nøyaktig VBeam-emulering" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 #, fuzzy msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" "Nøyaktig emuler EFB-kopier.\n" "Noen spill krever dette for visse grafiske effekter eller gameplay-" @@ -528,12 +532,12 @@ msgstr "Action Replay: Normal Kode %i: ugyldig Sub-type %08x (%s)" 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:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "Adapter:" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "Legg Til" @@ -549,9 +553,9 @@ msgstr "Legg til Patch" msgid "Add new pane" msgstr "Legg til ny rute" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "Legg til..." @@ -599,7 +603,7 @@ 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:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "Avansert" @@ -619,8 +623,8 @@ msgstr "Alle GC/Wii-bildefiler (gcm, iso, ciso, wad)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle GameCube GCM-filer (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "All Save States (sav, s##)" msgstr "Alle Save States (sav, s##)" @@ -636,7 +640,7 @@ msgstr "Alle komprimerte GC/Wii-filer (gcz)" msgid "All files (*.*)|*.*" msgstr "Alle filer (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -648,11 +652,16 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Emulert Wiimote" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" msgstr "Anisotropisk Filtrering:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "Kantutjevning:" @@ -674,7 +683,7 @@ msgstr "Applikasjonslaster:" msgid "Apply" msgstr "Bruk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -708,7 +717,7 @@ msgstr "" "Den vil bli borte for alltid!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspektforhold:" @@ -729,19 +738,19 @@ msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Feil ved Ã¥pning av AO-device.\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Multiplum av 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "Automatisk (Vindusstørrelse):" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "Automatisk juster Vindusstørrelse" @@ -755,6 +764,18 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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/WXInputBase.cpp:27 msgid "Back" msgstr "Tilbake" @@ -763,8 +784,8 @@ msgstr "Tilbake" msgid "Backend Settings" msgstr "Backend-innstillinger" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Backend:" @@ -798,7 +819,7 @@ msgstr "Banner:" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "Grunnleggende" @@ -810,7 +831,7 @@ msgstr "Grunnleggende Innstillinger" msgid "Bass" msgstr "Bass" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Blokkallokasjontabellsjekksum feilet" @@ -830,8 +851,8 @@ msgstr "BlÃ¥ Venstre" msgid "Blue Right" msgstr "BlÃ¥ Høyre" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 msgid "Bottom" msgstr "Bunn" @@ -864,9 +885,9 @@ msgstr "Bla etter lagringssted" msgid "Buffer:" msgstr "Buffer:" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "Knapper" @@ -883,11 +904,11 @@ msgstr "C-joystick" msgid "CPU Emulator Engine" msgstr "CPU-emulatormotor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "Cacher Display-lister" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 " @@ -902,7 +923,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ pÃ¥." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -916,8 +937,8 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Avbryt" @@ -964,10 +985,10 @@ msgstr "Kan ikke finne Wiimote med bd: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Kan ikke finne Wiimote med tilkoblingshandler %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Kan ikke lese fra DVD_Plugin - DVD-Interface: Fatal Feil" @@ -1089,10 +1110,10 @@ msgstr "Sirkel-joystick" msgid "Classic" msgstr "Klassisk" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "Tøm" @@ -1108,10 +1129,10 @@ msgstr "" "Klientfrakobling mens spillet kjørte!! NetPlay er slÃ¥tt av. Du mÃ¥ manuelt " "stoppe spillet." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Lukk" @@ -1215,7 +1236,7 @@ msgstr "Koble til Wiimote 3" msgid "Connect Wiimote 4" msgstr "Koble til Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:608 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Connecting..." msgstr "Kobler til..." @@ -1284,7 +1305,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:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1353,11 +1374,11 @@ msgstr "Skaper:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "Krum" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1404,8 +1425,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "CPU Emulatormotor" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE-emulering (raskt)" @@ -1454,7 +1475,7 @@ msgstr "Dødsone" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Debugging" msgstr "Debugging" @@ -1487,8 +1508,8 @@ msgstr "Standard-ISO:" msgid "Default font" msgstr "Standard tekst-font" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "Slett" @@ -1496,12 +1517,12 @@ msgstr "Slett" msgid "Delete Save" msgstr "Slett Lagringsfil" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "Slett den eksiterende filen '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 msgid "Description" msgstr "Beskrivelse" @@ -1532,15 +1553,15 @@ msgstr "Innstillinger for device" msgid "Dial" msgstr "" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1548,32 +1569,28 @@ msgstr "" "Mappestisjekksum misyktes\n" " og mappesti backup-sjekksummen mislyktes" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 msgid "Disable" msgstr "Deaktiver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "Deaktiver tÃ¥ke (fog)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "Deaktiver lyseffekter" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "Deaktiver Per-Pikseldybde" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "Deaktiver teksturer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "Deaktiver Wiimote-høytaler" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1587,7 +1604,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ pÃ¥." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1603,7 +1620,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1622,11 +1639,11 @@ msgstr "Disk" msgid "Disc Read Error" msgstr "Feil ved lesing av disk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "Visning" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1640,7 +1657,7 @@ msgstr "" msgid "Divide" msgstr "Del" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Do you want to stop the current emulation?" msgstr "Vil du stoppe pÃ¥gÃ¥ende emulering?" @@ -1648,7 +1665,7 @@ msgstr "Vil du stoppe pÃ¥gÃ¥ende emulering?" msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafikkinstillinger" @@ -1669,12 +1686,12 @@ msgstr "Dolphin Emulert Wiimote Konfigurasjon" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC-kontroll konfigurasjon" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS-Filmer (*.dtm)" @@ -1702,8 +1719,8 @@ msgstr "" "Dolphin er satt til Ã¥ gjemme alle spill. Dobbeltklikk her for Ã¥ vise alle " "spill..." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Ned" @@ -1728,19 +1745,19 @@ msgstr "Juksedukke" msgid "Dump Audio" msgstr "Dump Audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "Dump EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "Skjermdumping" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "Dump teksturer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1750,7 +1767,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1760,7 +1777,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1770,9 +1787,9 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "Nederlansk" @@ -1780,7 +1797,7 @@ msgstr "Nederlansk" msgid "E&xit" msgstr "&Avslutt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" msgstr "EFB-kopier" @@ -1833,7 +1850,7 @@ msgstr "Endre..." msgid "Effect" msgstr "Effekt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer (EFB)" @@ -1841,7 +1858,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:111 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1855,7 +1872,7 @@ msgstr "" "\n" "Hvis usikker, benytt virtuell XFB isteden." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1883,7 +1900,7 @@ msgstr "Emulasjonsstatus:" msgid "Enable" msgstr "Aktiver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1915,6 +1932,10 @@ msgstr "Aktiver BAT" msgid "Enable Block Merging" msgstr "Aktiver Block Merging" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +msgid "Enable Cache" +msgstr "Aktiver cache" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "Aktiver Juksekoder" @@ -1931,7 +1952,7 @@ msgstr "Aktiver Dobbelkjerne" msgid "Enable Dual Core (speedup)" msgstr "Aktiver Dobbelkjerne (for bedre ytelse)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "Aktiver Snarveistaster" @@ -1947,8 +1968,8 @@ msgstr "Aktiver Idle Skipping (for bedre ytelse)" msgid "Enable MMU" msgstr "Aktiver MMU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "Aktiver Progressiv Skanning" @@ -1960,7 +1981,7 @@ msgstr "Aktiver Skjermsparer" msgid "Enable WideScreen" msgstr "Aktiver Widescreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "Aktiver WireFrame" @@ -2056,7 +2077,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:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2070,14 +2091,14 @@ msgstr "" msgid "End" msgstr "Slutt" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "Engelsk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "Forbedringer" @@ -2099,13 +2120,13 @@ msgstr "Entry 1/%d" msgid "Equal" msgstr "Lik" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "Feil" -#: Source/Core/DolphinWX/Src/Main.cpp:356 +#: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Feil ved lasting av valgt sprÃ¥k. Faller tilbake til systemstandarden." @@ -2179,7 +2200,7 @@ msgstr "Eksporter lagringsfil som..." msgid "Extension" msgstr "Utvidelse" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "Ekstern Bildebuffer (EFB)" @@ -2300,7 +2321,7 @@ msgstr "Kunne ikke laste hid.dll" msgid "Failed to read banner.bin" msgstr "Kunne ikke lese banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2308,7 +2329,7 @@ msgstr "" "Kunne ikke lese blokkallokasjonstabell-backup'en korrekt\n" "(0x8000-0x9FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2321,7 +2342,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Kunne ikke lese data fra filen %d" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2329,7 +2350,7 @@ msgstr "" "Kunne ikke lese mappesti-backup'en korrekt\n" "(0x4000-0x5FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2337,7 +2358,7 @@ msgstr "" "Kunne ikke lese mappestien korrekt\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2345,7 +2366,7 @@ msgstr "" "kunne ikke lese headeren korrekt\n" "(0x0000-0x1FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2377,6 +2398,14 @@ 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/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "Rask" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "Raske Mipmaps" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rask versjon av MMU. Fungerer ikke for alle spill." @@ -2405,7 +2434,7 @@ msgstr "" "Filen kunne ikke Ã¥pnes\n" "eller har ingen gyldig utvidelse" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2443,11 +2472,11 @@ msgstr "Første Blokk" msgid "Fix Checksums" msgstr "Fiks Sjekksummer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "Tving 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "Tving 4:3" @@ -2455,11 +2484,11 @@ msgstr "Tving 4:3" msgid "Force Console as NTSC-J" msgstr "Tving Konsoll til NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" msgstr "Tving Teksturfiltrering" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2494,7 +2523,7 @@ msgstr "" "Er dette avslÃ¥tt, benytter Dolphin NTSC-U som standard og gÃ¥r automatisk " "over til denne innstillingen nÃ¥r japanske spill spilles." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2519,7 +2548,7 @@ msgstr "Stillbilde" msgid "Frame Advance" msgstr "Bilde-for-bilde Modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "Spillopptak bruker FFV1" @@ -2539,13 +2568,13 @@ msgstr "Framelimit:" msgid "Frames To Record" msgstr "Bilder Til Opptak" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "Fri Utkikk" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "Fransk" @@ -2562,7 +2591,7 @@ msgstr "Fra" msgid "FullScr" msgstr "FullSkj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 msgid "Fullscreen resolution:" msgstr "Fullskjermsoppløsning:" @@ -2606,8 +2635,8 @@ msgstr "GameCube" msgid "Gamecube &Pad Settings" msgstr "Innstillinger for &GameCube-kontroll" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube-minnekort (*.raw,*.gcp)" @@ -2629,9 +2658,9 @@ 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/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generelt" @@ -2639,9 +2668,9 @@ msgstr "Generelt" msgid "General Settings" msgstr "Generelle Innstillinger" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "Tysk" @@ -2662,12 +2691,14 @@ msgstr "Innstillinger for Grafikk" msgid "Greater Than" msgstr "Større Enn" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 #, fuzzy msgid "" -"Greatly increases quality of textures generated using render-to-texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2702,11 +2733,11 @@ msgstr "Gitar" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY ble kalt, venligst rapporter!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "Hacks" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Header-sjekksum feilet" @@ -2742,7 +2773,7 @@ msgstr "" msgid "Hide" msgstr "Gjem" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "Gjem Musepeker" @@ -2769,8 +2800,8 @@ msgstr "Vert" msgid "Hotkey Configuration" msgstr "Konfigurer Snarveistaster" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 msgid "Hotkeys" msgstr "Snarveistaster" @@ -2852,11 +2883,11 @@ msgstr "" "PAL:50), mÃ¥ du ogsÃ¥ deaktivere Audio Throttle i DSP-innstillingene for Ã¥ " "gjøre endringen effektiv." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" msgstr "Ignorer Formatendringer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2870,7 +2901,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ pÃ¥." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 " @@ -2912,7 +2943,7 @@ msgstr "" "Importert fil har .sav-utvidelse\n" "men har ikke korrekt header" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2923,7 +2954,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -2941,8 +2972,8 @@ msgstr "I spillet" msgid "In-Game" msgstr "I spillet" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "Info" @@ -2983,7 +3014,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:1361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 msgid "Installing WAD..." msgstr "Installer WAD..." @@ -3012,7 +3043,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "Intern LZO-feil - lzo_init() mislyktes" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 msgid "Internal Resolution:" msgstr "Intern Oppløsning:" @@ -3065,9 +3096,9 @@ msgstr "Ugyldig opptaksfil" msgid "Invalid state" msgstr "Ugyldig save state" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "Italiensk" @@ -3128,8 +3159,8 @@ msgstr "Siste Overskrevne Save State:" msgid "Last Saved State" msgstr "Siste Save State:" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "Venstre" @@ -3175,7 +3206,7 @@ msgstr "Begrens med FPS (bilder-per-sekund)" msgid "Load" msgstr "Last inn" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Load Custom Textures" msgstr "Last inn Kustomiserte Teksturer" @@ -3215,16 +3246,16 @@ msgstr "Last Inn Save State Slot 8" msgid "Load State..." msgstr "Last Inn Save State..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Load Wii System Menu" msgstr "Last inn Wii System Meny" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 #, 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:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3266,8 +3297,8 @@ msgstr "Loggtyper" msgid "Logger Outputs" msgstr "Logger utdata" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "Logging" @@ -3301,8 +3332,8 @@ msgstr "Ytelses-hack for MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark-filer(*.gcs)" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Hoved-joystick" @@ -3331,8 +3362,8 @@ msgstr "Minnekort allerede Ã¥pnet" msgid "Memory Byte" msgstr "Memory Byte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 msgid "Memory Card" msgstr "Minnekort" @@ -3361,7 +3392,7 @@ msgstr "" "%s\n" "Vil du kopiere den gamle filen til denne nye plasseringen?\n" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "" @@ -3378,7 +3409,7 @@ msgstr "Mic" msgid "Min" msgstr "Minimum" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "Diverse" @@ -3391,7 +3422,7 @@ msgstr "Diverse Innstillinger" msgid "Modifier" msgstr "Modifiserer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3416,7 +3447,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3530,9 +3561,9 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Opp" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Navn:" @@ -3617,7 +3648,7 @@ msgstr "Ikke Lik" msgid "Not Set" msgstr "Ikke Satt" -#: Source/Core/DolphinWX/Src/Main.cpp:607 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Not connected" msgstr "Ikke tilkoblet" @@ -3646,8 +3677,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "Antall koder:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "Nunchuk" @@ -3676,8 +3707,8 @@ msgstr "Offset:" msgid "Only %d blocks available" msgstr "Kun %d blokker tilgjengelig" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Open" msgstr "Ã…pne" @@ -3707,11 +3738,11 @@ 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:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "OpenCL Teksturdekoder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "OpenMP Teksturdekoder" @@ -3742,8 +3773,8 @@ msgstr "" "Høyreklikk og eksporter all lagringsfilene,\n" "og importer lagringsfilene til et nytt minnekort\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "Annet" @@ -3808,13 +3839,13 @@ msgstr "Patcher" msgid "Paths" msgstr "Mappestier" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "Pause" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Per-Pixel Lighting" msgstr "Per-Pikselbelysning" @@ -3827,10 +3858,10 @@ msgstr "Perfekt" msgid "Perspective %d" msgstr "Perspektiv %d" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 msgid "Play" msgstr "Spill" @@ -3854,7 +3885,7 @@ msgstr "Avspillingsalterntiver" msgid "Players" msgstr "Spillere" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 msgid "Please confirm..." msgstr "Vennligst bekreft..." @@ -3899,7 +3930,7 @@ msgstr "Portugisisk" msgid "Portuguese (Brazilian)" msgstr "Portugisisk (Brasilsk)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "postprosesseringseffekt:" @@ -3958,7 +3989,7 @@ msgstr "R-knappen" msgid "R-Analog" msgstr "Høyre-analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "RAM" @@ -3974,7 +4005,7 @@ msgstr "Rekkevidde" msgid "Read-only mode" msgstr "Les-kun-modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "Ekte" @@ -4036,9 +4067,9 @@ msgstr "" "\n" "Hvis usikker, velg ingen." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Oppdater" @@ -4050,14 +4081,14 @@ msgstr "Oppdater liste" msgid "Refresh game list" msgstr "Oppdater spilliste" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Remove" msgstr "Fjern" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4067,12 +4098,12 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "Render til Hovedvindu" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Restart" @@ -4084,8 +4115,8 @@ msgstr "Resultater" msgid "Return" msgstr "Tilbake" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "Høyre" @@ -4110,13 +4141,17 @@ msgstr "Russisk" msgid "Sa&ve State" msgstr "Lagre Sa&ve State" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "Sikker" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "Samplingsratio:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Lagre" @@ -4182,6 +4217,10 @@ msgstr "Lagre dekomprimert GCM/ISO" msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Save State-film %s er korrupt, opptak avsluttes..." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +msgid "Scaled EFB Copy" +msgstr "Skalert EFB-kopi" + #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format msgid "Scanning %s" @@ -4217,17 +4256,17 @@ msgstr "Søk i Undermapper" msgid "Section %s not found in SYSCONF" msgstr "Seksjon %s ikke funnet i SYSCONF" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "Velg" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "Velg Opptaksfil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 msgid "Select a Wii WAD file to install" msgstr "Velg en Wii WAD-fil Ã¥ innstallere" @@ -4253,15 +4292,15 @@ msgstr "Velg flytvindu" msgid "Select the file to load" msgstr "Velg fil Ã¥ laste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Select the save file" msgstr "Velg lagringsfil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Velg en save state Ã¥ laste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "Select the state to save" msgstr "Velg en save state Ã¥ lagre" @@ -4399,11 +4438,11 @@ msgstr "Vis &Verktøylinje" msgid "Show Drives" msgstr "Vis DVD-stasjoner" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "Vis Kopieringsregioner for EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "Vis Bildefrekvens (FPS)" @@ -4415,7 +4454,7 @@ msgstr "Vis Frankrike" msgid "Show GameCube" msgstr "Vis GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "Vis Inndata" @@ -4451,7 +4490,7 @@ msgstr "Vis Plattformer" msgid "Show Regions" msgstr "Vis Regioner" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "Vis Statistikker" @@ -4506,7 +4545,7 @@ msgstr "Vis lagringsikon" msgid "Show save title" msgstr "Vis lagringstittel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4525,7 +4564,7 @@ msgstr "Vis denne hjelpemelding" msgid "Show unknown" msgstr "Vis ukjent" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -4551,15 +4590,15 @@ msgstr "Størrelse" msgid "Skip BIOS" msgstr "Dropp BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "Dropp Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "Dropp EFB Access fra CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4571,6 +4610,22 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Øker ytelsen noe for EFB-til-RAM-kopier ved Ã¥ ofre emulasjonsnøyaktighet.\n" +"Økeri noen tilfeller den visuelle kvaliteten.\n" +"Hvis du opplever problemer, prøv Ã¥ øke tekstur-cache-nøyaktigheten, eller " +"deaktiver dette alternativet.\n" +"\n" +"Hvis usikker, la stÃ¥ avslÃ¥tt." + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4622,9 +4677,9 @@ msgstr "Laging av lydbuffer mislyktes: %s" msgid "Space" msgstr "Mellomrom" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "Spansk" @@ -4632,7 +4687,7 @@ msgstr "Spansk" msgid "Speaker Volume:" msgstr "Høytalervolum:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 " @@ -4667,9 +4722,9 @@ msgstr "Kvadrat-joystick" msgid "Standard Controller" msgstr "Standardkontroller" +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Start" @@ -4697,14 +4752,28 @@ msgstr "Save State-lagringsfiler" msgid "Stick" msgstr "Joystick" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stopp" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" +"Lagre EFB-kopier i GPU-teksturobjekter.\n" +"Dette er ikke sÃ¥ nøyaktig, men det fungerer bra nok for de fleste spill og " +"gir en god ytelsesøkning over EFB-til-RAM.\n" +"\n" +"Hvis usikker, la stÃ¥ pÃ¥." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "Strekk til Vindu" @@ -4738,8 +4807,8 @@ msgstr "SystemsprÃ¥k:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #, fuzzy msgid "TAS Input" msgstr "Inndata" @@ -4760,9 +4829,9 @@ msgstr "Tabell Venstre" msgid "Table Right" msgstr "Tabell Høyre" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "Ta Skjermbilde" @@ -4770,7 +4839,15 @@ msgstr "Ta Skjermbilde" msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "Tekstur" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +msgid "Texture Cache" +msgstr "Tekstur-cache" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" msgstr "Teksturformat Overlegg" @@ -4815,7 +4892,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:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Filen du spesifiserte (%s) eksisterer ikke" @@ -4832,11 +4909,23 @@ 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:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +msgstr "" +"Jo tryggere du setter denne, jo mindre sannsynlig er det at emulatoren " +"mangler noen teksturoppdateringer fra RAM.\n" +"\n" +"Hvis usikker, bruk den andre-raskeste verdien fra høyre." + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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:363 +#: Source/Core/DolphinWX/Src/Main.cpp:353 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4903,7 +4992,7 @@ msgstr "" 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:119 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. " @@ -4979,13 +5068,13 @@ msgstr "Til" msgid "Toggle All Log Types" msgstr "Vipp Alle Loggtyper" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Vipp Mellom Vindu/Fullskjerm" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Top" msgstr "Topp" @@ -4993,7 +5082,7 @@ msgstr "Topp" msgid "Traditional Chinese" msgstr "Tradisjonell Kinesisk" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "Forsøkte Ã¥ laste en ukjent filtype." @@ -5029,8 +5118,8 @@ msgstr "Type" msgid "UDP Port:" msgstr "UDP Port:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5101,8 +5190,8 @@ msgstr "" "Ukjent peker %#08x\n" "Fortsett?" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "Opp" @@ -5119,7 +5208,7 @@ msgstr "Mot-skjerm-pekende Wiimote" msgid "Use EuRGB60 Mode (PAL60)" msgstr "Bruk EuRGB60-modus (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 msgid "Use Fullscreen" msgstr "Bruk Fullskjerm" @@ -5131,7 +5220,7 @@ msgstr "Bruk Hex" msgid "Use Panic Handlers" msgstr "Bruk Panikkadvarslere" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5144,7 +5233,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5158,11 +5247,11 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "Verktøyet" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "Vertikal Synkronisering" @@ -5186,8 +5275,7 @@ msgstr "Verbøsitet" msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "Virtuell" @@ -5214,21 +5302,21 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Advarsel" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 msgid "Warning - starting DOL in wrong console mode!" msgstr "Advarsel - starter DOL i feil konsollmodus!" -#: Source/Core/Core/Src/Boot/Boot.cpp:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "Advarsel - starter ELF i feil konsollmodus!" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "Advarsel - starter ISO i feil konsollmodus!" @@ -5265,7 +5353,7 @@ msgstr "WaveFileWriter - fil ikke Ã¥pen." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "Widescreen Hack" @@ -5289,7 +5377,7 @@ msgstr "Wii NAND-rot:" msgid "Wii Save Import" msgstr "Importer Wii-lagringsfil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii-lagringsfiler (*.bin)|*.bin" @@ -5297,8 +5385,8 @@ msgstr "Wii-lagringsfiler (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Kunne ikke lese fra fil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "Wiimote" @@ -5320,7 +5408,7 @@ msgstr "" "eller kanskje den koblet seg fra pga. inaktivitet.\n" "Vil du koble til igjen øyeblikkelig?" -#: Source/Core/DolphinWX/Src/Main.cpp:609 +#: Source/Core/DolphinWX/Src/Main.cpp:599 msgid "Wiimote Connected" msgstr "Wiimote Tilkoblet" @@ -5353,7 +5441,7 @@ msgstr "Windows Høyre" msgid "Word Wrap" msgstr "Ordkrumning" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5457,7 +5545,7 @@ msgstr "Zero-kode ukjent for Dolphin: %08x" msgid "[ waiting ]" msgstr "[ venter ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5472,7 +5560,7 @@ msgstr "" msgid "[Custom]" msgstr "[Selvdefinert]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5491,7 +5579,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5580,9 +5668,6 @@ msgstr "| ELLER" #~ msgid "AOSound" #~ msgstr "&Lyd" -#~ msgid "Accuracy:" -#~ msgstr "Nøyaktighet:" - #~ msgid "Accurate Texture Cache" #~ msgstr "Nøyaktig Tekstur-Cache" @@ -5620,17 +5705,6 @@ 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" @@ -5677,6 +5751,9 @@ msgstr "| ELLER" #~ msgid "Danish" #~ msgstr "Dansk" +#~ msgid "Disable Wiimote Speaker" +#~ msgstr "Deaktiver Wiimote-høytaler" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -5723,9 +5800,6 @@ msgstr "| ELLER" #~ msgid "Enable CPU Access" #~ msgstr "Aktiver CPU Access" -#~ msgid "Enable Cache" -#~ msgstr "Aktiver cache" - #~ msgid "Enable Copy to EFB" #~ msgstr "Aktiver kopiering til EFB" @@ -5788,12 +5862,6 @@ msgstr "| ELLER" #~ "%s\n" #~ "Denne filen kreves for Ã¥ bruke DSP LLE." -#~ msgid "Fast" -#~ msgstr "Rask" - -#~ msgid "Fast Mipmaps" -#~ msgstr "Raske Mipmaps" - #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -5940,15 +6008,9 @@ msgstr "| ELLER" #~ msgid "Running script...\n" #~ msgstr "Kjører skript...\n" -#~ msgid "Safe" -#~ msgstr "Sikker" - #~ msgid "Scale:" #~ msgstr "Skala:" -#~ msgid "Scaled EFB Copy" -#~ msgstr "Skalert EFB-kopi" - #~ msgid "Select resolution for fullscreen mode" #~ msgstr "Velg oppløsning for fullskjermsmodus" @@ -6004,22 +6066,6 @@ msgstr "| ELLER" #~ msgid "Skies of Arcadia" #~ msgstr "Skies of Arcadia" -#~ 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" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Øker ytelsen noe for EFB-til-RAM-kopier ved Ã¥ ofre " -#~ "emulasjonsnøyaktighet.\n" -#~ "Økeri noen tilfeller den visuelle kvaliteten.\n" -#~ "Hvis du opplever problemer, prøv Ã¥ øke tekstur-cache-nøyaktigheten, eller " -#~ "deaktiver dette alternativet.\n" -#~ "\n" -#~ "Hvis usikker, la stÃ¥ avslÃ¥tt." - #, fuzzy #~ msgid "Slot" #~ msgstr "Slot A" @@ -6061,39 +6107,9 @@ msgstr "| ELLER" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Start renderingsvinduet i fullskjermsmodus." -#~ 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" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "Lagre EFB-kopier i GPU-teksturobjekter.\n" -#~ "Dette er ikke sÃ¥ nøyaktig, men det fungerer bra nok for de fleste spill " -#~ "og gir en god ytelsesøkning over EFB-til-RAM.\n" -#~ "\n" -#~ "Hvis usikker, la stÃ¥ pÃ¥." - -#~ msgid "Texture" -#~ msgstr "Tekstur" - -#~ msgid "Texture Cache" -#~ msgstr "Tekstur-cache" - #~ msgid "The file " #~ msgstr "Filen" -#~ msgid "" -#~ "The safer you adjust this, the less likely the emulator will be missing " -#~ "any texture updates from RAM.\n" -#~ "\n" -#~ "If unsure, use the second-fastest value from the right." -#~ msgstr "" -#~ "Jo tryggere du setter denne, jo mindre sannsynlig er det at emulatoren " -#~ "mangler noen teksturoppdateringer fra RAM.\n" -#~ "\n" -#~ "Hvis usikker, bruk den andre-raskeste verdien fra høyre." - #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "" #~ "Dette formatet brukes vanligvis til Ã¥ spille stemme- og lyd- effekter." diff --git a/Languages/po/nl.po b/Languages/po/nl.po index 9f6c9d49e7..8e9a210221 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: 2011-08-10 08:30-0500\n" +"POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-08-07 16:43+0100\n" "Last-Translator: Goost \n" "Language-Team: DevPro Team. \n" @@ -32,7 +32,7 @@ msgstr " Spel:" msgid "! NOT" msgstr "! NIET" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -74,7 +74,7 @@ msgstr "%s bestaat al, wilt u het vervangen?" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "Het lukte niet om %s te comprimeren. Waarschijnlijk is de image kapot." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, fuzzy, c-format msgid "" "%s failed to load as a memorycard \n" @@ -83,7 +83,7 @@ msgstr "" "De geheugenkaart kon niet worden geladen\n" "Kaart grootte is onjuist (%04X)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, fuzzy, c-format msgid "" "%s failed to load as a memorycard \n" @@ -92,7 +92,7 @@ msgstr "" "De geheugenkaart kon niet worden geladen\n" "Kaart grootte is onjuist (%04X)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -306,7 +306,7 @@ msgstr "(-)+zDichtbij" msgid "(UNKNOWN)" msgstr "(ONBEKEND)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(uit) " @@ -318,7 +318,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "" @@ -330,7 +330,7 @@ msgstr "8 bit" msgid "" msgstr " " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr " " @@ -418,17 +418,22 @@ msgstr "Over Dolphin" msgid "Acceleration" msgstr "Acceleratie" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulatie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#, fuzzy msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" "Emuleer EFB kopiën nauwkeurig. \n" "Sommige spellen zijn hiervan afhankelijk voor een aantal grafische effecten " @@ -528,12 +533,12 @@ msgstr "Action Replay: Normal Code %i: Onjuist subtype %08x (%s)" 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:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "Adapter:" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "Voeg toe" @@ -549,9 +554,9 @@ msgstr "Voeg Patch toe" msgid "Add new pane" msgstr "Voeg een nieuwe paneel toe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "Voeg toe..." @@ -599,7 +604,7 @@ 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:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "Geavanceerd" @@ -619,8 +624,8 @@ msgstr "Alle GC/Wii images (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM bestanden (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "All Save States (sav, s##)" msgstr "Alle Opgeslagen Staten (sav, s##)" @@ -636,7 +641,7 @@ msgstr "Alle gecomprimeerde GC/Wii ISO-bestanden (GCZ)" msgid "All files (*.*)|*.*" msgstr "Alle Bestanden (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -648,11 +653,16 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Geëmuleerde Wiimote" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" msgstr "Anisotropic Filteren:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "Anti-Aliasing:" @@ -673,7 +683,7 @@ msgstr "Applader:" msgid "Apply" msgstr "Toepassen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -707,7 +717,7 @@ msgstr "" "terug te halen!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Beeldverhouding:" @@ -728,19 +738,19 @@ msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Veelvoud van 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "Automatisch (Venster Grootte)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "Venster grootte automatisch aanpassen" @@ -754,6 +764,14 @@ msgstr "" "\n" "In geval van twijfel leeg laten." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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/WXInputBase.cpp:27 msgid "Back" msgstr "Terug" @@ -762,8 +780,8 @@ msgstr "Terug" msgid "Backend Settings" msgstr "Backend Instellingen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Geluids backend:" @@ -797,7 +815,7 @@ msgstr "Banner:" msgid "Bar" msgstr "Balk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "Basis" @@ -809,7 +827,7 @@ msgstr "Basis Instellingen" msgid "Bass" msgstr "Bass" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Block Allocation Table checksum is mislukt" @@ -829,8 +847,8 @@ msgstr "Blauw Links" msgid "Blue Right" msgstr "Blauw Rechts" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 msgid "Bottom" msgstr "Onder" @@ -863,9 +881,9 @@ msgstr "Zoek een uitvoer folder" msgid "Buffer:" msgstr "Buffer:" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "Knoppen" @@ -881,11 +899,11 @@ msgstr "C-Stick" msgid "CPU Emulator Engine" msgstr "CPU Emulatie Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "Activeer scherm lijst caching." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 " @@ -901,7 +919,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 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,8 +935,8 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Annuleer" @@ -965,10 +983,10 @@ msgstr "Kan WiiMOte niet via bd vinden: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Kan WiiMote met verbinding handle %02x niet vinden" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Kan niet lezen van DVD_Plugin - DVD-Interface: Fatal Error" @@ -1090,10 +1108,10 @@ msgstr "Cirkel Stick" msgid "Classic" msgstr "Klassiek" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "Legen" @@ -1109,10 +1127,10 @@ msgstr "" "Client is uitgeschakeld terwijl het spel draait! NetPlay is uitgeschakeld. " "Je moet het spel handmatig stoppen." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Sluit" @@ -1217,7 +1235,7 @@ msgstr "Verbind Wiimote 3" msgid "Connect Wiimote 4" msgstr "Verbind Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:608 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Connecting..." msgstr "Verbinden..." @@ -1286,7 +1304,7 @@ msgstr "" "draait nog!\n" "(pads instellen terwijl het spel draait wordt nog niet ondersteund)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1356,11 +1374,11 @@ msgstr "Auteur:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "Bijsnijden" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1407,8 +1425,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "DSP Emulator Motor" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulatie (snel)" @@ -1457,7 +1475,7 @@ msgstr "Dode Zone" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 #, fuzzy msgid "Debugging" msgstr "Debug" @@ -1491,8 +1509,8 @@ msgstr "Standaard ISO:" msgid "Default font" msgstr "Standaard font" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "Verwijder" @@ -1500,12 +1518,12 @@ msgstr "Verwijder" msgid "Delete Save" msgstr "Verwijder Save" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "Verwijder het bestaande bestand '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 msgid "Description" msgstr "Beschrijving" @@ -1536,15 +1554,15 @@ msgstr "Apparaat Instellingen" msgid "Dial" msgstr "Bellen" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1552,33 +1570,29 @@ msgstr "" "Map checksum is mislukt\n" " en map backup checksum is mislukt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 #, fuzzy msgid "Disable" msgstr "Schakel Fog uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "Schakel Fog uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "Schakel Lighting uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "Schakel Pixel Diepte uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "Schakel Textures uit" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "Schakel Wiimote speaker uit" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1592,7 +1606,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1608,7 +1622,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1627,11 +1641,11 @@ msgstr "Schijf" msgid "Disc Read Error" msgstr "Schijf Lees Fout" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "Scherm" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1645,7 +1659,7 @@ msgstr "" msgid "Divide" msgstr "Verdelen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Do you want to stop the current emulation?" msgstr "Wil je de emulatie stoppen?" @@ -1653,7 +1667,7 @@ msgstr "Wil je de emulatie stoppen?" msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafische Configuratie" @@ -1674,12 +1688,12 @@ msgstr "Dolphin Geëmuleerde Wiimote configuratie" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Configuratie" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Film (*.dtm)" @@ -1706,8 +1720,8 @@ msgstr "" "Dolphin is ingesteld om alle spellen te verbergen. Dubbelklik hier om alle " "spellen te weergeven..." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Omlaag" @@ -1732,19 +1746,19 @@ msgstr "Pop" msgid "Dump Audio" msgstr "Dump Geluid" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "Dump EFB Doel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "Dump Frames" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "Dump texturen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1754,7 +1768,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1764,7 +1778,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1774,9 +1788,9 @@ msgstr "" "\n" "In geval van twijfel leeg laten." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "Nederlands" @@ -1784,7 +1798,7 @@ msgstr "Nederlands" msgid "E&xit" msgstr "Sl&uiten" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" msgstr "EFB Regio kopie" @@ -1837,7 +1851,7 @@ msgstr "Wijzig..." msgid "Effect" msgstr "Effect" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "Ingebedde Frame Buffer" @@ -1845,7 +1859,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:111 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1859,7 +1873,7 @@ msgstr "" "\n" "In geval van twijfel selecteer virtuele XFB emulatie." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1887,7 +1901,7 @@ msgstr "Emulatie Staat:" msgid "Enable" msgstr "Activeer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1919,6 +1933,11 @@ msgstr "Activeer BAT" msgid "Enable Block Merging" msgstr "Activeer Block Merging" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#, fuzzy +msgid "Enable Cache" +msgstr "Activeer Cache" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "Activeer Cheats" @@ -1935,7 +1954,7 @@ msgstr "Activeer Dual Core" msgid "Enable Dual Core (speedup)" msgstr "Activeer Dual Core (verhoogt de snelheid)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "Activeer Sneltoetsen" @@ -1951,8 +1970,8 @@ msgstr "Activeer Idle Skipping (verhoogt de snelheid)" msgid "Enable MMU" msgstr "Activeer MMU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "Activeer Progressive Scan" @@ -1964,7 +1983,7 @@ msgstr "Activeer Schermbeveiliger" msgid "Enable WideScreen" msgstr "Activeer BreedBeeld" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "Activeer Wireframe" @@ -2061,7 +2080,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:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2075,14 +2094,14 @@ msgstr "" msgid "End" msgstr "Einde" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "Engels" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "Verbeteringen" @@ -2104,13 +2123,13 @@ msgstr "Toegang 1/%d" msgid "Equal" msgstr "Gelijk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "Error (Fout)" -#: Source/Core/DolphinWX/Src/Main.cpp:356 +#: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Fout bij het laden van de geselecteerde taal. Dolphin zal terugvallen op de " @@ -2187,7 +2206,7 @@ msgstr "Exporteer save als..." msgid "Extension" msgstr "Extensie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "Externe Frame Buffer" @@ -2309,7 +2328,7 @@ msgstr "Mislukt om hid.dll te laden" msgid "Failed to read banner.bin" msgstr "Mislukt om banner.bin te lezen" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2317,7 +2336,7 @@ msgstr "" "Het lezen van de block allocation table backup is mislukt\n" "(0x8000-0x9FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2330,7 +2349,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Mislukt om gegevens uit %d te lezen" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2338,7 +2357,7 @@ msgstr "" "Het lezen van de map backup is mislukt\n" "(0x4000-0x5FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2346,7 +2365,7 @@ msgstr "" "Het lezen van de map is mislukt\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2354,7 +2373,7 @@ msgstr "" "Het lezen van de header is mislukt\n" "(0x000-0x1FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2386,6 +2405,15 @@ 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/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "Snel" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#, fuzzy +msgid "Fast Mipmaps" +msgstr "Laad Native Mipmaps" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "Snelle versie van de MMU. Werkt niet voor elk spel." @@ -2414,7 +2442,7 @@ msgstr "" "Bestand kon niet geopend worden\n" "of heeft geen valide extensie" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2452,11 +2480,11 @@ msgstr "Eerste Blok" msgid "Fix Checksums" msgstr "Herstel Checksums" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "Forceer 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "Forceer 4:3" @@ -2465,11 +2493,11 @@ msgstr "Forceer 4:3" msgid "Force Console as NTSC-J" msgstr "Stel Console in als NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" msgstr "Forceer Texture Filtering" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2505,7 +2533,7 @@ msgstr "" "deze instelling automatisch aanzetten als je de Japanese versie van spellen " "speelt." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2530,7 +2558,7 @@ msgstr "" msgid "Frame Advance" msgstr "Frame Geavanceerd" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "Frame Dumps gebruiken FFV1" @@ -2550,13 +2578,13 @@ msgstr "Framelimiet:" msgid "Frames To Record" msgstr "Frames om op te nemen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "Vrije kijk" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "Frans" @@ -2573,7 +2601,7 @@ msgstr "Van" msgid "FullScr" msgstr "Volledig scherm" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 #, fuzzy msgid "Fullscreen resolution:" msgstr "Volledige Scherm Resolutie:" @@ -2618,8 +2646,8 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Gamecube &Pad Instellingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Kaarten (*.raw,*.gcp)" @@ -2641,9 +2669,9 @@ 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/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Algemeen" @@ -2651,9 +2679,9 @@ msgstr "Algemeen" msgid "General Settings" msgstr "Algemene Instellingen" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "Duits" @@ -2674,11 +2702,14 @@ msgstr "Grafische instellingen" msgid "Greater Than" msgstr "Grooter dan" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#, fuzzy msgid "" -"Greatly increases quality of textures generated using render-to-texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2713,11 +2744,11 @@ msgstr "Gitaar" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY is opgeroepen, rapport dit alstubliefst!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Header checksum is mislukt" @@ -2753,7 +2784,7 @@ msgstr "" msgid "Hide" msgstr "Verberg" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "Verberg Muis Cursor" @@ -2780,8 +2811,8 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Sneltoets Configuratie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 msgid "Hotkeys" msgstr "Hotkeys" @@ -2865,11 +2896,11 @@ msgstr "" "50),\n" "dan moet je ook Audio Throttle DSP uitschakelen om het effectief te maken." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" msgstr "Negeer formaat veranderingen." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2883,7 +2914,7 @@ msgstr "" "\n" "In geval van twijfel ingevuld laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 " @@ -2925,7 +2956,7 @@ msgstr "" "Geimporteerd bestand heeft sav extension\n" "maar heeft geen juiste header" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2937,7 +2968,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -2956,8 +2987,8 @@ msgstr "In Game" msgid "In-Game" msgstr "In-Game" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "Info" @@ -3000,7 +3031,7 @@ msgstr "" "InstallExceptionHandler opgeroepen, maar dit platform ondersteund dit nog " "niet." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 msgid "Installing WAD..." msgstr "WAD aan het installeren..." @@ -3030,7 +3061,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "Interne LZO fout - lzo_init() is mislukt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 msgid "Internal Resolution:" msgstr "Interne Resolutie:" @@ -3083,9 +3114,9 @@ msgstr "Onjuist opname bestand" msgid "Invalid state" msgstr "Onjuiste staat" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "Italië" @@ -3146,8 +3177,8 @@ msgstr "Laatste Overgeschreven Staat" msgid "Last Saved State" msgstr "Laatste Opgeslagen Staat" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "Links" @@ -3193,7 +3224,7 @@ msgstr "Limiteer met behulp van FPS" msgid "Load" msgstr "Laad" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Load Custom Textures" msgstr "Laad Aangepaste Textures" @@ -3233,17 +3264,17 @@ msgstr "Laad staat 8" msgid "Load State..." msgstr "Laad staat..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 #, fuzzy msgid "Load Wii System Menu" msgstr "Laad Wii System Menu(%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 #, 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:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3285,8 +3316,8 @@ msgstr "Log Types" msgid "Logger Outputs" msgstr "Logger Uitvoer" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "Logboek Bijhouden" @@ -3320,8 +3351,8 @@ msgstr "MMU Snelheids Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark bestanden(*.gcs)" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3350,8 +3381,8 @@ msgstr "De geheugenkaart is al geopend" msgid "Memory Byte" msgstr "Geheugen Byte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 msgid "Memory Card" msgstr "Geheugen Kaart" @@ -3380,7 +3411,7 @@ msgstr "" "%s\n" "Wil je de oude bestanden naar de nieuwe lokatie kopiëren?\n" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "" @@ -3397,7 +3428,7 @@ msgstr "Microfoon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "Overig" @@ -3410,7 +3441,7 @@ msgstr "Overige Instellingen" msgid "Modifier" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3435,7 +3466,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3550,9 +3581,9 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Omhoog" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Naam:" @@ -3637,7 +3668,7 @@ msgstr "Niet gelijk" msgid "Not Set" msgstr "Niet ingesteld" -#: Source/Core/DolphinWX/Src/Main.cpp:607 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Not connected" msgstr "Niet verbonden" @@ -3666,8 +3697,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "Aantal Codes:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "Nunchuk" @@ -3696,8 +3727,8 @@ msgstr "Afstand:" msgid "Only %d blocks available" msgstr "Er zijn maar %d blocks beschikaarr" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Open" msgstr "Open" @@ -3727,11 +3758,11 @@ 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:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "OpenCL Texture Decodeerder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decodeerder" @@ -3763,8 +3794,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:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "Overige" @@ -3829,13 +3860,13 @@ msgstr "Patches" msgid "Paths" msgstr "Pad" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "Pauze" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Per-Pixel Lighting" msgstr "Per-Pixel Belichting" @@ -3848,10 +3879,10 @@ msgstr "Perfect" msgid "Perspective %d" msgstr "Perspectief %d" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 msgid "Play" msgstr "Speel" @@ -3875,7 +3906,7 @@ msgstr "Terugspeel Opties" msgid "Players" msgstr "Spelers" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 msgid "Please confirm..." msgstr "Bevestig alsjeblieft..." @@ -3920,7 +3951,7 @@ msgstr "Portugees" msgid "Portuguese (Brazilian)" msgstr "Portugees (Braziliaans)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" @@ -3979,7 +4010,7 @@ msgstr "R Knop" msgid "R-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "RAM" @@ -3995,7 +4026,7 @@ msgstr "Afstand" msgid "Read-only mode" msgstr "Alleen-lezen modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "Echt" @@ -4057,9 +4088,9 @@ msgstr "" "\n" "In geval van twijfel selecteer Geen." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Ververs" @@ -4071,14 +4102,14 @@ msgstr "Lijst Verversen" msgid "Refresh game list" msgstr "Ververs de speellijst" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Remove" msgstr "Verwijder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4089,12 +4120,12 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "Geef weer op hoofdscherm" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Opnieuw" @@ -4106,8 +4137,8 @@ msgstr "Resultaten" msgid "Return" msgstr "Enter" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "Rechts" @@ -4132,13 +4163,17 @@ msgstr "Russisch" msgid "Sa&ve State" msgstr "S&la Staat Op" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "Opslaan" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "Sample Rate:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Opslaan" @@ -4204,6 +4239,11 @@ msgstr "Sla gedecomprimeerd GCM / ISO op" 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:401 +#, fuzzy +msgid "Scaled EFB Copy" +msgstr "EFB Verkleinde Kopie" + #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format msgid "Scanning %s" @@ -4239,17 +4279,17 @@ msgstr "Zoeken in submappen" msgid "Section %s not found in SYSCONF" msgstr "Sectie %s niet gevonden in SYSCONF" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "Selecteer" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "Selecteer de opname Bestand" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 msgid "Select a Wii WAD file to install" msgstr "Selecteer een Wii WAD bestand om te installeren" @@ -4275,15 +4315,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:1306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Select the save file" msgstr "Selecteer het save - bestand" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Selecteer de Staat om te laden" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "Select the state to save" msgstr "Selecteer de Staat om op te slaan" @@ -4421,11 +4461,11 @@ msgstr "Toon &Toolbar" msgid "Show Drives" msgstr "Toon Schijven" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "Weergeef EFB Kopie Regios" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "Toon FPS" @@ -4437,7 +4477,7 @@ msgstr "Toon Frans" msgid "Show GameCube" msgstr "Toon Gamecube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "Toon Input Venster" @@ -4473,7 +4513,7 @@ msgstr "Toon Platformen" msgid "Show Regions" msgstr "Toon Regio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "Weergeef statistieken" @@ -4527,7 +4567,7 @@ msgstr "Toon save icon" msgid "Show save title" msgstr "Toon save titel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4547,7 +4587,7 @@ msgstr "Toon dit help bericht" msgid "Show unknown" msgstr "Toon onbekend" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -4573,16 +4613,16 @@ msgstr "Grootte" msgid "Skip BIOS" msgstr "Sla BIOS Over" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "Schakel Dest. Alpha Pass uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "Sla EFB toegang van de CPU over" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4594,6 +4634,16 @@ msgstr "" "\n" "In geval van twijfel leeg laten." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4646,9 +4696,9 @@ msgstr "Het aanmaken van de geluids buffer is mislukt: %s" msgid "Space" msgstr "Ruimte" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "Spaans" @@ -4656,7 +4706,7 @@ msgstr "Spaans" msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 " @@ -4692,9 +4742,9 @@ msgstr "" msgid "Standard Controller" msgstr "" +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Start" @@ -4722,14 +4772,23 @@ msgstr "Opgeslage Staten" msgid "Stick" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stop" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "Uitrekken naar Venster" @@ -4763,8 +4822,8 @@ msgstr "Systeem Taal:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS Ingang" @@ -4784,9 +4843,9 @@ msgstr "Linker Tabel" msgid "Table Right" msgstr "Rechter Tabel" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "Neem een Schermafdruk" @@ -4794,7 +4853,16 @@ msgstr "Neem een Schermafdruk" msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "Textuur" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +#, fuzzy +msgid "Texture Cache" +msgstr "Zuiveren van de Cache" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" msgstr "Textuur Formaat Overlay" @@ -4840,7 +4908,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:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Het opgegeven bestand(%s) bestaat niet" @@ -4857,13 +4925,21 @@ 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:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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:363 +#: Source/Core/DolphinWX/Src/Main.cpp:353 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4932,7 +5008,7 @@ msgstr "" 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:119 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. " @@ -5009,13 +5085,13 @@ msgstr "Naar" msgid "Toggle All Log Types" msgstr "Zet Alle Log Types Aan" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Volledig Scherm Inschakelen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Top" msgstr "Boven" @@ -5023,7 +5099,7 @@ msgstr "Boven" msgid "Traditional Chinese" msgstr "Chinees (Traditioneel)" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "Poging tot het laden van een onbekend bestands type." @@ -5059,8 +5135,8 @@ msgstr "Type" msgid "UDP Port:" msgstr "UDP Port:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "UDP Wiimote " @@ -5134,8 +5210,8 @@ msgstr "" "Onbekende pointer %#08x\n" "Doorgaan?" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "Omhoog" @@ -5152,7 +5228,7 @@ msgstr "Wiimote rechtop" msgid "Use EuRGB60 Mode (PAL60)" msgstr "Gebruik EuRGB60 Mode (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 msgid "Use Fullscreen" msgstr "Gebruik &Volledig Scherm" @@ -5164,7 +5240,7 @@ msgstr "Gebruik Hex" msgid "Use Panic Handlers" msgstr "Gebruik Panic Handlers" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5177,7 +5253,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5191,11 +5267,11 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "Hulpprogramma" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "V-Sync" @@ -5219,8 +5295,7 @@ msgstr "Breedsprakigheid" msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "Virtueel" @@ -5247,21 +5322,21 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Waarschuwing" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 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:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "Waarschuwing - ELF wordt in de verkeerde console mode gestart!" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "Waarschuwing - ISO wordt in de verkeerde console mode gestart!" @@ -5299,7 +5374,7 @@ msgstr "WaveFileWriter - bestand niet open." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "Breedbeeld Hack" @@ -5323,7 +5398,7 @@ msgstr "Wii NAND basismap:" msgid "Wii Save Import" msgstr "Wii Save Importeren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii save bestanden (*.bin)|*.bin" @@ -5331,8 +5406,8 @@ msgstr "Wii save bestanden (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Kon het bestand niet lezen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "Wiimote" @@ -5354,7 +5429,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:609 +#: Source/Core/DolphinWX/Src/Main.cpp:599 msgid "Wiimote Connected" msgstr "Wiimote Connected" @@ -5387,7 +5462,7 @@ msgstr "Venster Rechts" msgid "Word Wrap" msgstr "Regelafbreking" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5491,7 +5566,7 @@ msgstr "Zero code onbekend voor Dolphin: %08x" msgid "[ waiting ]" msgstr "[ wachten ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5507,7 +5582,7 @@ msgstr "" msgid "[Custom]" msgstr "[Aangepast]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5524,7 +5599,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5687,6 +5762,9 @@ msgstr "| OF" #~ msgid "Danish" #~ msgstr "Deens" +#~ msgid "Disable Wiimote Speaker" +#~ msgstr "Schakel Wiimote speaker uit" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -5726,10 +5804,6 @@ msgstr "| OF" #~ msgid "Enable CPU Access" #~ msgstr "Activeer CPU Toegang" -#, fuzzy -#~ msgid "Enable Cache" -#~ msgstr "Activeer Cache" - #~ msgid "Enable Copy to EFB" #~ msgstr "Activeer Kopie naar EFB" @@ -5784,13 +5858,6 @@ msgstr "| OF" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Mislukt om DSP ROM te laden vanuit: %s" -#~ msgid "Fast" -#~ msgstr "Snel" - -#, fuzzy -#~ msgid "Fast Mipmaps" -#~ msgstr "Laad Native Mipmaps" - #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -5924,16 +5991,9 @@ msgstr "| OF" #~ msgid "Running script...\n" #~ msgstr "Draaiend script ...\n" -#~ msgid "Safe" -#~ msgstr "Opslaan" - #~ msgid "Scale:" #~ msgstr "Schaal:" -#, fuzzy -#~ msgid "Scaled EFB Copy" -#~ msgstr "EFB Verkleinde Kopie" - #~ msgid "Select resolution for fullscreen mode" #~ msgstr "Selecteer resolutie voor fullscreen mode" @@ -6008,13 +6068,6 @@ msgstr "| OF" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Start de weergave-venster in volledige scherm modus." -#~ msgid "Texture" -#~ msgstr "Textuur" - -#, fuzzy -#~ msgid "Texture Cache" -#~ msgstr "Zuiveren van de Cache" - #~ msgid "The file " #~ msgstr "Het bestand" diff --git a/Languages/po/pl.po b/Languages/po/pl.po index c4efb02555..da4063c325 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: 2011-08-10 08:30-0500\n" +"POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-08-12 17:04+0100\n" "Last-Translator: Krzysztof Baszczok \n" "Language-Team: Polish \n" @@ -30,7 +30,7 @@ msgstr "Gra :" msgid "! NOT" msgstr "! NOT" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -70,9 +70,10 @@ msgstr "%s już istnieje, zastÄ…pić?" #: Source/Core/DiscIO/Src/CompressedBlob.cpp:167 #, c-format msgid "%s failed to be scrubbed. Probably the image is corrupt." -msgstr "Oczyszczanie %s nie powiodÅ‚o siÄ™. Obraz prawdopodobnie jest uszkodzony." +msgstr "" +"Oczyszczanie %s nie powiodÅ‚o siÄ™. Obraz prawdopodobnie jest uszkodzony." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -81,7 +82,7 @@ msgstr "" "Wczytanie %s jako karty pamiÄ™ci nie powiodÅ‚o siÄ™\n" "NiewÅ‚aÅ›ciwa wielkość pliku (0x%x bajtów)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -90,14 +91,15 @@ msgstr "" "Wczytanie %s jako karty pamiÄ™ci nie powiodÅ‚o siÄ™\n" "NiewÅ‚aÅ›ciwa wielkość karty (0x%x bajtów)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format 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 "" "Wczytanie %s jako karty pamiÄ™ci nie powiodÅ‚o siÄ™\n" -"Plik nie jest wystarczajÄ…cej wielkoÅ›ci by być poprawnym plikiem karty pamiÄ™ci (0x%x bajtów)" +"Plik nie jest wystarczajÄ…cej wielkoÅ›ci by być poprawnym plikiem karty " +"pamiÄ™ci (0x%x bajtów)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -306,7 +308,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(Nieznany)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(wyÅ‚Ä…czone)" @@ -318,7 +320,7 @@ msgstr "16 bitów" msgid "32 bit" msgstr "32 bity" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "3D Vision" @@ -330,7 +332,7 @@ msgstr "8 bitów" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "" @@ -368,11 +370,13 @@ 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" @@ -389,7 +393,8 @@ msgstr "" " - RÄ™czne ustawienie iloÅ›ci kontrolerów używajÄ…c [Kontroler standardowy]\n" "\n" "Wszyscy gracze powinni używać tej samej wersji programu oraz ustawieÅ„.\n" -"WyÅ‚Ä…cz wszystkie karty pamiÄ™ci lub wyÅ›li je do wszystkich graczy przed rozpoczÄ™ciem.\n" +"WyÅ‚Ä…cz wszystkie karty pamiÄ™ci lub wyÅ›li je do wszystkich graczy przed " +"rozpoczÄ™ciem.\n" "Wsparcie dla Wiilota nie zostaÅ‚o jeszcze zaimplementowane.\n" "\n" "Wymagane jest przekierowanie portu TCP do hosta!" @@ -412,16 +417,22 @@ msgstr "O Dolphin" msgid "Acceleration" msgstr "Przyspieszenie" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "DokÅ‚adność:" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "Emulacja Accurate VBeam" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#, fuzzy 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, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" "DokÅ‚adnie emuluje kopie EFB.\n" "Niektóre gry wymagajÄ… tego do okreÅ›lonych efektów graficznych lub funkcji.\n" @@ -449,23 +460,38 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" -msgstr "BÅ‚Ä…d Action Replay: NiewÅ‚aÅ›ciwy rozmiar (%08x : address = %08x) w Add Code (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +msgstr "" +"BÅ‚Ä…d Action Replay: NiewÅ‚aÅ›ciwy rozmiar (%08x : address = %08x) w Add Code " +"(%s)" #: Source/Core/Core/Src/ActionReplay.cpp:756 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)" -msgstr "BÅ‚Ä…d Action Replay: NiewÅ‚aÅ›ciwy rozmiar (%08x : address = %08x) w Fill and Slide (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " +"(%s)" +msgstr "" +"BÅ‚Ä…d Action Replay: NiewÅ‚aÅ›ciwy rozmiar (%08x : address = %08x) w Fill and " +"Slide (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:549 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)" -msgstr "BÅ‚Ä…d Action Replay: NiewÅ‚aÅ›ciwy rozmiar (%08x : address = %08x) w Ram Write And Fill (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " +"Fill (%s)" +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 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Write To Pointer (%s)" -msgstr "BÅ‚Ä…d Action Replay: NiewÅ‚aÅ›ciwy rozmiar (%08x : address = %08x) w Write To Pointer (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Write To " +"Pointer (%s)" +msgstr "" +"BÅ‚Ä…d Action Replay: NiewÅ‚aÅ›ciwy rozmiar (%08x : address = %08x) w Write To " +"Pointer (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:803 #, c-format @@ -474,8 +500,11 @@ msgstr "BÅ‚Ä…d Action Replay: NiewÅ‚aÅ›ciwa wartość (%08x) w Memory Copy (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:684 #, c-format -msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "BÅ‚Ä…d Action Replay: Master Code and Write do CCXXXXXX nie jest zaimplementowane (%s)" +msgid "" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgstr "" +"BÅ‚Ä…d Action Replay: Master Code and Write do CCXXXXXX nie jest " +"zaimplementowane (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -502,12 +531,12 @@ msgstr "Action Replay: Normal Code %i: NiewÅ‚aÅ›ciwy podtyp %08x (%s)" 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:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "Adapter:" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "Dodaj" @@ -523,9 +552,9 @@ msgstr "Dodaj Å‚atkÄ™" msgid "Add new pane" msgstr "Dodaj nowy panel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "Dodaj..." @@ -537,14 +566,16 @@ msgstr "Adres :" 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 "" "Dodaje wskazanÄ… wartość do parametru zFar.\n" "Dwa sposoby wyrażenia wartoÅ›ci floating point.\n" -"PrzykÅ‚ad: wprowadzenie \"200\" lub \"0.0002\" bezpoÅ›rednio, generuje te same efekty, dokÅ‚adnÄ… wartoÅ›ciÄ… bÄ™dzie \"0.0002\".\n" +"PrzykÅ‚ad: wprowadzenie \"200\" lub \"0.0002\" bezpoÅ›rednio, generuje te same " +"efekty, dokÅ‚adnÄ… wartoÅ›ciÄ… bÄ™dzie \"0.0002\".\n" "WartoÅ›ci: (0->*/-Integer) lub (0->+/-FP[6 miejsc precyzji])\n" "\n" "Notka: Sprawdź LogWindow/Konsola dla ustwaionych wartoÅ›ci." @@ -553,14 +584,16 @@ 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 "" "Dodaje wskazanÄ… wartość do parametru zNear.\n" "Dwa sposoby wyrażenia wartoÅ›ci floating point.\n" -"PrzykÅ‚ad: wprowadzenie \"200\" lub \"0.0002\" bezpoÅ›rednio, generuje te same efekty, dokÅ‚adnÄ… wartoÅ›ciÄ… bÄ™dzie \"0.0002\".\n" +"PrzykÅ‚ad: wprowadzenie \"200\" lub \"0.0002\" bezpoÅ›rednio, generuje te same " +"efekty, dokÅ‚adnÄ… wartoÅ›ciÄ… bÄ™dzie \"0.0002\".\n" "WartoÅ›ci: (0->*/-Integer) lub (0->+/-FP[6 miejsc precyzji])\n" "\n" "Notka: Sprawdź LogWindow/Konsola dla ustwaionych wartoÅ›ci." @@ -569,7 +602,7 @@ 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:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "Zaawansowane" @@ -589,8 +622,8 @@ msgstr "Wszystkie obrazy GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Pliki GCM" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "All Save States (sav, s##)" msgstr "Stany zapisu (sav, s##)" @@ -606,21 +639,28 @@ msgstr "Spakowane obrazy GC/Wii (gcz)" msgid "All files (*.*)|*.*" msgstr "Wszystkie pliki (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 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 oknie emulacji.\n" +"Pozwala przeÅ‚Ä…czać okreÅ›lone opcje przez skróty klawiszowe 3, 4, 5, 6 i 7 w " +"oknie emulacji.\n" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Emulowany Wiilot" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" msgstr "Filtrowanie anizotropowe:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "Antyaliasing:" @@ -640,7 +680,7 @@ msgstr "Apploader:" msgid "Apply" msgstr "Zastosuj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -672,7 +712,7 @@ 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:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporcje ekranu:" @@ -693,19 +733,19 @@ msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: BÅ‚Ä…d otwarcia urzÄ…dzenia AO.\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Wiele z 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "Auto (rozmiar okna)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "Auto-dopasowanie rozmiaru okna" @@ -719,6 +759,18 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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/WXInputBase.cpp:27 msgid "Back" msgstr "Wstecz" @@ -727,8 +779,8 @@ msgstr "Wstecz" msgid "Backend Settings" msgstr "Ustawienia Backend'u" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Backend :" @@ -762,7 +814,7 @@ msgstr "Baner:" msgid "Bar" msgstr "Wajcha" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "Podstawowy" @@ -774,7 +826,7 @@ msgstr "Ustawienia podstawowe" msgid "Bass" msgstr "Bass" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Suma kontrolna Block Allocation Table nie powiodÅ‚a siÄ™" @@ -794,8 +846,8 @@ msgstr "Niebieski lewo" msgid "Blue Right" msgstr "Niebieski prawo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 msgid "Bottom" msgstr "Dół" @@ -828,9 +880,9 @@ msgstr "Szukaj folderu wyjÅ›ciowego" msgid "Buffer:" msgstr "Bufor:" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "Przyciski" @@ -846,23 +898,26 @@ msgstr "C-Stick" msgid "CPU Emulator Engine" msgstr "Silnik emulacji CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "Cache Display Lists" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 "" "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" +"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:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -872,11 +927,11 @@ msgid "" msgstr "" "Oblicza Å›wiatÅ‚a grafiki 3D na pixel zamiast na wierzchoÅ‚ek.\n" "Obniża szybkość emulacji o kilka procent (zależne od GPU).\n" -"Zazwyczaj bezpieczne ulepszenie, ale czasami może powodować bÅ‚Ä™dy.\\n" -"W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." +"Zazwyczaj bezpieczne ulepszenie, ale czasami może powodować bÅ‚Ä™dy.\\nW razie " +"wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Anuluj" @@ -924,10 +979,10 @@ msgstr "Nie można odnaleźć Wiilota po bd: %02x:%02x:%02x:%02x:%02x:%02x" 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:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Nie można odczytać z wtyczki DVD - Interfejs DVD: Poważny bÅ‚Ä…d" @@ -978,7 +1033,8 @@ msgstr "Zmienia symbol do parametru zNear (po poprawce)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 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!" +msgstr "" +"Zmiana tego nie bÄ™dzie miaÅ‚a wpÅ‚ywu jeÅ›li emulator jest w trakcie pracy!" #: Source/Core/DolphinWX/Src/NetWindow.cpp:282 msgid "Chat" @@ -1029,8 +1085,12 @@ msgid "Choose a memory card:" msgstr "Wybierz kartÄ™ pamiÄ™ci:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 -msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" -msgstr "Wybierz plik używany jako apploader: (dotyczy dysków stworzonych tylko z folderów)" +msgid "" +"Choose file to use as apploader: (applies to discs constructed from " +"directories only)" +msgstr "" +"Wybierz plik używany jako apploader: (dotyczy dysków stworzonych tylko z " +"folderów)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:764 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 @@ -1045,10 +1105,10 @@ msgstr "Circle Stick" msgid "Classic" msgstr "Classic" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "Wyczyść" @@ -1057,13 +1117,17 @@ msgid "Clear failed." msgstr "Czyszczenie nie powiodÅ‚o siÄ™." #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." -msgstr "Klient rozÅ‚Ä…czony podczas uruchomionej gry! NetPlay wyÅ‚Ä…czony. Musisz rÄ™cznie zatrzymać grÄ™." +msgid "" +"Client disconnect while game is running!! NetPlay is disabled. You must " +"manually stop the game." +msgstr "" +"Klient rozÅ‚Ä…czony podczas uruchomionej gry! NetPlay wyÅ‚Ä…czony. Musisz " +"rÄ™cznie zatrzymać grÄ™." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Zamknij" @@ -1167,7 +1231,7 @@ msgstr "PoÅ‚Ä…cz Wiilot 3" msgid "Connect Wiimote 4" msgstr "PoÅ‚Ä…cz Wiilot 4" -#: Source/Core/DolphinWX/Src/Main.cpp:608 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Connecting..." msgstr "ÅÄ…czÄ™..." @@ -1208,8 +1272,14 @@ msgstr "Beckend %s nie mógÅ‚ zostać zainicjalizowany." #: 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 "Nie można odczytać \"%s\". Brak noÅ›nika w napÄ™dzie lub to nie jest backup GC/Wii. Zwróć uwagÄ™, że oryginalne noÅ›niki GC i Wii nie bÄ™dÄ… odczytywane przez wiÄ™kszość napÄ™dów DVD." +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 "" +"Nie można odczytać \"%s\". Brak noÅ›nika w napÄ™dzie lub to nie jest backup GC/" +"Wii. Zwróć uwagÄ™, że oryginalne noÅ›niki GC i Wii nie bÄ™dÄ… odczytywane przez " +"wiÄ™kszość napÄ™dów DVD." #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format @@ -1229,16 +1299,18 @@ 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:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, 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 "" "Nie można zapisać pliku karty pamiÄ™ci %s.\n" "\n" -"Uruchamiasz program z CD/DVD albo plik zapisu jest zabezpieczony przed zapisem?" +"Uruchamiasz program z CD/DVD albo plik zapisu jest zabezpieczony przed " +"zapisem?" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 msgid "Couldn't find open command for extension 'ini'!" @@ -1276,8 +1348,11 @@ msgid "Created by KDE-Look.org" msgstr "Utworzone przez KDE-Look.org" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 -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 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:492 msgid "Created by VistaIcons.com" @@ -1285,7 +1360,8 @@ msgstr "Utworzone przez VistaIcons.com" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "Utworzone przez 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:15 msgid "Creator: " @@ -1295,11 +1371,11 @@ msgstr "Twórca:" msgid "Critical" msgstr "Krytyczny" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "ObciÄ™cie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1346,8 +1422,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulacja (szybkie)" @@ -1396,7 +1472,7 @@ msgstr "Dead Zone" msgid "Debug" msgstr "Debuguj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Debugging" msgstr "Debugowanie" @@ -1429,8 +1505,8 @@ msgstr "DomyÅ›lne ISO:" msgid "Default font" msgstr "DomyÅ›lna czcionka" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "UsuÅ„" @@ -1438,12 +1514,12 @@ msgstr "UsuÅ„" msgid "Delete Save" msgstr "UsuÅ„ zapis" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "Usunąć istniejÄ…cy plik '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 msgid "Description" msgstr "Opis" @@ -1453,8 +1529,12 @@ msgstr "Wykryj" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -msgid "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp." -msgstr "Wykryto próbÄ™ odczytu wiÄ™cej danych z DVD niż mieÅ›ci siÄ™ w buforze wyjÅ›ciowym. ZapchaÅ‚o siÄ™." +msgid "" +"Detected attempt to read more data from the DVD than fit inside the out " +"buffer. Clamp." +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 @@ -1470,15 +1550,15 @@ msgstr "Ustawienia urzÄ…dzenia" msgid "Dial" msgstr "PokrÄ™tÅ‚o" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1486,56 +1566,58 @@ msgstr "" "Suma kontrolna folderu oraz \n" "folderu zapasowego nie powiodÅ‚a siÄ™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 msgid "Disable" msgstr "WyÅ‚Ä…cz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "WyÅ‚Ä…cz mgÅ‚Ä™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "WyÅ‚Ä…cz Å›wiatÅ‚a" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "WyÅ‚Ä…cz Per-Pixel Depth" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "WyÅ‚Ä…cz tekstury" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "WyÅ‚Ä…cz gÅ‚oÅ›nik Wiilota" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 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 "" "WyÅ‚Ä…cz dowolnÄ… emulacjÄ™ XFB.\n" -"Przyspiesza znacznie emulacjÄ™, ale powoduje bÅ‚Ä™dy w wielu grach, które ich wymagajÄ… (szczególnie homebrew).\n" +"Przyspiesza znacznie emulacjÄ™, ale powoduje bÅ‚Ä™dy w wielu grach, które ich " +"wymagajÄ… (szczególnie homebrew).\n" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 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 "" "WyÅ‚Ä…cz emulacjÄ™ kopii EFB.\n" -"CzÄ™sto wykorzystywane do post-processingu lub efektów render-to-texture, wiÄ™c wÅ‚Ä…czajÄ…c tÄ… opcjÄ™ uzyskasz przyspieszenie, prawie zawsze powoduje bÅ‚Ä™dy.\n" +"CzÄ™sto wykorzystywane do post-processingu lub efektów render-to-texture, " +"wiÄ™c wÅ‚Ä…czajÄ…c tÄ… opcjÄ™ uzyskasz przyspieszenie, prawie zawsze powoduje " +"bÅ‚Ä™dy.\n" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1554,11 +1636,11 @@ msgstr "Dysk" msgid "Disc Read Error" msgstr "DÅ‚Ä…d odczytu dysku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "Ekran" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1572,7 +1654,7 @@ msgstr "" msgid "Divide" msgstr "Podziel" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Do you want to stop the current emulation?" msgstr "Zatrzymać aktualnÄ… emulacjÄ™?" @@ -1580,7 +1662,7 @@ msgstr "Zatrzymać aktualnÄ… emulacjÄ™?" msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Ustawienia graficzne %s" @@ -1601,12 +1683,12 @@ msgstr "Konfiguracja emulowanego Wiilota" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 msgid "Dolphin GCPad Configuration" msgstr "Konfiguracja GCPad'a" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmy TAS (*.dtm)" @@ -1619,15 +1701,23 @@ msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 -msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." -msgstr "Program nie mógÅ‚ znaleść żadnych obrazów GC/Wii ISO. Kliknij tutaj by przeglÄ…dać pliki..." +msgid "" +"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " +"files..." +msgstr "" +"Program nie mógÅ‚ znaleść żadnych obrazów GC/Wii ISO. Kliknij tutaj by " +"przeglÄ…dać pliki..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 -msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." -msgstr "Program jest obecnie ustawiony by ukrywać wszystkie gry. Kliknij tutaj by pokazać wszystkie gry..." +msgid "" +"Dolphin is currently set to hide all games. Doubleclick here to show all " +"games..." +msgstr "" +"Program jest obecnie ustawiony by ukrywać wszystkie gry. Kliknij tutaj by " +"pokazać wszystkie gry..." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Dół" @@ -1652,19 +1742,19 @@ msgstr "Atrapa" msgid "Dump Audio" msgstr "Zrzut Audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "Zrzut EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "Zrzut ramek" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "Zrzut tekstur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1674,7 +1764,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1684,7 +1774,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1694,9 +1784,9 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "Holenderski" @@ -1704,14 +1794,21 @@ msgstr "Holenderski" msgid "E&xit" msgstr "&WyjÅ›cie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" msgstr "EFB Copies" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, 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ć." +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ć." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 msgid "EUROPE" @@ -1750,7 +1847,7 @@ msgstr "Edytuj..." msgid "Effect" msgstr "Efekt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer" @@ -1758,27 +1855,34 @@ 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:111 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 "" "Emuluje XFB dokÅ‚adnie.\n" -"Spowalnia znacznie emulacjÄ™ i zabrania renderowania w wysokich rozdzielczoÅ›ciach, ale jest wymagane do prawidÅ‚owej emulacji niektórych gier.\n" +"Spowalnia znacznie emulacjÄ™ i zabrania renderowania w wysokich " +"rozdzielczoÅ›ciach, ale jest wymagane do prawidÅ‚owej emulacji niektórych " +"gier.\n" "\n" "W razie wÄ…tpliwoÅ›ci, wÅ‚Ä…cz wirtualnÄ… emulacjÄ™ XFB." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 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 "" "Emuluje XFB używajÄ…c obiektów tekstur GPU.\n" -"Naprawia wiele gier, które nie dziaÅ‚ajÄ… bez emulacji XFB, nie bÄ™dÄ…c jednakowo wolne jak rzeczywista emulacja XFB. Jednak może wciąż zawodzić dla pozostaÅ‚ej wiÄ™kszoÅ›ci gier (szczególnie homebrew).\n" +"Naprawia wiele gier, które nie dziaÅ‚ajÄ… bez emulacji XFB, nie bÄ™dÄ…c " +"jednakowo wolne jak rzeczywista emulacja XFB. Jednak może wciąż zawodzić dla " +"pozostaÅ‚ej wiÄ™kszoÅ›ci gier (szczególnie homebrew).\n" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." @@ -1794,15 +1898,17 @@ msgstr "Stan emulacji:" msgid "Enable" msgstr "WÅ‚Ä…cz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 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 "" -"WÅ‚Ä…cza efekty 3D poprzez stereoskopiÄ™ używajÄ…c technologii Nvidia 3D Vision jeÅ›li jest wspierana przez twojÄ… GPU.\n" +"WÅ‚Ä…cza efekty 3D poprzez stereoskopiÄ™ używajÄ…c technologii Nvidia 3D Vision " +"jeÅ›li jest wspierana przez twojÄ… GPU.\n" "Może powodować bÅ‚Ä™dy.\n" "Wymagany tryb peÅ‚noekranowy.\n" "\n" @@ -1824,6 +1930,10 @@ msgstr "WÅ‚Ä…cz BAT" msgid "Enable Block Merging" msgstr "WÅ‚Ä…cz Å‚Ä…czenie bloków" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +msgid "Enable Cache" +msgstr "WÅ‚Ä…cz cache" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "WÅ‚Ä…cz kody" @@ -1840,7 +1950,7 @@ msgstr "WÅ‚Ä…cz 2 rdzenie" msgid "Enable Dual Core (speedup)" msgstr "WÅ‚Ä…cz 2 rdzenie (przyspieszenie)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "WÅ‚Ä…cz skróty klawiszowe" @@ -1856,8 +1966,8 @@ msgstr "WÅ‚Ä…cz Idle Skipping (przyspieszenie)" msgid "Enable MMU" msgstr "WÅ‚Ä…cz MMU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "WÅ‚Ä…cz Progressive Scan" @@ -1869,7 +1979,7 @@ msgstr "WÅ‚Ä…cz wygaszacz ekranu" msgid "Enable WideScreen" msgstr "WÅ‚Ä…cz WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "WÅ‚Ä…cz Wireframe" @@ -1888,8 +1998,12 @@ msgstr "" "W razie wÄ…tpliwoÅ›ci, wybierz 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -msgid "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)" -msgstr "WÅ‚Ä…cz szybki dostÄ™p do dysku. Wymagane dla kilku gier. (ON = szybko, OFF = kompatybilne)" +msgid "" +"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " +"Compatible)" +msgstr "" +"WÅ‚Ä…cz szybki dostÄ™p do dysku. Wymagane dla kilku gier. (ON = szybko, OFF = " +"kompatybilne)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Enable pages" @@ -1909,21 +2023,33 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 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 "" -"WÅ‚Ä…cz jeÅ›li chcesz by główne okno Dolphina byÅ‚o używane do renderingu zamiast osobnego okna.\n" +"WÅ‚Ä…cz jeÅ›li chcesz by główne okno Dolphina byÅ‚o używane do renderingu " +"zamiast osobnego okna.\n" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 -msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." -msgstr "WÅ‚Ä…cz to by przyspieszyć The Legend of Zelda: Twilight Princess. WyÅ‚Ä…cz dla KAÅ»DEJ innej gry." +msgid "" +"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " +"ANY other game." +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:311 -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 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:334 msgid "Enables Custom Projection Hack" @@ -1942,10 +2068,14 @@ msgstr "" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" -msgstr "WÅ‚Ä…cza Memory Management Unit, wymagane dla niektórych gier. (ON = kompatybilny, OFF = szybko)" +msgid "" +"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " +"OFF = Fast)" +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:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -1959,14 +2089,14 @@ msgstr "" msgid "End" msgstr "Koniec" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "Angielski" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "Ulepszenia" @@ -1988,20 +2118,24 @@ msgstr "WejÅ›cie 1/%d" msgid "Equal" msgstr "Równy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "BÅ‚Ä…d" -#: Source/Core/DolphinWX/Src/Main.cpp:356 +#: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "BÅ‚Ä…d wczytywania wybranego jÄ™zyka. Ustawienia domyÅ›lne." #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 #, c-format -msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." -msgstr "BÅ‚Ä…d: Próba dostÄ™pu do czcionek %s ale nie sÄ… one wczytane. Gry mogÄ… pokazywać czcionki niewÅ‚aÅ›ciwie lub zawieÅ›cić siÄ™." +msgid "" +"Error: Trying to access %s fonts but they are not loaded. Games may not show " +"fonts correctly, or crash." +msgstr "" +"BÅ‚Ä…d: Próba dostÄ™pu do czcionek %s ale nie sÄ… one wczytane. Gry mogÄ… " +"pokazywać czcionki niewÅ‚aÅ›ciwie lub zawieÅ›cić siÄ™." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2064,7 +2198,7 @@ msgstr "Eksportuj zapis jako..." msgid "Extension" msgstr "Rozszerzenie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "External Frame Buffer" @@ -2185,7 +2319,7 @@ msgstr "Åadowanie hid.dll nie udaÅ‚o siÄ™" msgid "Failed to read banner.bin" msgstr "BÅ‚Ä…d odczytu banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2193,7 +2327,7 @@ msgstr "" "BÅ‚Ä…d poprawnego odczytu block allocation table backup\n" "(0x8000-0x9FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2206,7 +2340,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Odczyt z %d nieudany" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2214,7 +2348,7 @@ msgstr "" "BÅ‚Ä…d poprawnego odczytu folderu zapasowego\n" "(0x4000-0x5FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2222,7 +2356,7 @@ msgstr "" "BÅ‚Ä…d poprawnego odczytu folderu\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2230,7 +2364,7 @@ msgstr "" "BÅ‚Ä…d poprawnego odczytu nagłówka\n" "(0x0000-0x1FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2262,6 +2396,14 @@ 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/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "Szybki" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "Fast Mipmaps" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "Szybka wersja MMU. Nie funkcjonuje dla każdej gry." @@ -2290,7 +2432,7 @@ msgstr "" "Nie można otworzyć pliku\n" "lub posiada niewÅ‚aÅ›ciwe rozszerzenie" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2328,11 +2470,11 @@ msgstr "Blok pierwszy" msgid "Fix Checksums" msgstr "Napraw sumy kontrolne" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "WymuÅ› 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "WymuÅ› 4:3" @@ -2340,11 +2482,11 @@ msgstr "WymuÅ› 4:3" msgid "Force Console as NTSC-J" msgstr "WymuÅ› konsolÄ™ jako NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" msgstr "WymuÅ› filtrowanie tekstur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2371,12 +2513,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 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 "" "Wymusza tryb NTSC-J dla użycia czcionek japoÅ„skiego ROMu.\n" -"Pozostaw wyÅ‚Ä…czone, domyÅ›lnie NTSC-U i automatycznie wÅ‚Ä…cza gdy gramy w japoÅ„skie gry." +"Pozostaw wyÅ‚Ä…czone, domyÅ›lnie NTSC-U i automatycznie wÅ‚Ä…cza gdy gramy w " +"japoÅ„skie gry." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2401,7 +2545,7 @@ msgstr "Ramka" msgid "Frame Advance" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "Zrzuty ramek używajÄ… FFV1" @@ -2421,13 +2565,13 @@ msgstr "Limit ramek:" msgid "Frames To Record" msgstr "Ramki do nagrania" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "Free Look" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "Francuski" @@ -2444,7 +2588,7 @@ msgstr "Z" msgid "FullScr" msgstr "FullScr" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 msgid "Fullscreen resolution:" msgstr "Rozdzielczość peÅ‚noekranowa:" @@ -2488,8 +2632,8 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Ustawienia &pada GC" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Karty pamiÄ™ci GC (*.raw,*.gcp)" @@ -2511,9 +2655,9 @@ msgstr "" "BÅ‚Ä…d uruchomienia GeckoCode (CT%i CST%i) (%s)\n" "(zÅ‚y kod albo typ kodu nie jest jeszcze wspierany)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Główne" @@ -2521,9 +2665,9 @@ msgstr "Główne" msgid "General Settings" msgstr "Ustawienia ogólne" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "Niemiecki" @@ -2544,14 +2688,19 @@ msgstr "Ustawienia graficzne" msgid "Greater Than" msgstr "WiÄ™kszy niż" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#, fuzzy 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" "\n" "If unsure, leave this checked." msgstr "" -"Znacznie poprawia jakość tekstur generowanych przez renderowanie do efektów tekstur.\n" +"Znacznie poprawia jakość tekstur generowanych przez renderowanie do efektów " +"tekstur.\n" "ZwiÄ™kszenie wewnÄ™trznej rozdzielczoÅ›ci poprawi efekt tego ustawienia.\n" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." @@ -2580,11 +2729,11 @@ msgstr "Gitara" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY wywoÅ‚any, raportuj!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "Hacki" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Suma kontrolna nagłówka nie powiodÅ‚a siÄ™" @@ -2619,7 +2768,7 @@ msgstr "" msgid "Hide" msgstr "Ukryj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "Ukryj kursor myszy" @@ -2646,8 +2795,8 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Konfiguracja skrótów klawiszowych" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 msgid "Hotkeys" msgstr "Skróty klawiszowe" @@ -2662,16 +2811,19 @@ msgstr "Hybrydowy Wiilot" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 #, 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" +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:795 #, 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: Gra próbowaÅ‚a ponownie wczytać ios lub tytuÅ‚, który jest niedostÄ™pny w Twoim zrzucie NAND\n" +"IOCTL_ES_LAUNCH: Gra próbowaÅ‚a ponownie wczytać ios lub tytuÅ‚, który jest " +"niedostÄ™pny w Twoim zrzucie NAND\n" "TitleID %016llx.\n" "Program teraz chyba siÄ™ zawiesi :C" @@ -2712,38 +2864,49 @@ msgid "Icon" msgstr "Ikona" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -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)" +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:481 -msgid "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." -msgstr "JeÅ›li ustawisz limit ramek wiÄ™kszy niż peÅ‚na szybkość gry (NTSC:60, PAL:50), musisz także wyÅ‚Ä…czyc Audio Throttle w DSP dla peÅ‚nego efektu." +msgid "" +"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." +msgstr "" +"JeÅ›li ustawisz limit ramek wiÄ™kszy niż peÅ‚na szybkość gry (NTSC:60, PAL:50), " +"musisz także wyÅ‚Ä…czyc Audio Throttle w DSP dla peÅ‚nego efektu." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" msgstr "Ignoruj zmiany formatu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 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 "" "Ignoruje wszystkie zmiany formatu EFB.\n" -"Poprawia wydajność w wielu grach bez negatywnych skutków. Powoduje defekty graficzne w maÅ‚ej iloÅ›ci innych gier.\n" +"Poprawia wydajność w wielu grach bez negatywnych skutków. Powoduje defekty " +"graficzne w maÅ‚ej iloÅ›ci innych gier.\n" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 "" "Ignoruje wszystkie próby odczytu/zapisu EFB od CPU.\n" -"Poprawia wydajność w niektórych grach, ale może wyÅ‚Ä…czyć niektóre funkcje powiÄ…zane z grÄ… lub efekty graficzne.\n" +"Poprawia wydajność w niektórych grach, ale może wyÅ‚Ä…czyć niektóre funkcje " +"powiÄ…zane z grÄ… lub efekty graficzne.\n" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." @@ -2775,17 +2938,19 @@ msgstr "" "Zaimportowany plik posiada rozszerzenie sav\n" "lecz nie posiada wÅ‚aÅ›ciwego nagłówka" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 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 "" -"ZwiÄ™ksza wydajność, ale powoduje bÅ‚Ä™dy w grach, które wymagajÄ… wÅ‚aÅ›ciwej emulacji mgÅ‚y.\n" +"ZwiÄ™ksza wydajność, ale powoduje bÅ‚Ä™dy w grach, które wymagajÄ… wÅ‚aÅ›ciwej " +"emulacji mgÅ‚y.\n" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -2803,8 +2968,8 @@ msgstr "W grze" msgid "In-Game" msgstr "W grze" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "Info" @@ -2841,10 +3006,12 @@ msgid "Install to Wii Menu" msgstr "Zainstaluj do Wii Menu" #: Source/Core/Core/Src/MemTools.cpp:248 -msgid "InstallExceptionHandler called, but this platform does not yet support it." -msgstr "InstallExceptionHandler wywoÅ‚any, ale ta platforma nie wspiera go jeszcze." +msgid "" +"InstallExceptionHandler called, but this platform does not yet support it." +msgstr "" +"InstallExceptionHandler wywoÅ‚any, ale ta platforma nie wspiera go jeszcze." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 msgid "Installing WAD..." msgstr "Instalacja WAD..." @@ -2873,7 +3040,7 @@ 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:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 msgid "Internal Resolution:" msgstr "WewnÄ™trzna rozdzielczość:" @@ -2926,9 +3093,9 @@ msgstr "NewÅ‚aÅ›ciwy plik nagrania" msgid "Invalid state" msgstr "NiewÅ‚aÅ›ciwy stan" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "WÅ‚oski" @@ -2989,8 +3156,8 @@ msgstr "Ostatni nadpisany stan" msgid "Last Saved State" msgstr "Ostatni zapisany stan" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "Lewo" @@ -3036,7 +3203,7 @@ msgstr "Limit FPS" msgid "Load" msgstr "Wczytaj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Load Custom Textures" msgstr "Wczytaj wÅ‚asne tekstury" @@ -3076,16 +3243,16 @@ msgstr "Wczytaj stan Slot 8" msgid "Load State..." msgstr "Wczytaj stan..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Load Wii System Menu" msgstr "Wczytaj Wii System Menu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 #, 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:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3127,8 +3294,8 @@ msgstr "Typy logów" msgid "Logger Outputs" msgstr "Logger Outputs" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "Logging" @@ -3162,8 +3329,8 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Pliki MadCatz Gameshark(*.gcs)" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Główna gaÅ‚ka" @@ -3192,14 +3359,18 @@ msgstr "Karta pamiÄ™ci już otwarta" msgid "Memory Byte" msgstr "Bajt pamiÄ™ci" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 msgid "Memory Card" msgstr "Karta pamiÄ™ci" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" -msgstr "Memory Card Manager OSTRZEÅ»ENIE - Twórz kopie zapasowe przed użyciem, powinno zostać naprawione, ale może namieszać!" +msgid "" +"Memory Card Manager WARNING-Make backups before using, should be fixed but " +"could mangle stuff!" +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 #, c-format @@ -3218,7 +3389,7 @@ msgstr "" "%s\n" "Czy chcesz skopiować stary plik do nowej lokacji?\n" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "Wielkość pliku karty pamiÄ™ci nie odpowiada wielkoÅ›ci nagłówka" @@ -3235,7 +3406,7 @@ msgstr "Mikrofon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "Różne" @@ -3248,13 +3419,15 @@ msgstr "Ustawienia różne" msgid "Modifier" msgstr "Zmiennik" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 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 "" -"Modyfikuje tekstury by pokazaÅ‚y siÄ™ w formacie w jakim sÄ… zakodowane. Wymagany reset emulacji w wiÄ™kszoÅ›ci przypadków.\n" +"Modyfikuje tekstury by pokazaÅ‚y siÄ™ w formacie w jakim sÄ… zakodowane. " +"Wymagany reset emulacji w wiÄ™kszoÅ›ci przypadków.\n" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." @@ -3271,7 +3444,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3294,8 +3467,12 @@ msgid "Multiply" msgstr "Pomnóż" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." -msgstr " Wycisza gÅ‚oÅ›nik Wiilota. Naprawia losowe rozÅ‚Ä…czenia z prawdziwymi Wiilotami. Brak efektu na emulowanych Wiilotach." +msgid "" +"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " +"effect on emulated wiimotes." +msgstr "" +" Wycisza gÅ‚oÅ›nik Wiilota. Naprawia losowe rozÅ‚Ä…czenia z prawdziwymi " +"Wiilotami. Brak efektu na emulowanych Wiilotach." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:126 msgid "NP Add" @@ -3381,9 +3558,9 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Nazwa:" @@ -3468,7 +3645,7 @@ msgstr "Nie równe" msgid "Not Set" msgstr "Nie ustawiono" -#: Source/Core/DolphinWX/Src/Main.cpp:607 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Not connected" msgstr "Nie poÅ‚Ä…czono" @@ -3497,8 +3674,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "Liczba kodów:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "Nunchuk" @@ -3527,8 +3704,8 @@ msgstr "Offset:" msgid "Only %d blocks available" msgstr "DostÄ™pnych tylko %d bloków" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Open" msgstr "Otwórz" @@ -3558,11 +3735,11 @@ 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:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "OpenCL Texture Decoder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decoder" @@ -3593,14 +3770,18 @@ msgstr "" "PPM i wyeksportuj wszystkie zapisy,\n" "nastÄ™pnie zaimportuj te zapisy do nowej karty pamiÄ™ci\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "PozostaÅ‚e" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." -msgstr "Inny klient rozÅ‚Ä…czony podczas uruchomionej gry! NetPlay wyÅ‚Ä…czony. Musisz rÄ™cznie zatrzymać grÄ™." +msgid "" +"Other client disconnected while game is running!! NetPlay is disabled. You " +"manually stop the game." +msgstr "" +"Inny klient rozÅ‚Ä…czony podczas uruchomionej gry! NetPlay wyÅ‚Ä…czony. Musisz " +"rÄ™cznie zatrzymać grÄ™." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 msgid "Output" @@ -3655,13 +3836,13 @@ msgstr "Patche" msgid "Paths" msgstr "Åšcieżki" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "Pause" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Per-Pixel Lighting" msgstr "Per-Pixel Lighting" @@ -3674,10 +3855,10 @@ msgstr "Perfekcyjny" msgid "Perspective %d" msgstr "Perspekrtywa %d" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 msgid "Play" msgstr "Play" @@ -3701,7 +3882,7 @@ msgstr "Opcje playback'u" msgid "Players" msgstr "Gracze" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 msgid "Please confirm..." msgstr "Potwierdź..." @@ -3746,7 +3927,7 @@ msgstr "Portugalski" msgid "Portuguese (Brazilian)" msgstr "Portugalski (Brazylijski)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" @@ -3805,7 +3986,7 @@ msgstr "R Button" msgid "R-Analog" msgstr "R-Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "RAM" @@ -3821,7 +4002,7 @@ msgstr "ZasiÄ™g" msgid "Read-only mode" msgstr "Tryb tylko do odczytu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "Prawdziwy" @@ -3881,9 +4062,9 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, wybierz Å»adne." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "OdÅ›wież" @@ -3895,14 +4076,14 @@ msgstr "OdÅ›wież listÄ™" msgid "Refresh game list" msgstr "OdÅ›wież listÄ™ gier" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Remove" msgstr "UsuÅ„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -3912,12 +4093,12 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "Generuj w oknie głównym" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -3929,8 +4110,8 @@ msgstr "Wynik" msgid "Return" msgstr "Enter" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "Prawo" @@ -3955,13 +4136,17 @@ msgstr "Rosyjski" msgid "Sa&ve State" msgstr "Zapisz &stan" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "Bezpieczny" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "Wskaźnik próbkowania:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Zapisz" @@ -4027,6 +4212,10 @@ msgstr "Zapisz wypakowany GCM/ISO" msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +msgid "Scaled EFB Copy" +msgstr "Scaled EFB Copy" + #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format msgid "Scanning %s" @@ -4056,25 +4245,23 @@ msgstr "Filtr wyszukiwania" msgid "Search Subfolders" msgstr "Przeszukuj podfoldery" -#: Source/Core/Common/Src/SysConf.h:104 -#: Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 -#: Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 +#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Nie odnaleziono sekcji %s w SYSCONF" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "Select" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "Wybierz plik nagrania" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 msgid "Select a Wii WAD file to install" msgstr "Wybierz plik Wii WAD do zainstalowania" @@ -4100,15 +4287,15 @@ msgstr "Select floating windows" msgid "Select the file to load" msgstr "Wybierz plik do wczytania" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Select the save file" msgstr "Wybierz plik do zapisu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Wybierz stan do wczytania" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "Select the state to save" msgstr "Wybierz stan do zapisu" @@ -4137,13 +4324,15 @@ msgstr "Wybrana czcionka" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 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 "" "Wybiera rozdzielczość w trybie peÅ‚noekranowym.\n" -"Powinno być zawsze wiÄ™ksze bÄ…dź równe rozdzielczoÅ›ci wewnÄ™trznej. Wzrost wydajnoÅ›ci nieistotny.\n" +"Powinno być zawsze wiÄ™ksze bÄ…dź równe rozdzielczoÅ›ci wewnÄ™trznej. Wzrost " +"wydajnoÅ›ci nieistotny.\n" "\n" "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." @@ -4151,13 +4340,15 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 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 "" "Wybiera, które graficzne API ma być użyte wewnÄ™trznie.\n" -"Direct3D 9 zazwyczaj jest najszybsze. OpenGL jest bardziej dokÅ‚adne. Direct3D 11 jest pomiÄ™dzy tymi opcjami.\n" +"Direct3D 9 zazwyczaj jest najszybsze. OpenGL jest bardziej dokÅ‚adne. " +"Direct3D 11 jest pomiÄ™dzy tymi opcjami.\n" "\n" "W razie wÄ…tpliwoÅ›ci, użyj Direct3D 9." @@ -4178,7 +4369,8 @@ msgid "Serbian" msgstr "Serbski" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -msgid "Serial Port 1 - This is the port which devices such as the net adapter use" +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 @@ -4239,11 +4431,11 @@ msgstr "Pokaż pasek &narzÄ™dzi" msgid "Show Drives" msgstr "Pokaż napÄ™dy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "Pokaż EFB Copy Regions" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "Pokaż FPS" @@ -4255,7 +4447,7 @@ msgstr "Pokaż FrancjÄ™" msgid "Show GameCube" msgstr "Pokaż GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "Pokaż Input Display" @@ -4291,7 +4483,7 @@ msgstr "Pokaż platformy" msgid "Show Regions" msgstr "Pokaż regiony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "Pokaż statystyki" @@ -4318,10 +4510,12 @@ msgstr "Pokazuje okno potwierdzenia przed zatrzymaniem gry." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 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 "" "Pokazuje okno dialogowe gdy wystÄ…pi potencjalnie poważny bÅ‚Ä…d.\n" -"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." +"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:812 msgid "Show first block" @@ -4343,9 +4537,10 @@ msgstr "Pokaż ikonÄ™ zapisu" msgid "Show save title" msgstr "Pokaż tytuÅ‚ zapisu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 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 "" @@ -4361,7 +4556,7 @@ msgstr "Pokaż wiadomość pomocy" msgid "Show unknown" msgstr "Pokaż niewiadome" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -4387,21 +4582,39 @@ msgstr "Rozmiar" msgid "Skip BIOS" msgstr "PomiÅ„ BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "PomiÅ„ Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "PomiÅ„ EFB Access z CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 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 "" -"PomiÅ„ destination alpha pass używany w wielu grach dla niektórych efektów graficznych.\n" +"PomiÅ„ destination alpha pass używany w wielu grach dla niektórych efektów " +"graficznych.\n" +"\n" +"W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Przyspiesza kopie EFB do RAMu, poÅ›wiÄ™cajÄ…c dokÅ‚adność emulacji.\n" +"Czasami poprawia jakość grafiki.\n" +"JeÅ›li odczuwasz jakieÅ› bÅ‚Ä™dy, spróbuj podnieść dokÅ‚adność cachu tekstur lub " +"wyÅ‚Ä…cz tÄ… opcjÄ™.\n" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." @@ -4429,13 +4642,15 @@ msgstr "Renderer Programowy" #: 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 "" "Renderowanie programowe jest znacznie wolniejsze niż pozostaÅ‚e opcje.\n" "Użyteczne tylko w przypadku debugowania.\n" -"Czy na pewno chcesz wÅ‚Ä…czyć renderowanie programowe? W razie wÄ…tpliwoÅ›ci, wybierz 'Nie'." +"Czy na pewno chcesz wÅ‚Ä…czyć renderowanie programowe? W razie wÄ…tpliwoÅ›ci, " +"wybierz 'Nie'." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 msgid "Sound Settings" @@ -4455,9 +4670,9 @@ msgstr "Utworzenie bufora dźwiÄ™ku nie powiodÅ‚o siÄ™: %s" msgid "Space" msgstr "Space" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "HiszpaÅ„ski" @@ -4465,15 +4680,23 @@ msgstr "HiszpaÅ„ski" msgid "Speaker Volume:" msgstr "Poziom gÅ‚oÅ›nika:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 "" -"OkreÅ›la rozdzielczość do renderowania. Wysoka rozdzielczość podniesie jakość grafiki, ale znacznie obciąża wydajność i może powodować bÅ‚Ä™dy w niektórych grach.\n" -"\"Wiele z 640x528\" jest wolniejsze od \"Rozmiar Okna\", ale powoduje mniej bÅ‚Ä™dów. Ogólnie mówiÄ…c, im mniejsza rozdzielczość wewnÄ™trzna, tym lepsza bÄ™dzie wydajność.\n" +"OkreÅ›la rozdzielczość do renderowania. Wysoka rozdzielczość podniesie jakość " +"grafiki, ale znacznie obciąża wydajność i może powodować bÅ‚Ä™dy w niektórych " +"grach.\n" +"\"Wiele z 640x528\" jest wolniejsze od \"Rozmiar Okna\", ale powoduje mniej " +"bÅ‚Ä™dów. Ogólnie mówiÄ…c, im mniejsza rozdzielczość wewnÄ™trzna, tym lepsza " +"bÄ™dzie wydajność.\n" "\n" "W razie wÄ…tpliwoÅ›ci, wybierz 640x528." @@ -4493,9 +4716,9 @@ msgstr "Square Stick" msgid "Standard Controller" msgstr "Standard Controller" +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Start" @@ -4523,14 +4746,28 @@ msgstr "Stany zapisu" msgid "Stick" msgstr "GaÅ‚ka" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stop" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" +"Przechowuje kopie EFB w obiektach tekstur GPU.\n" +"Niezbyt dokÅ‚adne, ale dziaÅ‚a wystarczajÄ…co dobrze w wiÄ™kszoÅ›ci grach i daje " +"dobrego kopa przy EFB do RAMu :D.\n" +"\n" +"W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "RozciÄ…gnij do okna" @@ -4564,8 +4801,8 @@ msgstr "JÄ™zyk systemu:" msgid "TAIWAN" msgstr "Taiwan" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "WejÅ›cie TAS" @@ -4585,9 +4822,9 @@ msgstr "Talerz lewo" msgid "Table Right" msgstr "Talerz prawo" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "Zrób zdjÄ™cie" @@ -4595,7 +4832,15 @@ msgstr "Zrób zdjÄ™cie" msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "Tekstura" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +msgid "Texture Cache" +msgstr "Cache tekstur" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" msgstr "Format pokrycia tekstur" @@ -4628,15 +4873,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 "Nie można otworzyć pliku %s do zapisu. Sprawdź czy nie jest używany przez inny program." +msgid "" +"The file %s could not be opened for writing. Please check if it's already " +"opened by another program." +msgstr "" +"Nie można otworzyć pliku %s do zapisu. Sprawdź czy nie jest używany przez " +"inny program." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format 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:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Plik, który wybraÅ‚eÅ› (%s) nie istnieje" @@ -4653,13 +4902,28 @@ 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:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +msgstr "" +"Im bezpieczniejsze dasz ustawienia, tym mniej prawdopodobne, że emulator " +"pominie aktualizacje tekstur z RAMu.\n" +"\n" +"W razie wÄ…tpliwoÅ›ci, wybierz drugÄ… najszybszÄ… wartość od prawej." + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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:363 -msgid "The selected language is not supported by your system. Falling back to system default." -msgstr "Wybrany jÄ™zyk nie jest wspierany przez Twój system. Ustawienia domyÅ›lne." +#: Source/Core/DolphinWX/Src/Main.cpp:353 +msgid "" +"The selected language is not supported by your system. Falling back to " +"system default." +msgstr "" +"Wybrany jÄ™zyk nie jest wspierany przez Twój system. Ustawienia domyÅ›lne." #: Source/Core/Core/Src/NetPlayClient.cpp:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -4695,8 +4959,12 @@ msgid "Theme selection went wrong" msgstr "Wybór stylu nieudany" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 -msgid "There must be a ticket for 00000001/00000002. Your NAND dump is probably incomplete." -msgstr "Tutaj musi być ticket dla 00000001/00000002. Twój zrzut NAND jes prawdopodobnie niekompletny." +msgid "" +"There must be a ticket for 00000001/00000002. Your NAND dump is probably " +"incomplete." +msgstr "" +"Tutaj musi być ticket dla 00000001/00000002. Twój zrzut NAND jes " +"prawdopodobnie niekompletny." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "" @@ -4707,22 +4975,32 @@ msgstr "" "NieokreÅ›lone ustawienia odczytywane sÄ… ze źródÅ‚owych." #: Source/Core/Core/Src/ActionReplay.cpp:356 -msgid "This action replay simulator does not support codes that modify Action Replay itself." -msgstr "Ten symulator action replay nie wspiera kodów, które modyfikujÄ… Action Replay'a." +msgid "" +"This action replay simulator does not support codes that modify Action " +"Replay itself." +msgstr "" +"Ten symulator action replay nie wspiera kodów, które modyfikujÄ… Action " +"Replay'a." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 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:119 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 "" "Ta funkcja pozwala na wykorzystanie kamery gry.\n" -"Przytrzymaj prawy przycisk myszy i poruszaj by obracać kamerÄ…. Przytrzymaj SHIFT i naciÅ›nij jeden z klawiszy WSAD by zmienić dystans kamery (SHIFT+0 porusza szybciej i SHIFT+9 porusza wolniej). NaciÅ›nij SHIFT+R by zresetować kamerÄ™.\n" +"Przytrzymaj prawy przycisk myszy i poruszaj by obracać kamerÄ…. Przytrzymaj " +"SHIFT i naciÅ›nij jeden z klawiszy WSAD by zmienić dystans kamery (SHIFT+0 " +"porusza szybciej i SHIFT+9 porusza wolniej). NaciÅ›nij SHIFT+R by zresetować " +"kamerÄ™.\n" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." @@ -4734,11 +5012,14 @@ msgid "" "\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" +"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." +"Skrót klawiszowy : Przytrzymaj by natychmiastowo wyÅ‚Ä…czyc Audio " +"Throttle." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "This is used to play music tracks, like BGM." @@ -4746,11 +5027,14 @@ msgstr "Jest to używane do odtwarzania muzyki, BGM." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 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 "" "Rozdziela wÄ…tki wideo i CPU tak by mogÅ‚y dziaÅ‚ać na osobnych rdzeniach.\n" -"Znacznie zwiÄ™ksza wydajność na komputerach z wiÄ™cej niż jednym rdzeniem, ale powoduje także okazjonalne bÅ‚edy." +"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:283 msgid "This will let you Manually Edit the INI config file" @@ -4779,13 +5063,13 @@ msgstr "Do" msgid "Toggle All Log Types" msgstr "PrzeÅ‚Ä…cz wszystkie typy logów" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "PrzeÅ‚Ä…cz na peÅ‚ny ekran" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Top" msgstr "Góra" @@ -4793,7 +5077,7 @@ msgstr "Góra" msgid "Traditional Chinese" msgstr "ChiÅ„ski tradycyjny" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "Próbowano odczytać nieznany typ pliku." @@ -4801,8 +5085,7 @@ msgstr "Próbowano odczytać nieznany typ pliku." msgid "Triggers" msgstr "Spusty" -#: Source/Core/Common/Src/SysConf.h:92 -#: Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 msgid "Trying to read from invalid SYSCONF" msgstr "Próba odczytu z niewÅ‚aÅ›ciwego SYSCONF" @@ -4830,8 +5113,8 @@ msgstr "Typ" msgid "UDP Port:" msgstr "Port UDP:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "UDP Wiilot" @@ -4854,10 +5137,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 "" -"Nie można przeanalizować %lu linii wprowadzonego kodu AR jako poprawnego zaszyfrowanego/odszyfrowanego kodu. Sprawdź poprawność wpisanego kodu.\n" +"Nie można przeanalizować %lu linii wprowadzonego kodu AR jako poprawnego " +"zaszyfrowanego/odszyfrowanego kodu. Sprawdź poprawność wpisanego kodu.\n" "Czy chcesz pominąć liniÄ™ i kontynuować analizÄ™?" #: Source/Core/DolphinWX/Src/FrameTools.cpp:404 @@ -4902,8 +5187,8 @@ msgstr "" "Nieznany wskaźnik %#08x\n" "Kontynuować?" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "Góra" @@ -4920,7 +5205,7 @@ msgstr "Willot pionowo" msgid "Use EuRGB60 Mode (PAL60)" msgstr "Użyj trybu EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 msgid "Use Fullscreen" msgstr "Użyj trybu peÅ‚noekranowego" @@ -4932,7 +5217,7 @@ msgstr "Użyj HEX" msgid "Use Panic Handlers" msgstr "Użyj Panic Handlers" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -4944,23 +5229,26 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 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 "" -"Zazwyczaj, jeÅ›li kompilacja shaderów nie powiedzie siÄ™, jest wyÅ›wietlany bÅ‚Ä…d.\n" -"Jednak, można pominąć wyskakujÄ…ce okienka by cieszyć siÄ™ nieprzerwanÄ… grÄ… gdy zaznaczymy tÄ… opcjÄ™.\n" +"Zazwyczaj, jeÅ›li kompilacja shaderów nie powiedzie siÄ™, jest wyÅ›wietlany " +"bÅ‚Ä…d.\n" +"Jednak, można pominąć wyskakujÄ…ce okienka by cieszyć siÄ™ nieprzerwanÄ… grÄ… " +"gdy zaznaczymy tÄ… opcjÄ™.\n" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "NarzÄ™dzie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "V-Sync" @@ -4984,8 +5272,7 @@ msgstr "Verbosity" msgid "Video" msgstr "Wideo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "Wirtualny" @@ -5012,21 +5299,21 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Ostrzeżenie" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 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:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "Ostrzeżenie - uruchomienie ELF w zÅ‚ym trybie konsoli!" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "Ostrzeżenie - uruchomienie ISO w zÅ‚ym trybie konsoli!" @@ -5063,7 +5350,7 @@ msgstr "WaveFileWriter - plik nie jest otwarty." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "Widescreen Hack" @@ -5087,7 +5374,7 @@ msgstr "ŹródÅ‚o Wii NAND:" msgid "Wii Save Import" msgstr "Import zapisów Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 msgid "Wii save files (*.bin)|*.bin" msgstr "Pliki zapisu Wii (*.bin)|*.bin" @@ -5095,8 +5382,8 @@ msgstr "Pliki zapisu Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: nie moża odczytać z pliku" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "Wiilot" @@ -5118,7 +5405,7 @@ msgstr "" "lub zbyt dÅ‚ugi czas nieobecnoÅ›ci lub coÅ› innego.\n" "PoÅ‚Ä…czyć ponownie?" -#: Source/Core/DolphinWX/Src/Main.cpp:609 +#: Source/Core/DolphinWX/Src/Main.cpp:599 msgid "Wiimote Connected" msgstr "Wiilot poÅ‚Ä…czony" @@ -5150,7 +5437,7 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Zawijanie wierszy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5209,7 +5496,8 @@ msgstr "Musisz wprowadzić nazwÄ™!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 msgid "You must enter a valid decimal, hexadecimal or octal value." -msgstr "Musisz wprowadzić poprawnÄ… wartość dziesiÄ™tnÄ…, szestnastkowÄ… lub ósemkowÄ…." +msgstr "" +"Musisz wprowadzić poprawnÄ… wartość dziesiÄ™tnÄ…, szestnastkowÄ… lub ósemkowÄ…." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 msgid "You must enter a valid profile name." @@ -5256,7 +5544,7 @@ msgstr "Kod zero nieznany dla programu: %08x" msgid "[ waiting ]" msgstr "[ czekam ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5272,21 +5560,26 @@ msgstr "" msgid "[Custom]" msgstr "[WÅ‚asne]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 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 "" "[EKSPERYMENTALNE]\n" -"Celuje w przyspieszenie emulacji poprzez przeÅ‚ożenie dekodowania tekstur na GPU wykorzystujÄ…c frameworki OpenCL.\n" -"Jednak, w tej chwili jest znane z powodowania defektów tekstur w niektórych grach. Dodatkowo jest wolniejsze od powszechnego dekodowania tekstur przez CPU w wiÄ™kszoÅ›ci przypadków.\n" +"Celuje w przyspieszenie emulacji poprzez przeÅ‚ożenie dekodowania tekstur na " +"GPU wykorzystujÄ…c frameworki OpenCL.\n" +"Jednak, w tej chwili jest znane z powodowania defektów tekstur w niektórych " +"grach. Dodatkowo jest wolniejsze od powszechnego dekodowania tekstur przez " +"CPU w wiÄ™kszoÅ›ci przypadków.\n" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5386,9 +5679,6 @@ msgstr "| OR" #~ msgid "AOSound" #~ msgstr "AOSound" -#~ msgid "Accuracy:" -#~ msgstr "DokÅ‚adność:" - #~ msgid "Accurate Texture Cache" #~ msgstr "Accurate Texture Cache" @@ -5424,17 +5714,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" @@ -5497,6 +5776,9 @@ msgstr "| OR" #~ msgid "Danish" #~ msgstr "DuÅ„ski" +#~ msgid "Disable Wiimote Speaker" +#~ msgstr "WyÅ‚Ä…cz gÅ‚oÅ›nik Wiilota" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -5560,9 +5842,6 @@ msgstr "| OR" #~ msgid "Enable CPU Access" #~ msgstr "WÅ‚Ä…cz dostÄ™p CPU" -#~ msgid "Enable Cache" -#~ msgstr "WÅ‚Ä…cz cache" - #~ msgid "Enable Copy to EFB" #~ msgstr "WÅ‚Ä…cz kopiowanie do EFB" @@ -5630,12 +5909,6 @@ msgstr "| OR" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Nieudane Å‚adowanie romu DSP: %s" -#~ msgid "Fast" -#~ msgstr "Szybki" - -#~ msgid "Fast Mipmaps" -#~ msgstr "Fast Mipmaps" - #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -5794,15 +6067,9 @@ msgstr "| OR" #~ msgid "Running script...\n" #~ msgstr "WykonujÄ™ skrypt...\n" -#~ msgid "Safe" -#~ msgstr "Bezpieczny" - #~ msgid "Scale:" #~ msgstr "Skala:" -#~ msgid "Scaled EFB Copy" -#~ msgstr "Scaled EFB Copy" - #~ msgid "Select resolution for fullscreen mode" #~ msgstr "Wybierz rozdzielczość peÅ‚nego ekranu" @@ -5853,21 +6120,6 @@ msgstr "| OR" #~ msgid "Skies of Arcadia" #~ msgstr "Skies of Arcadia" -#~ 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" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Przyspiesza kopie EFB do RAMu, poÅ›wiÄ™cajÄ…c dokÅ‚adność emulacji.\n" -#~ "Czasami poprawia jakość grafiki.\n" -#~ "JeÅ›li odczuwasz jakieÅ› bÅ‚Ä™dy, spróbuj podnieść dokÅ‚adność cachu tekstur " -#~ "lub wyÅ‚Ä…cz tÄ… opcjÄ™.\n" -#~ "\n" -#~ "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." - #~ msgid "Slot" #~ msgstr "Slot" @@ -5906,39 +6158,9 @@ msgstr "| OR" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Rozpocznij rendering w trybie peÅ‚noekranowym." -#~ 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" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "Przechowuje kopie EFB w obiektach tekstur GPU.\n" -#~ "Niezbyt dokÅ‚adne, ale dziaÅ‚a wystarczajÄ…co dobrze w wiÄ™kszoÅ›ci grach i " -#~ "daje dobrego kopa przy EFB do RAMu :D.\n" -#~ "\n" -#~ "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." - -#~ msgid "Texture" -#~ msgstr "Tekstura" - -#~ msgid "Texture Cache" -#~ msgstr "Cache tekstur" - #~ msgid "The file " #~ msgstr "Plik" -#~ msgid "" -#~ "The safer you adjust this, the less likely the emulator will be missing " -#~ "any texture updates from RAM.\n" -#~ "\n" -#~ "If unsure, use the second-fastest value from the right." -#~ msgstr "" -#~ "Im bezpieczniejsze dasz ustawienia, tym mniej prawdopodobne, że emulator " -#~ "pominie aktualizacje tekstur z RAMu.\n" -#~ "\n" -#~ "W razie wÄ…tpliwoÅ›ci, wybierz drugÄ… najszybszÄ… wartość od prawej." - #~ 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." diff --git a/Languages/po/pt.po b/Languages/po/pt.po index f0c417e9de..9da0b1c8ec 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: 2011-08-10 08:30-0500\n" +"POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-07-23 15:53-0000\n" "Last-Translator: Zilaan \n" "Language-Team: Zilaan \n" @@ -32,7 +32,7 @@ msgstr "Jogo: " msgid "! NOT" msgstr "! NÃO" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -74,7 +74,7 @@ msgstr "%s já existe, substituir?" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s falha ao ficar scrubbed. Provavelmente a imagem está corrompida." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, fuzzy, c-format msgid "" "%s failed to load as a memorycard \n" @@ -83,7 +83,7 @@ msgstr "" "O cartão de memória falhou ao abrir\n" " O tamanho do cartão é inválido (%04X)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, fuzzy, c-format msgid "" "%s failed to load as a memorycard \n" @@ -92,7 +92,7 @@ msgstr "" "O cartão de memória falhou ao abrir\n" " O tamanho do cartão é inválido (%04X)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -307,7 +307,7 @@ msgstr "(-)+zPerto" msgid "(UNKNOWN)" msgstr "(DESCONHECIDO)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(desligado)" @@ -319,7 +319,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "3D Vision" @@ -331,7 +331,7 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "" @@ -418,17 +418,22 @@ msgstr "Sobre o Dolphin" msgid "Acceleration" msgstr "Aceleração" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "Precisão:" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "Emulação VBeam precisa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#, fuzzy msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" "Emula com precisão as cópias EFB.\n" "Alguns jogos dependem disto para certos efeitos gráficos ou funcionalidades " @@ -528,12 +533,12 @@ msgstr "Action Replay: Código normal %i: Subtipo inválido %08x (%s)" 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:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "Adaptador:" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "Adicionar" @@ -549,9 +554,9 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "Adicionar..." @@ -600,7 +605,7 @@ 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:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "Avançadas" @@ -620,8 +625,8 @@ msgstr "Todas as imagens GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Todos os ficheiros Gamecube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "All Save States (sav, s##)" msgstr "Todos os Estados Guardados (sav, s##)" @@ -637,7 +642,7 @@ msgstr "Todos os ficheiros GC/Wii ISO comprimidos (gcz)" msgid "All files (*.*)|*.*" msgstr "Todos os ficheiros (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -649,11 +654,16 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Wiimote Emulado" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" msgstr "Filtro Anisotrópico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "Anti-Serrilhamento" @@ -673,7 +683,7 @@ msgstr "Apploader:" msgid "Apply" msgstr "Aplicar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -707,7 +717,7 @@ msgstr "" "permanentemente!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção de ecrã:" @@ -728,19 +738,19 @@ msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "Automático (Multiplo de 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "Auto (Dimensão da Janela)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "Ajuste Automático da Dimensão da Janela" @@ -754,6 +764,19 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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/WXInputBase.cpp:27 msgid "Back" msgstr "Trás" @@ -762,8 +785,8 @@ msgstr "Trás" msgid "Backend Settings" msgstr "Definições Backend" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Backend:" @@ -797,7 +820,7 @@ msgstr "Banner:" msgid "Bar" msgstr "Barra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "Básico" @@ -809,7 +832,7 @@ msgstr "Definições Básicas" msgid "Bass" msgstr "Baixo" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Verificação da Tabela de Atribuição de Blocos falhou" @@ -829,8 +852,8 @@ msgstr "Azul esquerda" msgid "Blue Right" msgstr "Azul Direita" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 msgid "Bottom" msgstr "Inferior" @@ -863,9 +886,9 @@ msgstr "Procurar por pasta de destino" msgid "Buffer:" msgstr "Buffer:" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "Botões" @@ -881,11 +904,11 @@ msgstr "C-Stick" msgid "CPU Emulator Engine" msgstr "Motor de emulador de CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "Cache de listas de Visualização" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 " @@ -902,7 +925,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção activada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -918,8 +941,8 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Cancelar" @@ -967,10 +990,10 @@ msgstr "" 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:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 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" @@ -1093,10 +1116,10 @@ msgstr "Stick circular" msgid "Classic" msgstr "Clássico" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "Limpar" @@ -1112,10 +1135,10 @@ msgstr "" "O Cliente desligou enquanto jogo decorria!! NetPlay está desactivado. Terá " "que parar o jogo manualmente." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fechar" @@ -1219,7 +1242,7 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:608 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Connecting..." msgstr "A conectar..." @@ -1288,7 +1311,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:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1358,11 +1381,11 @@ msgstr "Criador:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "Recortar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1409,8 +1432,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Motor de Emulador DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "DSP HLE emulation (fast)" msgstr "Emulação de DSP HLE (rápido)" @@ -1459,7 +1482,7 @@ msgstr "Zona morta" msgid "Debug" msgstr "Depuração" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Debugging" msgstr "Depuração" @@ -1492,8 +1515,8 @@ msgstr "ISO Padrão:" msgid "Default font" msgstr "Tipo de letra Padrão" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "Apagar" @@ -1501,12 +1524,12 @@ msgstr "Apagar" msgid "Delete Save" msgstr "Apagar Jogo Guardado" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "Apagar o ficheiro existente '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 msgid "Description" msgstr "Descrição" @@ -1537,15 +1560,15 @@ msgstr "Definições de Dispositivo" msgid "Dial" msgstr "Marcação" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1553,32 +1576,28 @@ 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:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 msgid "Disable" msgstr "Desactivar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "Desactivar Nevoeiro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "Desactivar Luminosidade" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "Desactivar Profundidade por Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "Desactivar Texturas" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "Desactivar Altifalante do Wiimote" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1592,7 +1611,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:95 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1608,7 +1627,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1627,11 +1646,11 @@ msgstr "Disco" msgid "Disc Read Error" msgstr "Erro de leitura de disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "Visualização" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1645,7 +1664,7 @@ msgstr "" msgid "Divide" msgstr "Dividir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Do you want to stop the current emulation?" msgstr "Deseja parar a emulação actual?" @@ -1653,7 +1672,7 @@ msgstr "Deseja parar a emulação actual?" msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Configurações Gráficas" @@ -1674,12 +1693,12 @@ msgstr "Configuração da emulação de Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 msgid "Dolphin GCPad Configuration" msgstr "Configuração de GCPad " #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS filmes (*.dtm)" @@ -1707,8 +1726,8 @@ msgstr "" "Dolphin está actualmente definido para esconder todos os jogos. Duplo " "clique aqui para mostrar todos os jogos..." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Baixo" @@ -1733,19 +1752,19 @@ msgstr "Dummy" msgid "Dump Audio" msgstr "Depositar Ãudio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "Depositar Alvo EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "Depositar Quadros" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "Depositar Texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1756,7 +1775,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:112 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1766,7 +1785,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:114 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1776,9 +1795,9 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "Holandês" @@ -1786,7 +1805,7 @@ msgstr "Holandês" msgid "E&xit" msgstr "S&air" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" msgstr "Cópias EFB" @@ -1840,7 +1859,7 @@ msgstr "Editar..." msgid "Effect" msgstr "Efeito" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "Frame Buffer Embutido" @@ -1848,7 +1867,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:111 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1862,7 +1881,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:110 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1890,7 +1909,7 @@ msgstr "Estado da Emulação:" msgid "Enable" msgstr "Activar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1922,6 +1941,10 @@ msgstr "Activar BAT" msgid "Enable Block Merging" msgstr "Activar Fusão de blocos" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +msgid "Enable Cache" +msgstr "Activar Cache" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "Activar Cheats" @@ -1938,7 +1961,7 @@ msgstr "Activar Dual Core" msgid "Enable Dual Core (speedup)" msgstr "Activar Dual Core (aumento de desempenho)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "Activar Teclas de Atalho" @@ -1954,8 +1977,8 @@ msgstr "Activar Idle Skipping (aumento de desempenho)" msgid "Enable MMU" msgstr "Activar MMU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "Activar Progressive Scan" @@ -1967,7 +1990,7 @@ msgstr "Activar Protector de Ecrã" msgid "Enable WideScreen" msgstr "Activar Ecrã Panorâmico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "Activar Wireframe" @@ -2064,7 +2087,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:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2078,14 +2101,14 @@ msgstr "" msgid "End" msgstr "Fim" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "Inglês" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "Melhorias" @@ -2107,13 +2130,13 @@ msgstr "Entrada 1/%d" msgid "Equal" msgstr "Igual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "Erro" -#: Source/Core/DolphinWX/Src/Main.cpp:356 +#: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Erro ao carregar o idioma seleccionado. Será revertido para o idioma padrão " @@ -2190,7 +2213,7 @@ msgstr "Exportar guardar como..." msgid "Extension" msgstr "Extensão" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "Frame Buffer externo" @@ -2312,7 +2335,7 @@ msgstr "Falha ao carregar hid.dll" msgid "Failed to read banner.bin" msgstr "Falha ao ler banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2321,7 +2344,7 @@ msgstr "" "atribuídos\n" "(0x8000-0x9FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2334,7 +2357,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Falha ao ler dados do ficheiro %d" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2342,7 +2365,7 @@ msgstr "" "Falha ao ler correctamente a pasta com cópia de segurança\n" "(0x4000-0x5FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2350,7 +2373,7 @@ msgstr "" "Falha ao ler a pasta correctamente\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2358,7 +2381,7 @@ msgstr "" "Falha ao ler o cabeçalho correctamente\n" "(0x0000-0x1FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2390,6 +2413,14 @@ 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/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "Rápido" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "Mipmaps rápidos" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 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." @@ -2418,7 +2449,7 @@ msgstr "" "O ficheiro não pôde ser aberto\n" "ou não tem uma extensão válida" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2456,11 +2487,11 @@ msgstr "Primeiro Bloco" msgid "Fix Checksums" msgstr "Corrigir Checksums" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "Forçar 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "Forçar 4:3" @@ -2468,11 +2499,11 @@ msgstr "Forçar 4:3" msgid "Force Console as NTSC-J" msgstr "Definir a consola como NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" msgstr "Forçar Filtro de Textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2507,7 +2538,7 @@ msgstr "" "Se deixar desactivada, o dolphin utiliza a NTSC-U como padrão e " "automaticamente activa esta definição quando um jogo Japonês é jogado." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2532,7 +2563,7 @@ msgstr "Quadro" msgid "Frame Advance" msgstr "Avançar Quadro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "Depósitos de Quadros usam FFV1" @@ -2552,13 +2583,13 @@ msgstr "Limite de Quadros:" msgid "Frames To Record" msgstr "Quadros para Gravar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "Vista Livre" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "Francês" @@ -2575,7 +2606,7 @@ msgstr "De" msgid "FullScr" msgstr "Ecrã Inteiro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 msgid "Fullscreen resolution:" msgstr "Resolução em ecrã Inteiro:" @@ -2619,8 +2650,8 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Definições de Comando &Gamecube" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Cartões de memória Gamecube (*.raw,*.gcp)" @@ -2642,9 +2673,9 @@ 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/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -2652,9 +2683,9 @@ msgstr "Geral" msgid "General Settings" msgstr "Definições Gerais" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "Alemão" @@ -2675,11 +2706,14 @@ msgstr "Definições Gráficas" msgid "Greater Than" msgstr "Maior Que" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#, fuzzy msgid "" -"Greatly increases quality of textures generated using render-to-texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2713,11 +2747,11 @@ msgstr "Guitarra" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY é chamada, Por favor reporte!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "Hacks" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Verificação de Cabeçalho falhou" @@ -2753,7 +2787,7 @@ msgstr "" msgid "Hide" msgstr "Esconder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "Esconder o cursor do rato" @@ -2780,8 +2814,8 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Configuração de Teclas de atalho" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 msgid "Hotkeys" msgstr "Teclas de Atalho" @@ -2865,11 +2899,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:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" msgstr "Ignorar Mudanças de Formato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2883,7 +2917,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:93 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 " @@ -2925,7 +2959,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:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2937,7 +2971,7 @@ msgstr "" "\n" "Em caso de dúvida, manteha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -2956,8 +2990,8 @@ msgstr "Em Jogo" msgid "In-Game" msgstr "Em-Jogo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "Informação" @@ -2999,7 +3033,7 @@ msgid "" msgstr "" "InstallExceptionHandler chamado, mas esta plataforma ainda não a suporta." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 msgid "Installing WAD..." msgstr "A Instalar WAD..." @@ -3028,7 +3062,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "Erro interno de LZO - lzo_init() falhou" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 msgid "Internal Resolution:" msgstr "Resolução Interna:" @@ -3081,9 +3115,9 @@ msgstr "Ficheiro de Gravação inválido" msgid "Invalid state" msgstr "Estado Inválido" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "Italiano" @@ -3144,8 +3178,8 @@ msgstr "Último estado Substituído" msgid "Last Saved State" msgstr "Último Estado Guardado" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "Esquerda" @@ -3191,7 +3225,7 @@ msgstr "Limitar por FPS" msgid "Load" msgstr "Carregar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Load Custom Textures" msgstr "Carregar Texturas Personalizadas" @@ -3231,16 +3265,16 @@ msgstr "Carregar Estado Slot 8" msgid "Load State..." msgstr "Carregar Estado..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Load Wii System Menu" msgstr "Carregar Sistema de Menu Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 #, 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:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3282,8 +3316,8 @@ msgstr "Tipos de Relatório" msgid "Logger Outputs" msgstr "Saídas de Gerador de Relatórios" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "Relatório em execução" @@ -3317,8 +3351,8 @@ msgstr "MMU Hack de velocidade" msgid "MadCatz Gameshark files(*.gcs)" msgstr "ficheiros MadCatz Gameshark(*.gcs)" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick Principal" @@ -3347,8 +3381,8 @@ msgstr "O cartão de memória já abriu" msgid "Memory Byte" msgstr "Byte de Memória" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 msgid "Memory Card" msgstr "Cartão de memória" @@ -3377,7 +3411,7 @@ msgstr "" "%s\n" "Quer fazer uma cópia do ficheiro antigo para esta nova localização?\n" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "" @@ -3394,7 +3428,7 @@ msgstr "Mic" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "Diversos" @@ -3407,7 +3441,7 @@ msgstr "Configurações Diversas" msgid "Modifier" msgstr "Modificador" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3432,7 +3466,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3547,9 +3581,9 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Nome:" @@ -3634,7 +3668,7 @@ msgstr "Não igual" msgid "Not Set" msgstr "Não definido" -#: Source/Core/DolphinWX/Src/Main.cpp:607 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Not connected" msgstr "Não conectado" @@ -3663,8 +3697,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "Número De Códigos" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "Nunchuk" @@ -3693,8 +3727,8 @@ msgstr "Offset:" msgid "Only %d blocks available" msgstr "Apenas %d blocos disponíveis" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Open" msgstr "Abrir" @@ -3724,11 +3758,11 @@ 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:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "Descodificador de Textura OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "Descodificador de Textura OpenMP" @@ -3759,8 +3793,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:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "Outro" @@ -3825,13 +3859,13 @@ msgstr "Patches" msgid "Paths" msgstr "Caminhos" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "Pausa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Per-Pixel Lighting" msgstr "Iluminação por Pixel" @@ -3844,10 +3878,10 @@ msgstr "Perfeito" msgid "Perspective %d" msgstr "Perspectiva %d" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 msgid "Play" msgstr "Começar" @@ -3871,7 +3905,7 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 msgid "Please confirm..." msgstr "Por favor confirme..." @@ -3916,7 +3950,7 @@ msgstr "Português" msgid "Portuguese (Brazilian)" msgstr "Português (Brasileiro)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "Efeito de Pós-Processamento" @@ -3975,7 +4009,7 @@ msgstr "Botão R" msgid "R-Analog" msgstr "R-Analógico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "RAM" @@ -3991,7 +4025,7 @@ msgstr "Alcance" msgid "Read-only mode" msgstr "Modo só de leitura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "Real" @@ -4053,9 +4087,9 @@ msgstr "" "\n" "Em caso de dúvida, seleccione Nenhum." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Actualizar" @@ -4067,14 +4101,14 @@ msgstr "Actualizar Lista" msgid "Refresh game list" msgstr "Actualizar lista de Jogos" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Remove" msgstr "Remover" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4084,12 +4118,12 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "Renderizar para a Janela Principal" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -4101,8 +4135,8 @@ msgstr "Resultados" msgid "Return" msgstr "Return" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "Direita" @@ -4127,13 +4161,17 @@ msgstr "Russo" msgid "Sa&ve State" msgstr "Gua&rdar Estado" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "Seguro" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "Taxa de Amostragem:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Guardar" @@ -4199,6 +4237,10 @@ msgstr "Jogo guardado descomprimido GCM/ISO" 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:401 +msgid "Scaled EFB Copy" +msgstr "Cópia EFB Escalada" + #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format msgid "Scanning %s" @@ -4234,17 +4276,17 @@ msgstr "Procurar em Sub-Pastas" msgid "Section %s not found in SYSCONF" msgstr "Selecção %s não encontrada em SYSCONF" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "Seleccionar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "Seleccione o Ficheiro de Gravação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 msgid "Select a Wii WAD file to install" msgstr "Seleccione um ficheiro Wii WAD para instalar" @@ -4270,15 +4312,15 @@ msgstr "Seleccionar janelas flutuantes" msgid "Select the file to load" msgstr "Seleccione o ficheiro para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Select the save file" msgstr "Seleccione o ficheiro de jogo guardado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Seleccione o estado para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "Select the state to save" msgstr "Seleccione o estado para gravar" @@ -4417,11 +4459,11 @@ msgstr "Mostrar Barra de Ferramen&tas" msgid "Show Drives" msgstr "Mostrar Unidades" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "Mostrar Regiões de Cópia EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "Mostrar FPS" @@ -4433,7 +4475,7 @@ msgstr "Mostrar França" msgid "Show GameCube" msgstr "Mostrar GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "Mostrar visualização de Entradas" @@ -4469,7 +4511,7 @@ msgstr "Mostrar Plataformas" msgid "Show Regions" msgstr "Mostrar Regiões" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "Mostrar Estatísticas" @@ -4523,7 +4565,7 @@ msgstr "Mostrar ícone de guardar" msgid "Show save title" msgstr "Mostrar o título de jogo guardado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4543,7 +4585,7 @@ msgstr "Mostrar esta mensagem de ajuda" msgid "Show unknown" msgstr "Mostrar desconhecido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -4569,15 +4611,15 @@ msgstr "Dimensão" msgid "Skip BIOS" msgstr "Saltar Bios" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "Saltar Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "Ignorar o acesso do EFB a partir do CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4589,6 +4631,23 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Aumenta ligeiramente as cópias de EFB para RAM ao sacrificar a precisão da " +"emulação.\n" +"Por vezes também aumenta a qualidade visual.\n" +"Se está a experenciar quaisquer problemas, tente aumentar a precisão do " +"cache de textura ou desactive esta opção.\n" +"\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 #, c-format @@ -4642,9 +4701,9 @@ msgstr "Criação do buffer de som falhou: %s" msgid "Space" msgstr "Espaço" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "Espanhol" @@ -4652,7 +4711,7 @@ msgstr "Espanhol" msgid "Speaker Volume:" msgstr "Volume do Altifalante:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 " @@ -4688,9 +4747,9 @@ msgstr "Stick quadrado" msgid "Standard Controller" msgstr "Comando padrão" +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Começar" @@ -4718,14 +4777,28 @@ msgstr "Estados Guardados" msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Parar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" +"Guarda cópias EFB em objectos de textura GPU.\n" +"Isto não é tão preciso, mas funciona suficientemente bem para a maioria dos " +"jogos e proporciona mais velocidade que o EFB para RAM.\n" +"\n" +"Em caso de dúvida, mantenha esta opção activada." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "Ajustar à janela" @@ -4759,8 +4832,8 @@ msgstr "Idioma do sistema:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "Entrada TAS" @@ -4780,9 +4853,9 @@ msgstr "Table Esquerda" msgid "Table Right" msgstr "Table Direita" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "Tirar Screenshot" @@ -4790,7 +4863,15 @@ msgstr "Tirar Screenshot" msgid "Test" msgstr "Teste" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "Textura" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +msgid "Texture Cache" +msgstr "Cache de Textura" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" msgstr "Formato da textura" @@ -4837,7 +4918,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:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "O ficheiro que especificou (%s) não existe" @@ -4854,12 +4935,24 @@ 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:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +msgstr "" +"Quanto mais seguro o ajuste, menos o emulador irá falhar actualizações de " +"texturas através da RAM.\n" +"\n" +"Em caso de dúvida, utilize o segundo valor mais rápido a partir da direita." + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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:363 +#: Source/Core/DolphinWX/Src/Main.cpp:353 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4928,7 +5021,7 @@ msgstr "" 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:119 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. " @@ -5007,13 +5100,13 @@ msgstr "Para" msgid "Toggle All Log Types" msgstr "Alternar Todos os Tipos de Relatório" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Alternar Ecrã Inteiro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Top" msgstr "Topo" @@ -5021,7 +5114,7 @@ msgstr "Topo" msgid "Traditional Chinese" msgstr "Chinês Tradicional" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "Tentou carregar um tipo de ficheiro desconhecido." @@ -5057,8 +5150,8 @@ msgstr "Tipo" msgid "UDP Port:" msgstr "Porta UDP:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5131,8 +5224,8 @@ msgstr "" "Apontador desconhecido %#08x\n" "Continuar?" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "Cima" @@ -5149,7 +5242,7 @@ msgstr "Wiimote na vertical" msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar modo EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 msgid "Use Fullscreen" msgstr "Utilizar Ecrã Inteiro" @@ -5161,7 +5254,7 @@ msgstr "Usar Hex" msgid "Use Panic Handlers" msgstr "Usar Manipuladores de Pânico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5174,7 +5267,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:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5189,11 +5282,11 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "Utilidade" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "V-Sync" @@ -5217,8 +5310,7 @@ msgstr "Verbosidade" msgid "Video" msgstr "Vídeo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "Virtual" @@ -5246,21 +5338,21 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Aviso" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 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:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "Aviso - A iniciar um ELF em modo errado de consola!" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "Aviso - A iniciar um ISO em modo errado de consola!" @@ -5298,7 +5390,7 @@ msgstr "WaveFileWriter - ficheiro não aberto." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "Hack de Ecrã Panorâmico" @@ -5322,7 +5414,7 @@ msgstr "Raiz de NAND Wii:" msgid "Wii Save Import" msgstr "Importação de Jogo Guardado Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 msgid "Wii save files (*.bin)|*.bin" msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin" @@ -5330,8 +5422,8 @@ 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/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "Wiimote" @@ -5354,7 +5446,7 @@ msgstr "" "razão.\n" "Quer reconectar imediatamente?" -#: Source/Core/DolphinWX/Src/Main.cpp:609 +#: Source/Core/DolphinWX/Src/Main.cpp:599 msgid "Wiimote Connected" msgstr "Wiimote Conectado" @@ -5387,7 +5479,7 @@ msgstr "Janelas Direita" msgid "Word Wrap" msgstr "Moldar o texto" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5491,7 +5583,7 @@ msgstr "Código Zero desconhecido para o Dolphin: %08x" msgid "[ waiting ]" msgstr "[ em espera ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5507,7 +5599,7 @@ msgstr "" msgid "[Custom]" msgstr "[Costumizar]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5526,7 +5618,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:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5616,9 +5708,6 @@ msgstr "| OU" #~ msgid "< as Default Profile >" #~ msgstr "< como Perfil Padrão >" -#~ msgid "Accuracy:" -#~ msgstr "Precisão:" - #~ msgid "Accurate Texture Cache" #~ msgstr "Cache de textura precisa" @@ -5649,19 +5738,6 @@ 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" @@ -5707,6 +5783,9 @@ msgstr "| OU" #~ msgid "Danish" #~ msgstr "Dinamarquês" +#~ msgid "Disable Wiimote Speaker" +#~ msgstr "Desactivar Altifalante do Wiimote" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -5752,9 +5831,6 @@ msgstr "| OU" #~ msgid "Enable CPU Access" #~ msgstr "Activar acesso ao CPU" -#~ msgid "Enable Cache" -#~ msgstr "Activar Cache" - #~ msgid "Enable Copy to EFB" #~ msgstr "Activar cópia para EFB" @@ -5812,12 +5888,6 @@ msgstr "| OU" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Falha ao carregar ROM DSP: %s" -#~ msgid "Fast" -#~ msgstr "Rápido" - -#~ msgid "Fast Mipmaps" -#~ msgstr "Mipmaps rápidos" - #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -5935,15 +6005,9 @@ msgstr "| OU" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "Necessário para usar o ROM com caracteres japoneses" -#~ msgid "Safe" -#~ msgstr "Seguro" - #~ msgid "Scale:" #~ msgstr "Escala:" -#~ msgid "Scaled EFB Copy" -#~ msgstr "Cópia EFB Escalada" - #~ msgid "Select resolution for fullscreen mode" #~ msgstr "Seleccionar resolução para modo de ecrã inteiro" @@ -5993,22 +6057,6 @@ msgstr "| OU" #~ "Mostra várias estatísticas.\n" #~ "Isto é apenas útil para propósitos de depuração." -#~ 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" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Aumenta ligeiramente as cópias de EFB para RAM ao sacrificar a precisão " -#~ "da emulação.\n" -#~ "Por vezes também aumenta a qualidade visual.\n" -#~ "Se está a experenciar quaisquer problemas, tente aumentar a precisão do " -#~ "cache de textura ou desactive esta opção.\n" -#~ "\n" -#~ "Em caso de dúvida, mantenha esta opção desactivada." - #~ msgid "Slot" #~ msgstr "Slot" @@ -6046,37 +6094,6 @@ msgstr "| OU" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Começar a janela renderizada em ecrã inteiro" -#~ 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" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "Guarda cópias EFB em objectos de textura GPU.\n" -#~ "Isto não é tão preciso, mas funciona suficientemente bem para a maioria " -#~ "dos jogos e proporciona mais velocidade que o EFB para RAM.\n" -#~ "\n" -#~ "Em caso de dúvida, mantenha esta opção activada." - -#~ msgid "Texture" -#~ msgstr "Textura" - -#~ msgid "Texture Cache" -#~ msgstr "Cache de Textura" - -#~ msgid "" -#~ "The safer you adjust this, the less likely the emulator will be missing " -#~ "any texture updates from RAM.\n" -#~ "\n" -#~ "If unsure, use the second-fastest value from the right." -#~ msgstr "" -#~ "Quanto mais seguro o ajuste, menos o emulador irá falhar actualizações de " -#~ "texturas através da RAM.\n" -#~ "\n" -#~ "Em caso de dúvida, utilize o segundo valor mais rápido a partir da " -#~ "direita." - #~ msgid "Use FPS For Limiting" #~ msgstr "Usar FPS como limitador" diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index 479c1da646..a914664694 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: 2011-08-10 08:30-0500\n" -"PO-Revision-Date: 2011-09-11 23:35-0300\n" +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-12-18 13:38-0600\n" "Last-Translator: Runo \n" "Language-Team: Portuguese (BR) \n" "Language: \n" @@ -30,7 +30,7 @@ msgstr " Jogo : " msgid "! NOT" msgstr "! NÃO" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -73,7 +73,7 @@ msgstr "%s já existe, deseja substituir?" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s não pôde ser \"limpo\". A imagem provavelmente está corrompida." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -82,7 +82,7 @@ msgstr "" "%s falhou ao ser carregado como Memory Card\n" " O tamanho é inválido (0x%x bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -91,7 +91,7 @@ msgstr "" "%s falhou ao ser carregado como Memory Card\n" " O tamanho é inválido (0x%x bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -308,7 +308,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(DESCONHECIDO)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(desligado)" @@ -320,7 +320,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "3D Vision" @@ -332,7 +332,7 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "" @@ -420,17 +420,22 @@ msgstr "Sobre o Dolphin" msgid "Acceleration" msgstr "Aceleração" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "Precisão:" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "Emulção precisa de VBeam" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#, fuzzy msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" "Emula as Cópias do EFB com precisão.\n" "Alguns jogos dependem disso para certos efeitos visuais ou funções de " @@ -530,12 +535,12 @@ msgstr "Action Replay: Normal Code %i: Subtipo inválido %08x (%s)" 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:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "Adaptador:" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "Adicionar" @@ -551,9 +556,9 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painél" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "Adicionar..." @@ -601,7 +606,7 @@ 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:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "Avançado" @@ -621,8 +626,8 @@ msgstr "Todas as imagens CG/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Todos os arquivos Gamecube CGM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "All Save States (sav, s##)" msgstr "Todos os Pontos de Jogo Salvos (sav, s##)" @@ -638,7 +643,7 @@ msgstr "Todos os arquivos ISO GC/Wii comprimidos" msgid "All files (*.*)|*.*" msgstr "Todos os arquivos (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -650,11 +655,16 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Emular Wiimote" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" msgstr "Filtragem Anisotrópica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "Anti-Aliasing:" @@ -674,7 +684,7 @@ msgstr "Apploader:" msgid "Apply" msgstr "Aplicar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -708,7 +718,7 @@ msgstr "" "sempre!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção:" @@ -729,19 +739,19 @@ msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Múltiplo de 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "Auto (Tamanho da Janela)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "Ajustar Automaticamente o Tamanho da Janela" @@ -755,6 +765,19 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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/WXInputBase.cpp:27 msgid "Back" msgstr "Voltar" @@ -763,8 +786,8 @@ msgstr "Voltar" msgid "Backend Settings" msgstr "Configurações do Backend" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Backend:" @@ -798,7 +821,7 @@ msgstr "Banner:" msgid "Bar" msgstr "Alavanca" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "Básico" @@ -810,7 +833,7 @@ msgstr "Configurações Básicas" msgid "Bass" msgstr "Baixo" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Falha no teste de Mesa de Alocação de Blocos" @@ -830,8 +853,8 @@ msgstr "Azul Esquerdo" msgid "Blue Right" msgstr "Azul Direito" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 msgid "Bottom" msgstr "Embaixo" @@ -864,9 +887,9 @@ msgstr "Procurar por um diretório de saída" msgid "Buffer:" msgstr "Buffer:" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "Botões" @@ -882,11 +905,11 @@ msgstr "C-Stick" msgid "CPU Emulator Engine" msgstr "Engine de Emulação do CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "Cache das Listas de Display" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 " @@ -903,7 +926,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 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,8 +940,8 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Cancelar" @@ -968,10 +991,10 @@ 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:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Não é possível ler de DVD_Plugin - DVD-Interface: Erro Fatal" @@ -1093,10 +1116,10 @@ msgstr "Analógico Circular" msgid "Classic" msgstr "Clássico" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "Limpar" @@ -1112,10 +1135,10 @@ msgstr "" "O Client desconectou-se enquanto o jogo rodava!! O NetPlay foi desativado. " "Você deve parar o jogo manualmente." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fechar" @@ -1219,7 +1242,7 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:608 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Connecting..." msgstr "Conectando..." @@ -1288,7 +1311,7 @@ msgstr "" "no momento!\n" "(Definir os controles durante o jogo ainda não é suportado)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1358,11 +1381,11 @@ msgstr "Criador:" msgid "Critical" msgstr "Crítico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "Cortar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1409,8 +1432,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Engine de Emulação do DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "DSP HLE emulation (fast)" msgstr "Emulação HLE do DSP (rápido)" @@ -1459,7 +1482,7 @@ msgstr "Zona Morta" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Debugging" msgstr "Debugging" @@ -1492,8 +1515,8 @@ msgstr "ISO Padrão:" msgid "Default font" msgstr "Fonte Padrão" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "Excluir" @@ -1501,12 +1524,12 @@ msgstr "Excluir" msgid "Delete Save" msgstr "Deletar Save" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "Apagar o arquivo existente '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 msgid "Description" msgstr "Descrição" @@ -1537,15 +1560,15 @@ msgstr "Configurações de Dispositivo" msgid "Dial" msgstr "Discar" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1553,32 +1576,28 @@ msgstr "" "A checagem de diretório falhou\n" " e a checagem de Backup de Diretório falhou" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 msgid "Disable" msgstr "Desativar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "Desativar Neblina" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "Desativar Iluminação" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "Desativar Profundidade por Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "Desativar Texturas" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "Desabilitar o Auto-Falante do Wiimote" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1592,7 +1611,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto ativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1608,7 +1627,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1627,11 +1646,11 @@ msgstr "Disco" msgid "Disc Read Error" msgstr "Erro na leitura do Disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "Display" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1645,7 +1664,7 @@ msgstr "" msgid "Divide" msgstr "Dividir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Do you want to stop the current emulation?" msgstr "Você quer parar a emulação atual?" @@ -1653,7 +1672,7 @@ msgstr "Você quer parar a emulação atual?" msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Configurações %s Gráficas do Dolphin" @@ -1674,12 +1693,12 @@ msgstr "Configuração de Wiimote Emulado do Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 msgid "Dolphin GCPad Configuration" msgstr "Configuração do GCPad do Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmes TAS Dolphin (*.dtm)" @@ -1707,8 +1726,8 @@ msgstr "" "Dolphin atualmente está configurado para esconder todos os jogos. Duplo-" "clique aqui para mostrar todos os jogos..." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Para Baixo" @@ -1733,19 +1752,19 @@ msgstr "Dummy" msgid "Dump Audio" msgstr "Extrair Ãudio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "Extrair Código EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "Extrair Quadros" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "Extrair Texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1756,7 +1775,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1765,7 +1784,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:114 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1775,9 +1794,9 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "Holandês" @@ -1785,7 +1804,7 @@ msgstr "Holandês" msgid "E&xit" msgstr "&Sair" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" msgstr "Cópias de EFB" @@ -1839,7 +1858,7 @@ msgstr "Editar..." msgid "Effect" msgstr "Efeito" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "Frame Buffer Embutido" @@ -1847,7 +1866,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:111 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1861,7 +1880,7 @@ msgstr "" "\n" "Se estiver em dúvida, selecione Virtual." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1889,7 +1908,7 @@ msgstr "Estado de Emulação" msgid "Enable" msgstr "Ativar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1921,6 +1940,10 @@ msgstr "Ativar BAT" msgid "Enable Block Merging" msgstr "Ativar Block Merging" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +msgid "Enable Cache" +msgstr "Ativar Cache" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "Ativar Cheats" @@ -1937,7 +1960,7 @@ msgstr "Ativar Núcleo Duplo" msgid "Enable Dual Core (speedup)" msgstr "Ativar Núcleo Duplo (Aumento na velocidade)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "Ativar Hotkeys" @@ -1953,8 +1976,8 @@ msgstr "Ativar Idle Skipping (Aumento na velocidade)" msgid "Enable MMU" msgstr "Ativar MMU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "Ativar Varredura Progressiva" @@ -1966,7 +1989,7 @@ msgstr "Ativar Salva-Tela" msgid "Enable WideScreen" msgstr "Ativar WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "Ativar Wireframe" @@ -2063,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:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2077,14 +2100,14 @@ msgstr "" msgid "End" msgstr "Fim" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "Inglês" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "Improvisos" @@ -2106,13 +2129,13 @@ msgstr "Entry 1/%d" msgid "Equal" msgstr "Igual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "Erro" -#: Source/Core/DolphinWX/Src/Main.cpp:356 +#: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema." @@ -2187,7 +2210,7 @@ msgstr "Exportar Salvar como..." msgid "Extension" msgstr "Extensão" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "Frame Buffer Externo" @@ -2308,7 +2331,7 @@ msgstr "Falha ao carregar hid.dll" msgid "Failed to read banner.bin" msgstr "Falha ao ler banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2316,7 +2339,7 @@ msgstr "" "Falha ao ler mesa de alocação de blocos corretamente\n" "(0x8000-0x9FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2329,7 +2352,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Falha ao ler dados do arquivo %d" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2337,7 +2360,7 @@ msgstr "" "Não foii possível ler o Backup do diretório corretamente\n" "(0x4000-0x5FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2345,7 +2368,7 @@ msgstr "" "Não foi possível ler o diretório corretamente\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2353,7 +2376,7 @@ msgstr "" "Não foi possível ler o header corretamente\n" "(0x0000-0x1FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2385,6 +2408,14 @@ 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/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "Rápido" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "Mipmaps Rápidos" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 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." @@ -2413,7 +2444,7 @@ msgstr "" "O arquivo não pode ser aberto\n" "ou não tem uma extensão válida" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2451,11 +2482,11 @@ msgstr "Primeiro Bloco" msgid "Fix Checksums" msgstr "Corrigir Checksums" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "Forçar 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "Forçar 4:3" @@ -2463,11 +2494,11 @@ msgstr "Forçar 4:3" msgid "Force Console as NTSC-J" msgstr "Forçar Console para NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" msgstr "Forçar Filtro de Texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2502,7 +2533,7 @@ msgstr "" "Se isto ficar desativado, o Dolphin usa NTSC-U e ativa esta opção " "automaticamente quando você jogar jogos japoneses." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2527,7 +2558,7 @@ msgstr "Quadro" msgid "Frame Advance" msgstr "Avançar Quadro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "Extração de Quadros usam FFV1" @@ -2547,13 +2578,13 @@ msgstr "Limitador de FPS:" msgid "Frames To Record" msgstr "QUadros para Capturar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "Olhar Livre" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "Francês" @@ -2570,7 +2601,7 @@ msgstr "De" msgid "FullScr" msgstr "Tela Cheia" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 msgid "Fullscreen resolution:" msgstr "Resolução da Tela Cheia:" @@ -2614,8 +2645,8 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Configurações de &Controle de Gamecube" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Memory Cards do Gamecube (*.raw,*.gcp)" @@ -2637,9 +2668,9 @@ msgstr "" "Falha ao rodar o GeckoCode (CT%i CST%i) (%s)\n" "(É um código ruim ou um tipo de código não suportado.)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -2647,9 +2678,9 @@ msgstr "Geral" msgid "General Settings" msgstr "Configurações Gerais" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "Alemão" @@ -2670,11 +2701,14 @@ msgstr "Configurações Gráficas" msgid "Greater Than" msgstr "Maior do que" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#, fuzzy msgid "" -"Greatly increases quality of textures generated using render-to-texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2708,11 +2742,11 @@ msgstr "Guitarra" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY foi chamado, favor reportar!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "Hacks" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "A checagem do header falhou" @@ -2749,7 +2783,7 @@ msgstr "" msgid "Hide" msgstr "Ocultar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "Esconder Cursor Do Mouse" @@ -2776,8 +2810,8 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Configuração de hotkey" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 msgid "Hotkeys" msgstr "Hotkeys" @@ -2860,11 +2894,11 @@ msgstr "" "do jogo (NTSC:60, PAL:50), você também vai precisar desativar o Throttle de " "Ãudio no DSP para que funcione." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" msgstr "Ignorar Mudanças de Formato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2878,7 +2912,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto ativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 " @@ -2920,7 +2954,7 @@ msgstr "" "O arquivo importado tem a extensão sav\n" "mas não tem um header correto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2932,7 +2966,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe esta opção desativada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -2951,8 +2985,8 @@ msgstr "Funciona" msgid "In-Game" msgstr "In-Game" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "Info" @@ -2995,7 +3029,7 @@ msgstr "" "InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem " "suporte a ele." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 msgid "Installing WAD..." msgstr "Instalando WAD..." @@ -3024,7 +3058,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "Erro Interno do LZO - lzo_init() falhou" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 msgid "Internal Resolution:" msgstr "Resolução Interna:" @@ -3077,9 +3111,9 @@ msgstr "Arquivo de gravação inválido" msgid "Invalid state" msgstr "Estado Salvo Inválido" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "Italiano" @@ -3140,8 +3174,8 @@ msgstr "Último State sobrescrito" msgid "Last Saved State" msgstr "Último State Salvo" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "Esquerda" @@ -3187,7 +3221,7 @@ msgstr "Limitar por FPS" msgid "Load" msgstr "Carregar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Load Custom Textures" msgstr "Carregar Texturas Personalizadas" @@ -3227,16 +3261,16 @@ msgstr "Carregar Estado do Slot 8" msgid "Load State..." msgstr "Carregar State..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Load Wii System Menu" msgstr "Carregar Menu de Sistema do Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 #, 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:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3279,8 +3313,8 @@ msgstr "Tipo de Log" msgid "Logger Outputs" msgstr "Resposta do Logger" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "Logando" @@ -3314,8 +3348,8 @@ msgstr "Hack de velocidade MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Arquivos de Gameshark MadCatz(*.gcs)" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Analógico Principal" @@ -3344,8 +3378,8 @@ msgstr "O Memory Card já está aberto" msgid "Memory Byte" msgstr "Byte de Memória" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 msgid "Memory Card" msgstr "Cartão de memoria" @@ -3374,7 +3408,7 @@ msgstr "" "%s\n" "Você gostaria de copiar o arquivo antigo para o novo local?\n" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "O tamanho do arquivo do Memory Card é diferente do tamanho do header" @@ -3391,7 +3425,7 @@ msgstr "Microfone" msgid "Min" msgstr "Mínimo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "Diversas" @@ -3404,7 +3438,7 @@ msgstr "Opções diversas" msgid "Modifier" msgstr "Modificador" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3430,7 +3464,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3544,9 +3578,9 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Nome:" @@ -3631,7 +3665,7 @@ msgstr "Não igual" msgid "Not Set" msgstr "Indefinido" -#: Source/Core/DolphinWX/Src/Main.cpp:607 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Not connected" msgstr "Não conectado" @@ -3660,8 +3694,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "Números dos códigos:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "Nunchuk" @@ -3690,8 +3724,8 @@ msgstr "Offset:" msgid "Only %d blocks available" msgstr "Apenas %d blocos disponíveis" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Open" msgstr "Abrir" @@ -3721,11 +3755,11 @@ 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:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "Decodificador de Texturas OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "Decodificador de Texturas OpenMP" @@ -3756,8 +3790,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:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "Outros" @@ -3822,13 +3856,13 @@ msgstr "Patches" msgid "Paths" msgstr "Diretórios" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "Pausar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Per-Pixel Lighting" msgstr "Iluminação Por Pixels" @@ -3841,10 +3875,10 @@ msgstr "Perfeito" msgid "Perspective %d" msgstr "Perspectiva %d" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 msgid "Play" msgstr "Executar" @@ -3868,7 +3902,7 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 msgid "Please confirm..." msgstr "Favor confirmar..." @@ -3913,7 +3947,7 @@ msgstr "Português" msgid "Portuguese (Brazilian)" msgstr "Português (Brasil)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "Efeito Pós-Processamento" @@ -3972,7 +4006,7 @@ msgstr "Botão R" msgid "R-Analog" msgstr "R-Analógico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "RAM" @@ -3988,7 +4022,7 @@ msgstr "Alcance" msgid "Read-only mode" msgstr "Modo Somente Leitura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "Real" @@ -4048,9 +4082,9 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Atualizar" @@ -4062,14 +4096,14 @@ msgstr "Atualizar Lista" msgid "Refresh game list" msgstr "Atualizar a lista de jogos" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Remove" msgstr "Remover" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4079,12 +4113,12 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "Renderizar na Janela Principal" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -4096,8 +4130,8 @@ msgstr "Resultados" msgid "Return" msgstr "Retornar" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "Direita" @@ -4122,13 +4156,17 @@ msgstr "Russo" msgid "Sa&ve State" msgstr "Sal&var estado atual" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "Seguro" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "Taxa de Amostragem:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Salvar" @@ -4194,6 +4232,10 @@ msgstr "Salvar GCM/ISO descomprimido" 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:401 +msgid "Scaled EFB Copy" +msgstr "Cópia Escalada do EFB" + #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format msgid "Scanning %s" @@ -4229,17 +4271,17 @@ msgstr "Procurar em sub-pastas" msgid "Section %s not found in SYSCONF" msgstr "A seção %s não foi encontrada no SYSCONF" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "Selecionar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "Selecione o arquivo de Gravação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 msgid "Select a Wii WAD file to install" msgstr "Selecione um arquivo WAD de Wii para instalar" @@ -4264,15 +4306,15 @@ msgstr "Selecionar Janelas flutuantes" msgid "Select the file to load" msgstr "Selecione um arquivo para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Select the save file" msgstr "Selecione o arquivo de salva" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Selecione um estado para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "Select the state to save" msgstr "Selecione um estado para salvar" @@ -4412,11 +4454,11 @@ msgstr "Show Barra de &Ferramentas" msgid "Show Drives" msgstr "Mostrar Drives" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "Mostrar Regiões de Cópia do EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "Mostrar FPS" @@ -4428,7 +4470,7 @@ msgstr "Mostrar França" msgid "Show GameCube" msgstr "Mostrar GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "Mostrar" @@ -4464,7 +4506,7 @@ msgstr "Mostrar Plataformas" msgid "Show Regions" msgstr "Mostrar Regiões" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "Mostrar Estatísticas" @@ -4518,7 +4560,7 @@ msgstr "Mostrar ícone do salva" msgid "Show save title" msgstr "Mostrar título do salva" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4538,7 +4580,7 @@ msgstr "Mostra esta menssagem de ajuda" msgid "Show unknown" msgstr "Mostra desconhecido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -4564,15 +4606,15 @@ msgstr "Tamanho" msgid "Skip BIOS" msgstr "Pular a BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "Não fazer o Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "Não permite o acesso da CPU ao EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4584,6 +4626,23 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Aumenta a velocidade de cópias do EFB para a RAM sacrificando um pouco a " +"precisão da emulação.\n" +"Às vezes também aumenta a qualidade visual.\n" +"Se você está tendo problemas, tente aumentar a Precisão do Cache de Texturas " +"ou desative esta opção.\n" +"\n" +"Se estiver em dúvida, deixe isto desativado." + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4636,9 +4695,9 @@ msgstr "Falha na criação do buffer de som: %s" msgid "Space" msgstr "Barra de Espaço" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "Espanhol" @@ -4646,7 +4705,7 @@ msgstr "Espanhol" msgid "Speaker Volume:" msgstr "Volume do Auto-Falante:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 " @@ -4682,9 +4741,9 @@ msgstr "Analógico Quadrado" msgid "Standard Controller" msgstr "Controle Padrão" +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Start" @@ -4712,14 +4771,28 @@ msgstr "Estados Salvos" msgid "Stick" msgstr "Analógico" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Parar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" +"Armazena as cópias do EFB em objetos de textura da GPU.\n" +"Esta opção não é tão precisa, mas funciona bem para a maioria dos jogos e é " +"bem mais rápido do que EFB para RAM.\n" +"\n" +"Se estiver em dúvida, deixe isto ativado." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "Redimensionar para a Tela" @@ -4753,8 +4826,8 @@ msgstr "Idioma do Systema:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "Input do TAS" @@ -4774,9 +4847,9 @@ msgstr "Esquerda da Mesa" msgid "Table Right" msgstr "Direita da Mesa" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "Capturar Tela" @@ -4784,7 +4857,15 @@ msgstr "Capturar Tela" msgid "Test" msgstr "Testar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "Textura" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +msgid "Texture Cache" +msgstr "Cache de Texturas" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" msgstr "Sobreposição Formato das Texturas" @@ -4829,7 +4910,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:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "O arquivo que você especificou (%s) não existe" @@ -4846,12 +4927,24 @@ 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:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +msgstr "" +"Quanto mais Seguro, menor será a probabilidade do emulador perder alguma " +"atualização de textura da RAM.\n" +"\n" +"Se estiver em dúvida, use o segundo valor da direita para a esquerda." + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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:363 +#: Source/Core/DolphinWX/Src/Main.cpp:353 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4921,7 +5014,7 @@ 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:119 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. " @@ -4998,13 +5091,13 @@ msgstr "Para" msgid "Toggle All Log Types" msgstr "Ligar/Desligar Todos os Logs" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Ir para Tela Cheia" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Top" msgstr "Topo" @@ -5012,7 +5105,7 @@ msgstr "Topo" msgid "Traditional Chinese" msgstr "Chinês Tradicional" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "Houve a tentativa de carregar um tipo de arquivo desconhecido." @@ -5048,8 +5141,8 @@ msgstr "Tipo" msgid "UDP Port:" msgstr "Porta UDP:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "Wiimote UDP" @@ -5124,8 +5217,8 @@ msgstr "" "Ponteiro desconhecido %#08x\n" "Continuar?" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "Para cima" @@ -5142,7 +5235,7 @@ msgstr "Wiimote na Vertical" msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar modo EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 msgid "Use Fullscreen" msgstr "Usar Tela Cheia" @@ -5154,7 +5247,7 @@ msgstr "Usar Hex" msgid "Use Panic Handlers" msgstr "Usar Panic Handlers" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5167,7 +5260,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5182,11 +5275,11 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "Utilitário" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "V-Sync" @@ -5210,8 +5303,7 @@ msgstr "Verbosidade" msgid "Video" msgstr "Vídeo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "Virtual" @@ -5238,21 +5330,21 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Aviso" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 msgid "Warning - starting DOL in wrong console mode!" msgstr "Aviso - Inicializando DOL no modo de console errado!" -#: Source/Core/Core/Src/Boot/Boot.cpp:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "Aviso - Inicializando ELF no modo de console errado!" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "Aviso - Inicializando ISO no modo de console errado!" @@ -5291,7 +5383,7 @@ msgstr "WaveFileWriter - Arquivo não aberto." msgid "Whammy" msgstr "Distorção" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "Hack de Widescreen" @@ -5315,7 +5407,7 @@ msgstr "Raiz do Wii NAND" msgid "Wii Save Import" msgstr "Importar Save de Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 msgid "Wii save files (*.bin)|*.bin" msgstr "Arquivos de Salva do Wii (*.bin)|*.bin" @@ -5323,8 +5415,8 @@ msgstr "Arquivos de Salva do Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Não foi possível ler o arquivo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "Wiimote" @@ -5346,7 +5438,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:609 +#: Source/Core/DolphinWX/Src/Main.cpp:599 msgid "Wiimote Connected" msgstr "Wiimote Conectado" @@ -5378,7 +5470,7 @@ msgstr "Janelas da Direita" msgid "Word Wrap" msgstr "Word Wrap" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5485,7 +5577,7 @@ msgstr "Código Zero desconhecido pelo Dolphin: %08x" msgid "[ waiting ]" msgstr "[ Aguardando ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5501,7 +5593,7 @@ msgstr "" msgid "[Custom]" msgstr "[Personalizado]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5520,7 +5612,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5608,9 +5700,6 @@ msgstr "| OR" #~ msgid "< as Default Profile >" #~ msgstr "" -#~ msgid "Accuracy:" -#~ msgstr "Precisão:" - #~ msgid "Accurate Texture Cache" #~ msgstr "Cache de Textura Preciso" @@ -5648,18 +5737,6 @@ 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" @@ -5703,6 +5780,9 @@ msgstr "| OR" #~ msgid "Danish" #~ msgstr "Dinamarquês" +#~ msgid "Disable Wiimote Speaker" +#~ msgstr "Desabilitar o Auto-Falante do Wiimote" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -5749,9 +5829,6 @@ msgstr "| OR" #~ msgid "Enable CPU Access" #~ msgstr "Ativar Acesso da CPU" -#~ msgid "Enable Cache" -#~ msgstr "Ativar Cache" - #~ msgid "Enable Copy to EFB" #~ msgstr "Ativar cópia para o EFB" @@ -5806,12 +5883,6 @@ msgstr "| OR" #~ msgid "Error opening file %s for recording" #~ msgstr "Erro ao abrir o arquivo %s para gravação" -#~ msgid "Fast" -#~ msgstr "Rápido" - -#~ msgid "Fast Mipmaps" -#~ msgstr "Mipmaps Rápidos" - #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -5955,15 +6026,9 @@ msgstr "| OR" #~ msgid "Running script...\n" #~ msgstr "Running script...\n" -#~ msgid "Safe" -#~ msgstr "Seguro" - #~ msgid "Scale:" #~ msgstr "Escala:" -#~ msgid "Scaled EFB Copy" -#~ msgstr "Cópia Escalada do EFB" - #~ msgid "Select resolution for fullscreen mode" #~ msgstr "Selecione a resolução do modo Tela-cheia" @@ -6018,22 +6083,6 @@ msgstr "| OR" #~ msgid "Skies of Arcadia" #~ msgstr "Skies of Arcadia" -#~ 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" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Aumenta a velocidade de cópias do EFB para a RAM sacrificando um pouco a " -#~ "precisão da emulação.\n" -#~ "Às vezes também aumenta a qualidade visual.\n" -#~ "Se você está tendo problemas, tente aumentar a Precisão do Cache de " -#~ "Texturas ou desative esta opção.\n" -#~ "\n" -#~ "Se estiver em dúvida, deixe isto desativado." - #~ msgid "Slot" #~ msgstr "Slot" @@ -6074,39 +6123,9 @@ msgstr "| OR" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Iniciar a Janela de Renderização em Tela Cheia" -#~ 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" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "Armazena as cópias do EFB em objetos de textura da GPU.\n" -#~ "Esta opção não é tão precisa, mas funciona bem para a maioria dos jogos e " -#~ "é bem mais rápido do que EFB para RAM.\n" -#~ "\n" -#~ "Se estiver em dúvida, deixe isto ativado." - -#~ msgid "Texture" -#~ msgstr "Textura" - -#~ msgid "Texture Cache" -#~ msgstr "Cache de Texturas" - #~ msgid "The file " #~ msgstr "O arquivo" -#~ msgid "" -#~ "The safer you adjust this, the less likely the emulator will be missing " -#~ "any texture updates from RAM.\n" -#~ "\n" -#~ "If unsure, use the second-fastest value from the right." -#~ msgstr "" -#~ "Quanto mais Seguro, menor será a probabilidade do emulador perder alguma " -#~ "atualização de textura da RAM.\n" -#~ "\n" -#~ "Se estiver em dúvida, use o segundo valor da direita para a esquerda." - #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Isto é geralmente usado para efeitos de som e voz." diff --git a/Languages/po/ru.po b/Languages/po/ru.po index 6c3ea5e8fa..2a2b6b4a7b 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: 2011-08-10 08:30-0500\n" +"POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-01-20 14:40+0300\n" "Last-Translator: firnis \n" "Language-Team: Russian <>\n" @@ -31,7 +31,7 @@ msgstr " Игра : " msgid "! NOT" msgstr "! NOT" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -74,7 +74,7 @@ msgstr "%s уже ÑущеÑтвует, перепиÑать?" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s не может быть Ñжат. Возможно образ поврежден." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, fuzzy, c-format msgid "" "%s failed to load as a memorycard \n" @@ -83,7 +83,7 @@ msgstr "" "Ошибка загрузки карты памÑти\n" " Ðеверный размер (%04X)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, fuzzy, c-format msgid "" "%s failed to load as a memorycard \n" @@ -92,7 +92,7 @@ msgstr "" "Ошибка загрузки карты памÑти\n" " Ðеверный размер (%04X)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -310,7 +310,7 @@ msgstr "" msgid "(UNKNOWN)" msgstr "ÐЕИЗВЕСТÐО" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(отключен)" @@ -322,7 +322,7 @@ msgstr "16 бит" msgid "32 bit" msgstr "32 бита" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "" @@ -334,7 +334,7 @@ msgstr "8 бит" msgid "" msgstr "<Введите название>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "" @@ -420,17 +420,21 @@ msgstr "Об ÑмулÑторе Dolphin" msgid "Acceleration" msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 @@ -512,12 +516,12 @@ msgstr "" msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "Ðдаптер:" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "Добавить" @@ -533,9 +537,9 @@ msgstr "Добавление патча" msgid "Add new pane" msgstr "Добавить панель" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "Добавить..." @@ -569,7 +573,7 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "РаÑширенные" @@ -590,8 +594,8 @@ msgstr "Ð’Ñе образа от GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Ð’Ñе GCM-файлы Gamecube (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "All Save States (sav, s##)" msgstr "Файлы быÑтрых Ñохранений (sav, s##)" @@ -607,7 +611,7 @@ msgstr "Сжатые образа диÑков GC/Wii (gcz)" msgid "All files (*.*)|*.*" msgstr "Ð’Ñе файлы (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -615,11 +619,16 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Эмулируемый Wiimote" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" msgstr "ÐÐ½Ð¸Ð·Ð¾Ñ‚Ñ€Ð¾Ð¿Ð½Ð°Ñ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð°Ñ†Ð¸Ñ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "Сглаживание:" @@ -639,7 +648,7 @@ msgstr "Загрузчик:" msgid "Apply" msgstr "Применить" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -668,7 +677,7 @@ msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Ð’Ñ‹ уверены, что хотите удалить Ñтот файл? Он иÑчезнет навÑегда!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Соотношение Ñторон:" @@ -690,20 +699,20 @@ msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ ÑƒÑтройÑтва вывода звука.\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Ðвто" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 #, fuzzy msgid "Auto (Window Size)" msgstr "Разрешение оконного режима" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 #, fuzzy msgid "Auto adjust Window Size" msgstr "Разрешение оконного режима" @@ -718,6 +727,14 @@ msgstr "" "Отключение тумана улучшает производительноÑÑ‚ÑŒ, но влечет за Ñобой глюки в " "играх, которые завиÑÑÑ‚ от его правильной ÑмулÑции." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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/WXInputBase.cpp:27 msgid "Back" msgstr "Ðазад" @@ -727,8 +744,8 @@ msgstr "Ðазад" msgid "Backend Settings" msgstr "ОÑновные наÑтройки" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 #, fuzzy msgid "Backend:" msgstr "СиÑтема вывода" @@ -763,7 +780,7 @@ msgstr "Логотип:" msgid "Bar" msgstr "Панель" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "ОÑновные" @@ -775,7 +792,7 @@ msgstr "ОÑновные наÑтройки" msgid "Bass" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "" @@ -795,8 +812,8 @@ msgstr "СинÑÑ Ñлева" msgid "Blue Right" msgstr "СинÑÑ Ñправа" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 msgid "Bottom" msgstr "Ñнизу" @@ -829,9 +846,9 @@ msgstr "Укажите папку Ð´Ð»Ñ ÑохранениÑ" msgid "Buffer:" msgstr "Буфер:" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "Кнопки" @@ -847,11 +864,11 @@ msgstr "" msgid "CPU Emulator Engine" msgstr "Режим ÑмулÑции CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 " @@ -861,7 +878,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -870,8 +887,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Отмена" @@ -918,10 +935,10 @@ msgstr "Ðе получаетÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ WiiMote по адреÑу: %02x:%02 msgid "Cant find WiiMote by connection handle %02x" msgstr "Ðе получаетÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ WiiMote по деÑкриптору %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸Ð· DVD_Plugin - DVD-Interface: КритичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°" @@ -1045,10 +1062,10 @@ msgstr "" msgid "Classic" msgstr "" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "ОчиÑтить" @@ -1064,10 +1081,10 @@ msgstr "" "Клиент отÑоединилÑÑ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð¸Ð³Ñ€Ñ‹! Ð¡ÐµÑ‚ÐµÐ²Ð°Ñ Ð¸Ð³Ñ€Ð° оÑтановлена. Ð’Ñ‹ должны " "оÑтановить игру." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Закрыть" @@ -1172,7 +1189,7 @@ msgstr "Подключить Wiimote 3" msgid "Connect Wiimote 4" msgstr "Подключить Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:608 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Connecting..." msgstr "Подключение..." @@ -1238,7 +1255,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1306,11 +1323,11 @@ msgstr "Создатель:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "обрезать" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1357,8 +1374,8 @@ msgstr "Ðудио" msgid "DSP Emulator Engine" msgstr "Режим ÑмулÑции CPU" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "DSP HLE emulation (fast)" msgstr "" @@ -1409,7 +1426,7 @@ msgstr "ÐœÐµÑ€Ñ‚Ð²Ð°Ñ Ð·Ð¾Ð½Ð°" msgid "Debug" msgstr "Отладка" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 #, fuzzy msgid "Debugging" msgstr "Отладка" @@ -1443,8 +1460,8 @@ msgstr "Образ по умолчанию:" msgid "Default font" msgstr "Шрифт по умолчанию" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "Удалить" @@ -1452,12 +1469,12 @@ msgstr "Удалить" msgid "Delete Save" msgstr "Удалить Ñохранение" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "Удалить ÑущеÑтвующий файл '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 #, fuzzy msgid "Description" msgstr "ВопроÑ" @@ -1487,48 +1504,44 @@ msgstr "ÐаÑтройки уÑтройÑтв" msgid "Dial" msgstr "" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 #, fuzzy msgid "Disable" msgstr "Отключить туман" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "Отключить туман" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "Отключить оÑвещение" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 #, fuzzy msgid "Disable Per-Pixel Depth" msgstr "Глубина пикÑелÑ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "Отключить текÑтуры" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1537,7 +1550,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1547,7 +1560,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1563,11 +1576,11 @@ msgstr "ДиÑк" msgid "Disc Read Error" msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð´Ð¸Ñка" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "Изображение" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1578,7 +1591,7 @@ msgstr "" msgid "Divide" msgstr "/" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Do you want to stop the current emulation?" msgstr "Ð’Ñ‹ хотите оÑтановить ÑмулÑцию?" @@ -1586,7 +1599,7 @@ msgstr "Ð’Ñ‹ хотите оÑтановить ÑмулÑцию?" msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "ÐаÑтройки графики %s" @@ -1608,12 +1621,12 @@ msgstr "ÐаÑтройки Ñмулируемого Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 msgid "Dolphin GCPad Configuration" msgstr "ÐаÑтройки Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1641,8 +1654,8 @@ msgstr "" "Dolphin наÑтроен на Ñкрытие вÑех игр. Кликните здеÑÑŒ два раза, чтобы " "показать игры..." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Вниз" @@ -1667,26 +1680,26 @@ msgstr "" msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 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:112 #, fuzzy msgid "" "Dump decoded game textures to User/Dump/Textures//\n" @@ -1694,16 +1707,16 @@ msgid "" "If unsure, leave this unchecked." msgstr "СохранÑет текÑтуры игры в User/Dump/Textures// " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 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:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #, fuzzy msgid "Dutch" msgstr "Dutch" @@ -1712,7 +1725,7 @@ msgstr "Dutch" msgid "E&xit" msgstr "&Закрыть" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 #, fuzzy msgid "EFB Copies" msgstr "Регионы копии EFB" @@ -1766,7 +1779,7 @@ msgstr "Изменить..." msgid "Effect" msgstr "Эффект" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "" @@ -1774,7 +1787,7 @@ msgstr "" msgid "Emu Thread already running" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1783,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:110 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1805,7 +1818,7 @@ msgstr "КачеÑтво ÑмулÑции:" msgid "Enable" msgstr "Включить" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1831,6 +1844,11 @@ msgstr "Включить BAT" msgid "Enable Block Merging" msgstr "Включить Ñовмещение блоков" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#, fuzzy +msgid "Enable Cache" +msgstr "кÑшировать" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "Включить чит-коды" @@ -1847,7 +1865,7 @@ msgstr "Включить DualCore-режим" msgid "Enable Dual Core (speedup)" msgstr "Включить DualCore-режим (уÑкорение)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "Включить горÑчие клавиши" @@ -1863,8 +1881,8 @@ msgstr "Включить IdleSkipping-режим (уÑкорение)" msgid "Enable MMU" msgstr "Включить MMU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "Включить прогреÑÑивную развертку" @@ -1877,7 +1895,7 @@ msgstr "Включить широкий Ñкран" msgid "Enable WideScreen" msgstr "Включить широкий Ñкран" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "Включить ÐºÐ°Ñ€ÐºÐ°Ñ Ð¼Ð¾Ð´ÐµÐ»ÐµÐ¹" @@ -1960,7 +1978,7 @@ msgstr "" "Ðктивирует уÑтройÑтво ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ð¼Ñтью, требуетÑÑ Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… игр " "(Ð°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð²Ñ‹ÑˆÐ°ÐµÑ‚ ÑовмеÑтимоÑÑ‚ÑŒ, Ð´ÐµÐ°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ - ÑкороÑÑ‚ÑŒ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -1972,15 +1990,15 @@ msgstr "" msgid "End" msgstr "End" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #, fuzzy msgid "English" msgstr "English" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "УлучшениÑ" @@ -2002,13 +2020,13 @@ msgstr "ЗапиÑÑŒ 1/%d" msgid "Equal" msgstr "Равно" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "Ошибки" -#: Source/Core/DolphinWX/Src/Main.cpp:356 +#: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Ошибка загрузки выбранного Ñзыка. ВозвращаемÑÑ Ðº Ñтандартному." @@ -2086,7 +2104,7 @@ msgstr "&ЭкÑпортировать Ñохранение как..." msgid "Extension" msgstr "РаÑширение" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "" @@ -2200,13 +2218,13 @@ msgstr "Ошибка Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ hid.dll" msgid "Failed to read banner.bin" msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2217,25 +2235,25 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… из файла %d" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2264,6 +2282,14 @@ msgstr "Ошибка запиÑи заголовка Ð´Ð»Ñ %s" msgid "Failed to write header for file %d" msgstr "Ошибка запиÑи заголовка Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° %d" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "быÑтрое" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "Более быÑÑ‚Ñ€Ð°Ñ Ð²ÐµÑ€Ñи MMU (работает не Ñо вÑеми играми)." @@ -2293,7 +2319,7 @@ msgstr "" "Файл не может быть открыт\n" "или имеет неверное раÑширение" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2331,11 +2357,11 @@ msgstr "" msgid "Fix Checksums" msgstr "ИÑправить контрольную Ñумму" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "4:3" @@ -2344,12 +2370,12 @@ msgstr "4:3" msgid "Force Console as NTSC-J" msgstr "УÑтановить регион конÑоли как NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 #, fuzzy msgid "Force Texture Filtering" msgstr "Включить фильтрацию" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2372,7 +2398,7 @@ msgid "" "setting when playing Japanese games." msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2400,7 +2426,7 @@ msgstr "РаÑширенные" msgid "Frame Advance" msgstr "РаÑширенные" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "" @@ -2421,13 +2447,13 @@ msgstr "Лимит кадров:" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "Свободный обзор" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #, fuzzy msgid "French" msgstr "French" @@ -2445,7 +2471,7 @@ msgstr "" msgid "FullScr" msgstr "ПолнЭкран" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 #, fuzzy msgid "Fullscreen resolution:" msgstr "Разрешение полноÑкранного режима:" @@ -2491,8 +2517,8 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Опции &контроллера Gamecube" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Файлы карт памÑти Gamecube (*.raw,*.gcp)" @@ -2512,9 +2538,9 @@ msgid "" "(either a bad code or the code type is not yet supported.)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Общие" @@ -2523,9 +2549,9 @@ msgstr "Общие" msgid "General Settings" msgstr "ÐаÑтройки интерфейÑа" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #, fuzzy msgid "German" msgstr "German" @@ -2547,11 +2573,13 @@ msgstr "ÐаÑтройка видео" msgid "Greater Than" msgstr "Больше чем" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" -"Greatly increases quality of textures generated using render-to-texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2581,11 +2609,11 @@ msgstr "Гитара" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Вызван HCI_CMD_INQUIRY, пожалуйÑта Ñообщите!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Ошибка контрольной Ñуммы заголовка" @@ -2623,7 +2651,7 @@ msgstr "" msgid "Hide" msgstr "СпрÑтать" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "Скрывать курÑор мыши" @@ -2650,8 +2678,8 @@ msgstr "Создать" msgid "Hotkey Configuration" msgstr "ÐаÑтройка \"горÑчих\" клавиш" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 msgid "Hotkeys" msgstr "Клавиши" @@ -2738,12 +2766,12 @@ msgstr "" "Throttle\n" "в опциÑÑ… аудиоплагина." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 #, fuzzy msgid "Ignore Format Changes" msgstr "Эмулировать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2752,7 +2780,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 " @@ -2789,7 +2817,7 @@ msgstr "" "Импортированный файл имеет раÑширение sav\n" "но Ñодержит неверный заголовок" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 #, fuzzy msgid "" "Improves performance but causes glitches in most games which rely on proper " @@ -2800,7 +2828,7 @@ msgstr "" "Отключение тумана улучшает производительноÑÑ‚ÑŒ, но влечет за Ñобой глюки в " "играх, которые завиÑÑÑ‚ от его правильной ÑмулÑции." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 #, fuzzy msgid "" "Improves performance but causes lighting to disappear in most games.\n" @@ -2818,8 +2846,8 @@ msgstr "Почти играбельна" msgid "In-Game" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "ИнформациÑ" @@ -2862,7 +2890,7 @@ msgid "" msgstr "" "Вызван InstallExceptionHandler, но ваша платформа его еще не поддерживает." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 #, fuzzy msgid "Installing WAD..." msgstr "УÑтанавливаетÑÑ WAD в меню Wii..." @@ -2893,7 +2921,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "ВнутренÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ° LZO - ошибка в lzo_init()" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 #, fuzzy msgid "Internal Resolution:" msgstr "Разрешение полноÑкранного режима:" @@ -2947,9 +2975,9 @@ msgstr "Ðеверный файл запиÑи" msgid "Invalid state" msgstr "Ðеверное Ñохранение" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #, fuzzy msgid "Italian" msgstr "Italian" @@ -3014,8 +3042,8 @@ msgstr "ПоÑледнее перезапиÑанное Ñохранение" msgid "Last Saved State" msgstr "ПоÑледнее Ñохранение" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "Влево" @@ -3056,7 +3084,7 @@ msgstr "" msgid "Load" msgstr "Загр." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 #, fuzzy msgid "Load Custom Textures" msgstr "Load Hi-Res Textures" @@ -3105,17 +3133,17 @@ msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" msgid "Load State..." msgstr "Загрузить игру..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 #, fuzzy msgid "Load Wii System Menu" msgstr "Загрузить Wii System Menu (%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 #, 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:113 #, fuzzy msgid "" "Load custom textures from User/Load/Textures//\n" @@ -3159,8 +3187,8 @@ msgstr "Тип:" msgid "Logger Outputs" msgstr "" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "Окно лога" @@ -3194,8 +3222,8 @@ msgstr "УÑкорить MMU (Ñпидхак)" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Файлы Gameshark MadCatz (*.gcs)" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3225,8 +3253,8 @@ msgstr "Карта памÑти уже открыта" msgid "Memory Byte" msgstr "Па&мÑÑ‚ÑŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 msgid "Memory Card" msgstr "Карта памÑти" @@ -3247,7 +3275,7 @@ msgid "" "Would you like to copy the old file to this new location?\n" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "" @@ -3265,7 +3293,7 @@ msgstr "Мик." msgid "Min" msgstr "Мик." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "Разное" @@ -3278,7 +3306,7 @@ msgstr "Разное" msgid "Modifier" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3299,7 +3327,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3404,9 +3432,9 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Вверх" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "ИмÑ:" @@ -3493,7 +3521,7 @@ msgstr "Ðе равно" msgid "Not Set" msgstr "ÐеизвеÑтно" -#: Source/Core/DolphinWX/Src/Main.cpp:607 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Not connected" msgstr "Ðе подключено" @@ -3522,8 +3550,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "Кол-во кодов:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "" @@ -3552,8 +3580,8 @@ msgstr "Смещение:" msgid "Only %d blocks available" msgstr "ДоÑтупно только %d блоков" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Open" msgstr "Открыть" @@ -3583,11 +3611,11 @@ msgstr "OpenAL: не найдена аудио-карта" msgid "OpenAL: can't open device %s" msgstr "OpenAL: ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ ÑƒÑтройÑтва %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "" @@ -3615,8 +3643,8 @@ msgid "" "and import the the saves to a new memcard\n" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "" @@ -3679,13 +3707,13 @@ msgstr "Патчи" msgid "Paths" msgstr "Папки" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "Пауза" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 #, fuzzy msgid "Per-Pixel Lighting" msgstr "ОÑвещение пикÑелÑ" @@ -3699,10 +3727,10 @@ msgstr "Отлично" msgid "Perspective %d" msgstr "Точка %d" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 msgid "Play" msgstr "ЗапуÑк" @@ -3728,7 +3756,7 @@ msgstr "Опции" msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 msgid "Please confirm..." msgstr "" @@ -3780,7 +3808,7 @@ msgstr "Portuguese" msgid "Portuguese (Brazilian)" msgstr "Portuguese (Brazilian)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 #, fuzzy msgid "Post-Processing Effect:" msgstr "Шейдер поÑÑ‚-обработки:" @@ -3842,7 +3870,7 @@ msgstr "" msgid "R-Analog" msgstr "R-Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "ПамÑÑ‚ÑŒ" @@ -3858,7 +3886,7 @@ msgstr "" msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "ÐаÑтоÑщий" @@ -3921,9 +3949,9 @@ msgstr "" "Картинки выглÑдит менее \"блочной\", но Ñто Ñильно Ñнижает " "произврдительноÑÑ‚ÑŒ." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Обновить" @@ -3936,14 +3964,14 @@ msgstr "&Обновить ÑпиÑок игр" msgid "Refresh game list" msgstr "Обновление ÑпиÑка игр" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Remove" msgstr "Удалить" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 #, fuzzy msgid "" "Render the scene as a wireframe.\n" @@ -3953,12 +3981,12 @@ msgstr "" "Показывает только ÐºÐ°Ñ€ÐºÐ°Ñ Ð¼Ð¾Ð´ÐµÐ»ÐµÐ¹.\n" "Полезно только при отладке." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "Выводить изображение в главное окно" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð½Ð°Ñтроек" @@ -3970,8 +3998,8 @@ msgstr "Результаты" msgid "Return" msgstr "Enter" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "Вправо" @@ -3996,14 +4024,18 @@ msgstr "РуÑÑкий" msgid "Sa&ve State" msgstr "БыÑтрое &Ñохранение" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "безопаÑное" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 #, fuzzy msgid "Sample Rate:" msgstr "ЧаÑтота" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Сохр." @@ -4077,6 +4109,10 @@ msgstr "Выберите меÑто Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð½ÐµÑжатог msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +msgid "Scaled EFB Copy" +msgstr "" + #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, fuzzy, c-format msgid "Scanning %s" @@ -4112,17 +4148,17 @@ msgstr "ИÑкать в подпапках" msgid "Section %s not found in SYSCONF" msgstr "Ð¡ÐµÐºÑ†Ð¸Ñ %s не найдена в SYSCONF" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "Выбрать" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи игрового процеÑÑа" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð°" @@ -4149,15 +4185,15 @@ msgstr "" msgid "Select the file to load" msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Select the save file" msgstr "Выберите файл Ñохранений Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "Select the state to save" msgstr "Выберите или укажите файл Ð´Ð»Ñ Ð±Ñ‹Ñтрого ÑохранениÑ" @@ -4286,12 +4322,12 @@ msgstr "Отображать панель &инÑтрументов" msgid "Show Drives" msgstr "Отображать игры на DVD" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 #, fuzzy msgid "Show EFB Copy Regions" msgstr "Регионы копии EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "Показывать FPS" @@ -4303,7 +4339,7 @@ msgstr "Франции" msgid "Show GameCube" msgstr "GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 #, fuzzy msgid "Show Input Display" msgstr "Италии" @@ -4341,7 +4377,7 @@ msgstr "Отображать игры платформ..." msgid "Show Regions" msgstr "Отображать игры регионов..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 #, fuzzy msgid "Show Statistics" msgstr "Ð Ð°Ð·Ð»Ð¸Ñ‡Ð½Ð°Ñ ÑтатиÑтика" @@ -4400,7 +4436,7 @@ msgstr "Показать иконку" msgid "Show save title" msgstr "Показать заголовок" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4416,7 +4452,7 @@ msgstr "Показывает Ñто ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰Ð¸" msgid "Show unknown" msgstr "ÐеизвеÑтные" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -4442,15 +4478,15 @@ msgstr "Размер" msgid "Skip BIOS" msgstr "Пропуcтить загрузку BIOS'а GC" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4458,6 +4494,16 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, fuzzy, c-format @@ -4508,9 +4554,9 @@ msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð°ÑƒÐ´Ð¸Ð¾-буфера %s." msgid "Space" msgstr "Пробел" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #, fuzzy msgid "Spanish" msgstr "Spanish" @@ -4519,7 +4565,7 @@ msgstr "Spanish" msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 " @@ -4548,9 +4594,9 @@ msgstr "" msgid "Standard Controller" msgstr "" +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "" @@ -4580,14 +4626,23 @@ msgstr "Удалить Ñохранение" msgid "Stick" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Стоп" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "РаÑÑ‚Ñнуть по окну" @@ -4621,8 +4676,8 @@ msgstr "Язык ÑиÑтемы:" msgid "TAIWAN" msgstr "ТÐЙВÐÐЬ" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "" @@ -4642,9 +4697,9 @@ msgstr "Ð›ÐµÐ²Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ" msgid "Table Right" msgstr "ÐŸÑ€Ð°Ð²Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "Сделать Ñкриншот" @@ -4652,7 +4707,16 @@ msgstr "Сделать Ñкриншот" msgid "Test" msgstr "Проверить" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "ТекÑтура" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +#, fuzzy +msgid "Texture Cache" +msgstr "ОчиÑтить кÑш" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 #, fuzzy msgid "Texture Format Overlay" msgstr "Формат текÑтур" @@ -4698,7 +4762,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:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Указанный файл (%s) не ÑущеÑтвует" @@ -4715,11 +4779,19 @@ msgstr "Ð˜Ð¼Ñ Ð½Ðµ может Ñодержать знак ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" msgstr "Сохранение, которое вы пытаетеÑÑŒ Ñкопировать имеет неверный размер" -#: Source/Core/DolphinWX/Src/Main.cpp:363 +#: Source/Core/DolphinWX/Src/Main.cpp:353 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4793,7 +4865,7 @@ msgstr "" "ÐÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ опции может привеÑти к замедлению ÑмулÑции в Wii-меню и " "некоторых играх." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 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. " @@ -4866,13 +4938,13 @@ msgstr "Ñверху" msgid "Toggle All Log Types" msgstr "Включить вÑе" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Включение полноÑкранного режима" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Top" msgstr "Ñверху" @@ -4881,7 +4953,7 @@ msgstr "Ñверху" msgid "Traditional Chinese" msgstr "Traditional Chinese" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "Попытка загрузить неизвеÑтный тип файла." @@ -4916,8 +4988,8 @@ msgstr "Тип:" msgid "UDP Port:" msgstr "Порт UDP:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "" @@ -4985,8 +5057,8 @@ msgstr "" "ÐеизвеÑтный указатель %#08x\n" "Продолжить?" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "Вверх" @@ -5004,7 +5076,7 @@ msgstr "Гибридный Wiimote" msgid "Use EuRGB60 Mode (PAL60)" msgstr "ИÑпользовать EuRGB60-режим (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 #, fuzzy msgid "Use Fullscreen" msgstr "&ПолноÑкранный режим" @@ -5017,7 +5089,7 @@ msgstr "" msgid "Use Panic Handlers" msgstr "Показывать panic-ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ (ошибки)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5025,7 +5097,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5034,11 +5106,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "Утилиты" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "V-Sync" @@ -5062,8 +5134,7 @@ msgstr "Глубина анализа" msgid "Video" msgstr "Видео" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "Виртуальный" @@ -5086,21 +5157,21 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Предупреждение" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 msgid "Warning - starting DOL in wrong console mode!" msgstr "Предупреждение: запуÑк DOL в неправильном режиме!" -#: Source/Core/Core/Src/Boot/Boot.cpp:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "Предупреждение: запуÑк ELF в неправильном режиме!" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "Предупреждение: запуÑк ISO в неправильном режиме!" @@ -5136,7 +5207,7 @@ msgstr "WaveFileWriter - файл не открыт." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "" @@ -5161,7 +5232,7 @@ msgstr "DVD-диÑк:" msgid "Wii Save Import" msgstr "Импорт Ñохранений Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 msgid "Wii save files (*.bin)|*.bin" msgstr "Файлы Ñохранений Wii (*.bin)|*.bin" @@ -5169,8 +5240,8 @@ msgstr "Файлы Ñохранений Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: ÐÐµÐ»ÑŒÐ·Ñ Ð¿Ñ€Ð¾Ñ‡ÐµÑÑ‚ÑŒ файл" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "Wiimote" @@ -5188,7 +5259,7 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:609 +#: Source/Core/DolphinWX/Src/Main.cpp:599 msgid "Wiimote Connected" msgstr "Wiimote подключен" @@ -5224,7 +5295,7 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ñтрок" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5327,7 +5398,7 @@ msgstr "" msgid "[ waiting ]" msgstr "[ жду ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5339,7 +5410,7 @@ msgstr "" msgid "[Custom]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5350,7 +5421,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5573,10 +5644,6 @@ msgstr "| OR" #~ msgid "Enable CPU Access" #~ msgstr "Включить доÑтуп CPU к EFB" -#, fuzzy -#~ msgid "Enable Cache" -#~ msgstr "кÑшировать" - #~ msgid "Enable Copy to EFB" #~ msgstr "Включить режим ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð² EFB" @@ -5617,9 +5684,6 @@ msgstr "| OR" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Ошибка загрузки DSP ROM: %s" -#~ msgid "Fast" -#~ msgstr "быÑтрое" - #~ msgid "Fractional" #~ msgstr "Дробный" @@ -5725,9 +5789,6 @@ msgstr "| OR" #~ msgid "Running script...\n" #~ msgstr "ЗапуÑк Ñкрипта...\n" -#~ msgid "Safe" -#~ msgstr "безопаÑное" - #~ msgid "Scale:" #~ msgstr "МаÑштаб:" @@ -5785,13 +5846,6 @@ msgstr "| OR" #~ msgid "Take Screenshot\t" #~ msgstr "Сделать Ñкриншот\t" -#~ msgid "Texture" -#~ msgstr "ТекÑтура" - -#, fuzzy -#~ msgid "Texture Cache" -#~ msgstr "ОчиÑтить кÑш" - #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "" #~ "Ð”Ð°Ð½Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ Ð²ÐºÐ»ÑŽÑ‡Ð°ÐµÑ‚ обработку голоÑовых и SFX-Ñффектов (проÑтые звуки)." diff --git a/Languages/po/sr.po b/Languages/po/sr.po index eb5117db4f..42e341c386 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: 2011-08-10 08:30-0500\n" +"POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-03-02 21:58+0100\n" "Last-Translator: nikolassj\n" "Language-Team: \n" @@ -31,7 +31,7 @@ msgstr "Igra" msgid "! NOT" msgstr "! NE" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -73,21 +73,21 @@ msgstr "%s vec postoji, zameniti?" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s ije uspelo da bude scrubbed. Najverovatnije je \"image\" ostecen." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" " Card file size is invalid (0x%x bytes)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" " Card size is invalid (0x%x bytes)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -298,7 +298,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(NEPOZNAT/O)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(iskljucen/o)" @@ -310,7 +310,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "" @@ -322,7 +322,7 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "" @@ -391,17 +391,21 @@ msgstr "O Dolphin-u" msgid "Acceleration" msgstr "Ubrzanje" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "Tacna VBeam emulacija" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 @@ -481,12 +485,12 @@ msgstr "" msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "Adapter" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "Dodaj" @@ -502,9 +506,9 @@ msgstr "Dodaj Patch " msgid "Add new pane" msgstr "Dodaj nova okna" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "Dodaj..." @@ -538,7 +542,7 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "" @@ -558,8 +562,8 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "All Save States (sav, s##)" msgstr "" @@ -575,7 +579,7 @@ msgstr "" msgid "All files (*.*)|*.*" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -583,11 +587,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +msgid "Alternate Wiimote Timing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "" @@ -607,7 +615,7 @@ msgstr "" msgid "Apply" msgstr "Primeni " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -636,7 +644,7 @@ 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:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -657,19 +665,19 @@ msgid "AudioCommon: Error opening AO device.\n" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "" @@ -682,6 +690,14 @@ msgid "" msgstr "" "Onemoguci \"fog\". Poboljsava performans/brzinu ali uzrokuje bagove ..." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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/WXInputBase.cpp:27 msgid "Back" msgstr "Nazad " @@ -690,8 +706,8 @@ msgstr "Nazad " msgid "Backend Settings" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 #, fuzzy msgid "Backend:" msgstr "Nazad " @@ -726,7 +742,7 @@ msgstr "Baner:" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "Osnovno/ni/ne" @@ -738,7 +754,7 @@ msgstr "Osnovne opcije" msgid "Bass" msgstr "Bas" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "" @@ -758,8 +774,8 @@ msgstr "Blue left " msgid "Blue Right" msgstr "Blue right " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 msgid "Bottom" msgstr "Donji deo/dno" @@ -792,9 +808,9 @@ msgstr "" msgid "Buffer:" msgstr "" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "Tasteri" @@ -811,11 +827,11 @@ msgstr "C-Stick" msgid "CPU Emulator Engine" msgstr "CPU Emulacije \"Engine\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 " @@ -825,7 +841,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -834,8 +850,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Odustani" @@ -878,10 +894,10 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "" @@ -1001,10 +1017,10 @@ msgstr "" msgid "Classic" msgstr "Klasik/a" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "Ocisti" @@ -1020,10 +1036,10 @@ msgstr "" "Klient diskonektovao dok je igra pokrenuta!! NetPlay je onesposobljen. Moras " "manualno zaustaviti igru." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Zatvori" @@ -1127,7 +1143,7 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:608 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Connecting..." msgstr "Povezivanje..." @@ -1190,7 +1206,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1253,11 +1269,11 @@ msgstr "Kreator " msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "Izseci" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1301,8 +1317,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "DSP HLE emulation (fast)" msgstr "" @@ -1351,7 +1367,7 @@ msgstr "Mrtva Zona " msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Debugging" msgstr "" @@ -1384,8 +1400,8 @@ msgstr "" msgid "Default font" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "Obrisi" @@ -1393,12 +1409,12 @@ msgstr "Obrisi" msgid "Delete Save" msgstr "Obrisi save" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "Obrisi postojeci fajl '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 #, fuzzy msgid "Description" msgstr "Pitanje " @@ -1428,47 +1444,43 @@ msgstr "Opcije Uredjaja " msgid "Dial" msgstr "" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 #, fuzzy msgid "Disable" msgstr "Onemoguci \"Fog\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "Onemoguci \"Fog\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "Onemoguci \"Lighting\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "Onemoguci \"Textures\" " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1477,7 +1489,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1487,7 +1499,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1503,11 +1515,11 @@ msgstr "Disk" msgid "Disc Read Error" msgstr "Error tokom ucitavanje diska" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1518,7 +1530,7 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Do you want to stop the current emulation?" msgstr "" @@ -1526,7 +1538,7 @@ msgstr "" msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Graficka Podesavanja " @@ -1548,12 +1560,12 @@ msgstr "" msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 msgid "Dolphin GCPad Configuration" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1577,8 +1589,8 @@ msgid "" "games..." msgstr "" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "" @@ -1603,42 +1615,42 @@ msgstr "" msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 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:112 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:114 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:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "" @@ -1646,7 +1658,7 @@ msgstr "" msgid "E&xit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" msgstr "" @@ -1696,7 +1708,7 @@ msgstr "" msgid "Effect" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "" @@ -1704,7 +1716,7 @@ msgstr "" msgid "Emu Thread already running" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1713,7 +1725,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1735,7 +1747,7 @@ msgstr "" msgid "Enable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1761,6 +1773,10 @@ msgstr "" msgid "Enable Block Merging" msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +msgid "Enable Cache" +msgstr "" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "" @@ -1777,7 +1793,7 @@ msgstr "" msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "" @@ -1793,8 +1809,8 @@ msgstr "" msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "" @@ -1806,7 +1822,7 @@ msgstr "" msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "" @@ -1876,7 +1892,7 @@ msgid "" "OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -1887,14 +1903,14 @@ msgstr "" msgid "End" msgstr "Kraj" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "" @@ -1916,13 +1932,13 @@ msgstr "" msgid "Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "Error" -#: Source/Core/DolphinWX/Src/Main.cpp:356 +#: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -1994,7 +2010,7 @@ msgstr "" msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "" @@ -2107,13 +2123,13 @@ msgstr "" msgid "Failed to read banner.bin" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2124,25 +2140,25 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2171,6 +2187,15 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "Brzo " + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#, fuzzy +msgid "Fast Mipmaps" +msgstr "Ucitaj Native Mipmaps" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "" @@ -2198,7 +2223,7 @@ msgid "" "or does not have a valid extension" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2234,11 +2259,11 @@ msgstr "" msgid "Fix Checksums" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "" @@ -2246,11 +2271,11 @@ msgstr "" msgid "Force Console as NTSC-J" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2273,7 +2298,7 @@ msgid "" "setting when playing Japanese games." msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2296,7 +2321,7 @@ msgstr "" msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "" @@ -2316,13 +2341,13 @@ msgstr "" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "" @@ -2339,7 +2364,7 @@ msgstr "" msgid "FullScr" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 #, fuzzy msgid "Fullscreen resolution:" msgstr "Rezolucija punog ekrana " @@ -2384,8 +2409,8 @@ msgstr "Gamecube " msgid "Gamecube &Pad Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2405,9 +2430,9 @@ msgid "" "(either a bad code or the code type is not yet supported.)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2416,9 +2441,9 @@ msgstr "" msgid "General Settings" msgstr "Opcije Uredjaja " +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "Nemacki " @@ -2439,11 +2464,13 @@ msgstr "Graficke opcije/podesavanja/konfiguracije..." msgid "Greater Than" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" -"Greatly increases quality of textures generated using render-to-texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2472,11 +2499,11 @@ msgstr "Gitara " msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "" @@ -2506,7 +2533,7 @@ msgstr "" msgid "Hide" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "" @@ -2532,8 +2559,8 @@ msgstr "" msgid "Hotkey Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 msgid "Hotkeys" msgstr "" @@ -2606,11 +2633,11 @@ msgid "" "also have to disable Audio Throttle in DSP to make it effective." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2619,7 +2646,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 " @@ -2652,7 +2679,7 @@ msgid "" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 #, fuzzy msgid "" "Improves performance but causes glitches in most games which rely on proper " @@ -2662,7 +2689,7 @@ msgid "" msgstr "" "Onemoguci \"fog\". Poboljsava performans/brzinu ali uzrokuje bagove ..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 #, fuzzy msgid "" "Improves performance but causes lighting to disappear in most games.\n" @@ -2680,8 +2707,8 @@ msgstr "" msgid "In-Game" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "Info " @@ -2723,7 +2750,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 msgid "Installing WAD..." msgstr "" @@ -2750,7 +2777,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 #, fuzzy msgid "Internal Resolution:" msgstr "Rezolucija punog ekrana " @@ -2801,9 +2828,9 @@ msgstr "" msgid "Invalid state" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "Italianski " @@ -2864,8 +2891,8 @@ msgstr "" msgid "Last Saved State" msgstr "" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "" @@ -2904,7 +2931,7 @@ msgstr "" msgid "Load" msgstr "Ucitaj " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 #, fuzzy msgid "Load Custom Textures" msgstr "Ucitaj Hi-Res Textures " @@ -2945,17 +2972,17 @@ msgstr "Ucitaj State Slot 8" msgid "Load State..." msgstr "Ucitaj State" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 #, fuzzy msgid "Load Wii System Menu" msgstr "Ucitaj Wii Sistem Meni (%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 #, 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:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -2994,8 +3021,8 @@ msgstr "" msgid "Logger Outputs" msgstr "" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "" @@ -3027,8 +3054,8 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3058,8 +3085,8 @@ msgstr "" msgid "Memory Byte" msgstr "&Memorija" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 msgid "Memory Card" msgstr "" @@ -3080,7 +3107,7 @@ msgid "" "Would you like to copy the old file to this new location?\n" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "" @@ -3097,7 +3124,7 @@ msgstr "" msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "" @@ -3110,7 +3137,7 @@ msgstr "" msgid "Modifier" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3131,7 +3158,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3236,9 +3263,9 @@ msgstr "" msgid "NP Up" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "" @@ -3323,7 +3350,7 @@ msgstr "" msgid "Not Set" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:607 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Not connected" msgstr "" @@ -3352,8 +3379,8 @@ msgstr "" msgid "Number Of Codes: " msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "" @@ -3382,8 +3409,8 @@ msgstr "" msgid "Only %d blocks available" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Open" msgstr "Otvori " @@ -3413,11 +3440,11 @@ msgstr "" msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "" @@ -3445,8 +3472,8 @@ msgid "" "and import the the saves to a new memcard\n" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "" @@ -3509,13 +3536,13 @@ msgstr "" msgid "Paths" msgstr "" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "Pauza " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 #, fuzzy msgid "Per-Pixel Lighting" msgstr "Onemoguci \"Lighting\"" @@ -3529,10 +3556,10 @@ msgstr "Perfektno " msgid "Perspective %d" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 msgid "Play" msgstr "Pokreni " @@ -3557,7 +3584,7 @@ msgstr "Opcije " msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 msgid "Please confirm..." msgstr "" @@ -3602,7 +3629,7 @@ msgstr "Portugalski " msgid "Portuguese (Brazilian)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "" @@ -3661,7 +3688,7 @@ msgstr "" msgid "R-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "RAM " @@ -3677,7 +3704,7 @@ msgstr "" msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "" @@ -3734,9 +3761,9 @@ msgid "" "If unsure, select None." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "" @@ -3748,26 +3775,26 @@ msgstr "" msgid "Refresh game list" msgstr "" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Remove" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset/Restart " @@ -3779,8 +3806,8 @@ msgstr "Rezultati " msgid "Return" msgstr "" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "" @@ -3805,13 +3832,17 @@ msgstr "" msgid "Sa&ve State" msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "Siguran " + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Snimaj" @@ -3877,6 +3908,10 @@ msgstr "" msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +msgid "Scaled EFB Copy" +msgstr "" + #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, fuzzy, c-format msgid "Scanning %s" @@ -3912,17 +3947,17 @@ msgstr "Trazi Subfoldere " msgid "Section %s not found in SYSCONF" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "Izaberi " #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "Izaberi Snimani fajl" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje " @@ -3949,15 +3984,15 @@ msgstr "" msgid "Select the file to load" msgstr "Izaberi fajl za ucitavanje " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Select the save file" msgstr "Izaberi \"snimani fajl/the save state\"" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Izaberi state za ucitavanje " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "Select the state to save" msgstr "Izaberi state za snimanje/save" @@ -4076,11 +4111,11 @@ msgstr "" msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "" @@ -4092,7 +4127,7 @@ msgstr "" msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "" @@ -4128,7 +4163,7 @@ msgstr "" msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "" @@ -4179,7 +4214,7 @@ msgstr "" msgid "Show save title" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4195,7 +4230,7 @@ msgstr "" msgid "Show unknown" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -4219,15 +4254,15 @@ msgstr "Velicina" msgid "Skip BIOS" msgstr "Preskoci GC BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4235,6 +4270,16 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4283,9 +4328,9 @@ msgstr "" msgid "Space" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "" @@ -4293,7 +4338,7 @@ msgstr "" msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 " @@ -4321,9 +4366,9 @@ msgstr "" msgid "Standard Controller" msgstr "" +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Pokreni " @@ -4351,14 +4396,23 @@ msgstr "" msgid "Stick" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr " Zaustavi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "" @@ -4392,8 +4446,8 @@ msgstr "" msgid "TAIWAN" msgstr "" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "" @@ -4413,9 +4467,9 @@ msgstr "" msgid "Table Right" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "" @@ -4423,7 +4477,17 @@ msgstr "" msgid "Test" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#, fuzzy +msgid "Texture" +msgstr "Tacan \"Texture Cache\"" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +#, fuzzy +msgid "Texture Cache" +msgstr "Tacan \"Texture Cache\"" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" msgstr "" @@ -4464,7 +4528,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -4481,11 +4545,19 @@ msgstr "" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:363 +#: Source/Core/DolphinWX/Src/Main.cpp:353 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4546,7 +4618,7 @@ msgstr "" 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:119 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. " @@ -4605,13 +4677,13 @@ msgstr "" msgid "Toggle All Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Top" msgstr "" @@ -4619,7 +4691,7 @@ msgstr "" msgid "Traditional Chinese" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "" @@ -4653,8 +4725,8 @@ msgstr "" msgid "UDP Port:" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "" @@ -4720,8 +4792,8 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "" @@ -4738,7 +4810,7 @@ msgstr "" msgid "Use EuRGB60 Mode (PAL60)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 #, fuzzy msgid "Use Fullscreen" msgstr "&Pun Ekran" @@ -4751,7 +4823,7 @@ msgstr "" msgid "Use Panic Handlers" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -4759,7 +4831,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -4768,11 +4840,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "" @@ -4796,8 +4868,7 @@ msgstr "" msgid "Video" msgstr "Video " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "" @@ -4820,21 +4891,21 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Upozorenje " -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 msgid "Warning - starting DOL in wrong console mode!" msgstr "Upozorenje - pokrece se DOL u pogresan konzol mod!" -#: Source/Core/Core/Src/Boot/Boot.cpp:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "Upozorenje - pokrece se ELF u pogresan konzol mod!" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "Upozorenje - pogretanje ISO fajla u pogresan konzol mod!" @@ -4869,7 +4940,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "" @@ -4893,7 +4964,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -4901,8 +4972,8 @@ msgstr "" msgid "WiiWAD: Could not read from file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "" @@ -4920,7 +4991,7 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:609 +#: Source/Core/DolphinWX/Src/Main.cpp:599 msgid "Wiimote Connected" msgstr "" @@ -4953,7 +5024,7 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5052,7 +5123,7 @@ msgstr "" msgid "[ waiting ]" msgstr "[ cekanje ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5064,7 +5135,7 @@ msgstr "" msgid "[Custom]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5075,7 +5146,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5169,13 +5240,6 @@ msgstr "| ILI" #~ "Onemoguci alpha-setting pass.\n" #~ "Onemogucava neke efekte ali moze pomoci performansu/brzini" -#~ msgid "Fast" -#~ msgstr "Brzo " - -#, fuzzy -#~ msgid "Fast Mipmaps" -#~ msgstr "Ucitaj Native Mipmaps" - #~ msgid "GFX Config" #~ msgstr "GFX podesavanja" @@ -5186,15 +5250,8 @@ msgstr "| ILI" #~ msgid "OK" #~ msgstr "OK" -#~ msgid "Safe" -#~ msgstr "Siguran " - #~ msgid "Select resolution for fullscreen mode" #~ msgstr "Izaberi rezoluciju za pun ekran " -#, fuzzy -#~ msgid "Texture Cache" -#~ msgstr "Tacan \"Texture Cache\"" - #~ msgid "XFB" #~ msgstr "XFB" diff --git a/Languages/po/tr.po b/Languages/po/tr.po index a82987ecaa..120d06aad1 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: 2011-08-10 08:30-0500\n" +"POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-08-19 08:38-0500\n" "Last-Translator: nlgzrgn \n" "Language-Team: nlgzrgn \n" @@ -32,7 +32,7 @@ msgstr "Oyun :" msgid "! NOT" msgstr "! YOK" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -76,7 +76,7 @@ msgstr "%s zaten var, üzerine yazılsın mı?" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s küçültülemedi. Kalıp dosyası bozuk olabilir." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -85,7 +85,7 @@ msgstr "" "%s hafıza kart dosyası olarak yüklenemedi \n" "Kart dosyası boyutu hatalı (0x%x bayt)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -94,7 +94,7 @@ msgstr "" "%s hafıza kartı olarak yüklenemedi \n" "Kart boyutu hatalı (0x%x bayt)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -310,7 +310,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(BÄ°LÄ°NMEYEN)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(kapalı)" @@ -322,7 +322,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "3D Vision" @@ -334,7 +334,7 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "<Çözünürlük bulunamadı>" @@ -420,17 +420,22 @@ msgstr "Dolphin Hakkında" msgid "Acceleration" msgstr "Hızlandırma" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "DoÄŸruluk:" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "DoÄŸru VBeam Emülasyonu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#, fuzzy msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" "EFB kopyalarını doÄŸru bir ÅŸekilde emüle eder. \n" "Bazı oyunlar iÅŸlevsellik veya belirli görsel efektler için buna ihtiyaç " @@ -527,12 +532,12 @@ msgstr "Action Replay: Normal Kod %i: Hatalı alt tür %08x (%s)" 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:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "Dönüştürücü:" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "Ekle" @@ -548,9 +553,9 @@ msgstr "Yama Ekle" msgid "Add new pane" msgstr "Bölme ekle" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "Ekle..." @@ -600,7 +605,7 @@ msgstr "" "Düğmeleri etkinleÅŸtirmek için gerekli olan analog denetim basıncını " "ayarlayın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "GeliÅŸmiÅŸ" @@ -620,8 +625,8 @@ msgstr "Tüm GC/Wii kalıpları (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tüm GameCube GCM Dosyaları (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "All Save States (sav, s##)" msgstr "Tüm Kayıtlı Oyunlar (sav,s##)" @@ -637,7 +642,7 @@ 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:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -649,11 +654,16 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Taklit Wiimote" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" msgstr "Filtreleme:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "KeskinleÅŸtirme:" @@ -673,7 +683,7 @@ msgstr "Apploader:" msgid "Apply" msgstr "Uygula" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -706,7 +716,7 @@ msgstr "" "Bu dosyayı gerçekten silmek istiyor musunuz? Ama geri döndürülemeyecektir!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "En-boy Oranı:" @@ -727,19 +737,19 @@ msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO sürücüyü açarken hata.\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Otomatik" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "Otomatik (640x528'in katları)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "Otomatik (Pencere Boyutu)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "Pencere Boyutunu Otomatik Ayarla" @@ -753,6 +763,18 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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 "" +"Mipmapleri hafızadan dekode etmek yerine otomatik olarak yarat. \n" +"Performansı artırır ama bazı küçük doku hatalarına neden olabilir. \n" +"\n" +"Emin deÄŸilseniz, iÅŸaretli bırakın." + #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" msgstr "Geri" @@ -761,8 +783,8 @@ msgstr "Geri" msgid "Backend Settings" msgstr "Arka Uç Ayarları" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Arka Uç:" @@ -796,7 +818,7 @@ msgstr "AfiÅŸ:" msgid "Bar" msgstr "Çubuk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "Temel" @@ -808,7 +830,7 @@ msgstr "Temel Ayarlar" msgid "Bass" msgstr "Bass" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Blok Ayırma Tablosu saÄŸlaması baÅŸarısız." @@ -828,8 +850,8 @@ msgstr "Mavi Sol" msgid "Blue Right" msgstr "Mavi SaÄŸ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 msgid "Bottom" msgstr "Alt" @@ -862,9 +884,9 @@ msgstr "Çıkış klasörü için gözat" msgid "Buffer:" msgstr "Tampon:" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "Düğmeler" @@ -880,11 +902,11 @@ msgstr "C ÇubuÄŸu" msgid "CPU Emulator Engine" msgstr "CPU Emülatör Motoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "Görüntü Listelerini Önbellekle" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 " @@ -900,7 +922,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -915,8 +937,8 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Ä°ptal" @@ -964,10 +986,10 @@ msgstr "BD ile WiiMote bulunamadı: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Sap baÄŸlantısı ile Wiimote bulunamadı: %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "DVD Eklentisinden okunamıyor - DVD-Arabirimi : Ölümcül Hata" @@ -1089,10 +1111,10 @@ msgstr "Çember Çubuk" msgid "Classic" msgstr "Klasik" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "Temizle" @@ -1108,10 +1130,10 @@ msgstr "" "Oyun çalışırken istemci baÄŸlantısı kesildi!! NetPlay iptal edildi. Oyunu " "elle durdurmalısınız." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Kapat" @@ -1215,7 +1237,7 @@ msgstr "Wiimote 3'ü BaÄŸla" msgid "Connect Wiimote 4" msgstr "Wiimote 4'ü BaÄŸla" -#: Source/Core/DolphinWX/Src/Main.cpp:608 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Connecting..." msgstr "BaÄŸlanıyor..." @@ -1283,7 +1305,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:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1356,11 +1378,11 @@ msgstr "OluÅŸturan:" msgid "Critical" msgstr "Önemli" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "Kırp" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1408,8 +1430,8 @@ msgstr "Ses" msgid "DSP Emulator Engine" msgstr "Ses Emülatörü Motoru" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emülasyonu (Hızlı)" @@ -1458,7 +1480,7 @@ msgstr "Ölü Bölge" msgid "Debug" msgstr "Hata ayıklama" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Debugging" msgstr "Hata ayıklama" @@ -1491,8 +1513,8 @@ msgstr "Varsayılan kalıp:" msgid "Default font" msgstr "Varsayılan yazı tipi" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "Sil" @@ -1500,12 +1522,12 @@ msgstr "Sil" msgid "Delete Save" msgstr "Kaydı sil" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "'%s' dosyasını silmek istediÄŸinizden emin misiniz?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 msgid "Description" msgstr "Açıklama" @@ -1536,15 +1558,15 @@ msgstr "Sürücü Ayarları" msgid "Dial" msgstr "Kadran" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "DirectX 10/11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "DirectX 9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1552,32 +1574,28 @@ 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:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 msgid "Disable" msgstr "Ä°ptal et" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "Sisi Ä°ptal Et" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "Işıklandırmayı Ä°ptal Et" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "Piksel DerinliÄŸini Ä°ptal Et" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "Dokuları Ä°ptal Et" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "WiiMote Hoparlörünü Ä°ptal Et" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1591,7 +1609,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1607,7 +1625,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1626,11 +1644,11 @@ msgstr "Disk" msgid "Disc Read Error" msgstr "Disk Okuma Hatası" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "Görüntü" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1644,7 +1662,7 @@ msgstr "" msgid "Divide" msgstr "Böl" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Do you want to stop the current emulation?" msgstr "Emülasyonu durdurmak istiyor musunuz?" @@ -1652,7 +1670,7 @@ msgstr "Emülasyonu durdurmak istiyor musunuz?" msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Görüntü Yapılandırması" @@ -1673,12 +1691,12 @@ msgstr "Dolphin Taklit Wiimote Yapılandırması" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC Kolu Yapılandırması" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filmleri (*.dtm)" @@ -1706,8 +1724,8 @@ msgstr "" "Dolphin ÅŸu anda oyunları gizlemeye ayarlıdır. Buraya çift tıklatarak tüm " "oyunları görebilirsiniz..." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "AÅŸağı" @@ -1732,19 +1750,19 @@ msgstr "Kukla" msgid "Dump Audio" msgstr "Sesi Dök" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "EFB Hedef Dökümü" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "Kareleri Dök" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "Dokuları Dök" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1755,7 +1773,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1765,7 +1783,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1775,9 +1793,9 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "Flemenkçe" @@ -1785,7 +1803,7 @@ msgstr "Flemenkçe" msgid "E&xit" msgstr "Çıkış (&x)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" msgstr "EFB Kopyaları" @@ -1839,7 +1857,7 @@ msgstr "Düzenle..." msgid "Effect" msgstr "Etki" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "Gömülü Kare Tamponu" @@ -1847,7 +1865,7 @@ msgstr "Gömülü Kare 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:111 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1861,7 +1879,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:110 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1889,7 +1907,7 @@ msgstr "Emülasyon Durumu:" msgid "Enable" msgstr "Ä°zin ver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1921,6 +1939,10 @@ msgstr "BAT'a Ä°zin Ver" msgid "Enable Block Merging" msgstr "Blok BirleÅŸimine Ä°zin Ver" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +msgid "Enable Cache" +msgstr "ÖnbelleÄŸe izin ver" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "Hilelere Ä°zin Ver" @@ -1937,7 +1959,7 @@ msgstr "Çift ÇekirdeÄŸe Ä°zin Ver" msgid "Enable Dual Core (speedup)" msgstr "Çift ÇekirdeÄŸe Ä°zin Ver (hızı artırır)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "Kısayol TuÅŸlarına Ä°zin Ver" @@ -1953,8 +1975,8 @@ msgstr "BoÅŸta Atlamaya Ä°zin Ver (hızı artırır)" msgid "Enable MMU" msgstr "MMU'ya Ä°zin Ver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "Progresif Taramaya Ä°zin Ver" @@ -1966,7 +1988,7 @@ msgstr "Ekran Koruyucusuna Ä°zin Ver" msgid "Enable WideScreen" msgstr "GeniÅŸ Ekrana Ä°zin Ver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "GeniÅŸ Çerçeveye Ä°zin Ver" @@ -2063,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:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2077,14 +2099,14 @@ msgstr "" msgid "End" msgstr "Son" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "Ä°ngilizce" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "GeliÅŸtirmeler" @@ -2106,13 +2128,13 @@ msgstr "GiriÅŸ 1/%d" msgid "Equal" msgstr "EÅŸit" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "Hata" -#: Source/Core/DolphinWX/Src/Main.cpp:356 +#: Source/Core/DolphinWX/Src/Main.cpp:346 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." @@ -2186,7 +2208,7 @@ msgstr "Kaydı farklı ver..." msgid "Extension" msgstr "Uzantı" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "Harici Kare Tamponu" @@ -2307,7 +2329,7 @@ msgstr "hid.dll yükleme baÅŸarısız." msgid "Failed to read banner.bin" msgstr "banner.bin okunamadı." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2315,7 +2337,7 @@ msgstr "" "Blok Ayırma Tablosu yedeÄŸi doÄŸru okunamadı.\n" "(0x8000-0x9FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2328,7 +2350,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "%d dosyasından veri okunamadı." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2336,7 +2358,7 @@ msgstr "" "Konum yedeÄŸi doÄŸru okunamadı.\n" "(0x4000-0x5FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2344,7 +2366,7 @@ msgstr "" "Konum doÄŸru okunamadı\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2352,7 +2374,7 @@ msgstr "" "BaÅŸlık doÄŸru okunamadı\n" "(0x0000-0x1FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2384,6 +2406,14 @@ 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/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "Hızlı" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "Hızlı Mipmap'lar" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMU'nun hızlı sürümü. Her oyunda çalışmaz." @@ -2412,7 +2442,7 @@ msgstr "" "Dosya açılamadı\n" "veya geçersiz bir uzantıya sahip." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2450,11 +2480,11 @@ msgstr "Ä°lk Blok" msgid "Fix Checksums" msgstr "SaÄŸlamayı Düzelt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "16:9 'a zorla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "4:3 'e zorla" @@ -2462,11 +2492,11 @@ msgstr "4:3 'e zorla" msgid "Force Console as NTSC-J" msgstr "Konsolu NTSC-J Olarak Zorla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" msgstr "Doku Filtrelemesine Zorla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2500,7 +2530,7 @@ msgstr "" "Ä°ÅŸaretsiz bırakırsanız, Dolphin varsayılan olarak NTSC-U'yu seçecektir ve " "Japon oyunlarını oynarken bu ayarı etkinleÅŸtirecektir." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2525,7 +2555,7 @@ msgstr "Kare" msgid "Frame Advance" msgstr "GeliÅŸmiÅŸ Kareleme" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "Kare dökümünde FFV1 kullan" @@ -2545,13 +2575,13 @@ msgstr "Kare Sınırı:" msgid "Frames To Record" msgstr "Çekilecek Kareler" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "Serbest Bakış" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "Fransızca" @@ -2568,7 +2598,7 @@ msgstr "Buradan" msgid "FullScr" msgstr "Tam Ekran" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 msgid "Fullscreen resolution:" msgstr "Tam Ekran Çözünürlüğü:" @@ -2612,8 +2642,8 @@ msgstr "GameCube" msgid "Gamecube &Pad Settings" msgstr "Gamecube Kolu Ayarları (&P)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube Hafıza Kartları (*.raw,*.gcp)" @@ -2635,9 +2665,9 @@ msgstr "" "Gecko Kodu çalışmadı: (CT%i CST%i) (%s)\n" "(kötü bir kod veya türü henüz desteklenmiyor.)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Genel" @@ -2645,9 +2675,9 @@ msgstr "Genel" msgid "General Settings" msgstr "Genel Ayarlar" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "Almanca" @@ -2668,11 +2698,14 @@ msgstr "Görüntü Ayarları" msgid "Greater Than" msgstr "Daha Büyük" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#, fuzzy msgid "" -"Greatly increases quality of textures generated using render-to-texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2705,11 +2738,11 @@ msgstr "Gitar" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY çaÄŸrıldı, lütfen bildirin!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "Hack'ler" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "BaÅŸlık saÄŸlama hatası" @@ -2745,7 +2778,7 @@ msgstr "" msgid "Hide" msgstr "Gizle" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "Fare Ä°ÅŸaretçisini Gizle" @@ -2772,8 +2805,8 @@ msgstr "Barındırma" msgid "Hotkey Configuration" msgstr "Kısayol TuÅŸu Yapılandırması" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 msgid "Hotkeys" msgstr "TuÅŸlar" @@ -2855,11 +2888,11 @@ msgstr "" "ayarlarında Ses hızlandırmasını da iptal ederek bunu daha etkili " "kılabilirsiniz." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" msgstr "Birim deÄŸiÅŸimini yoksay" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2873,7 +2906,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 " @@ -2915,7 +2948,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:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2927,7 +2960,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakır." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -2946,8 +2979,8 @@ msgstr "Oyun İçi" msgid "In-Game" msgstr "Oyun-İçi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "Bilgi" @@ -2990,7 +3023,7 @@ msgstr "" "Kurulum Özel Durum Ä°ÅŸleyici çaÄŸrıldı, ama bu platform henüz bunu " "desteklemiyor." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 msgid "Installing WAD..." msgstr "WAD kuruluyor..." @@ -3019,7 +3052,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "İç LZO Hatası - lzo_init() baÅŸarısız." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 msgid "Internal Resolution:" msgstr "İç Çözünürlük:" @@ -3072,9 +3105,9 @@ msgstr "Hatalı çekim dosyası" msgid "Invalid state" msgstr "Hatalı durum" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "Ä°talyanca" @@ -3135,8 +3168,8 @@ msgstr "Son Ãœzerine Yazılan Durum" msgid "Last Saved State" msgstr "Son Kayıtlı Durum" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "Sol" @@ -3182,7 +3215,7 @@ msgstr "FPS Sınırlaması" msgid "Load" msgstr "Yükle" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Load Custom Textures" msgstr "Özel Dokuları Yükle" @@ -3222,16 +3255,16 @@ msgstr "Durumu Yükle : 8" msgid "Load State..." msgstr "Durumu Yükle..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Load Wii System Menu" msgstr "Wii Sistem Menüsünü Yükle" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 #, 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:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3273,8 +3306,8 @@ msgstr "GeçmiÅŸ Türü" msgid "Logger Outputs" msgstr "GeçmiÅŸ Çıkışı" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "GeçmiÅŸ" @@ -3308,8 +3341,8 @@ msgstr "MMU Hız Hilesi" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark dosyaları(*.gcs)" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Ana Çubuk" @@ -3338,8 +3371,8 @@ msgstr "Hafıza kartı zaten açık" msgid "Memory Byte" msgstr "Hafıza Baytı" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 msgid "Memory Card" msgstr "Hafıza Kartı" @@ -3368,7 +3401,7 @@ msgstr "" "%s\n" "Eski dosyaları bu yeni yere kopyalamak ister misiniz?\n" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "Hafıza kartı dosya boyutu baÅŸlık boyutuyla eÅŸleÅŸmiyor" @@ -3385,7 +3418,7 @@ msgstr "Mikrofon" msgid "Min" msgstr "En az" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "ÇeÅŸitli" @@ -3398,7 +3431,7 @@ msgstr "ÇeÅŸitli Ayarlar" msgid "Modifier" msgstr "DeÄŸiÅŸtirici" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3423,7 +3456,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3537,9 +3570,9 @@ msgstr "NP Sekme" msgid "NP Up" msgstr "NP Yukarı" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Ä°sim:" @@ -3624,7 +3657,7 @@ msgstr "EÅŸit DeÄŸil" msgid "Not Set" msgstr "Ayarlanmamış" -#: Source/Core/DolphinWX/Src/Main.cpp:607 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Not connected" msgstr "BaÄŸlı deÄŸil" @@ -3653,8 +3686,8 @@ msgstr "Sayı Kilidi" msgid "Number Of Codes: " msgstr "Kod Sayısı:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "Nunchuck" @@ -3683,8 +3716,8 @@ msgstr "Uzantı:" msgid "Only %d blocks available" msgstr "Sadece %d blok kullanılabilir" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Open" msgstr "Aç" @@ -3714,11 +3747,11 @@ 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:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "OpenCL Doku Çözücü" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "OpenMP Doku Çözücü" @@ -3749,8 +3782,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:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "DiÄŸer" @@ -3815,13 +3848,13 @@ msgstr "Yamalar" msgid "Paths" msgstr "Yollar" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "Duraklat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Per-Pixel Lighting" msgstr "Piksel Aydınlatması" @@ -3834,10 +3867,10 @@ msgstr "Mükemmel" msgid "Perspective %d" msgstr "Perspektif %d" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 msgid "Play" msgstr "Oynat" @@ -3861,7 +3894,7 @@ msgstr "Oynatma Seçenekleri" msgid "Players" msgstr "Oyuncular" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 msgid "Please confirm..." msgstr "Lütfen onaylayın..." @@ -3906,7 +3939,7 @@ msgstr "Portekizce" msgid "Portuguese (Brazilian)" msgstr "Portekizce (Brezilya)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "Sonradan Ä°ÅŸleme Etkisi:" @@ -3965,7 +3998,7 @@ msgstr "R Düğmesi" msgid "R-Analog" msgstr "R Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "Anabellek" @@ -3981,7 +4014,7 @@ msgstr "Aralık" msgid "Read-only mode" msgstr "Salt Okunur Mod" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "Gerçek" @@ -4041,9 +4074,9 @@ msgstr "" "\n" "Emin deÄŸilseniz, hiçbiri seçin." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Yenile" @@ -4055,14 +4088,14 @@ msgstr "Listeyi Yenile" msgid "Refresh game list" msgstr "Oyun Listesini Yenile" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Remove" msgstr "Kaldır" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4072,12 +4105,12 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "Ana pencerede yorumla" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Sıfırla" @@ -4089,8 +4122,8 @@ msgstr "Sonuçlar" msgid "Return" msgstr "Enter" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "SaÄŸ" @@ -4115,13 +4148,17 @@ msgstr "Rusça" msgid "Sa&ve State" msgstr "Durumu Kaydet (&V)" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "Güvenli" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "Örnek Oran:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Kaydet" @@ -4187,6 +4224,10 @@ msgstr "GeniÅŸletilen GCM/ISO'yu kaydet" 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:401 +msgid "Scaled EFB Copy" +msgstr "Boyutlandırılmış EFB Kopyası" + #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format msgid "Scanning %s" @@ -4222,17 +4263,17 @@ msgstr "Alt Klasörleri Ara" msgid "Section %s not found in SYSCONF" msgstr "SYSCONF içinde %s bölümü bulunamadı" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "Seç" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "Çekim Dosyasını Seç" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 msgid "Select a Wii WAD file to install" msgstr "Kurmak için bir Wii WAD dosyası seçin" @@ -4258,15 +4299,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:1306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Select the save file" msgstr "Kayıt dosyasını seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Yüklemek için durum seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "Select the state to save" msgstr "Kaydetmek için durum seçin" @@ -4404,11 +4445,11 @@ msgstr "Araç ÇubuÄŸunu Gös&ter" msgid "Show Drives" msgstr "Aygıtları Göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "EFB Bölge Kopyalamasını Göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "Kare Sayısını Göster" @@ -4420,7 +4461,7 @@ msgstr "Fransızları Göster" msgid "Show GameCube" msgstr "GameCube'leri Göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "Görüntü GiriÅŸini Göster" @@ -4456,7 +4497,7 @@ msgstr "Platformları Göster" msgid "Show Regions" msgstr "Bölgeleri Göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "Ä°statistikleri Göster" @@ -4510,7 +4551,7 @@ msgstr "Kayıt simgesini göster" msgid "Show save title" msgstr "Kayıt baÅŸlığını göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4530,7 +4571,7 @@ msgstr "Bu yardım mesajını göster." msgid "Show unknown" msgstr "Bilinmeyenleri göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -4556,15 +4597,15 @@ msgstr "Boyut" msgid "Skip BIOS" msgstr "BIOS'u Geç" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "Hedef Alpha GeçiÅŸini Atla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "CPU'dan EFB eriÅŸimini atla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4575,6 +4616,22 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"DoÄŸruluktan fedakarlık edip EFB'den RAM'a kopyalamayı biraz hızlandırır. \n" +"Bazen görsel kaliteyi de artırır. \n" +"EÄŸer herhangi bir sorun yaşıyorsanız, doku önbelleÄŸi doÄŸruluÄŸunu artırmayı " +"veya bu seçeneÄŸi iptal etmeyi deneyin. \n" +"\n" +"Emin deÄŸilseniz, iÅŸaretsiz bırakın." + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4627,9 +4684,9 @@ msgstr "Ses tamponu oluÅŸturulamadı: %s" msgid "Space" msgstr "BoÅŸluk" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "Ä°spanyolca" @@ -4637,7 +4694,7 @@ msgstr "Ä°spanyolca" msgid "Speaker Volume:" msgstr "Hoparlör Ses Seviyesi:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 " @@ -4673,9 +4730,9 @@ msgstr "Kare Çubuk" msgid "Standard Controller" msgstr "Varsayılan Denetim Aygıtı" +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "BaÅŸlat" @@ -4703,14 +4760,28 @@ msgstr "Durum Kayıtları" msgid "Stick" msgstr "Çubuk" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Durdur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" +"EFB kopyalarını GPU doku nesnelerinde sakla. \n" +"Pek doÄŸru deÄŸildir, ama çoÄŸu oyun için iyi çalışır ve EFB'den RAM'e " +"seçeneÄŸinden daha fazla hız verir. \n" +"\n" +"Emin deÄŸilseniz, iÅŸaretli bırakın." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "Pencereye Göre Ayarla" @@ -4744,8 +4815,8 @@ msgstr "Sistem Dili:" msgid "TAIWAN" msgstr "TAYVAN" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS GiriÅŸi" @@ -4765,9 +4836,9 @@ msgstr "Tablo Sol" msgid "Table Right" msgstr "Tablo SaÄŸ" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "Ekran Görüntüsü Al" @@ -4775,7 +4846,15 @@ msgstr "Ekran Görüntüsü Al" msgid "Test" msgstr "Sınama" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "Doku" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +msgid "Texture Cache" +msgstr "Doku ÖnbelleÄŸi" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" msgstr "Doku Biçimi Kaplaması" @@ -4820,7 +4899,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:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Belirtilen dosya (%s) bulunamadı" @@ -4837,11 +4916,23 @@ 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:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +msgstr "" +"Bunu ayarlamak daha güvenlidir, emülatörün RAM'den daha az doku güncellemesi " +"kaçırmasını saÄŸlar. \n" +"\n" +"Emin deÄŸilseniz, saÄŸdaki 2. en hızlı deÄŸeri kullanın." + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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:363 +#: Source/Core/DolphinWX/Src/Main.cpp:353 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4909,7 +5000,7 @@ msgstr "" 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:119 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. " @@ -4984,13 +5075,13 @@ msgstr "Buraya" msgid "Toggle All Log Types" msgstr "Tüm GeçmiÅŸ Türlerini Seç" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Tam Ekran Moduna Geç" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Top" msgstr "Ãœst" @@ -4998,7 +5089,7 @@ msgstr "Ãœst" msgid "Traditional Chinese" msgstr "Geleneksel Çince" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "Bilinmeyen bir dosya türünü yüklemeye denedik." @@ -5034,8 +5125,8 @@ msgstr "Tür" msgid "UDP Port:" msgstr "UDP BaÄŸ.Nok.:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5108,8 +5199,8 @@ msgstr "" "Bilinmeyen iÅŸaretleyici %#08x\n" "Devam?" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "Yukarı" @@ -5126,7 +5217,7 @@ msgstr "Dik Wiimote" msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 Modunu Kullan (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 msgid "Use Fullscreen" msgstr "Tam Ekran Kullan" @@ -5138,7 +5229,7 @@ msgstr "HEX Kullan" msgid "Use Panic Handlers" msgstr "Önemli Hataları Bildir" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5150,7 +5241,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5164,11 +5255,11 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "Gereçler" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "Dikey Sync" @@ -5192,8 +5283,7 @@ msgstr "Duyuru/Hata/Uyarı" msgid "Video" msgstr "Görüntü" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "Sanal" @@ -5220,21 +5310,21 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Uyarı" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 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:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "Uyarı - ELF yanlış konsol modunda baÅŸlatılıyor!" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "Uyarı - Kalıp yanlış konsol modunda baÅŸlatılıyor!" @@ -5272,7 +5362,7 @@ msgstr "WaveFileWriter - dosya açılamadı." msgid "Whammy" msgstr "Darbe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "GeniÅŸ Ekran Hilesi" @@ -5296,7 +5386,7 @@ msgstr "Wii NAND Kök Dizini:" msgid "Wii Save Import" msgstr "Wii Kaydı Al" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii kayıt dosyaları (*.bin)|*.bin" @@ -5304,8 +5394,8 @@ msgstr "Wii kayıt dosyaları (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Dosyadan okuma baÅŸarısız" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "Wiimote" @@ -5327,7 +5417,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:609 +#: Source/Core/DolphinWX/Src/Main.cpp:599 msgid "Wiimote Connected" msgstr "Wiimote BaÄŸlandı" @@ -5359,7 +5449,7 @@ msgstr "Pencereleri SaÄŸa Döşe" msgid "Word Wrap" msgstr "Heceleme" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5465,7 +5555,7 @@ msgstr "Dolphin Sıfır kodu bilinmiyor: %08x" msgid "[ waiting ]" msgstr "[ bekleniyor ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5481,7 +5571,7 @@ msgstr "" msgid "[Custom]" msgstr "[Özel]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5499,7 +5589,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5599,9 +5689,6 @@ msgstr "| VEYA" #~ msgid "AOSound" #~ msgstr "AOSes" -#~ msgid "Accuracy:" -#~ msgstr "DoÄŸruluk:" - #~ msgid "Accurate Texture Cache" #~ msgstr "DoÄŸru Doku ÖnbelleÄŸi" @@ -5638,17 +5725,6 @@ 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 "" -#~ "Mipmapleri hafızadan dekode etmek yerine otomatik olarak yarat. \n" -#~ "Performansı artırır ama bazı küçük doku hatalarına neden olabilir. \n" -#~ "\n" -#~ "Emin deÄŸilseniz, iÅŸaretli bırakın." - #~ msgid "Bad gameini filename" #~ msgstr "Kötü oyun .ini dosya adı" @@ -5711,6 +5787,9 @@ msgstr "| VEYA" #~ msgid "Danish" #~ msgstr "Danca" +#~ msgid "Disable Wiimote Speaker" +#~ msgstr "WiiMote Hoparlörünü Ä°ptal Et" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -5773,9 +5852,6 @@ msgstr "| VEYA" #~ msgid "Enable CPU Access" #~ msgstr "CPU EriÅŸimine Ä°zin Ver" -#~ msgid "Enable Cache" -#~ msgstr "ÖnbelleÄŸe izin ver" - #~ msgid "Enable Copy to EFB" #~ msgstr "EFB'ye Kopyalamaya Ä°zin Ver" @@ -5854,12 +5930,6 @@ msgstr "| VEYA" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "DSP ROM'u %s yükleme baÅŸarısız." -#~ msgid "Fast" -#~ msgstr "Hızlı" - -#~ msgid "Fast Mipmaps" -#~ msgstr "Hızlı Mipmap'lar" - #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6015,15 +6085,9 @@ msgstr "| VEYA" #~ msgid "Running script...\n" #~ msgstr "Script çalıştırılıyor... \n" -#~ msgid "Safe" -#~ msgstr "Güvenli" - #~ msgid "Scale:" #~ msgstr "Boyut:" -#~ msgid "Scaled EFB Copy" -#~ msgstr "Boyutlandırılmış EFB Kopyası" - #~ msgid "Select resolution for fullscreen mode" #~ msgstr "Tam ekran modu için çözünürlük seçin" @@ -6078,22 +6142,6 @@ msgstr "| VEYA" #~ msgid "Skies of Arcadia" #~ msgstr "Skies of Arcadia" -#~ 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" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "DoÄŸruluktan fedakarlık edip EFB'den RAM'a kopyalamayı biraz " -#~ "hızlandırır. \n" -#~ "Bazen görsel kaliteyi de artırır. \n" -#~ "EÄŸer herhangi bir sorun yaşıyorsanız, doku önbelleÄŸi doÄŸruluÄŸunu " -#~ "artırmayı veya bu seçeneÄŸi iptal etmeyi deneyin. \n" -#~ "\n" -#~ "Emin deÄŸilseniz, iÅŸaretsiz bırakın." - #~ msgid "Slot" #~ msgstr "Slot" @@ -6132,39 +6180,9 @@ msgstr "| VEYA" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Oyununuz tam ekran görüntüyle baÅŸlar." -#~ 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" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "EFB kopyalarını GPU doku nesnelerinde sakla. \n" -#~ "Pek doÄŸru deÄŸildir, ama çoÄŸu oyun için iyi çalışır ve EFB'den RAM'e " -#~ "seçeneÄŸinden daha fazla hız verir. \n" -#~ "\n" -#~ "Emin deÄŸilseniz, iÅŸaretli bırakın." - -#~ msgid "Texture" -#~ msgstr "Doku" - -#~ msgid "Texture Cache" -#~ msgstr "Doku ÖnbelleÄŸi" - #~ msgid "The file " #~ msgstr "Dosya" -#~ msgid "" -#~ "The safer you adjust this, the less likely the emulator will be missing " -#~ "any texture updates from RAM.\n" -#~ "\n" -#~ "If unsure, use the second-fastest value from the right." -#~ msgstr "" -#~ "Bunu ayarlamak daha güvenlidir, emülatörün RAM'den daha az doku " -#~ "güncellemesi kaçırmasını saÄŸlar. \n" -#~ "\n" -#~ "Emin deÄŸilseniz, saÄŸdaki 2. en hızlı deÄŸeri kullanın." - #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Ses efektlerini oynatmak için kullanılır." diff --git a/Languages/po/zh_CN.po b/Languages/po/zh_CN.po index 88ae9d8666..25a3c517d8 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: 2011-08-10 08:30-0500\n" +"POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-01-09 13:55-0800\n" "Last-Translator: thegfw \n" "Language-Team: \n" @@ -30,7 +30,7 @@ msgstr " æ¸¸æˆ : " msgid "! NOT" msgstr "! éž" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -72,7 +72,7 @@ msgstr "%s å·²ç»å­˜åœ¨,覆盖å—?" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "æå– %s 失败.å¯èƒ½é•œåƒæ˜¯åçš„." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, fuzzy, c-format msgid "" "%s failed to load as a memorycard \n" @@ -81,7 +81,7 @@ msgstr "" "内存å¡è½½å…¥å¤±è´¥\n" " å¡å¤§å°ä¸æ­£ç¡® (%04X)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, fuzzy, c-format msgid "" "%s failed to load as a memorycard \n" @@ -90,7 +90,7 @@ msgstr "" "内存å¡è½½å…¥å¤±è´¥\n" " å¡å¤§å°ä¸æ­£ç¡® (%04X)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -304,7 +304,7 @@ msgstr "" msgid "(UNKNOWN)" msgstr "(未知)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(å…³)" @@ -316,7 +316,7 @@ msgstr "16 ä½" msgid "32 bit" msgstr "32 ä½" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "" @@ -328,7 +328,7 @@ msgstr "8 ä½" msgid "" msgstr "<在这里æ’å…¥å称>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "<未找到分辨率>" @@ -414,17 +414,21 @@ msgstr "关于 Dolphin" msgid "Acceleration" msgstr "加速器" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "精确脉冲染料激光模拟" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 @@ -509,12 +513,12 @@ msgstr "动作回放: æ­£å¸¸ä»£ç  %i: 无效å­ç±»åž‹ %08x (%s)" msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "动作回放: æ­£å¸¸ä»£ç  0: 无效å­ç±»åž‹ %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "适é…器:" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "添加" @@ -530,9 +534,9 @@ msgstr "添加补ä¸" msgid "Add new pane" msgstr "添加新é¢æ¿" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "添加..." @@ -566,7 +570,7 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "调整摇æ†æŽ§åˆ¶éœ€è¦æ´»åŠ¨çš„按钮." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "高级" @@ -586,8 +590,8 @@ msgstr "所有 GC/Wii é•œåƒ (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 文件 (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "All Save States (sav, s##)" msgstr "æ‰€æœ‰å­˜æ¡£çŠ¶æ€ (sav, s##)" @@ -603,7 +607,7 @@ msgstr "所有压缩的 GC/Wii é•œåƒæ–‡ä»¶ (gcz)" msgid "All files (*.*)|*.*" msgstr "所有文件 (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -611,11 +615,16 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "模拟 Wiimote" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" msgstr "å„å‘异性过滤:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "抗锯齿:" @@ -635,7 +644,7 @@ msgstr "应用载入器:" msgid "Apply" msgstr "应用" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -664,7 +673,7 @@ msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "请确认真的è¦åˆ é™¤è¿™äº›æ–‡ä»¶?这将是永久性的删除!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "高宽比:" @@ -685,20 +694,20 @@ msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: 打开 AO 设备错误.\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自动" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 #, fuzzy msgid "Auto (Window Size)" msgstr "窗å£å¤§å°:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 #, fuzzy msgid "Auto adjust Window Size" msgstr "窗å£å¤§å°:" @@ -711,6 +720,14 @@ msgid "" "If unsure, leave this unchecked." msgstr "按模拟器显示输入读å–" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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/WXInputBase.cpp:27 msgid "Back" msgstr "Back" @@ -719,8 +736,8 @@ msgstr "Back" msgid "Backend Settings" msgstr "åŽç«¯è®¾ç½®" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 #, fuzzy msgid "Backend:" msgstr "音频åŽç«¯:" @@ -755,7 +772,7 @@ msgstr "标志:" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "基本" @@ -767,7 +784,7 @@ msgstr "基本 设置" msgid "Bass" msgstr "Bass" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Block Allocation Table checksum failed" @@ -787,8 +804,8 @@ msgstr "è“ å·¦" msgid "Blue Right" msgstr "è“ å³" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 msgid "Bottom" msgstr "底部" @@ -821,9 +838,9 @@ msgstr "æµè§ˆè¾“出目录" msgid "Buffer:" msgstr "缓冲区:" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "按键" @@ -840,12 +857,12 @@ msgstr "C-摇æ†" msgid "CPU Emulator Engine" msgstr "CPU 模拟引擎" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 #, fuzzy msgid "Cache Display Lists" msgstr "å¯ç”¨æ˜¾ç¤ºåˆ—表缓存" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 " @@ -855,7 +872,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -864,8 +881,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "å–消" @@ -912,10 +929,10 @@ msgstr "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "ä¸èƒ½æŒ‰ç…§è¿žæŽ¥å¥æŸ„ %02x 找到 WiiMote" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "ä¸èƒ½ä»Ž DVDæ’件 - DVD接å£è¯»å–æ•°æ®: 严é‡é”™è¯¯" @@ -1038,10 +1055,10 @@ msgstr "Circle Stick" msgid "Classic" msgstr "ç»å…¸" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "清除" @@ -1057,10 +1074,10 @@ msgstr "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "关闭" @@ -1165,7 +1182,7 @@ msgstr "连接 Wiimote 3" msgid "Connect Wiimote 4" msgstr "连接 Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:608 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Connecting..." msgstr "连接中..." @@ -1233,7 +1250,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:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1302,11 +1319,11 @@ msgstr "创建者:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "è£åˆ‡" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1350,8 +1367,8 @@ msgstr "DSP音频" msgid "DSP Emulator Engine" msgstr "音频模拟引擎" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "DSP HLE emulation (fast)" msgstr "音频 HLE 模拟(很快)" @@ -1401,7 +1418,7 @@ msgstr "死区" msgid "Debug" msgstr "调试" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 #, fuzzy msgid "Debugging" msgstr "调试" @@ -1435,8 +1452,8 @@ msgstr "默认镜åƒ:" msgid "Default font" msgstr "默认字体" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "删除" @@ -1444,12 +1461,12 @@ msgstr "删除" msgid "Delete Save" msgstr "删除存档" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "删除已ç»å­˜åœ¨çš„文件 '%s' 么?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 #, fuzzy msgid "Description" msgstr "询问" @@ -1481,15 +1498,15 @@ msgstr "设备设置" msgid "Dial" msgstr "Dial" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1497,34 +1514,30 @@ msgstr "" "目录校检失败\n" "和目录备份校检失败" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 #, fuzzy msgid "Disable" msgstr "ç¦ç”¨é›¾åŒ–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "ç¦ç”¨é›¾åŒ–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "ç¦ç”¨å…‰çº¿" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 #, fuzzy msgid "Disable Per-Pixel Depth" msgstr "åƒç´ æ·±åº¦" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "ç¦ç”¨æè´¨" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1533,7 +1546,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1543,7 +1556,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1559,11 +1572,11 @@ msgstr "光盘" msgid "Disc Read Error" msgstr "光盘读å–错误" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "显示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 #, fuzzy msgid "" "Display the inputs read by the emulator.\n" @@ -1575,7 +1588,7 @@ msgstr "按模拟器显示输入读å–" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Do you want to stop the current emulation?" msgstr "您确定是å¦åœæ­¢å½“å‰æ¨¡æ‹Ÿ?" @@ -1583,7 +1596,7 @@ msgstr "您确定是å¦åœæ­¢å½“å‰æ¨¡æ‹Ÿ?" msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s 图形设置" @@ -1605,12 +1618,12 @@ msgstr "Dolphin 模拟 Wiimote 设置" msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC 手柄设置" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 电影 (*.dtm)" @@ -1634,8 +1647,8 @@ msgid "" "games..." msgstr "Dolphin 当å‰è®¾ç½®äº†éšè—所有游æˆ. åŒå‡»è¿™é‡Œæ˜¾ç¤ºæ‰€æœ‰æ¸¸æˆ..." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "下" @@ -1660,26 +1673,26 @@ msgstr "虚拟" msgid "Dump Audio" msgstr "转储音频" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "转储 EFB 目标" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "转储框架" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "转储æè´¨" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 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:112 #, fuzzy msgid "" "Dump decoded game textures to User/Dump/Textures//\n" @@ -1687,16 +1700,16 @@ msgid "" "If unsure, leave this unchecked." msgstr "转储游æˆæ质到 User/Dump/Textures/<æ¸¸æˆ ID>/" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 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:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "è·å…°è¯­" @@ -1704,7 +1717,7 @@ msgstr "è·å…°è¯­" msgid "E&xit" msgstr "退出模拟(&X)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 #, fuzzy msgid "EFB Copies" msgstr "EFB å¤åˆ¶èŒƒå›´" @@ -1759,7 +1772,7 @@ msgstr "编辑..." msgid "Effect" msgstr "效果" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "" @@ -1767,7 +1780,7 @@ msgstr "" msgid "Emu Thread already running" msgstr "模拟线程已ç»åœ¨è¿è¡Œ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1776,7 +1789,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1798,7 +1811,7 @@ msgstr "模拟器状æ€: " msgid "Enable" msgstr "å¯ç”¨" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1824,6 +1837,11 @@ msgstr "å¯ç”¨ BAT" msgid "Enable Block Merging" msgstr "å¯ç”¨åŒºå—åˆå¹¶" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#, fuzzy +msgid "Enable Cache" +msgstr "å¯ç”¨ç¼“å­˜" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "å¯ç”¨ä½œå¼Š" @@ -1840,7 +1858,7 @@ msgstr "å¯ç”¨å¤šæ ¸å¤„ç†" msgid "Enable Dual Core (speedup)" msgstr "å¯ç”¨å¤šæ ¸å¤„ç†(加速)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "å¯ç”¨çƒ­é”®" @@ -1856,8 +1874,8 @@ msgstr "å¯ç”¨ç©ºé—²æ­¥è¿›(加速)" msgid "Enable MMU" msgstr "å¯ç”¨ MMU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "å¯ç”¨é€è¡Œæ‰«æ" @@ -1870,7 +1888,7 @@ msgstr "å¯ç”¨å®½å±" msgid "Enable WideScreen" msgstr "å¯ç”¨å®½å±" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "å¯ç”¨çº¿æ¡†" @@ -1948,7 +1966,7 @@ msgid "" "OFF = Fast)" msgstr "å¯ç”¨å†…存管ç†å•å…ƒ,一些游æˆéœ€è¦(ON = 兼容,OFF = 快速)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -1959,14 +1977,14 @@ msgstr "" msgid "End" msgstr "End" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "英语" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "增强" @@ -1988,13 +2006,13 @@ msgstr "项目 1/%d" msgid "Equal" msgstr "等于" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "错误" -#: Source/Core/DolphinWX/Src/Main.cpp:356 +#: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Error loading selected language. Falling back to system default." @@ -2068,7 +2086,7 @@ msgstr "导出存档为..." msgid "Extension" msgstr "扩展" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 #, fuzzy msgid "External Frame Buffer" msgstr "外部å‚æ•°" @@ -2184,7 +2202,7 @@ msgstr "ä¸èƒ½è½½å…¥ hid.dll" msgid "Failed to read banner.bin" msgstr "è¯»å– banner.bin 失败" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2192,7 +2210,7 @@ msgstr "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2205,7 +2223,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "从文件 %d 读å–æ•°æ®å¤±è´¥" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2213,7 +2231,7 @@ msgstr "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2221,7 +2239,7 @@ msgstr "" "正确的读å–目录失败\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2229,7 +2247,7 @@ msgstr "" "正确的读å–头失败\n" "(0x000-0x1FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2261,6 +2279,15 @@ msgstr "写入文件头到 %s 失败" msgid "Failed to write header for file %d" msgstr "写入文件头失败 %d" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "快速" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#, fuzzy +msgid "Fast Mipmaps" +msgstr "载人原始纹ç†" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMU 快速版本. 任何游æˆéƒ½ä¸èƒ½å·¥ä½œ" @@ -2291,7 +2318,7 @@ msgstr "" "File could not be opened\n" "or does not have a valid extension" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2329,11 +2356,11 @@ msgstr "第一个区å—" msgid "Fix Checksums" msgstr "修正校检和" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "强制 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "强制 4:3" @@ -2342,12 +2369,12 @@ msgstr "强制 4:3" msgid "Force Console as NTSC-J" msgstr "设置终端为 NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 #, fuzzy msgid "Force Texture Filtering" msgstr "å„å‘异性过滤:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 #, fuzzy msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" @@ -2377,7 +2404,7 @@ msgid "" "setting when playing Japanese games." msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2404,7 +2431,7 @@ msgstr "Frame Advance" msgid "Frame Advance" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "帧转储使用 FFV1" @@ -2426,13 +2453,13 @@ msgstr "帧数é™åˆ¶:" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "自由视点" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "法语" @@ -2449,7 +2476,7 @@ msgstr "" msgid "FullScr" msgstr "å…¨å±" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 #, fuzzy msgid "Fullscreen resolution:" msgstr "å…¨å±åˆ†è¾¨çŽ‡:" @@ -2494,8 +2521,8 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Gamecube 手柄设置(&P)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube å†…å­˜å¡ (*.raw,*.gcp)" @@ -2517,9 +2544,9 @@ 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/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "常规" @@ -2528,9 +2555,9 @@ msgstr "常规" msgid "General Settings" msgstr "ç•Œé¢è®¾ç½®" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "德语" @@ -2551,11 +2578,13 @@ msgstr "图形设置" msgid "Greater Than" msgstr "大于" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" -"Greatly increases quality of textures generated using render-to-texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2584,11 +2613,11 @@ msgstr "å‰å®ƒ" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY 被调用, 请报告bug!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "头部校检失败" @@ -2624,7 +2653,7 @@ msgstr "" msgid "Hide" msgstr "éšè—" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "éšè—鼠标光标" @@ -2649,8 +2678,8 @@ msgstr "主机" msgid "Hotkey Configuration" msgstr "热键设置" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 msgid "Hotkeys" msgstr "热键" @@ -2730,12 +2759,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:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 #, fuzzy msgid "Ignore Format Changes" msgstr "模拟格å¼ä¿®æ”¹" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2744,7 +2773,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 " @@ -2781,7 +2810,7 @@ msgstr "" "导入的文件有一个 sav 扩展å\n" "但是它没有正确的文件头" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 #, fuzzy msgid "" "Improves performance but causes glitches in most games which rely on proper " @@ -2792,7 +2821,7 @@ msgstr "" "Disable fog. Improves performance but causes glitches in games which rely on " "proper fog emulation." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 #, fuzzy msgid "" "Improves performance but causes lighting to disappear in most games.\n" @@ -2810,8 +2839,8 @@ msgstr "进游æˆ" msgid "In-Game" msgstr "进游æˆ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "ä¿¡æ¯" @@ -2854,7 +2883,7 @@ msgid "" msgstr "" "InstallExceptionHandler called, but this platform does not yet support it." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 #, fuzzy msgid "Installing WAD..." msgstr "安装 WAD 到 Wii èœå•ä¸­..." @@ -2885,7 +2914,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "内部 LZO 错误 - lzo_init() 失败" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 #, fuzzy msgid "Internal Resolution:" msgstr "å…¨å±åˆ†è¾¨çŽ‡:" @@ -2939,9 +2968,9 @@ msgstr "无效录制文件" msgid "Invalid state" msgstr "Invalid state" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "æ„大利语" @@ -3002,8 +3031,8 @@ msgstr "最åŽè¦†ç›–状æ€" msgid "Last Saved State" msgstr "最åŽä¿å­˜çŠ¶æ€" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "å·¦" @@ -3049,7 +3078,7 @@ msgstr "" msgid "Load" msgstr "载入" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 #, fuzzy msgid "Load Custom Textures" msgstr "载入精细æè´¨" @@ -3090,17 +3119,17 @@ msgstr "载入存档æ’槽 8" msgid "Load State..." msgstr "载入状æ€..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 #, fuzzy msgid "Load Wii System Menu" msgstr "载入 Wii 系统èœå•(%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 #, 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:113 #, fuzzy msgid "" "Load custom textures from User/Load/Textures//\n" @@ -3141,8 +3170,8 @@ msgstr "记录类型" msgid "Logger Outputs" msgstr "记录输出" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "记录中" @@ -3176,8 +3205,8 @@ msgstr "MMU 速度破解" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark 文件(*.gcs)" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "主摇æ†" @@ -3207,8 +3236,8 @@ msgstr "内存å¡å·²ç»æ‰“å¼€" msgid "Memory Byte" msgstr "内存(&M)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 msgid "Memory Card" msgstr "内存å¡" @@ -3235,7 +3264,7 @@ msgstr "" "%s\n" "Would you like to copy the old file to this new location?\n" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "" @@ -3253,7 +3282,7 @@ msgstr "Mic" msgid "Min" msgstr "Mic" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "其它" @@ -3266,7 +3295,7 @@ msgstr "其它设置" msgid "Modifier" msgstr "修改者" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3287,7 +3316,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "马达" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3392,9 +3421,9 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "å称:" @@ -3480,7 +3509,7 @@ msgstr "ä¸ç­‰äºŽ" msgid "Not Set" msgstr "未设置" -#: Source/Core/DolphinWX/Src/Main.cpp:607 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Not connected" msgstr "未连接" @@ -3509,8 +3538,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "代ç æ•°é‡: " -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "Nunchuk" @@ -3539,8 +3568,8 @@ msgstr "å移é‡:" msgid "Only %d blocks available" msgstr "åªæœ‰ %d 区å—有效" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Open" msgstr "打开" @@ -3570,11 +3599,11 @@ msgstr "OpenAL: ä¸èƒ½æ‰¾åˆ°éŸ³é¢‘设备" msgid "OpenAL: can't open device %s" msgstr "OpenAL: ä¸èƒ½æ‰“开设备 %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "" @@ -3605,8 +3634,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:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "" @@ -3671,13 +3700,13 @@ msgstr "è¡¥ä¸" msgid "Paths" msgstr "路径" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "æš‚åœ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 #, fuzzy msgid "Per-Pixel Lighting" msgstr "åƒç´ å…‰çº¿" @@ -3691,10 +3720,10 @@ msgstr "完美" msgid "Perspective %d" msgstr "Perspective %d" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 msgid "Play" msgstr "开始" @@ -3719,7 +3748,7 @@ msgstr "选项" msgid "Players" msgstr "玩家" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 msgid "Please confirm..." msgstr "请确认..." @@ -3764,7 +3793,7 @@ msgstr "è‘¡è„牙语" msgid "Portuguese (Brazilian)" msgstr "è‘¡è„牙语(巴西)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 #, fuzzy msgid "Post-Processing Effect:" msgstr "Post-Processing Shader:" @@ -3824,7 +3853,7 @@ msgstr "R é”®" msgid "R-Analog" msgstr "R-摇æ†" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "内存" @@ -3840,7 +3869,7 @@ msgstr "范围" msgid "Read-only mode" msgstr "åªè¯»æ¨¡å¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "真实" @@ -3903,9 +3932,9 @@ msgstr "" "This makes the rendered picture look less blocky but also heavily decreases " "performance." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "刷新" @@ -3917,14 +3946,14 @@ msgstr "刷新列表" msgid "Refresh game list" msgstr "刷新游æˆåˆ—表" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Remove" msgstr "移除" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 #, fuzzy msgid "" "Render the scene as a wireframe.\n" @@ -3934,12 +3963,12 @@ msgstr "" "Render the scene as a wireframe.\n" "This is only useful for debugging purposes." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "附加到主窗å£" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "é‡ç½®" @@ -3951,8 +3980,8 @@ msgstr "结果" msgid "Return" msgstr "回车" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "å³" @@ -3977,13 +4006,17 @@ msgstr "俄语" msgid "Sa&ve State" msgstr "ä¿å­˜çŠ¶æ€(&V)" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "安全" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "采样率:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "ä¿å­˜" @@ -4049,6 +4082,11 @@ msgstr "ä¿å­˜è§£åŽ‹ç¼©çš„GCM/é•œåƒ" msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Savestate movie %s is corrupted, movie recording stopping..." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#, fuzzy +msgid "Scaled EFB Copy" +msgstr "EFB 比例å¤åˆ¶" + #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, fuzzy, c-format msgid "Scanning %s" @@ -4084,17 +4122,17 @@ msgstr "æœç´¢å­ç›®å½•" msgid "Section %s not found in SYSCONF" msgstr "Section %s not found in SYSCONF" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "选择" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "选择录制文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 #, fuzzy msgid "Select a Wii WAD file to install" msgstr "选择è¦å¯¼å…¥çš„存档" @@ -4121,15 +4159,15 @@ msgstr "选择浮动窗å£" msgid "Select the file to load" msgstr "选择è¦è½½å…¥çš„文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Select the save file" msgstr "选择一个存档文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "选择è¦è½½å…¥çš„状æ€" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "Select the state to save" msgstr "选择è¦ä¿å­˜çš„状æ€" @@ -4255,12 +4293,12 @@ msgstr "显示工具æ (&T)" msgid "Show Drives" msgstr "显示驱动器" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 #, fuzzy msgid "Show EFB Copy Regions" msgstr "EFB å¤åˆ¶èŒƒå›´" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "显示 FPS" @@ -4272,7 +4310,7 @@ msgstr "显示法国" msgid "Show GameCube" msgstr "显示 GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "显示输入显示" @@ -4308,7 +4346,7 @@ msgstr "显示平å°" msgid "Show Regions" msgstr "显示国家" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 #, fuzzy msgid "Show Statistics" msgstr "å„ç§ç»Ÿè®¡æ•°æ®" @@ -4363,7 +4401,7 @@ msgstr "显示存档图标" msgid "Show save title" msgstr "显示存档标题" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4379,7 +4417,7 @@ msgstr "显示这个帮助消æ¯" msgid "Show unknown" msgstr "显示未知" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -4403,16 +4441,16 @@ msgstr "大å°" msgid "Skip BIOS" msgstr "跳过 GC BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "ç¦ç”¨ç›®æ ‡é€æ˜Žé€šé“" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4420,6 +4458,16 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4468,9 +4516,9 @@ msgstr "声音缓冲区创建失败: %s" msgid "Space" msgstr "空格" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "西ç­ç‰™è¯­" @@ -4478,7 +4526,7 @@ msgstr "西ç­ç‰™è¯­" msgid "Speaker Volume:" msgstr "扬声器音é‡:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 " @@ -4506,9 +4554,9 @@ msgstr "æ–¹å—é”®" msgid "Standard Controller" msgstr "标准控制器" +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "开始" @@ -4536,14 +4584,23 @@ msgstr "State Saves" msgid "Stick" msgstr "摇æ†" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "åœæ­¢" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "附加到窗å£" @@ -4577,8 +4634,8 @@ msgstr "系统语言" msgid "TAIWAN" msgstr "å°æ¹¾" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #, fuzzy msgid "TAS Input" msgstr "输入" @@ -4599,9 +4656,9 @@ msgstr "Table Left" msgid "Table Right" msgstr "Table Right" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "å±å¹•æˆªå›¾(&T)" @@ -4609,7 +4666,16 @@ msgstr "å±å¹•æˆªå›¾(&T)" msgid "Test" msgstr "测试" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "æè´¨" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +#, fuzzy +msgid "Texture Cache" +msgstr "清除缓存" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 #, fuzzy msgid "Texture Format Overlay" msgstr "æ质格å¼" @@ -4655,7 +4721,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:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "您指定的文件 %s ä¸å­˜åœ¨" @@ -4672,11 +4738,19 @@ msgstr "å称ä¸èƒ½åŒ…å«å­—符 ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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:363 +#: Source/Core/DolphinWX/Src/Main.cpp:353 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4745,7 +4819,7 @@ msgstr "" 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:119 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. " @@ -4814,13 +4888,13 @@ msgstr "顶部" msgid "Toggle All Log Types" msgstr "切æ¢æ‰€æœ‰æ—¥å¿—类型" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "切æ¢å…¨å±" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Top" msgstr "顶部" @@ -4828,7 +4902,7 @@ msgstr "顶部" msgid "Traditional Chinese" msgstr "ç¹ä½“中文" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "å·²ç»å°è¯•è½½å…¥æœªçŸ¥æ–‡ä»¶ç±»åž‹." @@ -4864,8 +4938,8 @@ msgstr "类型" msgid "UDP Port:" msgstr "UDP 端å£:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -4933,8 +5007,8 @@ msgstr "" "未知指针 %#08x\n" "继续?" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "上" @@ -4951,7 +5025,7 @@ msgstr "ç›´æ¡ Wiimote" msgid "Use EuRGB60 Mode (PAL60)" msgstr "使用 EuRGB60 æ¨¡å¼ (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 #, fuzzy msgid "Use Fullscreen" msgstr "切æ¢å…¨å±(&F)" @@ -4964,7 +5038,7 @@ msgstr "使用å六进制" msgid "Use Panic Handlers" msgstr "使用警告程åº" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -4972,7 +5046,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -4981,11 +5055,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "实用扩展" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "åž‚ç›´åŒæ­¥" @@ -5009,8 +5083,7 @@ msgstr "详细" msgid "Video" msgstr "视频" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "虚拟" @@ -5033,21 +5106,21 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "警告" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 msgid "Warning - starting DOL in wrong console mode!" msgstr "Warning - starting DOL in wrong console mode!" -#: Source/Core/Core/Src/Boot/Boot.cpp:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "Warning - starting ELF in wrong console mode!" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "Warning - starting ISO in wrong console mode!" @@ -5084,7 +5157,7 @@ msgstr "波形文件写入器 - 文件未打开." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "宽å±ç ´è§£" @@ -5109,7 +5182,7 @@ msgstr "DVD 根目录:" msgid "Wii Save Import" msgstr "导入 Wii 存档" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存档文件 (*.bin)|*.bin" @@ -5117,8 +5190,8 @@ msgstr "Wii 存档文件 (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: ä¸èƒ½ä»Žæ–‡ä»¶è¯»å–" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "Wiimote" @@ -5140,7 +5213,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:609 +#: Source/Core/DolphinWX/Src/Main.cpp:599 msgid "Wiimote Connected" msgstr "Wiimote 已连接" @@ -5173,7 +5246,7 @@ msgstr "窗å£å³ä¾§" msgid "Word Wrap" msgstr "自动æ¢è¡Œ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5275,7 +5348,7 @@ msgstr "Zero code unknown to dolphin: %08x" msgid "[ waiting ]" msgstr "[ 等待中 ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5287,7 +5360,7 @@ msgstr "" msgid "[Custom]" msgstr "[自定义]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5298,7 +5371,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5549,10 +5622,6 @@ msgstr "| 或" #~ msgid "Enable CPU Access" #~ msgstr "å¯ç”¨CPU访问" -#, fuzzy -#~ msgid "Enable Cache" -#~ msgstr "å¯ç”¨ç¼“å­˜" - #~ msgid "Enable Copy to EFB" #~ msgstr "å¯ç”¨å¤åˆ¶åˆ°EFB" @@ -5633,13 +5702,6 @@ msgstr "| 或" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "下载代ç å¤±è´¥." -#~ msgid "Fast" -#~ msgstr "快速" - -#, fuzzy -#~ msgid "Fast Mipmaps" -#~ msgstr "载人原始纹ç†" - #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -5801,16 +5863,9 @@ msgstr "| 或" #~ msgid "Running script...\n" #~ msgstr "è¿è¡Œè„šæœ¬ä¸­...\n" -#~ msgid "Safe" -#~ msgstr "安全" - #~ msgid "Scale:" #~ msgstr "比例:" -#, fuzzy -#~ msgid "Scaled EFB Copy" -#~ msgstr "EFB 比例å¤åˆ¶" - #~ msgid "Select resolution for fullscreen mode" #~ msgstr "选择全å±æ¨¡å¼åˆ†è¾¨çŽ‡" @@ -5896,13 +5951,6 @@ msgstr "| 或" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Start the rendering window in fullscreen mode." -#~ msgid "Texture" -#~ msgstr "æè´¨" - -#, fuzzy -#~ msgid "Texture Cache" -#~ msgstr "清除缓存" - #~ msgid "The file " #~ msgstr "The file " diff --git a/Languages/po/zh_TW.po b/Languages/po/zh_TW.po index 65d676311e..197bb80e90 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: 2011-08-10 08:30-0500\n" +"POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-03-15 02:51+0800\n" "Last-Translator: khiav \n" "Language-Team: khiav&yrbn \n" @@ -30,7 +30,7 @@ msgstr " éŠæˆ²ï¼š" msgid "! NOT" msgstr "! éž" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -72,7 +72,7 @@ msgstr "%s 已經存在，是å¦è¦†å¯«ï¼Ÿ" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "抹除 %s 失敗。也許檔案是ä¸æ­£ç¢ºçš„。" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, fuzzy, c-format msgid "" "%s failed to load as a memorycard \n" @@ -81,7 +81,7 @@ msgstr "" "讀å–記憶å¡å¤±æ•—\n" " 記憶å¡å¤§å°ç„¡æ•ˆ (%04X)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, fuzzy, c-format msgid "" "%s failed to load as a memorycard \n" @@ -90,7 +90,7 @@ msgstr "" "讀å–記憶å¡å¤±æ•—\n" " 記憶å¡å¤§å°ç„¡æ•ˆ (%04X)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -304,7 +304,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(未知)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(關閉)" @@ -316,7 +316,7 @@ msgstr "16 ä½å…ƒ" msgid "32 bit" msgstr "32 ä½å…ƒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "" @@ -328,7 +328,7 @@ msgstr "8 ä½å…ƒ" msgid "" msgstr "<æ’å…¥å稱>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "<無解æžåº¦è¨­å®š>" @@ -412,17 +412,21 @@ msgstr "關於 Dolphin" msgid "Acceleration" msgstr "加速" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "精確的 VBeam 模擬" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 @@ -509,12 +513,12 @@ msgstr "Action Replay：一般代碼 %i: 無效的副類型 %08x (%s)" msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay：一般代碼 0: 無效的副類型 %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "é…接器：" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "新增" @@ -530,9 +534,9 @@ msgstr "新增修正" msgid "Add new pane" msgstr "新增é¢ç‰ˆ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "新增..." @@ -579,7 +583,7 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "調整模擬æ–桿控制壓力需è¦æ´»å‹•çš„按鈕。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "進階" @@ -599,8 +603,8 @@ msgstr "所有 GC/Wii 映åƒæª” (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 檔案 (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "All Save States (sav, s##)" msgstr "所有å³æ™‚存檔 (sav, s##)" @@ -616,7 +620,7 @@ msgstr "所有已壓縮的 GC/Wii ISO 檔案 (gcz)" msgid "All files (*.*)|*.*" msgstr "所有檔案 (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -624,11 +628,16 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "模擬 Wiimote" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" msgstr "å„å‘異性éŽæ¿¾ï¼š" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "邊緣抗鋸齒：" @@ -648,7 +657,7 @@ msgstr "程å¼è®€å–器：" msgid "Apply" msgstr "套用" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -677,7 +686,7 @@ msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "是å¦çœŸçš„è¦åˆªé™¤é€™äº›æª”案？刪了之後就回ä¸ä¾†äº†å“¦ï¼" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "ç•«é¢æ¯”例：" @@ -698,20 +707,20 @@ msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon：開啟 AO è£ç½®å‡ºéŒ¯ã€‚\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 #, fuzzy msgid "Auto (Window Size)" msgstr "視窗尺寸：" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 #, fuzzy msgid "Auto adjust Window Size" msgstr "視窗尺寸：" @@ -724,6 +733,14 @@ msgid "" "If unsure, leave this unchecked." msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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/WXInputBase.cpp:27 msgid "Back" msgstr "返回" @@ -732,8 +749,8 @@ msgstr "返回" msgid "Backend Settings" msgstr "è£ç½®è¨­å®š" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 #, fuzzy msgid "Backend:" msgstr "è²éŸ³è£ç½®ï¼š" @@ -768,7 +785,7 @@ msgstr "橫幅：" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "基本" @@ -780,7 +797,7 @@ msgstr "基本設定" msgid "Bass" msgstr "Bass" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "å€å¡Šåˆ†é…表校驗失敗" @@ -800,8 +817,8 @@ msgstr "è— å·¦" msgid "Blue Right" msgstr "è— å³" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 msgid "Bottom" msgstr "下方" @@ -834,9 +851,9 @@ msgstr "ç€è¦½è¼¸å‡ºçš„資料夾" msgid "Buffer:" msgstr "ç·©è¡ï¼š" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "按鈕" @@ -853,12 +870,12 @@ msgstr "C-æ–æ¡¿" msgid "CPU Emulator Engine" msgstr "CPU 模擬引擎" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 #, fuzzy msgid "Cache Display Lists" msgstr "開啟顯示列表快å–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 " @@ -868,7 +885,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -877,8 +894,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "å–消" @@ -925,10 +942,10 @@ msgstr "找ä¸åˆ° WiiMote ä¾ bd： %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "找ä¸åˆ° WiiMote ä¾é€£æŽ¥é … %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "無法讀å–從 DVD_Plugin - DVD-ç•Œé¢ï¼šåš´é‡éŒ¯èª¤" @@ -1049,10 +1066,10 @@ msgstr "Circle Stick" msgid "Classic" msgstr "Classic" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "清除" @@ -1066,10 +1083,10 @@ msgid "" "manually stop the game." msgstr "在éŠæˆ²åŸ·è¡Œæ™‚客戶端斷開連接ï¼ï¼ç¶²è·¯å°æˆ°å·²ç¶“被關閉。您必須手動åœæ­¢éŠæˆ²ã€‚" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "關閉" @@ -1174,7 +1191,7 @@ msgstr "連接 Wiimote 3" msgid "Connect Wiimote 4" msgstr "連接 Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:608 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Connecting..." msgstr "正在連接..." @@ -1242,7 +1259,7 @@ msgstr "" "無法設置控制器。有玩家存留或者éŠæˆ²æ­£åœ¨åŸ·è¡Œï¼\n" "(é‚„ä¸æ”¯æ´åœ¨éŠæˆ²åŸ·è¡Œæ™‚設定控制器)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1310,11 +1327,11 @@ msgstr "作者：" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "剪è£" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1358,8 +1375,8 @@ msgstr "è²éŸ³" msgid "DSP Emulator Engine" msgstr "DSP 模擬引擎" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE 模擬器 (å¿«)" @@ -1409,7 +1426,7 @@ msgstr "éžä½œç”¨å€" msgid "Debug" msgstr "除錯" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 #, fuzzy msgid "Debugging" msgstr "除錯" @@ -1443,8 +1460,8 @@ msgstr "é è¨­çš„ ISO：" msgid "Default font" msgstr "é è¨­çš„å­—åž‹" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "刪除" @@ -1452,12 +1469,12 @@ msgstr "刪除" msgid "Delete Save" msgstr "刪除存檔" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "刪除已存在的檔案 '%s' ？" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 #, fuzzy msgid "Description" msgstr "å•é¡Œ" @@ -1489,15 +1506,15 @@ msgstr "è£ç½®è¨­å®š" msgid "Dial" msgstr "Dial" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1505,34 +1522,30 @@ msgstr "" "目錄校驗失敗\n" " 並且目錄備份校驗失敗" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 #, fuzzy msgid "Disable" msgstr "關閉霧化" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "關閉霧化" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "關閉光æº" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 #, fuzzy msgid "Disable Per-Pixel Depth" msgstr "åƒç´ æ·±åº¦" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "關閉紋ç†" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1541,7 +1554,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1551,7 +1564,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1567,11 +1580,11 @@ msgstr "光碟" msgid "Disc Read Error" msgstr "光碟讀å–錯誤" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "顯示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 #, fuzzy msgid "" "Display the inputs read by the emulator.\n" @@ -1583,7 +1596,7 @@ msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Do you want to stop the current emulation?" msgstr "您è¦åœæ­¢ç›®å‰çš„模擬嗎？" @@ -1591,7 +1604,7 @@ msgstr "您è¦åœæ­¢ç›®å‰çš„模擬嗎？" msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s å½±åƒè¨­å®š" @@ -1613,12 +1626,12 @@ msgstr "Dolphin 模擬 Wiimote 設定" msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC 控制器設定" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 影片 (*.dtm)" @@ -1642,8 +1655,8 @@ msgid "" "games..." msgstr "Dolphin ç›®å‰è¢«è¨­å®šç‚ºéš±è—所有éŠæˆ²ã€‚按兩下這裡顯示所有éŠæˆ²..." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "下" @@ -1668,26 +1681,26 @@ msgstr "空" msgid "Dump Audio" msgstr "轉儲è²éŸ³" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "轉儲 EFB 目標" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "轉儲畫格" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "轉儲紋ç†" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 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:112 #, fuzzy msgid "" "Dump decoded game textures to User/Dump/Textures//\n" @@ -1695,16 +1708,16 @@ msgid "" "If unsure, leave this unchecked." msgstr "轉儲éŠæˆ²ç´‹ç†è‡³ User/Dump/Textures//" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 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:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "Dutch" @@ -1712,7 +1725,7 @@ msgstr "Dutch" msgid "E&xit" msgstr "離開(&X)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 #, fuzzy msgid "EFB Copies" msgstr "EFB 複製範åœ" @@ -1765,7 +1778,7 @@ msgstr "編輯..." msgid "Effect" msgstr "效果" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "" @@ -1773,7 +1786,7 @@ msgstr "" msgid "Emu Thread already running" msgstr "模擬器線程已經執行中" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1782,7 +1795,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1804,7 +1817,7 @@ msgstr "模擬狀態：" msgid "Enable" msgstr "é–‹å•Ÿ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1830,6 +1843,11 @@ msgstr "é–‹å•Ÿ BAT" msgid "Enable Block Merging" msgstr "é–‹å•Ÿå¡Šåˆä½µ" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#, fuzzy +msgid "Enable Cache" +msgstr "é–‹å•Ÿå¿«å–" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "開啟作弊" @@ -1846,7 +1864,7 @@ msgstr "開啟雙核心" msgid "Enable Dual Core (speedup)" msgstr "開啟雙核心 (加速)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "é–‹å•Ÿå¿«æ·éµ" @@ -1862,8 +1880,8 @@ msgstr "é–‹å•Ÿç•¥éŽç©ºé–’ (加速)" msgid "Enable MMU" msgstr "é–‹å•Ÿ MMU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "é–‹å•Ÿé€è¡ŒæŽƒçž„" @@ -1876,7 +1894,7 @@ msgstr "開啟寬螢幕" msgid "Enable WideScreen" msgstr "開啟寬螢幕" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "開啟線框" @@ -1951,7 +1969,7 @@ msgid "" "OFF = Fast)" msgstr "開啟記憶體管ç†å–®å…ƒï¼ŒæŸäº›éŠæˆ²éœ€è¦ã€‚(ON = 兼容ã€OFF = 快速)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -1962,14 +1980,14 @@ msgstr "" msgid "End" msgstr "End" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "English" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "增強" @@ -1991,13 +2009,13 @@ msgstr "é …ç›® 1/%d" msgid "Equal" msgstr "等於" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "錯誤" -#: Source/Core/DolphinWX/Src/Main.cpp:356 +#: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "讀å–é¸æ“‡çš„語系出錯。返回使用系統é è¨­å€¼ã€‚" @@ -2070,7 +2088,7 @@ msgstr "匯出存檔為..." msgid "Extension" msgstr "æ“´å……" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 #, fuzzy msgid "External Frame Buffer" msgstr "é¡å¤–åƒæ•¸" @@ -2186,7 +2204,7 @@ msgstr "è®€å– hid.dll 失敗" msgid "Failed to read banner.bin" msgstr "è®€å– banner.bin 失敗" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2194,7 +2212,7 @@ msgstr "" "讀å–正確的塊分é…表備份失敗\n" "(0x8000-0x9FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2207,7 +2225,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "從檔案 %d 讀å–數據失敗" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2215,7 +2233,7 @@ msgstr "" "讀å–目錄備份失敗\n" "(0x4000-0x5FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2223,7 +2241,7 @@ msgstr "" "讀å–正確的目錄失敗\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2231,7 +2249,7 @@ msgstr "" "讀å–正確的頭部失敗\n" "(0x0000-0x1FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2263,6 +2281,15 @@ msgstr "檔案 %s 寫入檔頭失敗" msgid "Failed to write header for file %d" msgstr "檔案 %d 寫入檔頭失敗" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "快速" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#, fuzzy +msgid "Fast Mipmaps" +msgstr "讀å–原始紋ç†" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "快速版本的 MMU。å¯èƒ½ç„¡æ³•åœ¨æ‰€æœ‰éŠæˆ²ä¸ŠåŸ·è¡Œã€‚" @@ -2293,7 +2320,7 @@ msgstr "" "無法開啟檔案\n" "或沒有一個有效的副檔å" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2331,11 +2358,11 @@ msgstr "首數據å€å¡Š" msgid "Fix Checksums" msgstr "修正校驗" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "強制 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "強制 4:3" @@ -2344,12 +2371,12 @@ msgstr "強制 4:3" msgid "Force Console as NTSC-J" msgstr "設定主機為 NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 #, fuzzy msgid "Force Texture Filtering" msgstr "強制éŽæ¿¾" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 #, fuzzy msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" @@ -2378,7 +2405,7 @@ msgid "" "setting when playing Japanese games." msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2405,7 +2432,7 @@ msgstr "畫格步進" msgid "Frame Advance" msgstr "畫格步進" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "FFV1 畫格轉儲" @@ -2427,13 +2454,13 @@ msgstr "畫格速é™åˆ¶ï¼š" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "自由視點" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "French" @@ -2450,7 +2477,7 @@ msgstr "" msgid "FullScr" msgstr "全螢幕" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 #, fuzzy msgid "Fullscreen resolution:" msgstr "全螢幕顯示解æžåº¦ï¼š" @@ -2495,8 +2522,8 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Gamecube 控制器設定(&P)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube è¨˜æ†¶å¡ (*.raw,*.gcp)" @@ -2518,9 +2545,9 @@ msgstr "" "GeckoCode 無法執行 (CT%i CST%i) (%s)\n" "(一個æ毀的代碼或ä¸æ”¯æ´çš„代碼類型。)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -2529,9 +2556,9 @@ msgstr "一般" msgid "General Settings" msgstr "ç•Œé¢è¨­å®š" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "German" @@ -2552,11 +2579,13 @@ msgstr "å½±åƒè¨­å®š" msgid "Greater Than" msgstr "大於" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" -"Greatly increases quality of textures generated using render-to-texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2585,11 +2614,11 @@ msgstr "Guitar" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY 被調用，請回報ï¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "檔頭校驗失敗" @@ -2625,7 +2654,7 @@ msgstr "" msgid "Hide" msgstr "éš±è—" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "éš±è—滑鼠游標" @@ -2650,8 +2679,8 @@ msgstr "主機" msgid "Hotkey Configuration" msgstr "å¿«æ·éµè¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 msgid "Hotkeys" msgstr "å¿«æ·éµ" @@ -2729,12 +2758,12 @@ msgstr "" "如果您è¦è¨­å®šç•«æ ¼æ•¸é™åˆ¶å¤§æ–¼éŠæˆ²çš„速度 (NTSC:60, PAL:50)，您就需è¦åŒæ™‚關閉 DSP " "中的è²éŸ³ç¯€æµé–¥æ‰èƒ½ä½¿å…¶ç”Ÿæ•ˆã€‚" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 #, fuzzy msgid "Ignore Format Changes" msgstr "模擬格å¼è®ŠåŒ–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2743,7 +2772,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 " @@ -2780,7 +2809,7 @@ msgstr "" "匯入的檔案有 sav 副檔å\n" "但是沒有正確的檔頭" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 #, fuzzy msgid "" "Improves performance but causes glitches in most games which rely on proper " @@ -2789,7 +2818,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "關閉霧化。改善效能，但是å¯èƒ½å°Žè‡´éœ€è¦é©ç•¶éœ§åŒ–模擬的éŠæˆ²å‡ºç¾åœ–形錯誤。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 #, fuzzy msgid "" "Improves performance but causes lighting to disappear in most games.\n" @@ -2805,8 +2834,8 @@ msgstr "éŠæˆ²ä¸­" msgid "In-Game" msgstr "éŠæˆ²ä¸­" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "訊æ¯" @@ -2847,7 +2876,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "調用 InstallExceptionHandler，但是這個平å°å°šæœªæ”¯æ´æ­¤åŠŸèƒ½ã€‚" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 msgid "Installing WAD..." msgstr "æ­£åœ¨å®‰è£ WAD 至 Wii é¸å–®..." @@ -2877,7 +2906,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "內部 LZO 錯誤 - lzo_init() 失敗" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 #, fuzzy msgid "Internal Resolution:" msgstr "全螢幕顯示解æžåº¦ï¼š" @@ -2931,9 +2960,9 @@ msgstr "無效的錄åƒæª”" msgid "Invalid state" msgstr "無效的狀態" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "Italian" @@ -2994,8 +3023,8 @@ msgstr "最後覆蓋的進度" msgid "Last Saved State" msgstr "最後使用的進度" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "å·¦" @@ -3041,7 +3070,7 @@ msgstr "" msgid "Load" msgstr "讀å–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 #, fuzzy msgid "Load Custom Textures" msgstr "讀å–高解æžåº¦ç´‹ç†" @@ -3082,17 +3111,17 @@ msgstr "讀å–儲存格 8" msgid "Load State..." msgstr "讀å–進度檔..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 #, fuzzy msgid "Load Wii System Menu" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 #, 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:113 #, fuzzy msgid "" "Load custom textures from User/Load/Textures//\n" @@ -3133,8 +3162,8 @@ msgstr "記錄類型" msgid "Logger Outputs" msgstr "記錄輸出" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "日誌" @@ -3168,8 +3197,8 @@ msgstr "MMU 速度修正" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark 檔案(*.gcs)" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "主æ–æ¡¿" @@ -3199,8 +3228,8 @@ msgstr "記憶å¡å·²ç¶“é–‹å•Ÿ" msgid "Memory Byte" msgstr "記憶å¡(&M)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 msgid "Memory Card" msgstr "記憶å¡" @@ -3227,7 +3256,7 @@ msgstr "" "%s\n" "是å¦è¦è¤‡è£½èˆŠæª”案至新路徑？\n" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "" @@ -3245,7 +3274,7 @@ msgstr "麥克風" msgid "Min" msgstr "麥克風" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "雜項" @@ -3258,7 +3287,7 @@ msgstr "其它設定" msgid "Modifier" msgstr "Modifier" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3279,7 +3308,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "馬é”" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3384,9 +3413,9 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "å稱：" @@ -3472,7 +3501,7 @@ msgstr "ä¸ç›¸ç­‰" msgid "Not Set" msgstr "未設定" -#: Source/Core/DolphinWX/Src/Main.cpp:607 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Not connected" msgstr "未連接" @@ -3501,8 +3530,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "代碼數é‡ï¼š" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "Nunchuk" @@ -3531,8 +3560,8 @@ msgstr "å移：" msgid "Only %d blocks available" msgstr "僅 %d 個å€å¡Šå¯ç”¨" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Open" msgstr "é–‹å•Ÿ" @@ -3562,11 +3591,11 @@ msgstr "OpenAL：找ä¸åˆ°è²éŸ³è£ç½®" msgid "OpenAL: can't open device %s" msgstr "OpenAL：無法開啟è£ç½® %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "" @@ -3597,8 +3626,8 @@ msgstr "" "按å³éµåŒ¯å‡ºæ‰€æœ‰å­˜æª”，\n" "並匯入存檔至一張新的記憶å¡ä¸­\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "" @@ -3661,13 +3690,13 @@ msgstr "修正" msgid "Paths" msgstr "路徑" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "æš«åœ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 #, fuzzy msgid "Per-Pixel Lighting" msgstr "åƒç´ å…‰æº" @@ -3681,10 +3710,10 @@ msgstr "完美" msgid "Perspective %d" msgstr "ç‰ˆå¼ %d" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 msgid "Play" msgstr "執行" @@ -3709,7 +3738,7 @@ msgstr "é¸é …" msgid "Players" msgstr "玩家" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 msgid "Please confirm..." msgstr "請確èª..." @@ -3754,7 +3783,7 @@ msgstr "Portuguese" msgid "Portuguese (Brazilian)" msgstr "Portuguese (Brazilian)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 #, fuzzy msgid "Post-Processing Effect:" msgstr "後期處ç†è‘—色器：" @@ -3814,7 +3843,7 @@ msgstr "R 鈕" msgid "R-Analog" msgstr "R-類比" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "RAM" @@ -3830,7 +3859,7 @@ msgstr "範åœ" msgid "Read-only mode" msgstr "唯讀模å¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "實體" @@ -3892,9 +3921,9 @@ msgstr "" "減少圖形失真形æˆçš„光柵化 3D 圖形。\n" "é¿å…ç•«é¢çœ‹èµ·ä¾†åƒæ˜¯å¡Šç‹€åœ–形，但也大é‡é™ä½Žæ•ˆèƒ½ã€‚" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "æ›´æ–°" @@ -3906,14 +3935,14 @@ msgstr "更新列表" msgid "Refresh game list" msgstr "æ›´æ–°éŠæˆ²åˆ—表" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Remove" msgstr "移除" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 #, fuzzy msgid "" "Render the scene as a wireframe.\n" @@ -3923,12 +3952,12 @@ msgstr "" "場景渲染線框。\n" "這個僅用於除錯的目的使用。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "渲染至主視窗" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "é‡ç½®" @@ -3940,8 +3969,8 @@ msgstr "çµæžœ" msgid "Return" msgstr "Return" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "å³" @@ -3966,13 +3995,17 @@ msgstr "Russian" msgid "Sa&ve State" msgstr "儲存進度(&V)" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "安全" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "å–樣率：" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "儲存" @@ -4038,6 +4071,11 @@ msgstr "儲存已解壓縮的 GCM/ISO" msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "儲存的影片 %s 是æ毀的，影片錄製åœæ­¢..." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#, fuzzy +msgid "Scaled EFB Copy" +msgstr "EFB 縮放複製" + #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, fuzzy, c-format msgid "Scanning %s" @@ -4073,17 +4111,17 @@ msgstr "æœå°‹å­è³‡æ–™å¤¾" msgid "Section %s not found in SYSCONF" msgstr "é …ç›® %s 在 SYSCONF 中找ä¸åˆ°" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "é¸æ“‡" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "é¸æ“‡å·²éŒ„製的檔案" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 msgid "Select a Wii WAD file to install" msgstr "é¸æ“‡è¦å®‰è£çš„ Wii WAD" @@ -4109,15 +4147,15 @@ msgstr "é¸æ“‡æµ®å‹•è¦–窗" msgid "Select the file to load" msgstr "é¸æ“‡è¦è®€å–的檔案" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Select the save file" msgstr "é¸æ“‡å­˜æª”" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "é¸æ“‡è¦è®€å–的進度" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "Select the state to save" msgstr "é¸æ“‡è¦å„²å­˜çš„進度" @@ -4242,12 +4280,12 @@ msgstr "顯示工具列(&T)" msgid "Show Drives" msgstr "顯示è£ç½®" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 #, fuzzy msgid "Show EFB Copy Regions" msgstr "EFB 複製範åœ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "顯示 FPS" @@ -4259,7 +4297,7 @@ msgstr "顯示 France" msgid "Show GameCube" msgstr "顯示 GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "輸入顯示" @@ -4295,7 +4333,7 @@ msgstr "顯示平å°" msgid "Show Regions" msgstr "顯示å€åŸŸ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 #, fuzzy msgid "Show Statistics" msgstr "å„種統計數據" @@ -4350,7 +4388,7 @@ msgstr "顯示存檔圖示" msgid "Show save title" msgstr "顯示存檔標題" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4366,7 +4404,7 @@ msgstr "顯示此說明訊æ¯" msgid "Show unknown" msgstr "顯示 未知" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -4390,16 +4428,16 @@ msgstr "大å°" msgid "Skip BIOS" msgstr "ç•¥éŽ GC BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "關閉 Dest. Alpha 通é“" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4407,6 +4445,16 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4455,9 +4503,9 @@ msgstr "è²éŸ³ç·©è¡å»ºç«‹å¤±æ•—：%s" msgid "Space" msgstr "Space" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "Spanish" @@ -4465,7 +4513,7 @@ msgstr "Spanish" msgid "Speaker Volume:" msgstr "æšè²å™¨éŸ³é‡ï¼š" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 " @@ -4493,9 +4541,9 @@ msgstr "Square Stick" msgid "Standard Controller" msgstr "標準控制器" +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Start" @@ -4523,14 +4571,23 @@ msgstr "å³æ™‚存檔" msgid "Stick" msgstr "æ–æ¡¿" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "åœæ­¢" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "拉伸至視窗" @@ -4564,8 +4621,8 @@ msgstr "系統語系：" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #, fuzzy msgid "TAS Input" msgstr "輸入" @@ -4586,9 +4643,9 @@ msgstr "Table å·¦" msgid "Table Right" msgstr "Table å³" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "截å–ç•«é¢" @@ -4596,7 +4653,16 @@ msgstr "截å–ç•«é¢" msgid "Test" msgstr "測試" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "ç´‹ç†" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +#, fuzzy +msgid "Texture Cache" +msgstr "清ç†å¿«å–" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 #, fuzzy msgid "Texture Format Overlay" msgstr "ç´‹ç†æ ¼å¼" @@ -4640,7 +4706,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:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "指定的檔案 (%s) ä¸å­˜åœ¨" @@ -4657,11 +4723,19 @@ msgstr "å稱ä¸èƒ½å«æœ‰å­—符 ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" msgstr "您嘗試複製的檔案有一個無效的檔案大å°" -#: Source/Core/DolphinWX/Src/Main.cpp:363 +#: Source/Core/DolphinWX/Src/Main.cpp:353 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4724,7 +4798,7 @@ msgstr "Action replay 模擬器ä¸æ”¯æ´è¢« Action Replay 自身修改的代碼 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:119 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. " @@ -4791,13 +4865,13 @@ msgstr "上方" msgid "Toggle All Log Types" msgstr "å…¨é¸/全部å–消" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "切æ›å…¨èž¢å¹•" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Top" msgstr "上方" @@ -4805,7 +4879,7 @@ msgstr "上方" msgid "Traditional Chinese" msgstr "Traditional Chinese" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "已嘗試讀å–從未知的檔案類型。" @@ -4841,8 +4915,8 @@ msgstr "é¡žåž‹" msgid "UDP Port:" msgstr "UDP 埠å£ï¼š" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -4910,8 +4984,8 @@ msgstr "" "未知的指示器 %#08x\n" "是å¦ç¹¼çºŒï¼Ÿ" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "上" @@ -4928,7 +5002,7 @@ msgstr "ç›´æ¡ Wiimote" msgid "Use EuRGB60 Mode (PAL60)" msgstr "使用 EuRGB60 æ¨¡å¼ (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 #, fuzzy msgid "Use Fullscreen" msgstr "全螢幕(&F)" @@ -4941,7 +5015,7 @@ msgstr "使用 Hex" msgid "Use Panic Handlers" msgstr "顯示錯誤æ示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -4949,7 +5023,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -4958,11 +5032,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "工具" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "åž‚ç›´åŒæ­¥" @@ -4986,8 +5060,7 @@ msgstr "事件" msgid "Video" msgstr "å½±åƒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "虛擬" @@ -5010,21 +5083,21 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "警告" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 msgid "Warning - starting DOL in wrong console mode!" msgstr "警告 - DOL 啟動於錯誤的主機模å¼ï¼" -#: Source/Core/Core/Src/Boot/Boot.cpp:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "警告 - ELF 啟動於錯誤的主機模å¼ï¼" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "警告 - ISO 啟動於錯誤的主機模å¼ï¼" @@ -5061,7 +5134,7 @@ msgstr "WaveFileWriter - 檔案無法開啟。" msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "寬螢幕修正" @@ -5086,7 +5159,7 @@ msgstr "DVD 根：" msgid "Wii Save Import" msgstr "匯入 Wii 存檔" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存檔 (*.bin)|*.bin" @@ -5094,8 +5167,8 @@ msgstr "Wii 存檔 (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD：無法從檔案中讀å–" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "Wiimote" @@ -5117,7 +5190,7 @@ msgstr "" "或閒置的時間太久。\n" "是å¦è¦é‡æ–°é€£æŽ¥ï¼Ÿ" -#: Source/Core/DolphinWX/Src/Main.cpp:609 +#: Source/Core/DolphinWX/Src/Main.cpp:599 msgid "Wiimote Connected" msgstr "Wiimote 已連接" @@ -5150,7 +5223,7 @@ msgstr "視窗 å³" msgid "Word Wrap" msgstr "自動æ›è¡Œ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5254,7 +5327,7 @@ msgstr "Zero code 未知於 dolphin: %08x" msgid "[ waiting ]" msgstr "[ 等候中 ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5266,7 +5339,7 @@ msgstr "" msgid "[Custom]" msgstr "[自訂]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5277,7 +5350,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5514,10 +5587,6 @@ msgstr "| 或" #~ msgid "Enable CPU Access" #~ msgstr "é–‹å•Ÿ CPU å­˜å–" -#, fuzzy -#~ msgid "Enable Cache" -#~ msgstr "é–‹å•Ÿå¿«å–" - #~ msgid "Enable Copy to EFB" #~ msgstr "開啟複製至 EFB" @@ -5590,13 +5659,6 @@ msgstr "| 或" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "è®€å– DSP ROM 失敗： %s" -#~ msgid "Fast" -#~ msgstr "快速" - -#, fuzzy -#~ msgid "Fast Mipmaps" -#~ msgstr "讀å–原始紋ç†" - #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -5742,16 +5804,9 @@ msgstr "| 或" #~ msgid "Running script...\n" #~ msgstr "執行腳本...\n" -#~ msgid "Safe" -#~ msgstr "安全" - #~ msgid "Scale:" #~ msgstr "縮放：" -#, fuzzy -#~ msgid "Scaled EFB Copy" -#~ msgstr "EFB 縮放複製" - #~ msgid "Select resolution for fullscreen mode" #~ msgstr "為全螢幕模å¼è¨­å®šè§£æžåº¦" @@ -5835,13 +5890,6 @@ msgstr "| 或" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "以全螢幕模å¼å•Ÿå‹•æ¸²æŸ“視窗。" -#~ msgid "Texture" -#~ msgstr "ç´‹ç†" - -#, fuzzy -#~ msgid "Texture Cache" -#~ msgstr "清ç†å¿«å–" - #~ msgid "The file " #~ msgstr "檔案" From c671314307a381fceee5b7ec7f8b38ecf6a5c7bb Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sat, 15 Oct 2011 09:08:15 -0500 Subject: [PATCH 187/381] Update Greek and Czech translations --- Languages/po/cs.po | 621 ++++++++++++++++++++++----------------------- Languages/po/el.po | 605 +++++++++++++++++++++---------------------- 2 files changed, 610 insertions(+), 616 deletions(-) diff --git a/Languages/po/cs.po b/Languages/po/cs.po index bae31930e7..2f4d32f6d5 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: 2011-10-11 23:25-0500\n" -"PO-Revision-Date: 2011-08-10 20:37+0100\n" +"POT-Creation-Date: 2011-08-10 08:30-0500\n" +"PO-Revision-Date: 2011-10-15 14:50+0100\n" "Last-Translator: ZbynÄ›k Schwarz \n" "Language-Team: \n" "Language: Czech\n" @@ -30,7 +30,7 @@ msgstr " Hra : " msgid "! NOT" msgstr "! NE" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -72,7 +72,7 @@ msgstr "%s už existuje, pÅ™epsat?" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s nelze vyÄistit. Obraz je pravdÄ›podobnÄ› poÅ¡kozen." -#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -81,7 +81,7 @@ msgstr "" "%s nelze naÄíst jako paměťovou kartu\n" "Soubor karty je neplatný (0x%x bajtů)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -90,7 +90,7 @@ msgstr "" "%s nelze naÄíst jako paměťovou kartu\n" "Velikost karty je neplatná (0x%x bajtů)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -161,7 +161,7 @@ msgstr "O Progr&amu..." #: Source/Core/DolphinWX/Src/FrameTools.cpp:116 msgid "&Boot from DVD Drive..." -msgstr "&Bootovat z DVD Mechaniky..." +msgstr "&Zavést z DVD Mechaniky..." #: Source/Core/DolphinWX/Src/FrameTools.cpp:244 msgid "&Breakpoints" @@ -307,7 +307,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(NEZNÃMÃ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(vypnuto)" @@ -319,7 +319,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "3D Vision" msgstr "3D Vision" @@ -331,7 +331,7 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 msgid "" msgstr "<Žádné rozliÅ¡ení nenalezeno>" @@ -417,27 +417,23 @@ msgstr "O Dolphinu" msgid "Acceleration" msgstr "Zrychlení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 -msgid "Accuracy:" -msgstr "PÅ™esnost:" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "Precizní emulace VBeam" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 #, fuzzy msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, check EFB to Texture instead." +"If unsure, leave this checked." msgstr "" "PÅ™esnÄ› emulovat EFB kopie.\n" "NÄ›které hry na tomto závisí pro urÄité grafické efekty nebo herní funkce.\n" "\n" -"Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." +"Pokud si nejste jisti, zaÅ¡krtnÄ›te radÄ›jí EFB do Textury." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 msgid "Action" @@ -530,12 +526,12 @@ msgstr "Action Replay: Normální Kód %i: Neplatný podtyp %08x (%s)" 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:249 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:245 msgid "Adapter:" msgstr "Adaptér:" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 msgid "Add" msgstr "PÅ™idat" @@ -551,9 +547,9 @@ msgstr "PÅ™idat Záplatu" msgid "Add new pane" msgstr "PÅ™idat nový panel" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "PÅ™idat..." @@ -601,7 +597,7 @@ 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:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486 msgid "Advanced" msgstr "PokroÄilé" @@ -621,8 +617,8 @@ msgstr "VÅ¡echny obrazy GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "All Save States (sav, s##)" msgstr "VÅ¡echny Uložené Stavy (sav, s##)" @@ -638,7 +634,7 @@ msgstr "VÅ¡echny komprimované soubory GC/WII ISO (gcz)" msgid "All files (*.*)|*.*" msgstr "VÅ¡echny soubory (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -650,16 +646,11 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -#, fuzzy -msgid "Alternate Wiimote Timing" -msgstr "Emulovaný Wiimote" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Anizotropní Filtrování:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Vyhlazení okrajů" @@ -679,7 +670,7 @@ msgstr "ZavadÄ›Ä aplikace:" msgid "Apply" msgstr "Použít" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -711,7 +702,7 @@ 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:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 msgid "Aspect Ratio:" msgstr "PomÄ›r Stran:" @@ -732,19 +723,19 @@ 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:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Násobek 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Auto (Velikost Okna)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Auto adjust Window Size" msgstr "Automaticky upravovat Velikost Okna" @@ -758,18 +749,6 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 -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/WXInputBase.cpp:27 msgid "Back" msgstr "ZpÄ›t" @@ -778,8 +757,8 @@ msgstr "ZpÄ›t" msgid "Backend Settings" msgstr "Nastavení Backendu" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Backend:" @@ -813,7 +792,7 @@ msgstr "Plakát:" msgid "Bar" msgstr "Vibráto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Základní" @@ -825,7 +804,7 @@ msgstr "Základní nastavení" msgid "Bass" msgstr "Basy" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Kontrolní souÄet AlokaÄní Tabulky Bloku selhal" @@ -845,8 +824,8 @@ msgstr "Modrá vlevo" msgid "Blue Right" msgstr "Modrá vpravo" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 msgid "Bottom" msgstr "Dole" @@ -879,9 +858,9 @@ msgstr "Procházet pro výstupní adresář" msgid "Buffer:" msgstr "Vyrovnávací paměť:" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 msgid "Buttons" msgstr "TlaÄítka" @@ -897,11 +876,11 @@ msgstr "Kr-Stick" msgid "CPU Emulator Engine" msgstr "Jádro Emulátoru Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 msgid "Cache Display Lists" msgstr "Ukládat pÅ™edvyt. obj. do vyr. pam." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: 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 " @@ -916,7 +895,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: 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" @@ -931,8 +910,8 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 msgid "Cancel" msgstr "ZruÅ¡it" @@ -980,10 +959,10 @@ msgstr "Nelze najít Wiimote podle bz: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Nelze najít Wiimote pomocí obslužné rutiny spojení %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 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" @@ -1105,10 +1084,10 @@ msgstr "Kruhový Stick" msgid "Classic" msgstr "Klasické" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 -#: 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/WXInputBase.cpp:43 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "VyÄistit" @@ -1123,10 +1102,10 @@ 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:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 msgid "Close" msgstr "Zavřít" @@ -1230,7 +1209,7 @@ msgstr "PÅ™ipojit Wiimote 3" msgid "Connect Wiimote 4" msgstr "PÅ™ipojit Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:608 msgid "Connecting..." msgstr "PÅ™ipojuji..." @@ -1298,7 +1277,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:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1368,11 +1347,11 @@ msgstr "Tvůrce:" msgid "Critical" msgstr "Kritické" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Crop" msgstr "Oříznout" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: 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" @@ -1419,8 +1398,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Jádro Emulátoru DSP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulace (rychlé)" @@ -1469,7 +1448,7 @@ msgstr "Mrtvá Zóna" msgid "Debug" msgstr "LadÄ›ní" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Debugging" msgstr "LadÄ›ní" @@ -1502,8 +1481,8 @@ msgstr "Výchozí ISO:" 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/WXInputBase.cpp:32 msgid "Delete" msgstr "Smazat" @@ -1511,12 +1490,12 @@ msgstr "Smazat" msgid "Delete Save" msgstr "Smazat Uloženou Hru" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 #, c-format msgid "Delete the existing file '%s'?" msgstr "Vymazat existující soubor '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 msgid "Description" msgstr "Popis" @@ -1547,15 +1526,15 @@ msgstr "Nastavení Zařízení" msgid "Dial" msgstr "Kruhová stupnice" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1563,28 +1542,32 @@ msgstr "" "Kontrolní souÄet adresáře\n" "i záložní kontrolní souÄet Adresáře selhal" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 msgid "Disable" msgstr "Zakázat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Disable Fog" msgstr "Zakázat Mlhu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Disable Lighting" msgstr "Zakázat OsvÄ›tlení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Disable Per-Pixel Depth" msgstr "Zakázat Hloubku Podle Pixelu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Textures" msgstr "Zakázat Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +msgid "Disable Wiimote Speaker" +msgstr "Zakázat Reproduktor Wiimote" + +#: 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 " @@ -1598,7 +1581,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: 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,7 +1597,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Disable texturing.\n" "\n" @@ -1633,11 +1616,11 @@ msgstr "Disk" msgid "Disc Read Error" msgstr "Chyba Ätení disku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1651,7 +1634,7 @@ msgstr "" msgid "Divide" msgstr "RozdÄ›lit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 msgid "Do you want to stop the current emulation?" msgstr "Chcete souÄasnou emulaci zastavit?" @@ -1659,7 +1642,7 @@ msgstr "Chcete souÄasnou emulaci zastavit?" msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafická Nastavení" @@ -1680,12 +1663,12 @@ msgstr "Nastavení Emulovaného Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Nastavení" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" @@ -1713,8 +1696,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/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 msgid "Down" msgstr "Dolů" @@ -1739,19 +1722,19 @@ msgstr "Atrapa" msgid "Dump Audio" msgstr "Vypsat Zvuk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Dump EFB Target" msgstr "Vypsat Cíl EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 msgid "Dump Frames" msgstr "Vypsat Snímky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 msgid "Dump Textures" msgstr "Vypsat Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1761,7 +1744,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1771,7 +1754,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1781,9 +1764,9 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "NizozemÅ¡tina" @@ -1791,7 +1774,7 @@ msgstr "NizozemÅ¡tina" msgid "E&xit" msgstr "O&dejít" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 msgid "EFB Copies" msgstr "EFB Kopie" @@ -1844,7 +1827,7 @@ msgstr "Upravit" msgid "Effect" msgstr "Efekt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Embedded Frame Buffer" msgstr "VnoÅ™ená Vyr. PamÄ›t Snímků" @@ -1852,7 +1835,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:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1866,7 +1849,7 @@ msgstr "" "\n" "Pokud si nejste jisti, zaÅ¡krtnÄ›te místo tohoto virtuální emulaci XFB." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: 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 " @@ -1894,7 +1877,7 @@ msgstr "Stav Emulace:" msgid "Enable" msgstr "Povolit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: 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" @@ -1926,10 +1909,6 @@ msgstr "Zapnout BAT" msgid "Enable Block Merging" msgstr "Zapnout SluÄování Bloků" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 -msgid "Enable Cache" -msgstr "Povolit vyrovnávací paměť" - #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "Povolit Cheaty" @@ -1946,7 +1925,7 @@ msgstr "Povolit dvojité jádro" msgid "Enable Dual Core (speedup)" msgstr "Zapnout dvojité jádro (zrychlení)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Enable Hotkeys" msgstr "Povolit klávesové zkratky" @@ -1962,8 +1941,8 @@ msgstr "Povolit PÅ™eskakování NeÄinných Příkazů (zrychlení)" msgid "Enable MMU" msgstr "Zapnout MMU" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "Povolit Progresivní Skenování" @@ -1975,7 +1954,7 @@ msgstr "Povolit SpoÅ™iÄ Obrazovky" msgid "Enable WideScreen" msgstr "Povolit Å irokoúhlou obrazovku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Enable Wireframe" msgstr "Povolit DrátÄ›ný Model" @@ -2072,7 +2051,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:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2086,14 +2065,14 @@ msgstr "" msgid "End" msgstr "End" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "AngliÄtina" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "Enhancements" msgstr "VylepÅ¡ení" @@ -2115,13 +2094,13 @@ msgstr "Záznam 1/%d" msgid "Equal" msgstr "Rovná se" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Error" msgstr "Chyba" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:356 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." @@ -2196,7 +2175,7 @@ msgstr "Exportovat Uloženou hru jako..." msgid "Extension" msgstr "Rozšíření" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "External Frame Buffer" msgstr "VnÄ›jší Vyr. Paměť Snímků" @@ -2318,7 +2297,7 @@ msgstr "Nelze nahrát hid.dll" msgid "Failed to read banner.bin" msgstr "Nelze Äíst z banner.bin" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2326,7 +2305,7 @@ msgstr "" "Nelze správnÄ› Äíst zálohu alokaÄní tabulky bloku\n" "(0x8000-0x9FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2339,7 +2318,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Nelze Äíst data ze souboru %d" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2347,7 +2326,7 @@ msgstr "" "Nelze správnÄ› Äíst zálohu adresáře\n" "(0x4000-0x5FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2355,7 +2334,7 @@ msgstr "" "Nelze správnÄ› Äíst adresář\n" "(0x2000-0x3FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2363,7 +2342,7 @@ msgstr "" "Nelze správnÄ› Äíst hlaviÄku\n" "(0x0000-0x1FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2395,14 +2374,6 @@ 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/VideoConfigDiag.cpp:475 -msgid "Fast" -msgstr "Rychlá" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Fast Mipmaps" -msgstr "Rychlé Mipmapy" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rychlá verze MMU. Nefunguje v každé hÅ™e." @@ -2431,7 +2402,7 @@ msgstr "" "Soubor nelze otevřít\n" "nebo nemá platnou příponu" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2469,11 +2440,11 @@ msgstr "První blok" msgid "Fix Checksums" msgstr "Spravit Kontrolní SouÄty" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Force 16:9" msgstr "Vynutit 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Force 4:3" msgstr "Vynutit 4:3" @@ -2481,11 +2452,11 @@ msgstr "Vynutit 4:3" msgid "Force Console as NTSC-J" msgstr "Donutit konzoli být jako NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Force Texture Filtering" msgstr "Vynutit Filtrování Textur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: 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" @@ -2519,7 +2490,7 @@ msgstr "" "Pokud není zaÅ¡krtnuto, Dolphin standardnÄ› pÅ™ejde na NTSC-U a automaticky " "zapne toto nastavení pÅ™i hraní Japonských her." -#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2544,7 +2515,7 @@ msgstr "Snímek" msgid "Frame Advance" msgstr "Postup Snímkem" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 msgid "Frame Dumps use FFV1" msgstr "Uložení snímků použije FFV1" @@ -2564,13 +2535,13 @@ msgstr "Limit Snímků:" msgid "Frames To Record" msgstr "Snímky k Nahrání" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 msgid "Free Look" msgstr "Rozhlížení pomocí myÅ¡i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "FrancouzÅ¡tina" @@ -2587,7 +2558,7 @@ msgstr "Z" msgid "FullScr" msgstr "CelObr" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "Fullscreen resolution:" msgstr "RozliÅ¡ení celé obrazovky:" @@ -2631,8 +2602,8 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Nastavení Gamecube &Pad" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" @@ -2654,9 +2625,9 @@ msgstr "" "Nelze spustit GeckoKód (CT%i CST%i) (%s)\n" "(buÄ Å¡patný kód, nebo typ kódu není jeÅ¡tÄ› podporován.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 msgid "General" msgstr "Obecné" @@ -2664,9 +2635,9 @@ msgstr "Obecné" msgid "General Settings" msgstr "Obecná Nastavení" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "NÄ›mÄina" @@ -2687,20 +2658,19 @@ msgstr "Grafická nastavení" msgid "Greater Than" msgstr "VÄ›tší než" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 #, fuzzy msgid "" -"Greatly increases quality of textures generated using render to texture " +"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" "\n" "If unsure, leave this checked." msgstr "" "Velmi zvýší kvalitu vytvářených textur použitím efektů vykreslení do " "textury.\n" "Zvýšení vnitÅ™ního rozliÅ¡ení zlepší úÄinnek tohoto nastavení.\n" +"TroÅ¡ku sníží výkon a možná způsobí problémy (i když to je nepravdÄ›podobné).\n" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." @@ -2728,11 +2698,11 @@ msgstr "Kytara" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Byl zavolán HCI_CMD_INQUIRY, prosím ohlaste!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 msgid "Hacks" msgstr "Hacky" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Kontrolní souÄet hlaviÄky selhal" @@ -2768,7 +2738,7 @@ msgstr "" msgid "Hide" msgstr "Skrýt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Skrýt kurzor myÅ¡i" @@ -2795,8 +2765,8 @@ msgstr "Hostovat" msgid "Hotkey Configuration" msgstr "Nastavení klávesových zkratek" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 msgid "Hotkeys" msgstr "Klávesové zkratky" @@ -2877,11 +2847,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:432 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 msgid "Ignore Format Changes" msgstr "Ignorovat ZmÄ›ny Formátu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: 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 " @@ -2895,7 +2865,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: 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 " @@ -2937,7 +2907,7 @@ msgstr "" "\"Importovaný soubor má příponu sav\n" "ale nemá správnou hlaviÄku\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2949,7 +2919,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -2967,8 +2937,8 @@ msgstr "Ve HÅ™e" msgid "In-Game" msgstr "Ve HÅ™e" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 msgid "Info" msgstr "Info" @@ -3011,7 +2981,7 @@ msgstr "" "Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› " "nepodporuje." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 msgid "Installing WAD..." msgstr "Instaluji WAD..." @@ -3040,7 +3010,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "VnitÅ™ní chyba LZO - lzo_init() selhalo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "VnitÅ™ní RozliÅ¡ení:" @@ -3093,9 +3063,9 @@ msgstr "Neplatný soubor s nahrávkou" msgid "Invalid state" msgstr "Neplatný stav" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "ItalÅ¡tina" @@ -3156,8 +3126,8 @@ msgstr "Poslední PÅ™epsaný Stav" msgid "Last Saved State" msgstr "Poslední Uložený Stav" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 msgid "Left" msgstr "Vlevo" @@ -3203,7 +3173,7 @@ msgstr "Limitovat podle SzS" msgid "Load" msgstr "Nahrát" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 msgid "Load Custom Textures" msgstr "Nahrát Vlastní Textury" @@ -3243,16 +3213,16 @@ msgstr "Nahrát Slot Stavu 8" msgid "Load State..." msgstr "Nahrát Stav..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 msgid "Load Wii System Menu" msgstr "Nahrát Systémové Menu Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Nahrát Systémové Menu Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3294,8 +3264,8 @@ msgstr "Typy Záznamu" 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:132 msgid "Logging" msgstr "Protokolování" @@ -3329,8 +3299,8 @@ msgstr "MMU Hack Rychlosti" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Soubory MadCatz Gameshark (*.gcs)" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 msgid "Main Stick" msgstr "Hlavní Stick" @@ -3359,8 +3329,8 @@ msgstr "Pam. karta již otevÅ™ena" msgid "Memory Byte" msgstr "Bajt PamÄ›ti" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 msgid "Memory Card" msgstr "Paměťová karta" @@ -3389,7 +3359,7 @@ msgstr "" "%s\n" "ChtÄ›li byste starý soubor zkopírovat do nového umístÄ›ní?\n" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "Velikost paměťové karty se neshoduje s velikosti hlaviÄky" @@ -3406,7 +3376,7 @@ msgstr "Mikrofon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Misc" msgstr "Ostatní" @@ -3419,7 +3389,7 @@ msgstr "Ostatní Nastavení" msgid "Modifier" msgstr "Modifikátor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: 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" @@ -3444,7 +3414,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3558,9 +3528,9 @@ msgstr "NK Tab" msgid "NP Up" msgstr "NK Nahoru" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Jméno:" @@ -3645,7 +3615,7 @@ msgstr "Nerovná se" msgid "Not Set" msgstr "Nenastaven" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:607 msgid "Not connected" msgstr "NepÅ™ipojen" @@ -3674,8 +3644,8 @@ msgstr "Num Lock" 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/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 msgid "Nunchuk" msgstr "NunÄak" @@ -3704,8 +3674,8 @@ msgstr "Logická Adresa:" msgid "Only %d blocks available" msgstr "Pouze bloky %d jsou dostupné" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Open" msgstr "Otevřít" @@ -3735,11 +3705,11 @@ 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:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "OpenCL Texture Decoder" msgstr "OpenCL Dekodér Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "OpenMP Texture Decoder" msgstr "OpenMP Dekodér Textury" @@ -3770,8 +3740,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:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 msgid "Other" msgstr "Jiné" @@ -3835,13 +3805,13 @@ msgstr "Záplaty" msgid "Paths" msgstr "Cesty" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "Pozastavit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Per-Pixel Lighting" msgstr "OsvÄ›tlení Podle Pixelu" @@ -3854,10 +3824,10 @@ msgstr "Dokonalá" msgid "Perspective %d" msgstr "Perspektiva %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Play" msgstr "Spustit" @@ -3881,7 +3851,7 @@ msgstr "Možnosti PÅ™ehrávání" msgid "Players" msgstr "HráÄi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Please confirm..." msgstr "Prosím potvrÄte..." @@ -3926,7 +3896,7 @@ msgstr "PortugalÅ¡tina" msgid "Portuguese (Brazilian)" msgstr "PortugalÅ¡tina (Brazilská)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Efekt Následného Zpracování:" @@ -3985,7 +3955,7 @@ msgstr "TlaÄítko R" msgid "R-Analog" msgstr "Pravý Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "RAM" msgstr "RAM" @@ -4001,7 +3971,7 @@ msgstr "Rozsah" msgid "Read-only mode" msgstr "Režim pouze pro Ätení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Real" msgstr "Opravdová" @@ -4061,9 +4031,9 @@ msgstr "" "\n" "Pokud si nejste jisti, vyberte Žádný." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 msgid "Refresh" msgstr "Obnovit" @@ -4075,14 +4045,14 @@ msgstr "Obnovit Seznam" msgid "Refresh game list" msgstr "Obnovit seznam her" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Remove" msgstr "Odstranit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4092,12 +4062,12 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: 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/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 msgid "Reset" msgstr "Resetovat" @@ -4109,8 +4079,8 @@ msgstr "Výsledky" msgid "Return" msgstr "Enter" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 msgid "Right" msgstr "Vpravo" @@ -4135,17 +4105,13 @@ msgstr "RuÅ¡tina" msgid "Sa&ve State" msgstr "Uložit Sta&v" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 -msgid "Safe" -msgstr "BezpeÄná" - #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "Vzorkovací frekvence:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 msgid "Save" msgstr "Uložit" @@ -4211,10 +4177,6 @@ msgstr "Uložit dekomprimované GCM/ISO" 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:401 -msgid "Scaled EFB Copy" -msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" - #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format msgid "Scanning %s" @@ -4250,17 +4212,17 @@ msgstr "Hledat Podadresáře" msgid "Section %s not found in SYSCONF" msgstr "Sekce %s nebyla v SYSCONF nalezena" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 msgid "Select" msgstr "Vybrat" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Select The Recording File" msgstr "Vyberte Soubor s Nahrávkou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" @@ -4286,15 +4248,15 @@ msgstr "Vybrat plovoucí okna" msgid "Select the file to load" msgstr "Vyberte soubor k nahrání" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 msgid "Select the state to load" msgstr "Vyberte stav k nahrání" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 msgid "Select the state to save" msgstr "Vyberte stav k uložení" @@ -4432,11 +4394,11 @@ msgstr "Zobrazit Panel Nás&trojů" msgid "Show Drives" msgstr "Zobrazit Disky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Show EFB Copy Regions" msgstr "Zobrazit EFB Regiony Kopie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Show FPS" msgstr "Zobrazit Snímky za Sekundu" @@ -4448,7 +4410,7 @@ msgstr "Zobrazit Francii" msgid "Show GameCube" msgstr "Zobrazit GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Show Input Display" msgstr "Zobrazit Obrazovku Vstupu" @@ -4484,7 +4446,7 @@ msgstr "Zobrazit Platformy" msgid "Show Regions" msgstr "Zobrazit Regiony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Show Statistics" msgstr "Zobrazit Statistiky" @@ -4538,7 +4500,7 @@ msgstr "Zobrazit ikonu uložení" msgid "Show save title" msgstr "Zobrazit název uložení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4558,7 +4520,7 @@ msgstr "Zobrazit tuto zprávu nápovÄ›dy" msgid "Show unknown" msgstr "Zobrazit neznámé" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4584,15 +4546,15 @@ msgstr "Velikost" msgid "Skip BIOS" msgstr "PÅ™eskoÄit BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Skip Dest. Alpha Pass" msgstr "Vypnout Průchod Cíl. Průhl." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 msgid "Skip EFB Access from CPU" msgstr "PÅ™eskoÄit EFB Přístup z Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4604,22 +4566,6 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 -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" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Lehce zrychlí kopie EFB do RAM obÄ›továním pÅ™esnosti emulace.\n" -"NÄ›kdy také zvýší kvalitu obrazu.\n" -"Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit pÅ™esnost textury, " -"nebo tuto možnost vypnout.\n" -"\n" -"Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." - #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4673,9 +4619,9 @@ msgstr "VytvoÅ™ení vyrovnávací pamÄ›ti zvuku selhalo: %s" msgid "Space" msgstr "Mezerník" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "Å panÄ›lÅ¡tina" @@ -4683,7 +4629,7 @@ msgstr "Å panÄ›lÅ¡tina" msgid "Speaker Volume:" msgstr "Hlasitost Reproduktoru:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: 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 " @@ -4719,9 +4665,9 @@ msgstr "ÄŒtvercový Stick" msgid "Standard Controller" msgstr "Standardní OvladaÄ" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Start" @@ -4749,28 +4695,14 @@ msgstr "Ukládání stavu" msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Zastavit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 -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" -"\n" -"If unsure, leave this checked." -msgstr "" -"Ukládat EFB kopie do objektů textury grafického procesoru.\n" -"Toto není pÅ™esné, ale pro vÄ›tÅ¡inu her funguje dostateÄnÄ› dobÅ™e a dává vÄ›tší " -"zrychlení než EFB do RAM.\n" -"\n" -"Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Stretch to Window" msgstr "Roztáhnout do Okna" @@ -4804,8 +4736,8 @@ msgstr "Jazyk Systému:" msgid "TAIWAN" msgstr "TCHAJ-WAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 msgid "TAS Input" msgstr "TAS Vstup" @@ -4825,9 +4757,9 @@ msgstr "Deska vlevo" msgid "Table Right" msgstr "Deska vpravo" +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "VytvoÅ™it Snímek Obrazovky" @@ -4835,15 +4767,7 @@ msgstr "VytvoÅ™it Snímek Obrazovky" msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 -msgid "Texture" -msgstr "Textura" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 -msgid "Texture Cache" -msgstr "Vyrovnávací Paměť Textur" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Texture Format Overlay" msgstr "PÅ™ekryv Formátu Textury" @@ -4888,7 +4812,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:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:281 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Zadaný soubor (%s) neexistuje" @@ -4905,23 +4829,11 @@ 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:98 -msgid "" -"The safer you adjust this, the less likely the emulator will be missing any " -"texture updates from RAM.\n" -"\n" -"If unsure, use the second-fastest value from the right." -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." - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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:363 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4990,7 +4902,7 @@ msgstr "" 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:119 +#: 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. " @@ -5065,13 +4977,13 @@ 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/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 msgid "Toggle Fullscreen" msgstr "PÅ™epnout na Celou Obrazovku" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 msgid "Top" msgstr "NahoÅ™e" @@ -5079,7 +4991,7 @@ msgstr "NahoÅ™e" msgid "Traditional Chinese" msgstr "TradiÄní ČínÅ¡tina" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:375 msgid "Tried to load an unknown file type." msgstr "Pokus o naÄtení souboru neznámého typu." @@ -5115,8 +5027,8 @@ msgstr "Typ" msgid "UDP Port:" msgstr "UDP Port:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5189,8 +5101,8 @@ msgstr "" "Neznámý ukazatel %#08x\n" "PokraÄovat?" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 msgid "Up" msgstr "Nahoru" @@ -5207,7 +5119,7 @@ msgstr "Svislý Wiimote" msgid "Use EuRGB60 Mode (PAL60)" msgstr "Použít režim EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "Use Fullscreen" msgstr "Použít Celou Obrazovku" @@ -5219,7 +5131,7 @@ msgstr "Použít Å estnáctkovou soustavu" msgid "Use Panic Handlers" msgstr "Použít Obslužné Rutiny Paniky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: 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" @@ -5232,7 +5144,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 "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5246,11 +5158,11 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Utility" msgstr "Pomůcky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 msgid "V-Sync" msgstr "V-Synch" @@ -5274,7 +5186,8 @@ msgstr "Úroveň" msgid "Video" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 msgid "Virtual" msgstr "Virtuální" @@ -5301,21 +5214,21 @@ msgstr "" "\n" "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/VideoConfigDiag.h:84 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/Common/Src/MsgHandler.cpp:67 msgid "Warning" msgstr "Varování" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:240 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:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:290 msgid "Warning - starting ELF in wrong console mode!" msgstr "Varování - ELF se spouÅ¡tí ve Å¡patném režimu konzole!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:185 msgid "Warning - starting ISO in wrong console mode!" msgstr "Varování - ISO se spouÅ¡tí ve Å¡patném režimu konzole!" @@ -5352,7 +5265,7 @@ msgstr "WaveFileWriter - soubor není otevÅ™en." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Widescreen Hack" msgstr "Hack Å irokoúhlého obrazu" @@ -5376,7 +5289,7 @@ msgstr "Wii KoÅ™en NAND:" msgid "Wii Save Import" msgstr "Import uložených pozic Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -5384,8 +5297,8 @@ 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:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:16 msgid "Wiimote" msgstr "Wiimote" @@ -5407,7 +5320,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:599 +#: Source/Core/DolphinWX/Src/Main.cpp:609 msgid "Wiimote Connected" msgstr "Wiimote PÅ™ipojen" @@ -5439,7 +5352,7 @@ msgstr "Klávesa Windows Vpravo" msgid "Word Wrap" msgstr "Zalamování textu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5547,7 +5460,7 @@ msgstr "Nulový kód, který dolphin nezná: %08x" msgid "[ waiting ]" msgstr "[ Äekám ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5563,7 +5476,7 @@ msgstr "" msgid "[Custom]" msgstr "[Vlastní]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5582,7 +5495,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5689,6 +5602,9 @@ msgstr "| NEBO" #~ msgid "< as Default Profile >" #~ msgstr "< jako Výchozí Profil >" +#~ msgid "Accuracy:" +#~ msgstr "PÅ™esnost:" + #~ msgid "Accurate Texture Cache" #~ msgstr "Precizní Vyrovnávací Paměť Textur" @@ -5708,6 +5624,9 @@ msgstr "| NEBO" #~ "ale zapnutí této možnosti může mít také velký negativní dopad na výkon " #~ "pokud hra tuto funkci hodnÄ› využívá." +#~ msgid "Alternate Wiimote Timing" +#~ msgstr "Střídat Äasování Wiimote" + #~ msgid "Auto [recommended]" #~ msgstr "Auto [doporuÄeno]" @@ -5720,6 +5639,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" @@ -5753,9 +5683,6 @@ msgstr "| NEBO" #~ msgid "Danish" #~ msgstr "DánÅ¡tina" -#~ msgid "Disable Wiimote Speaker" -#~ msgstr "Zakázat Reproduktor Wiimote" - #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -5801,6 +5728,9 @@ msgstr "| NEBO" #~ msgid "Enable CPU Access" #~ msgstr "Povolit Přístup k Procesoru" +#~ msgid "Enable Cache" +#~ msgstr "Povolit vyrovnávací paměť" + #~ msgid "Enable Copy to EFB" #~ msgstr "Povolit Kopírování do EFB" @@ -5859,6 +5789,12 @@ msgstr "| NEBO" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Nelze nahrát DSP ROM : %s" +#~ msgid "Fast" +#~ msgstr "Rychlá" + +#~ msgid "Fast Mipmaps" +#~ msgstr "Rychlé Mipmapy" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -5972,9 +5908,15 @@ msgstr "| NEBO" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "Nutné pro použití Japonského písma ROM" +#~ msgid "Safe" +#~ msgstr "BezpeÄná" + #~ msgid "Scale:" #~ msgstr "ZmÄ›na Velikosti:" +#~ msgid "Scaled EFB Copy" +#~ msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" + #~ msgid "Select resolution for fullscreen mode" #~ msgstr "Vyberte rozliÅ¡ení v režimu celé obrazovky" @@ -6019,6 +5961,21 @@ msgstr "| NEBO" #~ "Zobrazí různé statistiky.\n" #~ "Jsou užiteÄné pouze pro úÄely ladÄ›ní." +#~ 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" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Lehce zrychlí kopie EFB do RAM obÄ›továním pÅ™esnosti emulace.\n" +#~ "NÄ›kdy také zvýší kvalitu obrazu.\n" +#~ "Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit pÅ™esnost " +#~ "textury, nebo tuto možnost vypnout.\n" +#~ "\n" +#~ "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." + #~ msgid "Slot" #~ msgstr "Slot" @@ -6052,6 +6009,36 @@ msgstr "| NEBO" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Spustí vykreslovací okno v režimu celé obrazovky." +#~ 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" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Ukládat EFB kopie do objektů textury grafického procesoru.\n" +#~ "Toto není pÅ™esné, ale pro vÄ›tÅ¡inu her funguje dostateÄnÄ› dobÅ™e a dává " +#~ "vÄ›tší zrychlení než EFB do RAM.\n" +#~ "\n" +#~ "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." + +#~ msgid "Texture" +#~ msgstr "Textura" + +#~ msgid "Texture Cache" +#~ msgstr "Vyrovnávací Paměť Textur" + +#~ msgid "" +#~ "The safer you adjust this, the less likely the emulator will be missing " +#~ "any texture updates from RAM.\n" +#~ "\n" +#~ "If unsure, use the second-fastest value from the right." +#~ 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." + #~ msgid "Use FPS For Limiting" #~ msgstr "Použít SzS pro Omezení" diff --git a/Languages/po/el.po b/Languages/po/el.po index 072f3b0990..b030d9565f 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: 2011-10-11 23:25-0500\n" -"PO-Revision-Date: 2011-12-18 13:37-0600\n" +"POT-Creation-Date: 2011-08-10 08:30-0500\n" +"PO-Revision-Date: 2011-12-18 13:38-0600\n" "Last-Translator: Linktothepast \n" "Language-Team: Gpower2 \n" "Language: Greek\n" @@ -32,7 +32,7 @@ msgstr "Παιχνίδι : " msgid "! NOT" msgstr "! NOT" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -76,7 +76,7 @@ msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "" "%s απέτυχε να γίνει scrubbed. Πιθανότατα το αÏχείο εικόνας είναι φθαÏμένο." -#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -85,7 +85,7 @@ msgstr "" "%s απέτυχε να φοÏτώσει ως κάÏτα μνήμης\n" " Το μέγεθος του αÏχείου της κάÏτας δεν είναι έγκυÏο (0x%x bytes)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -94,7 +94,7 @@ msgstr "" "%s απέτυχε να φοÏτώσει ως κάÏτα μνήμης\n" " Το μέγεθος της κάÏτας δεν είναι έγκυÏο (0x%x bytes)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -313,7 +313,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(ΑΓÎΩΣΤΟ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(ανενεÏγό)" @@ -325,7 +325,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "3D Vision" msgstr "3D Vision" @@ -337,7 +337,7 @@ msgstr "8 bit" msgid "" msgstr "<Εισάγετε όνομα εδώ>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 msgid "" msgstr "<Δε βÏέθηκαν αναλÏσεις>" @@ -423,28 +423,24 @@ msgstr "Σχετικά με το Dolphin" msgid "Acceleration" msgstr "Επιτάχυνση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 -msgid "Accuracy:" -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "ΑκÏιβής VBeam εξομοίωση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 #, fuzzy msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, check EFB to Texture instead." +"If unsure, leave this checked." msgstr "" "Εξομοιώνει με ακÏίβεια τα EFB αντίγÏαφα.\n" "Κάποια παιχνίδια βασίζονται σε αυτό για οÏισμένα εφέ γÏαφικών ή λειτουÏγίες " "του gameplay.\n" "\n" -"Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." +"Αν δεν είστε σίγουÏοι, επιλέξτε EFB ΑντίγÏαφα σε Υφή." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 msgid "Action" @@ -538,12 +534,12 @@ msgstr "Action Replay: Normal Code %i: Μη έγκυÏο subtype %08x (%s)" 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:249 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:245 msgid "Adapter:" msgstr "ΠÏοσαÏμογέας:" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 msgid "Add" msgstr "ΠÏοσθήκη" @@ -559,9 +555,9 @@ msgstr "ΠÏοσθήκη Patch" msgid "Add new pane" msgstr "ΠÏοσθήκη νέου pane" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "ΠÏοσθήκη..." @@ -597,7 +593,7 @@ msgstr "" "ΡÏθμιση της απαιτοÏμενης πίεσης του Î±Î½Î±Î»Î¿Î³Î¹ÎºÎ¿Ï Ï‡ÎµÎ¹ÏιστηÏίου για την " "ενεÏγοποίηση των κουμπιών." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486 msgid "Advanced" msgstr "Για Ï€ÏοχωÏημένους" @@ -617,8 +613,8 @@ msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" @@ -634,7 +630,7 @@ msgstr "Όλα τα συμπιεσμένα αÏχεία GC/Wii ISO (gcz)" msgid "All files (*.*)|*.*" msgstr "Όλα τα αÏχεία (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -646,16 +642,11 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -#, fuzzy -msgid "Alternate Wiimote Timing" -msgstr "Εξομοιωμένο Wiimote" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "ΑνισοτÏοπικό ΦιλτÏάÏισμα:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Εξομάλυνση ΟÏίων:" @@ -675,7 +666,7 @@ msgstr "Apploader:" msgid "Apply" msgstr "ΕφαÏμογή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -709,7 +700,7 @@ msgstr "" "πάντα!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 msgid "Aspect Ratio:" msgstr "Αναλογία Οθόνης:" @@ -730,19 +721,19 @@ msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Auto" msgstr "Αυτόματα" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Αυτόματα (Πολλαπλάσιο του 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Αυτόματα (Μέγεθος ΠαÏαθÏÏου)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Auto adjust Window Size" msgstr "Αυτόματη ΠÏοσαÏμογή Μεγέθους ΠαÏαθÏÏου" @@ -757,14 +748,6 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 -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/WXInputBase.cpp:27 msgid "Back" msgstr "Πίσω" @@ -773,8 +756,8 @@ msgstr "Πίσω" msgid "Backend Settings" msgstr "Backend Ρυθμίσεις" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Backend:" @@ -808,7 +791,7 @@ msgstr "Εικονίδιο:" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Βασικές" @@ -820,7 +803,7 @@ msgstr "Βασικές Ρυθμίσεις" msgid "Bass" msgstr "Μπάσο" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Αποτυχία ελέγχου checksum για τον BAT" @@ -840,8 +823,8 @@ msgstr "ΑÏιστεÏÏŒ Μπλε" msgid "Blue Right" msgstr "Δεξί Μπλε" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 msgid "Bottom" msgstr "Βάση" @@ -874,9 +857,9 @@ msgstr "ΕÏÏεση φακέλου Ï€ÏοοÏισμοÏ" msgid "Buffer:" msgstr "Buffer:" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 msgid "Buttons" msgstr "Κουμπιά" @@ -892,11 +875,11 @@ msgstr "Stick ΚάμεÏας" msgid "CPU Emulator Engine" msgstr "Μηχανή Εξομοίωσης CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 msgid "Cache Display Lists" msgstr "Cache Display Lists" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: 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 " @@ -912,7 +895,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: 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" @@ -927,8 +910,8 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 msgid "Cancel" msgstr "ΆκυÏο" @@ -976,10 +959,10 @@ msgstr "Αποτυχία εÏÏεσης WiiMote με bd: %02x:%02x:%02x:%02x:%02 msgid "Cant find WiiMote by connection handle %02x" msgstr "Αδυναμία εÏÏεσης του WiiMote με handle σÏνδεσης %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Αδυναμία ανάγνωσης από το DVD_Plugin - DVD-Interface: ΚÏίσιμο Σφάλμα" @@ -1101,10 +1084,10 @@ msgstr "Κυκλικό Stick" msgid "Classic" msgstr "Κλασικό ΧειÏιστήÏιο" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 -#: 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/WXInputBase.cpp:43 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "ΚαθάÏισ." @@ -1120,10 +1103,10 @@ msgstr "" "Ο Client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει " "απενεÏγοποιηθεί. Θα Ï€Ïέπει να σταματήσετε χειÏοκίνητα το παιχνίδι." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 msgid "Close" msgstr "Κλείσιμο" @@ -1227,7 +1210,7 @@ msgstr "ΣÏνδεση Wiimote 3" msgid "Connect Wiimote 4" msgstr "ΣÏνδεση Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:608 msgid "Connecting..." msgstr "Γίνεται ΣÏνδεση..." @@ -1298,7 +1281,7 @@ msgstr "" "(ο καθοÏισμός των χειÏιστηÏίων ενώ το παιχνίδι Ï„Ïέχει δεν υποστηÏίζεται Ï€Ïος " "το παÏόν)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1371,11 +1354,11 @@ msgstr "ΔημιουÏγός: " msgid "Critical" msgstr "ΚÏίσιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Crop" msgstr "Κόψιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: 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,8 +1405,8 @@ msgstr "Ήχος (DSP)" msgid "DSP Emulator Engine" msgstr "Μηχανή Εξομοίωσης DSP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE εξομοίωση (γÏήγοÏη)" @@ -1472,7 +1455,7 @@ msgstr "ÎεκÏή Ζώνη" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Debugging" msgstr "Debugging" @@ -1505,8 +1488,8 @@ msgstr "ΠÏοεπιλεγμένο ISO:" msgid "Default font" msgstr "ΠÏοεπιλεγμένη γÏαμματοσειÏά" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 msgid "Delete" msgstr "ΔιαγÏαφή" @@ -1514,12 +1497,12 @@ msgstr "ΔιαγÏαφή" msgid "Delete Save" msgstr "ΔιαγÏαφή Αποθήκευσης" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 #, c-format msgid "Delete the existing file '%s'?" msgstr "ΔιαγÏαφή του υπάÏχοντος αÏχείου '%s';" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 msgid "Description" msgstr "ΠεÏιγÏαφή" @@ -1550,15 +1533,15 @@ msgstr "Ρυθμίσεις Συσκευής" msgid "Dial" msgstr "Dial" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1566,28 +1549,32 @@ msgstr "" "Το checksum του Καταλόγου απέτυχε\n" " καθώς και το checksum του εφεδÏÎ¹ÎºÎ¿Ï ÎšÎ±Ï„Î±Î»ÏŒÎ³Î¿Ï… απέτυχε" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 msgid "Disable" msgstr "ΑπενεÏγοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Disable Fog" msgstr "ΑπενεÏγοποίηση Ομίχλης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Disable Lighting" msgstr "ΑπενεÏγοποίηση ΦωτισμοÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Disable Per-Pixel Depth" msgstr "ΑπενεÏγοποίηση Βάθους ανά Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Textures" msgstr "ΑπενεÏγοποίηση Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +msgid "Disable Wiimote Speaker" +msgstr "" + +#: 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 " @@ -1601,7 +1588,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: 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,7 +1604,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Disable texturing.\n" "\n" @@ -1636,11 +1623,11 @@ msgstr "Δίσκος" msgid "Disc Read Error" msgstr "Σφάλμα Ανάγνωσης Δίσκου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Οθόνη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1654,7 +1641,7 @@ msgstr "" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξομοίωση;" @@ -1662,7 +1649,7 @@ msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξο msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Ρυθμίσεις ΓÏαφικών Dolphin %s" @@ -1683,12 +1670,12 @@ msgstr "Ρυθμίσεις Εξοιμοιωμένου Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 msgid "Dolphin GCPad Configuration" msgstr "Ρυθμίσεις Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" @@ -1716,8 +1703,8 @@ msgstr "" "Το Dolphin είναι Ïυθμισμένο να αποκÏÏπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ " "εδώ για να εμφανιστοÏν όλα τα παιχνίδια..." -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 msgid "Down" msgstr "Κάτω" @@ -1742,19 +1729,19 @@ msgstr "Dummy" msgid "Dump Audio" msgstr "Εξαγωγή Ήχου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Dump EFB Target" msgstr "Εξαγωγή EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 msgid "Dump Frames" msgstr "Εξαγωγή ΚαÏέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 msgid "Dump Textures" msgstr "Εξαγωγή Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1765,7 +1752,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1776,7 +1763,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1786,9 +1773,9 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "Ολλανδικά" @@ -1796,7 +1783,7 @@ msgstr "Ολλανδικά" msgid "E&xit" msgstr "Έ&ξοδος" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 msgid "EFB Copies" msgstr "EFB ΑντίγÏαφα" @@ -1850,7 +1837,7 @@ msgstr "ΕπεξεÏγασία..." msgid "Effect" msgstr "Εφέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer" @@ -1858,7 +1845,7 @@ msgstr "Embedded Frame Buffer" msgid "Emu Thread already running" msgstr "Το νήμα εξομοίωσης εκτελείται ήδη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1873,7 +1860,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε εικονική XFB εξομοίωση." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: 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 " @@ -1901,7 +1888,7 @@ msgstr "Κατάσταση ΛειτουÏγίας:" msgid "Enable" msgstr "ΕνεÏγοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: 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" @@ -1933,11 +1920,6 @@ msgstr "ΕνεÏγοποίηση BAT" msgid "Enable Block Merging" msgstr "ΕνεÏγοποίηση Block Merging" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 -#, fuzzy -msgid "Enable Cache" -msgstr "ΕνεÏγοποίηση Cheat" - #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "ΕνεÏγοποίηση Cheat" @@ -1954,7 +1936,7 @@ msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα" msgid "Enable Dual Core (speedup)" msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα (επιτάχυνση)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Enable Hotkeys" msgstr "ΕνεÏγοποίηση ΣυντομεÏσεων" @@ -1970,8 +1952,8 @@ msgstr "ΕνεÏγοποίηση Idle Skipping (επιτάχυνση)" msgid "Enable MMU" msgstr "ΕνεÏγοποίηση MMU" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "ΕνεÏγοποίηση ΠÏοοδευτικής ΣάÏωσης" @@ -1983,7 +1965,7 @@ msgstr "ΕνεÏγοποίηση ΠÏοφÏλαξης Οθόνης" msgid "Enable WideScreen" msgstr "ΕνεÏγοποίηση ΕυÏείας Οθόνης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Enable Wireframe" msgstr "ΕνεÏγοποίηση Wireframe" @@ -2081,7 +2063,7 @@ msgstr "" "ΕνεÏγοποιεί τη Μονάδα ΔιαχείÏισης Μνήμης, απαÏαίτητο για μεÏικά παιχνίδια. " "(ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2095,14 +2077,14 @@ msgstr "" msgid "End" msgstr "Τέλος" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "Αγγλικά" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "Enhancements" msgstr "Βελτιώσεις" @@ -2124,13 +2106,13 @@ msgstr "ΕγγÏαφή 1/%d" msgid "Equal" msgstr "Ίσο" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Error" msgstr "Σφάλμα" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:356 msgid "Error loading selected language. Falling back to system default." msgstr "" "Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή " @@ -2208,7 +2190,7 @@ msgstr "Εξαγωγή αποθήκευσης ως..." msgid "Extension" msgstr "Επέκταση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "External Frame Buffer" msgstr "ΕξωτεÏικό Frame Buffer" @@ -2331,7 +2313,7 @@ msgstr "Αποτυχία φόÏτωσης hid.dll" msgid "Failed to read banner.bin" msgstr "Αποτυχία ανάγνωσης banner.bin" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2339,7 +2321,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης του αντιγÏάφου ασφαλείας του BAT\n" "(0x8000-0x9FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2352,7 +2334,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Αποτυχία ανάγνωσης δεδομένων από το αÏχείο %d" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2360,7 +2342,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης του αντιγÏάφου ασφαλείας των φακέλων\n" "(0x4000-0x5FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2368,7 +2350,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης των φακέλων\n" "(0x2000-0x3FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2376,7 +2358,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης της κεφαλίδας\n" "(0x0000-0x1FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2405,14 +2387,6 @@ msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το msgid "Failed to write header for file %d" msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το αÏχείο %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 -msgid "Fast" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Fast Mipmaps" -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "ΓÏήγοÏη έκδοση του MMU. Δε δουλεÏει για όλα τα παιχνίδια." @@ -2441,7 +2415,7 @@ msgstr "" "Το αÏχείο απέτυχε στο άνοιγμα\n" "ή δεν έχει έγκυÏη επέκταση" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2479,11 +2453,11 @@ msgstr "ΠÏώτο Μπλοκ" msgid "Fix Checksums" msgstr "ΕπιδιόÏθωση Checksum" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Force 16:9" msgstr "Επιβολή 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Force 4:3" msgstr "Επιβολή 4:3" @@ -2491,11 +2465,11 @@ msgstr "Επιβολή 4:3" msgid "Force Console as NTSC-J" msgstr "Επιβολή της Κονσόλας ως NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Force Texture Filtering" msgstr "Επιβολή ΦιλτÏαÏίσματος Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: 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" @@ -2531,7 +2505,7 @@ msgstr "" "Άμα αφεθεί αποεπιλεγμένο, το dolphin Ï€Ïοεπιλέγει τη NTSC-U και ενεÏγοποιεί " "αυτόματα αυτήν την ÏÏθμιση όταν παίζονται Ιαπωνικά παιχνίδια." -#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2556,7 +2530,7 @@ msgstr "ΚαÏέ" msgid "Frame Advance" msgstr "ΠÏοώθηση ανά ΚαÏέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 msgid "Frame Dumps use FFV1" msgstr "FFV1 Για Τα Εξαγώμενα ΚαÏέ" @@ -2576,13 +2550,13 @@ msgstr "ΠεÏιοÏισμός ΚαÏέ:" msgid "Frames To Record" msgstr "ΚαÏέ ΠÏος ΕγγÏαφή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 msgid "Free Look" msgstr "ΕλεÏθεÏη Ματιά" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "Γαλλικά" @@ -2599,7 +2573,7 @@ msgstr "Από" msgid "FullScr" msgstr "ΠλήÏης Οθόνη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "Fullscreen resolution:" msgstr "Ανάλυση ΠλήÏους Οθόνης:" @@ -2643,8 +2617,8 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Ρυθμίσεις Gamecube &Pad" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "ΚάÏτες Μνήμης Gamecube (*.raw,*.gcp)" @@ -2666,9 +2640,9 @@ msgstr "" "Ο Κωδικός Gecko απέτυχε να εκτελεστεί (CT%i CST%i) (%s)\n" "(ή είναι ένας κακός κωδικός ή ο Ï„Ïπος του ÎºÏ‰Î´Î¹ÎºÎ¿Ï Î´ÎµÎ½ υποστηÏίζεται.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 msgid "General" msgstr "Γενικά" @@ -2676,9 +2650,9 @@ msgstr "Γενικά" msgid "General Settings" msgstr "Γενικές Ρυθμίσεις" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "ΓεÏμανικά" @@ -2701,20 +2675,20 @@ msgstr "Ρυθμίσεις ΓÏαφικών" msgid "Greater Than" msgstr "ΜεγαλÏτεÏο από" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 #, fuzzy msgid "" -"Greatly increases quality of textures generated using render to texture " +"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" "\n" "If unsure, leave this checked." msgstr "" "Βελτιώνει Ï€Î¿Î»Ï Ï„Î·Î½ ποιότητα των υφών που παÏάγονται χÏησιμοποιώντας render " "to texture εφέ.\n" "Μία αÏξηση της εσωτεÏικής ανάλυσης θα βελτιώσει το εφέ αυτής της ÏÏθμισης.\n" +"Μειώνει ελαφÏÏŽÏ‚ την επίδοση και είναι πιθανό να Ï€Ïοκαλέσει Ï€Ïοβλήματα (αν " +"και σπάνια).\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -2742,11 +2716,11 @@ msgstr "ΚιθάÏα" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Γίνεται κλήση του HCI_CMD_INQUIRY, παÏακαλώ αναφέÏετε!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 msgid "Hacks" msgstr "Hacks" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Αποτυχία ελέγχου κεφαλίδας" @@ -2782,7 +2756,7 @@ msgstr "" msgid "Hide" msgstr "ΑπόκÏυψη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "ΑπόκÏυψη Δείκτη ΠοντικιοÏ" @@ -2810,8 +2784,8 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Ρυθμίσεις ΠλήκτÏων Συντόμευσης" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 msgid "Hotkeys" msgstr "ΠλήκτÏα Συντόμευσης" @@ -2896,11 +2870,11 @@ msgstr "" "θα Ï€Ïέπει επίσης να απενεÏγοποιήσετε το Throttle Ήχου στο DSP για να έχει " "αποτέλεσμα. " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 msgid "Ignore Format Changes" msgstr "Αγνόηση Αλλαγών Format" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: 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 " @@ -2914,7 +2888,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: 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 " @@ -2957,7 +2931,7 @@ msgstr "" "Το εισαγώμενο αÏχείο έχει sav επέκταση\n" "άλλα δεν έχει σωστή κεφαλίδα." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2969,7 +2943,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -2988,8 +2962,8 @@ msgstr "Εντός ΠαιχνιδιοÏ" msgid "In-Game" msgstr "Εντός ΠαιχνιδιοÏ" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 msgid "Info" msgstr "ΠληÏοφοÏίες" @@ -3032,7 +3006,7 @@ msgstr "" "InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόÏμα δεν το υποστηÏίζει " "ακόμα." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." @@ -3061,7 +3035,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "ΕσωτεÏικό Σφάλμα LZO - αποτυχία lzo_init()" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "ΕσωτεÏική Ανάλυση:" @@ -3114,9 +3088,9 @@ msgstr "Μη έγκυÏο αÏχείο εγγÏαφής" msgid "Invalid state" msgstr "Μη έγκυÏο κατάσταση" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "Ιταλικά" @@ -3177,8 +3151,8 @@ msgstr "Τελευταίο ΕπαναγÏαμμένο Σημείο Αποθ." msgid "Last Saved State" msgstr "Τελευταίο Αποθηκευμένο Σημείο Αποθ." -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 msgid "Left" msgstr "ΑÏιστεÏά" @@ -3224,7 +3198,7 @@ msgstr "ΠεÏιοÏισμός με βάση τα ΚαÏέ" msgid "Load" msgstr "ΦόÏτωσ." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 msgid "Load Custom Textures" msgstr "ΦόÏτωση ΤÏοποποιημένων Υφών" @@ -3264,16 +3238,16 @@ msgstr "ΦόÏτωση Σημείου Αποθήκευσης 8" msgid "Load State..." msgstr "ΦόÏτωση Σημείου Αποθήκευσης..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 msgid "Load Wii System Menu" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 #, c-format msgid "Load Wii System Menu %d%c" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3315,8 +3289,8 @@ msgstr "ΤÏποι ΚαταγÏαφής" msgid "Logger Outputs" msgstr "Έξοδοι ΚαταγÏαφής" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 #: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Logging" msgstr "ΚαταγÏαφή" @@ -3350,8 +3324,8 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "ΑÏχεία MadCatz Gameshark (*.gcs)" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 msgid "Main Stick" msgstr "ΚÏÏιο Stick" @@ -3380,8 +3354,8 @@ msgstr "Η κάÏτα μνήμης είναι ήδη ανοιχτή" msgid "Memory Byte" msgstr "Memory Byte" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 msgid "Memory Card" msgstr "ΚάÏτα Μνήμης" @@ -3410,7 +3384,7 @@ msgstr "" "%s\n" "Θέλετε να αντιγÏάψετε το παλιό αÏχείο σε αυτή την νέα τοποθεσία;\n" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "" "Το μέγεθος του αÏχείου της κάÏτας μνήμης δεν ταιÏιάζει με το μέγεθος της " @@ -3429,7 +3403,7 @@ msgstr "ΜικÏόφωνο" msgid "Min" msgstr "Ελάχιστη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Misc" msgstr "ΔιάφοÏα" @@ -3442,7 +3416,7 @@ msgstr "ΔιάφοÏες Ρυθμίσεις" msgid "Modifier" msgstr "Modifier" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: 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" @@ -3468,7 +3442,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "ΜοτέÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3581,9 +3555,9 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Όνομα:" @@ -3668,7 +3642,7 @@ msgstr "Όχι ίσο" msgid "Not Set" msgstr "Μη ΟÏισμένο" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:607 msgid "Not connected" msgstr "Μη Συνδεδεμένο" @@ -3697,8 +3671,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "ΑÏιθμός Κωδικών: " -#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 msgid "Nunchuk" msgstr "Nunchuk" @@ -3727,8 +3701,8 @@ msgstr "Offset:" msgid "Only %d blocks available" msgstr "Διαθέσιμα μόνο %d μπλοκ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Open" msgstr "Άνοιγμα" @@ -3758,11 +3732,11 @@ msgstr "OpenAL: αδυναμία εÏÏεσης συσκευών ήχου" msgid "OpenAL: can't open device %s" msgstr "OpenAL: αδυναμία ανοίγματος της συσκευής %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "OpenCL Texture Decoder" msgstr "OpenCL Αποκωδικοποιητής Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "OpenMP Texture Decoder" msgstr "OpenMP Αποκωδικοποιητής Υφών" @@ -3794,8 +3768,8 @@ msgstr "" "Κάντε δεξί κλίκ, εξάγετε όλα τα αÏχεία αποθήκευσης\n" "και εισάγετέ τα σε μία νέα κάÏτα μνήμης.\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 msgid "Other" msgstr "Άλλα" @@ -3860,13 +3834,13 @@ msgstr "Patches" msgid "Paths" msgstr "Φάκελοι" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "ΠαÏση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Per-Pixel Lighting" msgstr "Φωτισμός ανά Pixel" @@ -3879,10 +3853,10 @@ msgstr "Τέλειο" msgid "Perspective %d" msgstr "Οπτική %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Play" msgstr "ΑναπαÏαγωγή" @@ -3906,7 +3880,7 @@ msgstr "Ρυθμίσεις ΑναπαÏαγωγής" msgid "Players" msgstr "Παίχτες" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Please confirm..." msgstr "ΠαÏακαλώ επιβεβαιώστε..." @@ -3951,7 +3925,7 @@ msgstr "ΠοÏτογαλικά" msgid "Portuguese (Brazilian)" msgstr "ΠοÏτογαλικά (Î’Ïαζιλιάνικα)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Post-Processing Εφέ:" @@ -4010,7 +3984,7 @@ msgstr "R Button" msgid "R-Analog" msgstr "R-Αναλογική" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "RAM" msgstr "RAM" @@ -4026,7 +4000,7 @@ msgstr "ΕÏÏος" msgid "Read-only mode" msgstr "Μόνο Για Ανάγνωση (ΕγγÏαφής)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Real" msgstr "ΠÏαγματικό" @@ -4086,9 +4060,9 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε Καμία." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 msgid "Refresh" msgstr "Ανανέωση" @@ -4100,14 +4074,14 @@ msgstr "Ανανέωση Λίστας" msgid "Refresh game list" msgstr "Ανανέωση λίστας παιχνιδιών" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Remove" msgstr "ΑφαίÏεση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4117,12 +4091,12 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "ΑναπαÏαγωγή στο ΚεντÏικό ΠαÏάθυÏο" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 msgid "Reset" msgstr "Επανεκκίνηση" @@ -4134,8 +4108,8 @@ msgstr "Αποτελέσματα" msgid "Return" msgstr "Return" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 msgid "Right" msgstr "Δεξιά" @@ -4160,17 +4134,13 @@ msgstr "Ρώσικα" msgid "Sa&ve State" msgstr "Απ&οθήκευση Σημείου Αποθήκευσης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 -msgid "Safe" -msgstr "" - #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "Ρυθμός Δειγματοληψίας:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 msgid "Save" msgstr "Αποθήκ." @@ -4238,10 +4208,6 @@ msgstr "" "Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της " "εγγÏαφής της ταινίας..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 -msgid "Scaled EFB Copy" -msgstr "" - #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format msgid "Scanning %s" @@ -4277,17 +4243,17 @@ msgstr "Αναζήτηση σε Υποφακέλους" msgid "Section %s not found in SYSCONF" msgstr "Η ενότητα %s δε βÏέθηκε στο SYSCONF" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 msgid "Select" msgstr "Επιλογή" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Select The Recording File" msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αÏχείο για εγκατάσταση" @@ -4313,15 +4279,15 @@ msgstr "Επιλέξτε αιωÏοÏμενα παÏάθυÏα" msgid "Select the file to load" msgstr "Επιλέξτε το αÏχείο για φόÏτωση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 msgid "Select the save file" msgstr "Επιλέξτε αÏχείο αποθήκευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 msgid "Select the state to load" msgstr "Επιλέξτε το σημείο φόÏτωσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" @@ -4464,11 +4430,11 @@ msgstr "Εμφάνιση ΓÏαμμής &ΕÏγαλείων" msgid "Show Drives" msgstr "Εμφάνιση Οδηγών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Show EFB Copy Regions" msgstr "Εμφάνιση ΠεÏιοχών EFB ΑντιγÏαφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Show FPS" msgstr "Εμφάνιση FPS" @@ -4480,7 +4446,7 @@ msgstr "Εμφάνιση Γαλλίας" msgid "Show GameCube" msgstr "Εμφάνιση GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Show Input Display" msgstr "Εμφάνιση ΠÏοβολής ΧειÏισμών" @@ -4516,7 +4482,7 @@ msgstr "Εμφάνιση ΠλατφόÏμας" msgid "Show Regions" msgstr "Εμφάνιση ΠεÏιοχών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Show Statistics" msgstr "Εμφάνιση Στατιστικών" @@ -4571,7 +4537,7 @@ msgstr "Εμφάνιση αποθηκευμένου εικονιδίου" msgid "Show save title" msgstr "Εμφάνιση αποθηκευμένου τίτλου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4591,7 +4557,7 @@ msgstr "Εμφάνιση Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος βοήθειας" msgid "Show unknown" msgstr "Εμφάνιση Αγνώστων" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4617,15 +4583,15 @@ msgstr "Μέγεθος" msgid "Skip BIOS" msgstr "ΠαÏάλειψη BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Skip Dest. Alpha Pass" msgstr "ΠαÏάλειψη Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 msgid "Skip EFB Access from CPU" msgstr "ΠαÏάλειψη EFB ΠÏόσβασης από τη CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4637,16 +4603,6 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 -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" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4700,9 +4656,9 @@ msgstr "Αποτυχία δημιουÏγίας buffer ήχου: %s" msgid "Space" msgstr "Space" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "Ισπανικά" @@ -4710,7 +4666,7 @@ msgstr "Ισπανικά" msgid "Speaker Volume:" msgstr "Ένταση ηχείου:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: 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,9 +4703,9 @@ msgstr "ΤετÏάγωνο Stick" msgid "Standard Controller" msgstr "Τυπικός Controller" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Εκκίνηση" @@ -4777,23 +4733,14 @@ msgstr "Σημεία Αποθήκευσης" msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Διακοπή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 -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" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Stretch to Window" msgstr "ΠÏοσαÏμογή στο ΠαÏάθυÏο" @@ -4827,8 +4774,8 @@ msgstr "Γλώσσα Συστήματος:" msgid "TAIWAN" msgstr "ΤΑΪΒΑÎ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 msgid "TAS Input" msgstr "TAS Είσοδος" @@ -4848,9 +4795,9 @@ msgstr "ΑÏιστεÏÏŒ Table" msgid "Table Right" msgstr "Δεξί Table" +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "ΔημιουÏγία Στιγμιότυπου" @@ -4858,17 +4805,7 @@ msgstr "ΔημιουÏγία Στιγμιότυπου" msgid "Test" msgstr "Τέστ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 -#, fuzzy -msgid "Texture" -msgstr "Εξαγωγή Υφών" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 -#, fuzzy -msgid "Texture Cache" -msgstr "ΚαθαÏισμός Cache" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Texture Format Overlay" msgstr "Επικάλυψη Του Format Υφών" @@ -4913,7 +4850,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:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:281 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Το αÏχείο που επιλέξατε (%s) δεν υπάÏχει" @@ -4931,20 +4868,12 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" "Το αποτέλεσμα αποκÏυπτογÏάφησης του ÎºÏ‰Î´Î¹ÎºÎ¿Ï AR δεν πεÏιέχει καθόλου γÏαμμές." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 -msgid "" -"The safer you adjust this, the less likely the emulator will be missing any " -"texture updates from RAM.\n" -"\n" -"If unsure, use the second-fastest value from the right." -msgstr "" - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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:363 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5016,7 +4945,7 @@ msgstr "" "Αυτό μποÏεί να Ï€Ïοκαλέσει καθυστεÏήσεις στο ÎœÎµÎ½Î¿Ï Wii και σε μεÏικά " "παιχνίδια." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: 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. " @@ -5097,13 +5026,13 @@ msgstr "Εώς" msgid "Toggle All Log Types" msgstr "Εναλλαγή Όλων ΤÏπων ΚαταγÏαφής " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 msgid "Toggle Fullscreen" msgstr "Εναλλαγή ΠλήÏους Οθόνης" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 msgid "Top" msgstr "ΚοÏυφή" @@ -5111,7 +5040,7 @@ msgstr "ΚοÏυφή" msgid "Traditional Chinese" msgstr "Κινέζικα ΠαÏαδοσιακά " -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:375 msgid "Tried to load an unknown file type." msgstr "ΠÏοσπάθεια φόÏτωσης ενός άγνωστου Ï„Ïπου αÏχείο." @@ -5147,8 +5076,8 @@ msgstr "ΤÏπος" msgid "UDP Port:" msgstr "ΠόÏτα UDP:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5222,8 +5151,8 @@ msgstr "" "Άγνωστος δείκτης %#08x\n" "Συνέχεια;" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 msgid "Up" msgstr "Πάνω" @@ -5240,7 +5169,7 @@ msgstr "Κάθετη Θέση Wiimote" msgid "Use EuRGB60 Mode (PAL60)" msgstr "ΧÏήση ΛειτουÏγίας EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "Use Fullscreen" msgstr "ΧÏήση ΠλήÏους Οθόνης" @@ -5252,7 +5181,7 @@ msgstr "ΧÏήση Hex" msgid "Use Panic Handlers" msgstr "ΧÏήση Οθονών ΠανικοÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: 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" @@ -5265,7 +5194,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5280,11 +5209,11 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Utility" msgstr "ΕÏγαλεία" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 msgid "V-Sync" msgstr "Κάθετος ΣυγχÏονισμός" @@ -5308,7 +5237,8 @@ msgstr "Αναλυτικότητα" msgid "Video" msgstr "Βίντεο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 msgid "Virtual" msgstr "Εικονικό" @@ -5336,21 +5266,21 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/Common/Src/MsgHandler.cpp:67 msgid "Warning" msgstr "ΠÏοειδοποίηση" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:240 msgid "Warning - starting DOL in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση DOL σε λάθος λειτουÏγία κονσόλας!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:290 msgid "Warning - starting ELF in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση ELF σε λάθος λειτουÏγία κονσόλας!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:185 msgid "Warning - starting ISO in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση ISO σε λάθος λειτουÏγία κονσόλας!" @@ -5389,7 +5319,7 @@ msgstr "WaveFileWriter - το αÏχείο δεν είναι ανοιχτό." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Widescreen Hack" msgstr "Hack ΕυÏείας Οθόνης" @@ -5413,7 +5343,7 @@ msgstr "Wii NAND Ρίζα:" msgid "Wii Save Import" msgstr "Εισαγωγή Αποθήκευσης Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Wii save files (*.bin)|*.bin" msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -5421,8 +5351,8 @@ 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:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:16 msgid "Wiimote" msgstr "Wiimote" @@ -5444,7 +5374,7 @@ msgstr "" "ή πιθανόν να οφείλεται σε χÏόνο αδÏάνειας ή κάποιον άλλο λόγο.\n" "Θέλετε να γίνει άμεση επανασÏνδεση;" -#: Source/Core/DolphinWX/Src/Main.cpp:599 +#: Source/Core/DolphinWX/Src/Main.cpp:609 msgid "Wiimote Connected" msgstr "Συνδεδεμένο Wiimote" @@ -5476,7 +5406,7 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Αναδίπλωση Λέξεων" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5583,7 +5513,7 @@ msgstr "Άγνωστος Zero code: %08x" msgid "[ waiting ]" msgstr "[ σε αναμονή ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5599,7 +5529,7 @@ msgstr "" msgid "[Custom]" msgstr "[ΠÏοσαÏμοζόμενο]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5618,7 +5548,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5690,5 +5620,82 @@ msgstr "zNear ΔιόÏθωση: " msgid "| OR" msgstr "| OR" -#~ msgid "Disable Wiimote Speaker" -#~ msgstr "ΑπενεÏγοποίηση Ηχείου Wiimote" +#~ msgid "Accuracy:" +#~ msgstr "ΑκÏίβεια:" + +#~ msgid "Alternate Wiimote Timing" +#~ msgstr "Εναλλακτικός ΧÏονισμός Wiimote" + +#~ 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 "Enable Cache" +#~ msgstr "ΕνεÏγοποίηση Cache" + +#~ msgid "Fast" +#~ msgstr "ΓÏήγοÏη" + +#~ msgid "Fast Mipmaps" +#~ msgstr "ΓÏήγοÏα Mipmaps" + +#~ msgid "Safe" +#~ msgstr "Ασφαλής" + +#~ msgid "Scaled EFB Copy" +#~ msgstr "ΚλιμακοÏμενα EFB ΑντίγÏαφα" + +#~ 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" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "ΕπιταχÏνει ελαφÏÏŽÏ‚ τα EFB σε RAM αντίγÏαφα θυσιάζοντας την ακÏίβεια της " +#~ "εξομοίωσης.\n" +#~ "ΜεÏικές φοÏές μποÏεί να βελτιώσει την οπτική ποιότητα.\n" +#~ "Αν αντιμετωπίζετε Ï€Ïοβλήματα, δοκιμάστε να αυξήσετε την ακÏίβεια της " +#~ "cache υφών ή απενεÏγοποιήστε αυτήν την επιλογή.\n" +#~ "\n" +#~ "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." + +#~ 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" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Αποθήκευση των EFB αντιγÏάφων σε GPU αντικείμενα υφών.\n" +#~ "Αυτό δεν είναι τόσο ακÏιβές, αλλά δουλεÏει αÏκετά καλά για τα πεÏισσότεÏα " +#~ "παιχνίδια και Ï€ÏοσφέÏει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n" +#~ "\n" +#~ "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." + +#~ msgid "Texture" +#~ msgstr "Υφή" + +#~ msgid "Texture Cache" +#~ msgstr "Cache Υφών" + +#~ msgid "" +#~ "The safer you adjust this, the less likely the emulator will be missing " +#~ "any texture updates from RAM.\n" +#~ "\n" +#~ "If unsure, use the second-fastest value from the right." +#~ msgstr "" +#~ "Όσο πιο ασφαλής είναι αυτή η ÏÏθμιση, τόσο λιγότεÏο πιθανό ο εξομοιωτής " +#~ "να χάσει ανανεώσεις των υφών από την RAM.\n" +#~ "\n" +#~ "Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την δεÏτεÏη γÏηγοÏότεÏη τιμή από " +#~ "δεξιά." From 4bb1a0cc2d3fe787668eedeb5a90c4cb99185f7a Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sat, 15 Oct 2011 11:26:41 -0500 Subject: [PATCH 188/381] The actual update of the Greek and Czech translations. The last commit was a partial reversion by accident. --- Languages/po/cs.po | 615 +++++++++++----------- Languages/po/el.po | 1245 +++++++++++++++++--------------------------- 2 files changed, 801 insertions(+), 1059 deletions(-) diff --git a/Languages/po/cs.po b/Languages/po/cs.po index 2f4d32f6d5..19eaf2e9f2 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: 2011-08-10 08:30-0500\n" +"POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-10-15 14:50+0100\n" "Last-Translator: ZbynÄ›k Schwarz \n" "Language-Team: \n" @@ -30,7 +30,7 @@ msgstr " Hra : " msgid "! NOT" msgstr "! NE" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -72,7 +72,7 @@ msgstr "%s už existuje, pÅ™epsat?" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s nelze vyÄistit. Obraz je pravdÄ›podobnÄ› poÅ¡kozen." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -81,7 +81,7 @@ msgstr "" "%s nelze naÄíst jako paměťovou kartu\n" "Soubor karty je neplatný (0x%x bajtů)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -90,7 +90,7 @@ msgstr "" "%s nelze naÄíst jako paměťovou kartu\n" "Velikost karty je neplatná (0x%x bajtů)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -307,7 +307,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(NEZNÃMÃ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(vypnuto)" @@ -319,7 +319,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "3D Vision" @@ -331,7 +331,7 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "<Žádné rozliÅ¡ení nenalezeno>" @@ -417,18 +417,21 @@ msgstr "O Dolphinu" msgid "Acceleration" msgstr "Zrychlení" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "PÅ™esnost:" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "Precizní emulace VBeam" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 -#, fuzzy +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" "PÅ™esnÄ› emulovat EFB kopie.\n" "NÄ›které hry na tomto závisí pro urÄité grafické efekty nebo herní funkce.\n" @@ -526,12 +529,12 @@ msgstr "Action Replay: Normální Kód %i: Neplatný podtyp %08x (%s)" 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:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "Adaptér:" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "PÅ™idat" @@ -547,9 +550,9 @@ msgstr "PÅ™idat Záplatu" msgid "Add new pane" msgstr "PÅ™idat nový panel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "PÅ™idat..." @@ -597,7 +600,7 @@ 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:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "PokroÄilé" @@ -617,8 +620,8 @@ msgstr "VÅ¡echny obrazy GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "All Save States (sav, s##)" msgstr "VÅ¡echny Uložené Stavy (sav, s##)" @@ -634,7 +637,7 @@ msgstr "VÅ¡echny komprimované soubory GC/WII ISO (gcz)" msgid "All files (*.*)|*.*" msgstr "VÅ¡echny soubory (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -646,11 +649,15 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +msgid "Alternate Wiimote Timing" +msgstr "Střídat Äasování Wiimote" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" msgstr "Anizotropní Filtrování:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "Vyhlazení okrajů" @@ -670,7 +677,7 @@ msgstr "ZavadÄ›Ä aplikace:" msgid "Apply" msgstr "Použít" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -702,7 +709,7 @@ 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:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "PomÄ›r Stran:" @@ -723,19 +730,19 @@ 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:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Násobek 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "Auto (Velikost Okna)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "Automaticky upravovat Velikost Okna" @@ -749,6 +756,18 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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/WXInputBase.cpp:27 msgid "Back" msgstr "ZpÄ›t" @@ -757,8 +776,8 @@ msgstr "ZpÄ›t" msgid "Backend Settings" msgstr "Nastavení Backendu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Backend:" @@ -792,7 +811,7 @@ msgstr "Plakát:" msgid "Bar" msgstr "Vibráto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "Základní" @@ -804,7 +823,7 @@ msgstr "Základní nastavení" msgid "Bass" msgstr "Basy" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Kontrolní souÄet AlokaÄní Tabulky Bloku selhal" @@ -824,8 +843,8 @@ msgstr "Modrá vlevo" msgid "Blue Right" msgstr "Modrá vpravo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 msgid "Bottom" msgstr "Dole" @@ -858,9 +877,9 @@ msgstr "Procházet pro výstupní adresář" msgid "Buffer:" msgstr "Vyrovnávací paměť:" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "TlaÄítka" @@ -876,11 +895,11 @@ msgstr "Kr-Stick" msgid "CPU Emulator Engine" msgstr "Jádro Emulátoru Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "Ukládat pÅ™edvyt. obj. do vyr. pam." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 " @@ -895,7 +914,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 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,8 +929,8 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "ZruÅ¡it" @@ -959,10 +978,10 @@ msgstr "Nelze najít Wiimote podle bz: %02x:%02x:%02x:%02x:%02x:%02x" 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:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 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" @@ -1084,10 +1103,10 @@ msgstr "Kruhový Stick" msgid "Classic" msgstr "Klasické" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "VyÄistit" @@ -1102,10 +1121,10 @@ msgid "" msgstr "" "Klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru musíte ukonÄit ruÄnÄ›." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Zavřít" @@ -1209,7 +1228,7 @@ msgstr "PÅ™ipojit Wiimote 3" msgid "Connect Wiimote 4" msgstr "PÅ™ipojit Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:608 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Connecting..." msgstr "PÅ™ipojuji..." @@ -1277,7 +1296,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:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1347,11 +1366,11 @@ msgstr "Tvůrce:" msgid "Critical" msgstr "Kritické" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "Oříznout" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1398,8 +1417,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Jádro Emulátoru DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulace (rychlé)" @@ -1448,7 +1467,7 @@ msgstr "Mrtvá Zóna" msgid "Debug" msgstr "LadÄ›ní" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Debugging" msgstr "LadÄ›ní" @@ -1481,8 +1500,8 @@ msgstr "Výchozí ISO:" msgid "Default font" msgstr "Výchozí typ písma" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "Smazat" @@ -1490,12 +1509,12 @@ msgstr "Smazat" msgid "Delete Save" msgstr "Smazat Uloženou Hru" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "Vymazat existující soubor '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 msgid "Description" msgstr "Popis" @@ -1526,15 +1545,15 @@ msgstr "Nastavení Zařízení" msgid "Dial" msgstr "Kruhová stupnice" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1542,32 +1561,28 @@ msgstr "" "Kontrolní souÄet adresáře\n" "i záložní kontrolní souÄet Adresáře selhal" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 msgid "Disable" msgstr "Zakázat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "Zakázat Mlhu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "Zakázat OsvÄ›tlení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "Zakázat Hloubku Podle Pixelu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "Zakázat Textury" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "Zakázat Reproduktor Wiimote" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1581,7 +1596,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1597,7 +1612,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1616,11 +1631,11 @@ msgstr "Disk" msgid "Disc Read Error" msgstr "Chyba Ätení disku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1634,7 +1649,7 @@ msgstr "" msgid "Divide" msgstr "RozdÄ›lit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Do you want to stop the current emulation?" msgstr "Chcete souÄasnou emulaci zastavit?" @@ -1642,7 +1657,7 @@ msgstr "Chcete souÄasnou emulaci zastavit?" msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafická Nastavení" @@ -1663,12 +1678,12 @@ msgstr "Nastavení Emulovaného Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Nastavení" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" @@ -1696,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/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Dolů" @@ -1722,19 +1737,19 @@ msgstr "Atrapa" msgid "Dump Audio" msgstr "Vypsat Zvuk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "Vypsat Cíl EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "Vypsat Snímky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "Vypsat Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1744,7 +1759,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1754,7 +1769,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1764,9 +1779,9 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "NizozemÅ¡tina" @@ -1774,7 +1789,7 @@ msgstr "NizozemÅ¡tina" msgid "E&xit" msgstr "O&dejít" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" msgstr "EFB Kopie" @@ -1827,7 +1842,7 @@ msgstr "Upravit" msgid "Effect" msgstr "Efekt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "VnoÅ™ená Vyr. PamÄ›t Snímků" @@ -1835,7 +1850,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:111 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1849,7 +1864,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:110 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1877,7 +1892,7 @@ msgstr "Stav Emulace:" msgid "Enable" msgstr "Povolit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1909,6 +1924,10 @@ msgstr "Zapnout BAT" msgid "Enable Block Merging" msgstr "Zapnout SluÄování Bloků" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +msgid "Enable Cache" +msgstr "Povolit vyrovnávací paměť" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "Povolit Cheaty" @@ -1925,7 +1944,7 @@ msgstr "Povolit dvojité jádro" msgid "Enable Dual Core (speedup)" msgstr "Zapnout dvojité jádro (zrychlení)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "Povolit klávesové zkratky" @@ -1941,8 +1960,8 @@ msgstr "Povolit PÅ™eskakování NeÄinných Příkazů (zrychlení)" msgid "Enable MMU" msgstr "Zapnout MMU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "Povolit Progresivní Skenování" @@ -1954,7 +1973,7 @@ msgstr "Povolit SpoÅ™iÄ Obrazovky" msgid "Enable WideScreen" msgstr "Povolit Å irokoúhlou obrazovku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "Povolit DrátÄ›ný Model" @@ -2051,7 +2070,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:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2065,14 +2084,14 @@ msgstr "" msgid "End" msgstr "End" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "AngliÄtina" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "VylepÅ¡ení" @@ -2094,13 +2113,13 @@ msgstr "Záznam 1/%d" msgid "Equal" msgstr "Rovná se" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "Chyba" -#: Source/Core/DolphinWX/Src/Main.cpp:356 +#: Source/Core/DolphinWX/Src/Main.cpp:346 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." @@ -2175,7 +2194,7 @@ msgstr "Exportovat Uloženou hru jako..." msgid "Extension" msgstr "Rozšíření" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "VnÄ›jší Vyr. Paměť Snímků" @@ -2297,7 +2316,7 @@ msgstr "Nelze nahrát hid.dll" msgid "Failed to read banner.bin" msgstr "Nelze Äíst z banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2305,7 +2324,7 @@ msgstr "" "Nelze správnÄ› Äíst zálohu alokaÄní tabulky bloku\n" "(0x8000-0x9FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2318,7 +2337,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Nelze Äíst data ze souboru %d" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2326,7 +2345,7 @@ msgstr "" "Nelze správnÄ› Äíst zálohu adresáře\n" "(0x4000-0x5FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2334,7 +2353,7 @@ msgstr "" "Nelze správnÄ› Äíst adresář\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2342,7 +2361,7 @@ msgstr "" "Nelze správnÄ› Äíst hlaviÄku\n" "(0x0000-0x1FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2374,6 +2393,14 @@ 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/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "Rychlá" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "Rychlé Mipmapy" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rychlá verze MMU. Nefunguje v každé hÅ™e." @@ -2402,7 +2429,7 @@ msgstr "" "Soubor nelze otevřít\n" "nebo nemá platnou příponu" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2440,11 +2467,11 @@ msgstr "První blok" msgid "Fix Checksums" msgstr "Spravit Kontrolní SouÄty" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "Vynutit 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "Vynutit 4:3" @@ -2452,11 +2479,11 @@ msgstr "Vynutit 4:3" msgid "Force Console as NTSC-J" msgstr "Donutit konzoli být jako NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" msgstr "Vynutit Filtrování Textur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2490,7 +2517,7 @@ msgstr "" "Pokud není zaÅ¡krtnuto, Dolphin standardnÄ› pÅ™ejde na NTSC-U a automaticky " "zapne toto nastavení pÅ™i hraní Japonských her." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2515,7 +2542,7 @@ msgstr "Snímek" msgid "Frame Advance" msgstr "Postup Snímkem" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "Uložení snímků použije FFV1" @@ -2535,13 +2562,13 @@ msgstr "Limit Snímků:" msgid "Frames To Record" msgstr "Snímky k Nahrání" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "Rozhlížení pomocí myÅ¡i" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "FrancouzÅ¡tina" @@ -2558,7 +2585,7 @@ msgstr "Z" msgid "FullScr" msgstr "CelObr" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 msgid "Fullscreen resolution:" msgstr "RozliÅ¡ení celé obrazovky:" @@ -2602,8 +2629,8 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Nastavení Gamecube &Pad" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" @@ -2625,9 +2652,9 @@ msgstr "" "Nelze spustit GeckoKód (CT%i CST%i) (%s)\n" "(buÄ Å¡patný kód, nebo typ kódu není jeÅ¡tÄ› podporován.)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Obecné" @@ -2635,9 +2662,9 @@ msgstr "Obecné" msgid "General Settings" msgstr "Obecná Nastavení" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "NÄ›mÄina" @@ -2658,12 +2685,13 @@ msgstr "Grafická nastavení" msgid "Greater Than" msgstr "VÄ›tší než" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 -#, fuzzy +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" -"Greatly increases quality of textures generated using render-to-texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2698,11 +2726,11 @@ msgstr "Kytara" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Byl zavolán HCI_CMD_INQUIRY, prosím ohlaste!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "Hacky" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Kontrolní souÄet hlaviÄky selhal" @@ -2738,7 +2766,7 @@ msgstr "" msgid "Hide" msgstr "Skrýt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "Skrýt kurzor myÅ¡i" @@ -2765,8 +2793,8 @@ msgstr "Hostovat" msgid "Hotkey Configuration" msgstr "Nastavení klávesových zkratek" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 msgid "Hotkeys" msgstr "Klávesové zkratky" @@ -2847,11 +2875,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:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" msgstr "Ignorovat ZmÄ›ny Formátu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2865,7 +2893,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 +2935,7 @@ msgstr "" "\"Importovaný soubor má příponu sav\n" "ale nemá správnou hlaviÄku\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2919,7 +2947,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -2937,8 +2965,8 @@ msgstr "Ve HÅ™e" msgid "In-Game" msgstr "Ve HÅ™e" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "Info" @@ -2981,7 +3009,7 @@ msgstr "" "Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› " "nepodporuje." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 msgid "Installing WAD..." msgstr "Instaluji WAD..." @@ -3010,7 +3038,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "VnitÅ™ní chyba LZO - lzo_init() selhalo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 msgid "Internal Resolution:" msgstr "VnitÅ™ní RozliÅ¡ení:" @@ -3063,9 +3091,9 @@ msgstr "Neplatný soubor s nahrávkou" msgid "Invalid state" msgstr "Neplatný stav" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "ItalÅ¡tina" @@ -3126,8 +3154,8 @@ msgstr "Poslední PÅ™epsaný Stav" msgid "Last Saved State" msgstr "Poslední Uložený Stav" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "Vlevo" @@ -3173,7 +3201,7 @@ msgstr "Limitovat podle SzS" msgid "Load" msgstr "Nahrát" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Load Custom Textures" msgstr "Nahrát Vlastní Textury" @@ -3213,16 +3241,16 @@ msgstr "Nahrát Slot Stavu 8" msgid "Load State..." msgstr "Nahrát Stav..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Load Wii System Menu" msgstr "Nahrát Systémové Menu Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 #, 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:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3264,8 +3292,8 @@ msgstr "Typy Záznamu" msgid "Logger Outputs" msgstr "Výstup ZapisovaÄe" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "Protokolování" @@ -3299,8 +3327,8 @@ msgstr "MMU Hack Rychlosti" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Soubory MadCatz Gameshark (*.gcs)" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Hlavní Stick" @@ -3329,8 +3357,8 @@ msgstr "Pam. karta již otevÅ™ena" msgid "Memory Byte" msgstr "Bajt PamÄ›ti" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 msgid "Memory Card" msgstr "Paměťová karta" @@ -3359,7 +3387,7 @@ msgstr "" "%s\n" "ChtÄ›li byste starý soubor zkopírovat do nového umístÄ›ní?\n" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "Velikost paměťové karty se neshoduje s velikosti hlaviÄky" @@ -3376,7 +3404,7 @@ msgstr "Mikrofon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "Ostatní" @@ -3389,7 +3417,7 @@ msgstr "Ostatní Nastavení" msgid "Modifier" msgstr "Modifikátor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3414,7 +3442,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3528,9 +3556,9 @@ msgstr "NK Tab" msgid "NP Up" msgstr "NK Nahoru" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Jméno:" @@ -3615,7 +3643,7 @@ msgstr "Nerovná se" msgid "Not Set" msgstr "Nenastaven" -#: Source/Core/DolphinWX/Src/Main.cpp:607 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Not connected" msgstr "NepÅ™ipojen" @@ -3644,8 +3672,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "PoÄet Kódů:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "NunÄak" @@ -3674,8 +3702,8 @@ msgstr "Logická Adresa:" msgid "Only %d blocks available" msgstr "Pouze bloky %d jsou dostupné" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Open" msgstr "Otevřít" @@ -3705,11 +3733,11 @@ 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:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "OpenCL Dekodér Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "OpenMP Dekodér Textury" @@ -3740,8 +3768,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:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "Jiné" @@ -3805,13 +3833,13 @@ msgstr "Záplaty" msgid "Paths" msgstr "Cesty" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "Pozastavit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Per-Pixel Lighting" msgstr "OsvÄ›tlení Podle Pixelu" @@ -3824,10 +3852,10 @@ msgstr "Dokonalá" msgid "Perspective %d" msgstr "Perspektiva %d" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 msgid "Play" msgstr "Spustit" @@ -3851,7 +3879,7 @@ msgstr "Možnosti PÅ™ehrávání" msgid "Players" msgstr "HráÄi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 msgid "Please confirm..." msgstr "Prosím potvrÄte..." @@ -3896,7 +3924,7 @@ msgstr "PortugalÅ¡tina" msgid "Portuguese (Brazilian)" msgstr "PortugalÅ¡tina (Brazilská)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "Efekt Následného Zpracování:" @@ -3955,7 +3983,7 @@ msgstr "TlaÄítko R" msgid "R-Analog" msgstr "Pravý Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "RAM" @@ -3971,7 +3999,7 @@ msgstr "Rozsah" msgid "Read-only mode" msgstr "Režim pouze pro Ätení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "Opravdová" @@ -4031,9 +4059,9 @@ msgstr "" "\n" "Pokud si nejste jisti, vyberte Žádný." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Obnovit" @@ -4045,14 +4073,14 @@ msgstr "Obnovit Seznam" msgid "Refresh game list" msgstr "Obnovit seznam her" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Remove" msgstr "Odstranit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4062,12 +4090,12 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "Vykreslit do Hlavního okna" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Resetovat" @@ -4079,8 +4107,8 @@ msgstr "Výsledky" msgid "Return" msgstr "Enter" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "Vpravo" @@ -4105,13 +4133,17 @@ msgstr "RuÅ¡tina" msgid "Sa&ve State" msgstr "Uložit Sta&v" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "BezpeÄná" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "Vzorkovací frekvence:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Uložit" @@ -4177,6 +4209,10 @@ msgstr "Uložit dekomprimované GCM/ISO" 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:401 +msgid "Scaled EFB Copy" +msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" + #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format msgid "Scanning %s" @@ -4212,17 +4248,17 @@ msgstr "Hledat Podadresáře" msgid "Section %s not found in SYSCONF" msgstr "Sekce %s nebyla v SYSCONF nalezena" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "Vybrat" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "Vyberte Soubor s Nahrávkou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" @@ -4248,15 +4284,15 @@ msgstr "Vybrat plovoucí okna" msgid "Select the file to load" msgstr "Vyberte soubor k nahrání" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Vyberte stav k nahrání" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "Select the state to save" msgstr "Vyberte stav k uložení" @@ -4394,11 +4430,11 @@ msgstr "Zobrazit Panel Nás&trojů" msgid "Show Drives" msgstr "Zobrazit Disky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "Zobrazit EFB Regiony Kopie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "Zobrazit Snímky za Sekundu" @@ -4410,7 +4446,7 @@ msgstr "Zobrazit Francii" msgid "Show GameCube" msgstr "Zobrazit GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "Zobrazit Obrazovku Vstupu" @@ -4446,7 +4482,7 @@ msgstr "Zobrazit Platformy" msgid "Show Regions" msgstr "Zobrazit Regiony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "Zobrazit Statistiky" @@ -4500,7 +4536,7 @@ msgstr "Zobrazit ikonu uložení" msgid "Show save title" msgstr "Zobrazit název uložení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4520,7 +4556,7 @@ msgstr "Zobrazit tuto zprávu nápovÄ›dy" msgid "Show unknown" msgstr "Zobrazit neznámé" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -4546,15 +4582,15 @@ msgstr "Velikost" msgid "Skip BIOS" msgstr "PÅ™eskoÄit BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "Vypnout Průchod Cíl. Průhl." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "PÅ™eskoÄit EFB Přístup z Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4566,6 +4602,22 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Lehce zrychlí kopie EFB do RAM obÄ›továním pÅ™esnosti emulace.\n" +"NÄ›kdy také zvýší kvalitu obrazu.\n" +"Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit pÅ™esnost textury, " +"nebo tuto možnost vypnout.\n" +"\n" +"Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4619,9 +4671,9 @@ msgstr "VytvoÅ™ení vyrovnávací pamÄ›ti zvuku selhalo: %s" msgid "Space" msgstr "Mezerník" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "Å panÄ›lÅ¡tina" @@ -4629,7 +4681,7 @@ msgstr "Å panÄ›lÅ¡tina" msgid "Speaker Volume:" msgstr "Hlasitost Reproduktoru:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 " @@ -4665,9 +4717,9 @@ msgstr "ÄŒtvercový Stick" msgid "Standard Controller" msgstr "Standardní OvladaÄ" +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Start" @@ -4695,14 +4747,28 @@ msgstr "Ukládání stavu" msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Zastavit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" +"Ukládat EFB kopie do objektů textury grafického procesoru.\n" +"Toto není pÅ™esné, ale pro vÄ›tÅ¡inu her funguje dostateÄnÄ› dobÅ™e a dává vÄ›tší " +"zrychlení než EFB do RAM.\n" +"\n" +"Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "Roztáhnout do Okna" @@ -4736,8 +4802,8 @@ msgstr "Jazyk Systému:" msgid "TAIWAN" msgstr "TCHAJ-WAN" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS Vstup" @@ -4757,9 +4823,9 @@ msgstr "Deska vlevo" msgid "Table Right" msgstr "Deska vpravo" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "VytvoÅ™it Snímek Obrazovky" @@ -4767,7 +4833,15 @@ msgstr "VytvoÅ™it Snímek Obrazovky" msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "Textura" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +msgid "Texture Cache" +msgstr "Vyrovnávací Paměť Textur" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" msgstr "PÅ™ekryv Formátu Textury" @@ -4812,7 +4886,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:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Zadaný soubor (%s) neexistuje" @@ -4829,11 +4903,23 @@ 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:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +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." + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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:363 +#: Source/Core/DolphinWX/Src/Main.cpp:353 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4902,7 +4988,7 @@ msgstr "" 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:119 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. " @@ -4977,13 +5063,13 @@ msgstr "Do" msgid "Toggle All Log Types" msgstr "Zapnout VÅ¡echny Typy Záznamů" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "PÅ™epnout na Celou Obrazovku" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Top" msgstr "NahoÅ™e" @@ -4991,7 +5077,7 @@ msgstr "NahoÅ™e" msgid "Traditional Chinese" msgstr "TradiÄní ČínÅ¡tina" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "Pokus o naÄtení souboru neznámého typu." @@ -5027,8 +5113,8 @@ msgstr "Typ" msgid "UDP Port:" msgstr "UDP Port:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5101,8 +5187,8 @@ msgstr "" "Neznámý ukazatel %#08x\n" "PokraÄovat?" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "Nahoru" @@ -5119,7 +5205,7 @@ msgstr "Svislý Wiimote" msgid "Use EuRGB60 Mode (PAL60)" msgstr "Použít režim EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 msgid "Use Fullscreen" msgstr "Použít Celou Obrazovku" @@ -5131,7 +5217,7 @@ msgstr "Použít Å estnáctkovou soustavu" msgid "Use Panic Handlers" msgstr "Použít Obslužné Rutiny Paniky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5144,7 +5230,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5158,11 +5244,11 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "Pomůcky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "V-Synch" @@ -5186,8 +5272,7 @@ msgstr "Úroveň" msgid "Video" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "Virtuální" @@ -5214,21 +5299,21 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Varování" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 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:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "Varování - ELF se spouÅ¡tí ve Å¡patném režimu konzole!" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "Varování - ISO se spouÅ¡tí ve Å¡patném režimu konzole!" @@ -5265,7 +5350,7 @@ msgstr "WaveFileWriter - soubor není otevÅ™en." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "Hack Å irokoúhlého obrazu" @@ -5289,7 +5374,7 @@ msgstr "Wii KoÅ™en NAND:" msgid "Wii Save Import" msgstr "Import uložených pozic Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -5297,8 +5382,8 @@ msgstr "Wii soubory s uložením (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD Nelze Äíst ze souboru" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "Wiimote" @@ -5320,7 +5405,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:609 +#: Source/Core/DolphinWX/Src/Main.cpp:599 msgid "Wiimote Connected" msgstr "Wiimote PÅ™ipojen" @@ -5352,7 +5437,7 @@ msgstr "Klávesa Windows Vpravo" msgid "Word Wrap" msgstr "Zalamování textu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5460,7 +5545,7 @@ msgstr "Nulový kód, který dolphin nezná: %08x" msgid "[ waiting ]" msgstr "[ Äekám ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5476,7 +5561,7 @@ msgstr "" msgid "[Custom]" msgstr "[Vlastní]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5495,7 +5580,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5602,9 +5687,6 @@ msgstr "| NEBO" #~ msgid "< as Default Profile >" #~ msgstr "< jako Výchozí Profil >" -#~ msgid "Accuracy:" -#~ msgstr "PÅ™esnost:" - #~ msgid "Accurate Texture Cache" #~ msgstr "Precizní Vyrovnávací Paměť Textur" @@ -5624,9 +5706,6 @@ msgstr "| NEBO" #~ "ale zapnutí této možnosti může mít také velký negativní dopad na výkon " #~ "pokud hra tuto funkci hodnÄ› využívá." -#~ msgid "Alternate Wiimote Timing" -#~ msgstr "Střídat Äasování Wiimote" - #~ msgid "Auto [recommended]" #~ msgstr "Auto [doporuÄeno]" @@ -5639,17 +5718,6 @@ 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" @@ -5683,6 +5751,9 @@ msgstr "| NEBO" #~ msgid "Danish" #~ msgstr "DánÅ¡tina" +#~ msgid "Disable Wiimote Speaker" +#~ msgstr "Zakázat Reproduktor Wiimote" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -5728,9 +5799,6 @@ msgstr "| NEBO" #~ msgid "Enable CPU Access" #~ msgstr "Povolit Přístup k Procesoru" -#~ msgid "Enable Cache" -#~ msgstr "Povolit vyrovnávací paměť" - #~ msgid "Enable Copy to EFB" #~ msgstr "Povolit Kopírování do EFB" @@ -5789,12 +5857,6 @@ msgstr "| NEBO" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Nelze nahrát DSP ROM : %s" -#~ msgid "Fast" -#~ msgstr "Rychlá" - -#~ msgid "Fast Mipmaps" -#~ msgstr "Rychlé Mipmapy" - #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -5908,15 +5970,9 @@ msgstr "| NEBO" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "Nutné pro použití Japonského písma ROM" -#~ msgid "Safe" -#~ msgstr "BezpeÄná" - #~ msgid "Scale:" #~ msgstr "ZmÄ›na Velikosti:" -#~ msgid "Scaled EFB Copy" -#~ msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" - #~ msgid "Select resolution for fullscreen mode" #~ msgstr "Vyberte rozliÅ¡ení v režimu celé obrazovky" @@ -5961,21 +6017,6 @@ msgstr "| NEBO" #~ "Zobrazí různé statistiky.\n" #~ "Jsou užiteÄné pouze pro úÄely ladÄ›ní." -#~ 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" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Lehce zrychlí kopie EFB do RAM obÄ›továním pÅ™esnosti emulace.\n" -#~ "NÄ›kdy také zvýší kvalitu obrazu.\n" -#~ "Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit pÅ™esnost " -#~ "textury, nebo tuto možnost vypnout.\n" -#~ "\n" -#~ "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." - #~ msgid "Slot" #~ msgstr "Slot" @@ -6009,36 +6050,6 @@ msgstr "| NEBO" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Spustí vykreslovací okno v režimu celé obrazovky." -#~ 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" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "Ukládat EFB kopie do objektů textury grafického procesoru.\n" -#~ "Toto není pÅ™esné, ale pro vÄ›tÅ¡inu her funguje dostateÄnÄ› dobÅ™e a dává " -#~ "vÄ›tší zrychlení než EFB do RAM.\n" -#~ "\n" -#~ "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." - -#~ msgid "Texture" -#~ msgstr "Textura" - -#~ msgid "Texture Cache" -#~ msgstr "Vyrovnávací Paměť Textur" - -#~ msgid "" -#~ "The safer you adjust this, the less likely the emulator will be missing " -#~ "any texture updates from RAM.\n" -#~ "\n" -#~ "If unsure, use the second-fastest value from the right." -#~ 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." - #~ msgid "Use FPS For Limiting" #~ msgstr "Použít SzS pro Omezení" diff --git a/Languages/po/el.po b/Languages/po/el.po index b030d9565f..22953f7c39 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: 2011-08-10 08:30-0500\n" -"PO-Revision-Date: 2011-12-18 13:38-0600\n" +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-12-18 13:39-0600\n" "Last-Translator: Linktothepast \n" "Language-Team: Gpower2 \n" "Language: Greek\n" @@ -32,7 +32,7 @@ msgstr "Παιχνίδι : " msgid "! NOT" msgstr "! NOT" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -44,8 +44,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\" είναι ένα μη έγκυÏο αÏχείο GCM/ISO, ή δεν είναι ένα ISO GC/Wii." +msgstr "Το \"%s\" είναι ένα μη έγκυÏο αÏχείο GCM/ISO, ή δεν είναι ένα ISO GC/Wii." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:193 #, c-format @@ -73,10 +72,9 @@ 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/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -85,7 +83,7 @@ msgstr "" "%s απέτυχε να φοÏτώσει ως κάÏτα μνήμης\n" " Το μέγεθος του αÏχείου της κάÏτας δεν είναι έγκυÏο (0x%x bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -94,15 +92,14 @@ msgstr "" "%s απέτυχε να φοÏτώσει ως κάÏτα μνήμης\n" " Το μέγεθος της κάÏτας δεν είναι έγκυÏο (0x%x bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format 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 bytes)" +"το αÏχείο δεν είναι αÏκετά μεγάλο ώστε να αποτελεί έγκυÏο αÏχείο κάÏτας μνήμης (0x%x bytes)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -133,9 +130,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:199 #, c-format @@ -313,7 +308,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(ΑΓÎΩΣΤΟ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(ανενεÏγό)" @@ -325,7 +320,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "3D Vision" @@ -337,7 +332,7 @@ msgstr "8 bit" msgid "" msgstr "<Εισάγετε όνομα εδώ>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "<Δε βÏέθηκαν αναλÏσεις>" @@ -375,13 +370,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" @@ -395,12 +388,10 @@ msgstr "" " - ΔÏο ΠυÏήνες [ΑÎΕÎΕΡΓΟ]\n" " - Throttle Ήχου [ΑÎΕÎΕΡΓΟ]\n" " - DSP-HLE με \"Null Audio\" ή DSP-LLE\n" -" - ΧειÏοκίνητη εισαγωγή του ακÏιβοÏÏ‚ αÏÎ¹Î¸Î¼Î¿Ï Ï„Ï‰Î½ ελεγκτών που θα " -"χÏησιμοποιηθοÏν σαν [Τυπικός Ελεγκτής]\n" +" - ΧειÏοκίνητη εισαγωγή του ακÏιβοÏÏ‚ αÏÎ¹Î¸Î¼Î¿Ï Ï„Ï‰Î½ ελεγκτών που θα χÏησιμοποιηθοÏν σαν [Τυπικός Ελεγκτής]\n" "\n" "Όλοι οι παίκτες Ï€Ïέπει να έχουν την ίδια έκδοση και Ïυθμίσεις του Dolphin.\n" -"ΑπενεÏγοποιήστε όλες τις κάÏτες μνήμης ή στείλτε τες σε όλους τους παίκτες " -"Ï€Ïιν την εκκίνηση.\n" +"ΑπενεÏγοποιήστε όλες τις κάÏτες μνήμης ή στείλτε τες σε όλους τους παίκτες Ï€Ïιν την εκκίνηση.\n" "Η υποστήÏιξη Wiimote δεν έχει ακόμα υλοποιηθεί.\n" "\n" "Θα Ï€Ïέπει να έχετε κάνει Ï€Ïοώθηση της πόÏτας TCP στον host!!" @@ -423,22 +414,23 @@ msgstr "Σχετικά με το Dolphin" msgid "Acceleration" msgstr "Επιτάχυνση" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "ΑκÏίβεια:" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "ΑκÏιβής VBeam εξομοίωση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 -#, fuzzy +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 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, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" "Εξομοιώνει με ακÏίβεια τα EFB αντίγÏαφα.\n" -"Κάποια παιχνίδια βασίζονται σε αυτό για οÏισμένα εφέ γÏαφικών ή λειτουÏγίες " -"του gameplay.\n" +"Κάποια παιχνίδια βασίζονται σε αυτό για οÏισμένα εφέ γÏαφικών ή λειτουÏγίες του gameplay.\n" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε EFB ΑντίγÏαφα σε Υφή." @@ -463,38 +455,23 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, 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:756 #, 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:549 #, 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:609 #, 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:803 #, c-format @@ -503,11 +480,8 @@ msgstr "Σφάλμα Action Replay: Μη έγκυÏη τιμή (%08x) σε Memor #: Source/Core/Core/Src/ActionReplay.cpp:684 #, 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 @@ -534,12 +508,12 @@ msgstr "Action Replay: Normal Code %i: Μη έγκυÏο subtype %08x (%s)" 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:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "ΠÏοσαÏμογέας:" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "ΠÏοσθήκη" @@ -555,9 +529,9 @@ msgstr "ΠÏοσθήκη Patch" msgid "Add new pane" msgstr "ΠÏοσθήκη νέου pane" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 msgid "Add..." msgstr "ΠÏοσθήκη..." @@ -569,8 +543,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." @@ -580,8 +553,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." @@ -589,11 +561,9 @@ 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:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "Για Ï€ÏοχωÏημένους" @@ -613,8 +583,8 @@ msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" @@ -630,23 +600,25 @@ msgstr "Όλα τα συμπιεσμένα αÏχεία GC/Wii ISO (gcz)" msgid "All files (*.*)|*.*" msgstr "Όλα τα αÏχεία (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕπιτÏέπει την εναλλαγή οÏισμένων επιλογών με τα πλήκτÏα συντόμευσης 3, 4, 5, " -"6 και 7 μέσα από το παÏάθυÏο εξομοίωσης.\n" +"ΕπιτÏέπει την εναλλαγή οÏισμένων επιλογών με τα πλήκτÏα συντόμευσης 3, 4, 5, 6 και 7 μέσα από το παÏάθυÏο εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +msgid "Alternate Wiimote Timing" +msgstr "Εναλλακτικός ΧÏονισμός Wiimote" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" msgstr "ΑνισοτÏοπικό ΦιλτÏάÏισμα:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "Εξομάλυνση ΟÏίων:" @@ -666,7 +638,7 @@ msgstr "Apploader:" msgid "Apply" msgstr "ΕφαÏμογή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -695,12 +667,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 msgid "Are you sure you want to delete this file? It will be gone forever!" -msgstr "" -"Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για " -"πάντα!" +msgstr "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για πάντα!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Αναλογία Οθόνης:" @@ -721,19 +691,19 @@ msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Αυτόματα" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "Αυτόματα (Πολλαπλάσιο του 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "Αυτόματα (Μέγεθος ΠαÏαθÏÏου)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "Αυτόματη ΠÏοσαÏμογή Μεγέθους ΠαÏαθÏÏου" @@ -743,11 +713,22 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΠÏοσαÏμόζει αυτόματα το μέγεθος του παÏαθÏÏου σÏμφωνα με την εσωτεÏική " -"ανάλυση.\n" +"ΠÏοσαÏμόζει αυτόματα το μέγεθος του παÏαθÏÏου σÏμφωνα με την εσωτεÏική ανάλυση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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/WXInputBase.cpp:27 msgid "Back" msgstr "Πίσω" @@ -756,8 +737,8 @@ msgstr "Πίσω" msgid "Backend Settings" msgstr "Backend Ρυθμίσεις" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Backend:" @@ -791,7 +772,7 @@ msgstr "Εικονίδιο:" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "Βασικές" @@ -803,7 +784,7 @@ msgstr "Βασικές Ρυθμίσεις" msgid "Bass" msgstr "Μπάσο" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Αποτυχία ελέγχου checksum για τον BAT" @@ -823,8 +804,8 @@ msgstr "ΑÏιστεÏÏŒ Μπλε" msgid "Blue Right" msgstr "Δεξί Μπλε" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 msgid "Bottom" msgstr "Βάση" @@ -857,9 +838,9 @@ msgstr "ΕÏÏεση φακέλου Ï€ÏοοÏισμοÏ" msgid "Buffer:" msgstr "Buffer:" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "Κουμπιά" @@ -875,27 +856,23 @@ msgstr "Stick ΚάμεÏας" msgid "CPU Emulator Engine" msgstr "Μηχανή Εξομοίωσης CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "Cache Display Lists" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -905,13 +882,12 @@ msgid "" msgstr "" "Υπολογίζει τον φωτισμό των 3D γÏαφικών ανά pixel αντί ανά vertex.\n" "Μειώνει την ταχÏτητα εξομοίωσης κατά κάποιο ποσοστό (ανάλογα με την GPU).\n" -"Αυτή συνήθως είναι μια ασφαλής βελτίωση, αλλά μποÏεί να Ï€Ïοκαλέσει οÏισμένες " -"φοÏές Ï€Ïοβλήματα.\n" +"Αυτή συνήθως είναι μια ασφαλής βελτίωση, αλλά μποÏεί να Ï€Ïοκαλέσει οÏισμένες φοÏές Ï€Ïοβλήματα.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "ΆκυÏο" @@ -959,10 +935,10 @@ msgstr "Αποτυχία εÏÏεσης WiiMote με bd: %02x:%02x:%02x:%02x:%02 msgid "Cant find WiiMote by connection handle %02x" msgstr "Αδυναμία εÏÏεσης του WiiMote με handle σÏνδεσης %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Αδυναμία ανάγνωσης από το DVD_Plugin - DVD-Interface: ΚÏίσιμο Σφάλμα" @@ -1064,12 +1040,8 @@ msgid "Choose a memory card:" msgstr "Επιλέξτε μια κάÏτα μνήμης:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 -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:764 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 @@ -1084,10 +1056,10 @@ msgstr "Κυκλικό Stick" msgid "Classic" msgstr "Κλασικό ΧειÏιστήÏιο" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "ΚαθάÏισ." @@ -1096,17 +1068,13 @@ msgid "Clear failed." 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/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Κλείσιμο" @@ -1210,7 +1178,7 @@ msgstr "ΣÏνδεση Wiimote 3" msgid "Connect Wiimote 4" msgstr "ΣÏνδεση Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:608 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Connecting..." msgstr "Γίνεται ΣÏνδεση..." @@ -1251,15 +1219,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 @@ -1276,23 +1239,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:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, 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:1044 msgid "Couldn't find open command for extension 'ini'!" @@ -1330,11 +1289,8 @@ msgid "Created by KDE-Look.org" msgstr "ΔημιουÏγήθηκε από KDE-Look.org" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 -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:492 msgid "Created by VistaIcons.com" @@ -1342,9 +1298,7 @@ msgstr "ΔημιουÏγήθηκε από VistaIcons.com" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 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:15 msgid "Creator: " @@ -1354,11 +1308,11 @@ msgstr "ΔημιουÏγός: " msgid "Critical" msgstr "ΚÏίσιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "Κόψιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1405,8 +1359,8 @@ msgstr "Ήχος (DSP)" msgid "DSP Emulator Engine" msgstr "Μηχανή Εξομοίωσης DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE εξομοίωση (γÏήγοÏη)" @@ -1455,7 +1409,7 @@ msgstr "ÎεκÏή Ζώνη" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Debugging" msgstr "Debugging" @@ -1488,8 +1442,8 @@ msgstr "ΠÏοεπιλεγμένο ISO:" msgid "Default font" msgstr "ΠÏοεπιλεγμένη γÏαμματοσειÏά" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "ΔιαγÏαφή" @@ -1497,12 +1451,12 @@ msgstr "ΔιαγÏαφή" msgid "Delete Save" msgstr "ΔιαγÏαφή Αποθήκευσης" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "ΔιαγÏαφή του υπάÏχοντος αÏχείου '%s';" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 msgid "Description" msgstr "ΠεÏιγÏαφή" @@ -1512,12 +1466,8 @@ msgstr "Ανίχνευση" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -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 @@ -1533,15 +1483,15 @@ msgstr "Ρυθμίσεις Συσκευής" msgid "Dial" msgstr "Dial" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1549,62 +1499,52 @@ msgstr "" "Το checksum του Καταλόγου απέτυχε\n" " καθώς και το checksum του εφεδÏÎ¹ÎºÎ¿Ï ÎšÎ±Ï„Î±Î»ÏŒÎ³Î¿Ï… απέτυχε" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 msgid "Disable" msgstr "ΑπενεÏγοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "ΑπενεÏγοποίηση Ομίχλης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "ΑπενεÏγοποίηση ΦωτισμοÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "ΑπενεÏγοποίηση Βάθους ανά Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "ΑπενεÏγοποίηση Υφών" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 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:95 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/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1623,11 +1563,11 @@ msgstr "Δίσκος" msgid "Disc Read Error" msgstr "Σφάλμα Ανάγνωσης Δίσκου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "Οθόνη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1641,7 +1581,7 @@ msgstr "" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξομοίωση;" @@ -1649,7 +1589,7 @@ msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξο msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Ρυθμίσεις ΓÏαφικών Dolphin %s" @@ -1670,12 +1610,12 @@ msgstr "Ρυθμίσεις Εξοιμοιωμένου Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 msgid "Dolphin GCPad Configuration" msgstr "Ρυθμίσεις Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" @@ -1688,23 +1628,15 @@ msgid "Dolphin at &Google Code" msgstr "Dolphin στο &Google Code" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 -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:307 -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/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Κάτω" @@ -1729,41 +1661,39 @@ msgstr "Dummy" msgid "Dump Audio" msgstr "Εξαγωγή Ήχου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "Εξαγωγή EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "Εξαγωγή ΚαÏέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "Εξαγωγή Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 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:112 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:114 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1773,9 +1703,9 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 msgid "Dutch" msgstr "Ολλανδικά" @@ -1783,22 +1713,14 @@ msgstr "Ολλανδικά" msgid "E&xit" msgstr "Έ&ξοδος" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" msgstr "EFB ΑντίγÏαφα" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, 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:162 msgid "EUROPE" @@ -1837,7 +1759,7 @@ msgstr "ΕπεξεÏγασία..." msgid "Effect" msgstr "Εφέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer" @@ -1845,34 +1767,27 @@ msgstr "Embedded Frame Buffer" msgid "Emu Thread already running" msgstr "Το νήμα εξομοίωσης εκτελείται ήδη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 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:110 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" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -1888,17 +1803,15 @@ msgstr "Κατάσταση ΛειτουÏγίας:" msgid "Enable" msgstr "ΕνεÏγοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 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" @@ -1920,6 +1833,10 @@ msgstr "ΕνεÏγοποίηση BAT" msgid "Enable Block Merging" msgstr "ΕνεÏγοποίηση Block Merging" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +msgid "Enable Cache" +msgstr "ΕνεÏγοποίηση Cache" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 msgid "Enable Cheats" msgstr "ΕνεÏγοποίηση Cheat" @@ -1936,7 +1853,7 @@ msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα" msgid "Enable Dual Core (speedup)" msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα (επιτάχυνση)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "ΕνεÏγοποίηση ΣυντομεÏσεων" @@ -1952,8 +1869,8 @@ msgstr "ΕνεÏγοποίηση Idle Skipping (επιτάχυνση)" msgid "Enable MMU" msgstr "ΕνεÏγοποίηση MMU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "ΕνεÏγοποίηση ΠÏοοδευτικής ΣάÏωσης" @@ -1965,7 +1882,7 @@ msgstr "ΕνεÏγοποίηση ΠÏοφÏλαξης Οθόνης" msgid "Enable WideScreen" msgstr "ΕνεÏγοποίηση ΕυÏείας Οθόνης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "ΕνεÏγοποίηση Wireframe" @@ -1978,19 +1895,14 @@ msgid "" "If unsure, select 1x." msgstr "" "ΕνεÏγοποιεί το ανισοτÏοπικό φιλτÏάÏισμα.\n" -"Βελτιώνει την ποιότητα απεικόνισης των υφών που βÏίσκονται σε οξείες οπτικές " -"γωνίες.\n" +"Βελτιώνει την ποιότητα απεικόνισης των υφών που βÏίσκονται σε οξείες οπτικές γωνίες.\n" "ΜποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα σε έναν μικÏÏŒ αÏιθμό παιχνιδιών.\n" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -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:799 msgid "Enable pages" @@ -2003,41 +1915,28 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιήστε το αν θέλετε ολόκληÏη η οθόνη να χÏησιμοποιηθεί για την " -"απεικόνιση.\n" +"ΕνεÏγοποιήστε το αν θέλετε ολόκληÏη η οθόνη να χÏησιμοποιηθεί για την απεικόνιση.\n" "Αν αυτό είναι απενεÏγοποιημένο, θα δημιουÏγηθεί ένα παÏάθυÏο απεικόνισης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 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:329 -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:311 -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:334 msgid "Enables Custom Projection Hack" @@ -2050,20 +1949,15 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιεί την Ï€Ïοοδευτική σάÏωση αν υποστηÏίζεται από το εξομοιωμένο " -"λογισμικό. Τα πεÏισσότεÏα παιχνίδια δεν την χÏειάζονται αυτήν την ÏÏθμιση.\n" +"ΕνεÏγοποιεί την Ï€Ïοοδευτική σάÏωση αν υποστηÏίζεται από το εξομοιωμένο λογισμικό. Τα πεÏισσότεÏα παιχνίδια δεν την χÏειάζονται αυτήν την ÏÏθμιση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -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 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2077,14 +1971,14 @@ msgstr "" msgid "End" msgstr "Τέλος" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "English" msgstr "Αγγλικά" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "Βελτιώσεις" @@ -2106,27 +2000,20 @@ msgstr "ΕγγÏαφή 1/%d" msgid "Equal" msgstr "Ίσο" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "Σφάλμα" -#: Source/Core/DolphinWX/Src/Main.cpp:356 +#: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." -msgstr "" -"Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή " -"συστήματος." +msgstr "Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή συστήματος." #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 #, 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" @@ -2139,8 +2026,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:58 msgid "Execute" @@ -2190,7 +2076,7 @@ msgstr "Εξαγωγή αποθήκευσης ως..." msgid "Extension" msgstr "Επέκταση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "ΕξωτεÏικό Frame Buffer" @@ -2291,12 +2177,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 @@ -2313,7 +2197,7 @@ msgstr "Αποτυχία φόÏτωσης hid.dll" msgid "Failed to read banner.bin" msgstr "Αποτυχία ανάγνωσης banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2321,7 +2205,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης του αντιγÏάφου ασφαλείας του BAT\n" "(0x8000-0x9FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2334,7 +2218,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Αποτυχία ανάγνωσης δεδομένων από το αÏχείο %d" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2342,7 +2226,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης του αντιγÏάφου ασφαλείας των φακέλων\n" "(0x4000-0x5FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2350,7 +2234,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης των φακέλων\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2358,7 +2242,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης της κεφαλίδας\n" "(0x0000-0x1FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2387,6 +2271,14 @@ msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το msgid "Failed to write header for file %d" msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το αÏχείο %d" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "ΓÏήγοÏη" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "ΓÏήγοÏα Mipmaps" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "ΓÏήγοÏη έκδοση του MMU. Δε δουλεÏει για όλα τα παιχνίδια." @@ -2415,7 +2307,7 @@ msgstr "" "Το αÏχείο απέτυχε στο άνοιγμα\n" "ή δεν έχει έγκυÏη επέκταση" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2453,11 +2345,11 @@ msgstr "ΠÏώτο Μπλοκ" msgid "Fix Checksums" msgstr "ΕπιδιόÏθωση Checksum" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "Επιβολή 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "Επιβολή 4:3" @@ -2465,11 +2357,11 @@ msgstr "Επιβολή 4:3" msgid "Force Console as NTSC-J" msgstr "Επιβολή της Κονσόλας ως NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" msgstr "Επιβολή ΦιλτÏαÏίσματος Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2477,8 +2369,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Επιβάλλει φιλτÏάÏισμα υφών ακόμα κι αν το παιχνίδι το έχει απενεÏγοποιήσει.\n" -"Βελτιώνει ελαφÏÏŽÏ‚ την ποιότητα των υφών αλλά μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα " -"σε οÏισμένα παιχνίδια.\n" +"Βελτιώνει ελαφÏÏŽÏ‚ την ποιότητα των υφών αλλά μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα σε οÏισμένα παιχνίδια.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -2497,15 +2388,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 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/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2530,7 +2418,7 @@ msgstr "ΚαÏέ" msgid "Frame Advance" msgstr "ΠÏοώθηση ανά ΚαÏέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "FFV1 Για Τα Εξαγώμενα ΚαÏέ" @@ -2550,13 +2438,13 @@ msgstr "ΠεÏιοÏισμός ΚαÏέ:" msgid "Frames To Record" msgstr "ΚαÏέ ΠÏος ΕγγÏαφή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "ΕλεÏθεÏη Ματιά" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 msgid "French" msgstr "Γαλλικά" @@ -2573,7 +2461,7 @@ msgstr "Από" msgid "FullScr" msgstr "ΠλήÏης Οθόνη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 msgid "Fullscreen resolution:" msgstr "Ανάλυση ΠλήÏους Οθόνης:" @@ -2617,8 +2505,8 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Ρυθμίσεις Gamecube &Pad" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "ΚάÏτες Μνήμης Gamecube (*.raw,*.gcp)" @@ -2640,9 +2528,9 @@ msgstr "" "Ο Κωδικός Gecko απέτυχε να εκτελεστεί (CT%i CST%i) (%s)\n" "(ή είναι ένας κακός κωδικός ή ο Ï„Ïπος του ÎºÏ‰Î´Î¹ÎºÎ¿Ï Î´ÎµÎ½ υποστηÏίζεται.)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Γενικά" @@ -2650,18 +2538,16 @@ msgstr "Γενικά" msgid "General Settings" msgstr "Γενικές Ρυθμίσεις" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "German" msgstr "ΓεÏμανικά" #: Source/Core/Core/Src/ActionReplay.cpp:451 #, 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:443 msgid "Graphics" @@ -2675,20 +2561,17 @@ msgstr "Ρυθμίσεις ΓÏαφικών" msgid "Greater Than" msgstr "ΜεγαλÏτεÏο από" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 -#, fuzzy +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 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" "\n" "If unsure, leave this checked." msgstr "" -"Βελτιώνει Ï€Î¿Î»Ï Ï„Î·Î½ ποιότητα των υφών που παÏάγονται χÏησιμοποιώντας render " -"to texture εφέ.\n" +"Βελτιώνει Ï€Î¿Î»Ï Ï„Î·Î½ ποιότητα των υφών που παÏάγονται χÏησιμοποιώντας render to texture εφέ.\n" "Μία αÏξηση της εσωτεÏικής ανάλυσης θα βελτιώσει το εφέ αυτής της ÏÏθμισης.\n" -"Μειώνει ελαφÏÏŽÏ‚ την επίδοση και είναι πιθανό να Ï€Ïοκαλέσει Ï€Ïοβλήματα (αν " -"και σπάνια).\n" +"Μειώνει ελαφÏÏŽÏ‚ την επίδοση και είναι πιθανό να Ï€Ïοκαλέσει Ï€Ïοβλήματα (αν και σπάνια).\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -2716,11 +2599,11 @@ msgstr "ΚιθάÏα" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Γίνεται κλήση του HCI_CMD_INQUIRY, παÏακαλώ αναφέÏετε!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "Hacks" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Αποτυχία ελέγχου κεφαλίδας" @@ -2756,7 +2639,7 @@ msgstr "" msgid "Hide" msgstr "ΑπόκÏυψη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "ΑπόκÏυψη Δείκτη ΠοντικιοÏ" @@ -2766,8 +2649,7 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"ΑποκÏÏπτει τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î±Î½ βÏίσκεται πάνω από το παÏάθυÏο " -"εξομοίωσης.\n" +"ΑποκÏÏπτει τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î±Î½ βÏίσκεται πάνω από το παÏάθυÏο εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -2784,8 +2666,8 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Ρυθμίσεις ΠλήκτÏων Συντόμευσης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 msgid "Hotkeys" msgstr "ΠλήκτÏα Συντόμευσης" @@ -2800,20 +2682,16 @@ msgstr "ΥβÏιδικό Wiimote" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 #, 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:795 #, 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 πιθανότατα θα κολλήσει Ï„ÏŽÏα." @@ -2854,52 +2732,40 @@ msgid "Icon" msgstr "Εικονίδιο" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -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:481 -msgid "" -"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." +msgid "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." msgstr "" -"Αν θέσετε τιμή υψηλότεÏη από την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, " -"PAL:50),\n" -"θα Ï€Ïέπει επίσης να απενεÏγοποιήσετε το Throttle Ήχου στο DSP για να έχει " -"αποτέλεσμα. " +"Αν θέσετε τιμή υψηλότεÏη από την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, PAL:50),\n" +"θα Ï€Ïέπει επίσης να απενεÏγοποιήσετε το Throttle Ήχου στο DSP για να έχει αποτέλεσμα. " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" msgstr "Αγνόηση Αλλαγών Format" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 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:93 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -2931,26 +2797,23 @@ msgstr "" "Το εισαγώμενο αÏχείο έχει sav επέκταση\n" "άλλα δεν έχει σωστή κεφαλίδα." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 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/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί την εξαφάνιση του Ï†Ï‰Ï„Î¹ÏƒÎ¼Î¿Ï ÏƒÏ„Î± " -"πεÏισσότεÏα παιχνίδια.\n" +"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί την εξαφάνιση του Ï†Ï‰Ï„Î¹ÏƒÎ¼Î¿Ï ÏƒÏ„Î± πεÏισσότεÏα παιχνίδια.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -2962,8 +2825,8 @@ msgstr "Εντός ΠαιχνιδιοÏ" msgid "In-Game" msgstr "Εντός ΠαιχνιδιοÏ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "ΠληÏοφοÏίες" @@ -3000,13 +2863,10 @@ 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:1361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." @@ -3035,7 +2895,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "ΕσωτεÏικό Σφάλμα LZO - αποτυχία lzo_init()" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 msgid "Internal Resolution:" msgstr "ΕσωτεÏική Ανάλυση:" @@ -3088,9 +2948,9 @@ msgstr "Μη έγκυÏο αÏχείο εγγÏαφής" msgid "Invalid state" msgstr "Μη έγκυÏο κατάσταση" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Italian" msgstr "Ιταλικά" @@ -3151,8 +3011,8 @@ msgstr "Τελευταίο ΕπαναγÏαμμένο Σημείο Αποθ." msgid "Last Saved State" msgstr "Τελευταίο Αποθηκευμένο Σημείο Αποθ." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "ΑÏιστεÏά" @@ -3198,7 +3058,7 @@ msgstr "ΠεÏιοÏισμός με βάση τα ΚαÏέ" msgid "Load" msgstr "ΦόÏτωσ." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Load Custom Textures" msgstr "ΦόÏτωση ΤÏοποποιημένων Υφών" @@ -3238,16 +3098,16 @@ msgstr "ΦόÏτωση Σημείου Αποθήκευσης 8" msgid "Load State..." msgstr "ΦόÏτωση Σημείου Αποθήκευσης..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Load Wii System Menu" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 #, 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:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3289,8 +3149,8 @@ msgstr "ΤÏποι ΚαταγÏαφής" msgid "Logger Outputs" msgstr "Έξοδοι ΚαταγÏαφής" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "ΚαταγÏαφή" @@ -3324,8 +3184,8 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "ΑÏχεία MadCatz Gameshark (*.gcs)" -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "ΚÏÏιο Stick" @@ -3354,18 +3214,14 @@ msgstr "Η κάÏτα μνήμης είναι ήδη ανοιχτή" msgid "Memory Byte" msgstr "Memory Byte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 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 @@ -3384,11 +3240,9 @@ msgstr "" "%s\n" "Θέλετε να αντιγÏάψετε το παλιό αÏχείο σε αυτή την νέα τοποθεσία;\n" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" -msgstr "" -"Το μέγεθος του αÏχείου της κάÏτας μνήμης δεν ταιÏιάζει με το μέγεθος της " -"κεφαλίδας." +msgstr "Το μέγεθος του αÏχείου της κάÏτας μνήμης δεν ταιÏιάζει με το μέγεθος της κεφαλίδας." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:47 msgid "Menu" @@ -3403,7 +3257,7 @@ msgstr "ΜικÏόφωνο" msgid "Min" msgstr "Ελάχιστη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "ΔιάφοÏα" @@ -3416,15 +3270,13 @@ msgstr "ΔιάφοÏες Ρυθμίσεις" msgid "Modifier" msgstr "Modifier" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -3442,7 +3294,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "ΜοτέÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3452,8 +3304,7 @@ msgid "" "\n" "\n" msgstr "" -"Μετακινήστε τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Ï€Î¬Î½Ï‰ από μία επιλογή για να εμφανιστεί " -"μία λεπτομεÏής πεÏιγÏαφή.\n" +"Μετακινήστε τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Ï€Î¬Î½Ï‰ από μία επιλογή για να εμφανιστεί μία λεπτομεÏής πεÏιγÏαφή.\n" "\n" "\n" "\n" @@ -3464,12 +3315,8 @@ msgid "Multiply" msgstr "Multiply" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -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/WXInputBase.cpp:126 msgid "NP Add" @@ -3555,9 +3402,9 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Όνομα:" @@ -3642,7 +3489,7 @@ msgstr "Όχι ίσο" msgid "Not Set" msgstr "Μη ΟÏισμένο" -#: Source/Core/DolphinWX/Src/Main.cpp:607 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Not connected" msgstr "Μη Συνδεδεμένο" @@ -3671,8 +3518,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "ΑÏιθμός Κωδικών: " -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "Nunchuk" @@ -3701,8 +3548,8 @@ msgstr "Offset:" msgid "Only %d blocks available" msgstr "Διαθέσιμα μόνο %d μπλοκ" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 msgid "Open" msgstr "Άνοιγμα" @@ -3732,11 +3579,11 @@ msgstr "OpenAL: αδυναμία εÏÏεσης συσκευών ήχου" msgid "OpenAL: can't open device %s" msgstr "OpenAL: αδυναμία ανοίγματος της συσκευής %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "OpenCL Αποκωδικοποιητής Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "OpenMP Αποκωδικοποιητής Υφών" @@ -3763,23 +3610,18 @@ 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" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 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" @@ -3834,13 +3676,13 @@ msgstr "Patches" msgid "Paths" msgstr "Φάκελοι" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "ΠαÏση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Per-Pixel Lighting" msgstr "Φωτισμός ανά Pixel" @@ -3853,10 +3695,10 @@ msgstr "Τέλειο" msgid "Perspective %d" msgstr "Οπτική %d" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 msgid "Play" msgstr "ΑναπαÏαγωγή" @@ -3880,7 +3722,7 @@ msgstr "Ρυθμίσεις ΑναπαÏαγωγής" msgid "Players" msgstr "Παίχτες" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 msgid "Please confirm..." msgstr "ΠαÏακαλώ επιβεβαιώστε..." @@ -3925,7 +3767,7 @@ msgstr "ΠοÏτογαλικά" msgid "Portuguese (Brazilian)" msgstr "ΠοÏτογαλικά (Î’Ïαζιλιάνικα)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "Post-Processing Εφέ:" @@ -3984,7 +3826,7 @@ msgstr "R Button" msgid "R-Analog" msgstr "R-Αναλογική" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "RAM" @@ -4000,7 +3842,7 @@ msgstr "ΕÏÏος" msgid "Read-only mode" msgstr "Μόνο Για Ανάγνωση (ΕγγÏαφής)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "ΠÏαγματικό" @@ -4060,9 +3902,9 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε Καμία." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Ανανέωση" @@ -4074,14 +3916,14 @@ msgstr "Ανανέωση Λίστας" msgid "Refresh game list" msgstr "Ανανέωση λίστας παιχνιδιών" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Remove" msgstr "ΑφαίÏεση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4091,12 +3933,12 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "ΑναπαÏαγωγή στο ΚεντÏικό ΠαÏάθυÏο" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Επανεκκίνηση" @@ -4108,8 +3950,8 @@ msgstr "Αποτελέσματα" msgid "Return" msgstr "Return" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "Δεξιά" @@ -4134,13 +3976,17 @@ msgstr "Ρώσικα" msgid "Sa&ve State" msgstr "Απ&οθήκευση Σημείου Αποθήκευσης" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "Ασφαλής" + #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Sample Rate:" msgstr "Ρυθμός Δειγματοληψίας:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Αποθήκ." @@ -4204,9 +4050,11 @@ msgstr "Αποθήκευση αποσυμπιεσμένου GCM/ISO" #: Source/Core/Core/Src/Movie.cpp:428 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." -msgstr "" -"Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της " -"εγγÏαφής της ταινίας..." +msgstr "Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της εγγÏαφής της ταινίας..." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +msgid "Scaled EFB Copy" +msgstr "ΚλιμακοÏμενα EFB ΑντίγÏαφα" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format @@ -4237,23 +4085,25 @@ msgstr "ΦίλτÏο Αναζήτησης" msgid "Search Subfolders" msgstr "Αναζήτηση σε Υποφακέλους" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:104 +#: Source/Core/Common/Src/SysConf.h:127 +#: Source/Core/Common/Src/SysConf.h:147 +#: Source/Core/Common/Src/SysConf.h:168 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Η ενότητα %s δε βÏέθηκε στο SYSCONF" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "Επιλογή" #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αÏχείο για εγκατάσταση" @@ -4279,15 +4129,15 @@ msgstr "Επιλέξτε αιωÏοÏμενα παÏάθυÏα" msgid "Select the file to load" msgstr "Επιλέξτε το αÏχείο για φόÏτωση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 msgid "Select the save file" msgstr "Επιλέξτε αÏχείο αποθήκευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Επιλέξτε το σημείο φόÏτωσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" @@ -4305,8 +4155,7 @@ msgstr "" "Αυτόματα: ΧÏήση της τοπικής αναλογίας οθόνης (4:3)\n" "Επιβολή 16:9: ΠÏοσαÏμόζει την εικόνα σε αναλογία οθόνης 16:9.\n" "Επιβολή 4:3: ΠÏοσαÏμόζει την εικόνα σε αναλογία οθόνης 4:3.\n" -"ΠÏοσαÏμογή στο παÏάθυÏο: ΠÏοσαÏμόζει την εικόνα στην αναλογία του " -"παÏαθÏÏου.\n" +"ΠÏοσαÏμογή στο παÏάθυÏο: ΠÏοσαÏμόζει την εικόνα στην αναλογία του παÏαθÏÏου.\n" "\n" "Αν δεν είστε σίγουÏοι επιλέξτε Αυτόματα." @@ -4317,32 +4166,26 @@ msgstr "Επιλεγμένη γÏαμματοσειÏά" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 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:73 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." @@ -4364,11 +4207,8 @@ msgid "Serbian" msgstr "ΣεÏβικά" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -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" @@ -4386,9 +4226,7 @@ msgstr "ΟÏισμός ως Ï€Ïοεπιλεγμένη ΚάÏτα Μνήμης % #: Source/Core/Core/Src/ActionReplay.cpp:462 #, 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:335 msgid "Settings..." @@ -4430,11 +4268,11 @@ msgstr "Εμφάνιση ΓÏαμμής &ΕÏγαλείων" msgid "Show Drives" msgstr "Εμφάνιση Οδηγών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "Εμφάνιση ΠεÏιοχών EFB ΑντιγÏαφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "Εμφάνιση FPS" @@ -4446,7 +4284,7 @@ msgstr "Εμφάνιση Γαλλίας" msgid "Show GameCube" msgstr "Εμφάνιση GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "Εμφάνιση ΠÏοβολής ΧειÏισμών" @@ -4482,7 +4320,7 @@ msgstr "Εμφάνιση ΠλατφόÏμας" msgid "Show Regions" msgstr "Εμφάνιση ΠεÏιοχών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "Εμφάνιση Στατιστικών" @@ -4509,12 +4347,10 @@ msgstr "Εμφάνιση επιβεβαίωσης Ï€Ïιν τη διακοπή #: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 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:812 @@ -4537,15 +4373,13 @@ msgstr "Εμφάνιση αποθηκευμένου εικονιδίου" msgid "Show save title" msgstr "Εμφάνιση αποθηκευμένου τίτλου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -4557,7 +4391,7 @@ msgstr "Εμφάνιση Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος βοήθειας" msgid "Show unknown" msgstr "Εμφάνιση Αγνώστων" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -4583,23 +4417,35 @@ msgstr "Μέγεθος" msgid "Skip BIOS" msgstr "ΠαÏάλειψη BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "ΠαÏάλειψη Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "ΠαÏάλειψη EFB ΠÏόσβασης από τη CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 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:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"ΕπιταχÏνει ελαφÏÏŽÏ‚ τα EFB σε RAM αντίγÏαφα θυσιάζοντας την ακÏίβεια της εξομοίωσης.\n" +"ΜεÏικές φοÏές μποÏεί να βελτιώσει την οπτική ποιότητα.\n" +"Αν αντιμετωπίζετε Ï€Ïοβλήματα, δοκιμάστε να αυξήσετε την ακÏίβεια της cache υφών ή απενεÏγοποιήστε αυτήν την επιλογή.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -4627,16 +4473,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:618 msgid "Sound Settings" @@ -4656,9 +4499,9 @@ msgstr "Αποτυχία δημιουÏγίας buffer ήχου: %s" msgid "Space" msgstr "Space" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Spanish" msgstr "Ισπανικά" @@ -4666,24 +4509,15 @@ msgstr "Ισπανικά" msgid "Speaker Volume:" msgstr "Ένταση ηχείου:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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." @@ -4703,9 +4537,9 @@ msgstr "ΤετÏάγωνο Stick" msgid "Standard Controller" msgstr "Τυπικός Controller" +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Εκκίνηση" @@ -4733,14 +4567,26 @@ msgstr "Σημεία Αποθήκευσης" msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Διακοπή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" +"Αποθήκευση των EFB αντιγÏάφων σε GPU αντικείμενα υφών.\n" +"Αυτό δεν είναι τόσο ακÏιβές, αλλά δουλεÏει αÏκετά καλά για τα πεÏισσότεÏα παιχνίδια και Ï€ÏοσφέÏει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n" +"\n" +"Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "ΠÏοσαÏμογή στο ΠαÏάθυÏο" @@ -4774,8 +4620,8 @@ msgstr "Γλώσσα Συστήματος:" msgid "TAIWAN" msgstr "ΤΑΪΒΑÎ" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS Είσοδος" @@ -4795,9 +4641,9 @@ msgstr "ΑÏιστεÏÏŒ Table" msgid "Table Right" msgstr "Δεξί Table" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 msgid "Take Screenshot" msgstr "ΔημιουÏγία Στιγμιότυπου" @@ -4805,7 +4651,15 @@ msgstr "ΔημιουÏγία Στιγμιότυπου" msgid "Test" msgstr "Τέστ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "Υφή" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +msgid "Texture Cache" +msgstr "Cache Υφών" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" msgstr "Επικάλυψη Του Format Υφών" @@ -4838,19 +4692,15 @@ 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:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Το αÏχείο που επιλέξατε (%s) δεν υπάÏχει" @@ -4865,21 +4715,25 @@ msgstr "Το όνομα δεν μποÏεί να πεÏιέχει τον Ï‡Î±Ï #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:141 msgid "The resulting decrypted AR code doesn't contain any lines." +msgstr "Το αποτέλεσμα αποκÏυπτογÏάφησης του ÎºÏ‰Î´Î¹ÎºÎ¿Ï AR δεν πεÏιέχει καθόλου γÏαμμές." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." msgstr "" -"Το αποτέλεσμα αποκÏυπτογÏάφησης του ÎºÏ‰Î´Î¹ÎºÎ¿Ï AR δεν πεÏιέχει καθόλου γÏαμμές." +"Όσο πιο ασφαλής είναι αυτή η ÏÏθμιση, τόσο λιγότεÏο πιθανό ο εξομοιωτής να χάσει ανανεώσεις των υφών από την RAM.\n" +"\n" +"Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την δεÏτεÏη γÏηγοÏότεÏη τιμή από δεξιά." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" -msgstr "" -"Το σημείο αποθήκευσης που Ï€Ïοσπαθείτε να αντιγÏάψετε έχει μη έγκυÏο μέγεθος" +msgstr "Το σημείο αποθήκευσης που Ï€Ïοσπαθείτε να αντιγÏάψετε έχει μη έγκυÏο μέγεθος" -#: Source/Core/DolphinWX/Src/Main.cpp:363 -msgid "" -"The selected language is not supported by your system. Falling back to " -"system default." -msgstr "" -"Η επιλεγμένη γλώσσα δεν υποστηÏίζεται από το σÏστημά σας. ΕπαναφοÏά στην " -"Ï€Ïοεπιλογή συστήματος." +#: Source/Core/DolphinWX/Src/Main.cpp:353 +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!" @@ -4915,12 +4769,8 @@ msgid "Theme selection went wrong" msgstr "Η επιλογή θέματος απέτυχε" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 -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:304 msgid "" @@ -4928,40 +4778,25 @@ msgid "" "Undetermined means the game uses Dolphin's setting." msgstr "" "Αυτές οι Ïυθμίσεις υπεÏισχÏουν των γενικών Ïυθμίσεων του Dolphin.\n" -"Αν είναι ακαθόÏιστη η επιλογή το παιχνίδι χÏησιμοποιεί τις γενικές Ïυθμίσεις " -"του Dolphin. " +"Αν είναι ακαθόÏιστη η επιλογή το παιχνίδι χÏησιμοποιεί τις γενικές Ïυθμίσεις του Dolphin. " #: Source/Core/Core/Src/ActionReplay.cpp:356 -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:509 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:119 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -4973,14 +4808,11 @@ msgid "" "\n" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" -"ΧÏησιμοποιείται για τον έλεγχο της ταχÏτητας του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î¼Îµ throttle " -"ήχου.\n" -"ΑπενεÏγοποιώντας το μποÏεί να Ï€Ïοκλήθει αφÏσικη ταχÏτητα σε παιχνίδια, Ï€.χ. " -"Ï€Î¿Î»Ï Î³ÏήγοÏη.\n" +"ΧÏησιμοποιείται για τον έλεγχο της ταχÏτητας του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î¼Îµ throttle ήχου.\n" +"ΑπενεÏγοποιώντας το μποÏεί να Ï€Ïοκλήθει αφÏσικη ταχÏτητα σε παιχνίδια, Ï€.χ. Ï€Î¿Î»Ï Î³ÏήγοÏη.\n" "Όμως οÏισμένες φοÏές η ενεÏγοποίησή της μποÏεί να Ï€Ïοκαλέσει μόνιμο θόÏυβο.\n" "\n" -"Συντόμευση πληκτÏολογίου : ΚÏατήστε το πατημένο για να απενεÏγοποιηθεί " -"η λειτουÏγία Throttle." +"Συντόμευση πληκτÏολογίου : ΚÏατήστε το πατημένο για να απενεÏγοποιηθεί η λειτουÏγία Throttle." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "This is used to play music tracks, like BGM." @@ -4988,20 +4820,16 @@ msgstr "ΧÏησιμοποιείται για την αναπαÏαγωγή μο #: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 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:283 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 @@ -5026,13 +4854,13 @@ msgstr "Εώς" msgid "Toggle All Log Types" msgstr "Εναλλαγή Όλων ΤÏπων ΚαταγÏαφής " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Εναλλαγή ΠλήÏους Οθόνης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Top" msgstr "ΚοÏυφή" @@ -5040,7 +4868,7 @@ msgstr "ΚοÏυφή" msgid "Traditional Chinese" msgstr "Κινέζικα ΠαÏαδοσιακά " -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "ΠÏοσπάθεια φόÏτωσης ενός άγνωστου Ï„Ïπου αÏχείο." @@ -5048,7 +4876,8 @@ msgstr "ΠÏοσπάθεια φόÏτωσης ενός άγνωστου Ï„Ïπο msgid "Triggers" msgstr "Σκανδάλες" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:92 +#: Source/Core/Common/Src/SysConf.h:115 msgid "Trying to read from invalid SYSCONF" msgstr "ΠÏοσπάθεια ανάγνωσης από ένα μη έγκυÏο SYSCONF" @@ -5076,8 +4905,8 @@ msgstr "ΤÏπος" msgid "UDP Port:" msgstr "ΠόÏτα UDP:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5100,13 +4929,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:404 @@ -5151,8 +4977,8 @@ msgstr "" "Άγνωστος δείκτης %#08x\n" "Συνέχεια;" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "Πάνω" @@ -5169,7 +4995,7 @@ msgstr "Κάθετη Θέση Wiimote" msgid "Use EuRGB60 Mode (PAL60)" msgstr "ΧÏήση ΛειτουÏγίας EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 msgid "Use Fullscreen" msgstr "ΧÏήση ΠλήÏους Οθόνης" @@ -5181,7 +5007,7 @@ msgstr "ΧÏήση Hex" msgid "Use Panic Handlers" msgstr "ΧÏήση Οθονών ΠανικοÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5189,31 +5015,27 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "ΧÏησιμοποίηση πολλαπλών νημάτων για την αποκωδικοποίηση υφών.\n" -"ΜποÏεί να βελτιώσει την ταχÏτητα (ειδικά σε CPUs με πεÏισσότεÏους από δÏο " -"πυÏήνες).\n" +"ΜποÏεί να βελτιώσει την ταχÏτητα (ειδικά σε CPUs με πεÏισσότεÏους από δÏο πυÏήνες).\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 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:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "ΕÏγαλεία" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "Κάθετος ΣυγχÏονισμός" @@ -5237,8 +5059,7 @@ msgstr "Αναλυτικότητα" msgid "Video" msgstr "Βίντεο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "Εικονικό" @@ -5260,27 +5081,26 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Αναμονή για την κάθετη ανανέωση της οθόνης ώστε να μειωθεί το σπάσιμο της " -"εικόνας.\n" +"Αναμονή για την κάθετη ανανέωση της οθόνης ώστε να μειωθεί το σπάσιμο της εικόνας.\n" "Μειώνει τις επιδόσεις αν η ταχÏτητα εξομοίωσης είναι μικÏότεÏη από 100%.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "ΠÏοειδοποίηση" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 msgid "Warning - starting DOL in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση DOL σε λάθος λειτουÏγία κονσόλας!" -#: Source/Core/Core/Src/Boot/Boot.cpp:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση ELF σε λάθος λειτουÏγία κονσόλας!" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση ISO σε λάθος λειτουÏγία κονσόλας!" @@ -5291,8 +5111,7 @@ msgid "" "%s\n" "Do you wish to continue?" msgstr "" -"ΠÏοειδοποίηση! Συστήνεται η δημιουÏγία αντιγÏάφου ασφαλείας όλων των αÏχείων " -"στον φάκελο:\n" +"ΠÏοειδοποίηση! Συστήνεται η δημιουÏγία αντιγÏάφου ασφαλείας όλων των αÏχείων στον φάκελο:\n" "%s\n" "Θέλετε να συνεχίσετε;" @@ -5304,8 +5123,7 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" -"ΠÏοειδοποίηση: Αυτό θα αντικαταστήσει όλα τα υπάÏχοντα σημεία αποθήκευσης " -"που υπάÏχουν στον φάκελο:\n" +"ΠÏοειδοποίηση: Αυτό θα αντικαταστήσει όλα τα υπάÏχοντα σημεία αποθήκευσης που υπάÏχουν στον φάκελο:\n" "%s\n" "και έχουν το ίδιο όνομα με αÏχεία στη memcard\n" "Συνέχεια;" @@ -5319,7 +5137,7 @@ msgstr "WaveFileWriter - το αÏχείο δεν είναι ανοιχτό." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "Hack ΕυÏείας Οθόνης" @@ -5343,7 +5161,7 @@ msgstr "Wii NAND Ρίζα:" msgid "Wii Save Import" msgstr "Εισαγωγή Αποθήκευσης Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 msgid "Wii save files (*.bin)|*.bin" msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -5351,8 +5169,8 @@ msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Αδυναμία ανάγνωσης από αÏχείο" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "Wiimote" @@ -5374,7 +5192,7 @@ msgstr "" "ή πιθανόν να οφείλεται σε χÏόνο αδÏάνειας ή κάποιον άλλο λόγο.\n" "Θέλετε να γίνει άμεση επανασÏνδεση;" -#: Source/Core/DolphinWX/Src/Main.cpp:609 +#: Source/Core/DolphinWX/Src/Main.cpp:599 msgid "Wiimote Connected" msgstr "Συνδεδεμένο Wiimote" @@ -5406,7 +5224,7 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Αναδίπλωση Λέξεων" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 msgid "Working..." @@ -5473,8 +5291,7 @@ msgstr "ΠÏέπει να εισάγετε ένα έγκυÏο όνομα Ï€Ïο #: Source/Core/DolphinWX/Src/ConfigMain.cpp:877 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 "" @@ -5513,7 +5330,7 @@ msgstr "Άγνωστος Zero code: %08x" msgid "[ waiting ]" msgstr "[ σε αναμονή ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5529,26 +5346,21 @@ msgstr "" msgid "[Custom]" msgstr "[ΠÏοσαÏμοζόμενο]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 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:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5591,9 +5403,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:461 msgid "s" @@ -5620,82 +5430,3 @@ msgstr "zNear ΔιόÏθωση: " msgid "| OR" msgstr "| OR" -#~ msgid "Accuracy:" -#~ msgstr "ΑκÏίβεια:" - -#~ msgid "Alternate Wiimote Timing" -#~ msgstr "Εναλλακτικός ΧÏονισμός Wiimote" - -#~ 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 "Enable Cache" -#~ msgstr "ΕνεÏγοποίηση Cache" - -#~ msgid "Fast" -#~ msgstr "ΓÏήγοÏη" - -#~ msgid "Fast Mipmaps" -#~ msgstr "ΓÏήγοÏα Mipmaps" - -#~ msgid "Safe" -#~ msgstr "Ασφαλής" - -#~ msgid "Scaled EFB Copy" -#~ msgstr "ΚλιμακοÏμενα EFB ΑντίγÏαφα" - -#~ 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" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "ΕπιταχÏνει ελαφÏÏŽÏ‚ τα EFB σε RAM αντίγÏαφα θυσιάζοντας την ακÏίβεια της " -#~ "εξομοίωσης.\n" -#~ "ΜεÏικές φοÏές μποÏεί να βελτιώσει την οπτική ποιότητα.\n" -#~ "Αν αντιμετωπίζετε Ï€Ïοβλήματα, δοκιμάστε να αυξήσετε την ακÏίβεια της " -#~ "cache υφών ή απενεÏγοποιήστε αυτήν την επιλογή.\n" -#~ "\n" -#~ "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." - -#~ 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" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "Αποθήκευση των EFB αντιγÏάφων σε GPU αντικείμενα υφών.\n" -#~ "Αυτό δεν είναι τόσο ακÏιβές, αλλά δουλεÏει αÏκετά καλά για τα πεÏισσότεÏα " -#~ "παιχνίδια και Ï€ÏοσφέÏει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n" -#~ "\n" -#~ "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." - -#~ msgid "Texture" -#~ msgstr "Υφή" - -#~ msgid "Texture Cache" -#~ msgstr "Cache Υφών" - -#~ msgid "" -#~ "The safer you adjust this, the less likely the emulator will be missing " -#~ "any texture updates from RAM.\n" -#~ "\n" -#~ "If unsure, use the second-fastest value from the right." -#~ msgstr "" -#~ "Όσο πιο ασφαλής είναι αυτή η ÏÏθμιση, τόσο λιγότεÏο πιθανό ο εξομοιωτής " -#~ "να χάσει ανανεώσεις των υφών από την RAM.\n" -#~ "\n" -#~ "Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την δεÏτεÏη γÏηγοÏότεÏη τιμή από " -#~ "δεξιά." From de5abb3df5f698eb3e71b57274b88f87937c33f4 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sat, 15 Oct 2011 17:01:51 -0500 Subject: [PATCH 189/381] Updated Spanish translation --- Languages/po/es.po | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Languages/po/es.po b/Languages/po/es.po index b2b2a44c3d..dcd0faa8e7 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: 2011-10-11 23:25-0500\n" -"PO-Revision-Date: 2011-08-11 15:30+0100\n" +"PO-Revision-Date: 2011-10-15 23:23+0100\n" "Last-Translator: Petiso Carambanal \n" "Language-Team: DARIO_FF \n" "Language: Spanish\n" @@ -430,7 +430,6 @@ msgid "Accurate VBeam emulation" msgstr "Emulación de VBeam Precisa" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -#, fuzzy msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -442,7 +441,7 @@ msgstr "" "Algunos juegos dependen de esto para algunos efectos gráficos o " "funcionalidad del juego.\n" "\n" -"Si está inseguro, déjelo marcado." +"Si está inseguro, elija EFB a textura." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 msgid "Action" @@ -659,9 +658,8 @@ msgstr "" "Si está inseguro, déjelo sin marcar." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -#, fuzzy msgid "Alternate Wiimote Timing" -msgstr "Wiimote emulado" +msgstr "Sincronización alternativa del Wiimote" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -2703,7 +2701,6 @@ msgid "Greater Than" msgstr "Mayor que" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -#, fuzzy msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2715,8 +2712,8 @@ msgid "" msgstr "" "Aumenta bastante la calidad de las texturas generadas utilizando los efectos " "de renderización para la textura.\n" -"Aumentar la resolución interna va a mejorar el efecto de esta definición.\n" -"Diminuye ligeramente el desempenño y probablemente provoca fallos (aunque es " +"Aumentar la resolución interna va a mejorar el efecto de este ajuste.\n" +"Diminuye ligeramente el desempeño y probablemente provoca fallos (aunque es " "improbable).\n" "\n" "Si está inseguro, déjelo marcado." From b83dfe7c8cf0e2317ff6a5dc482985f9952d5751 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Mon, 17 Oct 2011 16:36:56 -0500 Subject: [PATCH 190/381] Update Arabic and Japanese translations. --- Languages/po/ar.po | 538 ++++++++++++++++++++++++++++++++++++++++++--- Languages/po/ja.po | 68 +++--- 2 files changed, 537 insertions(+), 69 deletions(-) diff --git a/Languages/po/ar.po b/Languages/po/ar.po index 3aab54781e..d83a79c0f7 100644 --- a/Languages/po/ar.po +++ b/Languages/po/ar.po @@ -1,10 +1,15 @@ +# Translation of dolphin-emu.pot to Arabic +# Copyright (C) 2003-2011 +# This file is distributed under the same license as the dolphin-emu package. +# mansoor, 2011 +# msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-10-11 23:25-0500\n" -"PO-Revision-Date: 2011-07-20 13:33+0300\n" -"Last-Translator: \n" +"PO-Revision-Date: 2011-10-16 11:25-0500\n" +"Last-Translator: mansoor\n" "Language-Team: \n" "Language: \n" "MIME-Version: 1.0\n" @@ -52,9 +57,9 @@ msgid "%d Hz" msgstr "%d هرتز" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 -#, fuzzy, c-format +#, c-format msgid "%i connected" -msgstr "غير متصل" +msgstr "%i متصل" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296 @@ -412,7 +417,6 @@ msgid "Accurate VBeam emulation" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -#, fuzzy msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -609,9 +613,8 @@ msgstr "" "إذا لم تكن متأكدا اترك هذا غير محددة." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -#, fuzzy msgid "Alternate Wiimote Timing" -msgstr "محاكاة ويموت" +msgstr "بديل ويموت" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -649,7 +652,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "Arabic" -msgstr "" +msgstr "Arabic" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 #, c-format @@ -694,7 +697,7 @@ msgstr "تلقائي" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" -msgstr "" +msgstr "تلقائي (Multiple of 640x528)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" @@ -901,21 +904,22 @@ msgstr "لا يمكن Ùتح %s" #: Source/Core/DolphinWX/Src/FrameTools.cpp:721 msgid "Cannot record movies in read-only mode." -msgstr "" +msgstr "لا يمكن تسجيل الأÙلام ÙÙŠ وضع للقراءة Ùقط." #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "لا يمكن إلغاء تسجيل الأحداث مع الأحداث المعلقة" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 -#, fuzzy, c-format +#, c-format msgid "" "Cannot use that file as a memory card.\n" "%s\n" "is not a valid gamecube memory card file" msgstr "" "لا يمكن استخدام هذا المل٠كبطاقة الذاكرة.\n" -"هل تحاول استخدام Ù†Ùس المل٠ÙÙŠ كل من Ùتحات?" +"%s\n" +"ليست ذاكرة جيم كيوب مل٠بطاقة صالحة" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 msgid "" @@ -928,7 +932,7 @@ msgstr "" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" -msgstr "" +msgstr "غير قادر العثور على ويموت: %02x:%02x:%02x:%02x:%02x:%02x" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1872 #, c-format @@ -948,7 +952,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Catalan" -msgstr "" +msgstr "Catalan" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 msgid "Center" @@ -1323,7 +1327,7 @@ msgstr "المنشئ :" #: Source/Core/Common/Src/MsgHandler.cpp:68 msgid "Critical" -msgstr "" +msgstr "حرج" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" @@ -2287,6 +2291,9 @@ msgid "" "(0xA000-)\n" "Memcard may be truncated" msgstr "" +"Ùشل ÙÙŠ قراءة بيانات الحÙظ\n" +"(0xA000-)\n" +"قد يتم اقتطاع بطاقة ذاكرة" #: Source/Core/DiscIO/Src/VolumeGC.cpp:61 msgid "Failed to read unique ID from disc image" @@ -2430,6 +2437,9 @@ msgid "" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " "setting when playing Japanese games." msgstr "" +"وضع لاستخدام الخط الياباني ÙÙŠ اللعاب .\n" +"ترك دون ,المحاكي يكون اÙتراضي على النظام الانجليزي ويتيح هذا الاعداد تلقائيا " +"عند اللعب اليابانية ." #: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" @@ -2598,7 +2608,6 @@ msgid "Greater Than" msgstr "أكبر من" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -#, fuzzy msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2608,8 +2617,9 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"يزيد بشكل كبير جودة تجعل القوام تم إنشاؤها باستخدام إلى الملمس الآثار.\n" +"زيد بشكل كبير جودة تجعل القوام تم إنشاؤها باستخدام إلى الملمس الآثار.\n" "سيتم زيادة الدقة الداخلي بتحسين أثر هذا الإعداد.\n" +"انخÙاض Ø·Ùي٠الأداء وربما يسبب مشاكل.\n" "\n" "إذا لم تكن متأكدا، اترك هذا التحقق." @@ -2666,6 +2676,13 @@ msgid "" "\n" "Sayonara!\n" msgstr "" +"مرحبا,\n" +"\n" +"المحاكي يتطلب وحدة المعالجة المركزية احدث .\n" +"للأس٠وحدة المعالجة المركزية الخاصة بك لا يعتمد عليها، لذلك لن يتم تشغيل " +"المحاكي.\n" +"\n" +"الوداع!\n" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 msgid "Hide" @@ -3058,6 +3075,8 @@ msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." msgstr "" +"انقر الأيسر لاكتشا٠مÙاتيح الاختصار.\n" +"أدخل لمسح المساحة." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 msgid "" @@ -3259,10 +3278,16 @@ msgid "" "%s\n" "Would you like to copy the old file to this new location?\n" msgstr "" +"بطاقة الذاكرة ÙÙŠ Ùتحة مل٠%c غير صحيح\n" +"Region not specified\n" +"\n" +"Slot %c تم تغيير المسار إلى\n" +"%s\n" +"هل ترغب ÙÙŠ نسخ المل٠القديم إلى هذا الموقع الجديد?\n" #: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" -msgstr "" +msgstr "حجم بطاقة الذاكرة لا تتطابق مع حجم المل٠" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:47 msgid "Menu" @@ -3882,7 +3907,6 @@ msgid "Real Wiimote" msgstr "ويموت حقيقي " #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 -#, fuzzy msgid "Real Wiimotes" msgstr "ويموت حقيقي " @@ -3998,7 +4022,7 @@ msgstr "هزاز" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Run DSP LLE on a dedicated thread (not recommended)." -msgstr "" +msgstr "Run DSP LLE on a dedicated thread (غير مستحسن)." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Russian" @@ -4086,7 +4110,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" -msgstr "" +msgstr "EFB Copia a escala" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format @@ -4445,7 +4469,7 @@ msgstr "ويموت جانبي" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 msgid "Simplified Chinese" -msgstr "" +msgstr "Simplified Chinese" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 msgid "Size" @@ -4704,14 +4728,12 @@ msgid "Test" msgstr "اختبار" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 -#, fuzzy msgid "Texture" -msgstr "Texturesتعطيل " +msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 -#, fuzzy msgid "Texture Cache" -msgstr "إزالة التخزين المؤقت" +msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" @@ -4741,6 +4763,8 @@ msgid "" "The file %s already exists.\n" "Do you wish to replace it?" msgstr "" +"The file %s already exists.\n" +"هل ترغب ÙÙŠ استبدالها?" #: Source/Core/AudioCommon/Src/WaveFile.cpp:51 #, c-format @@ -4844,7 +4868,7 @@ msgstr "تجاوز هذه الإعدادات إعدادات دولÙين الأ msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." -msgstr "" +msgstr "هذه المحاكاة إعادة العمل لا تدعم تعديل الرموز التي اعادتها العمل Ù†Ùسه." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 msgid "This could cause slow down in Wii Menu and some games." @@ -4877,6 +4901,11 @@ msgid "" "\n" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" +"يستخدم هذا للسيطرة على سرعة اللعبة خنق الصوت.\n" +"يؤدي تعطيل هذا غير عادية يمكن أن يسبب سرعة اللعبة ØŒ مثل سريع جدا.\n" +"لكن ÙÙŠ بعض الأحيان يمكن أن يسبب تمكين هذا الضجيج المستمر.\n" +"\n" +"اختصار : اضغط باستمرار على الÙور لتعطيل الخنق ÙÙŠ لوحة المÙاتيح." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "This is used to play music tracks, like BGM." @@ -4929,7 +4958,7 @@ msgstr "أعلى" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Traditional Chinese" -msgstr "" +msgstr "Traditional Chinese" #: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." @@ -4983,6 +5012,8 @@ msgid "" "Unable to create patch from given values.\n" "Entry not modified." msgstr "" +"غير قادر على إنشاء التصحيح من قيم المعينة.\n" +"الدخول غير معدل." #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:123 #, c-format @@ -4991,6 +5022,9 @@ msgid "" "decrypted code. Make sure you typed it correctly.\n" "Would you like to ignore this line and continue parsing?" msgstr "" +"Unable to parse line %lu of the entered AR code as a valid encrypted or " +"decrypted code. Make sure you typed it correctly.\n" +"هل ترغب ÙÙŠ تجاهل هذا الخط ØŒ ومواصلة تحليل?" #: Source/Core/DolphinWX/Src/FrameTools.cpp:404 #, c-format @@ -5183,6 +5217,10 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" +"تحذير : هذا سو٠يحÙظ أي الكتابة Ùوق التي هي موجودة ÙÙŠ مجلد:\n" +"%s\n" +"ولها Ù†Ùس اسم المل٠على بطاقة ذاكرة الخاصة بك\n" +"تستمر?" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -5231,9 +5269,9 @@ msgid "Wiimote" msgstr "تحكم الوي" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 -#, fuzzy, c-format +#, c-format msgid "Wiimote %i" -msgstr "ويموت" +msgstr "ويموت %i" #: Source/Core/DolphinWX/Src/Frame.cpp:162 #, c-format @@ -5261,7 +5299,6 @@ msgid "Wiimote settings" msgstr "إعدادات ويموت" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 -#, fuzzy msgid "Wiimotes" msgstr "تحكم الوي" @@ -5361,6 +5398,9 @@ msgid "" "It should be 0x%04x (but is 0x%04llx)\n" "Do you want to generate a new one?" msgstr "" +"Your SYSCONF file is the wrong size.\n" +"يجب أن يكون 0x%04x (but is 0x%04llx)\n" +"هل تريد إنشاء واحدة جديدة?" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "ZTP hack" @@ -5484,18 +5524,62 @@ msgstr "" msgid "| OR" msgstr "أو" +#, fuzzy +#~ msgid "%d %%" +#~ msgstr "%d هرتز" + +#, fuzzy +#~ msgid "&Frame Stepping" +#~ msgstr "تخطي الإطار " + #~ msgid "(Default)" #~ msgstr "(اÙتراضي)" +#~ msgid "32,000 Hz" +#~ msgstr "32,000 Hz" + +#~ msgid "32-bit platforms do not support fastmem yet. Report this bug." +#~ msgstr "" +#~ "La plataformas de 32-bit no soportan fastmem todavía. Reportar este bug." + #~ msgid "3D Vision (Requires Fullscreen)" #~ msgstr "رؤية ثلاثي الابعاد يتطلب ملء الشاشة" +#~ msgid "48,000 Hz" +#~ msgstr "48,000 Hz" + #~ msgid "< as Default Profile >" #~ msgstr "< الوضع الاÙتراضي >" +#, fuzzy +#~ msgid "AOSound" +#~ msgstr "&الصوت" + #~ msgid "Accurate Texture Cache" #~ msgstr "دقة المظهر السطحي المؤقت" +#, fuzzy +#~ msgid "Adjust window size" +#~ msgstr "ضبط حجم الناÙذة تلقائي " + +#~ msgid "" +#~ "Allows the CPU to read or write to the EFB (render buffer).\n" +#~ "This is needed for certain gameplay functionality (e.g. star pointer in " +#~ "Super Mario Galaxy) as well as for certain visual effects (e.g. Monster " +#~ "Hunter Tri),\n" +#~ "but enabling this option can also have a huge negative impact on " +#~ "performance if the game uses this functionality heavily." +#~ msgstr "" +#~ "Permite a la CPU leer o escribir al EFB (búfer de renderizado)\n" +#~ "Esto es necesario para ciertas funciones de jugabilidad (p. ej., el " +#~ "cursor en forma de estrella en Super Mario Galaxy), y también para " +#~ "ciertos efectos visuales (p. ej., Monster Hunter Tri),\n" +#~ "pero habilitar esta opción puede tener un impacto muy negativo en el " +#~ "rendimiento si el juego usa esta funcionalidad en gran medida." + +#~ msgid "Alternate RFI" +#~ msgstr "RFI Alternativo" + #~ msgid "Auto [recommended]" #~ msgstr "الموصى بها تلقائي" @@ -5508,12 +5592,47 @@ msgstr "أو" #~ "the EFB scale.\n" #~ "ومن الأÙضل Ù„ تعيين نسبة العرض إلى الارتÙاع لتمتد عند استخدامه." +#~ msgid "Bad gameini filename" +#~ msgstr "Nombre de archivo gameini incorrecto" + +#~ msgid "Bleach Versus Crusade" +#~ msgstr "Bleach Versus Crusade" + +#~ msgid "" +#~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " +#~ "vertex.\n" +#~ "This is the more accurate behavior but reduces performance." +#~ msgstr "" +#~ "Calcula la iluminación de los gráficos 3D en una base por cada píxel, en " +#~ "vez de por cada vértice.\n" +#~ "Es el resultado más preciso, pero reduce el rendimiento." + +#~ msgid "Can't find plugin %s" +#~ msgstr "No se puede encontrar el plugin %s" + +#~ msgid "Can't init DSP Plugin" +#~ msgstr "No se puede iniciar el Plugin DSP" + +#~ msgid "Can't init Video Plugin" +#~ msgstr "No se puede iniciar el Plugin de Vídeo" + +#~ msgid "Can't open %s, it has a missing function" +#~ msgstr "No se puede abrir %s, no tiene una función" + +#, fuzzy +#~ msgid "Config..." +#~ msgstr "إعدادات" + #~ msgid "Configuration profile" #~ msgstr "التكوين الشخصي" #~ msgid "Configuration profile:" #~ msgstr "التكوين الشخصي:" +#, fuzzy +#~ msgid "Connected" +#~ msgstr "اتصال" + #~ msgid "Connected to %i Wiimotes" #~ msgstr "ويموت متصل %i" @@ -5523,6 +5642,17 @@ msgstr "أو" #~ msgid "Could not copy %s to %s" #~ msgstr "لا يمكن نسخ %s to %s" +#, fuzzy +#~ msgid "Could not get info about plugin %s" +#~ msgstr "لا يمكن إنشاء %s" + +#~ msgid "DList Cache" +#~ msgstr "Caché DList" + +#, fuzzy +#~ msgid "DSound" +#~ msgstr "&الصوت" + #~ msgid "Danish" #~ msgstr "Danish" @@ -5536,6 +5666,38 @@ msgstr "أو" #~ "تعطيل التركيب.\n" #~ "وهذا Ù…Ùيد Ùقط لأغراض التصحيح." +#~ msgid "" +#~ "Disables an alpha-setting pass.\n" +#~ "Breaks certain effects but might help performance." +#~ msgstr "" +#~ "Deshabilita el pase de la configuración de Alpha.\n" +#~ "Quiebra ciertos efectos, pero puede ayudar al rendimiento." + +#~ msgid "Distance Alpha Pass" +#~ msgstr "Pase de Alpha de distancia" + +#~ msgid "Dolphin DSP-HLE Plugin" +#~ msgstr "Plugin DSP-HLE de Dolphin" + +#~ msgid "Dolphin DSP-HLE Plugin Settings" +#~ msgstr "Configuración de Plugin Dolphin DSP-HLE" + +#~ msgid "Dolphin DSP-LLE Plugin" +#~ msgstr "Plugin DSP-LLE de Dolphin" + +#~ msgid "Dolphin DSP-LLE Plugin Settings" +#~ msgstr "Configuración de Plugin Dolphin DSP-LLE" + +#~ msgid "Dolphin Direct3D11" +#~ msgstr "Dolphin Direct3D11" + +#~ msgid "Dolphin Direct3D9" +#~ msgstr "Dolphin Direct3D9" + +#, fuzzy +#~ msgid "Dolphin OpenGL" +#~ msgstr "دولÙين" + #~ msgid "" #~ "Dolphin has not been configured with an install location,\n" #~ "Keep Dolphin portable?" @@ -5543,18 +5705,118 @@ msgstr "أو" #~ "لم يتم تكوينها مع دولÙين للمكان تثبيت,\n" #~ "دولÙين للإبقاء المحمولة?" +#~ msgid "EFB" +#~ msgstr "EFB" + +#~ msgid "" +#~ "Emulate frame buffer copies directly to textures.\n" +#~ "This is not so accurate, but it's good enough for the way many games use " +#~ "framebuffer copies." +#~ msgstr "" +#~ "Emula las copias del framebúfer directamente a las texturas.\n" +#~ "Esto no es muy preciso, pero es suficiente para la forma en que varios " +#~ "juegos usan copias del framebúfer." + #~ msgid "Emulator Display Settings" #~ msgstr "إعدادات العرض " #~ msgid "Enable CPU Access" #~ msgstr "CPU Access تمكين" +#~ msgid "Enable Copy to EFB" +#~ msgstr "Habilitar Copiado al EFB" + +#, fuzzy +#~ msgid "Enable EFB To Texture" +#~ msgstr "Texturesتعطيل " + +#, fuzzy +#~ msgid "Enable HLE Audio" +#~ msgstr "Enable Audio Throttle" + +#, fuzzy +#~ msgid "Enable JIT Dynarec" +#~ msgstr "تمكين صÙحات" + #~ msgid "Enable OpenCL" #~ msgstr "OpenCL تمكين " #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "تمكين شاشة التوقÙ" +#, fuzzy +#~ msgid "" +#~ "Enables dynamic recompilation of DSP code.\n" +#~ "Changing this will have no effect while the emulator is running!" +#~ msgstr "تغيير هذه ليس لها أي أثر ÙÙŠ حين أن المحاكي قيد التشغيل!" + +#~ msgid "" +#~ "Enables emulation of Embedded Frame Buffer copies, if the game uses " +#~ "them.\n" +#~ "Games often need this for post-processing or other things, but if you can " +#~ "live without it, you can sometimes get a big speedup." +#~ msgstr "" +#~ "Habilitar emulación de copias EFB, si el juego las usa.\n" +#~ "Los juegos comunmente necesita esto para el post-procesado u otras cosas, " +#~ "pero si puedes lidiar sin el, puedes tener a veces una gran mejora de " +#~ "rendimiento." + +#~ msgid "" +#~ "Enables reinterpreting the data inside the EFB when the pixel format " +#~ "changes.\n" +#~ "Some games depend on this function for certain effects, so enable it if " +#~ "you're having glitches.\n" +#~ "Depending on how the game uses this function, the speed hits caused by " +#~ "this option range from none to critical." +#~ msgstr "" +#~ "Habilita la reinterpretación de los datos dentro del EFB cuando el " +#~ "formato de píxeles cambia.\n" +#~ "Algunos juegos dependen de esta función para ciertos efectos, así que " +#~ "habilitalo si tienes errores gráficos.\n" +#~ "Dependiendo de cómo el juego use esta función, la influencia en el " +#~ "rendimiento por esta opción varían desde nada, hasta crítico." + +#~ msgid "Error allocating buffer" +#~ msgstr "Error al asignar el búfer" + +#~ msgid "Error loading %s: can't read info" +#~ msgstr "Error al cargar %s: no se puede leer la información" + +#~ msgid "" +#~ "Error loading plugin %s: can't find file. Please re-select your plugins." +#~ msgstr "" +#~ "Error al cargar el plugin %s: no se puede encontrar el archivo. Por " +#~ "favor, reseleccione sus plugins." + +#~ msgid "Error opening file %s for recording" +#~ msgstr "Error al abrir el archivo %s para grabación." + +#~ msgid "" +#~ "Failed to load DSP ROM:\n" +#~ "%s\n" +#~ "This file is required to use DSP LLE" +#~ msgstr "" +#~ "Fallo al cargar DSP ROM:\n" +#~ "%s\n" +#~ "Este fichero es necesario para usar DSP LLE" + +#, fuzzy +#~ msgid "Failed to load DSP ROM: %s" +#~ msgstr "اللعبه لاتوجد ÙÙŠ قاعده البيانات." + +#~ msgid "" +#~ "Faster variants look at fewer pixels and thus have more potential for " +#~ "errors.\n" +#~ "Slower variants look at more pixels and thus are safer." +#~ msgstr "" +#~ "Las variantes rápidas buscan en menos pixeles, y por lo tanto tienen más " +#~ "posibilidad de errores.\n" +#~ "Las variantes lentas buscan por más pixeles, y por lo tanto son más " +#~ "seguras." + +#~ msgid "Force Bi/Trilinear Filtering" +#~ msgstr "Forzar Filtro Bi/Tri-linear" + #~ msgid "Fractional" #~ msgstr "جزئي" @@ -5570,6 +5832,10 @@ msgstr "أو" #~ msgid "GFX Config" #~ msgstr "اعداد الصوره" +#, fuzzy +#~ msgid "Graphics Plugin" +#~ msgstr "الرسومات" + #~ msgid "Hide Shader Errors" #~ msgstr "إخÙاء أخطاء شادر " @@ -5578,6 +5844,13 @@ msgstr "أو" #~ "window has focus." #~ msgstr "إخÙاء المؤشر عندما يكون أكثر من ناÙذة وتقديم إطار جعل لديه التركيز." +#~ msgid "" +#~ "If a game hangs, works only in the Interpreter or Dolphin crashes, this " +#~ "option may fix the game." +#~ 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 "Input Source" #~ msgstr "مدخلات المصدر" @@ -5590,12 +5863,78 @@ msgstr "أو" #~ msgid "Integral [recommended]" #~ msgstr "الموصى بها . متكاملة" +#, fuzzy +#~ msgid "" +#~ "Internal LZO Error - decompression failed (%d) (%ld, %ld) \n" +#~ "Try verifying the state again" +#~ msgstr "" +#~ "Internal LZO Error - decompression failed (%d) (%li, %li) \n" +#~ "حاول تحميل الحالة مرة أخرى" + +#~ msgid "" +#~ "Keeps track of textures based on looking at the actual pixels in the " +#~ "texture.\n" +#~ "Can cause slowdown, but some games need this option enabled to work " +#~ "properly." +#~ msgstr "" +#~ "Mantiene un control en las texturas basado en mirar los pixeles actuales " +#~ "en estas.\n" +#~ "Puede provocar peor rendimiento, pero algunos juegos necesitan esta " +#~ "opción para funcionar adecuadamente." + +#, fuzzy +#~ msgid "Load Script..." +#~ msgstr "تحميل حالة" + +#~ msgid "" +#~ "Loads native mipmaps instead of generating them.\n" +#~ "Loading native mipmaps is the more accurate behavior, but might also " +#~ "decrease performance (your mileage might vary though)." +#~ msgstr "" +#~ "Cargar mipmaps nativos en vez de generarlos.\n" +#~ "Cargar los mipmaps nativos es la emulación mas precisa, pero puede " +#~ "empeorar el rendimiento(los resultados pueden variar)." + +#, fuzzy +#~ msgid "Lua Script Console" +#~ msgstr "الكتابة إلى وحدة التحكم" + +#~ msgid "Metroid Other M" +#~ msgstr "Metroid Other M" + +#~ msgid "Mixer: Unsupported sample rate." +#~ msgstr "Mezclador: Frecuencia de sonido no soportada." + +#, fuzzy +#~ msgid "" +#~ "Modify textures to show the format they're using.\n" +#~ "This is only useful for debugging purposes." +#~ msgstr "" +#~ "تعطيل التركيب.\n" +#~ "وهذا Ù…Ùيد Ùقط لأغراض التصحيح." + +#, fuzzy +#~ msgid "New &Lua Console" +#~ msgstr "اظهار &لوحة المراقبة" + #~ msgid "Normal" #~ msgstr "عادي" #~ msgid "OK" #~ msgstr "مواÙÙ‚" +#, fuzzy +#~ msgid "OpenAL" +#~ msgstr "Ùتح" + +#, fuzzy +#~ msgid "OpenGL" +#~ msgstr "Ùتح" + +#, fuzzy +#~ msgid "Plugins" +#~ msgstr "Polish" + #~ msgid "" #~ "Portable Setting could not be saved\n" #~ " Are you running Dolphin from read only media or from a directory that " @@ -5620,6 +5959,13 @@ msgstr "أو" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "اللازمة لاستعمال الخط القرص اليابانية." +#, fuzzy +#~ msgid "Run" +#~ msgstr "Enter" + +#~ msgid "Running script...\n" +#~ msgstr "Ejecutando script...\n" + #~ msgid "Scale:" #~ msgstr "النطاق :" @@ -5628,7 +5974,22 @@ msgstr "أو" #~ msgid "" #~ "Select the System Menu wad extracted from the update partition of a disc" -#~ msgstr "قائمة النظام المستخرجة من قسم من قرص التحديث wad حدد" +#~ msgstr "" +#~ "Selecciona el Menú de sistema wad extraído de la partición de " +#~ "actualización de un disco" + +#, fuzzy +#~ msgid "Select the script to load" +#~ msgstr "حدد حالة التحميل" + +#~ msgid "" +#~ "Selects which game should be affected by the configuration changes done " +#~ "in this dialog.\n" +#~ "The (Default) profile affects the standard settings used for every game." +#~ msgstr "" +#~ "Seleccionar qué juego debería verse afectado por los cambios de estas " +#~ "configuraciones.\n" +#~ "El perfil predeterminado afecta a la configuración estándar de cada juego." #~ msgid "Set All to Default" #~ msgstr "كل مجموعة لاÙتراضي" @@ -5640,6 +6001,18 @@ msgstr "أو" #~ "تثبيت موقع لمجموعة:\n" #~ " %s ?" +#, fuzzy +#~ msgid "" +#~ "Show projection statistics.\n" +#~ "This is only useful for debugging purposes." +#~ msgstr "" +#~ "عرض إحصاءات مختلÙØ©.\n" +#~ "وهذا Ù…Ùيد Ùقط لأغراض التصحيح." + +#, fuzzy +#~ msgid "Show save banner" +#~ msgstr "إظهار أيقونة الحÙظ " + #~ msgid "Show the number of frames rendered per second." #~ msgstr "إظهار عدد الإطارات المقدمة ÙÙŠ الثانية الواحدة" @@ -5650,15 +6023,84 @@ msgstr "أو" #~ "عرض إحصاءات مختلÙØ©.\n" #~ "وهذا Ù…Ùيد Ùقط لأغراض التصحيح." +#~ msgid "Skies of Arcadia" +#~ msgstr "Skies of Arcadia" + +#, fuzzy +#~ msgid "Slot" +#~ msgstr "A خانة " + +#~ msgid "Sonic and the Black Knight" +#~ msgstr "Sonic and the Black Knight" + +#~ msgid "" +#~ "Specifies the resolution used to render at. A high resolution will " +#~ "improve visual quality but is also quite heavy on performance and might " +#~ "cause glitches in certain games.\n" +#~ "Fractional: Uses your display resolution directly instead of the native " +#~ "resolution. The quality scales with your display/window size, as does the " +#~ "performance impact.\n" +#~ "Integral: This is like Fractional, but rounds up to an integer multiple " +#~ "of the native resolution. Should give a more accurate look but is usually " +#~ "slower.\n" +#~ "The other options are fixed resolutions for choosing a visual quality " +#~ "independent of your display size." +#~ msgstr "" +#~ "Especifica la resolución a la que se renderizará. Una alta resolución " +#~ "puede mejorar la calidad visual, pero puede empeorar el rendimiento " +#~ "gravemente, y puede causar errores en ciertos juegos.\n" +#~ "Fraccional: Utiliza la resolución del Display directamente en vez de la " +#~ "resolución nativa. La calidad es escalada con tu tamaño de la ventana/" +#~ "display, tal como el impacto al rendimiento.\n" +#~ "Integral: Es como Fraccional, pero es redondeada a entero múltiplo de la " +#~ "resolución nativa. Debería dar una vista mas precisa, pero es mas lento " +#~ "normalmente.\n" +#~ "Las otras opciones son resoluciones fijas para elegir una calidad visual " +#~ "independiente del tamaño del Display." + +#, fuzzy +#~ msgid "Specify an audio plugin" +#~ msgstr "حدد الخلÙية مل٠Ùيديو" + #~ msgid "Start Renderer in Fullscreen" #~ msgstr "بدء ÙÙŠ كمال ملء الشاشة" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "بدء التقديم ÙÙŠ إطار وضع ملء الشاشة." +#~ msgid "The file " +#~ msgstr "El archivo " + +#~ msgid "This is usually used to play voice and sound effects." +#~ msgstr "Esto es usado comunmente para reproducir voces y efectos de sonido." + +#, fuzzy +#~ msgid "Trying to load unsupported type %d" +#~ msgstr "حاول تحميل نوع مل٠غير معروÙ." + +#~ msgid "Type %d config not supported in plugin %s" +#~ msgstr "Configuración de tipo %d no soportado en el plugin %s" + #~ msgid "Use FPS For Limiting" #~ msgstr "لحد عدد الاطارات" +#~ msgid "Use XFB" +#~ msgstr "Usar XFB" + +#~ msgid "Uses multiple threads to decode the textures in the game." +#~ msgstr "Usar múltiples hilos para descodifcar texturas en los juegos" + +#~ msgid "" +#~ "Uses the high-resolution render buffer for EFB copies instead of scaling " +#~ "them down to native resolution.\n" +#~ "Vastly improves visual quality in games which use EFB copies but might " +#~ "cause glitches in some games." +#~ msgstr "" +#~ "Usa un búfer de alta resolución para las copias de EFB en vez de " +#~ "reducirlas a la resolución nativa.\n" +#~ "Mejora en gran manera la calidad visual en juegos que usan copias de EFB, " +#~ "pero puede causar errores gráficos en algunos juegos." + #~ msgid "Video Backend:" #~ msgstr "خلÙية الÙيديو :" @@ -5669,6 +6111,32 @@ msgstr "أو" #~ "انتظر الÙراغات الرأسية.\n" #~ "ولكن قد يقلل من تمزق أيضا انخÙاض الأداء" +#~ msgid "" +#~ "When using EFB to RAM we very often need to decode RAM data to a VRAM " +#~ "texture, which is a very time-consuming task.\n" +#~ "With this option enabled, we'll skip decoding a texture if it didn't " +#~ "change.\n" +#~ "This results in a nice speedup, but possibly causes glitches.\n" +#~ "If you have any problems with this option enabled you should either try " +#~ "increasing the safety of the texture cache or disable this option.\n" +#~ "(NOTE: The safer the texture cache is adjusted the lower the speedup will " +#~ "be; accurate texture cache set to \"safe\" might actually be slower!)" +#~ msgstr "" +#~ "Cuando se usa EFB a RAM comunmente necesitamos decodificar los datos de " +#~ "la RAM a una textura VRAM, lo que es una tarea larga.\n" +#~ "Con esta opción habilitada, se salteará decodificarla si no ha cambiado.\n" +#~ "Esto resulta en una buena mejora de rendimiento, pero probablemente cause " +#~ "errores.\n" +#~ "Si tienes cualquier problema con esta opción habilitada, deberías probar " +#~ "incrementar la seguridad del Caché de textura, o deshabilitar esta " +#~ "opción.\n" +#~ "(NOTA: Mientras mas seguro el caché, menor será la mejora de rendimiento; " +#~ "el caché de textura preciso em \"seguro\" puede ser mas lento!)" + +#, fuzzy +#~ msgid "Wiimote %i %s" +#~ msgstr "ويموت %i" + #~ msgid "Wiimote Settings" #~ msgstr "إعدادات ويموت" @@ -5683,3 +6151,9 @@ msgstr "أو" #~ msgid "Window width for windowed mode" #~ msgstr "ناÙذة عرض لوضع إطارات" + +#~ msgid "XFB" +#~ msgstr "XFB" + +#~ msgid "Zelda Twilight Princess Bloom hack" +#~ msgstr "Hack de bloom Zelda Twilight Princess" diff --git a/Languages/po/ja.po b/Languages/po/ja.po index 31f1cf1b66..9087eb6011 100644 --- a/Languages/po/ja.po +++ b/Languages/po/ja.po @@ -1,14 +1,14 @@ # Translation of dolphin-emu.pot to Japanese # Copyright (C) 2003-2011 # This file is distributed under the same license as the dolphin-emu package. -# DanbSky, 2011 +# Danbsky, 2011. # msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-10-11 23:25-0500\n" -"PO-Revision-Date: 2011-08-19 08:37-0500\n" +"PO-Revision-Date: 2011-10-12 20:45+0900\n" "Last-Translator: DanbSky\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 @@ -65,7 +65,7 @@ msgstr "接続数 %i 個" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296 #, c-format msgid "%s already exists, overwrite?" -msgstr " %s ã¯ã™ã§ã«å­˜åœ¨ã—ã¾ã™ã€‚上書ãã—ã¾ã™ã‹ï¼Ÿ" +msgstr "%s ã¯ã™ã§ã«å­˜åœ¨ã—ã¾ã™ã€‚上書ãã—ã¾ã™ã‹ï¼Ÿ" #: Source/Core/DiscIO/Src/CompressedBlob.cpp:167 #, c-format @@ -96,7 +96,7 @@ 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" +"%s をメモリーカードファイルã¨ã—ã¦èª­ã¿è¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸ\n" "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚µã‚¤ã‚ºã¯å°ã•ã™ãŽã¾ã™ã€‚æ­£ã—ã„ファイルã§ã¯ã‚ã‚Šã¾ã›ã‚“ (0x%x ãƒã‚¤" "ト)" @@ -225,7 +225,7 @@ msgstr "ステートロード(&L)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:203 msgid "&Memcard Manager (GC)" -msgstr "メモリーカード編集ツール(&M)" +msgstr "GCメモリーカードマãƒãƒ¼ã‚¸ãƒ£(&M)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Memory" @@ -425,7 +425,6 @@ msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulation" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -#, fuzzy msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -436,7 +435,7 @@ msgstr "" "より正確ãªEFBコピーエミュレーションを行ã„ã¾ã™ã€‚\n" "ã„ãã¤ã‹ã®ã‚²ãƒ¼ãƒ ã®ç”»é¢åŠ¹æžœã‚„ゲームプレイ性ã¯ã“ã®æ©Ÿèƒ½ã«ä¾ã£ã¦ã„ã¾ã™ã€‚\n" "\n" -"よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’外ã•ãªã„ã§ãã ã•ã„。" +"よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€Texture】をé¸æŠžã—ãŸã¾ã¾ã«ã—ã¦ãã ã•ã„。" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 msgid "Action" @@ -560,7 +559,6 @@ msgid "Address :" msgstr "接続先：" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:57 -#, fuzzy msgid "" "Adds the specified value to zFar Parameter.\n" "Two ways to express the floating point values.\n" @@ -578,7 +576,6 @@ msgstr "" "補足：å–得値ã¯ãƒ­ã‚°ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ï¼ã‚³ãƒ³ã‚½ãƒ¼ãƒ«ã§ç¢ºèªã—ã¾ã™" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:52 -#, fuzzy msgid "" "Adds the specified value to zNear Parameter.\n" "Two ways to express the floating point values.\n" @@ -649,9 +646,8 @@ msgstr "" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -#, fuzzy msgid "Alternate Wiimote Timing" -msgstr "Wii リモコンをエミュレート" +msgstr "Wii リモコンã®åŒæœŸèª¿æ•´" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -1397,11 +1393,11 @@ msgstr "カレントフォルダ㯠wxFileSelector ã®å¾Œã« %s ã‹ã‚‰ %s ã«å¤‰ #: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "Custom Projection Hack" -msgstr "タイトル別投影補正" +msgstr "Custom Projection Hack" #: Source/Core/DolphinWX/Src/PHackSettings.h:30 msgid "Custom Projection Hack Settings" -msgstr "タイトル別投影補正設定" +msgstr "Custom Projection Hack Settings" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Customize some Orthographic Projection parameters." @@ -1761,8 +1757,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"User/Dump/Frames/\n" -"フォルダã«ãƒ¬ãƒ³ãƒ€ãƒªãƒ³ã‚°ã—ãŸãƒ•ãƒ¬ãƒ¼ãƒ å…¨ã¦ã‚’ダンプã—ã€AVIã¨ã—ã¦ä¿å­˜ã—ã¾ã™ã€‚\n" +"User/Dump/Frames/ フォルダã«ãƒ¬ãƒ³ãƒ€ãƒªãƒ³ã‚°ã—ãŸãƒ•ãƒ¬ãƒ¼ãƒ å…¨ã¦ã‚’ダンプã—ã€AVIã¨ã—ã¦" +"ä¿å­˜ã—ã¾ã™ã€‚\n" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" @@ -1782,8 +1778,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"User/Dump/Textures/\n" -"フォルダã«EFBコピーã®å†…容をダンプã—ã¾ã™ã€‚\n" +"User/Dump/Textures/ フォルダã«EFBコピーã®å†…容をダンプã—ã¾ã™ã€‚\n" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" @@ -1910,11 +1905,11 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ステレオスコピック3D(立体視)表示を有効ã«ã—ã¾ã™ã€‚\n" -"※GPUãŒNvidia 3D Visionをサãƒãƒ¼ãƒˆã—ã¦ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚\n" +"ステレオスコピック3D(立体視)表示を有効ã«ã—ã¾ã™ã€‚使用ã™ã‚‹ã«ã¯ GPUã«ã‚ˆã‚‹Nvidia " +"3D Visionã®ã‚µãƒãƒ¼ãƒˆãŒå¿…è¦ã§ã™ã€‚\n" "ã»ã¨ã‚“ã©ã®å ´åˆä½•ã‹ã—らã®å•é¡ŒãŒç™ºç”Ÿã™ã‚‹ã§ã—ょã†ã€‚\n" -"\n" "ã“ã®æ©Ÿèƒ½ã¯ãƒ•ãƒ«ã‚¹ã‚¯ãƒªãƒ¼ãƒ³è¡¨ç¤ºæ™‚ã®ã¿å‹•ä½œã—ã¾ã™ã€‚\n" +"\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 @@ -2050,12 +2045,12 @@ msgid "" "Fast)" msgstr "" "Block Address Translation (BAT)：メモリ管ç†æ©Ÿæ§‹ã®æ©Ÿèƒ½ã®ä¸€ã¤ã§ã€æœ‰åŠ¹ã«ã™ã‚‹ã¨" -"ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ç²¾åº¦ãŒå‘上ã—ã¾ã™\n" -"[有効ï¼äº’æ›æ€§é‡è¦–,ï¼ç„¡åŠ¹ï¼å‹•ä½œé€Ÿåº¦å‘上]" +"ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ç²¾åº¦ãŒå‘上ã—ã¾ã™[有効ï¼äº’æ›æ€§é‡è¦–,ï¼ç„¡åŠ¹ï¼å‹•ä½œ" +"速度å‘上]" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 msgid "Enables Custom Projection Hack" -msgstr "タイトル別ã®æŠ•å½±è£œæ­£ã‚’有効ã«ã—ã¾ã™" +msgstr "Enables Custom Projection Hack" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" @@ -2235,7 +2230,7 @@ msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’抽出" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 msgid "Extract Partition..." -msgstr "ã“ã®ãƒ‘ーティションを抽出" +msgstr "ã“ã® Partition を抽出" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 #, c-format @@ -2306,7 +2301,7 @@ msgstr "" "DSPSpyを使用ã—ã¦ã‚ãªãŸã®GC/Wii 実機よりダンプを行ã£ã¦ä¸‹ã•ã„\n" "\n" "ダンプãŒé›£ã—ã„環境ã§ã¯ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒä¸è¦ãªDSP-HLEエンジンを使用ã—ã¦ãã ã•ã„\n" -"(Dolphin本体ã®è¨­å®šâ†’サウンド設定ã§é¸æŠžã§ãã¾ã™)" +"(Dolphin本体ã®è¨­å®šâ†’\"サウンド設定\"ã§é¸æŠžã§ãã¾ã™)" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:99 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:119 @@ -2592,7 +2587,7 @@ msgstr "開始" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 msgid "FullScr" -msgstr "全画é¢è¡¨ç¤º" +msgstr "全画é¢" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 msgid "Fullscreen resolution:" @@ -2696,7 +2691,6 @@ msgid "Greater Than" msgstr "より大ãã„" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -#, fuzzy msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2709,7 +2703,7 @@ msgstr "" "テクスãƒãƒ£ã‚¨ãƒ•ã‚§ã‚¯ãƒˆã‚’表示ã™ã‚‹ãŸã‚ã«ä½œæˆã•ã‚ŒãŸãƒ†ã‚¯ã‚¹ãƒãƒ£ã®å“質を è‘—ã—ãå‘上ã•" "ã›ã¾ã™ã€‚\n" "特ã«é«˜è§£åƒåº¦å‡ºåŠ›æ™‚ã«åŠ¹æžœãŒå¤§ãã出ã¾ã™ã€‚\n" -"\n" +"動作速度ã¯å°‘々低下ã—ã€ã¾ã‚Œã«æç”»ãƒã‚°ã®åŽŸå› ã«ã‚‚ãªã‚‹ã“ã¨ã‚‚ã‚ã‚Šã¾ã™ã€‚\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’外ã•ãªã„ã§ãã ã•ã„。" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 @@ -3482,7 +3476,7 @@ msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." msgstr "" -"Wii リモコン上ã®ã‚¹ãƒ”ーカーを無効化ã—ã¾ã™ã€‚実機Wii リモコン使用時ã«ãƒ©ãƒ³ãƒ€ãƒ ã§" +"Wii リモコン内蔵ã®ã‚¹ãƒ”ーカーを無効化ã—ã¾ã™ã€‚実機Wii リモコン使用中ランダムã«" "切断ã•ã‚Œã‚‹å•é¡Œã‚’解消ã—ã¾ã™" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:126 @@ -3976,7 +3970,7 @@ msgstr "キャッシュã®æ•´é “を実行" #: Source/Core/Common/Src/MsgHandler.cpp:66 msgid "Question" -msgstr "質å•" +msgstr "確èª" #: Source/Core/DolphinWX/Src/NetWindow.cpp:146 #: Source/Core/DolphinWX/Src/NetWindow.cpp:303 @@ -4243,7 +4237,7 @@ msgstr "確èªä¸­..." #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 msgid "ScrShot" -msgstr "ç”»é¢ã‚’撮影" +msgstr "ç”»é¢æ’®å½±" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:103 msgid "Scroll Lock" @@ -4392,7 +4386,7 @@ msgstr "é©ç”¨" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 msgid "Set as &default ISO" -msgstr "Wiiメニューã«è¡¨ç¤º(&D)" +msgstr "Wiiメニュー(ディスクãƒãƒ£ãƒ³ãƒãƒ«)ã«è¡¨ç¤º(&D)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 #, c-format @@ -5206,8 +5200,8 @@ msgid "" "Unknown pointer %#08x\n" "Continue?" msgstr "" -"ä¸æ˜Žãªãƒã‚¤ãƒ³ã‚¿ %#08x\n" -"続ã‘ã¾ã™ã‹ï¼Ÿ" +"Unknown pointer %#08x\n" +"Continue?" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 @@ -5648,7 +5642,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:461 msgid "s" -msgstr " " +msgstr "　" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 #, c-format From 035926df8c7b55b111ae9c91b1409396d6ac2913 Mon Sep 17 00:00:00 2001 From: Pascal Jouy Date: Fri, 28 Oct 2011 23:42:40 +0200 Subject: [PATCH 191/381] Update french translation. --- Languages/po/fr.po | 684 +++++++++++++-------------------------------- 1 file changed, 202 insertions(+), 482 deletions(-) diff --git a/Languages/po/fr.po b/Languages/po/fr.po index a477cf2a90..38440d51cd 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: 2011-10-11 23:25-0500\n" -"PO-Revision-Date: 2011-08-10 17:42+0100\n" +"PO-Revision-Date: 2011-10-28 23:40+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/MemcardManager.cpp:193 #, c-format @@ -98,8 +97,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,13 +368,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" @@ -390,13 +386,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 !!" @@ -428,19 +421,16 @@ msgid "Accurate VBeam emulation" msgstr "Emulation fidèle VBeam" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -#, fuzzy 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 cette case." +"Dans le doute, cochez plutôt EFB vers texture." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 msgid "Action" @@ -463,51 +453,33 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, 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:756 #, 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:549 #, 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:609 #, 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:803 #, 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:684 #, c-format -msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "" -"Erreur Action Replay : Master Code et Write To CCXXXXXX non implémentés (%s)" +msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgstr "Erreur Action Replay : Master Code et Write To CCXXXXXX non implémentés (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -569,16 +541,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." @@ -587,24 +557,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:759 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:520 msgid "Advanced" @@ -645,20 +612,17 @@ msgstr "Tous les fichiers (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 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, 6 et 7 dans la fenêtre d'émulation.\n" "\n" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -#, fuzzy msgid "Alternate Wiimote Timing" -msgstr "Wiimote émulée" +msgstr "Délai alternatif de communication avec la Wiimote" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -690,8 +654,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)." @@ -714,9 +677,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 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:725 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 @@ -773,10 +734,8 @@ msgid "" "\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" +"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." @@ -837,9 +796,7 @@ msgstr "Basse" #: Source/Core/Core/Src/HW/GCMemcard.cpp:188 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:628 msgid "Blocks" @@ -916,17 +873,12 @@ msgstr "Cache des listes d'affichage" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 "" -"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" +"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." @@ -939,10 +891,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." @@ -964,8 +914,7 @@ msgstr "Impossible d'enregistrer des films en mode Lecture seule." #: Source/Core/Core/Src/CoreTiming.cpp:122 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:1016 #, c-format @@ -989,8 +938,7 @@ msgstr "" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858 #, 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:1872 #, c-format @@ -1002,8 +950,7 @@ msgstr "Impossible de trouver la Wiimote par le gestionnaire de connexion %02x" #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 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:49 msgid "Caps Lock" @@ -1103,12 +1050,8 @@ msgid "Choose a memory card:" msgstr "Choisir une carte mémoire :" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 -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:764 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 @@ -1135,12 +1078,8 @@ msgid "Clear failed." msgstr "Echec de l'éffacement" #: 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:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 @@ -1290,15 +1229,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 @@ -1315,23 +1247,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:119 #, 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:1044 msgid "Couldn't find open command for extension 'ini'!" @@ -1369,10 +1297,8 @@ msgid "Created by KDE-Look.org" msgstr "Créé par KDE-Look.org" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 -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 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:492 msgid "Created by VistaIcons.com" @@ -1548,12 +1474,8 @@ msgstr "Détecter" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -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:131 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 @@ -1609,30 +1531,24 @@ msgstr "Désactiver les textures" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 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:95 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." @@ -1720,20 +1636,12 @@ msgid "Dolphin at &Google Code" msgstr "Dolphin dans &Google Code" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 -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:307 -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/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -1779,8 +1687,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." @@ -1820,16 +1727,8 @@ msgstr "Copies de l'EFB" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, 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:162 msgid "EUROPE" @@ -1879,31 +1778,24 @@ msgstr "Thread d'émulation déjà en cours d'exécution" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 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:110 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:33 @@ -1920,15 +1812,13 @@ msgstr "Activer" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 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" @@ -2012,19 +1902,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:317 -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:799 msgid "Enable pages" @@ -2037,41 +1922,28 @@ 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:79 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:329 -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:311 -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:334 msgid "Enables Custom Projection Hack" @@ -2090,12 +1962,8 @@ msgstr "" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -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:117 msgid "" @@ -2148,18 +2016,12 @@ msgstr "Erreur" #: Source/Core/DolphinWX/Src/Main.cpp:346 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/Core/Src/HW/EXI_DeviceIPL.cpp:273 #, 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" @@ -2172,8 +2034,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:58 msgid "Execute" @@ -2327,8 +2188,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 @@ -2350,8 +2210,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:144 @@ -2521,8 +2380,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." @@ -2533,8 +2391,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." @@ -2542,12 +2399,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 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:76 msgid "" @@ -2703,8 +2558,7 @@ msgstr "Allemand" #: Source/Core/Core/Src/ActionReplay.cpp:451 #, 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:443 msgid "Graphics" @@ -2719,20 +2573,16 @@ msgid "Greater Than" msgstr "Plus grand que" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -#, fuzzy 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" +"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." @@ -2791,10 +2641,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" @@ -2812,8 +2660,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." @@ -2846,20 +2693,16 @@ msgstr "Wiimote hybride" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 #, 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:795 #, 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" @@ -2900,20 +2743,12 @@ msgid "Icon" msgstr "Icône" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -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:481 -msgid "" -"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." -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), vous devez aussi désactiver " -"le contrôle audio dans le DSP pour que cela fonctionne." +msgid "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." +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), vous devez aussi désactiver le contrôle audio dans le DSP pour que cela fonctionne." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" @@ -2922,28 +2757,24 @@ msgstr "Ignorer les changements de formats" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 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:93 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." @@ -2977,13 +2808,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 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." @@ -2993,8 +2822,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Améliore les performances, mais peut faire disparaître l'éclairage dans la " -"plupart des jeux.\n" +"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." @@ -3044,11 +2872,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:1363 msgid "Installing WAD..." @@ -3303,9 +3128,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/Main.cpp:134 msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" @@ -3406,12 +3229,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 @@ -3432,9 +3251,7 @@ msgstr "" #: Source/Core/Core/Src/HW/GCMemcard.cpp:126 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:47 msgid "Menu" @@ -3464,14 +3281,11 @@ msgstr "Modif." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 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." @@ -3511,12 +3325,8 @@ msgid "Multiply" msgstr "Multiplier" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -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/WXInputBase.cpp:126 msgid "NP Add" @@ -3810,8 +3620,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" @@ -3821,12 +3630,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:485 msgid "Output" @@ -4103,8 +3908,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." @@ -4256,9 +4060,7 @@ msgstr "Sauvegarder le fichier GCM/ISO décompressé" #: Source/Core/Core/Src/Movie.cpp:428 #, 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:401 msgid "Scaled EFB Copy" @@ -4293,8 +4095,10 @@ msgstr "Fitre de recherche" msgid "Search Subfolders" msgstr "Chercher dans sous-dossiers" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:104 +#: Source/Core/Common/Src/SysConf.h:127 +#: Source/Core/Common/Src/SysConf.h:147 +#: Source/Core/Common/Src/SysConf.h:168 #, c-format msgid "Section %s not found in SYSCONF" msgstr "La section %s n'a pas été trouvée dans SYSCONF" @@ -4360,8 +4164,7 @@ 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." @@ -4373,32 +4176,27 @@ msgstr "Police sélectionnée" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 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:73 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." @@ -4420,11 +4218,8 @@ msgid "Serbian" msgstr "Serbe" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -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:492 msgid "Set" @@ -4442,9 +4237,7 @@ msgstr "Définir comme carte mémoire par défaut : %c" #: Source/Core/Core/Src/ActionReplay.cpp:462 #, 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/ISOProperties.cpp:335 msgid "Settings..." @@ -4565,13 +4358,10 @@ msgstr "Demande confirmation avant d'arrêter le jeu." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 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 "" "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:812 msgid "Show first block" @@ -4595,13 +4385,11 @@ msgstr "Afficher le titre de sauvegarde" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 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." @@ -4649,13 +4437,11 @@ msgstr "Ignorer l'accès à l'EFB depuis le CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 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." @@ -4663,16 +4449,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." @@ -4700,16 +4483,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:618 msgid "Sound Settings" @@ -4741,21 +4521,13 @@ msgstr "Volume du haut-parleur :" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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." @@ -4815,14 +4587,12 @@ msgstr "Arrêter" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 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." @@ -4932,12 +4702,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 @@ -4963,28 +4729,21 @@ msgstr "Le code AR décrypté ne contient aucune ligne." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 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 second-fastest value from the right." 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 deuxième position depuis la droite." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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:353 -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!" @@ -5020,12 +4779,8 @@ 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:467 -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:304 msgid "" @@ -5036,12 +4791,8 @@ msgstr "" "Indéterminé signifie que les paramètres de Dolphin sont appliqués." #: Source/Core/Core/Src/ActionReplay.cpp:356 -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:509 msgid "This could cause slow down in Wii Menu and some games." @@ -5050,19 +4801,12 @@ msgstr "Ceci peut ralentir le Menu Wii et quelques jeux." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 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." @@ -5075,12 +4819,10 @@ msgid "" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" "Ceci est utiliser pour contrôler la vitesse du jeu par la constance du son.\n" -"Désactiver cette option peut causer une vitesse anormale du jeu, par exemple " -"trop rapide.\n" +"Désactiver cette option peut causer une vitesse anormale du jeu, par exemple trop rapide.\n" "Mais il se peut parfois qu'activer cette option produise un bruit constant.\n" "\n" -"Raccourci clavier : Appuyer pour instantanément désactiver cette " -"option." +"Raccourci clavier : Appuyer pour instantanément désactiver cette option." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "This is used to play music tracks, like BGM." @@ -5088,21 +4830,15 @@ msgstr "Ceci est utilisé pour lire les pistes de musique, comme les BGM." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 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:283 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 @@ -5149,7 +4885,8 @@ msgstr "Echec de chargement d'un type de fichier inconnu." msgid "Triggers" msgstr "Déclencheurs" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:92 +#: Source/Core/Common/Src/SysConf.h:115 msgid "Trying to read from invalid SYSCONF" msgstr "Essai de lecture d'un fichier SYSCONF non valide" @@ -5201,12 +4938,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:404 @@ -5240,8 +4975,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/Core/Src/HW/Memmap.cpp:633 #, c-format @@ -5290,23 +5024,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:127 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." @@ -5390,8 +5120,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 ?" @@ -5403,8 +5132,7 @@ 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 ?" @@ -5548,8 +5276,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." @@ -5631,19 +5358,14 @@ msgstr "[Personnalisé]" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 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." @@ -5690,9 +5412,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:461 msgid "s" From 3a73f21a11685fc9f10b17cd2ce4bc9f477012f7 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sun, 18 Dec 2011 13:40:09 -0600 Subject: [PATCH 192/381] Update pot file once again. --- Languages/po/ar.po | 760 ++++++++++-------- Languages/po/ca.po | 763 ++++++++++-------- Languages/po/cs.po | 760 ++++++++++-------- Languages/po/de.po | 757 ++++++++++-------- Languages/po/dolphin-emu.pot | 747 ++++++++++-------- Languages/po/el.po | 1431 +++++++++++++++++++++------------ Languages/po/en.po | 747 ++++++++++-------- Languages/po/es.po | 760 ++++++++++-------- Languages/po/fr.po | 1437 ++++++++++++++++++++++------------ Languages/po/he.po | 748 ++++++++++-------- Languages/po/hu.po | 757 ++++++++++-------- Languages/po/it.po | 757 ++++++++++-------- Languages/po/ja.po | 760 ++++++++++-------- Languages/po/ko.po | 757 ++++++++++-------- Languages/po/nb.po | 757 ++++++++++-------- Languages/po/nl.po | 757 ++++++++++-------- Languages/po/pl.po | 760 ++++++++++-------- Languages/po/pt.po | 757 ++++++++++-------- Languages/po/pt_BR.po | 760 ++++++++++-------- Languages/po/ru.po | 757 ++++++++++-------- Languages/po/sr.po | 748 ++++++++++-------- Languages/po/tr.po | 760 ++++++++++-------- Languages/po/zh_CN.po | 757 ++++++++++-------- Languages/po/zh_TW.po | 757 ++++++++++-------- 24 files changed, 11440 insertions(+), 8071 deletions(-) diff --git a/Languages/po/ar.po b/Languages/po/ar.po index d83a79c0f7..845b571a9a 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: 2011-10-11 23:25-0500\n" +"POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-16 11:25-0500\n" "Last-Translator: mansoor\n" "Language-Team: \n" @@ -49,9 +49,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sنسخ%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d هرتز" @@ -172,11 +172,11 @@ msgstr "&مدير الاسرار" msgid "&DSP Settings" msgstr "&إعدادات الصوت" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "&مسح ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 msgid "&Delete selected ISOs..." msgstr "&حذ٠تحديد ايزو" @@ -240,7 +240,7 @@ msgstr "&وقÙØ©" msgid "&Play" msgstr "&ابداء اللعبه" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "&خصائص" @@ -284,7 +284,7 @@ msgstr "&القائمة" msgid "&Wiimote Settings" msgstr "&إعدادات تحكم الوي" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "&معلومات عن اللعبة" @@ -333,10 +333,11 @@ msgid "" msgstr "<لا شيء>" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "<اضغط على Ù…Ùتاح>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "<النظام>" @@ -390,8 +391,8 @@ msgstr "" "\n" "يجب عليك إعادة توجيه البرنامج منÙØ° الهوست!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "" @@ -430,6 +431,7 @@ msgstr "" "إذا لم تكن متأكدا اترك هذا التحقق." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 msgid "Action" msgstr "العمل" @@ -515,11 +517,11 @@ msgstr "كرت الشاشه :" msgid "Add" msgstr "أضÙ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "إضاÙØ© رمز ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "أض٠باتش" @@ -527,9 +529,9 @@ msgstr "أض٠باتش" msgid "Add new pane" msgstr "إضاÙØ© جزء جديد" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Add..." msgstr "أضÙ" @@ -567,7 +569,7 @@ msgstr "ضبط السيطرة على ضغط التناظرية المطلوبة msgid "Advanced" msgstr "متقدم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "إعدادات متقدمة" @@ -575,28 +577,28 @@ msgstr "إعدادات متقدمة" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "جميع ملÙات الجيم كيوب (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Ø­Ùظ جميع الحالات (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "جميع ملÙات ايزو الوي" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "جميع مضغوط GC/Wii ISO files (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "جميع الملÙات (*.*)|*.*" @@ -632,7 +634,7 @@ msgstr "محمل التطبيق هو حجم الخطأ... هل حقا محمل msgid "Apploader unable to load from file" msgstr "Apploader غير قادر على تحميل مل٠من" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "" @@ -650,7 +652,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا حدد إيقاÙ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Arabic" @@ -659,17 +661,17 @@ msgstr "Arabic" msgid "Are you sure you want to delete \"%s\"?" msgstr "هل أنت متأكد أنك تريد حذ٠\"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙØŸ " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙات؟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "نسبة العرض :" @@ -678,11 +680,11 @@ msgstr "نسبة العرض :" msgid "At least one pane must remain open." msgstr "يجب أن لا يقل عن جزء واحد لا تزال Ù…Ùتوحة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" msgstr "صوت الخلÙية :" @@ -690,7 +692,7 @@ msgstr "صوت الخلÙية :" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "تلقائي" @@ -733,7 +735,7 @@ msgstr "" msgid "Back" msgstr "رجوع" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" msgstr "إعدادات الخلÙية" @@ -743,7 +745,7 @@ msgid "Backend:" msgstr "الخلÙية:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "خلÙية الإدخال" @@ -756,15 +758,15 @@ msgid "Bad File Header" msgstr "سيء بداية المل٠" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr "بنر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "تÙاصيل بنر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "بنر:" @@ -776,7 +778,7 @@ msgstr "شريط" msgid "Basic" msgstr "الأساسية" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "إعدادات أساسية" @@ -805,7 +807,7 @@ msgid "Blue Right" msgstr "اليمين أزرق" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "أسÙÙ„" @@ -814,7 +816,7 @@ msgstr "أسÙÙ„" msgid "Bound Controls: %lu" msgstr "يلزم التحكم: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "معطل" @@ -822,7 +824,7 @@ msgstr "معطل" msgid "Browse" msgstr "أستعرض" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "لتصÙØ­ دليل لإضاÙØ©" @@ -830,7 +832,7 @@ msgstr "لتصÙØ­ دليل لإضاÙØ©" msgid "Browse for an ISO directory..." msgstr "لاستعراض الدليل ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "لاستعراض الدليل الإخراج" @@ -838,7 +840,7 @@ msgstr "لاستعراض الدليل الإخراج" msgid "Buffer:" msgstr "العازلة :" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -848,11 +850,11 @@ msgstr "أزرار" msgid "C Stick" msgstr "العصا الأيمن " -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "العصا الأيمن " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "محرك محاكي المعالج" @@ -902,15 +904,11 @@ msgstr "إلغاء" msgid "Cannot open %s" msgstr "لا يمكن Ùتح %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "لا يمكن تسجيل الأÙلام ÙÙŠ وضع للقراءة Ùقط." - #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "لا يمكن إلغاء تسجيل الأحداث مع الأحداث المعلقة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -921,7 +919,7 @@ msgstr "" "%s\n" "ليست ذاكرة جيم كيوب مل٠بطاقة صالحة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -950,7 +948,7 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Catalan" @@ -967,6 +965,7 @@ msgid "Change &Disc..." msgstr "تغيير &القرص" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "تغيير القرص" @@ -974,7 +973,7 @@ msgstr "تغيير القرص" msgid "Change Game" msgstr "تغيير اللعبة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -990,8 +989,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:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "تغيير هذه ليس لها أي أثر ÙÙŠ حين أن المحاكي قيد التشغيل!" @@ -1011,31 +1010,31 @@ msgstr "بحث عن اسرار" msgid "Cheats Manager" msgstr "قائمة الاسرار" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Chinese (Simplified)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Chinese (Traditional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "DVD اختيار الدليل أصل :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "اختيار ايزو الاÙتراضية :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "اختيار دليل لإضاÙØ©" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "اختيار مل٠لÙتح" @@ -1043,14 +1042,14 @@ msgstr "اختيار مل٠لÙتح" msgid "Choose a memory card:" msgstr "اختيار بطاقة الذاكرة :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "اختيار مجلد لاستخراج" @@ -1069,7 +1068,7 @@ msgstr "الكلاسيكية" msgid "Clear" msgstr "أزال" -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." msgstr "Ùشل ÙÙŠ الازاله." @@ -1083,7 +1082,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "إغلاق" @@ -1108,20 +1107,20 @@ msgstr "الأمر" msgid "Comment" msgstr "التعليق" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "التعليق:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "ضغط ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "اختيار ضغط ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "ضغط ايزو" @@ -1148,13 +1147,13 @@ msgstr "تكوين منصات" msgid "Configure..." msgstr "إعدادات" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "تأكيد الكتابة Ùوق ملÙ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Confirm on Stop" msgstr "تأكيد على التوقÙ" @@ -1163,7 +1162,7 @@ msgstr "تأكيد على التوقÙ" msgid "Connect" msgstr "اتصال" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "ربط كيبورد يو اس بي" @@ -1173,22 +1172,26 @@ msgid "Connect Wiimote %i" msgstr " توصيل ويموت%i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "توصيل ويموت 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "توصيل ويموت 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "توصيل ويموت 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "توصيل ويموت 4" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Connecting..." msgstr "توصيل" @@ -1213,7 +1216,7 @@ msgstr "Ùشل نسخ" msgid "Copy to Memcard %c" msgstr "نسخ إلى بطاقة الذاكرة %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "الأساسية" @@ -1243,7 +1246,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "لا يمكن التعر٠مل٠ايزو %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "لا يمكن Ø­Ùظ %s" @@ -1269,7 +1272,7 @@ msgstr "" "Are you running Dolphin from a CD/DVD, or is the save file maybe write " "protected?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "لا يمكن العثور Ùتح الأوامر للتمديد 'ini'!" @@ -1286,7 +1289,7 @@ msgstr "" msgid "Count:" msgstr "الاحصاء :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "البلد:" @@ -1300,21 +1303,21 @@ msgstr "إنشاء رموز اسرار" msgid "Create new perspective" msgstr "إنشاء منظور جديد" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr " KDE-Look.org تم بواسطة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr " VistaIcons.com تم بواسطة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" " black_rider and published on ForumW.org > Web DevelopmentsCreated by " @@ -1352,7 +1355,7 @@ msgstr "الإبهات المتداخل" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "المسار الحالي تغيرت من %s to %s after wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" msgstr "هاك مخصص العرض" @@ -1360,15 +1363,15 @@ msgstr "هاك مخصص العرض" msgid "Custom Projection Hack Settings" msgstr "إعدادات هاك مخصص العرض" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." msgstr "تخصيص بعض المعلمات العرض على إملائي." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Czech" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "الاسهم" @@ -1376,24 +1379,24 @@ msgstr "الاسهم" msgid "DSP" msgstr "الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP Emulator Engine" msgstr "محرك محاكي الصوت" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulation (سريع)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (بطيء)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "" @@ -1401,7 +1404,7 @@ msgstr "" msgid "DSP settings" msgstr "إعدادات الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "" @@ -1409,7 +1412,7 @@ msgstr "" msgid "Data Size" msgstr "حجم البيانات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "التاريخ :" @@ -1438,16 +1441,16 @@ msgstr "التصحيح" msgid "Decimal" msgstr "عشري" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "ضغط ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "اختيار إلغاء ضغط ايزو " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "ÙÙƒ ايزو" @@ -1455,7 +1458,7 @@ msgstr "ÙÙƒ ايزو" msgid "Default" msgstr "الاÙتراضي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "ايزو الاÙتراضية :" @@ -1497,8 +1500,8 @@ msgstr "" msgid "Device" msgstr "أداة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "إعدادات الجهاز" @@ -1583,7 +1586,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "القرص" @@ -1610,11 +1613,11 @@ msgstr "" msgid "Divide" msgstr "انقسام" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 msgid "Do you want to stop the current emulation?" msgstr "هل تريد اغلق اللعبة الحالية؟" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "دولÙين" @@ -1639,12 +1642,12 @@ msgstr "إعدادات تحكم الوي" msgid "Dolphin FIFO" msgstr "دولÙين" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "إعدادات تحكم الجيم كيوب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1656,14 +1659,14 @@ msgstr "إعدادات تحكم الوي" msgid "Dolphin at &Google Code" msgstr "دولÙين على مدونة قوقل" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" "لايمكن العثور على اي لعبه جيم كيوب او وي . دبل كيك هنا لاستعراض الملÙات " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1692,7 +1695,7 @@ msgstr "الطبول" msgid "Dummy" msgstr "وهمي " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "" @@ -1738,9 +1741,9 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Dutch" @@ -1789,8 +1792,8 @@ msgstr "تعديل الباتش" msgid "Edit current perspective" msgstr "تعديل المنظور الحالي" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "تحرير" @@ -1802,7 +1805,7 @@ msgstr "تأثير" msgid "Embedded Frame Buffer" msgstr "عازل الإطار المضمن " -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "المحاكي قيد التشغيل بالÙعل" @@ -1835,7 +1838,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "محاكاة ويموت" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "حالة المحاكاه: " @@ -1864,7 +1867,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "Enable Audio Throttle" @@ -1876,15 +1879,19 @@ msgstr "BAT تمكين" msgid "Enable Block Merging" msgstr "تمكين منع الدمج" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "تمكين التخزين المؤقت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Cheats" msgstr "تمكين الاسرار " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "" @@ -1892,7 +1899,7 @@ msgstr "" msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "Enable Dual Core (لزيادة السرعة)" @@ -1904,7 +1911,7 @@ msgstr "تمكين الاختصارات" msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "Enable Idle Skipping (لزيادة السرعة)" @@ -1917,7 +1924,7 @@ msgstr "MMU تمكين" msgid "Enable Progressive Scan" msgstr "تمكين المسح التقدمي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Enable Screen Saver" msgstr "تمكين شاشة التوقÙ" @@ -1979,7 +1986,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -1992,7 +1999,7 @@ msgid "" "Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" msgstr "يمكن توقعات مخصص هاك" @@ -2028,9 +2035,9 @@ msgstr "" msgid "End" msgstr "نهاية" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "English" @@ -2059,15 +2066,29 @@ msgstr "المساواة" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "خطأ" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "خطأ ÙÙŠ تحميل اللغة المختارة. يتراجع إلى النظام الاÙتراضية." -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2101,11 +2122,12 @@ msgstr "للخروج مع المحاكي" msgid "Export Failed" msgstr "Ùشل تصدير" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "Ùشل تصدير" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "تصدير تسجيل" @@ -2117,7 +2139,7 @@ msgstr "تصدير تسجيل" msgid "Export Save" msgstr "تصدير Ø­Ùظ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "تصدير Ø­Ùظ الوي" @@ -2149,44 +2171,44 @@ msgstr "معلمة إضاÙية" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "استخراج كاÙØ© الملÙات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "استخراج Apploader" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "استخراج دليل" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "استخراج الملÙات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "استخراج التقسيم" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "استخراج %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "استخراج كاÙØ© الملÙات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "استخراج دليل" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "استخراج" @@ -2202,7 +2224,7 @@ msgstr "لاعبين" msgid "FRANCE" msgstr "Ùرنسا" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "الحجم :" @@ -2218,7 +2240,7 @@ msgstr "لم اسمع!" msgid "Failed to download codes." msgstr "اللعبه لاتوجد ÙÙŠ قاعده البيانات." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "Ùشل ÙÙŠ الاستخراج إلى %s!" @@ -2375,11 +2397,11 @@ msgstr "مل٠غير مضغوط " msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "الملÙات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "نوع المل٠غير معروÙ! لن تÙتح!" @@ -2399,7 +2421,7 @@ msgstr "العرض 16:9" msgid "Force 4:3" msgstr "العرض 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Force Console as NTSC-J" msgstr "Ùرض وحدة التحكم على النظام الياباني" @@ -2431,7 +2453,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2461,6 +2483,7 @@ msgid "Frame " msgstr "الإطار" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "الإطار المسبق" @@ -2476,7 +2499,7 @@ msgstr "مجموعة الإطار " msgid "Frame S&kipping" msgstr "تخطي الإطار " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "حد الإطار:" @@ -2488,9 +2511,9 @@ msgstr "إطارات لتسجيل" msgid "Free Look" msgstr "تحكم بكاميرا اللعبة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "French" msgstr "French" @@ -2515,11 +2538,16 @@ msgstr "دقة العرض :" msgid "GCI File(*.gci)" msgstr "" +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +#, fuzzy +msgid "GCMic Configuration" +msgstr "سجل الإعدادات" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "تحكم الجيم كيوب" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "معر٠اللعبة:" @@ -2535,7 +2563,7 @@ msgstr "اللعبة ليست على التوالي!" msgid "Game not found!!" msgstr "لم يتم العثور على لعبة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "إعدادات معينه للعبه" @@ -2543,7 +2571,7 @@ msgstr "إعدادات معينه للعبه" msgid "GameConfig" msgstr "إعدادات اللعبة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "جيم كيوب" @@ -2552,7 +2580,7 @@ msgid "Gamecube &Pad Settings" msgstr "إعدادات تحكم جيم كيوب" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "بطاقه ذاكره الجيم كيوب (*.raw,*.gcp) " @@ -2575,7 +2603,8 @@ msgstr "" "(إما غير رمز سيئة أو نوع رمز غير مدعومة حتى الآن.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "عام" @@ -2584,9 +2613,9 @@ msgstr "عام" msgid "General Settings" msgstr "الإعدادات العامة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "German" msgstr "German" @@ -2623,7 +2652,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا، اترك هذا التحقق." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" msgstr "Greek" @@ -2655,7 +2684,7 @@ msgstr "هاك" msgid "Header checksum failed" msgstr "عنوان اختباري Ùشل" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hebrew" msgstr "Hebrew" @@ -2716,11 +2745,12 @@ msgid "Hotkey Configuration" msgstr "إعدادات الاختصارات" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 msgid "Hotkeys" msgstr "الاختصارات" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hungarian" msgstr "Hungarian" @@ -2746,7 +2776,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "IPL إعدادات" @@ -2762,11 +2792,11 @@ msgstr "IR المؤشر" msgid "IR Sensitivity:" msgstr "IR حساسية:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "تÙاصيل ايزو" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "مجلد الايزو" @@ -2778,12 +2808,18 @@ msgstr "إيطاليا" msgid "Icon" msgstr " أيقونة" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 msgid "" "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." @@ -2869,7 +2905,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا ترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "ÙÙŠ اللعبة" @@ -2898,7 +2934,7 @@ msgstr "إدراج" msgid "Insert Encrypted or Decrypted code here..." msgstr "إدراج رمز المشÙرة أو ÙÙƒ Ø´Ùرة هنا" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "SD Card ادرج " @@ -2910,7 +2946,7 @@ msgstr "أدخل اسم هنا" msgid "Install WAD" msgstr "wad تثبيت" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 msgid "Install to Wii Menu" msgstr "تثبيت إلى قائمة الوي" @@ -2919,23 +2955,23 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 msgid "Installing WAD..." msgstr "wad تثبيت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 msgid "Interface" msgstr "الواجهة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "واجهة الإعدادات" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "" -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -2944,7 +2980,7 @@ msgstr "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" "حاول تحميل الحالة مرة أخرى" -#: Source/Core/Core/Src/State.cpp:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "" @@ -2952,11 +2988,11 @@ msgstr "" msgid "Internal Resolution:" msgstr "الدقة الداخلية :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "Interpreter (بطيئة جدا)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "مقدمة" @@ -2973,7 +3009,7 @@ msgstr "قيمة غير صالحة!" msgid "Invalid bat.map or dir entry" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "غير صالح نوع الحدث %i" @@ -2990,17 +3026,17 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "تسجيل المل٠غير صالح" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "غير صالح حالة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Italian" msgstr "Italian" @@ -3008,16 +3044,16 @@ msgstr "Italian" msgid "JAPAN" msgstr "اليابان" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (موصى به)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "JITIL recompiler (تجريبي )" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Japanese" msgstr "Japanese" @@ -3026,16 +3062,17 @@ msgid "KOREA" msgstr "كوريا" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "المÙتاح" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Korean" msgstr "Korean" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "" @@ -3044,11 +3081,11 @@ msgid "L Button" msgstr "" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "اللغة :" @@ -3071,6 +3108,7 @@ msgid "Left Stick" msgstr "العصا الأيسر" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3095,7 +3133,7 @@ msgstr "" msgid "Less Than" msgstr "أقل من" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "الحد من عدد الإطارات ÙÙŠ الثانية " @@ -3108,34 +3146,42 @@ msgid "Load Custom Textures" msgstr "تحميل القوام المخصص" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 1" msgstr "1 تحميل حالة " #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 2" msgstr "2 تحميل حالة " #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 3" msgstr "3 تحميل حالة " #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 4" msgstr "4 تحميل حالة " #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 msgid "Load State Slot 5" msgstr "5 تحميل حالة " #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Load State Slot 6" msgstr "6 تحميل حالة" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Load State Slot 7" msgstr "7 تحميل حالة" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Load State Slot 8" msgstr "8 تحميل حالة" @@ -3143,11 +3189,11 @@ msgstr "8 تحميل حالة" msgid "Load State..." msgstr "تحميل حالة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "تحميل قائمة نظام الوي" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 #, c-format msgid "Load Wii System Menu %d%c" msgstr "تحميل قائمة نظام الوي %d%c" @@ -3174,7 +3220,7 @@ msgstr "تحميل المل٠المحدد (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "المحلية" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Lock Threads to Cores" msgstr "" @@ -3227,16 +3273,16 @@ msgstr "MMU سرعة هاك" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "العصا الأيسر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "معر٠المنتج :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "المنتج :" @@ -3258,7 +3304,7 @@ msgid "Memory Byte" msgstr "ذاكرة بايت" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 msgid "Memory Card" msgstr "بطاقة الذاكرة" @@ -3293,7 +3339,7 @@ msgstr "حجم بطاقة الذاكرة لا تتطابق مع حجم المل msgid "Menu" msgstr "القائمة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "الميكروÙون" @@ -3306,7 +3352,7 @@ msgstr "منخÙض" msgid "Misc" msgstr "متÙرقات" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "إعدادات منوعة" @@ -3336,7 +3382,7 @@ msgid "Motion Plus" msgstr "موشن بلس" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "محرك" @@ -3454,7 +3500,7 @@ msgstr "التبويب" msgid "NP Up" msgstr "Ùوق" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3493,7 +3539,7 @@ msgstr "اسمك :" msgid "No Country (SDK)" msgstr "لا يوجد بلد (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "لم يتم العثور على الايزو " @@ -3528,7 +3574,7 @@ msgstr "لا Ø­Ùظ المجلد نتيجة البحث عن العنوان %s" msgid "None" msgstr "لا شيء" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" msgstr "Norwegian Bokmaal" @@ -3536,16 +3582,16 @@ msgstr "Norwegian Bokmaal" msgid "Not Equal" msgstr "لا يساوي" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "غير مجموعة" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Not connected" msgstr "غير متصل" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "ملاحظات" @@ -3587,7 +3633,7 @@ msgstr "الهدÙ" msgid "Object Range" msgstr "نطاق الهدÙ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "إيقاÙ" @@ -3602,14 +3648,15 @@ msgstr "Ùقط %d كتل متاحة" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Ùتح" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "Ùتح المجلد المتضمن" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "اÙتح مجلد Ø­Ùظ الوي" @@ -3648,7 +3695,7 @@ msgid "Opens the logger" msgstr "ÙŠÙتح المسجل" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "خيارات" @@ -3728,12 +3775,12 @@ msgstr "قسم %i" msgid "Patches" msgstr "باتش" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "مسارات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "وقÙØ©" @@ -3742,7 +3789,7 @@ msgstr "وقÙØ©" msgid "Per-Pixel Lighting" msgstr "لكل بكسل إضاءة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "مثالي" @@ -3753,20 +3800,22 @@ msgstr "مشهد %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 msgid "Play" msgstr "بدأ اللعبه" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "تشغيل التسجيل" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "بدأ/ايقاÙ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "القابلة للتشغيل" @@ -3778,7 +3827,7 @@ msgstr "خيارات التشغيل" msgid "Players" msgstr "لاعبين" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 msgid "Please confirm..." msgstr "يرجى تأكيد" @@ -3790,23 +3839,23 @@ msgstr "الرجاء إنشاء منظور قبل الحÙظ" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Polish" msgstr "Polish" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 1" msgstr "تحكم 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 2" msgstr "تحكم 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Port 3" msgstr "تحكم 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 msgid "Port 4" msgstr "تحكم 4" @@ -3815,11 +3864,11 @@ msgstr "تحكم 4" msgid "Port :" msgstr "المنÙØ° :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese" msgstr "Portuguese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" msgstr "Portuguese (Brazilian)" @@ -3827,6 +3876,21 @@ msgstr "Portuguese (Brazilian)" msgid "Post-Processing Effect:" msgstr "بعد معالجة تأثير:" +#: Source/Core/Core/Src/Movie.cpp:735 +#, c-format +msgid "Premature movie end in PlayController. %u + 8 > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:829 +#, c-format +msgid "Premature movie end in PlayWiimote. %u + %d > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:806 +#, c-format +msgid "Premature movie end in PlayWiimote. %u > %u" +msgstr "" + #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "إعدادات مسبقة :" @@ -3869,7 +3933,7 @@ msgid "Quit" msgstr "خروج" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "" @@ -3878,7 +3942,7 @@ msgid "R Button" msgstr "" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" msgstr "" @@ -3895,6 +3959,7 @@ msgid "Range" msgstr "قوه" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "وضع القراءة Ùقط" @@ -3965,6 +4030,7 @@ msgid "Refresh" msgstr "تحديث" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "تحديث قائمة" @@ -3972,10 +4038,10 @@ msgstr "تحديث قائمة" msgid "Refresh game list" msgstr "تحديث القائمة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 msgid "Remove" msgstr "إزالة" @@ -3994,6 +4060,7 @@ 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 msgid "Reset" msgstr "إعادة ضبط" @@ -4016,15 +4083,15 @@ msgid "Right Stick" msgstr "العصا الايمن" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "هزاز" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Run DSP LLE on a dedicated thread (غير مستحسن)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "Russian" @@ -4036,7 +4103,7 @@ msgstr "Ø­Ùظ الحالة" msgid "Safe" msgstr "آمنة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Sample Rate:" msgstr "معدل العينة :" @@ -4051,34 +4118,42 @@ msgid "Save GCI as..." msgstr "GCI Ø­Ùظ باسم " #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 1" msgstr "1 Ø­Ùظ حالة" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 2" msgstr "2 Ø­Ùظ حالة" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 3" msgstr "3 Ø­Ùظ حالة" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 4" msgstr "4 Ø­Ùظ حالة" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 msgid "Save State Slot 5" msgstr "5 Ø­Ùظ حالة" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 msgid "Save State Slot 6" msgstr "6 Ø­Ùظ حالة" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 msgid "Save State Slot 7" msgstr "7 Ø­Ùظ حالة" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 msgid "Save State Slot 8" msgstr "8 Ø­Ùظ حالة" @@ -4086,12 +4161,12 @@ msgstr "8 Ø­Ùظ حالة" msgid "Save State..." msgstr "Ø­Ùظ حالة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "Ø­Ùظ باسم" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "Ø­Ùظ مضغوط GCM/ISO" @@ -4099,11 +4174,11 @@ msgstr "Ø­Ùظ مضغوط GCM/ISO" msgid "Save current perspective" msgstr "Ø­Ùظ المنظور الحالي" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "Ø­Ùظ الضغط GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4112,16 +4187,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "EFB Copia a escala" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, c-format msgid "Scanning %s" msgstr "Ùحص %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "بحث ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "Ùحص" @@ -4137,7 +4212,7 @@ msgstr "انتقل تأمين" msgid "Search Filter" msgstr "بحث Ùلتر" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "البحث ÙÙŠ المجلدات الÙرعية" @@ -4152,12 +4227,12 @@ msgstr "" msgid "Select" msgstr "حدد" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "اختر مل٠تسجيل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 msgid "Select a Wii WAD file to install" msgstr "لتثبيت wad حدد ملÙ" @@ -4183,15 +4258,15 @@ msgstr "اختر النواÙØ° العائمة" msgid "Select the file to load" msgstr "حدد المل٠لتحميل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "حدد Ø­Ùظ الملÙ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "حدد حالة التحميل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "حدد حالة الحÙظ" @@ -4261,11 +4336,11 @@ msgstr "موضع الاستشعار:" msgid "Separator" msgstr "الÙاصل" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "Serbian" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "المنÙØ° التسلسلي 1 -- وهذا هو المنÙØ° الذي الأجهزة مثل استخدام محول شبكة" @@ -4274,7 +4349,7 @@ msgstr "المنÙØ° التسلسلي 1 -- وهذا هو المنÙØ° الذي msgid "Set" msgstr "ضبط" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "تعيين كاÙتراضي ايزو" @@ -4288,11 +4363,11 @@ msgstr "تعيين كاÙتراضي بطاقة الذاكرة %c" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." msgstr "إعدادات" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: الإعداد غير قادر على إيجاد ملÙ" @@ -4300,7 +4375,7 @@ msgstr "SetupWiiMem: الإعداد غير قادر على إيجاد ملÙ" msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "الاسم المختصر :" @@ -4360,7 +4435,7 @@ msgstr "اليابان" msgid "Show Korea" msgstr "كوريا" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "أظهر اللغة :" @@ -4400,11 +4475,11 @@ msgstr "Wad اظهار" msgid "Show Wii" msgstr "الوي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 msgid "Show a confirmation box before stopping a game." msgstr "ظهور رسالة قبل وق٠اللعبة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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 " @@ -4467,15 +4542,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "ويموت جانبي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Simplified Chinese" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "الحجم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 msgid "Skip BIOS" msgstr "تخطي البيوس" @@ -4520,11 +4595,11 @@ msgstr "" msgid "Slot %i" msgstr "Ùتحة %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 msgid "Slot A" msgstr "A خانة " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 msgid "Slot B" msgstr "B خانة " @@ -4547,7 +4622,7 @@ msgstr "" "انها Ù…Ùيدة Ùقط لأغراض التصحيح.\n" "هل حقا تريد تمكين تقديم البرامج؟ إذا لم تكن متأكدا، اختر 'لا'.." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "إعدادات الصوت" @@ -4565,9 +4640,9 @@ msgstr "Ùشل إنشاء المخزن المؤقت الصوت : %s" msgid "Space" msgstr "مجال" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Spanish" msgstr "Spanish" @@ -4611,7 +4686,7 @@ msgstr "" msgid "Standard Controller" msgstr "وحدة تحكم القياسية" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4626,14 +4701,16 @@ msgid "Start Re&cording" msgstr "بدء التسجيل" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "بدء التسجيل" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "الحالة" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "Ø­Ùظ الحالة" @@ -4644,6 +4721,7 @@ msgstr "عصا" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "اغلق اللعبه" @@ -4687,8 +4765,8 @@ msgstr "استيرادها بنجاح Ø­Ùظ الملÙات" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "نظام اللغة :" @@ -4720,9 +4798,14 @@ msgstr "الجدول الأيمن" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" msgstr "اخذ لقطه من الشاشه" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "اختبار" @@ -4751,13 +4834,13 @@ msgstr "عنوان غير صالح" msgid "The checksum was successfully fixed" msgstr "تم إصلاح بنجاح الاختباري" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "The chosen directory is already in the list" msgstr "الدليل المختار هو بالÙعل ÙÙŠ قائمة" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, c-format msgid "" "The file %s already exists.\n" @@ -4844,7 +4927,7 @@ msgstr "" msgid "The value is invalid" msgstr "قيمة غير صالحة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "ثيم" @@ -4870,7 +4953,7 @@ msgid "" "Replay itself." msgstr "هذه المحاكاة إعادة العمل لا تدعم تعديل الرموز التي اعادتها العمل Ù†Ùسه." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "هذا يمكن أن يسبب بطء ÙÙŠ القائمة لوى وبعض الألعاب." @@ -4893,7 +4976,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -4907,11 +4990,11 @@ msgstr "" "\n" "اختصار : اضغط باستمرار على الÙور لتعطيل الخنق ÙÙŠ لوحة المÙاتيح." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr " BGM هذا وتستخدم لتشغيل مسارات الموسيقى ØŒ مثل." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4933,7 +5016,7 @@ msgid "Tilt" msgstr "إمالة" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr "العنوان" @@ -4948,15 +5031,16 @@ msgstr "تبديل جميع أنواع السجل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "أعلى" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Traditional Chinese" @@ -4964,7 +5048,7 @@ msgstr "Traditional Chinese" msgid "Tried to load an unknown file type." msgstr "حاول تحميل نوع مل٠غير معروÙ." -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "Triggers" @@ -4978,7 +5062,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Turkish" msgstr "Turkish" @@ -5059,15 +5143,6 @@ msgstr "تلقى رسالة مجهولة مع معر٠: %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"مؤشر غير معرو٠%#08x\n" -"مواصلة?" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5082,7 +5157,7 @@ msgstr "التحديث" msgid "Upright Wiimote" msgstr "ويموت مستقيم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "(PAL60) استخدم وضع " @@ -5094,7 +5169,7 @@ msgstr "استخدام شاشة كاملة" msgid "Use Hex" msgstr "استخدام الهيكس" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "" @@ -5149,7 +5224,7 @@ msgstr "القيمة:" msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "Ùديو" @@ -5157,7 +5232,7 @@ msgstr "Ùديو" msgid "Virtual" msgstr "الظاهري" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "الصوت" @@ -5222,6 +5297,41 @@ msgstr "" "ولها Ù†Ùس اسم المل٠على بطاقة ذاكرة الخاصة بك\n" "تستمر?" +#: Source/Core/Core/Src/Movie.cpp:629 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, 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" +"\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" +"\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" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -5239,15 +5349,15 @@ msgstr "شاشة واسعة هاك" msgid "Width" msgstr "عرض" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "الوي" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "جهاز الوي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 msgid "Wii NAND Root:" msgstr "" @@ -5255,7 +5365,7 @@ msgstr "" msgid "Wii Save Import" msgstr "استيراد Ø­Ùظ الوي" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 msgid "Wii save files (*.bin)|*.bin" msgstr "ملÙات Ø­Ùظ الوي (*.bin)|*.bin" @@ -5286,7 +5396,7 @@ msgstr "" "أو ربما هو بسبب الخمول وقت مستقطع أو لسبب آخر.\n" "هل تريد إعادة الاتصال على الÙور?" -#: Source/Core/DolphinWX/Src/Main.cpp:599 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Wiimote Connected" msgstr "ويموت متصل" @@ -5318,9 +5428,9 @@ msgstr "نواÙØ° اليمين" msgid "Word Wrap" msgstr "كلمة ختامية" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Working..." msgstr "العمل" @@ -5381,7 +5491,7 @@ msgstr "يجب إدخال صالح العشري، أو الست عشرية قي msgid "You must enter a valid profile name." msgstr "يجب إدخال اسم المل٠صالح." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 msgid "You must restart Dolphin in order for the change to take effect." msgstr "يجب إعادة تشغيل دولÙين من أجل التغيير ناÙØ° المÙعول." @@ -5402,7 +5512,7 @@ msgstr "" "يجب أن يكون 0x%04x (but is 0x%04llx)\n" "هل تريد إنشاء واحدة جديدة?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "ZTP هاك" @@ -5472,7 +5582,7 @@ msgstr "" msgid "^ ADD" msgstr "^أض٠" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "" @@ -5489,7 +5599,7 @@ msgstr "Ùشل ÙÙŠ قراءة البيانات من ملÙ: %s" msgid "failed to read header" msgstr "Ùشل ÙÙŠ قراءة عنوان" -#: Source/Core/Core/Src/HW/Memmap.cpp:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "" @@ -5508,7 +5618,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "أمر غير معرو٠0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "" @@ -5619,6 +5729,9 @@ msgstr "أو" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "No se puede abrir %s, no tiene una función" +#~ msgid "Cannot record movies in read-only mode." +#~ msgstr "لا يمكن تسجيل الأÙلام ÙÙŠ وضع للقراءة Ùقط." + #, fuzzy #~ msgid "Config..." #~ msgstr "إعدادات" @@ -6081,6 +6194,13 @@ msgstr "أو" #~ msgid "Type %d config not supported in plugin %s" #~ msgstr "Configuración de tipo %d no soportado en el plugin %s" +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "مؤشر غير معرو٠%#08x\n" +#~ "مواصلة?" + #~ msgid "Use FPS For Limiting" #~ msgstr "لحد عدد الاطارات" diff --git a/Languages/po/ca.po b/Languages/po/ca.po index 9869f00aed..f78b52303b 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: 2011-10-11 23:25-0500\n" +"POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-08-19 08:36-0500\n" "Last-Translator: Jordi Coma \n" "Language-Team: Catalan \n" @@ -55,9 +55,9 @@ msgstr "\"%s\" no és un fitxer GCM/ISO valid, o no és una ISO GC/Wii." msgid "%1$sCopy%1$s" msgstr "%1$sCopia%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -187,11 +187,11 @@ msgstr "Gestor de &Trucs" msgid "&DSP Settings" msgstr "Configuració de &DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "&Eliminar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 msgid "&Delete selected ISOs..." msgstr "&EliminarISOs seleccionades ..." @@ -255,7 +255,7 @@ msgstr "&Pausa" msgid "&Play" msgstr "&Executar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "&Propietats" @@ -299,7 +299,7 @@ msgstr "&Visualitza" msgid "&Wiimote Settings" msgstr "Configuració «&Wiimote»" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "&Wiki" @@ -348,10 +348,11 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -408,8 +409,8 @@ msgstr "" "\n" "Vostè ha d'enviar el port TCP per rebre!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "AM-placa base" @@ -450,6 +451,7 @@ msgstr "" "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 msgid "Action" msgstr "Acció" @@ -550,11 +552,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Afegeix" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "Afegeix codi ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "Afegeix Pegat" @@ -562,9 +564,9 @@ msgstr "Afegeix Pegat" msgid "Add new pane" msgstr "Afegeix un nou panell" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Add..." msgstr "Afegir ..." @@ -616,7 +618,7 @@ msgstr "Ajustar la pressió de control analògic per activar els botons." msgid "Advanced" msgstr "Avançada" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "Configuració avançada" @@ -624,28 +626,28 @@ msgstr "Configuració avançada" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Tots els arxius GC / Wii (elf, dol, gcm, iso, ciso, GCZ, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Totes les imatges GC / Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "Tots els fitxers GameCube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Tots els Estats (savi, s##\")" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "Tots els fitxers ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 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:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "Tots els fitxers (*.*)|*.*" @@ -682,7 +684,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:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "Apploader:" @@ -700,7 +702,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat (off)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Àrab" @@ -709,7 +711,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:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -717,12 +719,12 @@ msgstr "" "Esteu segur que voleu eliminar aquests arxius? \n" "No es podran recuperar mai més!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 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:725 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relació d'aspecte:" @@ -731,11 +733,11 @@ 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:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "Àudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" msgstr "Suport d'àudio:" @@ -743,7 +745,7 @@ 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:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -787,7 +789,7 @@ msgstr "" msgid "Back" msgstr "Tornar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" msgstr "Configuració del Suport" @@ -797,7 +799,7 @@ msgid "Backend:" msgstr "Suport:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Suport d'entrada" @@ -810,15 +812,15 @@ msgid "Bad File Header" msgstr "Mala capçalera a l'arxiu" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr "Imatge" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "Detalls del Imatge" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "Imatge:" @@ -830,7 +832,7 @@ msgstr "Barra" msgid "Basic" msgstr "Bàsic" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "Configuració bàsica" @@ -859,7 +861,7 @@ msgid "Blue Right" msgstr "Blau dret" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Abaix" @@ -868,7 +870,7 @@ msgstr "Abaix" msgid "Bound Controls: %lu" msgstr "Controls enllaçats: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "Trencat" @@ -876,7 +878,7 @@ msgstr "Trencat" msgid "Browse" msgstr "Examinar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "Examineu un directori per afegir" @@ -884,7 +886,7 @@ msgstr "Examineu un directori per afegir" msgid "Browse for an ISO directory..." msgstr "Examineu un directori ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "Examineu el directori de sortida" @@ -892,7 +894,7 @@ msgstr "Examineu el directori de sortida" msgid "Buffer:" msgstr "Buffer:" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -902,11 +904,11 @@ msgstr "Botons" msgid "C Stick" msgstr "Palanca-C" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "Palanca-C" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "Motor d'emulació de CPU" @@ -969,15 +971,11 @@ msgstr "Cancel·lar" msgid "Cannot open %s" msgstr "No es pot obrir% s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "No es poden gravar vídeos a mode només lectura." - #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "No es pot des-registrar esdeveniments amb esdeveniments pendents" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -988,7 +986,7 @@ msgstr "" "%s\n" "No és un arxiu de targeta de memòria gamecube vàlid." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1017,7 +1015,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:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Català" @@ -1034,6 +1032,7 @@ msgid "Change &Disc..." msgstr "Canviar &Disc ..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "Canviar Disc" @@ -1041,7 +1040,7 @@ msgstr "Canviar Disc" msgid "Change Game" msgstr "Canvi de joc" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1057,8 +1056,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:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "Canviar això no tindrà cap efecte mentre l'emulador s'executa!" @@ -1078,31 +1077,31 @@ msgstr "Cerca trucs" msgid "Cheats Manager" msgstr "Administrador de trucs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Xinès (simplificat)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Xinès (tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "Tria un directori arrel del DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Choose a NAND root directory:" msgstr "Tria el directori arrel del NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "Triar una ISO per defecte:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "Trieu un directori per afegir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "Trieu un arxiu per obrir" @@ -1110,7 +1109,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:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1118,8 +1117,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:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "Seleccioneu la carpeta on extreure" @@ -1138,7 +1137,7 @@ msgstr "Clàssic" msgid "Clear" msgstr "Esborrar" -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." msgstr "Fallada a l'esborrar." @@ -1152,7 +1151,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Tancar" @@ -1177,20 +1176,20 @@ msgstr "Comanda" msgid "Comment" msgstr "Comentari" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "Comentari:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "Comprimir ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "Comprimir ISOs seleccionades ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "Comprimeix ISO" @@ -1217,13 +1216,13 @@ msgstr "Configurar Control" msgid "Configure..." msgstr "Configuració..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "Confirmar contraescriptura del fitxer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Confirm on Stop" msgstr "Confirmar a l'aturar" @@ -1232,7 +1231,7 @@ msgstr "Confirmar a l'aturar" msgid "Connect" msgstr "Connectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "Connectar el teclat USB" @@ -1242,22 +1241,26 @@ msgid "Connect Wiimote %i" msgstr "Connectar Wiimote %i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "Connectar Wiimote 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "Connectar Wiimote 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "Connectar Wiimote 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "Connectar Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Connecting..." msgstr "Connectant ..." @@ -1282,7 +1285,7 @@ msgstr "Copia fallada" msgid "Copy to Memcard %c" msgstr "Copiar a la targeta de memòria %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "Nucli" @@ -1312,7 +1315,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "No es pot reconèixer el fitxer ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "No s'ha pogut desar %s" @@ -1339,7 +1342,7 @@ 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:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "No s'ha trobat la comanda d'obertura per l'extensió 'ini'!" @@ -1356,7 +1359,7 @@ msgstr "" msgid "Count:" msgstr "Compta:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "País:" @@ -1370,21 +1373,21 @@ msgstr "Crear Codi AR" msgid "Create new perspective" msgstr "Crear una nova perspectiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr "Creat per KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr "Creat per VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Creat per black_rider i publicat en ForumW.org > Web Developments" @@ -1419,7 +1422,7 @@ msgstr "Atenuar" 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:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" msgstr "Projecció personalitzada" @@ -1427,15 +1430,15 @@ msgstr "Projecció personalitzada" msgid "Custom Projection Hack Settings" msgstr "Configuració de la projecció personalitzada" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." msgstr "Configuració d'alguns paràmetres de projecció Ortogràfica." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Txec" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "Direcció digital" @@ -1443,24 +1446,24 @@ msgstr "Direcció digital" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP Emulator Engine" msgstr "Motor d'emulació DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP HLE emulation (fast)" msgstr "Emulació DSP HLE (ràpid)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP LLE interpreter (slow)" msgstr "Intèrpret DSP LLE (lent)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP LLE on Thread" msgstr "DSP LLE al fil d'execució" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "Recompilador DSP LLE " @@ -1468,7 +1471,7 @@ msgstr "Recompilador DSP LLE " msgid "DSP settings" msgstr "Configuració DSP " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "Arrel del DVD:" @@ -1476,7 +1479,7 @@ msgstr "Arrel del DVD:" msgid "Data Size" msgstr "Mida de dades" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "Data:" @@ -1505,16 +1508,16 @@ msgstr "Depuració" msgid "Decimal" msgstr "Decimals" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "Descomprimir ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISO seleccionades..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "Descomprimint ISO" @@ -1522,7 +1525,7 @@ msgstr "Descomprimint ISO" msgid "Default" msgstr "Per defecte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "ISO per defecte:" @@ -1565,8 +1568,8 @@ msgstr "" msgid "Device" msgstr "Dispositiu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "Configuració del dispositiu" @@ -1652,7 +1655,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "Disc" @@ -1679,11 +1682,11 @@ msgstr "" msgid "Divide" msgstr "Divideix" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 msgid "Do you want to stop the current emulation?" msgstr "Voleu aturar l'emulació actual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "Dolphin" @@ -1708,12 +1711,12 @@ msgstr "Configuració de Wiimote emulat" msgid "Dolphin FIFO" msgstr "FIFO Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Configuració del control GC Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin Pel·lícules TAS (*.dtm)" @@ -1725,7 +1728,7 @@ msgstr "Configuració Wiimote Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin a &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1733,7 +1736,7 @@ msgstr "" "Dolphin no ha pogut trobar cap ISO GC/Wii. Feu doble clic aquí per buscar-" "les ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1763,7 +1766,7 @@ msgstr "Tambors" msgid "Dummy" msgstr "Maniquí" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Bolcat d'àudio" @@ -1810,9 +1813,9 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Holandès" @@ -1865,8 +1868,8 @@ msgstr "Modificar el pagat" msgid "Edit current perspective" msgstr "Modificar perspectiva actual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "Modificació ..." @@ -1878,7 +1881,7 @@ msgstr "Efecte" msgid "Embedded Frame Buffer" msgstr "Activar la memòria cau d'imatge («Frame Buffer»)" -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "El fil de l'emulador ja s'està executant" @@ -1916,7 +1919,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wiimote emulat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "Estat d'emulació:" @@ -1945,7 +1948,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "Habilitar el registre de logs d'AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "Habilitar la regulació de so" @@ -1957,15 +1960,19 @@ msgstr "Habilitar les millors tècniques disponibles" msgid "Enable Block Merging" msgstr "Habilitar fusió de Bloc" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Habilitar memòria cau" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Cheats" msgstr "Activar Trucs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "Habilitar Música DTK" @@ -1973,7 +1980,7 @@ msgstr "Habilitar Música DTK" msgid "Enable Dual Core" msgstr "Habilitar Doble nucli" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "Habilitar Doble nucli (acceleració)" @@ -1985,7 +1992,7 @@ msgstr "Activar tecles d'accés ràpid" msgid "Enable Idle Skipping" msgstr "Habilitar salt d'inactiu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "Habilitar salt d'inactiu (acceleració)" @@ -1998,7 +2005,7 @@ msgstr "Habilitar MMU" msgid "Enable Progressive Scan" msgstr "Habilitar exploració &Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Enable Screen Saver" msgstr "Habilitar el protector de pantalla" @@ -2058,7 +2065,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2076,7 +2083,7 @@ msgstr "" "Gestió de memòria. Precisa en el maquinari, però lent per emular. " "(Activat=compatible, Desactivat = ràpid)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" msgstr "Activa la modificació personalitzada de projecció" @@ -2114,9 +2121,9 @@ msgstr "" msgid "End" msgstr "Fi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Anglès" @@ -2145,17 +2152,31 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Error en carregar l'idioma seleccionat. Es retorna a l'idioma per defecte " "del sistema." -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2190,11 +2211,12 @@ msgstr "Sortir de Dolphin amb emulador" msgid "Export Failed" msgstr "Fallada d'exportació" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "Exportar fitxer" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "Exportar gravació" @@ -2206,7 +2228,7 @@ msgstr "Exportar gravació ..." msgid "Export Save" msgstr "Exportar partida desada" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "Exportar partida desada Wii (Experimental)" @@ -2238,44 +2260,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:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "Extreure tots els arxius ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "Extreure «Apploader» ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "Extreure DOL ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "Extreure del repertori ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "Extreure arxiu ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "Extreure partició ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "Extraient %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "Extreure tots els arxius" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "Extraient Directori" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "Extraient ..." @@ -2291,7 +2313,7 @@ msgstr "Jugador FIFO" msgid "FRANCE" msgstr "FRANÇA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "Mida FST:" @@ -2307,7 +2329,7 @@ msgstr "Error a l'escoltar!" msgid "Failed to download codes." msgstr "Error al descarregar codis." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "Error a l' extreure a %s!" @@ -2482,11 +2504,11 @@ 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:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "Sistema d'arxius" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "'ini' Tipus de fitxer és desconegut! no s'obre!" @@ -2506,7 +2528,7 @@ msgstr "Forçar 16:9" msgid "Force 4:3" msgstr "Forçar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Force Console as NTSC-J" msgstr "Força la consola com NTSC-J" @@ -2539,7 +2561,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2571,6 +2593,7 @@ msgid "Frame " msgstr "Imatge" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "Avançar imatges" @@ -2586,7 +2609,7 @@ msgstr "Rang d'imatges" msgid "Frame S&kipping" msgstr "Salta imatge&s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "Limit d'imatges/s:" @@ -2598,9 +2621,9 @@ msgstr "Imatges a Enregistrar" msgid "Free Look" msgstr "Visió lliure" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "French" msgstr "Francès" @@ -2625,11 +2648,16 @@ msgstr "Resolució de pantalla a pantalla completa:" msgid "GCI File(*.gci)" msgstr "Arxiu de GCI (*.gci)" +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +#, fuzzy +msgid "GCMic Configuration" +msgstr "Configuració de gràfics" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "Control GC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "ID del Joc:" @@ -2645,7 +2673,7 @@ msgstr "El joc no està funcionant!" msgid "Game not found!!" msgstr "Joc no trobat!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "Configuració de jocs específics" @@ -2653,7 +2681,7 @@ msgstr "Configuració de jocs específics" msgid "GameConfig" msgstr "Configuració de joc" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "Gamecube" @@ -2662,7 +2690,7 @@ msgid "Gamecube &Pad Settings" msgstr "Configuració control «&Gamecube»" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Targetes de memòria per GameCube (*.raw, *.gcp)" @@ -2685,7 +2713,8 @@ msgstr "" "(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/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -2694,9 +2723,9 @@ msgstr "General" msgid "General Settings" msgstr "Configuració General" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "German" msgstr "Alemany" @@ -2737,7 +2766,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" msgstr "Grec" @@ -2769,7 +2798,7 @@ msgstr "Modificacions" msgid "Header checksum failed" msgstr "Comprovació de la checksum de capçalera ha fallat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hebrew" msgstr "Hebreu" @@ -2830,11 +2859,12 @@ msgid "Hotkey Configuration" msgstr "Tecla d'accés de configuració" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 msgid "Hotkeys" msgstr "Tecles d'accés" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hungarian" msgstr "Hongarès" @@ -2866,7 +2896,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destinació dolenta" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "Configuració de IPL" @@ -2882,11 +2912,11 @@ msgstr "Punter IR" msgid "IR Sensitivity:" msgstr "Sensibilitat d'IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "Detalls d'ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "Directoris ISO:" @@ -2898,6 +2928,12 @@ msgstr "ITÀLIA" msgid "Icon" msgstr "Icona" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" @@ -2905,7 +2941,7 @@ msgstr "" "Si el FPS és irregular, aquesta opció pot ser útil. (Activat = compatible, " "Desactivat = ràpid)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 msgid "" "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." @@ -2997,7 +3033,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "En Joc" @@ -3026,7 +3062,7 @@ msgstr "Insereix" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inseriu el codi xifrat o desxifrat aquí ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "Inserir la targeta SD" @@ -3038,7 +3074,7 @@ msgstr "Introduïu un nom aquí .." msgid "Install WAD" msgstr "Instal·lar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 msgid "Install to Wii Menu" msgstr "Instal·lar al Menú de Wii" @@ -3049,23 +3085,23 @@ msgstr "" "InstallExceptionHandler cridat, però aquesta plataforma no està suportada " "encara." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 msgid "Installing WAD..." msgstr "Instal·lant WAD ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 msgid "Interface" msgstr "Interfície" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "Configuració d'interfície" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "Error intern LZO - la compressió ha fallat" -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3074,7 +3110,7 @@ msgstr "" "Error intern LZO - descompressió fallada (% d) (%li, %li) \n" "Intenteu carregar l'estat de nou" -#: Source/Core/Core/Src/State.cpp:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "Error intern LZO - lzo_init () ha fallat" @@ -3082,11 +3118,11 @@ msgstr "Error intern LZO - lzo_init () ha fallat" msgid "Internal Resolution:" msgstr "Resolució Interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "Intèrpret (molt lent)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "Introducció" @@ -3103,7 +3139,7 @@ msgstr "Valor invàlid!" msgid "Invalid bat.map or dir entry" msgstr "Invàlid bat.map o entrada al directori" -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "Tipus d'esdeveniment invàlid %i" @@ -3123,17 +3159,17 @@ msgstr "" "% s\n" "És possible que necessiti re-descarregar aquest joc." -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "Enregistrament de fitxer invàlid" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "Estat invàlid" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Italian" msgstr "Italià" @@ -3141,16 +3177,16 @@ msgstr "Italià" msgid "JAPAN" msgstr "JAPÓ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "Recompilador JIT (recomanat)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "Recompilador JITIL experimental" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Japanese" msgstr "Japonès" @@ -3159,16 +3195,17 @@ msgid "KOREA" msgstr "COREA" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "Clau" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Korean" msgstr "Corea" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "L" @@ -3177,11 +3214,11 @@ msgid "L Button" msgstr "Botó L" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" msgstr "L-Analògic" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "Idioma:" @@ -3204,6 +3241,7 @@ msgid "Left Stick" msgstr "Palanca esquerra" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3233,7 +3271,7 @@ msgstr "" msgid "Less Than" msgstr "Menys de" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "Limitar per FPS " @@ -3246,34 +3284,42 @@ msgid "Load Custom Textures" msgstr "Carrega textures personalitzades" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 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 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 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 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 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 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 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 msgid "Load State Slot 8" msgstr "Carregar ranura d'estat 8" @@ -3281,11 +3327,11 @@ msgstr "Carregar ranura d'estat 8" msgid "Load State..." msgstr "Carregar Estat..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Carregar el menú del sistema Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar menú del sistema Wii %d%c" @@ -3312,7 +3358,7 @@ msgstr "Carrega els fitxer especificats (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Lock Threads to Cores" msgstr "Bloca els fils d'execució als nuclis" @@ -3367,16 +3413,16 @@ msgstr "Modificació de velocitat MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Arxius MadCatz Gameshark (*.gcs)" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Palanca principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "ID Fabricant:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "Fabricant:" @@ -3398,7 +3444,7 @@ msgid "Memory Byte" msgstr "Byte de memòria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 msgid "Memory Card" msgstr "Targeta de memòria" @@ -3436,7 +3482,7 @@ msgstr "" msgid "Menu" msgstr "Menú" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "Micròfon" @@ -3449,7 +3495,7 @@ msgstr "Mínim" msgid "Misc" msgstr "Altres" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "Altres Configuracions" @@ -3479,7 +3525,7 @@ msgid "Motion Plus" msgstr "Motion Plus®" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" @@ -3598,7 +3644,7 @@ msgstr "NP Tabulador" msgid "NP Up" msgstr "NP Amunt" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3637,7 +3683,7 @@ msgstr "Sobrenom:" msgid "No Country (SDK)" msgstr "No país (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "No s'han trobat ISOs o WADs" @@ -3672,7 +3718,7 @@ msgstr "No s'ha trobat la carpeta de partides desades per el joc %s" msgid "None" msgstr "Cap" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" msgstr "Noruega Bokmaal" @@ -3680,16 +3726,16 @@ msgstr "Noruega Bokmaal" msgid "Not Equal" msgstr "No igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "Sense establir" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Not connected" msgstr "No està connectat" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "Notes" @@ -3731,7 +3777,7 @@ msgstr "Objecte" msgid "Object Range" msgstr "Rang d'objecte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "Apagar" @@ -3746,14 +3792,15 @@ msgstr "Només queden %d blocs disponibles" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Obrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "Obrir directori &contingut" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "Obrir la carpeta de partide&s desades" @@ -3792,7 +3839,7 @@ 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:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Opcions" @@ -3872,12 +3919,12 @@ msgstr "Partició %i" msgid "Patches" msgstr "Pegats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "Camins" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -3886,7 +3933,7 @@ msgstr "Pausa" msgid "Per-Pixel Lighting" msgstr "Il·luminació per píxel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "Perfecte" @@ -3897,20 +3944,22 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 msgid "Play" msgstr "Executar" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "Reproduir enregistrament" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "Reproduir/Pausa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "Jugable" @@ -3922,7 +3971,7 @@ msgstr "Opcions de reproducció" msgid "Players" msgstr "Jugadors" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 msgid "Please confirm..." msgstr "Confirmeu ..." @@ -3934,23 +3983,23 @@ msgstr "Creeu una perspectiva abans de desar" msgid "Plus-Minus" msgstr "Més-Menys" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Polish" msgstr "Polonès" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 msgid "Port 4" msgstr "Port 4" @@ -3959,11 +4008,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese" msgstr "Portuguès" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" msgstr "Portuguès (Brasil)" @@ -3971,6 +4020,21 @@ msgstr "Portuguès (Brasil)" msgid "Post-Processing Effect:" msgstr "Efectes de post-procés:" +#: Source/Core/Core/Src/Movie.cpp:735 +#, c-format +msgid "Premature movie end in PlayController. %u + 8 > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:829 +#, c-format +msgid "Premature movie end in PlayWiimote. %u + %d > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:806 +#, c-format +msgid "Premature movie end in PlayWiimote. %u > %u" +msgstr "" + #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "Preestablerts:" @@ -4013,7 +4077,7 @@ msgid "Quit" msgstr "Sortir" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "R" @@ -4022,7 +4086,7 @@ msgid "R Button" msgstr "Botó R" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" msgstr "R-Analògic" @@ -4039,6 +4103,7 @@ msgid "Range" msgstr "Rang" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "Només lectura" @@ -4110,6 +4175,7 @@ msgid "Refresh" msgstr "Actualitzar" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "Actualitzar llista" @@ -4117,10 +4183,10 @@ msgstr "Actualitzar llista" msgid "Refresh game list" msgstr "Actualitza la llista de jocs" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 msgid "Remove" msgstr "Treure" @@ -4139,6 +4205,7 @@ 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 msgid "Reset" msgstr "Reiniciar" @@ -4161,15 +4228,15 @@ msgid "Right Stick" msgstr "Palanca dreta" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Vibració" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 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:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "Rússia" @@ -4181,7 +4248,7 @@ msgstr "&Desa l'estat" msgid "Safe" msgstr "Segur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Sample Rate:" msgstr "Freqüència de mostreig:" @@ -4196,34 +4263,42 @@ msgid "Save GCI as..." msgstr "Anomena i desa GCI..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 1" msgstr "Desar ranura estat 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 2" msgstr "Desar ranura estat 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 3" msgstr "Desar ranura estat 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 4" msgstr "Desar ranura estat 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 msgid "Save State Slot 5" msgstr "Desar ranura estat 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 msgid "Save State Slot 6" msgstr "Desar ranura estat 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 msgid "Save State Slot 7" msgstr "Desar ranura estat 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 msgid "Save State Slot 8" msgstr "Desar ranura estat 8" @@ -4231,12 +4306,12 @@ msgstr "Desar ranura estat 8" msgid "Save State..." msgstr "Desar Estat ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "Desar com ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "Desar GCM/ISO comprimit" @@ -4244,11 +4319,11 @@ msgstr "Desar GCM/ISO comprimit" msgid "Save current perspective" msgstr "Desar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "Desar GCM/ISO descomprimit" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "La pal·lícula guardada %s és corrupta, s'atura la gravació..." @@ -4257,16 +4332,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:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, c-format msgid "Scanning %s" msgstr "Escanejant %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "Cercant ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "Cercant ..." @@ -4282,7 +4357,7 @@ msgstr "Bloc desplaçament" msgid "Search Filter" msgstr "Filtre de cerca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "Cercar en subcarpetes" @@ -4297,12 +4372,12 @@ msgstr "La secció %s no trobada a SYSCONF" msgid "Select" msgstr "Seleccionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Seleccionar el fitxer de gravació" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 msgid "Select a Wii WAD file to install" msgstr "Seleccionar un fitxer WAD de Wii per instal·lar" @@ -4327,15 +4402,15 @@ msgstr "Seleccioneu finestres flotants" msgid "Select the file to load" msgstr "Seleccioneu el fitxer a carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Seleccioneu el fitxer de partida desada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Seleccioneu l'estat a carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Seleccioneu l'estat a desar" @@ -4405,11 +4480,11 @@ msgstr "Barra de sensors de posició" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "Serbi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4420,7 +4495,7 @@ msgstr "" msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "Definir la imatge ISO per &defecte" @@ -4436,11 +4511,11 @@ msgstr "" "SetARCode_IsActive: L'índex és major que la grandària de la llista de codis " "AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." msgstr "Configuració ..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: No es troba el fitxer de configuració" @@ -4448,7 +4523,7 @@ msgstr "SetupWiiMem: No es troba el fitxer de configuració" msgid "Shake" msgstr "Sacsejar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "Nom curt:" @@ -4508,7 +4583,7 @@ msgstr "Mostrar Japó" msgid "Show Korea" msgstr "Mostrar Corea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "Mostrar Idioma:" @@ -4548,11 +4623,11 @@ msgstr "Mostrar Wad" msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 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:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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 " @@ -4616,15 +4691,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote horitzontal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Xinès simplificat" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "Mida" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 msgid "Skip BIOS" msgstr "Saltar BIOS" @@ -4671,11 +4746,11 @@ msgstr "" msgid "Slot %i" msgstr "Ranura %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 msgid "Slot A" msgstr "Ranura A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 msgid "Slot B" msgstr "Ranura B" @@ -4700,7 +4775,7 @@ msgstr "" "Realment voleu activar el renderitzat per software? Si no n'esteu segurs, " "seleccioneu 'No'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Configuració de so" @@ -4718,9 +4793,9 @@ msgstr "Ha fallat la creació del buffer de so: %s" msgid "Space" msgstr "Espai" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Spanish" msgstr "Espanyol" @@ -4765,7 +4840,7 @@ msgstr "Palanca quadrada" msgid "Standard Controller" msgstr "Control estàndard" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4780,14 +4855,16 @@ msgid "Start Re&cording" msgstr "Iniciar grava&ció" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "Iniciar gravació" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "Estat" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "Estats desats" @@ -4798,6 +4875,7 @@ msgstr "Palanca" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Aturar" @@ -4841,8 +4919,8 @@ msgstr "Arxius de partides desades importats correctament" msgid "Swing" msgstr "Oscil·lació" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "Idioma del sistema:" @@ -4874,9 +4952,14 @@ msgstr "Taula dreta" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" msgstr "Capturar pantalla" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "Prova" @@ -4905,13 +4988,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:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "The chosen directory is already in the list" msgstr "El directori triat ja és a la llista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, c-format msgid "" "The file %s already exists.\n" @@ -5001,7 +5084,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:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "Tema visual" @@ -5033,7 +5116,7 @@ msgstr "" "Aquest simulador «ActionReplay» no és compatible amb els codis que " "modifiquen «ActionReplay»." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "Pot causar alentiment al Menú Wii i alguns jocs." @@ -5055,7 +5138,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -5069,12 +5152,12 @@ msgstr "" "\n" "Drecera de teclat : Arpeta per desactivar-ho." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" "Això s'utilitza per reproduir pistes de música, com BGM (música de fons)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5100,7 +5183,7 @@ msgid "Tilt" msgstr "Inclinació" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr "Títol" @@ -5115,15 +5198,16 @@ msgstr "Activar tots els tipus de registre de Log" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Dalt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Xinés tradicional" @@ -5131,7 +5215,7 @@ msgstr "Xinés tradicional" msgid "Tried to load an unknown file type." msgstr "S'ha intentat de carregar un tipus de fitxer desconegut." -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "Gatells" @@ -5147,7 +5231,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:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Turkish" msgstr "Turc" @@ -5229,15 +5313,6 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "Missatge desconegut amb id: %d rebut des del jugador: Expulsant jugador %d!" -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Punter desconegud %#08x\n" -"Voleu continuar?" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5252,7 +5327,7 @@ msgstr "Actualitzar" msgid "Upright Wiimote" msgstr "Wiimote vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utilitzar mode EuRGB60 (PAL60)" @@ -5264,7 +5339,7 @@ msgstr "Utilitzar pantalla completa" msgid "Use Hex" msgstr "Utilitzeu hexagonal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "Utilitzar advertències" @@ -5320,7 +5395,7 @@ msgstr "Valor:" msgid "Verbosity" msgstr "Verbositat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "Video" @@ -5328,7 +5403,7 @@ msgstr "Video" msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "Volum" @@ -5395,6 +5470,41 @@ 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:629 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, 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" +"\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" +"\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" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -5412,15 +5522,15 @@ msgstr "Modificació de pantalla panoràmica" msgid "Width" msgstr "Ample" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 msgid "Wii NAND Root:" msgstr "Arrel de la NAND:" @@ -5428,7 +5538,7 @@ msgstr "Arrel de la NAND:" msgid "Wii Save Import" msgstr "Importar partida guardada Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 msgid "Wii save files (*.bin)|*.bin" msgstr "Arxius de partida guardada Wii (*.bin)|*.bin" @@ -5459,7 +5569,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:599 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Wiimote Connected" msgstr "Wiimote connectat" @@ -5491,9 +5601,9 @@ msgstr "Finestra dreta" msgid "Word Wrap" msgstr "Envoltant de paraula" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Working..." msgstr "Treballant ..." @@ -5556,7 +5666,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:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Ha de reiniciar Dolphin perquè el canvi tingui efecte." @@ -5579,7 +5689,7 @@ msgstr "" "Hauria de ser 0x%04x (però és 0x%04llx) \n" "Vol generar un de nou?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "Modificador ZTP" @@ -5651,7 +5761,7 @@ msgstr "" msgid "^ ADD" msgstr "^ Afegir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5668,7 +5778,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:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Llegint Opcode des de%x Si us plau, informeu." @@ -5689,7 +5799,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Comanda desconeguda 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute Ha retornat -1 en l'execució de l'aplicació!" @@ -5705,9 +5815,6 @@ msgstr "Correcció ZAprop" msgid "| OR" msgstr "| O" -#~ msgid " Graphics Configuration" -#~ msgstr "Configuració de gràfics" - #~ msgid "(Default)" #~ msgstr "(Per defecte)" @@ -5758,6 +5865,9 @@ msgstr "| O" #~ "de per vèrtex. \n" #~ "Aquest és un comportament més precís, però redueix el rendiment." +#~ msgid "Cannot record movies in read-only mode." +#~ msgstr "No es poden gravar vídeos a mode només lectura." + #~ msgid "Configuration profile" #~ msgstr "Perfil de configuració" @@ -6065,6 +6175,13 @@ msgstr "| O" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Iniciar la finestra de renderitzat a pantalla completa." +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "Punter desconegud %#08x\n" +#~ "Voleu continuar?" + #~ msgid "Use FPS For Limiting" #~ msgstr "Limitar imatges/s (FPS)" diff --git a/Languages/po/cs.po b/Languages/po/cs.po index 19eaf2e9f2..1937128a37 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: 2011-10-11 23:25-0500\n" +"POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-15 14:50+0100\n" "Last-Translator: ZbynÄ›k Schwarz \n" "Language-Team: \n" @@ -49,9 +49,9 @@ msgstr "\"%s\" je neplatný soubor GCM/ISO, nebo není GC/Wii ISO." msgid "%1$sCopy%1$s" msgstr "%1$sKopírovat%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -179,11 +179,11 @@ msgstr "Správce &Cheatů" msgid "&DSP Settings" msgstr "&DSP Nastavení" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "&Smazat ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 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:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "&Vlastnosti" @@ -291,7 +291,7 @@ msgstr "&Zobrazit" msgid "&Wiimote Settings" msgstr "&Wiimote Nastavení" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "&Wiki" @@ -340,10 +340,11 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -399,8 +400,8 @@ msgstr "" "\n" "Musíte pÅ™esmÄ›rovat Váš TCP port na hostitele!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "AM Základní Deska" @@ -439,6 +440,7 @@ msgstr "" "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 msgid "Action" msgstr "ÄŒinnost" @@ -538,11 +540,11 @@ msgstr "Adaptér:" msgid "Add" msgstr "PÅ™idat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "PÅ™idat kód ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "PÅ™idat Záplatu" @@ -550,9 +552,9 @@ msgstr "PÅ™idat Záplatu" msgid "Add new pane" msgstr "PÅ™idat nový panel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Add..." msgstr "PÅ™idat..." @@ -604,7 +606,7 @@ msgstr "Upravte tlak analogového ovládání potÅ™ebný k aktivaci tlaÄítek." msgid "Advanced" msgstr "PokroÄilé" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "PokroÄilá Nastavení" @@ -612,28 +614,28 @@ msgstr "PokroÄilá Nastavení" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "VÅ¡echny soubory GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "VÅ¡echny obrazy GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "VÅ¡echny Uložené Stavy (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "VÅ¡echny soubory Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "VÅ¡echny komprimované soubory GC/WII ISO (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "VÅ¡echny soubory (*.*)|*.*" @@ -669,7 +671,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:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "ZavadÄ›Ä aplikace:" @@ -687,7 +689,7 @@ msgstr "" "\n" " Pokud si nejste jisti, zvolte (vypnuto)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "ArabÅ¡tina" @@ -696,7 +698,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:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -704,11 +706,11 @@ msgstr "" "Jste si jisti, že chcete tyto soubory smazat?\n" "Budou navždy ztraceny!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 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:725 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "PomÄ›r Stran:" @@ -717,11 +719,11 @@ 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:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" msgstr "Backend Zvuku:" @@ -729,7 +731,7 @@ 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:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -772,7 +774,7 @@ msgstr "" msgid "Back" msgstr "ZpÄ›t" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" msgstr "Nastavení Backendu" @@ -782,7 +784,7 @@ msgid "Backend:" msgstr "Backend:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Zadní Vstup" @@ -795,15 +797,15 @@ msgid "Bad File Header" msgstr "Å patná hlaviÄka souboru" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr "Plakát" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "Detaily Plakátu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "Plakát:" @@ -815,7 +817,7 @@ msgstr "Vibráto" msgid "Basic" msgstr "Základní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "Základní nastavení" @@ -844,7 +846,7 @@ msgid "Blue Right" msgstr "Modrá vpravo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Dole" @@ -853,7 +855,7 @@ msgstr "Dole" msgid "Bound Controls: %lu" msgstr "Spojené ovladaÄe: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "Rozbité" @@ -861,7 +863,7 @@ msgstr "Rozbité" msgid "Browse" msgstr "Procházet" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "Procházet pro pÅ™idání adresáře" @@ -869,7 +871,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:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "Procházet pro výstupní adresář" @@ -877,7 +879,7 @@ msgstr "Procházet pro výstupní adresář" msgid "Buffer:" msgstr "Vyrovnávací paměť:" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -887,11 +889,11 @@ msgstr "TlaÄítka" msgid "C Stick" msgstr "Kr Stick" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "Kr-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "Jádro Emulátoru Procesoru" @@ -941,15 +943,11 @@ msgstr "ZruÅ¡it" msgid "Cannot open %s" msgstr "Nelze otevřít %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "V režimu pouze pro Ätení nelze nahrávát filmy." - #: Source/Core/Core/Src/CoreTiming.cpp:122 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:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -960,7 +958,7 @@ msgstr "" "%s\n" "není platný soubor paměťové karty gamecube" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -989,7 +987,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:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "KatalánÅ¡tina" @@ -1006,6 +1004,7 @@ msgid "Change &Disc..." msgstr "VymÄ›nit &Disk..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "VymÄ›nit Disk" @@ -1013,7 +1012,7 @@ msgstr "VymÄ›nit Disk" msgid "Change Game" msgstr "ZmÄ›nit hru" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1029,8 +1028,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:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "ZmÄ›na tohoto se neprojeví, pokud emulátor běží!" @@ -1050,31 +1049,31 @@ msgstr "Hledání Cheatů" msgid "Cheats Manager" msgstr "Správce Cheatů" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "ČínÅ¡tina (ZjednoduÅ¡ená)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "ČínÅ¡tina (TradiÄní)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "Zvolte koÅ™enový adresář DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Choose a NAND root directory:" msgstr "Zvolte koÅ™enový adresář NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "Zvolte výchozí ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "Zvolte adresář k pÅ™idání" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "Zvolte soubor k otevÅ™ení" @@ -1082,7 +1081,7 @@ msgstr "Zvolte soubor k otevÅ™ení" msgid "Choose a memory card:" msgstr "Zvolte paměťovou kartu:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1090,8 +1089,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:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "Zvolte adresář pro umístÄ›ní extrakce" @@ -1110,7 +1109,7 @@ msgstr "Klasické" msgid "Clear" msgstr "VyÄistit" -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." msgstr "VyÄiÅ¡tÄ›ní selhalo" @@ -1123,7 +1122,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Zavřít" @@ -1148,20 +1147,20 @@ msgstr "Příkaz" msgid "Comment" msgstr "Komentář" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "Komentář:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "Komprimovat ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "Komprimovat vybraná ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "Komprimuji ISO" @@ -1188,13 +1187,13 @@ msgstr "Nastavit Pady" msgid "Configure..." msgstr "Nastavit..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "Potvrdit PÅ™epsání Souboru" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Confirm on Stop" msgstr "PÅ™i zastavení Potvrdit" @@ -1203,7 +1202,7 @@ msgstr "PÅ™i zastavení Potvrdit" msgid "Connect" msgstr "PÅ™ipojit" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "PÅ™ipojit USB Klávesnici" @@ -1213,22 +1212,26 @@ msgid "Connect Wiimote %i" msgstr "PÅ™ipojit Wiimote %i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "PÅ™ipojit Wiimote 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "PÅ™ipojit Wiimote 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "PÅ™ipojit Wiimote 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "PÅ™ipojit Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Connecting..." msgstr "PÅ™ipojuji..." @@ -1253,7 +1256,7 @@ msgstr "Kopírování selhalo" msgid "Copy to Memcard %c" msgstr "Kopírovat na Paměťovou kartu %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "Jádro" @@ -1283,7 +1286,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Nelze rozpoznat ISO soubor %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "Nelze uložit %s" @@ -1309,7 +1312,7 @@ 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:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "Nelze najít příkaz pro otevÅ™ení přípony 'ini'!" @@ -1326,7 +1329,7 @@ msgstr "" msgid "Count:" msgstr "PoÄet:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "ZemÄ›:" @@ -1340,21 +1343,21 @@ msgstr "VytvoÅ™it AR kód" msgid "Create new perspective" msgstr "VytvoÅ™it novou perspektivu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr "VytvoÅ™il KDE-look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr "VytvoÅ™il VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 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" @@ -1389,7 +1392,7 @@ msgstr "Crossfade" 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:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" msgstr "Vlastní Hack Projekce" @@ -1397,15 +1400,15 @@ msgstr "Vlastní Hack Projekce" msgid "Custom Projection Hack Settings" msgstr "Nastavení Vlastního Hacku Projekce" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." msgstr "PÅ™izpůsobte nÄ›které Ortografické parametry Projekce" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "ÄŒeÅ¡tina" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "D-Pad" @@ -1413,24 +1416,24 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP Emulator Engine" msgstr "Jádro Emulátoru DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulace (rychlé)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE pÅ™evadÄ›Ä (pomalé)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP LLE on Thread" msgstr "DSP LLE ve VláknÄ›" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "DSP LLE rekompilátor" @@ -1438,7 +1441,7 @@ msgstr "DSP LLE rekompilátor" msgid "DSP settings" msgstr "Nastavení DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "KoÅ™en DVD:" @@ -1446,7 +1449,7 @@ msgstr "KoÅ™en DVD:" msgid "Data Size" msgstr "Velikost data" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "Datum:" @@ -1475,16 +1478,16 @@ msgstr "LadÄ›ní" msgid "Decimal" msgstr "Desetinné" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "Dekomprimovat ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "Dekomprimovat vybraná ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "Dekomprimuji ISO" @@ -1492,7 +1495,7 @@ msgstr "Dekomprimuji ISO" msgid "Default" msgstr "Výchozí" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "Výchozí ISO:" @@ -1536,8 +1539,8 @@ msgstr "" msgid "Device" msgstr "Zařízení" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "Nastavení Zařízení" @@ -1622,7 +1625,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "Disk" @@ -1649,11 +1652,11 @@ msgstr "" msgid "Divide" msgstr "RozdÄ›lit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 msgid "Do you want to stop the current emulation?" msgstr "Chcete souÄasnou emulaci zastavit?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "Dolphin" @@ -1678,12 +1681,12 @@ msgstr "Nastavení Emulovaného Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Nastavení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" @@ -1695,7 +1698,7 @@ msgstr "Dolphin Wiimote Nastavení" msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1703,7 +1706,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:307 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1733,7 +1736,7 @@ msgstr "Bubny" msgid "Dummy" msgstr "Atrapa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Vypsat Zvuk" @@ -1779,9 +1782,9 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "NizozemÅ¡tina" @@ -1833,8 +1836,8 @@ msgstr "Upravit záplatu" msgid "Edit current perspective" msgstr "Upravit souÄasnou perspektivu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "Upravit" @@ -1846,7 +1849,7 @@ msgstr "Efekt" msgid "Embedded Frame Buffer" msgstr "VnoÅ™ená Vyr. PamÄ›t Snímků" -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "Vlákno Emulace již běží" @@ -1884,7 +1887,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emulovaný Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "Stav Emulace:" @@ -1912,7 +1915,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "Povolit protokolování AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "Zapnout PÅ™iÅ¡krcení Zvuku" @@ -1924,15 +1927,19 @@ msgstr "Zapnout BAT" msgid "Enable Block Merging" msgstr "Zapnout SluÄování Bloků" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Povolit vyrovnávací paměť" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Cheats" msgstr "Povolit Cheaty" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "Zapnout DTK Hudbu" @@ -1940,7 +1947,7 @@ msgstr "Zapnout DTK Hudbu" msgid "Enable Dual Core" msgstr "Povolit dvojité jádro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "Zapnout dvojité jádro (zrychlení)" @@ -1952,7 +1959,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:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "Povolit PÅ™eskakování NeÄinných Příkazů (zrychlení)" @@ -1965,7 +1972,7 @@ msgstr "Zapnout MMU" msgid "Enable Progressive Scan" msgstr "Povolit Progresivní Skenování" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Enable Screen Saver" msgstr "Povolit SpoÅ™iÄ Obrazovky" @@ -2028,7 +2035,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2046,7 +2053,7 @@ msgstr "" "napodobuje hardware, ale je emulován pomalu. (ZAPNUTO = Kompatibilní, " "VYPNUTO = Rychlé)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" msgstr "Povolit Vlastní Hack Projekce" @@ -2084,9 +2091,9 @@ msgstr "" msgid "End" msgstr "End" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "AngliÄtina" @@ -2115,16 +2122,30 @@ msgstr "Rovná se" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Chyba" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 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." -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2158,11 +2179,12 @@ msgstr "UkonÄit Dolphin s emulátorem" msgid "Export Failed" msgstr "Export Selhal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "Exportovat Soubor" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "Exportovat Nahrávku" @@ -2174,7 +2196,7 @@ msgstr "Exportovat Nahrávku..." msgid "Export Save" msgstr "Exportovat Uloženou hru" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "Exportovat uloženou hru Wii (Experimentální)" @@ -2206,44 +2228,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:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "Extrahovat VÅ¡echny Soubory..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "Extrahovat ZavadÄ›Ä Aplikace..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "Extrahovat DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "Extrahovat Adresář..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "Extrahovat Soubor..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "Extrahovat Oddíl..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "Extrahuji %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "Extrahuji VÅ¡echny Soubory" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "Extrahuji Adresář" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "Extrahuji..." @@ -2259,7 +2281,7 @@ msgstr "PÅ™ehrávaÄ FIFO" msgid "FRANCE" msgstr "FRANCIE" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "Velikost FST:" @@ -2275,7 +2297,7 @@ msgstr "Naslouchání Selhalo!!" msgid "Failed to download codes." msgstr "Stahování kódů selhalo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "Nelze extrahovat do %s!" @@ -2451,11 +2473,11 @@ 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:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "Souborový systém" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Typ souboru 'ini' je neznámý! Nelze otevřít!" @@ -2475,7 +2497,7 @@ msgstr "Vynutit 16:9" msgid "Force 4:3" msgstr "Vynutit 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Force Console as NTSC-J" msgstr "Donutit konzoli být jako NTSC-J" @@ -2507,7 +2529,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2539,6 +2561,7 @@ msgid "Frame " msgstr "Snímek" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "Postup Snímkem" @@ -2554,7 +2577,7 @@ msgstr "Rozsah Snímku" msgid "Frame S&kipping" msgstr "PÅ™es&kakování snímků:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "Limit Snímků:" @@ -2566,9 +2589,9 @@ msgstr "Snímky k Nahrání" msgid "Free Look" msgstr "Rozhlížení pomocí myÅ¡i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "French" msgstr "FrancouzÅ¡tina" @@ -2593,11 +2616,16 @@ msgstr "RozliÅ¡ení celé obrazovky:" msgid "GCI File(*.gci)" msgstr "Soubor GCI(*.gci)" +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +#, fuzzy +msgid "GCMic Configuration" +msgstr "Nastavení Záznamu" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "ID Hry:" @@ -2613,7 +2641,7 @@ msgstr "Hra neběží!" msgid "Game not found!!" msgstr "Hra nenalezena!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "Nastavení Konkrétní Hry" @@ -2621,7 +2649,7 @@ msgstr "Nastavení Konkrétní Hry" msgid "GameConfig" msgstr "Nastavení Hry" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "Gamecube" @@ -2630,7 +2658,7 @@ msgid "Gamecube &Pad Settings" msgstr "Nastavení Gamecube &Pad" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" @@ -2653,7 +2681,8 @@ msgstr "" "(buÄ Å¡patný kód, nebo typ kódu není jeÅ¡tÄ› podporován.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Obecné" @@ -2662,9 +2691,9 @@ msgstr "Obecné" msgid "General Settings" msgstr "Obecná Nastavení" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "German" msgstr "NÄ›mÄina" @@ -2702,7 +2731,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" msgstr "ŘeÄtina" @@ -2734,7 +2763,7 @@ msgstr "Hacky" msgid "Header checksum failed" msgstr "Kontrolní souÄet hlaviÄky selhal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hebrew" msgstr "HebrejÅ¡tina" @@ -2794,11 +2823,12 @@ msgid "Hotkey Configuration" msgstr "Nastavení klávesových zkratek" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 msgid "Hotkeys" msgstr "Klávesové zkratky" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hungarian" msgstr "MaÄarÅ¡tina" @@ -2828,7 +2858,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - Å¡patný cíl" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "Nastavení IPL" @@ -2844,11 +2874,11 @@ msgstr "InfraÄer. Ukazovátko" msgid "IR Sensitivity:" msgstr "Citlivost InfraÄer.:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "Detaily ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "Adresáře ISO" @@ -2860,6 +2890,12 @@ msgstr "ITÃLIE" msgid "Icon" msgstr "Ikona" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" @@ -2867,7 +2903,7 @@ msgstr "" "Pokud jsou SzS nestálé, tato volba může pomoci. (ZAPNUTO = Kompatibilní, " "VYPNUTO = Rychlé)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 msgid "" "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." @@ -2957,7 +2993,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "Ve HÅ™e" @@ -2986,7 +3022,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:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "Vložit SD Kartu" @@ -2998,7 +3034,7 @@ msgstr "Zde vložte jméno..." msgid "Install WAD" msgstr "Instalovat WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 msgid "Install to Wii Menu" msgstr "Instalovat do Wii Menu" @@ -3009,23 +3045,23 @@ msgstr "" "Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› " "nepodporuje." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 msgid "Installing WAD..." msgstr "Instaluji WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 msgid "Interface" msgstr "Rozhraní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "Nastavení Rozhraní" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "VnitÅ™ní chyba LZO - komprimace selhala" -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3034,7 +3070,7 @@ msgstr "" "VnitÅ™ní chyba LZO - dekomprimace selhala (%d) (%ld, %ld) \n" "Zkuste znovu nahrát stav" -#: Source/Core/Core/Src/State.cpp:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "VnitÅ™ní chyba LZO - lzo_init() selhalo" @@ -3042,11 +3078,11 @@ msgstr "VnitÅ™ní chyba LZO - lzo_init() selhalo" msgid "Internal Resolution:" msgstr "VnitÅ™ní RozliÅ¡ení:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "PÅ™evadÄ›Ä (VELMI pomalé)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "Intro" @@ -3063,7 +3099,7 @@ msgstr "Neplatná Hodnota!" msgid "Invalid bat.map or dir entry" msgstr "Neplatný bat.map nebo záznam adr." -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "Neplatná událost typu %i" @@ -3083,17 +3119,17 @@ msgstr "" "%s\n" "Možná budete muset hru znovu vypsat." -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "Neplatný soubor s nahrávkou" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "Neplatný stav" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Italian" msgstr "ItalÅ¡tina" @@ -3101,16 +3137,16 @@ msgstr "ItalÅ¡tina" msgid "JAPAN" msgstr "JAPONSKO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "JIT Rekompilátor (doporuÄeno)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "JITIL experimentální rekompilátor" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Japanese" msgstr "JaponÅ¡tina" @@ -3119,16 +3155,17 @@ msgid "KOREA" msgstr "KOREA" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "Klávesa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Korean" msgstr "KorejÅ¡tina" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "L" @@ -3137,11 +3174,11 @@ msgid "L Button" msgstr "TlaÄítko L" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" msgstr "Levý Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "Jazyk:" @@ -3164,6 +3201,7 @@ msgid "Left Stick" msgstr "Levý Stick" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3193,7 +3231,7 @@ msgstr "" msgid "Less Than" msgstr "Menší než" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "Limitovat podle SzS" @@ -3206,34 +3244,42 @@ msgid "Load Custom Textures" msgstr "Nahrát Vlastní Textury" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 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 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 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 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 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 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 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 msgid "Load State Slot 8" msgstr "Nahrát Slot Stavu 8" @@ -3241,11 +3287,11 @@ msgstr "Nahrát Slot Stavu 8" msgid "Load State..." msgstr "Nahrát Stav..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Nahrát Systémové Menu Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Nahrát Systémové Menu Wii %d%c" @@ -3272,7 +3318,7 @@ msgstr "Nahraje urÄený soubor (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Místní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Lock Threads to Cores" msgstr "Uzamknout Vlákna do Jader" @@ -3327,16 +3373,16 @@ msgstr "MMU Hack Rychlosti" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Soubory MadCatz Gameshark (*.gcs)" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Hlavní Stick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "ID Výrobce:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "Výrobce:" @@ -3358,7 +3404,7 @@ msgid "Memory Byte" msgstr "Bajt PamÄ›ti" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 msgid "Memory Card" msgstr "Paměťová karta" @@ -3395,7 +3441,7 @@ msgstr "Velikost paměťové karty se neshoduje s velikosti hlaviÄky" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "Mikrofon" @@ -3408,7 +3454,7 @@ msgstr "Min" msgid "Misc" msgstr "Ostatní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "Ostatní Nastavení" @@ -3438,7 +3484,7 @@ msgid "Motion Plus" msgstr "Motion Plus" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" @@ -3556,7 +3602,7 @@ msgstr "NK Tab" msgid "NP Up" msgstr "NK Nahoru" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3595,7 +3641,7 @@ msgstr "PÅ™ezdívka :" msgid "No Country (SDK)" msgstr "Žádná ZemÄ› (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "Nenalezena žádná ISO nebo WADS" @@ -3630,7 +3676,7 @@ msgstr "Nebyl nalezen žádný ukládací adresář pro název %s" msgid "None" msgstr "Žádný" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" msgstr "Norský BokmÃ¥l" @@ -3638,16 +3684,16 @@ msgstr "Norský BokmÃ¥l" msgid "Not Equal" msgstr "Nerovná se" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "Nenastaven" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Not connected" msgstr "NepÅ™ipojen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "Poznámky" @@ -3689,7 +3735,7 @@ msgstr "Objekt" msgid "Object Range" msgstr "Rozsah Objektu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "Vypnuto" @@ -3704,14 +3750,15 @@ msgstr "Pouze bloky %d jsou dostupné" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: 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:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "Otevřít &adresář umístÄ›ní" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "Otevřít Wii adre&sář uložení" @@ -3750,7 +3797,7 @@ msgid "Opens the logger" msgstr "OtevÅ™e protokol" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Volby" @@ -3829,12 +3876,12 @@ msgstr "Oddíl %i" msgid "Patches" msgstr "Záplaty" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "Cesty" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pozastavit" @@ -3843,7 +3890,7 @@ msgstr "Pozastavit" msgid "Per-Pixel Lighting" msgstr "OsvÄ›tlení Podle Pixelu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "Dokonalá" @@ -3854,20 +3901,22 @@ msgstr "Perspektiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 msgid "Play" msgstr "Spustit" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "PÅ™ehrát nahrávku" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "PÅ™ehrát/Pozastavit" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "Hratelné" @@ -3879,7 +3928,7 @@ msgstr "Možnosti PÅ™ehrávání" msgid "Players" msgstr "HráÄi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 msgid "Please confirm..." msgstr "Prosím potvrÄte..." @@ -3891,23 +3940,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:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Polish" msgstr "PolÅ¡tina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 msgid "Port 4" msgstr "Port 4" @@ -3916,11 +3965,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese" msgstr "PortugalÅ¡tina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" msgstr "PortugalÅ¡tina (Brazilská)" @@ -3928,6 +3977,21 @@ msgstr "PortugalÅ¡tina (Brazilská)" msgid "Post-Processing Effect:" msgstr "Efekt Následného Zpracování:" +#: Source/Core/Core/Src/Movie.cpp:735 +#, c-format +msgid "Premature movie end in PlayController. %u + 8 > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:829 +#, c-format +msgid "Premature movie end in PlayWiimote. %u + %d > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:806 +#, c-format +msgid "Premature movie end in PlayWiimote. %u > %u" +msgstr "" + #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "PÅ™edvolby:" @@ -3970,7 +4034,7 @@ msgid "Quit" msgstr "UkonÄit" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "R" @@ -3979,7 +4043,7 @@ msgid "R Button" msgstr "TlaÄítko R" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" msgstr "Pravý Analog" @@ -3996,6 +4060,7 @@ msgid "Range" msgstr "Rozsah" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "Režim pouze pro Ätení" @@ -4066,6 +4131,7 @@ msgid "Refresh" msgstr "Obnovit" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "Obnovit Seznam" @@ -4073,10 +4139,10 @@ msgstr "Obnovit Seznam" msgid "Refresh game list" msgstr "Obnovit seznam her" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 msgid "Remove" msgstr "Odstranit" @@ -4095,6 +4161,7 @@ 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 msgid "Reset" msgstr "Resetovat" @@ -4117,15 +4184,15 @@ msgid "Right Stick" msgstr "Pravý Stick" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Vibrace" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 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:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "RuÅ¡tina" @@ -4137,7 +4204,7 @@ msgstr "Uložit Sta&v" msgid "Safe" msgstr "BezpeÄná" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Sample Rate:" msgstr "Vzorkovací frekvence:" @@ -4152,34 +4219,42 @@ msgid "Save GCI as..." msgstr "Uložit GCI jako..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 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 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 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 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 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 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 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 msgid "Save State Slot 8" msgstr "Uložit do Slotu Stavu 8" @@ -4187,12 +4262,12 @@ msgstr "Uložit do Slotu Stavu 8" msgid "Save State..." msgstr "Uložit Stav..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "Uložit jako" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "Uložit komprimované GCM/ISO" @@ -4200,11 +4275,11 @@ msgstr "Uložit komprimované GCM/ISO" msgid "Save current perspective" msgstr "Uložit souÄasnou perspektivu" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "Uložit dekomprimované GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, 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..." @@ -4213,16 +4288,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:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, c-format msgid "Scanning %s" msgstr "Skenuji %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "Skenuji pro ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "Skenuji..." @@ -4238,7 +4313,7 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Hledat Filtr" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "Hledat Podadresáře" @@ -4253,12 +4328,12 @@ msgstr "Sekce %s nebyla v SYSCONF nalezena" msgid "Select" msgstr "Vybrat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Vyberte Soubor s Nahrávkou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" @@ -4284,15 +4359,15 @@ msgstr "Vybrat plovoucí okna" msgid "Select the file to load" msgstr "Vyberte soubor k nahrání" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Vyberte stav k nahrání" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Vyberte stav k uložení" @@ -4361,11 +4436,11 @@ msgstr "UmístÄ›ní Senzorové TyÄe:" msgid "Separator" msgstr "OddÄ›lovaÄ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "SrbÅ¡tina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4376,7 +4451,7 @@ msgstr "" msgid "Set" msgstr "Nastavit" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "Nastavit jako &výchozí ISO" @@ -4390,11 +4465,11 @@ 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:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." msgstr "Nastavení..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Nelze najít soubor s nastavením" @@ -4402,7 +4477,7 @@ msgstr "SetupWiiMem: Nelze najít soubor s nastavením" msgid "Shake" msgstr "TÅ™es" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "Krátké Jméno:" @@ -4462,7 +4537,7 @@ msgstr "Zobrazit JAP" msgid "Show Korea" msgstr "Zobrazit Koreu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "Jazyk Zobrazení:" @@ -4502,11 +4577,11 @@ msgstr "Zobrazit Wad" msgid "Show Wii" msgstr "Zobrazit Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 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:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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 " @@ -4570,15 +4645,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Å ikmý Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "ZjednoduÅ¡ená ÄínÅ¡tina" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "Velikost" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 msgid "Skip BIOS" msgstr "PÅ™eskoÄit BIOS" @@ -4624,11 +4699,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 msgid "Slot B" msgstr "Slot B" @@ -4653,7 +4728,7 @@ msgstr "" "Opravdu chcete zapnout softwarové vykreslování? Pokud si nejste jisti, " "zvolte 'Ne'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Nastavení Zvuku" @@ -4671,9 +4746,9 @@ msgstr "VytvoÅ™ení vyrovnávací pamÄ›ti zvuku selhalo: %s" msgid "Space" msgstr "Mezerník" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Spanish" msgstr "Å panÄ›lÅ¡tina" @@ -4717,7 +4792,7 @@ msgstr "ÄŒtvercový Stick" msgid "Standard Controller" msgstr "Standardní OvladaÄ" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4732,14 +4807,16 @@ msgid "Start Re&cording" msgstr "ZaÄít na&hrávat" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "ZaÄít Nahrávat" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "Stav" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "Ukládání stavu" @@ -4750,6 +4827,7 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Zastavit" @@ -4793,8 +4871,8 @@ msgstr "Uložení byly úspěšnÄ› importovány" msgid "Swing" msgstr "Å vihnutí" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "Jazyk Systému:" @@ -4826,9 +4904,14 @@ msgstr "Deska vpravo" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" msgstr "VytvoÅ™it Snímek Obrazovky" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "Test" @@ -4857,13 +4940,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:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "The chosen directory is already in the list" msgstr "Zvolený adresář je už v seznamu" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, c-format msgid "" "The file %s already exists.\n" @@ -4952,7 +5035,7 @@ msgstr "Zadaný soubor \"%s\" neexistuje" msgid "The value is invalid" msgstr "Hodnota je neplatná" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "Vzhled" @@ -4984,7 +5067,7 @@ msgstr "" "Tento simulátor action replay nepodporuje kód, který mÄ›ní samotný Action " "Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 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." @@ -5006,7 +5089,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -5020,12 +5103,12 @@ msgstr "" "\n" "Klávesová Zkratka : Podržte pro okamžité vypnutí ZaÅ¡krcení." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" "Toto se používá pro pÅ™ehrávání hudebních stop, jako napÅ™. hudba v pozadí." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5050,7 +5133,7 @@ msgid "Tilt" msgstr "NaklánÄ›ní" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr "Název" @@ -5065,15 +5148,16 @@ msgstr "Zapnout VÅ¡echny Typy Záznamů" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "NahoÅ™e" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "TradiÄní ČínÅ¡tina" @@ -5081,7 +5165,7 @@ msgstr "TradiÄní ČínÅ¡tina" msgid "Tried to load an unknown file type." msgstr "Pokus o naÄtení souboru neznámého typu." -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "SpínaÄe" @@ -5097,7 +5181,7 @@ msgstr "" "Pokus o Ätení z neplatného SYSCONF\n" "ID bt wiimote nejsou dostupné" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Turkish" msgstr "TureÄtina" @@ -5178,15 +5262,6 @@ msgstr "PÅ™ijata neznámá zpráva s id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Neznámá zpráva s id:%d pÅ™ijata od hráÄe:%d Vyhazuji hráÄe!" -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Neznámý ukazatel %#08x\n" -"PokraÄovat?" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5201,7 +5276,7 @@ msgstr "Aktualizovat" msgid "Upright Wiimote" msgstr "Svislý Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Použít režim EuRGB60 (PAL60)" @@ -5213,7 +5288,7 @@ msgstr "Použít Celou Obrazovku" msgid "Use Hex" msgstr "Použít Å estnáctkovou soustavu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "Použít Obslužné Rutiny Paniky" @@ -5268,7 +5343,7 @@ msgstr "Hodnota:" msgid "Verbosity" msgstr "Úroveň" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "Obraz" @@ -5276,7 +5351,7 @@ msgstr "Obraz" msgid "Virtual" msgstr "Virtuální" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "Hlasitost" @@ -5341,6 +5416,41 @@ msgstr "" "a mají stejný název jako soubor na VaÅ¡i paměťové kartÄ›\n" "PokraÄovat?" +#: Source/Core/Core/Src/Movie.cpp:629 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, 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" +"\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" +"\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" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -5358,15 +5468,15 @@ msgstr "Hack Å irokoúhlého obrazu" msgid "Width" msgstr "Šířka" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "Konzole Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 msgid "Wii NAND Root:" msgstr "Wii KoÅ™en NAND:" @@ -5374,7 +5484,7 @@ msgstr "Wii KoÅ™en NAND:" msgid "Wii Save Import" msgstr "Import uložených pozic Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -5405,7 +5515,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:599 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Wiimote Connected" msgstr "Wiimote PÅ™ipojen" @@ -5437,9 +5547,9 @@ msgstr "Klávesa Windows Vpravo" msgid "Word Wrap" msgstr "Zalamování textu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Working..." msgstr "Pracuji..." @@ -5504,7 +5614,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "Musíte zadat platné jméno profilu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Pro uplatnÄ›ní zmÄ›n musíte Dolphin restartovat." @@ -5527,7 +5637,7 @@ msgstr "" "MÄ›l by být 0x%04x (ale je 0x%04llx)\n" "Chcete vytvoÅ™it nový?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "ZTP hack" @@ -5599,7 +5709,7 @@ msgstr "" msgid "^ ADD" msgstr "^ PŘIDAT" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "zavadÄ›Ä aplikace (.img)" @@ -5616,7 +5726,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:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: PÅ™eÄten Opcode z %x. Prosím nahlaste." @@ -5635,7 +5745,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "neznámý příkaz 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute pÅ™i bÄ›hu aplikace vrátil -1!" @@ -5727,6 +5837,9 @@ msgstr "| NEBO" #~ "vertexu.\n" #~ "Toto je správnÄ›jší chování, ale snižuje výkon." +#~ msgid "Cannot record movies in read-only mode." +#~ msgstr "V režimu pouze pro Ätení nelze nahrávát filmy." + #~ msgid "Config..." #~ msgstr "Nastavení..." @@ -6050,6 +6163,13 @@ msgstr "| NEBO" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Spustí vykreslovací okno v režimu celé obrazovky." +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "Neznámý ukazatel %#08x\n" +#~ "PokraÄovat?" + #~ msgid "Use FPS For Limiting" #~ msgstr "Použít SzS pro Omezení" diff --git a/Languages/po/de.po b/Languages/po/de.po index 836afc91d3..e33919c10f 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: 2011-10-11 23:25-0500\n" +"POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-02-17 01:23+0100\n" "Last-Translator: LucasX \n" "Language-Team: \n" @@ -49,9 +49,9 @@ msgstr "\"%s\" ist ein ungültiges GC/Wii-Image, oder kein GC/Wii-Image." msgid "%1$sCopy%1$s" msgstr "%1$sKopie%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -179,11 +179,11 @@ msgstr "&Cheat Manager" msgid "&DSP Settings" msgstr "&DSP Einstellungen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "ISO &löschen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 msgid "&Delete selected ISOs..." msgstr "Ausgewählte ISOs &löschen" @@ -247,7 +247,7 @@ msgstr "Pau&se" msgid "&Play" msgstr "&Start" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "&Eigenschaften" @@ -291,7 +291,7 @@ msgstr "&Ansicht" msgid "&Wiimote Settings" msgstr "&Wiimote Einstellungen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "" @@ -340,10 +340,11 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -400,8 +401,8 @@ msgstr "" "\n" "TCP Port zum Hoster muss geöffnet sein!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "" @@ -436,6 +437,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 msgid "Action" msgstr "Aktion" @@ -537,11 +539,11 @@ msgstr "Grafikkarte:" msgid "Add" msgstr "Hinzufügen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "ActionReplay Code hinzufügen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "Patch hinzufügen" @@ -549,9 +551,9 @@ msgstr "Patch hinzufügen" msgid "Add new pane" msgstr "Neue Palette hinzufügen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Add..." msgstr "Hinzufügen..." @@ -603,7 +605,7 @@ msgstr "Einstellung des benötigten Drucks um Analoge Tasten zu aktivieren." msgid "Advanced" msgstr "Erweitert" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "Erweiterte Einstellungen" @@ -612,28 +614,28 @@ msgstr "Erweiterte Einstellungen" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Alle GC/Wii Dateien (elf, dol, gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Alle GC/Wii Images (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM Dateien (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Alle Speicherstände (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO Dateien (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle komprimierten GC/Wii ISO Dateien (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "Alle Dateien (*.*)|*.*" @@ -667,7 +669,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Kann Apploader aus dieser Datei nicht laden." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "Apploader:" @@ -682,7 +684,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "" @@ -691,7 +693,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:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -699,12 +701,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:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 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:725 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Seitenverhältnis:" @@ -713,11 +715,11 @@ 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:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" msgstr "Audio Backend:" @@ -725,7 +727,7 @@ 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:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisch" @@ -766,7 +768,7 @@ msgstr "" msgid "Back" msgstr "Zurück" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" msgstr "Backend Einstellungen" @@ -777,7 +779,7 @@ msgid "Backend:" msgstr "Audio Backend:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Hintergrund-Eingabe" @@ -790,15 +792,15 @@ msgid "Bad File Header" msgstr "Ungültige Header-Datei" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "Banner Details" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "Banner:" @@ -810,7 +812,7 @@ msgstr "Leiste" msgid "Basic" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "Grundeinstellungen" @@ -839,7 +841,7 @@ msgid "Blue Right" msgstr "Blau rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Unten" @@ -848,7 +850,7 @@ msgstr "Unten" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "Defekt" @@ -856,7 +858,7 @@ msgstr "Defekt" msgid "Browse" msgstr "Durchsuchen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "Ordner suchen und hinzufügen" @@ -864,7 +866,7 @@ msgstr "Ordner suchen und hinzufügen" msgid "Browse for an ISO directory..." msgstr "ISO-Verzeichnis hinzufügen..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "Ausgabeverzeichnis auswählen" @@ -872,7 +874,7 @@ msgstr "Ausgabeverzeichnis auswählen" msgid "Buffer:" msgstr "Buffer:" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -883,11 +885,11 @@ msgstr "Tasten" msgid "C Stick" msgstr "C-Stick" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "CPU Emulator Engine" @@ -927,16 +929,12 @@ msgstr "Abbrechen" msgid "Cannot open %s" msgstr "Kann %s nicht öffnen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "" - #: Source/Core/Core/Src/CoreTiming.cpp:122 #, fuzzy msgid "Cannot unregister events with events pending" msgstr "Kann Ereignisse mit Ereignis-_Pending_ nicht unregistrieren." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -946,7 +944,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:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 #, fuzzy msgid "" "Cannot use that file as a memory card.\n" @@ -976,7 +974,7 @@ msgstr "Kann von DVD_Plugin/DVD-Schnittstelle nicht lesen: Fataler Fehler" msgid "Caps Lock" msgstr "Feststellen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "" @@ -993,6 +991,7 @@ msgid "Change &Disc..." msgstr "Disc &wechseln..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "Disc wechseln" @@ -1000,7 +999,7 @@ msgstr "Disc wechseln" msgid "Change Game" msgstr "Spiel wechseln" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1018,8 +1017,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:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Änderung dieser Option zeigt keine Auswirkung, solange die Emulation läuft." @@ -1040,32 +1039,32 @@ msgstr "Cheat Suche" msgid "Cheats Manager" msgstr "Cheat Manager" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Chinesisch (Vereinfacht)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Chinesisch (Traditionell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "Wähle ein Standard DVD-Verzeichnis:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 #, fuzzy msgid "Choose a NAND root directory:" msgstr "Wähle ein Standard DVD-Verzeichnis:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "Standard ISO auswählen:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "Ordner zum Hinzufügen auswählen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "Datei zum Öffnen auswählen" @@ -1073,15 +1072,15 @@ msgstr "Datei zum Öffnen auswählen" msgid "Choose a memory card:" msgstr "Wähle eine Memory Card:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 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:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "Ordner zum Extrahieren auswählen" @@ -1100,7 +1099,7 @@ msgstr "Klassik" msgid "Clear" msgstr "Löschen" -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." msgstr "Löschen fehlgeschlagen." @@ -1114,7 +1113,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Schließen" @@ -1139,20 +1138,20 @@ msgstr "Befehl" msgid "Comment" msgstr "Kommentar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "Kommentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "ISO komprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "Ausgewählte ISOs komprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "Komprimiere ISO" @@ -1179,13 +1178,13 @@ msgstr "Pads konfigurieren" msgid "Configure..." msgstr "Konfigurieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "Ãœberschreiben Bestätigen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 #, fuzzy msgid "Confirm on Stop" msgstr "Bestätigung beim Beenden" @@ -1195,7 +1194,7 @@ msgstr "Bestätigung beim Beenden" msgid "Connect" msgstr "Verbinden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "USB-Keyboard anschließen" @@ -1205,22 +1204,26 @@ msgid "Connect Wiimote %i" msgstr "Wiimote %i verbinden" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "Wiimote 1 verbinden" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "Wiimote 2 verbinden" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "Wiimote 3 verbinden" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "Wiimote 4 verbinden" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Connecting..." msgstr "Verbinden..." @@ -1245,7 +1248,7 @@ msgstr "Kopieren fehlgeschlagen" msgid "Copy to Memcard %c" msgstr "Auf Memcard %c kopieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "Kern" @@ -1275,7 +1278,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Konnte ISO-Datei %s nicht erkennen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "Konnte %s nicht speichern." @@ -1303,7 +1306,7 @@ msgstr "" "Führen Sie Dolphin von einer CD/DVD aus, oder ist die Speicherdatei " "vielleicht schreibgeschützt?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "Konnte denn Befehl zum öffnen der Dateierweiterung 'ini' nicht finden!" @@ -1321,7 +1324,7 @@ msgstr "" msgid "Count:" msgstr "Anzahl:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "Land:" @@ -1335,21 +1338,21 @@ msgstr "AR-Code erstellen" msgid "Create new perspective" msgstr "Neue Perspektive erstellen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr "Erstellt von KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr "Erstellt von VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 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" @@ -1383,7 +1386,7 @@ 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:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" msgstr "Benutzerdefinierter Projection-Hack" @@ -1391,15 +1394,15 @@ msgstr "Benutzerdefinierter Projection-Hack" msgid "Custom Projection Hack Settings" msgstr "Benutzerdefinierter Projection-Hack Einstellungen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." msgstr "Einige orthographische Projection Parameter anpassen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Tschechisch" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "D-Pad" @@ -1407,25 +1410,25 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emulation (schnell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE Interpreter (langsam)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 #, fuzzy msgid "DSP LLE on Thread" msgstr "DSP LLE in eigenem Thread ausführen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "DSP LLE Recompiler" @@ -1433,7 +1436,7 @@ msgstr "DSP LLE Recompiler" msgid "DSP settings" msgstr "DSP Einstellungen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "DVD Laufwerk:" @@ -1441,7 +1444,7 @@ msgstr "DVD Laufwerk:" msgid "Data Size" msgstr "Datengröße" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "Datum:" @@ -1471,16 +1474,16 @@ msgstr "Debug" msgid "Decimal" msgstr "Dezimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "ISO dekomprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "Ausgewählte ISOs dekomprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "Dekomprimiere ISO" @@ -1488,7 +1491,7 @@ msgstr "Dekomprimiere ISO" msgid "Default" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "Standard ISO:" @@ -1531,8 +1534,8 @@ msgstr "" msgid "Device" msgstr "Gerät" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "Geräteeinstellungen" @@ -1605,7 +1608,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "Disc" @@ -1629,11 +1632,11 @@ msgstr "" msgid "Divide" msgstr "Dividieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 msgid "Do you want to stop the current emulation?" msgstr "Laufende Emulation stoppen?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "Dolphin" @@ -1659,12 +1662,12 @@ msgstr "Dolphin Emulierte-Wiimote Einstellungen" msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Konfiguration" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filme (*.dtm)" @@ -1676,7 +1679,7 @@ msgstr "Dolphin Wiimote Einstellungen" msgid "Dolphin at &Google Code" msgstr "Dolphin auf &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1684,7 +1687,7 @@ msgstr "" "Dolphin konnte keine GC oder Wii ISOs finden. Hier doppelklicken um nach " "ISOs zu suchen..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1714,7 +1717,7 @@ msgstr "Trommeln" msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Audio dumpen" @@ -1752,9 +1755,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Holländisch" @@ -1808,8 +1811,8 @@ msgstr "Patch bearbeiten" msgid "Edit current perspective" msgstr "Aktuelle Ansicht ändern" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "Bearbeiten..." @@ -1821,7 +1824,7 @@ msgstr "Effekt" msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "Emu-Thread läuft bereits." @@ -1848,7 +1851,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emulierte Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "Emulierbarkeit:" @@ -1870,7 +1873,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "AR Logging aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "Audio-Throttle aktivieren" @@ -1882,16 +1885,20 @@ msgstr "BAT aktivieren" msgid "Enable Block Merging" msgstr "Blockvereinigung aktivieren" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Cache verwenden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Cheats" msgstr "Cheats aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "DTK Musik aktivieren" @@ -1899,7 +1906,7 @@ msgstr "DTK Musik aktivieren" msgid "Enable Dual Core" msgstr "Dual Core aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "Dual Core aktivieren (Beschleunigung)" @@ -1911,7 +1918,7 @@ msgstr "Tastenkürzel aktivieren" msgid "Enable Idle Skipping" msgstr "Idle-Skipping aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "Idle-Skipping aktivieren (Beschleunigung)" @@ -1924,7 +1931,7 @@ msgstr "MMU aktivieren" msgid "Enable Progressive Scan" msgstr "Vollbildverfahren aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 #, fuzzy msgid "Enable Screen Saver" msgstr "Breitbildmodus" @@ -1977,7 +1984,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -1995,7 +2002,7 @@ msgstr "" "Speicherverwaltungs-Einheit. Präzise für die Hardware, aber langsamer zu " "Emulieren. (ON = Kompatibel, OFF = Schnell)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" msgstr "Benutzerdefinierten Projection-Hack aktivieren" @@ -2026,9 +2033,9 @@ msgstr "" msgid "End" msgstr "Ende" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Englisch" @@ -2057,17 +2064,31 @@ msgstr "Gleich" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Fehler" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Fehler beim Laden der ausgewählten Sprache. Kehre nun zu dem Systemstandart " "zurück." -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2103,11 +2124,12 @@ msgstr "Dolphin mit Emulator beenden." msgid "Export Failed" msgstr "Exportieren fehlgeschlagen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "Datei exportieren" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "Aufnahme exportieren" @@ -2119,7 +2141,7 @@ msgstr "Aufnahme exportieren..." msgid "Export Save" msgstr "Spielstand exportieren" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "Wii Spielstand exportieren (Experimentell)..." @@ -2152,44 +2174,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:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "Alle Dateien extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "Apploader extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "DOL extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "Ordner extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "Datei extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "Partition extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "Extrahiere %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "Alle Dateien extrahieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "Ordner extrahieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "Extrahieren..." @@ -2206,7 +2228,7 @@ msgstr "Spieler" msgid "FRANCE" msgstr "FRANKREICH" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "FST Größe:" @@ -2223,7 +2245,7 @@ msgstr "_Listen_ Fehlgeschlagen!!" msgid "Failed to download codes." msgstr "Download von Codes ist Fehlgeschlagen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "Entpacken nach %s ist Fehlgeschlagen!" @@ -2394,11 +2416,11 @@ msgstr "Datei nicht komprimiert" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Unbekanter Open-Modus : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "Dateisystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Der Datentyp 'ini' ist unbekannt! Wird nicht geöffnet!" @@ -2418,7 +2440,7 @@ msgstr "16:9 erzwingen" msgid "Force 4:3" msgstr "4:3 erzwingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 #, fuzzy msgid "Force Console as NTSC-J" msgstr "Konsole auf NTSC-J umschalten" @@ -2452,7 +2474,7 @@ msgstr "" "Zwingt das Spiel, Grafiken für Breitbild-Auflösungen auszugeben.\n" "Dies kann Grafikfehler verursachen!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2483,6 +2505,7 @@ msgid "Frame " msgstr "Einzelbildwiedergabe" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "Einzelbildwiedergabe" @@ -2500,7 +2523,7 @@ msgstr "Einzelbildwiedergabe" msgid "Frame S&kipping" msgstr "Frames ü&berspringen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "Framelimit:" @@ -2512,9 +2535,9 @@ msgstr "" msgid "Free Look" msgstr "Frei Umsehen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "French" msgstr "Französisch" @@ -2540,11 +2563,16 @@ msgstr "Vollbildauflösung:" msgid "GCI File(*.gci)" msgstr "GCI Datei(*.gci)" +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +#, fuzzy +msgid "GCMic Configuration" +msgstr "Tastenkürzel Einstellungen" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "GC-Pad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "Spiel ID:" @@ -2560,7 +2588,7 @@ msgstr "Spiel wird nicht emuliert!" msgid "Game not found!!" msgstr "Spiel nicht gefunden!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "Spiel-Spezifische Einstellungen" @@ -2568,7 +2596,7 @@ msgstr "Spiel-Spezifische Einstellungen" msgid "GameConfig" msgstr "Spieleinstellungen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "Gamecube" @@ -2578,7 +2606,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube-&Pad Einstellungen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Cards (*.raw,*.gcp)" @@ -2602,7 +2630,8 @@ msgstr "" "unterstützt.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Allgemein" @@ -2612,9 +2641,9 @@ msgstr "Allgemein" msgid "General Settings" msgstr "Interface Einstellungen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "German" msgstr "Deutsch" @@ -2646,7 +2675,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" msgstr "Griechisch" @@ -2678,7 +2707,7 @@ msgstr "" msgid "Header checksum failed" msgstr "Header-Prüfsumme fehlerhaft" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hebrew" msgstr "Hebräisch" @@ -2739,11 +2768,12 @@ msgid "Hotkey Configuration" msgstr "Tastenkürzel Einstellungen" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 msgid "Hotkeys" msgstr "Tastenkürzel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hungarian" msgstr "Ungarisch" @@ -2775,7 +2805,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - Fehlerhafte Beschreibung" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "IPL Einstellungen" @@ -2791,11 +2821,11 @@ msgstr "IR-Zeiger" msgid "IR Sensitivity:" msgstr "IR-Empfindlichkeit" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "ISO Details" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "ISO Verzeichnisse" @@ -2807,6 +2837,12 @@ msgstr "ITALIEN" msgid "Icon" msgstr "Symbol" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" @@ -2814,7 +2850,7 @@ msgstr "" "Wenn die FPS sprunghaft ist, kann diese Option helfen. (ON = Kompatibel, OFF " "= Schnell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 msgid "" "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." @@ -2895,7 +2931,7 @@ msgstr "" "Beleuchtung Deaktivieren. Verbessert die Performance, aber schaltet " "Beleuchtung in Spielen ab, die sie benutzen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "Ingame" @@ -2924,7 +2960,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:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "SD-Karte einlegen" @@ -2937,7 +2973,7 @@ msgstr "Namen hier eingeben.." msgid "Install WAD" msgstr "Wii-Menü installieren" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 msgid "Install to Wii Menu" msgstr "Zum Wii-Menü hinzufügen" @@ -2948,25 +2984,25 @@ msgstr "" "InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesn " "noch nicht." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 #, fuzzy msgid "Installing WAD..." msgstr "WAD ins Wii-Menü installieren..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 #, fuzzy msgid "Interface" msgstr "Interface Einstellungen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "Interface Einstellungen" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "Internationaler LZO-Fehler - Komprimierung fehlgeschlagen" -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -2976,7 +3012,7 @@ msgstr "" "%li) \n" "Versuche diesen Status nochmal zu laden." -#: Source/Core/Core/Src/State.cpp:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "Internationaler LZO-Fehler - lzo_init() fehlerhaft" @@ -2985,11 +3021,11 @@ msgstr "Internationaler LZO-Fehler - lzo_init() fehlerhaft" msgid "Internal Resolution:" msgstr "Vollbildauflösung:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "Interpreter (SEHR langsam)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "Intro" @@ -3006,7 +3042,7 @@ msgstr "Ungültigen Wert!" msgid "Invalid bat.map or dir entry" msgstr "Ungültige bat.map oder Verzeichnis-Eintrag" -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "Ungültiger Ereignis-Typ %i" @@ -3026,17 +3062,17 @@ msgstr "" "%s\n" " Möglicherweise müssen Sie dieses Spiel neu dumpen." -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "Ungültige Aufnahmedatei" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "Ungültiger Status" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Italian" msgstr "Italienisch" @@ -3044,16 +3080,16 @@ msgstr "Italienisch" msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (empfohlen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "JITIL experimenteller Recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Japanese" msgstr "Japanisch" @@ -3062,16 +3098,17 @@ msgid "KOREA" msgstr "KOREA" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "Taste" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Korean" msgstr "Koreanisch" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "L" @@ -3080,11 +3117,11 @@ msgid "L Button" msgstr "L Taste" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "Sprache:" @@ -3107,6 +3144,7 @@ msgid "Left Stick" msgstr "Stick links" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3136,7 +3174,7 @@ msgstr "" msgid "Less Than" msgstr "Kleiner als" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "" @@ -3150,34 +3188,42 @@ msgid "Load Custom Textures" msgstr "Hochauflösende Texturen laden" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 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 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 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 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 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 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 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 msgid "Load State Slot 8" msgstr "Status aus Slot 8 laden" @@ -3185,12 +3231,12 @@ msgstr "Status aus Slot 8 laden" msgid "Load State..." msgstr "Status laden..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 #, fuzzy msgid "Load Wii System Menu" msgstr "Wii-Menü laden (%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii-Menü laden (%d %c)" @@ -3216,7 +3262,7 @@ msgstr "Lade die ausgewählte Datei (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Lokal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 #, fuzzy msgid "Lock Threads to Cores" msgstr "Threads an Cores binden" @@ -3275,16 +3321,16 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark Dateien(*.gcs)" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Main Stick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "Hersteller ID" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "Hersteller:" @@ -3307,7 +3353,7 @@ msgid "Memory Byte" msgstr "Speicher" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 msgid "Memory Card" msgstr "Memory Card" @@ -3344,7 +3390,7 @@ msgstr "" msgid "Menu" msgstr "Menü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "Mikrofon" @@ -3358,7 +3404,7 @@ msgstr "Mikrofon" msgid "Misc" msgstr "Sonstiges" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "Sonstige Einstellungen" @@ -3384,7 +3430,7 @@ msgid "Motion Plus" msgstr "Motion Plus" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" @@ -3494,7 +3540,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Hoch" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3533,7 +3579,7 @@ msgstr "Nickname:" msgid "No Country (SDK)" msgstr "Kein Land (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "Keine ISOs oder WADs gefunden" @@ -3569,7 +3615,7 @@ msgstr "Keinen Spielstand-Ordner für Tittel %s gefunden." msgid "None" msgstr "Keine" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" msgstr "Norwegisch" @@ -3577,16 +3623,16 @@ msgstr "Norwegisch" msgid "Not Equal" msgstr "Ungleich" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "Nicht Festgelegt" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Not connected" msgstr "Nicht Verbunden" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "Notizen" @@ -3628,7 +3674,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "Aus" @@ -3643,14 +3689,15 @@ msgstr "Nur %d Blöcke verfügbar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Öffnen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "Beinhaltenden &Ordner öffnen..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "&Wii Spielstand-Ordner öffnen..." @@ -3689,7 +3736,7 @@ msgid "Opens the logger" msgstr "Öffnet den Logger" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Optionen" @@ -3770,12 +3817,12 @@ msgstr "Partition %i" msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "Pfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -3785,7 +3832,7 @@ msgstr "Pause" msgid "Per-Pixel Lighting" msgstr "Pixel Beleuchtung" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "Perfekt" @@ -3796,20 +3843,22 @@ msgstr "Perspektive %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 msgid "Play" msgstr "Start" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "Aufnahme abspielen" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "Start/Pause" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "Spielbar" @@ -3822,7 +3871,7 @@ msgstr "Optionen" msgid "Players" msgstr "Spieler" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 msgid "Please confirm..." msgstr "Bitte Bestätigen..." @@ -3834,23 +3883,23 @@ msgstr "Bitte legen Sie vor dem Speichern eine Perspektive fest" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Polish" msgstr "Polnisch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 msgid "Port 4" msgstr "Port 4" @@ -3859,11 +3908,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese" msgstr "Portugiesisch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" msgstr "Portugiesisch (Brasilianisch)" @@ -3872,6 +3921,21 @@ msgstr "Portugiesisch (Brasilianisch)" msgid "Post-Processing Effect:" msgstr "Post-Processing Shader:" +#: Source/Core/Core/Src/Movie.cpp:735 +#, c-format +msgid "Premature movie end in PlayController. %u + 8 > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:829 +#, c-format +msgid "Premature movie end in PlayWiimote. %u + %d > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:806 +#, c-format +msgid "Premature movie end in PlayWiimote. %u > %u" +msgstr "" + #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "" @@ -3914,7 +3978,7 @@ msgid "Quit" msgstr "Beenden" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "R" @@ -3923,7 +3987,7 @@ msgid "R Button" msgstr "R Taste" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" msgstr "R-Analog" @@ -3940,6 +4004,7 @@ msgid "Range" msgstr "Weite" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "Nur-Lese-Modus" @@ -4014,6 +4079,7 @@ msgid "Refresh" msgstr "Aktualisieren" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "Liste aktualisieren" @@ -4021,10 +4087,10 @@ msgstr "Liste aktualisieren" msgid "Refresh game list" msgstr "Spieleliste aktualisieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 msgid "Remove" msgstr "Entfernen" @@ -4043,6 +4109,7 @@ 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 msgid "Reset" msgstr "Zurücksetzen" @@ -4065,15 +4132,15 @@ msgid "Right Stick" msgstr "Stick rechts" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 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:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "Russisch" @@ -4085,7 +4152,7 @@ msgstr "S&tatus speichern" msgid "Safe" msgstr "Sicher" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Sample Rate:" msgstr "Abtastrate:" @@ -4100,34 +4167,42 @@ msgid "Save GCI as..." msgstr "CGI speichern unter..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 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 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 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 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 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 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 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 msgid "Save State Slot 8" msgstr "Status in Slot 8 speichern" @@ -4135,12 +4210,12 @@ msgstr "Status in Slot 8 speichern" msgid "Save State..." msgstr "Status speichern..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "Speichern unter..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "Komprimierte GCM/ISO speichern" @@ -4148,11 +4223,11 @@ msgstr "Komprimierte GCM/ISO speichern" msgid "Save current perspective" msgstr "Aktuelle Perspektive speichern" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "Dekomprimierte GCM/ISO speichern" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Film-Status %s ist fehlerhaft, breche die Filmaufnahme ab..." @@ -4162,16 +4237,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:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, fuzzy, c-format msgid "Scanning %s" msgstr "Suche..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "Suche nach ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "Suche..." @@ -4187,7 +4262,7 @@ msgstr "Rollen Feststell" msgid "Search Filter" msgstr "Suchfilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "Unterordner durchsuchen" @@ -4202,12 +4277,12 @@ msgstr "Ausgewähltes %s nicht gefunden in SYSCONF" msgid "Select" msgstr "Auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Aufnahmedatei auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Speicherdatei zum Importieren auswählen" @@ -4234,15 +4309,15 @@ msgstr "Wähle unverankerte Fenster" msgid "Select the file to load" msgstr "Datei zum Laden auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Wii-Spielstand auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Status zum Laden auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Status zum Speichern auswählen" @@ -4299,11 +4374,11 @@ msgstr "Position der Sensorleiste:" msgid "Separator" msgstr "Trennzeichen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4314,7 +4389,7 @@ msgstr "" msgid "Set" msgstr "Zuweisen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "Als &Standard-ISO festlegen" @@ -4329,11 +4404,11 @@ 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:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." msgstr "Einstellungen..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Kann die Einstellungsdatei nicht finden" @@ -4341,7 +4416,7 @@ msgstr "SetupWiiMem: Kann die Einstellungsdatei nicht finden" msgid "Shake" msgstr "Schütteln" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "Kurzer Name:" @@ -4404,7 +4479,7 @@ msgstr "JAP anzeigen" msgid "Show Korea" msgstr "Korea anzeigen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "Sprache anzeigen:" @@ -4446,11 +4521,11 @@ msgstr "Wad anzeigen" msgid "Show Wii" msgstr "Wii anzeigen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 msgid "Show a confirmation box before stopping a game." msgstr "Hinweisfenster anzeigen, bevor die Emulation beendet wird." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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 " @@ -4510,15 +4585,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "_Seitwärts_ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Vereinfachtes Chinesisch" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "Größe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 #, fuzzy msgid "Skip BIOS" msgstr "GC-BIOS überspringen" @@ -4556,11 +4631,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 msgid "Slot B" msgstr "Slot B" @@ -4580,7 +4655,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Sound Einstelungen" @@ -4598,9 +4673,9 @@ msgstr "Erstellen des Sound-Buffer fehlgeschlagen: %s" msgid "Space" msgstr "Leertaste" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Spanish" msgstr "Spanisch" @@ -4636,7 +4711,7 @@ msgstr "" msgid "Standard Controller" msgstr "Standard-Controller" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4651,14 +4726,16 @@ msgid "Start Re&cording" msgstr "&Aufnahme starten" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "Aufnahme starten" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "Status" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "Status" @@ -4669,6 +4746,7 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stopp" @@ -4707,8 +4785,8 @@ msgstr "Die gespeicherte Datei wurde erfolgreich importiert" msgid "Swing" msgstr "Schwenken" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "Systemsprache:" @@ -4741,9 +4819,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" msgstr "Screenshot erstellen" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "Testen" @@ -4774,13 +4857,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:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 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:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, c-format msgid "" "The file %s already exists.\n" @@ -4870,7 +4953,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:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "Theme" @@ -4903,7 +4986,7 @@ msgstr "" "Dieser Action-Replay-Simulator unterstützt keine Codes, die sich selber " "verändern können." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 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." @@ -4918,7 +5001,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -4934,11 +5017,11 @@ msgstr "" "\n" "Tastaturkürzel : Zur Deaktivierung der Drossel gedrückt halten." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Wird zur Wiedergabe von Musik (z.B. Hintergrundmusik) benutzt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4965,7 +5048,7 @@ msgid "Tilt" msgstr "Neigung" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr "Titel" @@ -4982,15 +5065,16 @@ msgstr "Alle umschalten" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Oben" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Traditionelles Chinesisch" @@ -4998,7 +5082,7 @@ msgstr "Traditionelles Chinesisch" msgid "Tried to load an unknown file type." msgstr "Versuche gerade einen unbekannten Dateityp zu Laden." -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "Schultertasten" @@ -5014,7 +5098,7 @@ msgstr "" "Versuche gerade eine ungültige SYSCONF zu Lesen\n" "Wiimote BT-IDs sind nicht verfügbar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Turkish" msgstr "Türkisch" @@ -5091,15 +5175,6 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "Unbekannte Meldung mit ID %d erhalten von Spieler %d, Spieler herausgeworfen!" -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Unbekanter Pointer %#08x\n" -"Fortfahren?" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5114,7 +5189,7 @@ msgstr "Update" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 Modus (PAL60) verwenden" @@ -5127,7 +5202,7 @@ msgstr "&Vollbild" msgid "Use Hex" msgstr "Hex verwenden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "Warnmeldungen anzeigen" @@ -5172,7 +5247,7 @@ msgstr "Wert: " msgid "Verbosity" msgstr "Ausführung" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "Video" @@ -5180,7 +5255,7 @@ msgstr "Video" msgid "Virtual" msgstr "Virtuell" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "Lautstärke" @@ -5241,6 +5316,41 @@ msgstr "" "und hat den gleichen Namen wie die Datei auf Ihrer Memory-Card\n" "Fortfahren?" +#: Source/Core/Core/Src/Movie.cpp:629 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, 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" +"\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" +"\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" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -5258,15 +5368,15 @@ msgstr "Breitbild Hack" msgid "Width" msgstr "Weite" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "Wii Konsole" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD Laufwerk:" @@ -5275,7 +5385,7 @@ msgstr "DVD Laufwerk:" msgid "Wii Save Import" msgstr "Wii Spielstand importieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii Speicherdateien (*.bin)|*.bin" @@ -5306,7 +5416,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:599 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Wiimote Connected" msgstr "Wiimote Verbunden" @@ -5339,9 +5449,9 @@ msgstr "Windows Rechts" msgid "Word Wrap" msgstr "Zeilenumbruch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Working..." msgstr "Arbeite..." @@ -5404,7 +5514,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:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 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." @@ -5425,7 +5535,7 @@ msgid "" msgstr "" "Ihre SYSCONF-Datei hat eine falsche Größe - Sollte 0x%04x (Aber ist 0x%04llx)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "ZTP Hack" @@ -5479,7 +5589,7 @@ msgstr "" msgid "^ ADD" msgstr "^ HINZUF." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "Apploader (.img)" @@ -5496,7 +5606,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:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Lesen des Opcode aus %x. Bitte berichten." @@ -5515,7 +5625,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "Unbekanter CMD 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute meldet -1 beim Start der Anwendung!" @@ -6193,6 +6303,13 @@ msgstr "| ODER" #~ msgid "Type %d config not supported in plugin %s" #~ msgstr "Typ %d Konfiguartion wird im Plugin %s nicht unterstüzt" +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "Unbekanter Pointer %#08x\n" +#~ "Fortfahren?" + #~ msgid "Use FPS For Limiting" #~ msgstr "Durch FPS begrenzen" diff --git a/Languages/po/dolphin-emu.pot b/Languages/po/dolphin-emu.pot index 4c30844e45..ea882faa37 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: 2011-10-11 23:25-0500\n" +"POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -48,9 +48,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "" @@ -168,11 +168,11 @@ msgstr "" msgid "&DSP Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 msgid "&Delete selected ISOs..." msgstr "" @@ -236,7 +236,7 @@ msgstr "" msgid "&Play" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "" @@ -280,7 +280,7 @@ msgstr "" msgid "&Wiimote Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "" @@ -329,10 +329,11 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -371,8 +372,8 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "" @@ -407,6 +408,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 msgid "Action" msgstr "" @@ -492,11 +494,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "" @@ -504,9 +506,9 @@ msgstr "" msgid "Add new pane" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Add..." msgstr "" @@ -544,7 +546,7 @@ msgstr "" msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "" @@ -552,28 +554,28 @@ msgstr "" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "" @@ -605,7 +607,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "" @@ -620,7 +622,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "" @@ -629,17 +631,17 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -648,11 +650,11 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" msgstr "" @@ -660,7 +662,7 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -696,7 +698,7 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" msgstr "" @@ -706,7 +708,7 @@ msgid "Backend:" msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "" @@ -719,15 +721,15 @@ msgid "Bad File Header" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "" @@ -739,7 +741,7 @@ msgstr "" msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "" @@ -768,7 +770,7 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "" @@ -777,7 +779,7 @@ msgstr "" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "" @@ -785,7 +787,7 @@ msgstr "" msgid "Browse" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "" @@ -793,7 +795,7 @@ msgstr "" msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "" @@ -801,7 +803,7 @@ msgstr "" msgid "Buffer:" msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -811,11 +813,11 @@ msgstr "" msgid "C Stick" msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "" @@ -854,15 +856,11 @@ msgstr "" msgid "Cannot open %s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "" - #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -870,7 +868,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -897,7 +895,7 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "" @@ -914,6 +912,7 @@ msgid "Change &Disc..." msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "" @@ -921,7 +920,7 @@ msgstr "" msgid "Change Game" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -935,8 +934,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "" @@ -956,31 +955,31 @@ msgstr "" msgid "Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "" @@ -988,14 +987,14 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "" @@ -1014,7 +1013,7 @@ msgstr "" msgid "Clear" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." msgstr "" @@ -1026,7 +1025,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "" @@ -1051,20 +1050,20 @@ msgstr "" msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "" @@ -1091,13 +1090,13 @@ msgstr "" msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Confirm on Stop" msgstr "" @@ -1106,7 +1105,7 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "" @@ -1116,22 +1115,26 @@ msgid "Connect Wiimote %i" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Connecting..." msgstr "" @@ -1156,7 +1159,7 @@ msgstr "" msgid "Copy to Memcard %c" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "" @@ -1183,7 +1186,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "" @@ -1203,7 +1206,7 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "" @@ -1218,7 +1221,7 @@ msgstr "" msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "" @@ -1232,20 +1235,20 @@ msgstr "" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" @@ -1277,7 +1280,7 @@ msgstr "" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" msgstr "" @@ -1285,15 +1288,15 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "" @@ -1301,24 +1304,24 @@ msgstr "" msgid "DSP" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP Emulator Engine" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "" @@ -1326,7 +1329,7 @@ msgstr "" msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "" @@ -1334,7 +1337,7 @@ msgstr "" msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "" @@ -1363,16 +1366,16 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "" @@ -1380,7 +1383,7 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "" @@ -1422,8 +1425,8 @@ msgstr "" msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "" @@ -1492,7 +1495,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "" @@ -1516,11 +1519,11 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "" @@ -1545,12 +1548,12 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1562,13 +1565,13 @@ msgstr "" msgid "Dolphin at &Google Code" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1596,7 +1599,7 @@ msgstr "" msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "" @@ -1633,9 +1636,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "" @@ -1684,8 +1687,8 @@ msgstr "" msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "" @@ -1697,7 +1700,7 @@ msgstr "" msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "" @@ -1724,7 +1727,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "" @@ -1746,7 +1749,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "" @@ -1758,15 +1761,19 @@ msgstr "" msgid "Enable Block Merging" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "" @@ -1774,7 +1781,7 @@ msgstr "" msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "" @@ -1786,7 +1793,7 @@ msgstr "" msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "" @@ -1799,7 +1806,7 @@ msgstr "" msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Enable Screen Saver" msgstr "" @@ -1846,7 +1853,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -1859,7 +1866,7 @@ msgid "" "Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" msgstr "" @@ -1888,9 +1895,9 @@ msgstr "" msgid "End" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "" @@ -1919,15 +1926,29 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -1959,11 +1980,12 @@ msgstr "" msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "" @@ -1975,7 +1997,7 @@ msgstr "" msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "" @@ -2007,44 +2029,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "" @@ -2060,7 +2082,7 @@ msgstr "" msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "" @@ -2076,7 +2098,7 @@ msgstr "" msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2226,11 +2248,11 @@ msgstr "" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2250,7 +2272,7 @@ msgstr "" msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Force Console as NTSC-J" msgstr "" @@ -2274,7 +2296,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2301,6 +2323,7 @@ msgid "Frame " msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "" @@ -2316,7 +2339,7 @@ msgstr "" msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "" @@ -2328,9 +2351,9 @@ msgstr "" msgid "Free Look" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "French" msgstr "" @@ -2355,11 +2378,15 @@ msgstr "" msgid "GCI File(*.gci)" msgstr "" +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +msgid "GCMic Configuration" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "" @@ -2375,7 +2402,7 @@ msgstr "" msgid "Game not found!!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "" @@ -2383,7 +2410,7 @@ msgstr "" msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "" @@ -2392,7 +2419,7 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2413,7 +2440,8 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2422,9 +2450,9 @@ msgstr "" msgid "General Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "German" msgstr "" @@ -2456,7 +2484,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" msgstr "" @@ -2488,7 +2516,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hebrew" msgstr "" @@ -2539,11 +2567,12 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hungarian" msgstr "" @@ -2569,7 +2598,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "" @@ -2585,11 +2614,11 @@ msgstr "" msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "" @@ -2601,12 +2630,18 @@ msgstr "" msgid "Icon" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 msgid "" "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." @@ -2673,7 +2708,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "" @@ -2702,7 +2737,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "" @@ -2714,7 +2749,7 @@ msgstr "" msgid "Install WAD" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 msgid "Install to Wii Menu" msgstr "" @@ -2723,30 +2758,30 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "" -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" "Try loading the state again" msgstr "" -#: Source/Core/Core/Src/State.cpp:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "" @@ -2754,11 +2789,11 @@ msgstr "" msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "" @@ -2775,7 +2810,7 @@ msgstr "" msgid "Invalid bat.map or dir entry" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "" @@ -2792,17 +2827,17 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Italian" msgstr "" @@ -2810,16 +2845,16 @@ msgstr "" msgid "JAPAN" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Japanese" msgstr "" @@ -2828,16 +2863,17 @@ msgid "KOREA" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Korean" msgstr "" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "" @@ -2846,11 +2882,11 @@ msgid "L Button" msgstr "" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "" @@ -2873,6 +2909,7 @@ msgid "Left Stick" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -2895,7 +2932,7 @@ msgstr "" msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "" @@ -2908,34 +2945,42 @@ msgid "Load Custom Textures" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 1" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 2" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 3" 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 "" @@ -2943,11 +2988,11 @@ msgstr "" msgid "Load State..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -2971,7 +3016,7 @@ msgstr "" msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Lock Threads to Cores" msgstr "" @@ -3024,16 +3069,16 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "" @@ -3055,7 +3100,7 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 msgid "Memory Card" msgstr "" @@ -3084,7 +3129,7 @@ msgstr "" msgid "Menu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "" @@ -3097,7 +3142,7 @@ msgstr "" msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "" @@ -3123,7 +3168,7 @@ msgid "Motion Plus" msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "" @@ -3232,7 +3277,7 @@ msgstr "" msgid "NP Up" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3271,7 +3316,7 @@ msgstr "" msgid "No Country (SDK)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "" @@ -3306,7 +3351,7 @@ msgstr "" msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" msgstr "" @@ -3314,16 +3359,16 @@ msgstr "" msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Not connected" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "" @@ -3365,7 +3410,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "" @@ -3380,14 +3425,15 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "" @@ -3426,7 +3472,7 @@ msgid "Opens the logger" msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "" @@ -3501,12 +3547,12 @@ msgstr "" msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3515,7 +3561,7 @@ msgstr "" msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "" @@ -3526,20 +3572,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 msgid "Play" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "" @@ -3551,7 +3599,7 @@ msgstr "" msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 msgid "Please confirm..." msgstr "" @@ -3563,23 +3611,23 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 msgid "Port 4" msgstr "" @@ -3588,11 +3636,11 @@ msgstr "" msgid "Port :" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" msgstr "" @@ -3600,6 +3648,21 @@ msgstr "" msgid "Post-Processing Effect:" msgstr "" +#: Source/Core/Core/Src/Movie.cpp:735 +#, c-format +msgid "Premature movie end in PlayController. %u + 8 > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:829 +#, c-format +msgid "Premature movie end in PlayWiimote. %u + %d > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:806 +#, c-format +msgid "Premature movie end in PlayWiimote. %u > %u" +msgstr "" + #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "" @@ -3642,7 +3705,7 @@ msgid "Quit" msgstr "" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "" @@ -3651,7 +3714,7 @@ msgid "R Button" msgstr "" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" msgstr "" @@ -3668,6 +3731,7 @@ msgid "Range" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "" @@ -3733,6 +3797,7 @@ msgid "Refresh" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "" @@ -3740,10 +3805,10 @@ msgstr "" msgid "Refresh game list" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 msgid "Remove" msgstr "" @@ -3759,6 +3824,7 @@ 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 msgid "Reset" msgstr "" @@ -3781,15 +3847,15 @@ msgid "Right Stick" msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "" @@ -3801,7 +3867,7 @@ msgstr "" msgid "Safe" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Sample Rate:" msgstr "" @@ -3816,34 +3882,42 @@ msgid "Save GCI as..." msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 1" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 2" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 3" 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 "" @@ -3851,12 +3925,12 @@ msgstr "" msgid "Save State..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "" @@ -3864,11 +3938,11 @@ msgstr "" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -3877,16 +3951,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, c-format msgid "Scanning %s" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "" @@ -3902,7 +3976,7 @@ msgstr "" msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "" @@ -3917,12 +3991,12 @@ msgstr "" msgid "Select" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 msgid "Select a Wii WAD file to install" msgstr "" @@ -3945,15 +4019,15 @@ msgstr "" msgid "Select the file to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "" @@ -4004,11 +4078,11 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4017,7 +4091,7 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "" @@ -4031,11 +4105,11 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." msgstr "" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "" @@ -4043,7 +4117,7 @@ msgstr "" msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "" @@ -4103,7 +4177,7 @@ msgstr "" msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "" @@ -4143,11 +4217,11 @@ msgstr "" msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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 " @@ -4201,15 +4275,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 msgid "Skip BIOS" msgstr "" @@ -4245,11 +4319,11 @@ msgstr "" msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 msgid "Slot B" msgstr "" @@ -4269,7 +4343,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "" @@ -4287,9 +4361,9 @@ msgstr "" msgid "Space" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Spanish" msgstr "" @@ -4325,7 +4399,7 @@ msgstr "" msgid "Standard Controller" msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4340,14 +4414,16 @@ msgid "Start Re&cording" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "" @@ -4358,6 +4434,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -4396,8 +4473,8 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "" @@ -4429,9 +4506,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" msgstr "" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "" @@ -4460,13 +4542,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, c-format msgid "" "The file %s already exists.\n" @@ -4545,7 +4627,7 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "" @@ -4571,7 +4653,7 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "" @@ -4586,7 +4668,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -4595,11 +4677,11 @@ msgid "" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4621,7 +4703,7 @@ msgid "Tilt" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr "" @@ -4636,15 +4718,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "" @@ -4652,7 +4735,7 @@ msgstr "" msgid "Tried to load an unknown file type." msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "" @@ -4666,7 +4749,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Turkish" msgstr "" @@ -4742,13 +4825,6 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -4763,7 +4839,7 @@ msgstr "" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -4775,7 +4851,7 @@ msgstr "" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "" @@ -4820,7 +4896,7 @@ msgstr "" msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "" @@ -4828,7 +4904,7 @@ msgstr "" msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "" @@ -4882,6 +4958,41 @@ msgid "" "Continue?" msgstr "" +#: Source/Core/Core/Src/Movie.cpp:629 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, 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" +"\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" +"\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" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -4899,15 +5010,15 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 msgid "Wii NAND Root:" msgstr "" @@ -4915,7 +5026,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -4942,7 +5053,7 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:599 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Wiimote Connected" msgstr "" @@ -4974,9 +5085,9 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Working..." msgstr "" @@ -5037,7 +5148,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5055,7 +5166,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "" @@ -5109,7 +5220,7 @@ msgstr "" msgid "^ ADD" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "" @@ -5126,7 +5237,7 @@ msgstr "" msgid "failed to read header" msgstr "" -#: Source/Core/Core/Src/HW/Memmap.cpp:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "" @@ -5145,7 +5256,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/el.po b/Languages/po/el.po index 22953f7c39..81814c796e 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: 2011-10-11 23:25-0500\n" +"POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-18 13:39-0600\n" "Last-Translator: Linktothepast \n" "Language-Team: Gpower2 \n" @@ -44,16 +44,17 @@ 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/MemcardManager.cpp:193 #, c-format msgid "%1$sCopy%1$s" msgstr "%1$sΑντιγÏαφή%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -72,7 +73,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:97 #, c-format @@ -99,7 +101,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 @@ -130,7 +133,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:199 #, c-format @@ -180,11 +185,11 @@ msgstr "&ΔιαχειÏιστής Cheat" msgid "&DSP Settings" msgstr "&Ρυθμίσεις DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "&ΔιαγÏαφή ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 msgid "&Delete selected ISOs..." msgstr "&ΔιαγÏαφή επιλεγμένων ISO..." @@ -248,7 +253,7 @@ msgstr "&ΠαÏση" msgid "&Play" msgstr "&ΑναπαÏαγωγή" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "&Ιδιότητες" @@ -292,7 +297,7 @@ msgstr "&ΠÏοβολή" msgid "&Wiimote Settings" msgstr "&Ρυθμίσεις Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "&Wiki" @@ -341,10 +346,11 @@ msgid "" msgstr "<Τίποτα>" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "<Πατήστε ΠλήκτÏο>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "<Συστήματος>" @@ -370,11 +376,13 @@ 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" @@ -388,16 +396,18 @@ 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:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "AM-Baseboard" @@ -425,16 +435,19 @@ msgstr "ΑκÏιβής VBeam εξομοίωση" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 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 msgid "Action" msgstr "ΕνέÏγεια" @@ -455,23 +468,38 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, 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:756 #, 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:549 #, 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:609 #, 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:803 #, c-format @@ -480,8 +508,11 @@ msgstr "Σφάλμα Action Replay: Μη έγκυÏη τιμή (%08x) σε Memor #: Source/Core/Core/Src/ActionReplay.cpp:684 #, 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 @@ -517,11 +548,11 @@ msgstr "ΠÏοσαÏμογέας:" msgid "Add" msgstr "ΠÏοσθήκη" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "ΠÏοσθήκη ÎšÏ‰Î´Î¹ÎºÎ¿Ï ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "ΠÏοσθήκη Patch" @@ -529,9 +560,9 @@ msgstr "ΠÏοσθήκη Patch" msgid "Add new pane" msgstr "ΠÏοσθήκη νέου pane" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Add..." msgstr "ΠÏοσθήκη..." @@ -543,7 +574,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." @@ -553,7 +585,8 @@ 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." @@ -561,13 +594,15 @@ 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:520 msgid "Advanced" msgstr "Για Ï€ÏοχωÏημένους" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "Ρυθμίσεις για ΠÏοχωÏημένους" @@ -575,38 +610,40 @@ msgstr "Ρυθμίσεις για ΠÏοχωÏημένους" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Όλα τα αÏχεία GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "Όλα τα αÏχεία Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Όλα τα συμπιεσμένα αÏχεία GC/Wii ISO (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "Όλα τα αÏχεία (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕπιτÏέπει την εναλλαγή οÏισμένων επιλογών με τα πλήκτÏα συντόμευσης 3, 4, 5, 6 και 7 μέσα από το παÏάθυÏο εξομοίωσης.\n" +"ΕπιτÏέπει την εναλλαγή οÏισμένων επιλογών με τα πλήκτÏα συντόμευσης 3, 4, 5, " +"6 και 7 μέσα από το παÏάθυÏο εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -630,7 +667,7 @@ msgstr "Ο Apploader έχει λάθος μέγεθος... είναι Ï€Ïάγμ msgid "Apploader unable to load from file" msgstr "Ο Apploader απέτυχε να φοÏτωθεί από αÏχείο" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "Apploader:" @@ -648,7 +685,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε (ανενεÏγό)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "ΑÏαβικά" @@ -657,7 +694,7 @@ msgstr "ΑÏαβικά" msgid "Are you sure you want to delete \"%s\"?" msgstr "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε το \"%s\";" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -665,11 +702,13 @@ msgstr "" "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτά τα αÏχεία;\n" "Θα εξαφανιστοÏν για πάντα!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 msgid "Are you sure you want to delete this file? It will be gone forever!" -msgstr "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για πάντα!" +msgstr "" +"Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για " +"πάντα!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Αναλογία Οθόνης:" @@ -678,11 +717,11 @@ msgstr "Αναλογία Οθόνης:" msgid "At least one pane must remain open." msgstr "Τουλάχιστον ένα pane Ï€Ïέπει να μένει ανοιχτό." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "Ήχος" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" msgstr "Backend Ήχου:" @@ -690,7 +729,7 @@ msgstr "Backend Ήχου:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Αυτόματα" @@ -713,7 +752,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΠÏοσαÏμόζει αυτόματα το μέγεθος του παÏαθÏÏου σÏμφωνα με την εσωτεÏική ανάλυση.\n" +"ΠÏοσαÏμόζει αυτόματα το μέγεθος του παÏαθÏÏου σÏμφωνα με την εσωτεÏική " +"ανάλυση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -725,7 +765,8 @@ msgid "" "If unsure, leave this checked." msgstr "" "ΔημιουÏγεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" -"Αυξάνει λίγο τις επιδόσεις, αλλά μποÏεί να Ï€Ïοκαλέσει μικÏά ελαττώματα στις υφές.\n" +"Αυξάνει λίγο τις επιδόσεις, αλλά μποÏεί να Ï€Ïοκαλέσει μικÏά ελαττώματα στις " +"υφές.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -733,7 +774,7 @@ msgstr "" msgid "Back" msgstr "Πίσω" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" msgstr "Backend Ρυθμίσεις" @@ -743,7 +784,7 @@ msgid "Backend:" msgstr "Backend:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "ΧειÏισμός με Ανεστίαστο ΠαÏαθ." @@ -756,15 +797,15 @@ msgid "Bad File Header" msgstr "Μη ΈγκυÏη Κεφαλίδα ΑÏχείου" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr "Εικονίδιο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "ΛεπτομέÏειες Εικονιδίου:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "Εικονίδιο:" @@ -776,7 +817,7 @@ msgstr "Bar" msgid "Basic" msgstr "Βασικές" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "Βασικές Ρυθμίσεις" @@ -805,7 +846,7 @@ msgid "Blue Right" msgstr "Δεξί Μπλε" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Βάση" @@ -814,7 +855,7 @@ msgstr "Βάση" msgid "Bound Controls: %lu" msgstr "Δεσμευμένοι ΧειÏισμοί: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "Χαλασμένο" @@ -822,7 +863,7 @@ msgstr "Χαλασμένο" msgid "Browse" msgstr "ΕÏÏεση" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "ΕÏÏεση φακέλου για Ï€Ïοσθήκη" @@ -830,7 +871,7 @@ msgstr "ΕÏÏεση φακέλου για Ï€Ïοσθήκη" msgid "Browse for an ISO directory..." msgstr "ΕÏÏεση φακέλου ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "ΕÏÏεση φακέλου Ï€ÏοοÏισμοÏ" @@ -838,7 +879,7 @@ msgstr "ΕÏÏεση φακέλου Ï€ÏοοÏισμοÏ" msgid "Buffer:" msgstr "Buffer:" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -848,11 +889,11 @@ msgstr "Κουμπιά" msgid "C Stick" msgstr "Stick ΚάμεÏας " -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "Stick ΚάμεÏας" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "Μηχανή Εξομοίωσης CPU" @@ -863,12 +904,16 @@ msgstr "Cache Display Lists" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -882,7 +927,8 @@ msgid "" msgstr "" "Υπολογίζει τον φωτισμό των 3D γÏαφικών ανά pixel αντί ανά vertex.\n" "Μειώνει την ταχÏτητα εξομοίωσης κατά κάποιο ποσοστό (ανάλογα με την GPU).\n" -"Αυτή συνήθως είναι μια ασφαλής βελτίωση, αλλά μποÏεί να Ï€Ïοκαλέσει οÏισμένες φοÏές Ï€Ïοβλήματα.\n" +"Αυτή συνήθως είναι μια ασφαλής βελτίωση, αλλά μποÏεί να Ï€Ïοκαλέσει οÏισμένες " +"φοÏές Ï€Ïοβλήματα.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -898,15 +944,11 @@ msgstr "ΆκυÏο" msgid "Cannot open %s" msgstr "Αποτυχία ανοίγματος %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "Δεν μποÏεί να γίνει εγγÏαφή ταινιών σε λειτουÏγία μόνο για ανάγνωση." - #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -917,7 +959,7 @@ msgstr "" "%s\n" "δεν είναι έγκυÏο αÏχείο κάÏτας μνήμης gamecube" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -946,7 +988,7 @@ msgstr "Αδυναμία ανάγνωσης από το DVD_Plugin - DVD-Interfa msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Καταλανικά" @@ -963,6 +1005,7 @@ msgid "Change &Disc..." msgstr "Αλλαγή &Δίσκου..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "Αλλαγή Δίσκου" @@ -970,7 +1013,7 @@ msgstr "Αλλαγή Δίσκου" msgid "Change Game" msgstr "Αλλαγή ΠαιχνιδιοÏ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -986,8 +1029,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "Αυτή η αλλαγή δε θα έχει επίπτωση όσο ο εξομοιωτής εκτελείται!" @@ -1007,31 +1050,31 @@ msgstr "Αναζήτηση Cheat" msgid "Cheats Manager" msgstr "ΔιαχείÏιση Cheat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Κινέζικα (Απλοποιημένα)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Κινέζικα (ΠαÏαδοσιακά)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "Επιλέξτε έναν φάκελο Ïίζας DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Choose a NAND root directory:" msgstr "Επιλέξτε έναν φάκελο Ïίζας NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "Επιλέξτε ένα Ï€Ïοεπιλεγμένο ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "Επιλέξτε έναν φάκελο για Ï€Ïοσθήκη" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "Επιλέξτε ένα αÏχείο για άνοιγμα" @@ -1039,12 +1082,16 @@ msgstr "Επιλέξτε ένα αÏχείο για άνοιγμα" msgid "Choose a memory card:" msgstr "Επιλέξτε μια κάÏτα μνήμης:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 -msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" -msgstr "Επιλέξτε ένα αÏχείο για χÏήση ως apploader: (έχει εφαÏμογή σε δίσκους που απαÏτίζονται μόνο από φακέλους)" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +msgid "" +"Choose file to use as apploader: (applies to discs constructed from " +"directories only)" +msgstr "" +"Επιλέξτε ένα αÏχείο για χÏήση ως apploader: (έχει εφαÏμογή σε δίσκους που " +"απαÏτίζονται μόνο από φακέλους)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "Επιλέξτε τον φάκελο Ï€Ïος αποσυμπίεση" @@ -1063,17 +1110,21 @@ msgstr "Κλασικό ΧειÏιστήÏιο" msgid "Clear" msgstr "ΚαθάÏισ." -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." 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:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Κλείσιμο" @@ -1098,20 +1149,20 @@ msgstr "Εντολή" msgid "Comment" msgstr "Σχόλιο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "Σχόλιο:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "Συμπίεση ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "Συμπίεση επιλεγμένων ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "Συμπίεση ISO" @@ -1138,13 +1189,13 @@ msgstr "Ρυθμίσεις ΧειÏιστηÏίων" msgid "Configure..." msgstr "Γενικές Ρυθμίσεις..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "Επιβεβαίωση Αντικατάστασης ΑÏχείου" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Confirm on Stop" msgstr "Επιβεβαίωση Διακοπής" @@ -1153,7 +1204,7 @@ msgstr "Επιβεβαίωση Διακοπής" msgid "Connect" msgstr "ΣÏνδεση" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "ΣÏνδεση ΠληκτÏολογίου USB" @@ -1163,22 +1214,26 @@ msgid "Connect Wiimote %i" msgstr "ΣÏνδεση Wiimote %i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "ΣÏνδεση Wiimote 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "ΣÏνδεση Wiimote 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "ΣÏνδεση Wiimote 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "ΣÏνδεση Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Connecting..." msgstr "Γίνεται ΣÏνδεση..." @@ -1203,7 +1258,7 @@ msgstr "Η αντιγÏαφή απέτυχε" msgid "Copy to Memcard %c" msgstr "ΑντιγÏαφή στην κάÏτα μνήμης %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "ΠυÏήνας" @@ -1219,17 +1274,22 @@ 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:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "Αποτυχία αποθήκευσης του %s" @@ -1239,21 +1299,25 @@ 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:119 #, 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:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "Αδυναμία εÏÏεσης εντολής ανοίγματος για την επέκταση 'ini'!" @@ -1270,7 +1334,7 @@ msgstr "" msgid "Count:" msgstr "Πλήθος:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "ΧώÏα:" @@ -1284,21 +1348,26 @@ msgstr "ΔημιουÏγία ÎšÏ‰Î´Î¹ÎºÎ¿Ï AR" msgid "Create new perspective" msgstr "ΔημιουÏγία νέας οπτικής" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr "ΔημιουÏγήθηκε από KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 -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:495 +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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr "ΔημιουÏγήθηκε από VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 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:15 msgid "Creator: " @@ -1331,7 +1400,7 @@ msgstr "Crossfade" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Ο Ï„Ïέχων φάκελος άλλαξε από %s σε %s μετά από τον wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" msgstr "ΠÏοσαÏμοζόμενο Projection Hack" @@ -1339,15 +1408,15 @@ msgstr "ΠÏοσαÏμοζόμενο Projection Hack" msgid "Custom Projection Hack Settings" msgstr "Ρυθμίσεις ΠÏοσαÏμοζόμενου Projection Hack" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Τσέχικα" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "Ψηφιακό Pad" @@ -1355,24 +1424,24 @@ msgstr "Ψηφιακό Pad" msgid "DSP" msgstr "Ήχος (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP Emulator Engine" msgstr "Μηχανή Εξομοίωσης DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE εξομοίωση (γÏήγοÏη)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (αÏγή)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP LLE on Thread" msgstr "DSP LLE σε ΞεχωÏιστό Îήμα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "DSP LLE recompiler" @@ -1380,7 +1449,7 @@ msgstr "DSP LLE recompiler" msgid "DSP settings" msgstr "Ρυθμίσεις ήχου (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "Ρίζα DVD:" @@ -1388,7 +1457,7 @@ msgstr "Ρίζα DVD:" msgid "Data Size" msgstr "Μέγεθος Δεδομένων" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "ΗμεÏομηνία:" @@ -1417,16 +1486,16 @@ msgstr "Debugging" msgid "Decimal" msgstr "Δεκαδικός" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "Αποσυμπίεση ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "Αποσυμπίεση επιλεγμένων ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "Γίνεται αποσυμπίεση ISO" @@ -1434,7 +1503,7 @@ msgstr "Γίνεται αποσυμπίεση ISO" msgid "Default" msgstr "ΠÏοεπιλ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "ΠÏοεπιλεγμένο ISO:" @@ -1466,16 +1535,20 @@ msgstr "Ανίχνευση" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -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 msgid "Device" msgstr "Συσκευή" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "Ρυθμίσεις Συσκευής" @@ -1523,24 +1596,30 @@ msgstr "ΑπενεÏγοποίηση Υφών" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 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:95 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -1554,7 +1633,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "Δίσκος" @@ -1581,11 +1660,11 @@ msgstr "" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξομοίωση;" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "Dolphin" @@ -1610,12 +1689,12 @@ msgstr "Ρυθμίσεις Εξοιμοιωμένου Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Ρυθμίσεις Dolphin GCPad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" @@ -1627,13 +1706,21 @@ msgstr "Ρυθμίσεις Dolphin Wiimote" msgid "Dolphin at &Google Code" msgstr "Dolphin στο &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 -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:339 +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:307 -msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." -msgstr "Το Dolphin είναι Ïυθμισμένο να αποκÏÏπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ εδώ για να εμφανιστοÏν όλα τα παιχνίδια..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +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:55 @@ -1657,7 +1744,7 @@ msgstr "ΤÏμπανα" msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Εξαγωγή Ήχου" @@ -1679,7 +1766,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Εξαγωγή όλων των απεικονισμένων καÏέ σε ένα AVI αÏχείο στο User/Dump/Frames/\n" +"Εξαγωγή όλων των απεικονισμένων καÏέ σε ένα AVI αÏχείο στο User/Dump/" +"Frames/\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -1689,7 +1777,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Εξαγωγή των αποκωδικοποιημένων υφών του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï ÏƒÏ„Î¿ User/Dump/Textures//\n" +"Εξαγωγή των αποκωδικοποιημένων υφών του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï ÏƒÏ„Î¿ User/Dump/Textures/" +"/\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -1703,9 +1792,9 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Ολλανδικά" @@ -1719,8 +1808,16 @@ msgstr "EFB ΑντίγÏαφα" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, 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:162 msgid "EUROPE" @@ -1750,8 +1847,8 @@ msgstr "ΕπεξεÏγασία Patch" msgid "Edit current perspective" msgstr "ΕπεξεÏγασία Ï„Ïέχουσας οπτικής" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "ΕπεξεÏγασία..." @@ -1763,31 +1860,38 @@ msgstr "Εφέ" msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer" -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "Το νήμα εξομοίωσης εκτελείται ήδη" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 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:110 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" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -1795,7 +1899,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Εξομοιωμένο Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "Κατάσταση ΛειτουÏγίας:" @@ -1805,13 +1909,15 @@ msgstr "ΕνεÏγοποίηση" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 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" @@ -1821,7 +1927,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "ΕνεÏγοποίηση ΚαταγÏαφής AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "ΕνεÏγοποίηση Throttle Ήχου" @@ -1833,15 +1939,19 @@ msgstr "ΕνεÏγοποίηση BAT" msgid "Enable Block Merging" msgstr "ΕνεÏγοποίηση Block Merging" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "ΕνεÏγοποίηση Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Cheats" msgstr "ΕνεÏγοποίηση Cheat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "ΕνεÏγοποίηση Μουσικής DTK" @@ -1849,7 +1959,7 @@ msgstr "ΕνεÏγοποίηση Μουσικής DTK" msgid "Enable Dual Core" msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα (επιτάχυνση)" @@ -1861,7 +1971,7 @@ msgstr "ΕνεÏγοποίηση ΣυντομεÏσεων" msgid "Enable Idle Skipping" msgstr "ΕνεÏγοποίηση Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "ΕνεÏγοποίηση Idle Skipping (επιτάχυνση)" @@ -1874,7 +1984,7 @@ msgstr "ΕνεÏγοποίηση MMU" msgid "Enable Progressive Scan" msgstr "ΕνεÏγοποίηση ΠÏοοδευτικής ΣάÏωσης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Enable Screen Saver" msgstr "ΕνεÏγοποίηση ΠÏοφÏλαξης Οθόνης" @@ -1895,14 +2005,19 @@ msgid "" "If unsure, select 1x." msgstr "" "ΕνεÏγοποιεί το ανισοτÏοπικό φιλτÏάÏισμα.\n" -"Βελτιώνει την ποιότητα απεικόνισης των υφών που βÏίσκονται σε οξείες οπτικές γωνίες.\n" +"Βελτιώνει την ποιότητα απεικόνισης των υφών που βÏίσκονται σε οξείες οπτικές " +"γωνίες.\n" "ΜποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα σε έναν μικÏÏŒ αÏιθμό παιχνιδιών.\n" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -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:799 msgid "Enable pages" @@ -1915,30 +2030,43 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιήστε το αν θέλετε ολόκληÏη η οθόνη να χÏησιμοποιηθεί για την απεικόνιση.\n" +"ΕνεÏγοποιήστε το αν θέλετε ολόκληÏη η οθόνη να χÏησιμοποιηθεί για την " +"απεικόνιση.\n" "Αν αυτό είναι απενεÏγοποιημένο, θα δημιουÏγηθεί ένα παÏάθυÏο απεικόνισης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 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:329 -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:332 +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:311 -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:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" msgstr "ΕνεÏγοποιεί το ΠÏοσαÏμοζόμενο Projection Hack" @@ -1949,13 +2077,18 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιεί την Ï€Ïοοδευτική σάÏωση αν υποστηÏίζεται από το εξομοιωμένο λογισμικό. Τα πεÏισσότεÏα παιχνίδια δεν την χÏειάζονται αυτήν την ÏÏθμιση.\n" +"ΕνεÏγοποιεί την Ï€Ïοοδευτική σάÏωση αν υποστηÏίζεται από το εξομοιωμένο " +"λογισμικό. Τα πεÏισσότεÏα παιχνίδια δεν την χÏειάζονται αυτήν την ÏÏθμιση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -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:117 msgid "" @@ -1971,9 +2104,9 @@ msgstr "" msgid "End" msgstr "Τέλος" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Αγγλικά" @@ -2002,18 +2135,39 @@ msgstr "Ίσο" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Σφάλμα" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." -msgstr "Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή συστήματος." +msgstr "" +"Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή " +"συστήματος." -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 #, 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: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#, c-format +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" @@ -2026,7 +2180,8 @@ 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:58 msgid "Execute" @@ -2040,11 +2195,12 @@ msgstr "Έξοδος από το Dolphin με τον εξομοιωτή" msgid "Export Failed" msgstr "Αποτυχία Εξαγωγής" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "Εξαγωγή ΑÏχείου" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "Εξαγωγή ΕγγÏαφής" @@ -2056,7 +2212,7 @@ msgstr "Εξαγωγή ΕγγÏαφής..." msgid "Export Save" msgstr "Εξαγωγή Αποθήκευσης" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "Εξαγωγή Αποθήκευσης Wii (ΠειÏαματικό)" @@ -2088,44 +2244,44 @@ msgstr "Επιπλέον ΠαÏάμετÏος" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Η Επιπλέον ΠαÏάμετÏος είναι χÏήσιμη μόνο στο ''Metroid: Other M''." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "Εξαγωγή όλων των αÏχείων..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "Εξαγωγή Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "Εξαγωγή DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "Εξαγωγή Φακέλου..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "Εξαγωγή ΑÏχείου..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "Εξαγωγή Κατάτμησης..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "Γίνεται εξαγωγή %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "Γίνεται εξαγωγή όλων των αÏχείων" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "Γίνεται εξαγωγή φακέλου" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "Γίνεται εξαγωγή..." @@ -2141,7 +2297,7 @@ msgstr "ΑναπαÏαγωγή FIFO" msgid "FRANCE" msgstr "ΓΑΛΛΙΑ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "Μέγεθος FST:" @@ -2157,7 +2313,7 @@ msgstr "Αποτυχία ακÏόασης!!" msgid "Failed to download codes." msgstr "Αποτυχία μεταφόÏτωσης κωδικών." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "Αποτυχία εξαγωγής στο %s!" @@ -2177,10 +2333,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 @@ -2329,11 +2487,11 @@ msgstr "Το αÏχείο δεν είναι συμπιεσμένο" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Άγνωστη λειτουÏγία ανοίγματος : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "ΑÏχεία δίσκου" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Ο Ï„Ïπος αÏχείου 'ini' είναι άγνωστος! Δε θα γίνει άνοιγμα!" @@ -2353,7 +2511,7 @@ msgstr "Επιβολή 16:9" msgid "Force 4:3" msgstr "Επιβολή 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Force Console as NTSC-J" msgstr "Επιβολή της Κονσόλας ως NTSC-J" @@ -2369,7 +2527,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Επιβάλλει φιλτÏάÏισμα υφών ακόμα κι αν το παιχνίδι το έχει απενεÏγοποιήσει.\n" -"Βελτιώνει ελαφÏÏŽÏ‚ την ποιότητα των υφών αλλά μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα σε οÏισμένα παιχνίδια.\n" +"Βελτιώνει ελαφÏÏŽÏ‚ την ποιότητα των υφών αλλά μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα " +"σε οÏισμένα παιχνίδια.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -2385,13 +2544,16 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 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:76 msgid "" @@ -2415,6 +2577,7 @@ msgid "Frame " msgstr "ΚαÏέ" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "ΠÏοώθηση ανά ΚαÏέ" @@ -2430,7 +2593,7 @@ msgstr "ΕÏÏος ΚαÏέ" msgid "Frame S&kipping" msgstr "ΠαÏάλειψη Κ&αÏέ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "ΠεÏιοÏισμός ΚαÏέ:" @@ -2442,9 +2605,9 @@ msgstr "ΚαÏέ ΠÏος ΕγγÏαφή" msgid "Free Look" msgstr "ΕλεÏθεÏη Ματιά" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "French" msgstr "Γαλλικά" @@ -2469,11 +2632,16 @@ msgstr "Ανάλυση ΠλήÏους Οθόνης:" msgid "GCI File(*.gci)" msgstr "ΑÏχεία GCI(*.gci)" +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +#, fuzzy +msgid "GCMic Configuration" +msgstr "Ρυθμίσεις ΚαταγÏαφής" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "ID ΠαιχνιδιοÏ:" @@ -2489,7 +2657,7 @@ msgstr "Το παιχνίδι δεν εκτελείται!" msgid "Game not found!!" msgstr "Το παιχνίδι δε βÏέθηκε!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "Ρυθμίσεις ΣυγκεκÏιμένου ΠαιχνιδιοÏ" @@ -2497,7 +2665,7 @@ msgstr "Ρυθμίσεις ΣυγκεκÏιμένου ΠαιχνιδιοÏ" msgid "GameConfig" msgstr "Ρυθμίσεις ΠαιχνιδιοÏ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "Gamecube" @@ -2506,7 +2674,7 @@ msgid "Gamecube &Pad Settings" msgstr "Ρυθμίσεις Gamecube &Pad" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "ΚάÏτες Μνήμης Gamecube (*.raw,*.gcp)" @@ -2529,7 +2697,8 @@ msgstr "" "(ή είναι ένας κακός κωδικός ή ο Ï„Ïπος του ÎºÏ‰Î´Î¹ÎºÎ¿Ï Î´ÎµÎ½ υποστηÏίζεται.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Γενικά" @@ -2538,16 +2707,18 @@ msgstr "Γενικά" msgid "General Settings" msgstr "Γενικές Ρυθμίσεις" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "German" msgstr "ΓεÏμανικά" #: Source/Core/Core/Src/ActionReplay.cpp:451 #, 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:443 msgid "Graphics" @@ -2563,19 +2734,23 @@ msgstr "ΜεγαλÏτεÏο από" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 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:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" msgstr "Ελληνικά" @@ -2607,7 +2782,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Αποτυχία ελέγχου κεφαλίδας" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hebrew" msgstr "ΕβÏαϊκά" @@ -2649,7 +2824,8 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"ΑποκÏÏπτει τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î±Î½ βÏίσκεται πάνω από το παÏάθυÏο εξομοίωσης.\n" +"ΑποκÏÏπτει τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î±Î½ βÏίσκεται πάνω από το παÏάθυÏο " +"εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -2667,11 +2843,12 @@ msgid "Hotkey Configuration" msgstr "Ρυθμίσεις ΠλήκτÏων Συντόμευσης" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 msgid "Hotkeys" msgstr "ΠλήκτÏα Συντόμευσης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hungarian" msgstr "ΟυγγÏικά" @@ -2682,16 +2859,20 @@ msgstr "ΥβÏιδικό Wiimote" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 #, 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:795 #, 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 πιθανότατα θα κολλήσει Ï„ÏŽÏα." @@ -2699,7 +2880,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - μη έγκυÏος Ï€ÏοοÏισμός" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "Ρυθμίσεις IPL" @@ -2715,11 +2896,11 @@ msgstr "Δείκτης IR" msgid "IR Sensitivity:" msgstr "Ευαισθησία IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "ΛεπτομέÏειες ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "Φάκελοι ISO" @@ -2731,15 +2912,28 @@ msgstr "ΙΤΑΛΙΑ" msgid "Icon" msgstr "Εικονίδιο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -msgid "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -msgstr "Αν τα FPS διακυμαίνονται, αυτή η επιλογή μποÏείο να βοηθήσει. (ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 -msgid "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/ISOProperties.cpp:329 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." msgstr "" -"Αν θέσετε τιμή υψηλότεÏη από την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, PAL:50),\n" -"θα Ï€Ïέπει επίσης να απενεÏγοποιήσετε το Throttle Ήχου στο DSP για να έχει αποτέλεσμα. " + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +msgid "" +"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" +msgstr "" +"Αν τα FPS διακυμαίνονται, αυτή η επιλογή μποÏείο να βοηθήσει. (ΕνεÏγό = " +"Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +msgid "" +"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." +msgstr "" +"Αν θέσετε τιμή υψηλότεÏη από την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, " +"PAL:50),\n" +"θα Ï€Ïέπει επίσης να απενεÏγοποιήσετε το Throttle Ήχου στο DSP για να έχει " +"αποτέλεσμα. " #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" @@ -2748,24 +2942,29 @@ msgstr "Αγνόηση Αλλαγών Format" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 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:93 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -2799,11 +2998,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -2813,11 +3014,12 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί την εξαφάνιση του Ï†Ï‰Ï„Î¹ÏƒÎ¼Î¿Ï ÏƒÏ„Î± πεÏισσότεÏα παιχνίδια.\n" +"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί την εξαφάνιση του Ï†Ï‰Ï„Î¹ÏƒÎ¼Î¿Ï ÏƒÏ„Î± " +"πεÏισσότεÏα παιχνίδια.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "Εντός ΠαιχνιδιοÏ" @@ -2846,7 +3048,7 @@ msgstr "Εισάγετε" msgid "Insert Encrypted or Decrypted code here..." msgstr "Εισάγετε Κωδικοποιημένο ή μη Κωδικό εδώ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "Εισαγωγή ΚάÏτας SD" @@ -2858,31 +3060,34 @@ msgstr "Εισάγετε όνομα εδώ..." msgid "Install WAD" msgstr "Εγκατάσταση WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 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:1363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 msgid "Interface" msgstr "Διεπαφή" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "Ρυθμίσεις Διεπαφής" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "ΕσωτεÏικό Σφάλμα LZO - αποτυχία συμπίεσης" -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -2891,7 +3096,7 @@ msgstr "" "ΕσωτεÏικό Σφάλμα LZO - αποτυχία αποσυμπίεσης (%d) (%ld, %ld) \n" "Δοκιμάστε να φοÏτώσετε ξανά το σημείο αποθήκευσης" -#: Source/Core/Core/Src/State.cpp:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "ΕσωτεÏικό Σφάλμα LZO - αποτυχία lzo_init()" @@ -2899,11 +3104,11 @@ msgstr "ΕσωτεÏικό Σφάλμα LZO - αποτυχία lzo_init()" msgid "Internal Resolution:" msgstr "ΕσωτεÏική Ανάλυση:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "Interpreter (ΠΟΛΥ αÏγός)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "Εισαγωγή" @@ -2920,7 +3125,7 @@ msgstr "Μη έγκυÏη τιμή!" msgid "Invalid bat.map or dir entry" msgstr "Μη έγκυÏο bat.map ή εγγÏαφή φακέλου" -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "Μη έγκυÏος Ï„Ïπος συμβάντος %i" @@ -2940,17 +3145,17 @@ msgstr "" "%s\n" " Ίσως χÏειαστεί να ξαναεξάγετε την εικόνα Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î±Ï€ÏŒ τον δίσκο." -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "Μη έγκυÏο αÏχείο εγγÏαφής" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "Μη έγκυÏο κατάσταση" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Italian" msgstr "Ιταλικά" @@ -2958,16 +3163,16 @@ msgstr "Ιταλικά" msgid "JAPAN" msgstr "ΙΑΠΩÎΙΑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (Ï€Ïοτείνεται)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "JITIL δοκιμαστικός recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Japanese" msgstr "Ιαπωνικά" @@ -2976,16 +3181,17 @@ msgid "KOREA" msgstr "ΚΟΡΕΑ" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "ΠλήκτÏο" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Korean" msgstr "ΚοÏεάτικα" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "L" @@ -2994,11 +3200,11 @@ msgid "L Button" msgstr "L Button" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" msgstr "L-Αναλογική" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "Γλώσσα:" @@ -3021,6 +3227,7 @@ msgid "Left Stick" msgstr "ΑÏιστεÏÏŒ Stick" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3050,7 +3257,7 @@ msgstr "" msgid "Less Than" msgstr "ΜικÏότεÏο από" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "ΠεÏιοÏισμός με βάση τα ΚαÏέ" @@ -3063,34 +3270,42 @@ msgid "Load Custom Textures" msgstr "ΦόÏτωση ΤÏοποποιημένων Υφών" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 1" msgstr "ΦόÏτωση Σημείου Αποθήκευσης 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 2" msgstr "ΦόÏτωση Σημείου Αποθήκευσης 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 3" msgstr "ΦόÏτωση Σημείου Αποθήκευσης 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 4" msgstr "ΦόÏτωση Σημείου Αποθήκευσης 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 msgid "Load State Slot 5" msgstr "ΦόÏτωση Σημείου Αποθήκευσης 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Load State Slot 6" msgstr "ΦόÏτωση Σημείου Αποθήκευσης 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Load State Slot 7" msgstr "ΦόÏτωση Σημείου Αποθήκευσης 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Load State Slot 8" msgstr "ΦόÏτωση Σημείου Αποθήκευσης 8" @@ -3098,11 +3313,11 @@ msgstr "ΦόÏτωση Σημείου Αποθήκευσης 8" msgid "Load State..." msgstr "ΦόÏτωση Σημείου Αποθήκευσης..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 #, c-format msgid "Load Wii System Menu %d%c" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii %d%c" @@ -3129,7 +3344,7 @@ msgstr "ΦοÏτώνει το καθοÏισμένο αÏχείο (DOL,ELF,GCM,I msgid "Local" msgstr "Τοπικό" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Lock Threads to Cores" msgstr "Κλείδωμα Îημάτων στους ΠυÏήνες " @@ -3184,16 +3399,16 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "ΑÏχεία MadCatz Gameshark (*.gcs)" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "ΚÏÏιο Stick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "ID ΔημιουÏγοÏ:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "ΔημιουÏγός:" @@ -3215,13 +3430,17 @@ msgid "Memory Byte" msgstr "Memory Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 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 @@ -3242,13 +3461,15 @@ msgstr "" #: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" -msgstr "Το μέγεθος του αÏχείου της κάÏτας μνήμης δεν ταιÏιάζει με το μέγεθος της κεφαλίδας." +msgstr "" +"Το μέγεθος του αÏχείου της κάÏτας μνήμης δεν ταιÏιάζει με το μέγεθος της " +"κεφαλίδας." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:47 msgid "Menu" msgstr "ΜενοÏ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "ΜικÏόφωνο" @@ -3261,7 +3482,7 @@ msgstr "Ελάχιστη" msgid "Misc" msgstr "ΔιάφοÏα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "ΔιάφοÏες Ρυθμίσεις" @@ -3272,11 +3493,13 @@ msgstr "Modifier" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -3290,7 +3513,7 @@ msgid "Motion Plus" msgstr "Motion Plus" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "ΜοτέÏ" @@ -3304,7 +3527,8 @@ msgid "" "\n" "\n" msgstr "" -"Μετακινήστε τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Ï€Î¬Î½Ï‰ από μία επιλογή για να εμφανιστεί μία λεπτομεÏής πεÏιγÏαφή.\n" +"Μετακινήστε τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Ï€Î¬Î½Ï‰ από μία επιλογή για να εμφανιστεί " +"μία λεπτομεÏής πεÏιγÏαφή.\n" "\n" "\n" "\n" @@ -3315,8 +3539,12 @@ msgid "Multiply" msgstr "Multiply" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -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/WXInputBase.cpp:126 msgid "NP Add" @@ -3402,7 +3630,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3441,7 +3669,7 @@ msgstr "Ψευδώνυμο :" msgid "No Country (SDK)" msgstr "Καμία ΧώÏα (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "Δε βÏέθηκαν ISO ή WAD" @@ -3476,7 +3704,7 @@ msgstr "Δε βÏέθηκε φάκελος αποθήκευσης για τον msgid "None" msgstr "Καμία" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" msgstr "ÎοÏβηγικά Bokmaal" @@ -3484,16 +3712,16 @@ msgstr "ÎοÏβηγικά Bokmaal" msgid "Not Equal" msgstr "Όχι ίσο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "Μη ΟÏισμένο" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Not connected" msgstr "Μη Συνδεδεμένο" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "Σημειώσεις" @@ -3535,7 +3763,7 @@ msgstr "Αντικείμενο" msgid "Object Range" msgstr "ΕÏÏος Αντικειμένου" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "ΑνενεÏγός" @@ -3550,14 +3778,15 @@ msgstr "Διαθέσιμα μόνο %d μπλοκ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Άνοιγμα" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "Άνοιγμα &τοποθεσίας αÏχείου" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "Άνοιγμα φακέλου αποθήκευσης Wii" @@ -3596,7 +3825,7 @@ msgid "Opens the logger" msgstr "Άνοιγμα της καταγÏαφής" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Ρυθμίσεις" @@ -3610,7 +3839,8 @@ 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" @@ -3620,8 +3850,12 @@ 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" @@ -3672,12 +3906,12 @@ msgstr "Κατάτμηση %i" msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "Φάκελοι" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "ΠαÏση" @@ -3686,7 +3920,7 @@ msgstr "ΠαÏση" msgid "Per-Pixel Lighting" msgstr "Φωτισμός ανά Pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "Τέλειο" @@ -3697,20 +3931,22 @@ msgstr "Οπτική %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 msgid "Play" msgstr "ΑναπαÏαγωγή" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "ΑναπαÏαγωγή ΕγγÏαφής" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "ΑναπαÏαγωγή/ΠαÏση" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "Παίζεται" @@ -3722,7 +3958,7 @@ msgstr "Ρυθμίσεις ΑναπαÏαγωγής" msgid "Players" msgstr "Παίχτες" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 msgid "Please confirm..." msgstr "ΠαÏακαλώ επιβεβαιώστε..." @@ -3734,23 +3970,23 @@ msgstr "ΠαÏακαλώ δημιουÏγήστε μια οπτική Ï€Ïιν msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Polish" msgstr "Πολωνέζικα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 1" msgstr "ΘÏÏα 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 2" msgstr "ΘÏÏα 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Port 3" msgstr "ΘÏÏα 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 msgid "Port 4" msgstr "ΘÏÏα 4" @@ -3759,11 +3995,11 @@ msgstr "ΘÏÏα 4" msgid "Port :" msgstr "ΘÏÏα :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese" msgstr "ΠοÏτογαλικά" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" msgstr "ΠοÏτογαλικά (Î’Ïαζιλιάνικα)" @@ -3771,6 +4007,21 @@ msgstr "ΠοÏτογαλικά (Î’Ïαζιλιάνικα)" msgid "Post-Processing Effect:" msgstr "Post-Processing Εφέ:" +#: Source/Core/Core/Src/Movie.cpp:735 +#, c-format +msgid "Premature movie end in PlayController. %u + 8 > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:829 +#, c-format +msgid "Premature movie end in PlayWiimote. %u + %d > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:806 +#, c-format +msgid "Premature movie end in PlayWiimote. %u > %u" +msgstr "" + #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "ΠÏοεπιλογές: " @@ -3813,7 +4064,7 @@ msgid "Quit" msgstr "Έξοδος" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "R" @@ -3822,7 +4073,7 @@ msgid "R Button" msgstr "R Button" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" msgstr "R-Αναλογική" @@ -3839,6 +4090,7 @@ msgid "Range" msgstr "ΕÏÏος" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "Μόνο Για Ανάγνωση (ΕγγÏαφής)" @@ -3909,6 +4161,7 @@ msgid "Refresh" msgstr "Ανανέωση" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "Ανανέωση Λίστας" @@ -3916,10 +4169,10 @@ msgstr "Ανανέωση Λίστας" msgid "Refresh game list" msgstr "Ανανέωση λίστας παιχνιδιών" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 msgid "Remove" msgstr "ΑφαίÏεση" @@ -3938,6 +4191,7 @@ 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 msgid "Reset" msgstr "Επανεκκίνηση" @@ -3960,15 +4214,15 @@ msgid "Right Stick" msgstr "Δεξί Stick" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Δόνηση" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Εκτέλεση DSP LLE σε ξεχωÏιστό νήμα (δεν Ï€Ïοτείνεται)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "Ρώσικα" @@ -3980,7 +4234,7 @@ msgstr "Απ&οθήκευση Σημείου Αποθήκευσης" msgid "Safe" msgstr "Ασφαλής" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Sample Rate:" msgstr "Ρυθμός Δειγματοληψίας:" @@ -3995,34 +4249,42 @@ msgid "Save GCI as..." msgstr "Αποθήκευση GCI ως..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 1" msgstr "Αποθήκευση Σημείου Αποθήκευσης 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 2" msgstr "Αποθήκευση Σημείου Αποθήκευσης 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 3" msgstr "Αποθήκευση Σημείου Αποθήκευσης 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 4" msgstr "Αποθήκευση Σημείου Αποθήκευσης 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 msgid "Save State Slot 5" msgstr "Αποθήκευση Σημείου Αποθήκευσης 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 msgid "Save State Slot 6" msgstr "Αποθήκευση Σημείου Αποθήκευσης 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 msgid "Save State Slot 7" msgstr "Αποθήκευση Σημείου Αποθήκευσης 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 msgid "Save State Slot 8" msgstr "Αποθήκευση Σημείου Αποθήκευσης 8" @@ -4030,12 +4292,12 @@ msgstr "Αποθήκευση Σημείου Αποθήκευσης 8" msgid "Save State..." msgstr "Αποθήκευση Σημείου..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "Αποθήκευση ως..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "Αποθήκευση συμπιεσμένου GCM/ISO" @@ -4043,29 +4305,31 @@ msgstr "Αποθήκευση συμπιεσμένου GCM/ISO" msgid "Save current perspective" msgstr "Αποθήκευση Ï„Ïέχουσας οπτικής" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "Αποθήκευση αποσυμπιεσμένου GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." -msgstr "Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της εγγÏαφής της ταινίας..." +msgstr "" +"Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της " +"εγγÏαφής της ταινίας..." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" msgstr "ΚλιμακοÏμενα EFB ΑντίγÏαφα" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, c-format msgid "Scanning %s" msgstr "Ανίχνευση %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "Αναζήτηση για ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "Ανίχνευση..." @@ -4081,14 +4345,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "ΦίλτÏο Αναζήτησης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "Αναζήτηση σε Υποφακέλους" -#: Source/Core/Common/Src/SysConf.h:104 -#: Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 -#: Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 +#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Η ενότητα %s δε βÏέθηκε στο SYSCONF" @@ -4098,12 +4360,12 @@ msgstr "Η ενότητα %s δε βÏέθηκε στο SYSCONF" msgid "Select" msgstr "Επιλογή" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αÏχείο για εγκατάσταση" @@ -4129,15 +4391,15 @@ msgstr "Επιλέξτε αιωÏοÏμενα παÏάθυÏα" msgid "Select the file to load" msgstr "Επιλέξτε το αÏχείο για φόÏτωση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Επιλέξτε αÏχείο αποθήκευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Επιλέξτε το σημείο φόÏτωσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" @@ -4155,7 +4417,8 @@ msgstr "" "Αυτόματα: ΧÏήση της τοπικής αναλογίας οθόνης (4:3)\n" "Επιβολή 16:9: ΠÏοσαÏμόζει την εικόνα σε αναλογία οθόνης 16:9.\n" "Επιβολή 4:3: ΠÏοσαÏμόζει την εικόνα σε αναλογία οθόνης 4:3.\n" -"ΠÏοσαÏμογή στο παÏάθυÏο: ΠÏοσαÏμόζει την εικόνα στην αναλογία του παÏαθÏÏου.\n" +"ΠÏοσαÏμογή στο παÏάθυÏο: ΠÏοσαÏμόζει την εικόνα στην αναλογία του " +"παÏαθÏÏου.\n" "\n" "Αν δεν είστε σίγουÏοι επιλέξτε Αυτόματα." @@ -4166,26 +4429,32 @@ msgstr "Επιλεγμένη γÏαμματοσειÏά" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 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:73 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." @@ -4202,19 +4471,22 @@ msgstr "Θέση Sensor Bar:" msgid "Separator" msgstr "ΔιαχωÏιστής" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "ΣεÏβικά" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -msgid "Serial Port 1 - This is the port which devices such as the net adapter use" -msgstr "ΣειÏιακή ΘÏÏα 1 - Αυτή είναι η θÏÏα που χÏησιμοποιοÏν οι συσκευές όπως ο Ï€ÏοσαÏμογέας δικτÏου" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +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" msgstr "ΟÏισμός" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "ΟÏισμός ως Ï€Ïοεπιλεγμένο &ISO" @@ -4226,13 +4498,15 @@ msgstr "ΟÏισμός ως Ï€Ïοεπιλεγμένη ΚάÏτα Μνήμης % #: Source/Core/Core/Src/ActionReplay.cpp:462 #, 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:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." msgstr "Ρυθμίσεις..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem:Αδυναμία εÏÏεσης αÏχείου Ïυθμίσεων" @@ -4240,7 +4514,7 @@ msgstr "SetupWiiMem:Αδυναμία εÏÏεσης αÏχείου Ïυθμίσ msgid "Shake" msgstr "ΚοÏνημα" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "ΣÏντομο Όνομα:" @@ -4300,7 +4574,7 @@ msgstr "Εμφάνιση JAP" msgid "Show Korea" msgstr "Εμφάνιση ΚοÏέας" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "Εμφάνιση Γλώσσας:" @@ -4340,17 +4614,19 @@ msgstr "Εμφάνιση Wad" msgid "Show Wii" msgstr "Εμφάνιση Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 msgid "Show a confirmation box before stopping a game." msgstr "Εμφάνιση επιβεβαίωσης Ï€Ïιν τη διακοπή ενός παιχνιδιοÏ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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:812 @@ -4375,11 +4651,13 @@ msgstr "Εμφάνιση αποθηκευμένου τίτλου" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -4405,15 +4683,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "ΟÏιζόντια Θέση Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Κινέζικα Απλοποιημένα" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "Μέγεθος" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 msgid "Skip BIOS" msgstr "ΠαÏάλειψη BIOS" @@ -4427,11 +4705,13 @@ msgstr "ΠαÏάλειψη EFB ΠÏόσβασης από τη CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -4439,13 +4719,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 "" -"ΕπιταχÏνει ελαφÏÏŽÏ‚ τα EFB σε RAM αντίγÏαφα θυσιάζοντας την ακÏίβεια της εξομοίωσης.\n" +"ΕπιταχÏνει ελαφÏÏŽÏ‚ τα EFB σε RAM αντίγÏαφα θυσιάζοντας την ακÏίβεια της " +"εξομοίωσης.\n" "ΜεÏικές φοÏές μποÏεί να βελτιώσει την οπτική ποιότητα.\n" -"Αν αντιμετωπίζετε Ï€Ïοβλήματα, δοκιμάστε να αυξήσετε την ακÏίβεια της cache υφών ή απενεÏγοποιήστε αυτήν την επιλογή.\n" +"Αν αντιμετωπίζετε Ï€Ïοβλήματα, δοκιμάστε να αυξήσετε την ακÏίβεια της cache " +"υφών ή απενεÏγοποιήστε αυτήν την επιλογή.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -4455,11 +4738,11 @@ msgstr "" msgid "Slot %i" msgstr "Θέση %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 msgid "Slot A" msgstr "Θέση Α" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 msgid "Slot B" msgstr "Θέση Î’" @@ -4473,15 +4756,18 @@ 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:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Ρυθμίσεις Ήχου" @@ -4499,9 +4785,9 @@ msgstr "Αποτυχία δημιουÏγίας buffer ήχου: %s" msgid "Space" msgstr "Space" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Spanish" msgstr "Ισπανικά" @@ -4511,13 +4797,22 @@ msgstr "Ένταση ηχείου:" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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." @@ -4537,7 +4832,7 @@ msgstr "ΤετÏάγωνο Stick" msgid "Standard Controller" msgstr "Τυπικός Controller" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4552,14 +4847,16 @@ msgid "Start Re&cording" msgstr "Εκκίνηση Ε&γγÏαφής" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "Εκκίνηση ΕγγÏαφής" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "Λειτ." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "Σημεία Αποθήκευσης" @@ -4570,6 +4867,7 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Διακοπή" @@ -4577,12 +4875,14 @@ msgstr "Διακοπή" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 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" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -4611,8 +4911,8 @@ msgstr "Επιτυχής εισαγωγή σημείων αποθήκευσης" msgid "Swing" msgstr "Swing" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "Γλώσσα Συστήματος:" @@ -4644,9 +4944,14 @@ msgstr "Δεξί Table" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" msgstr "ΔημιουÏγία Στιγμιότυπου" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "Τέστ" @@ -4675,13 +4980,13 @@ msgstr "Η διεÏθυνση είναι άκυÏη" msgid "The checksum was successfully fixed" msgstr "Το checksum διοÏθώθηκε με επιτυχία" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "The chosen directory is already in the list" msgstr "Ο επιλεγμένος φάκελος βÏίσκεται ήδη στη λίστα" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, c-format msgid "" "The file %s already exists.\n" @@ -4692,8 +4997,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 "Αδυναμία ανοίγματος του αÏχείου %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 @@ -4715,25 +5024,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:98 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 second-fastest value from the right." msgstr "" -"Όσο πιο ασφαλής είναι αυτή η ÏÏθμιση, τόσο λιγότεÏο πιθανό ο εξομοιωτής να χάσει ανανεώσεις των υφών από την RAM.\n" +"Όσο πιο ασφαλής είναι αυτή η ÏÏθμιση, τόσο λιγότεÏο πιθανό ο εξομοιωτής να " +"χάσει ανανεώσεις των υφών από την RAM.\n" "\n" "Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την δεÏτεÏη γÏηγοÏότεÏη τιμή από δεξιά." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" -msgstr "Το σημείο αποθήκευσης που Ï€Ïοσπαθείτε να αντιγÏάψετε έχει μη έγκυÏο μέγεθος" +msgstr "" +"Το σημείο αποθήκευσης που Ï€Ïοσπαθείτε να αντιγÏάψετε έχει μη έγκυÏο μέγεθος" #: Source/Core/DolphinWX/Src/Main.cpp:353 -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!" @@ -4760,7 +5077,7 @@ msgstr "Το επιλεγμένο αÏχείο \"%s\" δεν υπάÏχει" msgid "The value is invalid" msgstr "Η τιμή είναι άκυÏη" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "Θέμα" @@ -4769,8 +5086,12 @@ msgid "Theme selection went wrong" msgstr "Η επιλογή θέματος απέτυχε" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 -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:304 msgid "" @@ -4778,29 +5099,44 @@ msgid "" "Undetermined means the game uses Dolphin's setting." msgstr "" "Αυτές οι Ïυθμίσεις υπεÏισχÏουν των γενικών Ïυθμίσεων του Dolphin.\n" -"Αν είναι ακαθόÏιστη η επιλογή το παιχνίδι χÏησιμοποιεί τις γενικές Ïυθμίσεις του Dolphin. " +"Αν είναι ακαθόÏιστη η επιλογή το παιχνίδι χÏησιμοποιεί τις γενικές Ïυθμίσεις " +"του Dolphin. " #: Source/Core/Core/Src/ActionReplay.cpp:356 -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:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." -msgstr "Αυτό μποÏεί να Ï€Ïοκαλέσει καθυστεÏήσεις στο ÎœÎµÎ½Î¿Ï Wii και σε μεÏικά παιχνίδια." +msgstr "" +"Αυτό μποÏεί να Ï€Ïοκαλέσει καθυστεÏήσεις στο ÎœÎµÎ½Î¿Ï Wii και σε μεÏικά " +"παιχνίδια." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 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:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -4808,28 +5144,35 @@ msgid "" "\n" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" -"ΧÏησιμοποιείται για τον έλεγχο της ταχÏτητας του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î¼Îµ throttle ήχου.\n" -"ΑπενεÏγοποιώντας το μποÏεί να Ï€Ïοκλήθει αφÏσικη ταχÏτητα σε παιχνίδια, Ï€.χ. Ï€Î¿Î»Ï Î³ÏήγοÏη.\n" +"ΧÏησιμοποιείται για τον έλεγχο της ταχÏτητας του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î¼Îµ throttle " +"ήχου.\n" +"ΑπενεÏγοποιώντας το μποÏεί να Ï€Ïοκλήθει αφÏσικη ταχÏτητα σε παιχνίδια, Ï€.χ. " +"Ï€Î¿Î»Ï Î³ÏήγοÏη.\n" "Όμως οÏισμένες φοÏές η ενεÏγοποίησή της μποÏεί να Ï€Ïοκαλέσει μόνιμο θόÏυβο.\n" "\n" -"Συντόμευση πληκτÏολογίου : ΚÏατήστε το πατημένο για να απενεÏγοποιηθεί η λειτουÏγία Throttle." +"Συντόμευση πληκτÏολογίου : ΚÏατήστε το πατημένο για να απενεÏγοποιηθεί " +"η λειτουÏγία Throttle." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "ΧÏησιμοποιείται για την αναπαÏαγωγή μουσικών κομματιών, όπως BGM." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 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:283 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 @@ -4841,7 +5184,7 @@ msgid "Tilt" msgstr "Πλάγιασμα" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr "Τίτλος" @@ -4856,15 +5199,16 @@ msgstr "Εναλλαγή Όλων ΤÏπων ΚαταγÏαφής " #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "ΚοÏυφή" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Κινέζικα ΠαÏαδοσιακά " @@ -4872,12 +5216,11 @@ msgstr "Κινέζικα ΠαÏαδοσιακά " msgid "Tried to load an unknown file type." msgstr "ΠÏοσπάθεια φόÏτωσης ενός άγνωστου Ï„Ïπου αÏχείο." -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "Σκανδάλες" -#: Source/Core/Common/Src/SysConf.h:92 -#: Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 msgid "Trying to read from invalid SYSCONF" msgstr "ΠÏοσπάθεια ανάγνωσης από ένα μη έγκυÏο SYSCONF" @@ -4889,7 +5232,7 @@ msgstr "" "ΠÏοσπάθεια ανάγνωσης από ένα μη έγκυÏο SYSCONF\n" "Τα Wiimote bt ids δεν είναι διαθέσιμα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Turkish" msgstr "ΤουÏκικά" @@ -4929,10 +5272,13 @@ 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:404 @@ -4968,15 +5314,6 @@ msgstr "Ελήφθη άγνωστο μήνυμα με id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Ελήφθη άγνωστο μήνυμα με:%d από τον παίκτη:%d ΑποσÏνδεση παίκτη!" -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Άγνωστος δείκτης %#08x\n" -"Συνέχεια;" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -4991,7 +5328,7 @@ msgstr "ΕνημέÏωση" msgid "Upright Wiimote" msgstr "Κάθετη Θέση Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "ΧÏήση ΛειτουÏγίας EuRGB60 (PAL60)" @@ -5003,7 +5340,7 @@ msgstr "ΧÏήση ΠλήÏους Οθόνης" msgid "Use Hex" msgstr "ΧÏήση Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "ΧÏήση Οθονών ΠανικοÏ" @@ -5015,19 +5352,23 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "ΧÏησιμοποίηση πολλαπλών νημάτων για την αποκωδικοποίηση υφών.\n" -"ΜποÏεί να βελτιώσει την ταχÏτητα (ειδικά σε CPUs με πεÏισσότεÏους από δÏο πυÏήνες).\n" +"ΜποÏεί να βελτιώσει την ταχÏτητα (ειδικά σε CPUs με πεÏισσότεÏους από δÏο " +"πυÏήνες).\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -5055,7 +5396,7 @@ msgstr "Τιμή: " msgid "Verbosity" msgstr "Αναλυτικότητα" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "Βίντεο" @@ -5063,7 +5404,7 @@ msgstr "Βίντεο" msgid "Virtual" msgstr "Εικονικό" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "Ένταση" @@ -5081,7 +5422,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Αναμονή για την κάθετη ανανέωση της οθόνης ώστε να μειωθεί το σπάσιμο της εικόνας.\n" +"Αναμονή για την κάθετη ανανέωση της οθόνης ώστε να μειωθεί το σπάσιμο της " +"εικόνας.\n" "Μειώνει τις επιδόσεις αν η ταχÏτητα εξομοίωσης είναι μικÏότεÏη από 100%.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -5111,7 +5453,8 @@ msgid "" "%s\n" "Do you wish to continue?" msgstr "" -"ΠÏοειδοποίηση! Συστήνεται η δημιουÏγία αντιγÏάφου ασφαλείας όλων των αÏχείων στον φάκελο:\n" +"ΠÏοειδοποίηση! Συστήνεται η δημιουÏγία αντιγÏάφου ασφαλείας όλων των αÏχείων " +"στον φάκελο:\n" "%s\n" "Θέλετε να συνεχίσετε;" @@ -5123,11 +5466,47 @@ 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:629 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, 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" +"\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" +"\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" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -5145,15 +5524,15 @@ msgstr "Hack ΕυÏείας Οθόνης" msgid "Width" msgstr "Πλάτος" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "Wii Κονσόλα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 msgid "Wii NAND Root:" msgstr "Wii NAND Ρίζα:" @@ -5161,7 +5540,7 @@ msgstr "Wii NAND Ρίζα:" msgid "Wii Save Import" msgstr "Εισαγωγή Αποθήκευσης Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 msgid "Wii save files (*.bin)|*.bin" msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -5192,7 +5571,7 @@ msgstr "" "ή πιθανόν να οφείλεται σε χÏόνο αδÏάνειας ή κάποιον άλλο λόγο.\n" "Θέλετε να γίνει άμεση επανασÏνδεση;" -#: Source/Core/DolphinWX/Src/Main.cpp:599 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Wiimote Connected" msgstr "Συνδεδεμένο Wiimote" @@ -5224,9 +5603,9 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Αναδίπλωση Λέξεων" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Working..." msgstr "Σε εÏγασία..." @@ -5289,9 +5668,10 @@ msgstr "ΠÏέπει να εισάγετε μία έγκυÏη οκταδική msgid "You must enter a valid profile name." msgstr "ΠÏέπει να εισάγετε ένα έγκυÏο όνομα Ï€Ïοφίλ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 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 "" @@ -5312,7 +5692,7 @@ msgstr "" "Θα έπÏεπε να είναι 0x%04x (αλλά είναι 0x%04llx)\n" "Θέλετε να δημιουÏγηθεί ένα καινοÏÏιο;" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "ZTP hack" @@ -5349,14 +5729,19 @@ msgstr "[ΠÏοσαÏμοζόμενο]" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -5378,7 +5763,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5395,7 +5780,7 @@ msgstr "αποτυχία ανάγνωσης δεδομένων από το Î±Ï msgid "failed to read header" msgstr "αποτυχία ανάγνωσης κεφαλίδας" -#: Source/Core/Core/Src/HW/Memmap.cpp:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Ανάγνωση Opcode από %x. ΠαÏακαλώ να το αναφέÏετε." @@ -5403,7 +5788,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:461 msgid "s" @@ -5414,7 +5801,7 @@ msgstr "." msgid "unknown cmd 0x%08x" msgstr "άγνωστη εντολή 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "Το wxExecute επέστÏεψε -1 κατά την εκκίνηση της εφαÏμογής!" @@ -5430,3 +5817,13 @@ msgstr "zNear ΔιόÏθωση: " msgid "| OR" msgstr "| OR" +#~ msgid "Cannot record movies in read-only mode." +#~ msgstr "" +#~ "Δεν μποÏεί να γίνει εγγÏαφή ταινιών σε λειτουÏγία μόνο για ανάγνωση." + +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "Άγνωστος δείκτης %#08x\n" +#~ "Συνέχεια;" diff --git a/Languages/po/en.po b/Languages/po/en.po index 2ad1f8dd5b..f08b1e1cdf 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: 2011-10-11 23:25-0500\n" +"POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-01-06 14:53+0100\n" "Last-Translator: BhaaL \n" "Language-Team: \n" @@ -47,9 +47,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "" @@ -167,11 +167,11 @@ msgstr "" msgid "&DSP Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 msgid "&Delete selected ISOs..." msgstr "" @@ -235,7 +235,7 @@ msgstr "" msgid "&Play" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "" @@ -279,7 +279,7 @@ msgstr "" msgid "&Wiimote Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "" @@ -328,10 +328,11 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -370,8 +371,8 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "" @@ -406,6 +407,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 msgid "Action" msgstr "" @@ -491,11 +493,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "" @@ -503,9 +505,9 @@ msgstr "" msgid "Add new pane" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Add..." msgstr "" @@ -543,7 +545,7 @@ msgstr "" msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "" @@ -551,28 +553,28 @@ msgstr "" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "" @@ -604,7 +606,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "" @@ -619,7 +621,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "" @@ -628,17 +630,17 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -647,11 +649,11 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" msgstr "" @@ -659,7 +661,7 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -695,7 +697,7 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" msgstr "" @@ -705,7 +707,7 @@ msgid "Backend:" msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "" @@ -718,15 +720,15 @@ msgid "Bad File Header" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "" @@ -738,7 +740,7 @@ msgstr "" msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "" @@ -767,7 +769,7 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "" @@ -776,7 +778,7 @@ msgstr "" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "" @@ -784,7 +786,7 @@ msgstr "" msgid "Browse" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "" @@ -792,7 +794,7 @@ msgstr "" msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "" @@ -800,7 +802,7 @@ msgstr "" msgid "Buffer:" msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -810,11 +812,11 @@ msgstr "" msgid "C Stick" msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "" @@ -853,15 +855,11 @@ msgstr "" msgid "Cannot open %s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "" - #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -869,7 +867,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -896,7 +894,7 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "" @@ -913,6 +911,7 @@ msgid "Change &Disc..." msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "" @@ -920,7 +919,7 @@ msgstr "" msgid "Change Game" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -934,8 +933,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "" @@ -955,31 +954,31 @@ msgstr "" msgid "Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "" @@ -987,14 +986,14 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "" @@ -1013,7 +1012,7 @@ msgstr "" msgid "Clear" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." msgstr "" @@ -1025,7 +1024,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "" @@ -1050,20 +1049,20 @@ msgstr "" msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "" @@ -1090,13 +1089,13 @@ msgstr "" msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Confirm on Stop" msgstr "" @@ -1105,7 +1104,7 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "" @@ -1115,22 +1114,26 @@ msgid "Connect Wiimote %i" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Connecting..." msgstr "" @@ -1155,7 +1158,7 @@ msgstr "" msgid "Copy to Memcard %c" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "" @@ -1182,7 +1185,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "" @@ -1202,7 +1205,7 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "" @@ -1217,7 +1220,7 @@ msgstr "" msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "" @@ -1231,20 +1234,20 @@ msgstr "" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" @@ -1276,7 +1279,7 @@ msgstr "" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" msgstr "" @@ -1284,15 +1287,15 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "" @@ -1300,24 +1303,24 @@ msgstr "" msgid "DSP" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP Emulator Engine" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "" @@ -1325,7 +1328,7 @@ msgstr "" msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "" @@ -1333,7 +1336,7 @@ msgstr "" msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "" @@ -1362,16 +1365,16 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "" @@ -1379,7 +1382,7 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "" @@ -1421,8 +1424,8 @@ msgstr "" msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "" @@ -1491,7 +1494,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "" @@ -1515,11 +1518,11 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "" @@ -1544,12 +1547,12 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1561,13 +1564,13 @@ msgstr "" msgid "Dolphin at &Google Code" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1595,7 +1598,7 @@ msgstr "" msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "" @@ -1632,9 +1635,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "" @@ -1683,8 +1686,8 @@ msgstr "" msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "" @@ -1696,7 +1699,7 @@ msgstr "" msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "" @@ -1723,7 +1726,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "" @@ -1745,7 +1748,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "" @@ -1757,15 +1760,19 @@ msgstr "" msgid "Enable Block Merging" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "" @@ -1773,7 +1780,7 @@ msgstr "" msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "" @@ -1785,7 +1792,7 @@ msgstr "" msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "" @@ -1798,7 +1805,7 @@ msgstr "" msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Enable Screen Saver" msgstr "" @@ -1845,7 +1852,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -1858,7 +1865,7 @@ msgid "" "Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" msgstr "" @@ -1887,9 +1894,9 @@ msgstr "" msgid "End" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "" @@ -1918,15 +1925,29 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -1958,11 +1979,12 @@ msgstr "" msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "" @@ -1974,7 +1996,7 @@ msgstr "" msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "" @@ -2006,44 +2028,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "" @@ -2059,7 +2081,7 @@ msgstr "" msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "" @@ -2075,7 +2097,7 @@ msgstr "" msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2225,11 +2247,11 @@ msgstr "" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2249,7 +2271,7 @@ msgstr "" msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Force Console as NTSC-J" msgstr "" @@ -2273,7 +2295,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2300,6 +2322,7 @@ msgid "Frame " msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "" @@ -2315,7 +2338,7 @@ msgstr "" msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "" @@ -2327,9 +2350,9 @@ msgstr "" msgid "Free Look" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "French" msgstr "" @@ -2354,11 +2377,15 @@ msgstr "" msgid "GCI File(*.gci)" msgstr "" +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +msgid "GCMic Configuration" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "" @@ -2374,7 +2401,7 @@ msgstr "" msgid "Game not found!!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "" @@ -2382,7 +2409,7 @@ msgstr "" msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "" @@ -2391,7 +2418,7 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2412,7 +2439,8 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2421,9 +2449,9 @@ msgstr "" msgid "General Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "German" msgstr "" @@ -2455,7 +2483,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" msgstr "" @@ -2487,7 +2515,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hebrew" msgstr "" @@ -2538,11 +2566,12 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hungarian" msgstr "" @@ -2568,7 +2597,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "" @@ -2584,11 +2613,11 @@ msgstr "" msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "" @@ -2600,12 +2629,18 @@ msgstr "" msgid "Icon" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 msgid "" "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." @@ -2672,7 +2707,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "" @@ -2701,7 +2736,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "" @@ -2713,7 +2748,7 @@ msgstr "" msgid "Install WAD" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 msgid "Install to Wii Menu" msgstr "" @@ -2722,30 +2757,30 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "" -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" "Try loading the state again" msgstr "" -#: Source/Core/Core/Src/State.cpp:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "" @@ -2753,11 +2788,11 @@ msgstr "" msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "" @@ -2774,7 +2809,7 @@ msgstr "" msgid "Invalid bat.map or dir entry" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "" @@ -2791,17 +2826,17 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Italian" msgstr "" @@ -2809,16 +2844,16 @@ msgstr "" msgid "JAPAN" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Japanese" msgstr "" @@ -2827,16 +2862,17 @@ msgid "KOREA" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Korean" msgstr "" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "" @@ -2845,11 +2881,11 @@ msgid "L Button" msgstr "" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "" @@ -2872,6 +2908,7 @@ msgid "Left Stick" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -2894,7 +2931,7 @@ msgstr "" msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "" @@ -2907,34 +2944,42 @@ msgid "Load Custom Textures" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 1" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 2" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 3" 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 "" @@ -2942,11 +2987,11 @@ msgstr "" msgid "Load State..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -2970,7 +3015,7 @@ msgstr "" msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Lock Threads to Cores" msgstr "" @@ -3023,16 +3068,16 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "" @@ -3054,7 +3099,7 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 msgid "Memory Card" msgstr "" @@ -3083,7 +3128,7 @@ msgstr "" msgid "Menu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "" @@ -3096,7 +3141,7 @@ msgstr "" msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "" @@ -3122,7 +3167,7 @@ msgid "Motion Plus" msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "" @@ -3231,7 +3276,7 @@ msgstr "" msgid "NP Up" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3270,7 +3315,7 @@ msgstr "" msgid "No Country (SDK)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "" @@ -3305,7 +3350,7 @@ msgstr "" msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" msgstr "" @@ -3313,16 +3358,16 @@ msgstr "" msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Not connected" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "" @@ -3364,7 +3409,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "" @@ -3379,14 +3424,15 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "" @@ -3425,7 +3471,7 @@ msgid "Opens the logger" msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "" @@ -3500,12 +3546,12 @@ msgstr "" msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3514,7 +3560,7 @@ msgstr "" msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "" @@ -3525,20 +3571,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 msgid "Play" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "" @@ -3550,7 +3598,7 @@ msgstr "" msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 msgid "Please confirm..." msgstr "" @@ -3562,23 +3610,23 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 msgid "Port 4" msgstr "" @@ -3587,11 +3635,11 @@ msgstr "" msgid "Port :" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" msgstr "" @@ -3599,6 +3647,21 @@ msgstr "" msgid "Post-Processing Effect:" msgstr "" +#: Source/Core/Core/Src/Movie.cpp:735 +#, c-format +msgid "Premature movie end in PlayController. %u + 8 > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:829 +#, c-format +msgid "Premature movie end in PlayWiimote. %u + %d > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:806 +#, c-format +msgid "Premature movie end in PlayWiimote. %u > %u" +msgstr "" + #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "" @@ -3641,7 +3704,7 @@ msgid "Quit" msgstr "" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "" @@ -3650,7 +3713,7 @@ msgid "R Button" msgstr "" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" msgstr "" @@ -3667,6 +3730,7 @@ msgid "Range" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "" @@ -3732,6 +3796,7 @@ msgid "Refresh" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "" @@ -3739,10 +3804,10 @@ msgstr "" msgid "Refresh game list" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 msgid "Remove" msgstr "" @@ -3758,6 +3823,7 @@ 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 msgid "Reset" msgstr "" @@ -3780,15 +3846,15 @@ msgid "Right Stick" msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "" @@ -3800,7 +3866,7 @@ msgstr "" msgid "Safe" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Sample Rate:" msgstr "" @@ -3815,34 +3881,42 @@ msgid "Save GCI as..." msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 1" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 2" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 3" 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 "" @@ -3850,12 +3924,12 @@ msgstr "" msgid "Save State..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "" @@ -3863,11 +3937,11 @@ msgstr "" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -3876,16 +3950,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, c-format msgid "Scanning %s" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "" @@ -3901,7 +3975,7 @@ msgstr "" msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "" @@ -3916,12 +3990,12 @@ msgstr "" msgid "Select" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 msgid "Select a Wii WAD file to install" msgstr "" @@ -3944,15 +4018,15 @@ msgstr "" msgid "Select the file to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "" @@ -4003,11 +4077,11 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4016,7 +4090,7 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "" @@ -4030,11 +4104,11 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." msgstr "" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "" @@ -4042,7 +4116,7 @@ msgstr "" msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "" @@ -4102,7 +4176,7 @@ msgstr "" msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "" @@ -4142,11 +4216,11 @@ msgstr "" msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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 " @@ -4200,15 +4274,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 msgid "Skip BIOS" msgstr "" @@ -4244,11 +4318,11 @@ msgstr "" msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 msgid "Slot B" msgstr "" @@ -4268,7 +4342,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "" @@ -4286,9 +4360,9 @@ msgstr "" msgid "Space" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Spanish" msgstr "" @@ -4324,7 +4398,7 @@ msgstr "" msgid "Standard Controller" msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4339,14 +4413,16 @@ msgid "Start Re&cording" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "" @@ -4357,6 +4433,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -4395,8 +4472,8 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "" @@ -4428,9 +4505,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" msgstr "" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "" @@ -4459,13 +4541,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, c-format msgid "" "The file %s already exists.\n" @@ -4544,7 +4626,7 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "" @@ -4570,7 +4652,7 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "" @@ -4585,7 +4667,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -4594,11 +4676,11 @@ msgid "" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4620,7 +4702,7 @@ msgid "Tilt" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr "" @@ -4635,15 +4717,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "" @@ -4651,7 +4734,7 @@ msgstr "" msgid "Tried to load an unknown file type." msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "" @@ -4665,7 +4748,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Turkish" msgstr "" @@ -4741,13 +4824,6 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -4762,7 +4838,7 @@ msgstr "" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -4774,7 +4850,7 @@ msgstr "" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "" @@ -4819,7 +4895,7 @@ msgstr "" msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "" @@ -4827,7 +4903,7 @@ msgstr "" msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "" @@ -4881,6 +4957,41 @@ msgid "" "Continue?" msgstr "" +#: Source/Core/Core/Src/Movie.cpp:629 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, 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" +"\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" +"\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" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -4898,15 +5009,15 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 msgid "Wii NAND Root:" msgstr "" @@ -4914,7 +5025,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -4941,7 +5052,7 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:599 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Wiimote Connected" msgstr "" @@ -4973,9 +5084,9 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Working..." msgstr "" @@ -5036,7 +5147,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5054,7 +5165,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "" @@ -5108,7 +5219,7 @@ msgstr "" msgid "^ ADD" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "" @@ -5125,7 +5236,7 @@ msgstr "" msgid "failed to read header" msgstr "" -#: Source/Core/Core/Src/HW/Memmap.cpp:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "" @@ -5144,7 +5255,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/es.po b/Languages/po/es.po index dcd0faa8e7..7dfaa956c6 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: 2011-10-11 23:25-0500\n" +"POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-15 23:23+0100\n" "Last-Translator: Petiso Carambanal \n" "Language-Team: DARIO_FF \n" @@ -50,9 +50,9 @@ msgstr "\"%s\" no es un archivo GCM/ISO válido, o no es una ISO GC/Wii." msgid "%1$sCopy%1$s" msgstr "%1$sCopiar%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -182,11 +182,11 @@ msgstr "Administrador de &trucos" msgid "&DSP Settings" msgstr "&Configuración DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "&Borrar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 msgid "&Delete selected ISOs..." msgstr "&Borrar ISO seleccionadas..." @@ -250,7 +250,7 @@ msgstr "&Pausa" msgid "&Play" msgstr "&Jugar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "&Propiedades" @@ -294,7 +294,7 @@ msgstr "&Vista" msgid "&Wiimote Settings" msgstr "&Configuración de wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "&Wiki" @@ -343,10 +343,11 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -403,8 +404,8 @@ msgstr "" "\n" "¡¡Debe redireccionar el puerto TCP para hostear!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "Placa base AM" @@ -444,6 +445,7 @@ msgstr "" "Si está inseguro, elija EFB a textura." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 msgid "Action" msgstr "Acción" @@ -545,11 +547,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Añadir" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "Añadir código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "Añadir Parche" @@ -557,9 +559,9 @@ msgstr "Añadir Parche" msgid "Add new pane" msgstr "Añadir nueva ventana" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Add..." msgstr "Añadir..." @@ -612,7 +614,7 @@ msgstr "" msgid "Advanced" msgstr "Avanzado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "Configuración avanzada" @@ -620,28 +622,28 @@ msgstr "Configuración avanzada" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Todos los archivos GC/Wii (elf, dol, gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Todas las imágenes GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "Todos los archivos Gamecube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Todos los estados guardados (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "Todos los archivos ISO de Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos los archivos ISO comprimidos de GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "Todos los archivos (*.*)|*.*" @@ -677,7 +679,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:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "Apploader:" @@ -695,7 +697,7 @@ msgstr "" "\n" "Si no está seguro, seleccione (off)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Ãrabe" @@ -704,7 +706,7 @@ msgstr "Ãrabe" msgid "Are you sure you want to delete \"%s\"?" msgstr "¿Seguro que quiere borrar \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -712,11 +714,11 @@ msgstr "" "¿Seguro que quiere borrar estos archivos?\n" "¡Desaparecerán para siempre!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "¿Seguro que quiere borrar este archivo? ¡Desaparecerá para siempre!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relación de aspecto:" @@ -725,11 +727,11 @@ 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:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" msgstr "Motor de Audio:" @@ -737,7 +739,7 @@ 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:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -781,7 +783,7 @@ msgstr "" msgid "Back" msgstr "Atrás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" msgstr "Configuración del motor" @@ -791,7 +793,7 @@ msgid "Backend:" msgstr "Motor:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Detectar entrada sin foco" @@ -804,15 +806,15 @@ msgid "Bad File Header" msgstr "Cabecera de archivo incorrecta" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "Detalles del banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "Banner:" @@ -824,7 +826,7 @@ msgstr "Barra" msgid "Basic" msgstr "Básico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "Configuración básica" @@ -853,7 +855,7 @@ msgid "Blue Right" msgstr "Azul derecha" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Inferior" @@ -862,7 +864,7 @@ msgstr "Inferior" msgid "Bound Controls: %lu" msgstr "Controles asignados: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "Quebrado" @@ -870,7 +872,7 @@ msgstr "Quebrado" msgid "Browse" msgstr "Buscar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "Busca un directorio para añadir" @@ -878,7 +880,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:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "Busca un directorio de salida" @@ -886,7 +888,7 @@ msgstr "Busca un directorio de salida" msgid "Buffer:" msgstr "Búfer" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -896,11 +898,11 @@ msgstr "Botones" msgid "C Stick" msgstr "Stick C" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "Emulador de CPU" @@ -954,15 +956,11 @@ msgstr "Cancelar" msgid "Cannot open %s" msgstr "No se puede abrir %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "No se pueden grabar películas en el modo de solo lectura." - #: Source/Core/Core/Src/CoreTiming.cpp:122 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:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -973,7 +971,7 @@ msgstr "" "%s\n" "no es un fichero válido de tarjeta de memoria de Gamecube." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1002,7 +1000,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:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Catalan" @@ -1019,6 +1017,7 @@ msgid "Change &Disc..." msgstr "Cambiar &disco..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "Cambiar disco" @@ -1026,7 +1025,7 @@ msgstr "Cambiar disco" msgid "Change Game" msgstr "Cambiar Juego" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1042,8 +1041,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:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 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!" @@ -1064,31 +1063,31 @@ msgstr "Búscar trucos" msgid "Cheats Manager" msgstr "Administrador de trucos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Chino Simplificado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Chino (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "Escoge un directorio raíz de DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Choose a NAND root directory:" msgstr "Escoge un directorio raíz para la NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "Escoge una ISO por defecto:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "Escoja un directorio para añadir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "Escoge un archivo a abrir" @@ -1096,7 +1095,7 @@ msgstr "Escoge un archivo a abrir" msgid "Choose a memory card:" msgstr "Escoge una tarjeta de memoria:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1104,8 +1103,8 @@ msgstr "" "Escoja el archivo que usar como apploader (se aplica a los discos armados a " "partir de directorios solamente):" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "Escoge la carpeta de destino" @@ -1124,7 +1123,7 @@ msgstr "Clásico" msgid "Clear" msgstr "Limpiar" -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." msgstr "Fallo al borrar." @@ -1138,7 +1137,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Cerrar" @@ -1163,20 +1162,20 @@ msgstr "Comando" msgid "Comment" msgstr "Comentario" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "Comentario:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "Comprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "Comprimir ISO seleccionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "Comprimiendo ISO" @@ -1203,13 +1202,13 @@ msgstr "Configurar mandos" msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "Confirmar sobrescritura de archivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Confirm on Stop" msgstr "Confirmar al detenerse" @@ -1218,7 +1217,7 @@ msgstr "Confirmar al detenerse" msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "Conectar Teclado USB" @@ -1228,22 +1227,26 @@ msgid "Connect Wiimote %i" msgstr "Conectar Wiimote %i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "Conectar Wiimote 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "Conectar Wiimote 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "Conectar Wiimote 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Connecting..." msgstr "Conectando..." @@ -1268,7 +1271,7 @@ msgstr "Fallo al copiar" msgid "Copy to Memcard %c" msgstr "Copiar a tarjeta de memoria %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "Núcleo" @@ -1298,7 +1301,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "No se pudo reconocer el archivo ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "No se pudo guardar %s" @@ -1326,7 +1329,7 @@ msgstr "" "¿Está ejecutando Dolphin desde un CD/DVD, o el archivo de guardado está " "protegido contra escritura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "No se pudo hallar el comando para abrir la extension 'ini'!" @@ -1343,7 +1346,7 @@ msgstr "" msgid "Count:" msgstr "Cuenta:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "País:" @@ -1357,21 +1360,21 @@ msgstr "Crear Código AR" msgid "Create new perspective" msgstr "Crear nueva perspectiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr "Creado por KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr "Creado por VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Creado por black_rider y publicado en ForumW.org > Web Developments" @@ -1406,7 +1409,7 @@ msgstr "Fundido" 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:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" msgstr "Hack de proyección personalizado" @@ -1414,15 +1417,15 @@ 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:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." msgstr "Personalizar algunos párametros de la proyección ortográfica." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Checo" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "Pad direccional" @@ -1430,24 +1433,24 @@ msgstr "Pad direccional" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP Emulator Engine" msgstr "Motor de emulación DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP HLE emulation (fast)" msgstr "Emulación DSP HLE (rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP LLE interpreter (slow)" msgstr "Intérprete DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP LLE on Thread" msgstr "DSP LLE en un proceso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "Recompilador DSP LLE" @@ -1455,7 +1458,7 @@ msgstr "Recompilador DSP LLE" msgid "DSP settings" msgstr "Configuración DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "Raíz DVD:" @@ -1463,7 +1466,7 @@ msgstr "Raíz DVD:" msgid "Data Size" msgstr "Tamaño de datos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "Fecha:" @@ -1492,16 +1495,16 @@ msgstr "Depurarando" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "Descomprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISO seleccionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "Descomprimir ISO" @@ -1509,7 +1512,7 @@ msgstr "Descomprimir ISO" msgid "Default" msgstr "Defecto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "ISO por defecto:" @@ -1553,8 +1556,8 @@ msgstr "" msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "Configuración del dispositivo" @@ -1639,7 +1642,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "Disco" @@ -1666,11 +1669,11 @@ msgstr "" msgid "Divide" msgstr "Dividir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 msgid "Do you want to stop the current emulation?" msgstr "¿Quieres detener la emulación actual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "Dolphin" @@ -1695,12 +1698,12 @@ msgstr "Configuración de wiimote emulado de Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Configuración de GCPad Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Películas TAS de Dolphin (*.dtm)" @@ -1712,7 +1715,7 @@ msgstr "Configuración de wiimote de Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin en &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1720,7 +1723,7 @@ msgstr "" "Dolphin no pudo encontrar ninguna ISO de GC/Wii. Haz doble clic aquí para " "buscar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1750,7 +1753,7 @@ msgstr "Tambores" msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Depósito de audio" @@ -1796,9 +1799,9 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Alemán" @@ -1851,8 +1854,8 @@ msgstr "Editar parche" msgid "Edit current perspective" msgstr "Editar perspectiva actual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "Editar..." @@ -1864,7 +1867,7 @@ msgstr "Efecto" msgid "Embedded Frame Buffer" msgstr "Bufer de frames embebido" -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "El proceso de Emulación ya está ejecutandose" @@ -1897,7 +1900,7 @@ msgstr "Emular XFB usando texturas de objetos de la GPU" msgid "Emulated Wiimote" msgstr "Wiimote emulado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "Estado de emulación:" @@ -1925,7 +1928,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "Habilitar Registro de AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "Habilitar aceleración de audio" @@ -1937,15 +1940,19 @@ msgstr "Habilitar BAT" msgid "Enable Block Merging" msgstr "Habilitar asociación de bloques" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Habilitar caché" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Cheats" msgstr "Habilitar trucos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "Habilitar música DTK" @@ -1953,7 +1960,7 @@ msgstr "Habilitar música DTK" msgid "Enable Dual Core" msgstr "Habilitar doble núcleo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "Habilitar doble núcleo (mejora)" @@ -1965,7 +1972,7 @@ msgstr "Habilitar atajos" msgid "Enable Idle Skipping" msgstr "Habilitar salto de fotogramas inactivos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "Habilitar salto de fotogramas inactivos (mejora)" @@ -1978,7 +1985,7 @@ msgstr "Habilitar MMU" msgid "Enable Progressive Scan" msgstr "Habilitar escaneado progresivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Enable Screen Saver" msgstr "Habilitar salvapantallas" @@ -2041,7 +2048,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2059,7 +2066,7 @@ 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:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" msgstr "Habilta un hack de proyección personalizado" @@ -2096,9 +2103,9 @@ msgstr "" msgid "End" msgstr "Fin" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Inglés" @@ -2127,16 +2134,30 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Error al cargar el idioma seleccionado. Volviendo al defecto del sistema." -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2170,11 +2191,12 @@ msgstr "Cerrar Dolphin con el emulador" msgid "Export Failed" msgstr "Fallo al exportar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "Exportar archivo" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "Exportar grabación..." @@ -2186,7 +2208,7 @@ msgstr "Exportar grabación..." msgid "Export Save" msgstr "Exportar guardado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "Exportar guardado de Wii (experimental)" @@ -2218,44 +2240,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:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "Extraer todos los archivos..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "Extraer Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "Extraer DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "Extraer directorio..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "Extraer archivo..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "Extraer partición" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "Extrayendo %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "Extrayendo todos los archivos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "Extraer directorio" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "Extrayendo..." @@ -2271,7 +2293,7 @@ msgstr "Jugador FIFO" msgid "FRANCE" msgstr "FRANCIA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "Tamaño del FST:" @@ -2287,7 +2309,7 @@ msgstr "¡Fallo al escuchar!" msgid "Failed to download codes." msgstr "Fallo al descargar los códigos." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "Fallo al extraer a %s!" @@ -2462,11 +2484,11 @@ 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:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "Sistema de archivos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "¡Tipo de archivo INI desconocido: no se abrirá!" @@ -2486,7 +2508,7 @@ msgstr "Forzar 16:9" msgid "Force 4:3" msgstr "Forzar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Force Console as NTSC-J" msgstr "Forzar consola como NTSC-J" @@ -2521,7 +2543,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2553,6 +2575,7 @@ msgid "Frame " msgstr "Frame " #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "Avanzar &fotogramas" @@ -2568,7 +2591,7 @@ msgstr "Información de la grabación" msgid "Frame S&kipping" msgstr "Salto de &fotogramas" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "Límite de fotogramas:" @@ -2580,9 +2603,9 @@ msgstr "Frames a grabar" msgid "Free Look" msgstr "Cámara libre" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "French" msgstr "Francés" @@ -2607,11 +2630,16 @@ msgstr "Resolución en pantalla completa:" msgid "GCI File(*.gci)" msgstr "Archivo GCI (*.gci)" +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +#, fuzzy +msgid "GCMic Configuration" +msgstr "Configuración de registro" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "Pad GC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "ID del juego:" @@ -2627,7 +2655,7 @@ msgstr "¡El juego no está ejecutándose!" msgid "Game not found!!" msgstr "¡¡Juego no encontrado!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "Configuración específica del juego" @@ -2635,7 +2663,7 @@ msgstr "Configuración específica del juego" msgid "GameConfig" msgstr "Configurar Juego" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "Gamecube" @@ -2644,7 +2672,7 @@ msgid "Gamecube &Pad Settings" msgstr "&Configuración del mando Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Tarjetas de memoria de Gamecube (*.raw,*.gcp)" @@ -2667,7 +2695,8 @@ msgstr "" "(puede ser un código incorrecto o su tipo no es soportado todavía.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -2676,9 +2705,9 @@ msgstr "General" msgid "General Settings" msgstr "Ajustes generales" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "German" msgstr "Alemán" @@ -2718,7 +2747,7 @@ msgstr "" "\n" "Si está inseguro, déjelo marcado." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" msgstr "Griego" @@ -2750,7 +2779,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Falló la suma de verificación de cabecera" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hebrew" msgstr "Hebreo" @@ -2811,11 +2840,12 @@ msgid "Hotkey Configuration" msgstr "Configuración de atajos" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 msgid "Hotkeys" msgstr "Atajos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hungarian" msgstr "Húngaro" @@ -2847,7 +2877,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destino incorrecto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "Configuración IPL" @@ -2863,11 +2893,11 @@ msgstr "Puntero IR" msgid "IR Sensitivity:" msgstr "Sensibilidad IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "Detalles del ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "Directorios de ISO" @@ -2879,6 +2909,12 @@ msgstr "ITALIA" msgid "Icon" msgstr "Icono" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" @@ -2886,7 +2922,7 @@ msgstr "" "Si los FPS son erróneos, esta opción puede ayudar. (ON = Compatible, OFF = " "Rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 msgid "" "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." @@ -2978,7 +3014,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "En juego" @@ -3007,7 +3043,7 @@ msgstr "Insertar" msgid "Insert Encrypted or Decrypted code here..." msgstr "Insertar código encriptado o desencriptado aquí..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "Insertar tarjeta SD" @@ -3019,7 +3055,7 @@ msgstr "Insertar un nombre aquí.." msgid "Install WAD" msgstr "Instalar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 msgid "Install to Wii Menu" msgstr "Instalar al menú de la Wii" @@ -3030,23 +3066,23 @@ msgstr "" "Se ha llamado InstallExceptionHandler, pero esta plataforma no lo soporta " "todavía." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 msgid "Installing WAD..." msgstr "Instalando WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 msgid "Interface" msgstr "Interfaz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "Configuración de la interfaz" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "Error Interno de LZO - Fallo al comprimir" -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3055,7 +3091,7 @@ 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:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "Error Interno de LZO - lzo_init() falló" @@ -3063,11 +3099,11 @@ msgstr "Error Interno de LZO - lzo_init() falló" msgid "Internal Resolution:" msgstr "Resolución interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "Intérprete (MUY lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "Intro" @@ -3084,7 +3120,7 @@ msgstr "¡Valor no válido!" msgid "Invalid bat.map or dir entry" msgstr "bat.map o entrada de directorio no válido" -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "Evento de tipo %i no válido" @@ -3104,17 +3140,17 @@ msgstr "" "%s\n" " Puede que necesitas volcar este juego de nuevo." -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "Archivo de grabación no válido" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "Estado no válido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Italian" msgstr "Italiano" @@ -3122,16 +3158,16 @@ msgstr "Italiano" msgid "JAPAN" msgstr "JAPÓN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "Recompilador JIT (recomendado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "Recompilador experimental JITIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Japanese" msgstr "Japonés" @@ -3140,16 +3176,17 @@ msgid "KOREA" msgstr "COREA" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "Clave" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Korean" msgstr "Coreano" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "L" @@ -3158,11 +3195,11 @@ msgid "L Button" msgstr "Botón L" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" msgstr "L-Analógico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "Idioma:" @@ -3185,6 +3222,7 @@ msgid "Left Stick" msgstr "Stick izquierdo" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3214,7 +3252,7 @@ msgstr "" msgid "Less Than" msgstr "Menor que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "Usar FPS para limitar" @@ -3227,34 +3265,42 @@ msgid "Load Custom Textures" msgstr "Cargar texturas personalizadas" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 1" msgstr "&Cargar estado 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 2" msgstr "&Cargar estado 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 3" msgstr "&Cargar estado 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 4" msgstr "&Cargar estado 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 msgid "Load State Slot 5" msgstr "&Cargar estado 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Load State Slot 6" msgstr "&Cargar estado 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Load State Slot 7" msgstr "&Cargar estado 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Load State Slot 8" msgstr "&Cargar estado 8" @@ -3262,11 +3308,11 @@ msgstr "&Cargar estado 8" msgid "Load State..." msgstr "Cargar estado..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Cargar Menú de sistema Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Cargar Menú de sistema Wii %d %c" @@ -3293,7 +3339,7 @@ msgstr "Carga el archivo especificado (DOL, ELF, WAD, GCM, ISO)" msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Lock Threads to Cores" msgstr "Fijar procesos en núcleos" @@ -3348,16 +3394,16 @@ msgstr "Hack de velocidad MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Archivos MadCatz Gameshark (*.gcs)" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "ID del fabricante:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "Fabricante:" @@ -3379,7 +3425,7 @@ msgid "Memory Byte" msgstr "Byte de memoria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 msgid "Memory Card" msgstr "Tarjeta de memoria" @@ -3418,7 +3464,7 @@ msgstr "" msgid "Menu" msgstr "Menú" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "Mic" @@ -3431,7 +3477,7 @@ msgstr "Mín." msgid "Misc" msgstr "Varios" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "Configuraciones varias" @@ -3461,7 +3507,7 @@ msgid "Motion Plus" msgstr "Motion Plus" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" @@ -3577,7 +3623,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Arriba" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3616,7 +3662,7 @@ msgstr "Apodo:" msgid "No Country (SDK)" msgstr "Ningún país (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "Ninguna ISO o WAD ha sido encontrada." @@ -3651,7 +3697,7 @@ msgstr "No se encontró carpeta de guardado para el juego %s" msgid "None" msgstr "Ninguno" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" msgstr "Noruego Bokmal" @@ -3659,16 +3705,16 @@ msgstr "Noruego Bokmal" msgid "Not Equal" msgstr "No Igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "No Definido" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Not connected" msgstr "Sin conectar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "Notas" @@ -3710,7 +3756,7 @@ msgstr "Objeto" msgid "Object Range" msgstr "Rango de objeto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "Off" @@ -3725,14 +3771,15 @@ msgstr "Solo %d bloques disponibles" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Abrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "Abrir directorio &contenedor" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "Abrir carpeta de guardado&s de Wii" @@ -3771,7 +3818,7 @@ msgid "Opens the logger" msgstr "Abre el registro" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Opciones" @@ -3852,12 +3899,12 @@ msgstr "Partición %i" msgid "Patches" msgstr "Parches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "Directorios" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -3866,7 +3913,7 @@ msgstr "Pausa" msgid "Per-Pixel Lighting" msgstr "Iluminación por píxel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "Perfecto" @@ -3877,20 +3924,22 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 msgid "Play" msgstr "Reproducir" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "Reproducir grabación" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "Reproducir/pausa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "Jugable" @@ -3902,7 +3951,7 @@ msgstr "Opciones de reproducción" msgid "Players" msgstr "Jugadores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 msgid "Please confirm..." msgstr "Confirme, por favor..." @@ -3914,23 +3963,23 @@ msgstr "Por favor, cree una perspectiva antes de guardar" msgid "Plus-Minus" msgstr "Más-menos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Polish" msgstr "Polaco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 1" msgstr "Puerto 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 2" msgstr "Puerto 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Port 3" msgstr "Puerto 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 msgid "Port 4" msgstr "Puerto 4" @@ -3939,11 +3988,11 @@ msgstr "Puerto 4" msgid "Port :" msgstr "Puerto:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese" msgstr "Portugués" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" msgstr "Portugués (Brasil)" @@ -3951,6 +4000,21 @@ msgstr "Portugués (Brasil)" msgid "Post-Processing Effect:" msgstr "Efecto de posprocesado:" +#: Source/Core/Core/Src/Movie.cpp:735 +#, c-format +msgid "Premature movie end in PlayController. %u + 8 > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:829 +#, c-format +msgid "Premature movie end in PlayWiimote. %u + %d > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:806 +#, c-format +msgid "Premature movie end in PlayWiimote. %u > %u" +msgstr "" + #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "Predefinidos:" @@ -3993,7 +4057,7 @@ msgid "Quit" msgstr "Salir" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "R" @@ -4002,7 +4066,7 @@ msgid "R Button" msgstr "R Botón" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" msgstr "R-Analógico" @@ -4019,6 +4083,7 @@ msgid "Range" msgstr "Rango" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "Solo lectura" @@ -4089,6 +4154,7 @@ msgid "Refresh" msgstr "Actualizar" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "Actualizar lista" @@ -4096,10 +4162,10 @@ msgstr "Actualizar lista" msgid "Refresh game list" msgstr "Actualizar lista de juegos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 msgid "Remove" msgstr "Eliminar" @@ -4118,6 +4184,7 @@ 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 msgid "Reset" msgstr "Reiniciar" @@ -4140,15 +4207,15 @@ msgid "Right Stick" msgstr "Stick Derecho" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Vibración" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 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:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "Ruso" @@ -4160,7 +4227,7 @@ msgstr "Guardar estado" msgid "Safe" msgstr "Seguro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Sample Rate:" msgstr "Frecuencia del sonido:" @@ -4175,34 +4242,42 @@ msgid "Save GCI as..." msgstr "Guardar GCI como..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 1" msgstr "Guardar estado 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 2" msgstr "Guardar estado 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 3" msgstr "Guardar estado 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 4" msgstr "Guardar estado 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 msgid "Save State Slot 5" msgstr "Guardar estado 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 msgid "Save State Slot 6" msgstr "Guardar estado 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 msgid "Save State Slot 7" msgstr "Guardar estado 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 msgid "Save State Slot 8" msgstr "Guardar estado 8" @@ -4210,12 +4285,12 @@ msgstr "Guardar estado 8" msgid "Save State..." msgstr "Guardar estado..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "Guardar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "Guardar GCM/ISO comprimido" @@ -4223,11 +4298,11 @@ msgstr "Guardar GCM/ISO comprimido" msgid "Save current perspective" msgstr "Guardar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "Guardar GCM/ISO descomprimido" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4238,16 +4313,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "EFB Copia a escala" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, c-format msgid "Scanning %s" msgstr "Escaneando %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "Buscando ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "Escaneando..." @@ -4263,7 +4338,7 @@ msgstr "Bloq. desplazamiento" msgid "Search Filter" msgstr "Filtro de búsqueda" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "Buscar en subcarpetas" @@ -4278,12 +4353,12 @@ msgstr "No se ha encontrado la sección %s en SYSCONF" msgid "Select" msgstr "Seleccionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Seleccionar archivo de grabación" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 msgid "Select a Wii WAD file to install" msgstr "Elige un WAD de Wii para instalar" @@ -4309,15 +4384,15 @@ msgstr "Selecciona las ventanas flotantes" msgid "Select the file to load" msgstr "Selecciona el archivo para cargar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Selecciona el archivo de guardado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Selecciona el estado para cargar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Selecciona el estado para guardar" @@ -4388,11 +4463,11 @@ msgstr "Posición de la barra sensora:" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "Serbio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4403,7 +4478,7 @@ msgstr "" msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "Definir como ISO por &defecto" @@ -4419,11 +4494,11 @@ 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:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." msgstr "Configuración..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: No se puede encontrar el archivo de configuración" @@ -4431,7 +4506,7 @@ msgstr "SetupWiiMem: No se puede encontrar el archivo de configuración" msgid "Shake" msgstr "Sacudir" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "Nombre corto:" @@ -4491,7 +4566,7 @@ msgstr "Mostrar JAP" msgid "Show Korea" msgstr "Mostrar Corea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "Mostrar idioma:" @@ -4531,11 +4606,11 @@ msgstr "Mostrar WAD" msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 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:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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 " @@ -4600,15 +4675,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote de costado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Chino simplificado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "Tamaño" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 msgid "Skip BIOS" msgstr "Saltar BIOS" @@ -4655,11 +4730,11 @@ msgstr "" msgid "Slot %i" msgstr "Ranura %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 msgid "Slot A" msgstr "Ranura A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 msgid "Slot B" msgstr "Ranura B" @@ -4683,7 +4758,7 @@ msgstr "" "¿Realmente quieres activar renderizado por software? Si está inseguro, " "escoja No." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Configuración de sonido" @@ -4701,9 +4776,9 @@ msgstr "Falló la creación del búfer de sonido: %s" msgid "Space" msgstr "Espacio" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Spanish" msgstr "Español" @@ -4747,7 +4822,7 @@ msgstr "Stick cuadrado" msgid "Standard Controller" msgstr "Control estándar" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4762,14 +4837,16 @@ msgid "Start Re&cording" msgstr "Comenzar graba&ción" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "Comenzar grabación" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "Estado" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "Estados guardados" @@ -4780,6 +4857,7 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Detener" @@ -4826,8 +4904,8 @@ msgstr "Los archivos de guardado se han importado con éxito." msgid "Swing" msgstr "Oscilar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "Idioma del sistema:" @@ -4859,9 +4937,14 @@ msgstr "Tabla derecha" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" msgstr "Captura de pantalla" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "Prueba" @@ -4890,13 +4973,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:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 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:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, c-format msgid "" "The file %s already exists.\n" @@ -4987,7 +5070,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:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "Tema visual" @@ -5019,7 +5102,7 @@ msgstr "" "El simulador de Action Replay no soporta códigos que modifiquen al Action " "Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 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." @@ -5044,7 +5127,7 @@ msgstr "" "\n" "Si no está seguro, deje esta casilla sin marcar." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -5059,12 +5142,12 @@ msgstr "" "Atajo de Teclado : Mantén la tecla presionada para desabilitar la " "regulación instantáneamente." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" "Esto es usado para reproducir pistas de música, como música de fondo (BGM)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5090,7 +5173,7 @@ msgid "Tilt" msgstr "Inclinar" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr "Título" @@ -5105,15 +5188,16 @@ msgstr "Alternar todos los tipos de registro" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Superior" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Chino tradicional" @@ -5121,7 +5205,7 @@ msgstr "Chino tradicional" msgid "Tried to load an unknown file type." msgstr "Se trató de cargar un archivo de tipo desconocido." -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "Gatillos" @@ -5137,7 +5221,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:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Turkish" msgstr "Turco" @@ -5219,15 +5303,6 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "Mensaje desconocido con id:%d recibido del jugador:%d ¡Echando al jugador!" -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Puntero desconocido %#08x\n" -"¿Continuar?" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5242,7 +5317,7 @@ msgstr "Actualizar" msgid "Upright Wiimote" msgstr "Wiimote parado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar Modo EuRGB60 (PAL60)" @@ -5254,7 +5329,7 @@ msgstr "Usar pantalla completa" msgid "Use Hex" msgstr "Usar hexadecimal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "Usar advertencias" @@ -5310,7 +5385,7 @@ msgstr "Valor:" msgid "Verbosity" msgstr "Verbosidad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "Vídeo" @@ -5318,7 +5393,7 @@ msgstr "Vídeo" msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "Volumen" @@ -5386,6 +5461,41 @@ msgstr "" "y tienen el mismo nombre que el archivo en tu memcard\n" "Continuar?" +#: Source/Core/Core/Src/Movie.cpp:629 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, 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" +"\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" +"\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" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -5403,15 +5513,15 @@ msgstr "Hack de pantalla ancha (widescreen)" msgid "Width" msgstr "Ancho" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 msgid "Wii NAND Root:" msgstr "Raíz de la NAND de Wii:" @@ -5419,7 +5529,7 @@ msgstr "Raíz de la NAND de Wii:" msgid "Wii Save Import" msgstr "Importar guardado de Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 msgid "Wii save files (*.bin)|*.bin" msgstr "Archivos de guardado Wii (*.bin)|*.bin" @@ -5450,7 +5560,7 @@ msgstr "" "o mucho tiempo de espera, o alguna otra razón.\n" "¿Desea reconectarlo inmediatamente?" -#: Source/Core/DolphinWX/Src/Main.cpp:599 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Wiimote Connected" msgstr "Wiimote conectado" @@ -5482,9 +5592,9 @@ msgstr "Windows Derecha" msgid "Word Wrap" msgstr "Word Wrap" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Working..." msgstr "Trabajando..." @@ -5547,7 +5657,7 @@ msgstr "Debes introducir un valor decimal o hexadecimal válido." msgid "You must enter a valid profile name." msgstr "Debe introducir un nombre de perfil válido." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Debe reiniciar Dolphin para que el cambio tenga efecto." @@ -5570,7 +5680,7 @@ msgstr "" "Debería ser 0x%04x (pero es 0x%04llx)\n" "¿Quiere crear uno nuevo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "Zelda TP hack" @@ -5641,7 +5751,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5658,7 +5768,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:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Leyendo Opcode desde %x. Por favor, comuníquelo." @@ -5679,7 +5789,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "cmd 0x%08x desconocido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute dio un -1 al arrancar la aplicación!" @@ -5788,6 +5898,9 @@ msgstr "| OR" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "No se puede abrir %s, no tiene una función" +#~ msgid "Cannot record movies in read-only mode." +#~ msgstr "No se pueden grabar películas en el modo de solo lectura." + #~ msgid "Config..." #~ msgstr "Configuración..." @@ -6232,6 +6345,13 @@ msgstr "| OR" #~ msgid "Type %d config not supported in plugin %s" #~ msgstr "Configuración de tipo %d no soportado en el plugin %s" +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "Puntero desconocido %#08x\n" +#~ "¿Continuar?" + #~ msgid "Use FPS For Limiting" #~ msgstr "Usar FPS para limitar" diff --git a/Languages/po/fr.po b/Languages/po/fr.po index 38440d51cd..fcd5a4244f 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: 2011-10-11 23:25-0500\n" +"POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-28 23:40+0100\n" "Last-Translator: Pascal\n" "Language-Team: \n" @@ -42,16 +42,17 @@ 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/MemcardManager.cpp:193 #, c-format msgid "%1$sCopy%1$s" msgstr "%1$sCopie%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -97,7 +98,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 @@ -178,11 +180,11 @@ msgstr "Gestionnaire de &cheats" msgid "&DSP Settings" msgstr "Paramètres &DSP (audio)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "&Supprimer l'ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 msgid "&Delete selected ISOs..." msgstr "&Supprimer les ISO sélectionnés" @@ -246,7 +248,7 @@ msgstr "&Pause" msgid "&Play" msgstr "&Démarrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "&Propriétés" @@ -290,7 +292,7 @@ msgstr "&Affichage" msgid "&Wiimote Settings" msgstr "Paramètres de la &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "&Wiki" @@ -339,10 +341,11 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -368,11 +371,13 @@ 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" @@ -386,16 +391,19 @@ 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 !!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "AM-Baseboard" @@ -423,16 +431,19 @@ msgstr "Emulation fidèle VBeam" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 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." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 msgid "Action" msgstr "Action" @@ -453,33 +464,51 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, 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:756 #, 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:549 #, 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:609 #, 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:803 #, 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:684 #, c-format -msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "Erreur Action Replay : Master Code et Write To CCXXXXXX non implémentés (%s)" +msgid "" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgstr "" +"Erreur Action Replay : Master Code et Write To CCXXXXXX non implémentés (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -515,11 +544,11 @@ msgstr "Carte :" msgid "Add" msgstr "Ajouter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "Ajouter un code ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "Ajouter un patch" @@ -527,9 +556,9 @@ msgstr "Ajouter un patch" msgid "Add new pane" msgstr "Ajouter un nouveau panneau" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Add..." msgstr "Ajouter..." @@ -541,14 +570,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." @@ -557,27 +588,30 @@ 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:759 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:520 msgid "Advanced" msgstr "Avancé" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "Paramètres avancés" @@ -585,38 +619,40 @@ msgstr "Paramètres avancés" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Tous les fichiers GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Toutes les images GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "Tous les fichiers GameCube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Tous les états sauvegardés (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "Tous les fichiers ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tous les fichiers ISO compressés GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "Tous les fichiers (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 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, 6 et " +"7 dans la fenêtre d'émulation.\n" "\n" "Dans le doute, décochez cette case." @@ -640,7 +676,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:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "Apploader :" @@ -654,11 +690,12 @@ 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)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Arabe" @@ -667,7 +704,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:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -675,11 +712,13 @@ msgstr "" "Êtes-vous sûr de vouloir supprimer ces fichiers ?\n" "Ils seront définitivement supprimés !" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 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:725 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Format d'écran :" @@ -688,11 +727,11 @@ 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:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" msgstr "Moteur audio :" @@ -700,7 +739,7 @@ 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:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -734,8 +773,10 @@ msgid "" "\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" +"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." @@ -743,7 +784,7 @@ msgstr "" msgid "Back" msgstr "Retour" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" msgstr "Paramètres de l'interface audio" @@ -753,7 +794,7 @@ msgid "Backend:" msgstr "Moteur :" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Entrée en arrière-plan" @@ -766,15 +807,15 @@ msgid "Bad File Header" msgstr "Mauvaise entête de fichier" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr "Bannière" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "Détails de la bannière" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "Bannière :" @@ -786,7 +827,7 @@ msgstr "Barre" msgid "Basic" msgstr "Paramètres de base" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "Paramètres de base" @@ -796,7 +837,9 @@ msgstr "Basse" #: Source/Core/Core/Src/HW/GCMemcard.cpp:188 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:628 msgid "Blocks" @@ -815,7 +858,7 @@ msgid "Blue Right" msgstr "Bleu Droite" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Bas" @@ -824,7 +867,7 @@ msgstr "Bas" msgid "Bound Controls: %lu" msgstr "Contrôles liés : %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "Corrompu" @@ -832,7 +875,7 @@ msgstr "Corrompu" msgid "Browse" msgstr "Parcourir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "Choisir un dossier à ajouter" @@ -840,7 +883,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:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "Parcourir un dossier de destination" @@ -848,7 +891,7 @@ msgstr "Parcourir un dossier de destination" msgid "Buffer:" msgstr "Buffer :" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -858,11 +901,11 @@ msgstr "Boutons" msgid "C Stick" msgstr "Stick-C" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "Stick-C" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "Moteur d'émulation du CPU" @@ -873,12 +916,17 @@ msgstr "Cache des listes d'affichage" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 "" -"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" +"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." @@ -891,8 +939,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." @@ -908,15 +958,12 @@ msgstr "Annuler" msgid "Cannot open %s" msgstr "Impossible d'ouvrir %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "Impossible d'enregistrer des films en mode Lecture seule." - #: Source/Core/Core/Src/CoreTiming.cpp:122 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:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -927,7 +974,7 @@ msgstr "" "%s\n" "n'est pas un fichier de carte mémoire GameCube valide." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -938,7 +985,8 @@ msgstr "" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858 #, 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:1872 #, c-format @@ -950,13 +998,14 @@ msgstr "Impossible de trouver la Wiimote par le gestionnaire de connexion %02x" #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 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:49 msgid "Caps Lock" msgstr "Verr Maj" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Catalan" @@ -973,6 +1022,7 @@ msgid "Change &Disc..." msgstr "&Changer de disque..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "Changer de disque" @@ -980,7 +1030,7 @@ msgstr "Changer de disque" msgid "Change Game" msgstr "Changer de Jeu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -996,8 +1046,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:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "Changer ceci n'aura aucun effet durant l'émulation !" @@ -1017,31 +1067,31 @@ msgstr "Rechercher un cheat" msgid "Cheats Manager" msgstr "Gestionnaire de Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Chinois (simplifié)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Chinois (traditionnel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "Choisir un dossier racine pour le DVD :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Choose a NAND root directory:" msgstr "Choisir un dossier racine pour la NAND :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "Choisir un ISO par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "Choisir un dossier à ajouter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "Choisir un fichier à ouvrir" @@ -1049,12 +1099,16 @@ msgstr "Choisir un fichier à ouvrir" msgid "Choose a memory card:" msgstr "Choisir une carte mémoire :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 -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:759 +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:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "Choisir le dossier de destination de l'extraction" @@ -1073,17 +1127,21 @@ msgstr "Classique" msgid "Clear" msgstr "Effacer" -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." msgstr "Echec de l'éffacement" #: 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:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fermer" @@ -1108,20 +1166,20 @@ msgstr "Commande" msgid "Comment" msgstr "Commentaire" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "Commentaire :" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "Compresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "Compresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "Compression de l'ISO" @@ -1148,13 +1206,13 @@ msgstr "Configurer les manettes" msgid "Configure..." msgstr "Configurer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "Confirmer l'écrasement du fichier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Confirm on Stop" msgstr "Confirmer l'arrêt de l'émulation" @@ -1163,7 +1221,7 @@ msgstr "Confirmer l'arrêt de l'émulation" msgid "Connect" msgstr "Connecter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "Connecter le clavier USB" @@ -1173,22 +1231,26 @@ msgid "Connect Wiimote %i" msgstr "Connecter la Wiimote %i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "Connecter la 1ère Wiimote" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "Connecter la 2è Wiimote" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "Connecter la 3è Wiimote" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "Connecter la 4è Wiimote" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Connecting..." msgstr "Connexion..." @@ -1213,7 +1275,7 @@ msgstr "Echec de la copie" msgid "Copy to Memcard %c" msgstr "Copier vers la carte mémoire %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "Core" @@ -1229,15 +1291,22 @@ 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 msgid "Could not recognize ISO file %s" msgstr "Impossible de reconnaître le fichier ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "Impossible de sauvegarder %s" @@ -1247,21 +1316,25 @@ 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:119 #, 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:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "Impossible de trouver la commande d'ouverture pour l'extension 'ini' !" @@ -1278,7 +1351,7 @@ msgstr "" msgid "Count:" msgstr "Nombre :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "Pays :" @@ -1292,19 +1365,21 @@ msgstr "Créer un code AR" msgid "Create new perspective" msgstr "Créer une nouvelle perspective" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr "Créé par KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 -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:495 +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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr "Créé par VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Créé par black_rider et publié sur ForumW.org > Web Developments" @@ -1339,7 +1414,7 @@ msgstr "Crossfade" 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:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" msgstr "Hack de projection personnalisé" @@ -1347,15 +1422,15 @@ msgstr "Hack de projection personnalisé" msgid "Custom Projection Hack Settings" msgstr "Paramètres du hack de projection personnalisé" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." msgstr "Personnalise certains paramètres de projection orthographique." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Tchèque" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "Pad numérique" @@ -1363,24 +1438,24 @@ msgstr "Pad numérique" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP Emulator Engine" msgstr "Moteur d'émulation du DSP (Audio)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP HLE emulation (fast)" msgstr "Emulation du DSP en HLE (rapide)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 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:606 msgid "DSP LLE on Thread" msgstr "DSP LLE sur thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "Recompilateur du DSP en LLE" @@ -1388,7 +1463,7 @@ msgstr "Recompilateur du DSP en LLE" msgid "DSP settings" msgstr "Paramètres DSP (audio)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "Racine du DVD :" @@ -1396,7 +1471,7 @@ msgstr "Racine du DVD :" msgid "Data Size" msgstr "Taille des données" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "Date :" @@ -1425,16 +1500,16 @@ msgstr "Débug" msgid "Decimal" msgstr "Décimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "Décompresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "Décompresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "Décompression de l'ISO" @@ -1442,7 +1517,7 @@ msgstr "Décompression de l'ISO" msgid "Default" msgstr "Par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "ISO par défaut :" @@ -1474,16 +1549,20 @@ msgstr "Détecter" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -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:131 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 msgid "Device" msgstr "Appareil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "Paramètres de la console virtuelle" @@ -1531,24 +1610,30 @@ msgstr "Désactiver les textures" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 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:95 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." @@ -1562,7 +1647,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "Disque" @@ -1589,11 +1674,11 @@ msgstr "" msgid "Divide" msgstr "Diviser" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 msgid "Do you want to stop the current emulation?" msgstr "Voulez-vous arrêter l'émulation en cours ?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "Dolphin" @@ -1618,12 +1703,12 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Configuration de la manette GC pour Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Films TAS Dolphin (*.dtm)" @@ -1635,13 +1720,21 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin dans &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 -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:339 +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:307 -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:343 +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/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -1665,7 +1758,7 @@ msgstr "Percussions" msgid "Dummy" msgstr "Factice" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Enregistrer le son" @@ -1687,7 +1780,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." @@ -1711,9 +1805,9 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Néerlandais" @@ -1727,8 +1821,16 @@ msgstr "Copies de l'EFB" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, 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:162 msgid "EUROPE" @@ -1758,8 +1860,8 @@ msgstr "Editer le patch" msgid "Edit current perspective" msgstr "Modifier la perspective actuelle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "Editer..." @@ -1771,38 +1873,45 @@ msgstr "Effets" msgid "Embedded Frame Buffer" msgstr "Buffer d'image embarqué" -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "Thread d'émulation déjà en cours d'exécution" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 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:110 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:33 msgid "Emulated Wiimote" msgstr "Wiimote émulée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "Etat de l'émulation :" @@ -1812,13 +1921,15 @@ msgstr "Activer" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 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" @@ -1828,7 +1939,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "Activer la journalisation AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "Activer le contrôle audio" @@ -1840,15 +1951,19 @@ msgstr "Activer BAT" msgid "Enable Block Merging" msgstr "Activer l'assemblage de blocs" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Activer le cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Cheats" msgstr "Activer les Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "Activer la musique DTK" @@ -1856,7 +1971,7 @@ msgstr "Activer la musique DTK" msgid "Enable Dual Core" msgstr "Activer le Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "Activer le Dual Core (plus rapide)" @@ -1868,7 +1983,7 @@ msgstr "Activer les touches de raccourci" msgid "Enable Idle Skipping" msgstr "Activer le saut d'inactivité" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "Activer le saut d'inactivité (plus rapide)" @@ -1881,7 +1996,7 @@ msgstr "Activer le MMU" msgid "Enable Progressive Scan" msgstr "Activer le Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Enable Screen Saver" msgstr "Activer l'économiseur d'écran" @@ -1902,14 +2017,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:317 -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:799 msgid "Enable pages" @@ -1922,30 +2042,43 @@ 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:79 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:329 -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:332 +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:311 -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:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" msgstr "Active un hack de projection personnalisé" @@ -1962,8 +2095,12 @@ msgstr "" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -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:117 msgid "" @@ -1979,9 +2116,9 @@ msgstr "" msgid "End" msgstr "Fin" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Anglais" @@ -2010,18 +2147,38 @@ msgstr "Egal" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erreur" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 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/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 #, 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: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#, 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." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2034,7 +2191,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:58 msgid "Execute" @@ -2048,11 +2206,12 @@ msgstr "Quitter Dolphin avec l'émulateur" msgid "Export Failed" msgstr "Echec de l'exportation" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "Exporter un fichier" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "Exporter l'enregistrement..." @@ -2064,7 +2223,7 @@ msgstr "Exporter l'enregistrement..." msgid "Export Save" msgstr "Exporter une sauvegarde" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "Exporter une sauvegarde Wii (expérimental)" @@ -2096,44 +2255,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:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "Extraire tous les fichiers..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "Extraire l'Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "Extraire le DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "Extraire un dossier..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "Extraire un fichier..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "Extraire une partition..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "Extraction de %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "Extraction de tous les fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "Extraction du dossier" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "Extraction..." @@ -2149,7 +2308,7 @@ msgstr "Lecteur FIFO" msgid "FRANCE" msgstr "France" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "Taille FST :" @@ -2165,7 +2324,7 @@ msgstr "Ecoute impossible !" msgid "Failed to download codes." msgstr "Impossible de télécharger les codes." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "Impossible d'extraire vers %s !" @@ -2188,7 +2347,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 @@ -2210,7 +2370,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:144 @@ -2340,11 +2501,11 @@ 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:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "Système de fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Type de fichier 'ini' est inconnu ! Ne sera pas ouvert !" @@ -2364,7 +2525,7 @@ msgstr "Forcer 16/9è" msgid "Force 4:3" msgstr "Forcer 4/3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Force Console as NTSC-J" msgstr "Forcer la console comme NTSC-J" @@ -2380,7 +2541,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." @@ -2391,18 +2553,21 @@ 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." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 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:76 msgid "" @@ -2426,6 +2591,7 @@ msgid "Frame " msgstr "Image " #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "Avancement d'image" @@ -2441,7 +2607,7 @@ msgstr "Plage d'images :" msgid "Frame S&kipping" msgstr "Saut d'&image :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "Image/s max :" @@ -2453,9 +2619,9 @@ msgstr "Images à enregistrer :" msgid "Free Look" msgstr "Vue libre" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "French" msgstr "Français" @@ -2480,11 +2646,16 @@ msgstr "Résolution en Plein écran :" msgid "GCI File(*.gci)" msgstr "Fichier GCI (*.gci)" +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +#, fuzzy +msgid "GCMic Configuration" +msgstr "Configuration de la journalisation" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "Manette GC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "ID du jeu :" @@ -2500,7 +2671,7 @@ msgstr "Le jeu n'est pas en cours d'émulation !" msgid "Game not found!!" msgstr "Jeu non trouvé !!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "Paramètres spécifiques au jeu" @@ -2508,7 +2679,7 @@ msgstr "Paramètres spécifiques au jeu" msgid "GameConfig" msgstr "Config du Jeu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "GameCube" @@ -2517,7 +2688,7 @@ msgid "Gamecube &Pad Settings" msgstr "Paramètres de la &manette GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Carte mémoires de GameCube (*.raw,*.gcp)" @@ -2540,7 +2711,8 @@ msgstr "" "(ou c'est un mauvais code, ou il n'est pas encore pris en charge.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Général" @@ -2549,16 +2721,17 @@ msgstr "Général" msgid "General Settings" msgstr "Paramètres généraux" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "German" msgstr "Allemand" #: Source/Core/Core/Src/ActionReplay.cpp:451 #, 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:443 msgid "Graphics" @@ -2574,19 +2747,24 @@ msgstr "Plus grand que" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 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." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" msgstr "Grèque" @@ -2618,7 +2796,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:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hebrew" msgstr "Hébreu" @@ -2641,8 +2819,10 @@ 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" @@ -2660,7 +2840,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." @@ -2678,11 +2859,12 @@ msgid "Hotkey Configuration" msgstr "Configuration des raccourcis clavier" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 msgid "Hotkeys" msgstr "Raccourcis clavier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hungarian" msgstr "Hongrois" @@ -2693,16 +2875,20 @@ msgstr "Wiimote hybride" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 #, 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:795 #, 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" @@ -2710,7 +2896,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - mauvaise destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "Paramètres IPL" @@ -2726,11 +2912,11 @@ msgstr "Pointeur IR" msgid "IR Sensitivity:" msgstr "Sensibilité de l'IR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "Détails de l'ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "Dossiers des ISO" @@ -2742,13 +2928,27 @@ msgstr "Italie" msgid "Icon" msgstr "Icône" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -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/ISOProperties.cpp:329 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 -msgid "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." -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), vous devez aussi désactiver le contrôle audio dans le DSP pour que cela fonctionne." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +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:485 +msgid "" +"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." +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), vous devez aussi désactiver " +"le contrôle audio dans le DSP pour que cela fonctionne." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" @@ -2757,24 +2957,28 @@ msgstr "Ignorer les changements de formats" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 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:93 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." @@ -2808,11 +3012,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 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." @@ -2822,11 +3028,12 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Améliore les performances, mais peut faire disparaître l'éclairage dans la plupart des jeux.\n" +"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:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "Dans le jeu" @@ -2855,7 +3062,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:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "Insérer une carte SD" @@ -2867,31 +3074,34 @@ msgstr "Indiquer un nom ici..." msgid "Install WAD" msgstr "Installer un WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 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:1363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 msgid "Installing WAD..." msgstr "Installation du WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 msgid "Interface" msgstr "Interface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "Paramètres de l'interface" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "Erreur interne LZO - échec de la compression" -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -2900,7 +3110,7 @@ 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:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "Erreur interne LZO - échec de lzo_init()" @@ -2908,11 +3118,11 @@ msgstr "Erreur interne LZO - échec de lzo_init()" msgid "Internal Resolution:" msgstr "Résolution interne :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "Interpréteur (TRES lent)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "Intro" @@ -2929,7 +3139,7 @@ msgstr "Valeur non valide !" msgid "Invalid bat.map or dir entry" msgstr "bar.map ou entrée dir non valide" -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "Type d'évènement non valide : %i" @@ -2949,17 +3159,17 @@ msgstr "" "%s\n" "Vous devriez copier à nouveau ce jeu." -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "Fichier d'enregitrement non valide" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "Etat non valide" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Italian" msgstr "Italien" @@ -2967,16 +3177,16 @@ msgstr "Italien" msgid "JAPAN" msgstr "Japon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "Recompilateur JIT (recommandé) " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "Recompilateur expérimental JIT" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Japanese" msgstr "Japonais" @@ -2985,16 +3195,17 @@ msgid "KOREA" msgstr "Corée" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "Touche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Korean" msgstr "Coréen" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "L" @@ -3003,11 +3214,11 @@ msgid "L Button" msgstr "Bouton L" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" msgstr "L Analog." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "Langue :" @@ -3030,6 +3241,7 @@ msgid "Left Stick" msgstr "Stick Gauche" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3059,7 +3271,7 @@ msgstr "" msgid "Less Than" msgstr "Plus petit que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "Nb de FPS comme limite" @@ -3072,34 +3284,42 @@ msgid "Load Custom Textures" msgstr "Charger textures personnalisées" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 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 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 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 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 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 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 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 msgid "Load State Slot 8" msgstr "Charger l'état du Slot 8" @@ -3107,11 +3327,11 @@ msgstr "Charger l'état du Slot 8" msgid "Load State..." msgstr "Charger un état..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Charger le Menu Système Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Charger le Menu Système Wii %d%c" @@ -3128,7 +3348,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/Main.cpp:134 msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" @@ -3138,7 +3360,7 @@ msgstr "Charge le fichier spécifié (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Lock Threads to Cores" msgstr "Verrouiller les threads aux coeurs" @@ -3193,16 +3415,16 @@ msgstr "Hack de vitesse pour le MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Fichiers MadCatz Gameshark (*.gcs)" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "ID concepteur :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "Concepteur :" @@ -3224,13 +3446,17 @@ msgid "Memory Byte" msgstr "Octet mémoire" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 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 @@ -3251,13 +3477,15 @@ msgstr "" #: Source/Core/Core/Src/HW/GCMemcard.cpp:126 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:47 msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "Micro" @@ -3270,7 +3498,7 @@ msgstr "Min" msgid "Misc" msgstr "Divers" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "Paramètres divers" @@ -3281,11 +3509,14 @@ msgstr "Modif." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 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." @@ -3298,7 +3529,7 @@ msgid "Motion Plus" msgstr "Motion Plus" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Vibreur" @@ -3325,8 +3556,12 @@ msgid "Multiply" msgstr "Multiplier" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -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/WXInputBase.cpp:126 msgid "NP Add" @@ -3412,7 +3647,7 @@ msgstr "NP Tabulation" msgid "NP Up" msgstr "NP Haut" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3451,7 +3686,7 @@ msgstr "Pseudo :" msgid "No Country (SDK)" msgstr "Pas de pays (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "Aucun ISO ou WAD trouvé" @@ -3486,7 +3721,7 @@ msgstr "Aucun dossier de sauvegarde trouvé pour le titre %s" msgid "None" msgstr "Aucune" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" msgstr "Norvégien BokmÃ¥l" @@ -3494,16 +3729,16 @@ msgstr "Norvégien BokmÃ¥l" msgid "Not Equal" msgstr "Différent" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "Non défini" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Not connected" msgstr "Non connectée" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "Notes" @@ -3545,7 +3780,7 @@ msgstr "Objet" msgid "Object Range" msgstr "Plage d'objets :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "Arrêt" @@ -3560,14 +3795,15 @@ msgstr "%d blocs disponibles seulement" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Ouvrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "Ouvrir l'emplacement du fichier" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "Ouvrir le dossier de &sauvegarde Wii" @@ -3606,7 +3842,7 @@ msgid "Opens the logger" msgstr "Ouvrir le journaliseur" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Options" @@ -3620,7 +3856,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" @@ -3630,8 +3867,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:485 msgid "Output" @@ -3682,12 +3923,12 @@ msgstr "Partition %i" msgid "Patches" msgstr "Patchs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "Chemins" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -3696,7 +3937,7 @@ msgstr "Pause" msgid "Per-Pixel Lighting" msgstr "Eclairage par pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "Parfait" @@ -3707,20 +3948,22 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 msgid "Play" msgstr "Démarrer" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "Jouer l'enregistrement..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "Démarrer/Arrêter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "Jouable" @@ -3732,7 +3975,7 @@ msgstr "Options de lecture" msgid "Players" msgstr "Joueurs" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 msgid "Please confirm..." msgstr "Veuillez confirmer..." @@ -3744,23 +3987,23 @@ msgstr "Merci de créer une perspective avant de sauvegarder" msgid "Plus-Minus" msgstr "Plus-Moins" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Polish" msgstr "Polonais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 msgid "Port 4" msgstr "Port 4" @@ -3769,11 +4012,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese" msgstr "Portugais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" msgstr "Portugais (brésilien)" @@ -3781,6 +4024,21 @@ msgstr "Portugais (brésilien)" msgid "Post-Processing Effect:" msgstr "Effet de Post-processing :" +#: Source/Core/Core/Src/Movie.cpp:735 +#, c-format +msgid "Premature movie end in PlayController. %u + 8 > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:829 +#, c-format +msgid "Premature movie end in PlayWiimote. %u + %d > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:806 +#, c-format +msgid "Premature movie end in PlayWiimote. %u > %u" +msgstr "" + #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "Pré-réglages :" @@ -3823,7 +4081,7 @@ msgid "Quit" msgstr "Quitter" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "R" @@ -3832,7 +4090,7 @@ msgid "R Button" msgstr "Bouton R" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" msgstr "R Analog." @@ -3849,6 +4107,7 @@ msgid "Range" msgstr "Etendue" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "Mode Lecture seule" @@ -3908,7 +4167,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." @@ -3919,6 +4179,7 @@ msgid "Refresh" msgstr "Rafraîchir" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "Rafraîchir la liste" @@ -3926,10 +4187,10 @@ msgstr "Rafraîchir la liste" msgid "Refresh game list" msgstr "Rafraîchir la liste des jeux" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 msgid "Remove" msgstr "Retirer" @@ -3948,6 +4209,7 @@ 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 msgid "Reset" msgstr "Reset" @@ -3970,15 +4232,15 @@ msgid "Right Stick" msgstr "Stick Droit" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 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:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "Russe" @@ -3990,7 +4252,7 @@ msgstr "Sau&vegarder l'état" msgid "Safe" msgstr "Sûr " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Sample Rate:" msgstr "Echantillonnage :" @@ -4005,34 +4267,42 @@ msgid "Save GCI as..." msgstr "Enregistrer GCI sous..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 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 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 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 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 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 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 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 msgid "Save State Slot 8" msgstr "Sauvegarder l'état vers le Slot 8" @@ -4040,12 +4310,12 @@ msgstr "Sauvegarder l'état vers le Slot 8" msgid "Save State..." msgstr "Enregistrer l'état" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "Enregistrer sous..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "Sauver le fichier compressé GCM/ISO" @@ -4053,29 +4323,31 @@ msgstr "Sauver le fichier compressé GCM/ISO" msgid "Save current perspective" msgstr "Sauvegarder la perspective actuelle" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "Sauvegarder le fichier GCM/ISO décompressé" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, 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:401 msgid "Scaled EFB Copy" msgstr "Copie à l'échelle de l'EFB" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, c-format msgid "Scanning %s" msgstr "Analyse de %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "Recherche d'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "Recherche..." @@ -4091,14 +4363,12 @@ msgstr "Arrêt défil." msgid "Search Filter" msgstr "Fitre de recherche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "Chercher dans sous-dossiers" -#: Source/Core/Common/Src/SysConf.h:104 -#: Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 -#: Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 +#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 #, c-format msgid "Section %s not found in SYSCONF" msgstr "La section %s n'a pas été trouvée dans SYSCONF" @@ -4108,12 +4378,12 @@ msgstr "La section %s n'a pas été trouvée dans SYSCONF" msgid "Select" msgstr "Select" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Sélectionner le fichier d'enregistrement" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 msgid "Select a Wii WAD file to install" msgstr "Sélectionner un fichier WAD de Wii à installer" @@ -4139,15 +4409,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:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Sélectionner le fichier à enregistrer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Sélectionner l'état à charger" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Sélectionner l'état à enregistrer" @@ -4164,7 +4434,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." @@ -4176,27 +4447,32 @@ msgstr "Police sélectionnée" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 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:73 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." @@ -4213,19 +4489,22 @@ msgstr "Position de la Sensor Bar :" msgid "Separator" msgstr "Séparateur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "Serbe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -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/ConfigMain.cpp:510 +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 msgid "Set" msgstr "Paramétrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "Définir comme l'ISO par &défaut" @@ -4237,13 +4516,15 @@ msgstr "Définir comme carte mémoire par défaut : %c" #: Source/Core/Core/Src/ActionReplay.cpp:462 #, 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/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." msgstr "Configurer..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Impossible de trouver le fichier des paramètres" @@ -4251,7 +4532,7 @@ msgstr "SetupWiiMem: Impossible de trouver le fichier des paramètres" msgid "Shake" msgstr "Secouement" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "Nom court :" @@ -4311,7 +4592,7 @@ msgstr "Afficher Japon" msgid "Show Korea" msgstr "Afficher Corée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "Afficher la langue :" @@ -4351,17 +4632,20 @@ msgstr "Afficher WAD" msgid "Show Wii" msgstr "Afficher Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 msgid "Show a confirmation box before stopping a game." msgstr "Demande confirmation avant d'arrêter le jeu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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 "" "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:812 msgid "Show first block" @@ -4385,11 +4669,13 @@ msgstr "Afficher le titre de sauvegarde" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 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." @@ -4415,15 +4701,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote à l'horizontale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Chinois simplifié" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "Taille" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 msgid "Skip BIOS" msgstr "Ne pas exécuter le BIOS" @@ -4437,11 +4723,13 @@ msgstr "Ignorer l'accès à l'EFB depuis le CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 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." @@ -4449,13 +4737,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." @@ -4465,11 +4756,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 msgid "Slot B" msgstr "Slot B" @@ -4483,15 +4774,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:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Paramètres audio" @@ -4509,9 +4803,9 @@ msgstr "Echec de la création du buffer audio : %s" msgid "Space" msgstr "Espace" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Spanish" msgstr "Espagnol" @@ -4521,13 +4815,21 @@ msgstr "Volume du haut-parleur :" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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." @@ -4547,7 +4849,7 @@ msgstr "Stick carré" msgid "Standard Controller" msgstr "Contrôleur standard" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4562,14 +4864,16 @@ msgid "Start Re&cording" msgstr "Commencer l'enregistrement" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "Commencer l'enregistrement" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "Etat" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "Etats" @@ -4580,6 +4884,7 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Arrêter" @@ -4587,12 +4892,14 @@ msgstr "Arrêter" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 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." @@ -4621,8 +4928,8 @@ msgstr "Fichiers de sauvegarde importés avec succès" msgid "Swing" msgstr "Balancement" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "Langue du système :" @@ -4654,9 +4961,14 @@ msgstr "Table Droite" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" msgstr "Capture d'écran" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "Test" @@ -4685,13 +4997,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:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 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:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, c-format msgid "" "The file %s already exists.\n" @@ -4702,8 +5014,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 @@ -4729,21 +5045,28 @@ msgstr "Le code AR décrypté ne contient aucune ligne." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 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 second-fastest value from the right." 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 deuxième position depuis la droite." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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:353 -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!" @@ -4770,7 +5093,7 @@ 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:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "Thème" @@ -4779,8 +5102,12 @@ 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:467 -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:304 msgid "" @@ -4791,26 +5118,37 @@ msgstr "" "Indéterminé signifie que les paramètres de Dolphin sont appliqués." #: Source/Core/Core/Src/ActionReplay.cpp:356 -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:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 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:119 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:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -4819,26 +5157,34 @@ msgid "" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" "Ceci est utiliser pour contrôler la vitesse du jeu par la constance du son.\n" -"Désactiver cette option peut causer une vitesse anormale du jeu, par exemple trop rapide.\n" +"Désactiver cette option peut causer une vitesse anormale du jeu, par exemple " +"trop rapide.\n" "Mais il se peut parfois qu'activer cette option produise un bruit constant.\n" "\n" -"Raccourci clavier : Appuyer pour instantanément désactiver cette option." +"Raccourci clavier : Appuyer pour instantanément désactiver cette " +"option." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Ceci est utilisé pour lire les pistes de musique, comme les BGM." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 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:283 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 @@ -4850,7 +5196,7 @@ msgid "Tilt" msgstr "Tilt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr "Titre" @@ -4865,15 +5211,16 @@ msgstr "Activer tous les types de journaux" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Haut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Chinois traditionnel" @@ -4881,12 +5228,11 @@ msgstr "Chinois traditionnel" msgid "Tried to load an unknown file type." msgstr "Echec de chargement d'un type de fichier inconnu." -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "Déclencheurs" -#: Source/Core/Common/Src/SysConf.h:92 -#: Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 msgid "Trying to read from invalid SYSCONF" msgstr "Essai de lecture d'un fichier SYSCONF non valide" @@ -4898,7 +5244,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:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Turkish" msgstr "Turque" @@ -4938,10 +5284,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:404 @@ -4975,16 +5323,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 !" - -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" msgstr "" -"Pointeur inconnu %#08x\n" -"Continuer ?" +"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:53 @@ -5000,7 +5340,7 @@ msgstr "Mettre à jour" msgid "Upright Wiimote" msgstr "Wiimote debout" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utiliser le mode EuRGB60 (PAL60)" @@ -5012,7 +5352,7 @@ msgstr "&Plein écran" msgid "Use Hex" msgstr "Utiliser Hexa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "Utiliser les gestionnaires de panique" @@ -5024,19 +5364,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:127 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." @@ -5064,7 +5408,7 @@ msgstr "Valeur" msgid "Verbosity" msgstr "Verbosité" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "Vidéo" @@ -5072,7 +5416,7 @@ msgstr "Vidéo" msgid "Virtual" msgstr "Virtuel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "Volume" @@ -5120,7 +5464,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 ?" @@ -5132,11 +5477,47 @@ 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:629 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, 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" +"\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" +"\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" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -5154,15 +5535,15 @@ msgstr "Hack écran large (16/9è)" msgid "Width" msgstr "Largeur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "Console Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 msgid "Wii NAND Root:" msgstr "Racine de la NAND (Wii) :" @@ -5170,7 +5551,7 @@ msgstr "Racine de la NAND (Wii) :" msgid "Wii Save Import" msgstr "Importer une sauvegarde Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 msgid "Wii save files (*.bin)|*.bin" msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin" @@ -5201,7 +5582,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:599 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Wiimote Connected" msgstr "Wiimote connectée" @@ -5233,9 +5614,9 @@ msgstr "Windows Droit" msgid "Word Wrap" msgstr "Casse" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Working..." msgstr "Travail..." @@ -5276,7 +5657,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." @@ -5298,7 +5680,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:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 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." @@ -5321,7 +5703,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:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "ZTP hack" @@ -5358,14 +5740,19 @@ msgstr "[Personnalisé]" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 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." @@ -5387,7 +5774,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5404,7 +5791,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:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT : Lecture de l'Opcode depuis %x. Merci de nous le signaler." @@ -5412,7 +5799,9 @@ 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:461 msgid "s" @@ -5423,7 +5812,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Commande inconnue 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute a retourné -1 sur l'exécution de l'application !" @@ -5535,6 +5924,9 @@ msgstr "| OR" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "Impossible d'ouvrir %s, une fonction manque" +#~ msgid "Cannot record movies in read-only mode." +#~ msgstr "Impossible d'enregistrer des films en mode Lecture seule." + #~ msgid "Config..." #~ msgstr "Configurer..." @@ -5992,6 +6384,13 @@ msgstr "| OR" #~ msgstr "" #~ "Le type de configuration %d n'est pas pris en charge dans le plug-in %s" +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "Pointeur inconnu %#08x\n" +#~ "Continuer ?" + #~ msgid "Use FPS For Limiting" #~ msgstr "Utiliser les FPS pour limiter" diff --git a/Languages/po/he.po b/Languages/po/he.po index 912e1b2f45..498fb36d91 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: 2011-10-11 23:25-0500\n" +"POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-01-08 20:50+0200\n" "Last-Translator: Ely \n" "Language-Team: \n" @@ -47,9 +47,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sהעתק%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "" @@ -167,11 +167,11 @@ msgstr "" msgid "&DSP Settings" msgstr "הגדרות קול" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 msgid "&Delete selected ISOs..." msgstr "" @@ -236,7 +236,7 @@ msgstr "" msgid "&Play" msgstr "&שחק" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "" @@ -280,7 +280,7 @@ msgstr "" msgid "&Wiimote Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "" @@ -329,10 +329,11 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -371,8 +372,8 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "" @@ -407,6 +408,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 msgid "Action" msgstr "" @@ -492,11 +494,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "" @@ -504,9 +506,9 @@ msgstr "" msgid "Add new pane" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Add..." msgstr "" @@ -544,7 +546,7 @@ msgstr "" msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "" @@ -552,28 +554,28 @@ msgstr "" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "" @@ -605,7 +607,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "" @@ -620,7 +622,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "" @@ -629,17 +631,17 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -648,11 +650,11 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" msgstr "" @@ -660,7 +662,7 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -696,7 +698,7 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 #, fuzzy msgid "Backend Settings" msgstr "הגדרות קול" @@ -707,7 +709,7 @@ msgid "Backend:" msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "" @@ -720,15 +722,15 @@ msgid "Bad File Header" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "" @@ -740,7 +742,7 @@ msgstr "" msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "" @@ -769,7 +771,7 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "" @@ -778,7 +780,7 @@ msgstr "" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "" @@ -786,7 +788,7 @@ msgstr "" msgid "Browse" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "" @@ -794,7 +796,7 @@ msgstr "" msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "" @@ -802,7 +804,7 @@ msgstr "" msgid "Buffer:" msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -812,11 +814,11 @@ msgstr "" msgid "C Stick" msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "" @@ -855,15 +857,11 @@ msgstr "" msgid "Cannot open %s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "" - #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -871,7 +869,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -898,7 +896,7 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "" @@ -915,6 +913,7 @@ msgid "Change &Disc..." msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "" @@ -922,7 +921,7 @@ msgstr "" msgid "Change Game" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -936,8 +935,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "" @@ -957,31 +956,31 @@ msgstr "" msgid "Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "" @@ -989,14 +988,14 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "" @@ -1015,7 +1014,7 @@ msgstr "" msgid "Clear" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." msgstr "" @@ -1027,7 +1026,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "" @@ -1052,20 +1051,20 @@ msgstr "" msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "" @@ -1092,13 +1091,13 @@ msgstr "" msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Confirm on Stop" msgstr "" @@ -1107,7 +1106,7 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "" @@ -1117,22 +1116,26 @@ msgid "Connect Wiimote %i" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Connecting..." msgstr "" @@ -1157,7 +1160,7 @@ msgstr "" msgid "Copy to Memcard %c" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "" @@ -1184,7 +1187,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "" @@ -1204,7 +1207,7 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "" @@ -1219,7 +1222,7 @@ msgstr "" msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "" @@ -1233,20 +1236,20 @@ msgstr "" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" @@ -1278,7 +1281,7 @@ msgstr "" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" msgstr "" @@ -1286,15 +1289,15 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "" @@ -1302,24 +1305,24 @@ msgstr "" msgid "DSP" msgstr "קול" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP Emulator Engine" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "" @@ -1327,7 +1330,7 @@ msgstr "" msgid "DSP settings" msgstr "הגדרות קול" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "" @@ -1335,7 +1338,7 @@ msgstr "" msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "" @@ -1364,16 +1367,16 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "" @@ -1381,7 +1384,7 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "" @@ -1423,8 +1426,8 @@ msgstr "" msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "" @@ -1493,7 +1496,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "" @@ -1517,11 +1520,11 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "" @@ -1546,13 +1549,13 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 #, fuzzy msgid "Dolphin GCPad Configuration" msgstr "הגדרות גרפיקה" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1564,13 +1567,13 @@ msgstr "" msgid "Dolphin at &Google Code" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1598,7 +1601,7 @@ msgstr "" msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "" @@ -1635,9 +1638,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "" @@ -1686,8 +1689,8 @@ msgstr "" msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "" @@ -1699,7 +1702,7 @@ msgstr "" msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "" @@ -1726,7 +1729,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "" @@ -1748,7 +1751,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "" @@ -1760,15 +1763,19 @@ msgstr "" msgid "Enable Block Merging" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "" @@ -1776,7 +1783,7 @@ msgstr "" msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "" @@ -1788,7 +1795,7 @@ msgstr "" msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "" @@ -1801,7 +1808,7 @@ msgstr "" msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Enable Screen Saver" msgstr "" @@ -1848,7 +1855,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -1861,7 +1868,7 @@ msgid "" "Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" msgstr "" @@ -1890,9 +1897,9 @@ msgstr "" msgid "End" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "" @@ -1921,15 +1928,29 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -1961,11 +1982,12 @@ msgstr "" msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "" @@ -1977,7 +1999,7 @@ msgstr "" msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "" @@ -2009,44 +2031,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "" @@ -2062,7 +2084,7 @@ msgstr "" msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "" @@ -2078,7 +2100,7 @@ msgstr "" msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2228,11 +2250,11 @@ msgstr "" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2252,7 +2274,7 @@ msgstr "" msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Force Console as NTSC-J" msgstr "" @@ -2276,7 +2298,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2303,6 +2325,7 @@ msgid "Frame " msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "" @@ -2318,7 +2341,7 @@ msgstr "" msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "" @@ -2330,9 +2353,9 @@ msgstr "" msgid "Free Look" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "French" msgstr "" @@ -2358,11 +2381,16 @@ msgstr "&מסך מל×" msgid "GCI File(*.gci)" msgstr "" +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +#, fuzzy +msgid "GCMic Configuration" +msgstr "הגדרות גרפיקה" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "" @@ -2378,7 +2406,7 @@ msgstr "" msgid "Game not found!!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "" @@ -2386,7 +2414,7 @@ msgstr "" msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "" @@ -2396,7 +2424,7 @@ msgid "Gamecube &Pad Settings" msgstr "הגדרות קול" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2417,7 +2445,8 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2427,9 +2456,9 @@ msgstr "" msgid "General Settings" msgstr "הגדרות קול" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "German" msgstr "" @@ -2461,7 +2490,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" msgstr "" @@ -2493,7 +2522,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hebrew" msgstr "" @@ -2544,11 +2573,12 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hungarian" msgstr "" @@ -2574,7 +2604,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "" @@ -2590,11 +2620,11 @@ msgstr "" msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "" @@ -2606,12 +2636,18 @@ msgstr "" msgid "Icon" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 msgid "" "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." @@ -2678,7 +2714,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "" @@ -2707,7 +2743,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "" @@ -2719,7 +2755,7 @@ msgstr "" msgid "Install WAD" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 msgid "Install to Wii Menu" msgstr "" @@ -2728,30 +2764,30 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "" -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" "Try loading the state again" msgstr "" -#: Source/Core/Core/Src/State.cpp:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "" @@ -2759,11 +2795,11 @@ msgstr "" msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "" @@ -2780,7 +2816,7 @@ msgstr "" msgid "Invalid bat.map or dir entry" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "" @@ -2797,17 +2833,17 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Italian" msgstr "" @@ -2815,16 +2851,16 @@ msgstr "" msgid "JAPAN" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Japanese" msgstr "" @@ -2833,16 +2869,17 @@ msgid "KOREA" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Korean" msgstr "" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "" @@ -2851,11 +2888,11 @@ msgid "L Button" msgstr "" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "" @@ -2878,6 +2915,7 @@ msgid "Left Stick" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -2900,7 +2938,7 @@ msgstr "" msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "" @@ -2913,34 +2951,42 @@ msgid "Load Custom Textures" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 1" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 2" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 3" 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 "" @@ -2948,11 +2994,11 @@ msgstr "" msgid "Load State..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -2976,7 +3022,7 @@ msgstr "" msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Lock Threads to Cores" msgstr "" @@ -3030,16 +3076,16 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "" @@ -3061,7 +3107,7 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 msgid "Memory Card" msgstr "" @@ -3090,7 +3136,7 @@ msgstr "" msgid "Menu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "" @@ -3103,7 +3149,7 @@ msgstr "" msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "" @@ -3129,7 +3175,7 @@ msgid "Motion Plus" msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "" @@ -3238,7 +3284,7 @@ msgstr "" msgid "NP Up" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3277,7 +3323,7 @@ msgstr "" msgid "No Country (SDK)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "" @@ -3312,7 +3358,7 @@ msgstr "" msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" msgstr "" @@ -3320,16 +3366,16 @@ msgstr "" msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Not connected" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "" @@ -3371,7 +3417,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "" @@ -3386,14 +3432,15 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "" @@ -3432,7 +3479,7 @@ msgid "Opens the logger" msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "" @@ -3507,12 +3554,12 @@ msgstr "" msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3521,7 +3568,7 @@ msgstr "" msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "" @@ -3532,20 +3579,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 msgid "Play" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "" @@ -3557,7 +3606,7 @@ msgstr "" msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 msgid "Please confirm..." msgstr "" @@ -3569,23 +3618,23 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 msgid "Port 4" msgstr "" @@ -3594,11 +3643,11 @@ msgstr "" msgid "Port :" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" msgstr "" @@ -3606,6 +3655,21 @@ msgstr "" msgid "Post-Processing Effect:" msgstr "" +#: Source/Core/Core/Src/Movie.cpp:735 +#, c-format +msgid "Premature movie end in PlayController. %u + 8 > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:829 +#, c-format +msgid "Premature movie end in PlayWiimote. %u + %d > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:806 +#, c-format +msgid "Premature movie end in PlayWiimote. %u > %u" +msgstr "" + #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "" @@ -3648,7 +3712,7 @@ msgid "Quit" msgstr "" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "" @@ -3657,7 +3721,7 @@ msgid "R Button" msgstr "" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" msgstr "" @@ -3674,6 +3738,7 @@ msgid "Range" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "" @@ -3739,6 +3804,7 @@ msgid "Refresh" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "" @@ -3746,10 +3812,10 @@ msgstr "" msgid "Refresh game list" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 msgid "Remove" msgstr "" @@ -3765,6 +3831,7 @@ 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 msgid "Reset" msgstr "" @@ -3787,15 +3854,15 @@ msgid "Right Stick" msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "" @@ -3807,7 +3874,7 @@ msgstr "" msgid "Safe" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Sample Rate:" msgstr "" @@ -3822,34 +3889,42 @@ msgid "Save GCI as..." msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 1" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 2" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 3" 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 "" @@ -3857,12 +3932,12 @@ msgstr "" msgid "Save State..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "" @@ -3870,11 +3945,11 @@ msgstr "" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -3883,16 +3958,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, c-format msgid "Scanning %s" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "" @@ -3908,7 +3983,7 @@ msgstr "" msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "" @@ -3923,12 +3998,12 @@ msgstr "" msgid "Select" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 msgid "Select a Wii WAD file to install" msgstr "" @@ -3951,15 +4026,15 @@ msgstr "" msgid "Select the file to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "" @@ -4010,11 +4085,11 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4023,7 +4098,7 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "" @@ -4037,12 +4112,12 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 #, fuzzy msgid "Settings..." msgstr "הגדרות קול" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "" @@ -4050,7 +4125,7 @@ msgstr "" msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "" @@ -4110,7 +4185,7 @@ msgstr "" msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "" @@ -4151,11 +4226,11 @@ msgstr "" msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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 " @@ -4209,15 +4284,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 msgid "Skip BIOS" msgstr "" @@ -4253,11 +4328,11 @@ msgstr "" msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 msgid "Slot B" msgstr "" @@ -4277,7 +4352,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "" @@ -4295,9 +4370,9 @@ msgstr "" msgid "Space" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Spanish" msgstr "" @@ -4333,7 +4408,7 @@ msgstr "" msgid "Standard Controller" msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4348,14 +4423,16 @@ msgid "Start Re&cording" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "" @@ -4366,6 +4443,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -4404,8 +4482,8 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "" @@ -4437,9 +4515,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" msgstr "" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "" @@ -4468,13 +4551,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, fuzzy, c-format msgid "" "The file %s already exists.\n" @@ -4553,7 +4636,7 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "" @@ -4579,7 +4662,7 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "" @@ -4594,7 +4677,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -4603,11 +4686,11 @@ msgid "" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4629,7 +4712,7 @@ msgid "Tilt" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr "" @@ -4644,15 +4727,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "" @@ -4660,7 +4744,7 @@ msgstr "" msgid "Tried to load an unknown file type." msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "" @@ -4674,7 +4758,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Turkish" msgstr "" @@ -4750,13 +4834,6 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -4771,7 +4848,7 @@ msgstr "" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -4784,7 +4861,7 @@ msgstr "&מסך מל×" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "" @@ -4829,7 +4906,7 @@ msgstr "" msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "" @@ -4837,7 +4914,7 @@ msgstr "" msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "" @@ -4891,6 +4968,41 @@ msgid "" "Continue?" msgstr "" +#: Source/Core/Core/Src/Movie.cpp:629 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, 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" +"\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" +"\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" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -4908,15 +5020,15 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 msgid "Wii NAND Root:" msgstr "" @@ -4924,7 +5036,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -4951,7 +5063,7 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:599 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Wiimote Connected" msgstr "" @@ -4983,9 +5095,9 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Working..." msgstr "" @@ -5046,7 +5158,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5064,7 +5176,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "" @@ -5118,7 +5230,7 @@ msgstr "" msgid "^ ADD" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "" @@ -5135,7 +5247,7 @@ msgstr "" msgid "failed to read header" msgstr "" -#: Source/Core/Core/Src/HW/Memmap.cpp:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "" @@ -5154,7 +5266,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/hu.po b/Languages/po/hu.po index 05ea00680c..13710600e6 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: 2011-10-11 23:25-0500\n" +"POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-06-04 14:29+0100\n" "Last-Translator: Delirious \n" "Language-Team: Delirious \n" @@ -50,9 +50,9 @@ msgstr "\"%s\" egy érvénytelen GCM/ISO fájl, vagy nem GC/Wii ISO." msgid "%1$sCopy%1$s" msgstr "%1$sMásolás%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -177,11 +177,11 @@ msgstr "&Csalás kezelÅ‘" msgid "&DSP Settings" msgstr "&Hang beállítások" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "&ISO törlése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 msgid "&Delete selected ISOs..." msgstr "&A kiválasztott ISO fájlok törlése..." @@ -245,7 +245,7 @@ msgstr "&Szünet" msgid "&Play" msgstr "&Indítás" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "&Tulajdonságok" @@ -289,7 +289,7 @@ msgstr "&Nézet" msgid "&Wiimote Settings" msgstr "&Wiimote beállítások" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "&Wiki" @@ -338,10 +338,11 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -398,8 +399,8 @@ msgstr "" "\n" "Továbbítani kell a TCP portot a host számára!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "AM alaplap" @@ -440,6 +441,7 @@ msgstr "" "Ha bizonytalan vagy, válaszd az EFB textúrába lehetÅ‘séget inkább." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 msgid "Action" msgstr "Művelet" @@ -538,11 +540,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Hozzáadás" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "ActionReplay kód hozzáadása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "Patch hozzáadása" @@ -550,9 +552,9 @@ msgstr "Patch hozzáadása" msgid "Add new pane" msgstr "Új mezÅ‘ hozzáadása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Add..." msgstr "Hozzáadás..." @@ -606,7 +608,7 @@ msgstr "" msgid "Advanced" msgstr "Haladó" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "Haladó beállítások" @@ -614,28 +616,28 @@ msgstr "Haladó beállítások" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Minden GC/Wii fájl (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Minden GC/Wii képfájl (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "Minden Gamecube GCM fájl (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Minden állásmentés (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "Minden Wii ISO fájl (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 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:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "Minden fájl (*.*)|*.*" @@ -673,7 +675,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:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "BetöltÅ‘ program:" @@ -691,7 +693,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, válaszd ezt: (ki)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Arab" @@ -700,7 +702,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:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -708,11 +710,11 @@ msgstr "" "Biztos törlöd ezeket a fájlokat?\n" "Végleg el fognak veszni!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 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:725 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Képarány:" @@ -721,11 +723,11 @@ 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:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "Hang" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" msgstr "Hang feldolgozó:" @@ -733,7 +735,7 @@ 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:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatikus" @@ -778,7 +780,7 @@ msgstr "" msgid "Back" msgstr "Hátra" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" msgstr "Hang feldolgozó beállításai" @@ -788,7 +790,7 @@ msgid "Backend:" msgstr "Feldolgozó:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Háttér bemenet" @@ -801,15 +803,15 @@ msgid "Bad File Header" msgstr "Rossz fájl fejléc" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr "Játék kép" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "Játék kép részletek" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "Játék kép:" @@ -821,7 +823,7 @@ msgstr "VevÅ‘" msgid "Basic" msgstr "Alap" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "Alap beállítások" @@ -850,7 +852,7 @@ msgid "Blue Right" msgstr "Kék jobbra" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Lent" @@ -859,7 +861,7 @@ msgstr "Lent" msgid "Bound Controls: %lu" msgstr "Összekötött irányítások: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "Hibás" @@ -867,7 +869,7 @@ msgstr "Hibás" msgid "Browse" msgstr "Tallózás" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "Hozzáadandó könyvtár tallózása" @@ -875,7 +877,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:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "Kimeneti könyvtár tallózása" @@ -883,7 +885,7 @@ msgstr "Kimeneti könyvtár tallózása" msgid "Buffer:" msgstr "Puffer:" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -894,11 +896,11 @@ msgstr "Gombok" msgid "C Stick" msgstr "C-kar" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "C-kar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "Processzor emulátor motor" @@ -950,15 +952,11 @@ msgstr "Mégsem" msgid "Cannot open %s" msgstr "%s nem nyitható meg" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "" - #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "Nem lehet események bejegyzéseket törölni függÅ‘ben lévÅ‘ eseményekkel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -968,7 +966,7 @@ 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/DolphinWX/Src/ConfigMain.cpp:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -997,7 +995,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:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Katalán" @@ -1014,6 +1012,7 @@ msgid "Change &Disc..." msgstr "Lemez &váltás..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "Lemez váltás" @@ -1021,7 +1020,7 @@ msgstr "Lemez váltás" msgid "Change Game" msgstr "Játék váltás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1037,8 +1036,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:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 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!" @@ -1058,31 +1057,31 @@ msgstr "Csalás keresés" msgid "Cheats Manager" msgstr "Csalás kezelÅ‘" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Kínai (egyszerűsített)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Kínai (hagyományos)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "Válassz DVD gyökér könyvtárat:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Choose a NAND root directory:" msgstr "Válassz NAND gyökér könyvtárat:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "Válassz alapértelmezett ISO fájlt:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "Válassz hozzáadandó könyvtárat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "Válasz megnyitandó fájl" @@ -1090,7 +1089,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:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1098,8 +1097,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:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "Válassz mappát a kitömörítéshez" @@ -1118,7 +1117,7 @@ msgstr "Klasszikus" msgid "Clear" msgstr "Törlés" -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." msgstr "Törlés sikertelen." @@ -1132,7 +1131,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Bezárás" @@ -1157,20 +1156,20 @@ msgstr "Parancs" msgid "Comment" msgstr "Megjegyzés" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "Megjegyzés:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "ISO tömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "Kiválasztott ISO tömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "ISO tömörítése" @@ -1197,13 +1196,13 @@ msgstr "Irányítók beállítása" msgid "Configure..." msgstr "Beállítások..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "Fájl felülírás jóváhagyása" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Confirm on Stop" msgstr "Kilépéskor megerÅ‘sítés" @@ -1212,7 +1211,7 @@ msgstr "Kilépéskor megerÅ‘sítés" msgid "Connect" msgstr "Csatlakozás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "USB billentyűzet csatlakoztatása" @@ -1222,22 +1221,26 @@ msgid "Connect Wiimote %i" msgstr "%i Wiimote csatlakoztatása" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "Wiimote 1 csatlakoztatása" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "Wiimote 2 csatlakoztatása" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "Wiimote 3 csatlakoztatása" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "Wiimote 4 csatlakoztatása" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Connecting..." msgstr "Csatlakozás..." @@ -1262,7 +1265,7 @@ msgstr "Másolás sikertelen" msgid "Copy to Memcard %c" msgstr "%c. memóriakártyára másolás" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "Mag" @@ -1292,7 +1295,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "%s ISO fájl nem ismerhetÅ‘ fel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "%s nem menthetÅ‘ el" @@ -1317,7 +1320,7 @@ 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:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "Az 'ini' kiterjesztéshez nem található nyitott parancs!" @@ -1334,7 +1337,7 @@ msgstr "" msgid "Count:" msgstr "Számláló:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "Ország:" @@ -1348,21 +1351,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:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr "Készítette: KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr "Készítette: VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 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" @@ -1398,7 +1401,7 @@ msgstr "Kereszthalkítás" 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:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" msgstr "Egyedi megjelenítési hack" @@ -1406,15 +1409,15 @@ 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:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 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:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Cseh" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "Digitális irányok" @@ -1422,24 +1425,24 @@ msgstr "Digitális irányok" msgid "DSP" msgstr "Hang" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP Emulator Engine" msgstr "DSP emulátor motor" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emuláció (gyors)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (lassú)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP LLE on Thread" msgstr "DSP LLE folyamatágon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "DSP LLE recompiler" @@ -1447,7 +1450,7 @@ msgstr "DSP LLE recompiler" msgid "DSP settings" msgstr "Hang (DSP) beállítások" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "DVD gyökér könyvtár:" @@ -1455,7 +1458,7 @@ msgstr "DVD gyökér könyvtár:" msgid "Data Size" msgstr "Adatok mérete" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "Dátum:" @@ -1484,16 +1487,16 @@ msgstr "Hibakeresés" msgid "Decimal" msgstr "Decimális" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "ISO kitömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "A kiválasztott ISO fájlok kitömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "ISO kitömörítés" @@ -1501,7 +1504,7 @@ msgstr "ISO kitömörítés" msgid "Default" msgstr "Alap" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "Alapértelmezett ISO:" @@ -1545,8 +1548,8 @@ msgstr "" msgid "Device" msgstr "Eszköz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "Eszköz beállítások" @@ -1633,7 +1636,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "Lemez" @@ -1660,11 +1663,11 @@ msgstr "" msgid "Divide" msgstr "Megosztás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 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:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "Dolphin" @@ -1689,12 +1692,12 @@ msgstr "Dolphin emulált Wiimote beállítások" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS videók (*.dtm)" @@ -1706,7 +1709,7 @@ msgstr "Dolphin Wiimote beállítások" msgid "Dolphin at &Google Code" msgstr "Dolphin &Google Code oldal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1714,7 +1717,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:307 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1744,7 +1747,7 @@ msgstr "Dobok" msgid "Dummy" msgstr "Utánzat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Hang mentése" @@ -1791,9 +1794,9 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Holland" @@ -1846,8 +1849,8 @@ msgstr "Patch szerkesztése" msgid "Edit current perspective" msgstr "Jelenlegi perspektíva szerkesztése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "Szerkesztés..." @@ -1859,7 +1862,7 @@ msgstr "Effektus" msgid "Embedded Frame Buffer" msgstr "Beágyazott képkocka puffer" -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "Az emuláció már fut" @@ -1897,7 +1900,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emulált Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "Emuláció állapota:" @@ -1925,7 +1928,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "AR naplózás bekapcsolása" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "Hang szabályozás használata" @@ -1937,15 +1940,19 @@ msgstr "BAT használata" msgid "Enable Block Merging" msgstr "Blokk csatlakozás használata" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Gyorsítótár használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Cheats" msgstr "Csalások használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "DTK zene bekapcsolása" @@ -1953,7 +1960,7 @@ msgstr "DTK zene bekapcsolása" msgid "Enable Dual Core" msgstr "Dual Core használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "Dual Core használata (gyorsítás)" @@ -1965,7 +1972,7 @@ msgstr "Gyorsbillentyűk használata" msgid "Enable Idle Skipping" msgstr "Tétlen állapot mellÅ‘zése" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "Tétlen állapot mellÅ‘zése (gyorsítás)" @@ -1978,7 +1985,7 @@ msgstr "MMU használata" msgid "Enable Progressive Scan" msgstr "Progresszív pásztázás használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Enable Screen Saver" msgstr "KépernyÅ‘védÅ‘ bekapcsolása" @@ -2040,7 +2047,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2058,7 +2065,7 @@ 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:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" msgstr "Egyedi megjelenítési hack használata" @@ -2097,9 +2104,9 @@ msgstr "" msgid "End" msgstr "Vége" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Angol" @@ -2128,17 +2135,31 @@ msgstr "EgyenlÅ‘" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Hiba" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Hiba a kiválasztott nyelv betöltése közben. Rendszer alapértelmezett " "visszaállítva." -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2173,11 +2194,12 @@ msgstr "Kilépés a Dolphin emulátorból" msgid "Export Failed" msgstr "Exportálás sikertelen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "Fájl exportálása" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "Felvétel exportálása" @@ -2189,7 +2211,7 @@ msgstr "Felvétel exportálása..." msgid "Export Save" msgstr "Mentés exportálása" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "Wii mentés exportálása (kísérleti)" @@ -2221,44 +2243,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:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "Minden fájl kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "BetöltÅ‘ program kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "DOL kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "Könyvtár kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "Fájl kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "Partíció kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "%s kitömörítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "Minden fájl kitömörítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "Könyvtár kitömörítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "Kitömörítés..." @@ -2274,7 +2296,7 @@ msgstr "FIFO lejátszó" msgid "FRANCE" msgstr "FRANCIAORSZÃG" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "FST méret:" @@ -2290,7 +2312,7 @@ msgstr "Meghallgatás sikertelen!" msgid "Failed to download codes." msgstr "Kódok letöltése sikertelen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "Kitömörítés nem sikerült ide: %s!" @@ -2466,11 +2488,11 @@ 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:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "Fájlrendszer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Az 'ini' fájltípus ismeretlen! Nem lesz megnyitva!" @@ -2490,7 +2512,7 @@ msgstr "Kényszerített 16:9" msgid "Force 4:3" msgstr "Kényszerített 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Force Console as NTSC-J" msgstr "Konzol kényszerítése NTSC-J típusra" @@ -2523,7 +2545,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2555,6 +2577,7 @@ msgid "Frame " msgstr "Képkocka" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "Képkocka léptetés" @@ -2570,7 +2593,7 @@ msgstr "Képkocka rendezés" msgid "Frame S&kipping" msgstr "Képkocka k&ihagyás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "Képkocka korlát:" @@ -2582,9 +2605,9 @@ msgstr "RögzítendÅ‘ képkockák" msgid "Free Look" msgstr "Szabad nézet" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "French" msgstr "Francia" @@ -2609,11 +2632,16 @@ msgstr "Teljes kijelzÅ‘s felbontás:" msgid "GCI File(*.gci)" msgstr "GCI fájl(*.gci)" +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +#, fuzzy +msgid "GCMic Configuration" +msgstr "Napló beállítások" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "GC irányító" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "Játék azonosító:" @@ -2629,7 +2657,7 @@ msgstr "A játék nem fut!" msgid "Game not found!!" msgstr "A játék nem található!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "A játék sajátos beállításai" @@ -2637,7 +2665,7 @@ msgstr "A játék sajátos beállításai" msgid "GameConfig" msgstr "Játék konfig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "Gamecube" @@ -2646,7 +2674,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube &irányító beállítások" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube memóriakártyák (*.raw,*.gcp)" @@ -2669,7 +2697,8 @@ msgstr "" "(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/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Ãltalános" @@ -2678,9 +2707,9 @@ msgstr "Ãltalános" msgid "General Settings" msgstr "Ãltalános beállítások" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "German" msgstr "Német" @@ -2720,7 +2749,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelölve." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" msgstr "Görög" @@ -2752,7 +2781,7 @@ msgstr "Hackek" msgid "Header checksum failed" msgstr "A fejléc ellenÅ‘rzÅ‘ összege hibás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hebrew" msgstr "Héber" @@ -2813,11 +2842,12 @@ msgid "Hotkey Configuration" msgstr "Gyorsbillentyű beállítások" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 msgid "Hotkeys" msgstr "Gyorsbill." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hungarian" msgstr "Magyar" @@ -2849,7 +2879,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - rossz cél" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "IPL beállítások" @@ -2865,11 +2895,11 @@ msgstr "IR mutató" msgid "IR Sensitivity:" msgstr "IR érzékenysége:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "ISO részletek" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "ISO könyvtárak" @@ -2881,6 +2911,12 @@ msgstr "OLASZORSZÃG" msgid "Icon" msgstr "Ikon" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" @@ -2888,7 +2924,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:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 msgid "" "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." @@ -2981,7 +3017,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "Elindul" @@ -3010,7 +3046,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "Lekódolt vagy kódolatlan kódok beszúrása ide..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "SD kártya behelyezése" @@ -3022,7 +3058,7 @@ msgstr "Ãrj be ide nevet..." msgid "Install WAD" msgstr "WAD telepítése" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 msgid "Install to Wii Menu" msgstr "Telepítés a Wii menübe" @@ -3032,23 +3068,23 @@ msgid "" msgstr "" "InstallExceptionHandler elÅ‘idézve, de ez a platform még nem támogatja azt." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 msgid "Installing WAD..." msgstr "WAD telepítése..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 msgid "Interface" msgstr "Felhasználói felület" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "Felület beállítások" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "BelsÅ‘ LZO hiba - tömörítés sikertelen" -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3057,7 +3093,7 @@ 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:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "BelsÅ‘ LZO hiba - lzo_init() sikertelen" @@ -3065,11 +3101,11 @@ msgstr "BelsÅ‘ LZO hiba - lzo_init() sikertelen" msgid "Internal Resolution:" msgstr "BelsÅ‘ felbontás:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "Interpreter (NAGYON lassú)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "Intró" @@ -3086,7 +3122,7 @@ msgstr "Érvénytelen érték!" msgid "Invalid bat.map or dir entry" msgstr "Érvénytelen bat.map vagy könyvtár bejegyzés" -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "Érvénytelen esemény fajta %i" @@ -3106,17 +3142,17 @@ msgstr "" "%s\n" " Valószínűleg újra le kell mentened a játékot." -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "Nem megfelelÅ‘ rögzített fájl" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "Nem megfelelÅ‘ mentés" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Italian" msgstr "Olasz" @@ -3124,16 +3160,16 @@ msgstr "Olasz" msgid "JAPAN" msgstr "JAPÃN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (ajánlott)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "JITIL Recompiler (kísérleti)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Japanese" msgstr "Japán" @@ -3142,16 +3178,17 @@ msgid "KOREA" msgstr "KOREA" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "Bill." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Korean" msgstr "Koreai" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "L" @@ -3160,11 +3197,11 @@ msgid "L Button" msgstr "L gomb" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" msgstr "Bal analóg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "Nyelv:" @@ -3187,6 +3224,7 @@ msgid "Left Stick" msgstr "Bal kar" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3216,7 +3254,7 @@ msgstr "" msgid "Less Than" msgstr "Kevesebb mint" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "FPS alapú korlátozás" @@ -3229,34 +3267,42 @@ 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 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 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 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 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 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 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 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 msgid "Load State Slot 8" msgstr "Ãllás betöltése a 8. helyrÅ‘l" @@ -3264,11 +3310,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:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Wii rendszer menü betöltése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii rendszer menü betöltése %d%c" @@ -3295,7 +3341,7 @@ msgstr "Meghatározott fájlt tölt be (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "Helyi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Lock Threads to Cores" msgstr "Folyamatágak magokhoz zárolása" @@ -3350,16 +3396,16 @@ msgstr "MMU sebesség növelÅ‘ hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark fájlok (*.gcs)" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "FÅ‘kar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "Gyártó azonosító:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "Gyártó:" @@ -3381,7 +3427,7 @@ msgid "Memory Byte" msgstr "Memória bájt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 msgid "Memory Card" msgstr "Memóriakártya" @@ -3418,7 +3464,7 @@ msgstr "" msgid "Menu" msgstr "Menü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "Mikrofon" @@ -3431,7 +3477,7 @@ msgstr "Min" msgid "Misc" msgstr "Egyebek" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "Egyéb beállítások" @@ -3461,7 +3507,7 @@ msgid "Motion Plus" msgstr "Motion Plus" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" @@ -3579,7 +3625,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3618,7 +3664,7 @@ msgstr "Becenév:" msgid "No Country (SDK)" msgstr "Nincs ország (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "Nem találhatók sem ISO sem WAD fájlok" @@ -3653,7 +3699,7 @@ msgstr "%s játékhoz nem található mentési mappa" msgid "None" msgstr "Nincs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" msgstr "Norvég" @@ -3661,16 +3707,16 @@ msgstr "Norvég" msgid "Not Equal" msgstr "Nem egyenlÅ‘" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "Nincs beállítva" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Not connected" msgstr "Nincs csatlakoztatva" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "Megjegyzés" @@ -3712,7 +3758,7 @@ msgstr "Elem" msgid "Object Range" msgstr "Elem hatótáv" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "Ki" @@ -3727,14 +3773,15 @@ msgstr "Csak %d blokk szabad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: 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:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "A játékot &tartalmazó mappa megnyitása" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "Wii &mentések mappa megnyitása" @@ -3773,7 +3820,7 @@ 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:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "LehetÅ‘ségek" @@ -3853,12 +3900,12 @@ msgstr "%i partíció" msgid "Patches" msgstr "Javítások" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "Mappák" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Szünet" @@ -3867,7 +3914,7 @@ msgstr "Szünet" msgid "Per-Pixel Lighting" msgstr "Képpont alapú fényhatások" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "Tökéletes" @@ -3878,20 +3925,22 @@ msgstr "%d perspektíva" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 msgid "Play" msgstr "Indítás" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "Felvétel visszajátszása" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "Indítás/Szünet" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "Játszható" @@ -3903,7 +3952,7 @@ msgstr "Visszajátszási lehetÅ‘ségek" msgid "Players" msgstr "Játékosok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 msgid "Please confirm..." msgstr "Változtatás jóváhagyása..." @@ -3915,23 +3964,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:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Polish" msgstr "Lengyel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 1" msgstr "1. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 2" msgstr "2. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Port 3" msgstr "3. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 msgid "Port 4" msgstr "4. port" @@ -3940,11 +3989,11 @@ msgstr "4. port" msgid "Port :" msgstr "Port:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese" msgstr "Portugál" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" msgstr "Portugál (brazíliai)" @@ -3952,6 +4001,21 @@ msgstr "Portugál (brazíliai)" msgid "Post-Processing Effect:" msgstr "Utófeldolgozási effektus:" +#: Source/Core/Core/Src/Movie.cpp:735 +#, c-format +msgid "Premature movie end in PlayController. %u + 8 > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:829 +#, c-format +msgid "Premature movie end in PlayWiimote. %u + %d > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:806 +#, c-format +msgid "Premature movie end in PlayWiimote. %u > %u" +msgstr "" + #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "Gombkiosztás:" @@ -3994,7 +4058,7 @@ msgid "Quit" msgstr "Kilépés" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "R" @@ -4003,7 +4067,7 @@ msgid "R Button" msgstr "R gomb" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" msgstr "Jobb analóg" @@ -4020,6 +4084,7 @@ msgid "Range" msgstr "Hatótáv" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "Ãrásvédett mód" @@ -4091,6 +4156,7 @@ msgid "Refresh" msgstr "Frissítés" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "A lista frissítése" @@ -4098,10 +4164,10 @@ msgstr "A lista frissítése" msgid "Refresh game list" msgstr "Játéklista frissítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 msgid "Remove" msgstr "Törlés" @@ -4120,6 +4186,7 @@ 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 msgid "Reset" msgstr "Alapra állítás" @@ -4142,15 +4209,15 @@ msgid "Right Stick" msgstr "Jobb kar" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Rumble funkció" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 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:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "Orosz" @@ -4162,7 +4229,7 @@ msgstr "Ãl&lás mentése" msgid "Safe" msgstr "Biztonságos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Sample Rate:" msgstr "Mintavételezési frekvencia:" @@ -4177,34 +4244,42 @@ 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 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 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 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 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 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 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 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 msgid "Save State Slot 8" msgstr "Ãllás mentés a 8. helyre" @@ -4212,12 +4287,12 @@ msgstr "Ãllás mentés a 8. helyre" msgid "Save State..." msgstr "Ãllás mentése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "Mentés másként..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "Tömörített GCM/ISO mentése" @@ -4225,11 +4300,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:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "Kitömörített GCM/ISO mentése" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, 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..." @@ -4238,16 +4313,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:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, c-format msgid "Scanning %s" msgstr "Keresés %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "ISO fájlok keresése" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "Keresés..." @@ -4263,7 +4338,7 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Keresési szűrÅ‘" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "Keresés az almappákban" @@ -4278,12 +4353,12 @@ msgstr "%s rész nem található a SYSCONF fájlban" msgid "Select" msgstr "Választás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Válassz rögzítendÅ‘ fájlt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 msgid "Select a Wii WAD file to install" msgstr "Válassz telepítendÅ‘ Wii WAD fájlt" @@ -4309,15 +4384,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:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Válassz mentési fájlt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Válassz betöltendÅ‘ állásmentést" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Válassz mentendÅ‘ állást" @@ -4388,11 +4463,11 @@ msgstr "ÉrzékelÅ‘ helyzete:" msgid "Separator" msgstr "Separator" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "Szerb" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4402,7 +4477,7 @@ msgstr "" msgid "Set" msgstr "Beáll." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "Beállítás &alapértelmezett ISO fájlként" @@ -4417,11 +4492,11 @@ 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:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." msgstr "Beállítások..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Nem található a beállítási fájl" @@ -4429,7 +4504,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:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "Rövid cím:" @@ -4490,7 +4565,7 @@ msgstr "JAP mutatása" msgid "Show Korea" msgstr "Korea mutatása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "A játék nyelve:" @@ -4530,11 +4605,11 @@ msgstr "Wad mutatása" msgid "Show Wii" msgstr "Wii mutatása" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 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:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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 " @@ -4599,15 +4674,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Oldalt tartott Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Egyszerűsített kínai" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "Méret" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 msgid "Skip BIOS" msgstr "BIOS kihagyása" @@ -4653,11 +4728,11 @@ msgstr "" msgid "Slot %i" msgstr "%i hely" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 msgid "Slot A" msgstr "A hely" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 msgid "Slot B" msgstr "B hely" @@ -4682,7 +4757,7 @@ msgstr "" "Biztosan be kívánod kapcsolni a szoftveres képleképezést? Ha bizonytalan " "vagy, válaszd ezt: 'Nem'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Hang beállítások" @@ -4700,9 +4775,9 @@ msgstr "Hang puffer létrehozása sikertelen: %s" msgid "Space" msgstr "Szóköz" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Spanish" msgstr "Spanyol" @@ -4746,7 +4821,7 @@ msgstr "Negyzetes kar" msgid "Standard Controller" msgstr "Normál irányító" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4761,14 +4836,16 @@ 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 msgid "Start Recording" msgstr "Felvétel indítása" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "Ãllap." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "Ãllás mentések" @@ -4779,6 +4856,7 @@ msgstr "Kar" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Leállítás" @@ -4823,8 +4901,8 @@ msgstr "Mentés fájlok sikeresen importálva" msgid "Swing" msgstr "Lengetés" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "Rendszer nyelv:" @@ -4857,9 +4935,14 @@ msgstr "Tábla jobbra" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" msgstr "Pillanatkép készítése" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "Teszt" @@ -4888,13 +4971,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:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 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:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, c-format msgid "" "The file %s already exists.\n" @@ -4983,7 +5066,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:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "Kinézet" @@ -5015,7 +5098,7 @@ 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:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 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." @@ -5038,7 +5121,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -5053,11 +5136,11 @@ msgstr "" "Gyorsbillentyű : Tartsd lenyomva a szabályozás azonnali " "kikapcsolásához." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Ez a zenei sávok, mint BGM lejátszásra szolgál." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5083,7 +5166,7 @@ msgid "Tilt" msgstr "Billentés" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr "Cím" @@ -5098,15 +5181,16 @@ msgstr "Minden napló típus kijelölése" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Fent" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Hagyományos kínai" @@ -5114,7 +5198,7 @@ msgstr "Hagyományos kínai" msgid "Tried to load an unknown file type." msgstr "Próbálkozás egy ismeretlen fájltípus betöltésével. " -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "Kioldó gombok" @@ -5130,7 +5214,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:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Turkish" msgstr "Török" @@ -5211,15 +5295,6 @@ msgstr "" "Ismeretlen üzenet érkezett ezzel az azonosítóval:%d ettÅ‘l a játékostól:%d " "Játékos kirúgása!" -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Ismeretlen mutató %#08x\n" -"Folytatod?" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5234,7 +5309,7 @@ msgstr "Frissítés" msgid "Upright Wiimote" msgstr "ElÅ‘re tartott Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 mód (PAL60) használata" @@ -5246,7 +5321,7 @@ msgstr "Teljes nézet használata" msgid "Use Hex" msgstr "Hexa használat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "Hibaüzenetek megjelenítése" @@ -5302,7 +5377,7 @@ msgstr "Érték:" msgid "Verbosity" msgstr "Verbosity" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "Kép" @@ -5310,7 +5385,7 @@ msgstr "Kép" msgid "Virtual" msgstr "Virtuális" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "HangerÅ‘" @@ -5375,6 +5450,41 @@ msgstr "" "és azonos néven fog szerepelni a memóriakártyán lévÅ‘kkel\n" "Folytatod?" +#: Source/Core/Core/Src/Movie.cpp:629 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, 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" +"\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" +"\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" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -5392,15 +5502,15 @@ msgstr "Szélesvásznú hack" msgid "Width" msgstr "Szélesség" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "Wii konzol" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 msgid "Wii NAND Root:" msgstr "Wii NAND gyökér könyvtár:" @@ -5408,7 +5518,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:1310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii mentés fájlok (*.bin)|*.bin" @@ -5439,7 +5549,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:599 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Wiimote Connected" msgstr "Wiimote csatlakoztatva" @@ -5472,9 +5582,9 @@ msgstr "Jobb Windows" msgid "Word Wrap" msgstr "Word Wrap" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Working..." msgstr "Folyamatban..." @@ -5536,7 +5646,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:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 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." @@ -5560,7 +5670,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:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "ZTP hack" @@ -5631,7 +5741,7 @@ msgstr "" msgid "^ ADD" msgstr "^ HOZZÃADÃS" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "betöltÅ‘ program (.img)" @@ -5648,7 +5758,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:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Opcode olvasása innen %x. Kérlek jelentsd." @@ -5667,7 +5777,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "ismeretlen parancs 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute visszatért -1 alkalmazás fut!" @@ -6225,6 +6335,13 @@ msgstr "| VAGY" #~ msgid "Type %d config not supported in plugin %s" #~ msgstr "%d beállítás fajta nem támogatott a(z) %s plugin által" +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "Ismeretlen mutató %#08x\n" +#~ "Folytatod?" + #~ msgid "Use FPS For Limiting" #~ msgstr "FPS alapú korlátozás" diff --git a/Languages/po/it.po b/Languages/po/it.po index f9e2001f04..6be9fd979c 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: 2011-10-11 23:25-0500\n" +"POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-04-08 20:40+0100\n" "Last-Translator: RebuMan, Dolphin Team\n" "Language-Team: \n" @@ -49,9 +49,9 @@ msgstr "\"%s\" è un file GCM/ISO non valido, oppure non è una ISO GC/Wii." msgid "%1$sCopy%1$s" msgstr "%1$sCopia%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -178,11 +178,11 @@ msgstr "Gestore &Trucchi" msgid "&DSP Settings" msgstr "&Impostazioni DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "&Elimina ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 msgid "&Delete selected ISOs..." msgstr "&Elimina ISO selezionate..." @@ -246,7 +246,7 @@ msgstr "&Pausa" msgid "&Play" msgstr "&Gioca" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "&Proprietà" @@ -290,7 +290,7 @@ msgstr "&Visualizza" msgid "&Wiimote Settings" msgstr "Impostazioni &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "&Wiki" @@ -339,10 +339,11 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -400,8 +401,8 @@ msgstr "" "\n" "E' necessario inoltrare la porta TCP all'host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "Scheda basata su AM" @@ -436,6 +437,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 msgid "Action" msgstr "Azione" @@ -538,11 +540,11 @@ msgstr "Adattatore:" msgid "Add" msgstr "Aggiungi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "Aggiungi codice ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "Aggiungi Patch" @@ -550,9 +552,9 @@ msgstr "Aggiungi Patch" msgid "Add new pane" msgstr "Aggiungi nuovo riquadro" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Add..." msgstr "Aggiungi..." @@ -608,7 +610,7 @@ msgstr "" msgid "Advanced" msgstr "Avanzate" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "Impostazioni Avanzate" @@ -616,28 +618,28 @@ msgstr "Impostazioni Avanzate" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Tutti i file GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Tutti i file di immagine GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "Tutti i file GCM GameCube (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Tutti gli Stati di Gioco Salvati (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "Tutti i file ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tutti i file compressi GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "Tutti i file (*.*)|*.*" @@ -672,7 +674,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Impossibile caricare l'Apploader dal file" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "Programma di Caricamento (Apploader):" @@ -687,7 +689,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Arabo" @@ -696,7 +698,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:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -704,12 +706,12 @@ msgstr "" "Sei sicuro di voler eliminare questi file?\n" "Andranno persi definitivamente!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 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:725 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspetto:" @@ -718,11 +720,11 @@ msgstr "Aspetto:" msgid "At least one pane must remain open." msgstr "Almeno un riquadro deve rimanere aperto." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" msgstr "Interfaccia Audio:" @@ -730,7 +732,7 @@ 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:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -769,7 +771,7 @@ msgstr "" msgid "Back" msgstr "Indietro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" msgstr "Impostazioni Interfaccia" @@ -780,7 +782,7 @@ msgid "Backend:" msgstr "Interfaccia Audio:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Input in Background" @@ -793,15 +795,15 @@ msgid "Bad File Header" msgstr "File di Intestazione (Header) difettoso" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "Dettagli Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "Banner:" @@ -813,7 +815,7 @@ msgstr "Barra" msgid "Basic" msgstr "Impostazioni di Base" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "Impostazioni di Base" @@ -843,7 +845,7 @@ msgid "Blue Right" msgstr "Blu Destro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Sotto" @@ -852,7 +854,7 @@ msgstr "Sotto" msgid "Bound Controls: %lu" msgstr "Controlli Associati: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "Corrotto" @@ -860,7 +862,7 @@ msgstr "Corrotto" msgid "Browse" msgstr "Sfoglia" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "Cerca una directory da aggiungere" @@ -868,7 +870,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:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "Cerca una directory di destinazione" @@ -876,7 +878,7 @@ msgstr "Cerca una directory di destinazione" msgid "Buffer:" msgstr "Buffer:" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -887,11 +889,11 @@ msgstr "Pulsanti" msgid "C Stick" msgstr "Levetta di Controllo" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "Levetta di Controllo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "Motore di Emulazione CPU" @@ -931,15 +933,11 @@ msgstr "Annulla" msgid "Cannot open %s" msgstr "Impossibile aprire %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "" - #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "Impossibile non registrare gli eventi in sospeso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -949,7 +947,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:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -979,7 +977,7 @@ msgstr "Impossibile leggere da DVD_Plugin - Interfaccia DVD: Errore Fatale" msgid "Caps Lock" msgstr "Bloc Maiusc" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "" @@ -996,6 +994,7 @@ msgid "Change &Disc..." msgstr "Cambia &Disco..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "Cambia Disco" @@ -1003,7 +1002,7 @@ msgstr "Cambia Disco" msgid "Change Game" msgstr "Cambia Gioco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1019,8 +1018,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:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 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 " @@ -1042,32 +1041,32 @@ msgstr "Cerca Trucco" msgid "Cheats Manager" msgstr "Gestore Trucchi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Cinese (Semplificato)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Cinese (Tradizionale)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "Scegli una directory principale per i DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 #, fuzzy msgid "Choose a NAND root directory:" msgstr "Scegli una directory principale per i DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "Scegli una ISO predefinita:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "Scegli una directory da aggiungere" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "Scegli un file da aprire" @@ -1075,7 +1074,7 @@ msgstr "Scegli un file da aprire" msgid "Choose a memory card:" msgstr "Scegli una scheda di memoria:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1083,8 +1082,8 @@ msgstr "" "Scegli il file da utilizzare come apploader: (vale per i dischi costruiti " "solo da directory)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "Scegli la cartella in cui 'estrarre in'" @@ -1103,7 +1102,7 @@ msgstr "Controller Classico" msgid "Clear" msgstr "Cancella" -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." msgstr "Cancellazione non riuscita." @@ -1117,7 +1116,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Chiudi" @@ -1142,20 +1141,20 @@ msgstr "Comando" msgid "Comment" msgstr "Note" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "Note:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "Comprimi ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "Comprimi le ISO selezionate..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "Compressione ISO" @@ -1182,13 +1181,13 @@ msgstr "Configura Pads" msgid "Configure..." msgstr "Configura..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "Conferma la Sovrascrittura del File" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 #, fuzzy msgid "Confirm on Stop" msgstr "Conferma alla Chiusura" @@ -1198,7 +1197,7 @@ msgstr "Conferma alla Chiusura" msgid "Connect" msgstr "Connetti" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "Collega Tastiera USB" @@ -1208,22 +1207,26 @@ msgid "Connect Wiimote %i" msgstr "Collega Wiimote %i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "Collega Wiimote 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "Collega Wiimote 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "Collega Wiimote 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "Collega Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Connecting..." msgstr "Connessione in corso..." @@ -1248,7 +1251,7 @@ msgstr "Copia non riuscita" msgid "Copy to Memcard %c" msgstr "Copia nella Memcard %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "Core" @@ -1278,7 +1281,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Impossibile riconoscere il file ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "Impossibile salvare %s" @@ -1306,7 +1309,7 @@ msgstr "" "Stai eseguendo Dolphin da CD/DVD, o il file di salvataggio è protetto in " "scrittura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "Impossibile trovare il comando di apertura per l'estensione 'ini'!" @@ -1323,7 +1326,7 @@ msgstr "" msgid "Count:" msgstr "Conteggio:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "Paese:" @@ -1337,21 +1340,21 @@ msgstr "Crea codice AR" msgid "Create new perspective" msgstr "Crea nuova prospettiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr "Creata da KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr "Creata da VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Creata da black_rider e pubblicata su ForumW.org > Web Developments" @@ -1383,7 +1386,7 @@ msgstr "Dissolvenza Incrociata" 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:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" msgstr "Hack Proiezione Personalizzato" @@ -1391,15 +1394,15 @@ msgstr "Hack Proiezione Personalizzato" msgid "Custom Projection Hack Settings" msgstr "Impostazioni Hack Proiezione Personalizzato" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." msgstr "Personalizza alcuni parametri di Proiezione Ortografica" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Ceco" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "Croce Direzionale" @@ -1407,25 +1410,25 @@ msgstr "Croce Direzionale" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP Emulator Engine" msgstr "Motore di Emulazione DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP HLE emulation (fast)" msgstr "Emulazione DSP HLE (veloce)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP LLE interpreter (slow)" msgstr "Interprete DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 #, fuzzy msgid "DSP LLE on Thread" msgstr "Esegui DSP LLE in un processo dedicato" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "Ricompilatore DSP LLE" @@ -1433,7 +1436,7 @@ msgstr "Ricompilatore DSP LLE" msgid "DSP settings" msgstr "Impostazioni DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "Origine DVD:" @@ -1441,7 +1444,7 @@ msgstr "Origine DVD:" msgid "Data Size" msgstr "Dimensione Dati" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "Data:" @@ -1471,16 +1474,16 @@ msgstr "Debug" msgid "Decimal" msgstr "." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "Decomprimi ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "Decomprimi ISO selezionate..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "Decompressione ISO" @@ -1488,7 +1491,7 @@ msgstr "Decompressione ISO" msgid "Default" msgstr "Predef." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "ISO Predefinita:" @@ -1533,8 +1536,8 @@ msgstr "" msgid "Device" msgstr "Periferica" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "Impostazioni Periferica" @@ -1607,7 +1610,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "Disco" @@ -1632,11 +1635,11 @@ msgstr "Visualizza i tasti di input letti dall'emulatore." msgid "Divide" msgstr "/" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 msgid "Do you want to stop the current emulation?" msgstr "Vuoi interrompere l'emulazione in corso?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "Dolphin" @@ -1661,12 +1664,12 @@ msgstr "Dolphin - Configurazione Wiimote Emulato" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin - Configurazione Controlli GC" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmati TAS Dolphin (*.dtm)" @@ -1678,14 +1681,14 @@ msgstr "Dolphin - Configurazione Wiimote" msgid "Dolphin at &Google Code" msgstr "Dolphin in &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 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:307 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1715,7 +1718,7 @@ msgstr "Percussioni/Batteria" msgid "Dummy" msgstr "Fittizio/a" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Immagazzina Audio su disco" @@ -1755,9 +1758,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Olandese" @@ -1811,8 +1814,8 @@ msgstr "Modifica Pacth" msgid "Edit current perspective" msgstr "Modifica prospettiva corrente" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "Modifica..." @@ -1825,7 +1828,7 @@ msgstr "Effetto" msgid "Embedded Frame Buffer" msgstr "Frame Buffer" -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "Processo dell'Emulatore già in esecuzione" @@ -1852,7 +1855,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wiimote Emulato" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "Stato dell'Emulazione: " @@ -1874,7 +1877,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "Attiva Registrazione Eventi AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "Abilita Autoregolazione Audio" @@ -1886,16 +1889,20 @@ msgstr "Attiva BAT" msgid "Enable Block Merging" msgstr "Attiva Unione Blocchi" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Attiva Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Cheats" msgstr "Abilita Trucchi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "Abilita Audio DTK" @@ -1903,7 +1910,7 @@ msgstr "Abilita Audio DTK" msgid "Enable Dual Core" msgstr "Attiva Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "Attiva Dual Core (aumenta la velocità)" @@ -1915,7 +1922,7 @@ msgstr "Attiva Tasti di Scelta Rapida" msgid "Enable Idle Skipping" msgstr "Salta pause dovute a inattività" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "Salta pause dovute a inattività (aumenta la velocità)" @@ -1928,7 +1935,7 @@ msgstr "Attiva MMU" msgid "Enable Progressive Scan" msgstr "Attiva Scansione Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 #, fuzzy msgid "Enable Screen Saver" msgstr "Attiva WideScreen" @@ -1982,7 +1989,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2001,7 +2008,7 @@ msgstr "" "Accresce l'accuratezza dell'hardware emulato, ma è lento da eseguire (Attivo " "= Compatibile, Disattivato = Veloce)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" msgstr "Abilita Hack Proiezione Personalizzato" @@ -2032,9 +2039,9 @@ msgstr "" msgid "End" msgstr "Fine" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Inglese" @@ -2063,17 +2070,31 @@ msgstr "Uguale" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Errore/i" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Errore caricamento della lingua selezionata. Ritorno alla predefinita di " "sistema." -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2109,11 +2130,12 @@ msgstr "Esci dall'Emulatore Dolphin" msgid "Export Failed" msgstr "Esportazione non riuscita" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "Esporta File" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "Esporta Registrazione" @@ -2125,7 +2147,7 @@ msgstr "Esporta Registrazione..." msgid "Export Save" msgstr "Esporta Salvataggio" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "Esporta salvataggi Wii (sperimentale)" @@ -2158,44 +2180,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:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "Estrai Tutti i File..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "Estrai Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "Estrai DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "Estrai Directory..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "Estrai File..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "Estrai Partizione..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "Estrazione %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "Estrazione di Tutti i File" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "Estrazione Directory" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "Estrazione..." @@ -2211,7 +2233,7 @@ msgstr "Lettore FIFO" msgid "FRANCE" msgstr "FRANCIA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "Dimensione FST:" @@ -2227,7 +2249,7 @@ msgstr "Impossibile 'rimanere in ascolto'!!" msgid "Failed to download codes." msgstr "Download dei codici non riuscito" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "Estrazione in %s non riuscita!" @@ -2407,11 +2429,11 @@ 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:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "Filesystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Il tipo 'ini' è sconosciuto! Il file non verrà aperto!" @@ -2431,7 +2453,7 @@ msgstr "Forza 16:9" msgid "Force 4:3" msgstr "Forza 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 #, fuzzy msgid "Force Console as NTSC-J" msgstr "Imposta come Console NTSC-J" @@ -2465,7 +2487,7 @@ msgstr "" "Forza l'uscita video del gioco per risoluzioni widescreen.\n" "Questo potrebbe causare difetti grafici" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2494,6 +2516,7 @@ msgid "Frame " msgstr "Fotogramma " #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "Fotogramma per Fotogramma" @@ -2510,7 +2533,7 @@ msgstr "Intervallo Fotogramma" msgid "Frame S&kipping" msgstr "Salta &Fotogramma" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "Limite FPS:" @@ -2522,9 +2545,9 @@ msgstr "Fotogrammi da Registrare:" msgid "Free Look" msgstr "Visuale Libera" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "French" msgstr "Francese" @@ -2550,11 +2573,16 @@ msgstr "Risoluzione video a Schermo Intero:" msgid "GCI File(*.gci)" msgstr "File GCI(*.gci)" +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +#, fuzzy +msgid "GCMic Configuration" +msgstr "Configurazione Log" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "Controlli GC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "ID Gioco:" @@ -2570,7 +2598,7 @@ msgstr "Il gioco non è avviato" msgid "Game not found!!" msgstr "Gioco non trovato!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "Impostazioni di Gioco Specifiche" @@ -2578,7 +2606,7 @@ msgstr "Impostazioni di Gioco Specifiche" msgid "GameConfig" msgstr "Configurazione di Gioco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "GameCube" @@ -2587,7 +2615,7 @@ msgid "Gamecube &Pad Settings" msgstr "Impostazioni &Controlli GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Schede di Memoria GameCube (*.raw,*.gcp)" @@ -2610,7 +2638,8 @@ msgstr "" "(codice corrotto oppure tipo di codice non ancora supportato.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generale" @@ -2620,9 +2649,9 @@ msgstr "Generale" msgid "General Settings" msgstr "Impostazioni Interfaccia" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "German" msgstr "Tedesco" @@ -2656,7 +2685,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" msgstr "Greco" @@ -2688,7 +2717,7 @@ msgstr "" msgid "Header checksum failed" msgstr "Somma di controllo dell'intestazione non riuscita" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hebrew" msgstr "Ebreo" @@ -2747,11 +2776,12 @@ msgid "Hotkey Configuration" msgstr "Configurazione Tasti di Scelta Rapida" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 msgid "Hotkeys" msgstr "Tasti di Scelta Rapida" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hungarian" msgstr "Ungherese" @@ -2783,7 +2813,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destinazione corrotta" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "Impostazioni IPL" @@ -2799,11 +2829,11 @@ msgstr "Puntatore a raggi infrarossi (IR)" msgid "IR Sensitivity:" msgstr "Sensibilità IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "Dettagli ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "Directory ISO" @@ -2815,6 +2845,12 @@ msgstr "ITALIA" msgid "Icon" msgstr "Icona" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" @@ -2822,7 +2858,7 @@ msgstr "" "Se il framerate risulta incoerente o incostante, questa opzione potrebbe " "porre rimedio. (Attivo = Compatibile, Disabilitato = Veloce)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 msgid "" "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." @@ -2903,7 +2939,7 @@ 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:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "In Game" @@ -2932,7 +2968,7 @@ msgstr "Ins" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inserisci il codice criptato o decriptato qui..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "Inserisci SD Card" @@ -2944,7 +2980,7 @@ msgstr "Inserire il nome qui..." msgid "Install WAD" msgstr "Installa WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 msgid "Install to Wii Menu" msgstr "Installa in Menu Wii" @@ -2955,24 +2991,24 @@ msgstr "" "E' stata sollevata un'Eccezione all'Installazione, tuttavia questa " "piattaforma non la supporta ancora." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 msgid "Installing WAD..." msgstr "Installazione WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 #, fuzzy msgid "Interface" msgstr "Impostazioni Interfaccia" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "Impostazioni Interfaccia" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "Errore Interno LZO - compressione non riuscita" -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -2981,7 +3017,7 @@ msgstr "" "Errore Interno LZO - decompressione non riuscita (%d) (%li, %li) \n" "Riprovare a verificare lo stato" -#: Source/Core/Core/Src/State.cpp:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "Errore Interno LZO - lzo_init() non riuscita" @@ -2990,11 +3026,11 @@ msgstr "Errore Interno LZO - lzo_init() non riuscita" msgid "Internal Resolution:" msgstr "Risoluzione video a Schermo Intero:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "Interprete (molto lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "Intro" @@ -3011,7 +3047,7 @@ msgstr "Valore non Valido!" msgid "Invalid bat.map or dir entry" msgstr "bat.map o voce directory non valide" -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "Tipo di evento %i non valido" @@ -3031,17 +3067,17 @@ msgstr "" "%s\n" " E' possibile che sia necessario il redumping del gioco." -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "File di registrazione non valido" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "Stato non valido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Italian" msgstr "Italiano" @@ -3049,16 +3085,16 @@ msgstr "Italiano" msgid "JAPAN" msgstr "GIAPPONE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "Ricompilatore JIT (consigliato)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "Ricompilatore JITIL sperimentale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Japanese" msgstr "Giapponese" @@ -3067,16 +3103,17 @@ msgid "KOREA" msgstr "KOREA" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "Combinaz. Tasti" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Korean" msgstr "Coreano" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "L" @@ -3085,11 +3122,11 @@ msgid "L Button" msgstr "Pulsante L" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" msgstr "L-Analogico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "Lingua:" @@ -3112,6 +3149,7 @@ msgid "Left Stick" msgstr "Levetta Sinistra" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3141,7 +3179,7 @@ msgstr "" msgid "Less Than" msgstr "Minore di" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "" @@ -3155,34 +3193,42 @@ msgid "Load Custom Textures" msgstr "Carica Trame ad Alta Risoluzione" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 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 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 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 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 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 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 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 msgid "Load State Slot 8" msgstr "Carica Stato di Gioco dall'Ingresso 8" @@ -3190,12 +3236,12 @@ msgstr "Carica Stato di Gioco dall'Ingresso 8" msgid "Load State..." msgstr "Carica Stato di Gioco..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 #, fuzzy msgid "Load Wii System Menu" msgstr "Carica il Menu di Sistema Wii %d%c" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carica il Menu di Sistema Wii %d%c" @@ -3222,7 +3268,7 @@ msgstr "Carica il file specificato (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Locale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 #, fuzzy msgid "Lock Threads to Cores" msgstr "Blocca processi ai nuclei" @@ -3278,16 +3324,16 @@ msgstr "Hack Velocità MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "File MadCatz Gameshark(*.gcs)" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Levetta Principale" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "ID Produttore:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "Produttore:" @@ -3309,7 +3355,7 @@ msgid "Memory Byte" msgstr "Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 msgid "Memory Card" msgstr "Scheda di Memoria" @@ -3346,7 +3392,7 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "Mic" @@ -3360,7 +3406,7 @@ msgstr "Mic" msgid "Misc" msgstr "Varie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "Impostazioni Varie" @@ -3386,7 +3432,7 @@ msgid "Motion Plus" msgstr "Motion Plus" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motore" @@ -3495,7 +3541,7 @@ msgstr "TN Tab" msgid "NP Up" msgstr "TN Su" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3534,7 +3580,7 @@ msgstr "Pseudonimo:" msgid "No Country (SDK)" msgstr "Nessun Paese (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "Nessun ISO o WAD trovata" @@ -3569,7 +3615,7 @@ msgstr "Nessuna cartella di salvataggio trovata per il titolo %s" msgid "None" msgstr "Nessuno/a" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" msgstr "Norvegese" @@ -3577,16 +3623,16 @@ msgstr "Norvegese" msgid "Not Equal" msgstr "Diverso" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "Non Impostato" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Not connected" msgstr "Non collegato" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "Note" @@ -3628,7 +3674,7 @@ msgstr "Oggetto" msgid "Object Range" msgstr "Intervallo Oggetto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "Spento" @@ -3643,14 +3689,15 @@ msgstr "Solo %d blocchi disponibili" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Apri" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "Apri &percorso file" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "Apri cartella &salvataggi Wii" @@ -3690,7 +3737,7 @@ msgid "Opens the logger" msgstr "Apri il logger" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Opzioni" @@ -3772,12 +3819,12 @@ msgstr "Partizione %i" msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "Percorsi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -3787,7 +3834,7 @@ msgstr "Pausa" msgid "Per-Pixel Lighting" msgstr "Illuminazione Pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "Perfetto" @@ -3798,20 +3845,22 @@ msgstr "Prospettiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 msgid "Play" msgstr "Gioca" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "Avvia Riproduzione Registrazione" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "Gioca/Pausa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "Giocabile" @@ -3823,7 +3872,7 @@ msgstr "Opzioni di Riproduzione" msgid "Players" msgstr "Giocatori" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 msgid "Please confirm..." msgstr "Per favore confermare..." @@ -3835,23 +3884,23 @@ msgstr "Si prega di creare un prospettiva prima di salvare" msgid "Plus-Minus" msgstr "Più-Meno" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Polish" msgstr "Polacco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 1" msgstr "Porta 1:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 2" msgstr "Porta 2:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Port 3" msgstr "Porta 3:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 msgid "Port 4" msgstr "Porta 4:" @@ -3860,11 +3909,11 @@ msgstr "Porta 4:" msgid "Port :" msgstr "Porta:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese" msgstr "Portoghese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" msgstr "Portoghese (Brasiliano)" @@ -3873,6 +3922,21 @@ msgstr "Portoghese (Brasiliano)" msgid "Post-Processing Effect:" msgstr "Effetti di Post-Processing:" +#: Source/Core/Core/Src/Movie.cpp:735 +#, c-format +msgid "Premature movie end in PlayController. %u + 8 > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:829 +#, c-format +msgid "Premature movie end in PlayWiimote. %u + %d > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:806 +#, c-format +msgid "Premature movie end in PlayWiimote. %u > %u" +msgstr "" + #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "Preimpostazioni: " @@ -3915,7 +3979,7 @@ msgid "Quit" msgstr "Esci" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "R" @@ -3924,7 +3988,7 @@ msgid "R Button" msgstr "Pulsante R" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" msgstr "R-Analogico" @@ -3941,6 +4005,7 @@ msgid "Range" msgstr "Gamma" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "Modalità in Sola-lettura" @@ -4013,6 +4078,7 @@ msgid "Refresh" msgstr "Aggiorna" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "Aggiorna Elenco" @@ -4020,10 +4086,10 @@ msgstr "Aggiorna Elenco" msgid "Refresh game list" msgstr "Aggiorna elenco giochi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 msgid "Remove" msgstr "Rimuovi" @@ -4042,6 +4108,7 @@ 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 msgid "Reset" msgstr "Resetta" @@ -4064,15 +4131,15 @@ msgid "Right Stick" msgstr "Levetta Destra" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Vibrazione" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 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:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "Russo" @@ -4084,7 +4151,7 @@ msgstr "Sa&lva Stato di Gioco" msgid "Safe" msgstr "Accurata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Sample Rate:" msgstr "Frequenza di Campionamento:" @@ -4099,34 +4166,42 @@ msgid "Save GCI as..." msgstr "Salva GCI come.." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 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 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 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 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 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 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 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 msgid "Save State Slot 8" msgstr "Salva Stato di Gioco nell'Ingresso 8" @@ -4134,12 +4209,12 @@ msgstr "Salva Stato di Gioco nell'Ingresso 8" msgid "Save State..." msgstr "Salva Stato di Gioco..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "Salva come..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "Salva GCM/ISO compressi" @@ -4147,11 +4222,11 @@ msgstr "Salva GCM/ISO compressi" msgid "Save current perspective" msgstr "Salva prospettiva corrente" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "Salva GCM/ISO decompressi" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..." @@ -4161,16 +4236,16 @@ msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..." msgid "Scaled EFB Copy" msgstr "Scala Copie EFB" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, fuzzy, c-format msgid "Scanning %s" msgstr "Ricerca..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "Ricerca ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "Ricerca..." @@ -4186,7 +4261,7 @@ msgstr "Bloc Scroll" msgid "Search Filter" msgstr "Filtro di Ricerca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "Cerca nelle Sottocartelle" @@ -4201,12 +4276,12 @@ msgstr "Sezione %s non trovata in SYSCONF" msgid "Select" msgstr "Seleziona" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Seleziona il File di Registrazione" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 msgid "Select a Wii WAD file to install" msgstr "Seleziona un file WAD Wii da installare" @@ -4232,15 +4307,15 @@ msgstr "Seleziona finestre libere/mobili" msgid "Select the file to load" msgstr "Seleziona il file da caricare" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Seleziona il file di salvataggio" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Seleziona lo stato di gioco da caricare" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Seleziona lo stato di gioco da salvare" @@ -4298,11 +4373,11 @@ msgstr "Posizione della Barra a Sensori: " msgid "Separator" msgstr "Separatore" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "Serbo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4313,7 +4388,7 @@ msgstr "" msgid "Set" msgstr "Imposta" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "Imposta come ISO &predefinita" @@ -4329,11 +4404,11 @@ msgstr "" "SetARCode_IsActive: Indice troppo grande rispetto alla dimensione " "dell'elenco dei codici AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." msgstr "Impostazioni..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Impossible trovare il file per le impostazioni" @@ -4341,7 +4416,7 @@ msgstr "SetupWiiMem: Impossible trovare il file per le impostazioni" msgid "Shake" msgstr "Scuoti" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "Nome breve:" @@ -4403,7 +4478,7 @@ msgstr "Mostra JAP" msgid "Show Korea" msgstr "Mostra Corea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "Mostra Lingua:" @@ -4444,11 +4519,11 @@ msgstr "Mostra Wad" msgid "Show Wii" msgstr "Mostra Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 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:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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 " @@ -4507,15 +4582,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote in posizione di traverso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Cinese Semplificato" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "Dimensioni" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 #, fuzzy msgid "Skip BIOS" msgstr "Salta Caricamento BIOS GC" @@ -4553,11 +4628,11 @@ msgstr "" msgid "Slot %i" msgstr "Ingresso %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 msgid "Slot A" msgstr "Ingresso A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 msgid "Slot B" msgstr "Ingresso B" @@ -4577,7 +4652,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Impostazioni Audio" @@ -4595,9 +4670,9 @@ msgstr "Creazione buffer audio non riuscita: %s" msgid "Space" msgstr "Spazio" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Spanish" msgstr "Spagnolo" @@ -4633,7 +4708,7 @@ msgstr "Levetta Quadrata" msgid "Standard Controller" msgstr "Controller Standard" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4648,14 +4723,16 @@ msgid "Start Re&cording" msgstr "Avvia Re&gistrazione" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "Avvia Registrazione" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "Stato" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "Stati di Gioco" @@ -4666,6 +4743,7 @@ msgstr "Levetta" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Arresta" @@ -4704,8 +4782,8 @@ msgstr "Seleziona il file di salvataggio" msgid "Swing" msgstr "Ruota/Oscilla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "Lingua di Sistema:" @@ -4738,9 +4816,14 @@ msgstr "Semipiano destro" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" msgstr "Genera un'Istantanea di Gioco" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "Prova" @@ -4771,13 +4854,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:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "The chosen directory is already in the list" msgstr "La directory scelta è già in lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, c-format msgid "" "The file %s already exists.\n" @@ -4863,7 +4946,7 @@ msgstr "il file \"%s\" specificato non esiste" msgid "The value is invalid" msgstr "Il valore non è valido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "Tema" @@ -4895,7 +4978,7 @@ msgid "" msgstr "" "Questo simulatore di action replay non supporta codici automodificanti." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 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 " @@ -4912,7 +4995,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -4930,11 +5013,11 @@ msgstr "" "Scorciatoia da Tastiera : Tenere premuto per disabilitare " "istantaneamente l'Autoregolazione." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Questo è usato per riprodurre tracce e brani musicali, come BGM." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4963,7 +5046,7 @@ msgid "Tilt" msgstr "Inclina" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr "Titolo" @@ -4978,15 +5061,16 @@ msgstr "Seleziona/Deseleziona tutti i Tipi di Log" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Sopra" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Cinese Tradizionale" @@ -4994,7 +5078,7 @@ msgstr "Cinese Tradizionale" msgid "Tried to load an unknown file type." msgstr "Tentativo di caricamento di un tipo di file sconosciuto." -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "Grilletti" @@ -5010,7 +5094,7 @@ msgstr "" "Tentativo di accesso da una SYSCONF non valida\n" "Gli identificativi Wiimote bt non sono disponibili" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Turkish" msgstr "Turco" @@ -5088,15 +5172,6 @@ msgstr "" "Messaggio sconosciuto avente id:%d ricevuto dal giocatore:%d Giocatore " "espluso!!" -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Puntatore %#08x sconosciuto\n" -"Continuare?" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5111,7 +5186,7 @@ msgstr "Aggiorna" msgid "Upright Wiimote" msgstr "Wiimote in posizione verticale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utilizza Modalità EuRGB60 (PAL60)" @@ -5124,7 +5199,7 @@ msgstr "&Schermo Intero" msgid "Use Hex" msgstr "Usa Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "Avvisi di Errore" @@ -5169,7 +5244,7 @@ msgstr "Valore: " msgid "Verbosity" msgstr "Verboso" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "Video" @@ -5177,7 +5252,7 @@ msgstr "Video" msgid "Virtual" msgstr "Virtuale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "Volume" @@ -5240,6 +5315,41 @@ msgstr "" "la quale presenta un nome uguale ai file sulla tua memcard\n" "Continuare?" +#: Source/Core/Core/Src/Movie.cpp:629 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, 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" +"\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" +"\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" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -5257,15 +5367,15 @@ msgstr "Hack Widescreen" msgid "Width" msgstr "Larghezza" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "Console Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 #, fuzzy msgid "Wii NAND Root:" msgstr "Origine DVD:" @@ -5274,7 +5384,7 @@ msgstr "Origine DVD:" msgid "Wii Save Import" msgstr "Importa Salvataggi Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 msgid "Wii save files (*.bin)|*.bin" msgstr "Salva i file Wii (*.bin)|*.bin" @@ -5305,7 +5415,7 @@ msgstr "" " o forse è dovuto ad altri motivi. \n" "Vuoi riconnettersi immediatamente?" -#: Source/Core/DolphinWX/Src/Main.cpp:599 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Wiimote Connected" msgstr "Wiimote Collegato" @@ -5338,9 +5448,9 @@ msgstr "Windows Destro" msgid "Word Wrap" msgstr "Adatta Testo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Working..." msgstr "Attività in corso..." @@ -5401,7 +5511,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:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 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." @@ -5425,7 +5535,7 @@ msgstr "" "Dovrebbe essere 0x%04x (invece di 0x%04llx)\n" "Desideri generarne uno nuovo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "Hack ZTP" @@ -5479,7 +5589,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5496,7 +5606,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:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Lettura Opcode da %x. Per favore segnalare." @@ -5517,7 +5627,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "cmd 0x%08x sconosciuto" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "valore wxExecute ritornato -1 su applicazione in esecuzione!" @@ -6431,6 +6541,13 @@ msgstr "| OR" #~ msgid "Type %d config not supported in plugin %s" #~ msgstr "Tipo config %d non supportato dal plugin %s" +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "Puntatore %#08x sconosciuto\n" +#~ "Continuare?" + #~ msgid "Update Screen" #~ msgstr "Aggiornamento dello schermo" diff --git a/Languages/po/ja.po b/Languages/po/ja.po index 9087eb6011..d0e94ebb39 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: 2011-10-11 23:25-0500\n" +"POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-12 20:45+0900\n" "Last-Translator: DanbSky\n" "Language-Team: \n" @@ -49,9 +49,9 @@ msgstr "\"%s\" ã¯ç„¡åŠ¹ãªãƒ•ã‚¡ã‚¤ãƒ«ã€ã¾ãŸã¯ã‚²ãƒ¼ãƒ ã‚­ãƒ¥ãƒ¼ãƒ–ï¼Wii msgid "%1$sCopy%1$s" msgstr "%1$s コピー %1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -179,11 +179,11 @@ msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ç·¨é›†ãƒ„ール(&C)" msgid "&DSP Settings" msgstr "サウンド設定(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“を削除(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 msgid "&Delete selected ISOs..." msgstr "é¸æŠžã—ãŸã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ã‚’å…¨ã¦å‰Šé™¤(&D)" @@ -247,7 +247,7 @@ msgstr "一時åœæ­¢(&P)" msgid "&Play" msgstr "開始(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "プロパティ(&P)" @@ -291,7 +291,7 @@ msgstr "表示(&V)" msgid "&Wiimote Settings" msgstr "Wii入力設定(&W)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "å…¬å¼Wiki(英語)ã§å‹•ä½œçŠ¶æ³ã‚’確èª(&W)" @@ -340,10 +340,11 @@ msgid "" msgstr "ãªã—" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "入力を待機..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "＜システムã®è¨€èªžï¼ž" @@ -398,8 +399,8 @@ msgstr "" "\n" "TCPãƒãƒ¼ãƒˆã®é–‹æ”¾ã‚’忘れãšã«ï¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "Triforce基æ¿" @@ -438,6 +439,7 @@ msgstr "" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€Texture】をé¸æŠžã—ãŸã¾ã¾ã«ã—ã¦ãã ã•ã„。" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 msgid "Action" msgstr "動作" @@ -536,11 +538,11 @@ msgstr "ビデオカード：" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "コードを追加" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "パッãƒã‚’追加" @@ -548,9 +550,9 @@ msgstr "パッãƒã‚’追加" msgid "Add new pane" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Add..." msgstr "追加" @@ -600,7 +602,7 @@ msgstr "ボタンãŒåå¿œã™ã‚‹æ„Ÿåº¦ã‚’調整ã—ã¾ã™" msgid "Advanced" msgstr "高度ãªè¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "高度ãªè¨­å®š" @@ -608,28 +610,28 @@ msgstr "高度ãªè¨­å®š" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "å…¨ã¦ã® GC/Wii ファイル (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "å…¨ã¦ã® GC/Wii イメージ (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "GC GCMファイル (gcm)|*.gcm" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "å…¨ã¦ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイル (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "Wii ISOファイル (iso)|*.iso" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "圧縮ã•ã‚ŒãŸGC/Wii ISOファイル (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ« (*.*)|*.*" @@ -666,7 +668,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Apploader ファイルã‹ã‚‰èª­ã¿è¾¼ã‚€ã“ã¨ãŒã§ãã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "Apploader" @@ -684,7 +686,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€ã‚ªãƒ•ã€‘ã‚’é¸æŠžã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "アラビア語" @@ -693,7 +695,7 @@ msgstr "アラビア語" msgid "Are you sure you want to delete \"%s\"?" msgstr "\"%s\" ã“ã®ãƒ—ロファイルを削除ã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -701,11 +703,11 @@ msgstr "" "ã“れら複数ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ファイルを削除ã—ã¾ã™ã‹ï¼Ÿ\n" "å…ƒã«æˆ»ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ファイルを削除ã—ã¾ã™ã‹ï¼Ÿå…ƒã«æˆ»ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "アスペクト比：" @@ -714,11 +716,11 @@ msgstr "アスペクト比：" msgid "At least one pane must remain open." msgstr "At least one pane must remain open." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "サウンド" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" msgstr "出力API (Audio Backend)" @@ -726,7 +728,7 @@ msgstr "出力API (Audio Backend)" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error opening AO device.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" @@ -769,7 +771,7 @@ msgstr "" msgid "Back" msgstr "Back" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" msgstr "出力設定" @@ -779,7 +781,7 @@ msgid "Backend:" msgstr "æç”»API：" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰å…¥åŠ›ã‚’許å¯" @@ -792,15 +794,15 @@ msgid "Bad File Header" msgstr "ファイルヘッダã®ä¸è‰¯" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr "ãƒãƒŠãƒ¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "ãƒãƒŠãƒ¼ã®è©³ç´°" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "ãƒãƒŠãƒ¼è¡¨ç¤º" @@ -812,7 +814,7 @@ msgstr "ãƒãƒ¼" msgid "Basic" msgstr "基本設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "基本設定" @@ -841,7 +843,7 @@ msgid "Blue Right" msgstr "é’ - å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "下部" @@ -850,7 +852,7 @@ msgstr "下部" msgid "Bound Controls: %lu" msgstr "コマンド数: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "ダメダメ" @@ -858,7 +860,7 @@ msgstr "ダメダメ" msgid "Browse" msgstr "フォルダ追加" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "ゲームリストã«è¿½åŠ ã™ã‚‹ãƒ•ã‚©ãƒ«ãƒ€ã‚’é¸æŠžã—ã¦ãã ã•ã„" @@ -866,7 +868,7 @@ msgstr "ゲームリストã«è¿½åŠ ã™ã‚‹ãƒ•ã‚©ãƒ«ãƒ€ã‚’é¸æŠžã—ã¦ãã ã•ã„ msgid "Browse for an ISO directory..." msgstr "ISOã®ã‚るフォルダをブラウズ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "出力先をé¸æŠž" @@ -874,7 +876,7 @@ msgstr "出力先をé¸æŠž" msgid "Buffer:" msgstr "ãƒãƒƒãƒ•ã‚¡ï¼š" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -884,11 +886,11 @@ msgstr "ボタン" msgid "C Stick" msgstr "C-スティック" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "C-スティック" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "CPUエミュレーション方å¼" @@ -938,15 +940,11 @@ msgstr "キャンセル" msgid "Cannot open %s" msgstr "%s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "読ã¿è¾¼ã¿å°‚用設定ã®ãŸã‚録画ä¸å¯" - #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "Cannot unregister events with events pending" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -957,7 +955,7 @@ msgstr "" "%s\n" "ã“ã‚Œã¯ä¸æ­£ãªãƒ¡ãƒ¢ãƒªãƒ¼ã‚«ãƒ¼ãƒ‰ãƒ‡ãƒ¼ã‚¿ã§ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -986,7 +984,7 @@ msgstr "DVD_Pluginã‹ã‚‰ã®èª­ã¿è¾¼ã¿ãŒä¸å¯èƒ½ - DVD-Interface: 致命的 msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "カタルーニャ語" @@ -1004,6 +1002,7 @@ msgid "Change &Disc..." msgstr "ディスクã®å…¥ã‚Œæ›¿ãˆ(&D)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "ディスクã®å…¥ã‚Œæ›¿ãˆ" @@ -1011,7 +1010,7 @@ msgstr "ディスクã®å…¥ã‚Œæ›¿ãˆ" msgid "Change Game" msgstr "ゲームを変更" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1029,8 +1028,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:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "ã“ã®è¨­å®šã¯æ¬¡å›žã®ã‚²ãƒ¼ãƒ é–‹å§‹æ™‚ã«å映ã•ã‚Œã¾ã™ï¼" @@ -1050,31 +1049,31 @@ msgstr "コードサーãƒ" msgid "Cheats Manager" msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ç·¨é›†ãƒ„ール" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "簡体字中国語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "ç¹ä½“字中国語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "DVDルートフォルダをé¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Choose a NAND root directory:" msgstr "NANDã®ã‚るルートフォルダをé¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "ディスクãƒãƒ£ãƒ³ãƒãƒ«ã«è¡¨ç¤ºã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã‚’é¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "追加ã—ãŸã„フォルダをé¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "メモリーカードをé¸æŠž" @@ -1082,7 +1081,7 @@ msgstr "メモリーカードをé¸æŠž" msgid "Choose a memory card:" msgstr "メモリーカードをé¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1090,8 +1089,8 @@ msgstr "" "apploaderã¨ã—ã¦ä½¿ç”¨ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠžï¼š(フォルダã‹ã‚‰ã®ã¿æ§‹ç¯‰ã•ã‚ŒãŸãƒ‡ã‚£ã‚¹ã‚¯ã«" "é©ç”¨ã•ã‚Œã¾ã™)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "抽出先ã®ãƒ•ã‚©ãƒ«ãƒ€ã‚’é¸æŠž" @@ -1110,7 +1109,7 @@ msgstr "クラシックコントローラ" msgid "Clear" msgstr "全消去" -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." msgstr "クリアã«å¤±æ•—" @@ -1124,7 +1123,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "é–‰ã˜ã‚‹" @@ -1149,20 +1148,20 @@ msgstr "Command" msgid "Comment" msgstr "コメント" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "ゲーム紹介" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã‚’圧縮" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "é¸æŠžã—ãŸISOファイルを全ã¦åœ§ç¸®" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "圧縮ã—ã¦ã„ã¾ã™..." @@ -1189,13 +1188,13 @@ msgstr "パッド設定" msgid "Configure..." msgstr "Dolphin本体ã®è¨­å®šã‚’è¡Œã„ã¾ã™" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "ファイルã®ä¸Šæ›¸ãを確èª" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Confirm on Stop" msgstr "動作åœæ­¢æ™‚ã«ç¢ºèª" @@ -1204,7 +1203,7 @@ msgstr "動作åœæ­¢æ™‚ã«ç¢ºèª" msgid "Connect" msgstr "接続" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "USBキーボードã®æŽ¥ç¶šã‚’エミュレート" @@ -1214,22 +1213,26 @@ msgid "Connect Wiimote %i" msgstr "%iPã®Wii リモコンを接続ï¼åˆ‡æ–­" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "1Pã®Wii リモコンを接続ï¼åˆ‡æ–­" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "2Pã®Wii リモコンを接続ï¼åˆ‡æ–­" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "3Pã®Wii リモコンを接続ï¼åˆ‡æ–­" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "4Pã®Wii リモコンを接続ï¼åˆ‡æ–­" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Connecting..." msgstr "接続中..." @@ -1254,7 +1257,7 @@ msgstr "コピーã«å¤±æ•—" msgid "Copy to Memcard %c" msgstr "メモリーカード%cã«ã‚³ãƒ”ー" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "コア" @@ -1284,7 +1287,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "ISOファイル %s ã‚’èªè­˜ã§ãã¾ã›ã‚“ã§ã—ãŸ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "%s をセーブã§ãã¾ã›ã‚“ã§ã—ãŸ" @@ -1310,7 +1313,7 @@ msgstr "" "Dolphinã‚’CD/DVDã‹ã‚‰èµ·å‹•ã—ã¦ã„ã‚‹ã‹ã€ã‚»ãƒ¼ãƒ–ファイルãŒèª­ã¿å–り専用ã«ãªã£ã¦ã„ã¾ã›" "ã‚“ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "æ‹¡å¼µå­'ini'ã«å¯¾ã—ã¦é–¢é€£ä»˜ã‘られã¦ã„るプログラムãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ï¼" @@ -1327,7 +1330,7 @@ msgstr "" msgid "Count:" msgstr "該当：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "発売国" @@ -1341,21 +1344,21 @@ msgstr "アクションリプレイコードを作æˆ" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr "Created by KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr "Created by VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Created by black_rider and published on ForumW.org > Web Developments" @@ -1391,7 +1394,7 @@ msgstr "クロスフェーダー" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "カレントフォルダ㯠wxFileSelector ã®å¾Œã« %s ã‹ã‚‰ %s ã«å¤‰æ›´ã•ã‚Œã¾ã—ãŸï¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" msgstr "Custom Projection Hack" @@ -1399,15 +1402,15 @@ msgstr "Custom Projection Hack" msgid "Custom Projection Hack Settings" msgstr "Custom Projection Hack Settings" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." msgstr "設定画é¢ã«å…¥ã‚Šã¾ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "ãƒã‚§ã‚³èªž" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "å字キー" @@ -1415,24 +1418,24 @@ msgstr "å字キー" msgid "DSP" msgstr "サウンド" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP Emulator Engine" msgstr "DSPエミュレーション方å¼" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP HLE emulation (fast)" msgstr "DSP-HLE エミュレーション (高速)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP LLE interpreter (slow)" msgstr "DSP-LLE インタプリタ (低速)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP LLE on Thread" msgstr "DSP-LLEを別スレッドã§å®Ÿè¡Œ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "DSP-LLE リコンパイラ" @@ -1440,7 +1443,7 @@ msgstr "DSP-LLE リコンパイラ" msgid "DSP settings" msgstr "サウンドã«é–¢ã™ã‚‹è¨­å®šã‚’è¡Œã„ã¾ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "DVDルート" @@ -1448,7 +1451,7 @@ msgstr "DVDルート" msgid "Data Size" msgstr "データサイズ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "発売日" @@ -1477,16 +1480,16 @@ msgstr "デãƒãƒƒã‚°ç”¨é …ç›®" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "ISOファイルを解å‡" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "é¸æŠžã—ãŸISOファイルを全ã¦è§£å‡" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "解å‡ä¸­..." @@ -1494,7 +1497,7 @@ msgstr "解å‡ä¸­..." msgid "Default" msgstr "既定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "デフォルトISO" @@ -1539,8 +1542,8 @@ msgstr "" msgid "Device" msgstr "デãƒã‚¤ã‚¹" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "デãƒã‚¤ã‚¹è¨­å®š" @@ -1624,7 +1627,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "Disc" @@ -1651,11 +1654,11 @@ msgstr "" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 msgid "Do you want to stop the current emulation?" msgstr "動作中ã®ã‚²ãƒ¼ãƒ ã‚’åœæ­¢ã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "Dolphin" @@ -1680,12 +1683,12 @@ msgstr "Wii リモコンã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³è¨­å®š" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "GCコントローラ設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS ムービー (*.dtm)" @@ -1697,7 +1700,7 @@ msgstr "Wiiリモコンã®è¨­å®š" msgid "Dolphin at &Google Code" msgstr "Dolphin 開発状æ³(&G)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1705,7 +1708,7 @@ msgstr "" "リストã«ä½•ã‚‚ã‚ã‚Šã¾ã›ã‚“。ã“ã®æ–‡ç« ã‚’ダブルクリックã—㦠GC/Wii ã®ISOファイルã¾ãŸ" "ã¯WADファイルã®ã‚るフォルダをé¸æŠžã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1735,7 +1738,7 @@ msgstr "ドラムコントローラ" msgid "Dummy" msgstr "ダミーデãƒã‚¤ã‚¹" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "サウンドã®ãƒ€ãƒ³ãƒ—" @@ -1782,9 +1785,9 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "オランダ語" @@ -1836,8 +1839,8 @@ msgstr "パッãƒã‚’編集" msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "編集" @@ -1849,7 +1852,7 @@ msgstr "エフェクト" msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer (内蔵フレームãƒãƒƒãƒ•ã‚¡)" -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "エミュレーションスレッドã¯ã™ã§ã«ç¨¼åƒä¸­ã§ã™" @@ -1888,7 +1891,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wii リモコンをエミュレート" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "動作状æ³ï¼š" @@ -1916,7 +1919,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "アクションリプレイコードã®ãƒ­ã‚°ã‚’å–å¾—ã™ã‚‹" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "Enable Audio Throttle" @@ -1928,15 +1931,19 @@ msgstr "Enable BAT" msgid "Enable Block Merging" msgstr "Enable Block Merging" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Enable Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Cheats" msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ã‚’有効化" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "Enable DTK Music" @@ -1944,7 +1951,7 @@ msgstr "Enable DTK Music" msgid "Enable Dual Core" msgstr "Enable Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "デュアルコア動作を行ㆠ(速度å‘上)" @@ -1956,7 +1963,7 @@ msgstr "ホットキーを使用" msgid "Enable Idle Skipping" msgstr "Enable Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "アイドルスキップ処ç†ã‚’行ㆠ(速度å‘上)" @@ -1969,7 +1976,7 @@ msgstr "Enable MMU" msgid "Enable Progressive Scan" msgstr "プログレッシブ表示を有効化" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Enable Screen Saver" msgstr "スクリーンセーãƒãƒ¼ã‚’有効化" @@ -2030,7 +2037,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2048,7 +2055,7 @@ msgstr "" "ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ç²¾åº¦ãŒå‘上ã—ã¾ã™[有効ï¼äº’æ›æ€§é‡è¦–,ï¼ç„¡åŠ¹ï¼å‹•ä½œ" "速度å‘上]" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" msgstr "Enables Custom Projection Hack" @@ -2086,9 +2093,9 @@ msgstr "" msgid "End" msgstr "End" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "英語" @@ -2117,16 +2124,30 @@ msgstr "ã«ä¸€è‡´ã™ã‚‹" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "エラー" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "é¸æŠžã—ãŸè¨€èªžã®èª­ã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸã€‚＜システムã®è¨€èªžï¼žã«è¨­å®šã‚’戻ã—ã¾ã™" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2160,11 +2181,12 @@ msgstr "Dolphinを終了" msgid "Export Failed" msgstr "エクスãƒãƒ¼ãƒˆã«å¤±æ•—" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "ファイルを抽出" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "録画ファイルã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ" @@ -2176,7 +2198,7 @@ msgstr "録画ファイルã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ" msgid "Export Save" msgstr "セーブデータをエクスãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "セーブデータをエクスãƒãƒ¼ãƒˆ (実験的)" @@ -2208,44 +2230,44 @@ msgstr "特殊パラメータ" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "『メトロイド Other Mã€ã®ã¿ã«æœ‰åŠ¹ãªè¨­å®šã§ã™" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "Apploaderを抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "DOLを抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "ã“ã®ãƒ•ã‚©ãƒ«ãƒ€ã‚’抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "ã“ã® Partition を抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "%s を抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’エクスãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "フォルダをエクスãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "抽出中" @@ -2261,7 +2283,7 @@ msgstr "FIFO プレーヤー" msgid "FRANCE" msgstr "フランス" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "FSTサイズ" @@ -2277,7 +2299,7 @@ msgstr "Listenã«å¤±æ•—ï¼" msgid "Failed to download codes." msgstr "見ã¤ã‹ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "%s ã¸ã®æŠ½å‡ºã«å¤±æ•—" @@ -2452,11 +2474,11 @@ msgstr "圧縮ã•ã‚Œã¦ã„ãªã„ファイル" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Unknown open mode : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "構造" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr " 'ini' ã¯ä¸æ˜Žãªæ‹¡å¼µå­ã§ã™ã€‚é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“ï¼" @@ -2476,7 +2498,7 @@ msgstr "Force 16:9" msgid "Force 4:3" msgstr "Force 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Force Console as NTSC-J" msgstr "コンソールを日本å‘ã‘ (NTSC-J) ã«è¨­å®š" @@ -2510,7 +2532,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2543,6 +2565,7 @@ msgid "Frame " msgstr "フレーム" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "Frame Advance" @@ -2558,7 +2581,7 @@ msgstr "フレームã®ç¯„囲" msgid "Frame S&kipping" msgstr "フレームスキップ(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "フレームリミット：" @@ -2570,9 +2593,9 @@ msgstr "録画フレーム数設定" msgid "Free Look" msgstr "フリールック" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "French" msgstr "フランス語" @@ -2597,11 +2620,16 @@ msgstr "フルスクリーン表示時解åƒåº¦ï¼š" msgid "GCI File(*.gci)" msgstr "GCI ファイル (*.gci)" +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +#, fuzzy +msgid "GCMic Configuration" +msgstr "ログã®è¨­å®š" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "入力(GC)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "ゲームID" @@ -2617,7 +2645,7 @@ msgstr "ゲームãŒèµ·å‹•ã—ã¦ã„ã¾ã›ã‚“ï¼" msgid "Game not found!!" msgstr "ゲームãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "固有設定" @@ -2625,7 +2653,7 @@ msgstr "固有設定" msgid "GameConfig" msgstr "ゲーム設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "ゲームキューブ" @@ -2634,7 +2662,7 @@ msgid "Gamecube &Pad Settings" msgstr "ゲームキューブ入力設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "メモリーカードファイル (*.raw,*.gcp)|*.raw;*.gcp" @@ -2657,7 +2685,8 @@ msgstr "" "(コードã«å•é¡ŒãŒã‚ã‚‹ã‹ã€ã¾ã ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„タイプã®ã‚³ãƒ¼ãƒ‰ã§ã™)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -2666,9 +2695,9 @@ msgstr "一般" msgid "General Settings" msgstr "一般" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "German" msgstr "ドイツ語" @@ -2706,7 +2735,7 @@ msgstr "" "動作速度ã¯å°‘々低下ã—ã€ã¾ã‚Œã«æç”»ãƒã‚°ã®åŽŸå› ã«ã‚‚ãªã‚‹ã“ã¨ã‚‚ã‚ã‚Šã¾ã™ã€‚\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’外ã•ãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" msgstr "ギリシア語" @@ -2738,7 +2767,7 @@ msgstr "高速化(Hacks)" msgid "Header checksum failed" msgstr "ヘッダã®ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã«å¤±æ•—" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hebrew" msgstr "ヘブライ語" @@ -2800,11 +2829,12 @@ msgid "Hotkey Configuration" msgstr "ホットキーã®è¨­å®š" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 msgid "Hotkeys" msgstr "ホットキー" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hungarian" msgstr "ãƒãƒ³ã‚¬ãƒªãƒ¼èªž" @@ -2834,7 +2864,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - bad destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "IPL設定" @@ -2850,11 +2880,11 @@ msgstr "IR ãƒã‚¤ãƒ³ã‚¿" msgid "IR Sensitivity:" msgstr "感度" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "ゲームã®è©³ç´°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "フォルダ一覧" @@ -2866,13 +2896,19 @@ msgstr "イタリア" msgid "Icon" msgstr "アイコン" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "FPSãŒå®‰å®šã—ãªã„ゲームã§åŠ¹æžœãŒã‚ã‚Šã¾ã™ [有効ï¼äº’æ›æ€§å‘上ï¼ç„¡åŠ¹ï¼å‹•ä½œé€Ÿåº¦å‘上]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 msgid "" "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." @@ -2965,7 +3001,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "ソコソコ" @@ -2994,7 +3030,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "ã“ã“ã«æš—å·åŒ–or復å·åŒ–ã•ã‚ŒãŸã‚³ãƒ¼ãƒ‰ã‚’貼り付ã‘ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "SDカードã®æŒ¿å…¥ã‚’エミュレート" @@ -3006,7 +3042,7 @@ msgstr "コードåを入力ã—ã¦ãã ã•ã„" msgid "Install WAD" msgstr "Wiiメニューã«WADファイルを追加" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 msgid "Install to Wii Menu" msgstr "Wiiメニューã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«" @@ -3017,23 +3053,23 @@ msgstr "" "InstallExceptionHandler ãŒå‘¼ã³å‡ºã•ã‚Œã¾ã—ãŸãŒã€ã“ã®ãƒ—ラットフォームã¯ã¾ã ã‚µ" "ãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 msgid "Installing WAD..." msgstr "WADファイルを追加ã—ã¦ã„ã¾ã™..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 msgid "Interface" msgstr "表示" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "Dolphinã®è¡¨ç¤ºã«é–¢ã™ã‚‹è¨­å®š" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "Internal LZO Error - 圧縮ã«å¤±æ•—" -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3042,7 +3078,7 @@ msgstr "" "Internal LZO Error - 復元ã«å¤±æ•— (%d) (%li, %li) \n" "ã‚‚ã†ä¸€åº¦ãƒ­ãƒ¼ãƒ‰ã‚’試ã—ã¦ã¿ã¦ãã ã•ã„" -#: Source/Core/Core/Src/State.cpp:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "Internal LZO Error - lzo_init() failed" @@ -3050,11 +3086,11 @@ msgstr "Internal LZO Error - lzo_init() failed" msgid "Internal Resolution:" msgstr "内部解åƒåº¦ã®å¤‰æ›´ï¼š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "インタプリタ (éžæŽ¨å¥¨)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "イントロ" @@ -3071,7 +3107,7 @@ msgstr "無効ãªå€¤ã§ã™ï¼" msgid "Invalid bat.map or dir entry" msgstr "Invalid bat.map or dir entry" -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "Invalid event type %i" @@ -3091,17 +3127,17 @@ msgstr "" "%s\n" " ã“ã®ã‚²ãƒ¼ãƒ ã‚’ダンプã—ãªãŠã—ã¦ãã ã•ã„" -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "ä¸æ­£ãªéŒ²ç”»ãƒ•ã‚¡ã‚¤ãƒ«" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "ä¸æ­£ãªã‚»ãƒ¼ãƒ–ï¼ãƒ­ãƒ¼ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Italian" msgstr "イタリア語" @@ -3109,16 +3145,16 @@ msgstr "イタリア語" msgid "JAPAN" msgstr "日本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "JIT リコンパイラ (推奨)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "JITIL リコンパイラ (実験的)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Japanese" msgstr "日本語" @@ -3127,16 +3163,17 @@ msgid "KOREA" msgstr "韓国" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "キー設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Korean" msgstr "韓国語" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "L" @@ -3145,11 +3182,11 @@ msgid "L Button" msgstr "Lボタン" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" msgstr "L (åŠæŠ¼ã—)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "GUI言語：" @@ -3172,6 +3209,7 @@ msgid "Left Stick" msgstr "左スティック" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3201,7 +3239,7 @@ msgstr "" msgid "Less Than" msgstr "よりå°ã•ã„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "FPSã«ã‚ˆã‚‹åˆ¶é™ã‚’有効化" @@ -3214,34 +3252,42 @@ msgid "Load Custom Textures" msgstr "カスタムテクスãƒãƒ£ã‚’読ã¿è¾¼ã‚€" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 1" msgstr "ステートロード - スロット 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 2" msgstr "ステートロード - スロット 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 3" msgstr "ステートロード - スロット 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 4" msgstr "ステートロード - スロット 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 msgid "Load State Slot 5" msgstr "ステートロード - スロット 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Load State Slot 6" msgstr "ステートロード - スロット 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Load State Slot 7" msgstr "ステートロード - スロット 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Load State Slot 8" msgstr "ステートロード - スロット 8" @@ -3249,11 +3295,11 @@ msgstr "ステートロード - スロット 8" msgid "Load State..." msgstr "ファイルã‹ã‚‰ãƒ­ãƒ¼ãƒ‰" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Wiiメニューを起動" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wiiメニューを起動 ( ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š%d %c )" @@ -3281,7 +3327,7 @@ msgstr "è¦å®šã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ« (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "ローカル" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Lock Threads to Cores" msgstr "スレッドをコア数ã«åˆã‚ã›ã¦å›ºå®š" @@ -3336,16 +3382,16 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark セーブファイル(*.gcs)" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "コントロールスティック" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "メーカーID" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "メーカー" @@ -3367,7 +3413,7 @@ msgid "Memory Byte" msgstr "メモリãƒã‚¤ãƒˆ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 msgid "Memory Card" msgstr "メモリーカード" @@ -3402,7 +3448,7 @@ msgstr "メモリカードã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚µã‚¤ã‚ºãŒã€ãƒ˜ãƒƒãƒ€ã®ã‚µã‚¤ã‚ºã« msgid "Menu" msgstr "メニュー" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "マイク" @@ -3415,7 +3461,7 @@ msgstr "最å°" msgid "Misc" msgstr "ãã®ä»–" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "ãã®ä»–ã®è¨­å®š" @@ -3445,7 +3491,7 @@ msgid "Motion Plus" msgstr "モーションプラス" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "モーター" @@ -3563,7 +3609,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3602,7 +3648,7 @@ msgstr "ニックãƒãƒ¼ãƒ ï¼š" msgid "No Country (SDK)" msgstr "No Country (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "リストã«é …ç›®ãŒã‚ã‚Šã¾ã›ã‚“ï¼" @@ -3637,7 +3683,7 @@ msgstr "%s ã®ã‚»ãƒ¼ãƒ–フォルダãŒã‚ã‚Šã¾ã›ã‚“" msgid "None" msgstr "ãªã—" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" msgstr "ノルウェー語" @@ -3645,16 +3691,16 @@ msgstr "ノルウェー語" msgid "Not Equal" msgstr "ã«ä¸€è‡´ã—ãªã„" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "未確èª" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Not connected" msgstr "未接続" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "ノート" @@ -3696,7 +3742,7 @@ msgstr "オブジェクト" msgid "Object Range" msgstr "オブジェクトã®ç¯„囲" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "オフ" @@ -3711,14 +3757,15 @@ msgstr "残り %d ブロックã—ã‹ã‚ã‚Šã¾ã›ã‚“ï¼" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "é–‹ã" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "実体ã®ã‚るフォルダを開ã(&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "セーブデータã®ã‚るフォルダを開ã(&S)" @@ -3757,7 +3804,7 @@ msgid "Opens the logger" msgstr "ログ画é¢ã‚’é–‹ã" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "設定" @@ -3837,12 +3884,12 @@ msgstr "パーティション %i" msgid "Patches" msgstr "パッãƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "フォルダ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "一時åœæ­¢" @@ -3851,7 +3898,7 @@ msgstr "一時åœæ­¢" msgid "Per-Pixel Lighting" msgstr "Per-Pixel Lighting" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "カンペキï¼" @@ -3862,20 +3909,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 msgid "Play" msgstr "開始" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "録画ファイルをå†ç”Ÿ" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "開始ï¼ä¸€æ™‚åœæ­¢" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "サクサク" @@ -3887,7 +3936,7 @@ msgstr "å†ç”Ÿã‚ªãƒ—ション" msgid "Players" msgstr "プレイヤー一覧" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 msgid "Please confirm..." msgstr "確èª" @@ -3899,23 +3948,23 @@ msgstr "" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Polish" msgstr "ãƒãƒ¼ãƒ©ãƒ³ãƒ‰èªž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 1" msgstr "ãƒãƒ¼ãƒˆ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 2" msgstr "ãƒãƒ¼ãƒˆ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Port 3" msgstr "ãƒãƒ¼ãƒˆ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 msgid "Port 4" msgstr "ãƒãƒ¼ãƒˆ 4" @@ -3924,11 +3973,11 @@ msgstr "ãƒãƒ¼ãƒˆ 4" msgid "Port :" msgstr "ãƒãƒ¼ãƒˆ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese" msgstr "ãƒãƒ«ãƒˆã‚¬ãƒ«èªž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" msgstr "ブラジル語" @@ -3936,6 +3985,21 @@ msgstr "ブラジル語" msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" +#: Source/Core/Core/Src/Movie.cpp:735 +#, c-format +msgid "Premature movie end in PlayController. %u + 8 > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:829 +#, c-format +msgid "Premature movie end in PlayWiimote. %u + %d > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:806 +#, c-format +msgid "Premature movie end in PlayWiimote. %u > %u" +msgstr "" + #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "プリセット：" @@ -3978,7 +4042,7 @@ msgid "Quit" msgstr "終了" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "R" @@ -3987,7 +4051,7 @@ msgid "R Button" msgstr "Rボタン" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" msgstr "R (åŠæŠ¼ã—)" @@ -4004,6 +4068,7 @@ msgid "Range" msgstr "å¼·ã•" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "読ã¿è¾¼ã¿å°‚用 有効ï¼ç„¡åŠ¹" @@ -4075,6 +4140,7 @@ msgid "Refresh" msgstr "å†æ›´æ–°" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "ゲームリストをå†æ›´æ–°" @@ -4082,10 +4148,10 @@ msgstr "ゲームリストをå†æ›´æ–°" msgid "Refresh game list" msgstr "ゲームリストをå†æ›´æ–°ã—ã¾ã™" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 msgid "Remove" msgstr "削除" @@ -4104,6 +4170,7 @@ 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 msgid "Reset" msgstr "åˆæœŸåŒ–" @@ -4126,15 +4193,15 @@ msgid "Right Stick" msgstr "å³ã‚¹ãƒ†ã‚£ãƒƒã‚¯" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "振動" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "DSP-LLEã®å‡¦ç†ã‚’別スレッドã«åˆ†é›¢ã—ã¦è¡Œã„ã¾ã™ (éžæŽ¨å¥¨)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "ロシア語" @@ -4146,7 +4213,7 @@ msgstr "ステートセーブ(&V)" msgid "Safe" msgstr "Safe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Sample Rate:" msgstr "サンプルレート" @@ -4161,34 +4228,42 @@ msgid "Save GCI as..." msgstr "セーブデータã®ä¿å­˜å…ˆã‚’é¸æŠž" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 1" msgstr "ステートセーブ - スロット 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 2" msgstr "ステートセーブ - スロット 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 3" msgstr "ステートセーブ - スロット 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 4" msgstr "ステートセーブ - スロット 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 msgid "Save State Slot 5" msgstr "ステートセーブ - スロット 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 msgid "Save State Slot 6" msgstr "ステートセーブ - スロット 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 msgid "Save State Slot 7" msgstr "ステートセーブ - スロット 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 msgid "Save State Slot 8" msgstr "ステートセーブ - スロット 8" @@ -4196,12 +4271,12 @@ msgstr "ステートセーブ - スロット 8" msgid "Save State..." msgstr "ファイルã¨ã—ã¦ä¿å­˜" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "ファイルã¨ã—ã¦ä¿å­˜" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "圧縮ã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã®ä¿å­˜å…ˆã‚’é¸æŠž" @@ -4209,11 +4284,11 @@ msgstr "圧縮ã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã®ä¿å­˜å…ˆã‚’é¸æŠž" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "解å‡ã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã®ä¿å­˜å…ˆã‚’é¸æŠž" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, fuzzy, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Savestate movie %s ã®ç ´æを確èªã—ã¾ã—ãŸã€‚録画を中止ã—ã¦ã„ã¾ã™..." @@ -4222,16 +4297,16 @@ msgstr "Savestate movie %s ã®ç ´æを確èªã—ã¾ã—ãŸã€‚録画を中止㗠msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, c-format msgid "Scanning %s" msgstr "確èªä¸­... .%s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "確èªä¸­..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "確èªä¸­..." @@ -4247,7 +4322,7 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "フィルタリング" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "サブフォルダも検索" @@ -4262,12 +4337,12 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "é¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "録画ファイルをé¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 msgid "Select a Wii WAD file to install" msgstr "追加ã™ã‚‹WADファイルをé¸æŠž" @@ -4293,15 +4368,15 @@ msgstr "" msgid "Select the file to load" msgstr "ロードã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "セーブファイルをé¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "ロードã™ã‚‹ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイルをé¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "ステートセーブã®ä¿å­˜å…ˆã‚’é¸æŠž" @@ -4371,11 +4446,11 @@ msgstr "センサーãƒãƒ¼ã®ä½ç½®" msgid "Separator" msgstr "Separator" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "セルビア語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "シリアルãƒãƒ¼ãƒˆï¼šãƒ–ロードãƒãƒ³ãƒ‰ã‚¢ãƒ€ãƒ—ã‚¿ãªã©ã®ãƒ‡ãƒã‚¤ã‚¹ãŒæŽ¥ç¶šã§ãã¾ã™" @@ -4384,7 +4459,7 @@ msgstr "シリアルãƒãƒ¼ãƒˆï¼šãƒ–ロードãƒãƒ³ãƒ‰ã‚¢ãƒ€ãƒ—ã‚¿ãªã©ã®ãƒ‡ãƒ msgid "Set" msgstr "é©ç”¨" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "Wiiメニュー(ディスクãƒãƒ£ãƒ³ãƒãƒ«)ã«è¡¨ç¤º(&D)" @@ -4400,11 +4475,11 @@ msgstr "" "SetARCode_IsActive: インデックスã®ã‚µã‚¤ã‚ºãŒã‚³ãƒ¼ãƒ‰ãƒªã‚¹ãƒˆã®ã‚µã‚¤ã‚ºã‚’上回ã£ã¦ã„ã¾" "ã™ %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." msgstr "設定" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: 設定ファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" @@ -4412,7 +4487,7 @@ msgstr "SetupWiiMem: 設定ファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" msgid "Shake" msgstr "シェイク" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "通称" @@ -4472,7 +4547,7 @@ msgstr "日本" msgid "Show Korea" msgstr "韓国" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "次ã®è¨€èªžã§è¡¨ç¤º" @@ -4512,11 +4587,11 @@ msgstr "WAD(Wii ウェア)" msgid "Show Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 msgid "Show a confirmation box before stopping a game." msgstr "ゲームåœæ­¢å‰ã«ç¢ºèªã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãŒè¡¨ç¤ºã•ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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 " @@ -4580,15 +4655,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "横æŒã¡(Sideways)ã§ä½¿ç”¨" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "簡体字中国語" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "サイズ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 msgid "Skip BIOS" msgstr "BIOSをスキップ" @@ -4635,11 +4710,11 @@ msgstr "" msgid "Slot %i" msgstr "スロット %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 msgid "Slot A" msgstr "スロットA" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 msgid "Slot B" msgstr "スロットB" @@ -4662,7 +4737,7 @@ msgstr "" "デãƒãƒƒã‚°ç”¨é€”ã¨ã—ã¦ã®ã¿ä¾¿åˆ©ãªã‚‚ã®ã§ã™ã€‚\n" "ãã‚Œã§ã‚‚使用ã—ã¾ã™ã‹ï¼Ÿã‚ˆã分ã‹ã‚‰ãªã‘ã‚Œã°ã€é¸æŠžã—ãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "サウンド設定" @@ -4680,9 +4755,9 @@ msgstr "Sound buffer creation failed: %s" msgid "Space" msgstr "Space" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Spanish" msgstr "スペイン語" @@ -4726,7 +4801,7 @@ msgstr "丸ã¿" msgid "Standard Controller" msgstr "標準コントローラ" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4741,14 +4816,16 @@ msgid "Start Re&cording" msgstr "録画を開始(&C)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "録画を開始" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "動作率" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "ステートセーブï¼ãƒ­ãƒ¼ãƒ‰" @@ -4759,6 +4836,7 @@ msgstr "スティック" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "åœæ­¢" @@ -4802,8 +4880,8 @@ msgstr "セーブファイルã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆã«æˆåŠŸ" msgid "Swing" msgstr "å‹•ã" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "システムã®è¨€èªžï¼š" @@ -4835,9 +4913,14 @@ msgstr "å³ãƒ†ãƒ¼ãƒ–ル" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" msgstr "スクリーンショット" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "テスト" @@ -4866,13 +4949,13 @@ msgstr "無効ãªã‚¢ãƒ‰ãƒ¬ã‚¹ã§ã™" msgid "The checksum was successfully fixed" msgstr "ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã®ä¿®æ­£ã«æˆåŠŸã—ã¾ã—ãŸ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "The chosen directory is already in the list" msgstr "é¸æŠžã—ãŸãƒ•ã‚©ãƒ«ãƒ€ã¯ã™ã§ã«ãƒªã‚¹ãƒˆã«å­˜åœ¨ã—ã¾ã™ï¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, c-format msgid "" "The file %s already exists.\n" @@ -4962,7 +5045,7 @@ msgstr "指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ« \"%s\" ã¯å­˜åœ¨ã—ã¾ã›ã‚“" msgid "The value is invalid" msgstr "無効ãªå€¤ã§ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "テーマ" @@ -4996,7 +5079,7 @@ msgstr "" "ã“ã®ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ãƒªãƒ—レイシミュレータã¯ã€ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ãƒªãƒ—レイãã®ã‚‚ã®ã‚’変更ã™ã‚‹" "コードã¯ã‚µãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "有効ã«ã—ã¦ã„ã‚‹ã¨Wiiメニューやã„ãã¤ã‹ã®ã‚¿ã‚¤ãƒˆãƒ«ã§å‹•ä½œé€Ÿåº¦ãŒä½Žä¸‹ã™ã‚‹å ´åˆãŒã‚ã‚Š" @@ -5021,7 +5104,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -5037,11 +5120,11 @@ msgstr "" "ノート：ゲーム中ã€ã‚­ãƒ¼ã‚’押ã—続ã‘ã¦ã„ã‚‹é–“ã ã‘ã“ã®ã‚ªãƒ—ションを無効ã«ã™ã‚‹ã“" "ã¨ãŒã§ãã¾ã™ã€‚" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "BGMã®ã‚ˆã†ãªéŸ³æ¥½ãƒˆãƒ©ãƒƒã‚¯ã®å†ç”Ÿã«ä½¿ç”¨ã•ã‚Œã¾ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5066,7 +5149,7 @@ msgid "Tilt" msgstr "傾ã" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr "タイトル" @@ -5081,15 +5164,16 @@ msgstr "å…¨ã¦ã®ãƒ­ã‚°æƒ…報をé¸æŠžï¼è§£é™¤" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "上部" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "ç¹ä½“字中国語" @@ -5097,7 +5181,7 @@ msgstr "ç¹ä½“字中国語" msgid "Tried to load an unknown file type." msgstr "ä¸æ˜Žãªãƒ•ã‚¡ã‚¤ãƒ«ã‚¿ã‚¤ãƒ—を読ã¿è¾¼ã‚‚ã†ã¨ã—ã¾ã—ãŸ" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "トリガー" @@ -5113,7 +5197,7 @@ msgstr "" "Trying to read from invalid SYSCONF\n" "Wiimote bt ids are not available" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Turkish" msgstr "トルコ語" @@ -5194,15 +5278,6 @@ msgstr "次ã®IDã‹ã‚‰ä¸æ˜Žãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’å—ä¿¡ : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Unknown message with id:%d received from player:%d Kicking player!" -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Unknown pointer %#08x\n" -"Continue?" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5217,7 +5292,7 @@ msgstr "å†å–å¾—" msgid "Upright Wiimote" msgstr "直立状態(Upright)ã§ä½¿ç”¨" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 (PAL60) モードを使用" @@ -5229,7 +5304,7 @@ msgstr "フルスクリーンã§è¡¨ç¤º" msgid "Use Hex" msgstr "16進" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "パニックãƒãƒ³ãƒ‰ãƒ©ã‚’使用" @@ -5284,7 +5359,7 @@ msgstr "値：" msgid "Verbosity" msgstr "Verbosityモード" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "æç”»" @@ -5292,7 +5367,7 @@ msgstr "æç”»" msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "音é‡" @@ -5358,6 +5433,41 @@ msgstr "" "ファイルåã¯ãƒ¡ãƒ¢ãƒªãƒ¼ã‚«ãƒ¼ãƒ‰ä¸Šã®åå‰ã¨åŒã˜ã«ãªã‚Šã¾ã™\n" "続ã‘ã¾ã™ã‹ï¼Ÿ" +#: Source/Core/Core/Src/Movie.cpp:629 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, 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" +"\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" +"\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" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -5375,15 +5485,15 @@ msgstr "疑似ワイドスクリーン化" msgid "Width" msgstr "範囲(横)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "Wii コンソール" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 msgid "Wii NAND Root:" msgstr "Wii NANDルート" @@ -5391,7 +5501,7 @@ msgstr "Wii NANDルート" msgid "Wii Save Import" msgstr "Wiiã®ã‚»ãƒ¼ãƒ–データをインãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 msgid "Wii save files (*.bin)|*.bin" msgstr "Wiiセーブデータ (*.bin)|*.bin" @@ -5422,7 +5532,7 @@ msgstr "" "ã¾ãŸã¯ã—ã°ã‚‰ã入力ãŒãªã‹ã£ãŸãŸã‚çœé›»åŠ›ãƒ¢ãƒ¼ãƒ‰ã«å…¥ã£ãŸã®ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“\n" "å†æŽ¥ç¶šã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/Main.cpp:599 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Wiimote Connected" msgstr "Wii リモコン接続中" @@ -5454,9 +5564,9 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ワードラップ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Working..." msgstr "動作中..." @@ -5519,7 +5629,7 @@ msgstr "10進数・16進数・8進数ã„ãšã‚Œã‹ã®æœ‰åŠ¹ãªå€¤ã‚’入力ã—㦠msgid "You must enter a valid profile name." msgstr "有効ãªãƒ—ロファイルåを入力ã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 msgid "You must restart Dolphin in order for the change to take effect." msgstr "変更を有効ã«ã™ã‚‹ã«ã¯Dolphinã‚’å†èµ·å‹•ã—ã¦ãã ã•ã„" @@ -5542,7 +5652,7 @@ msgstr "" "æ­£ã—ã㯠0x%04x (ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ 0x%04llx)\n" "æ–°ã—ã作æˆã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "ZTP hack" @@ -5612,7 +5722,7 @@ msgstr "" msgid "^ ADD" msgstr "^ (...ã«åŠ ãˆã¦)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5629,7 +5739,7 @@ msgstr "次ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰ã®ãƒ‡ãƒ¼ã‚¿èª­ã¿è¾¼ã¿ã«å¤±æ•—: %s" msgid "failed to read header" msgstr "ヘッダã®èª­ã¿è¾¼ã¿ã«å¤±æ•—" -#: Source/Core/Core/Src/HW/Memmap.cpp:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Reading Opcode from %x. Please report." @@ -5649,7 +5759,7 @@ msgstr "　" msgid "unknown cmd 0x%08x" msgstr "unknown cmd 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returned -1 on application run!" @@ -5765,6 +5875,9 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Can't find plugin %s" #~ msgstr "%s プラグインãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" +#~ msgid "Cannot record movies in read-only mode." +#~ msgstr "読ã¿è¾¼ã¿å°‚用設定ã®ãŸã‚録画ä¸å¯" + #~ msgid "Choose the folder where to extract to" #~ msgstr "抽出先ã®ãƒ•ã‚©ãƒ«ãƒ€ã‚’é¸æŠž" @@ -6151,6 +6264,13 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "音声や効果音ã®å†ç”Ÿã«ã‚ˆã使用ã•ã‚Œã¾ã™" +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" + #~ msgid "Use FPS For Limiting" #~ msgstr "有効化" diff --git a/Languages/po/ko.po b/Languages/po/ko.po index b150a46898..3f8323714e 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: 2011-10-11 23:25-0500\n" +"POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-07-07 10:24+0900\n" "Last-Translator: \n" "Language-Team: \n" @@ -50,9 +50,9 @@ msgstr "\"%s\"는 비ì í•© GCM/ISO 파ì¼ìž„, í˜¹ì€ GC/Wii ISOê°€ 아님." msgid "%1$sCopy%1$s" msgstr "%1$s복사%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -177,11 +177,11 @@ msgstr "치트 매니저(&C)" msgid "&DSP Settings" msgstr "오디오 설정(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "ISO ì‚­ì œ(&D)..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 msgid "&Delete selected ISOs..." msgstr "ì„ íƒëœ ISO들 ì‚­ì œ(&D)..." @@ -245,7 +245,7 @@ msgstr "ì¼ì‹œì •ì§€(&P)" msgid "&Play" msgstr "실행(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "ì†ì„±(&P)" @@ -289,7 +289,7 @@ msgstr "보기(&V)" msgid "&Wiimote Settings" msgstr "위모트 설정(&W)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "위키(&W)" @@ -338,10 +338,11 @@ msgid "" msgstr "<ì—†ìŒ>" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "<키를 누르세요>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "<시스템>" @@ -397,8 +398,8 @@ msgstr "" "\n" "TCP í¬íŠ¸ë¥¼ í˜¸ìŠ¤íŠ¸ì— ì „ë‹¬í•´ì•¼í•©ë‹ˆë‹¤!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "AM-기반보드" @@ -438,6 +439,7 @@ msgstr "" "확신 없으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 msgid "Action" msgstr " [ ì•¡ì…˜ ]" @@ -535,11 +537,11 @@ msgstr "어댑터:" msgid "Add" msgstr "추가" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "ì•¡ì…˜ë¦¬í”Œë ˆì´ ì½”ë“œ 추가" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "패치 추가" @@ -547,9 +549,9 @@ msgstr "패치 추가" msgid "Add new pane" msgstr "새로운 ì°½ 추가" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Add..." msgstr "추가..." @@ -601,7 +603,7 @@ msgstr "버튼들 í™œì„±í™”ì— í•„ìš”í•œ 아날로그 컨트롤 ì••ë ¥ì„ ì¡°ì • msgid "Advanced" msgstr "고급" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "고급 설정" @@ -609,28 +611,28 @@ msgstr "고급 설정" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "모든 GC/Wii 파ì¼ë“¤ (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "모든 GC/Wii ì´ë¯¸ì§€ë“¤ (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "모든 게임í브 GCM 파ì¼ë“¤ (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "모든 ìƒíƒœë“¤ 저장 (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "모든 Wii ISO 파ì¼ë“¤ (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "모든 ì••ì¶•ëœ GC/Wii ISO 파ì¼ë“¤ (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "모든 íŒŒì¼ (*.*)|*.*" @@ -667,7 +669,7 @@ msgstr "앱로ë”ê°€ ìž˜ëª»ëœ í¬ê¸°ìž„... ì •ë§ ì•±ë¡œë”입니까?" msgid "Apploader unable to load from file" msgstr "앱로ë”ê°€ 파ì¼ë¡œ 부터 로드할 수 ì—†ìŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "앱로ë”:" @@ -685,7 +687,7 @@ msgstr "" "\n" "확신 없으면, (ë„기)를 ì„ íƒí•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "ì•„ëžì–´" @@ -694,7 +696,7 @@ msgstr "ì•„ëžì–´" msgid "Are you sure you want to delete \"%s\"?" msgstr "\"%s\" 를 ì •ë§ë¡œ 지우고 싶습니까?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -702,11 +704,11 @@ msgstr "" "ì´ íŒŒì¼ë“¤ì„ ì •ë§ë¡œ 지우고 싶습니까?\n" "ê·¸ê²ƒë“¤ì€ ì˜ì›ížˆ 사ë¼ì§‘니다!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ì´ íŒŒì¼ì„ ì •ë§ë¡œ 지우고 싶습니까? ê·¸ê²ƒì€ ì˜ì›ížˆ 사ë¼ì§‘니다!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "종횡비:" @@ -715,11 +717,11 @@ msgstr "종횡비:" msgid "At least one pane must remain open." msgstr "ì ì–´ë„ í•˜ë‚˜ì˜ ì°½ì´ ì—´ë ¤ 있어야합니다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "오디오" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" msgstr "오디오 백엔드:" @@ -727,7 +729,7 @@ msgstr "오디오 백엔드:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO 장치를 열기 ì—러.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "ìžë™" @@ -770,7 +772,7 @@ msgstr "" msgid "Back" msgstr "뒤로" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" msgstr "백엔드 설정" @@ -780,7 +782,7 @@ msgid "Backend:" msgstr "백엔드:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "백그ë¼ìš´ë“œ ìž…ë ¥" @@ -793,15 +795,15 @@ msgid "Bad File Header" msgstr "ë°°ë“œ íŒŒì¼ í—¤ë”" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr " 배너" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "배너 세부사항" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "배너:" @@ -813,7 +815,7 @@ msgstr "ë°”" msgid "Basic" msgstr "기본" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "기본 설정" @@ -842,7 +844,7 @@ msgid "Blue Right" msgstr "파랑 오른쪽" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "아래" @@ -851,7 +853,7 @@ msgstr "아래" msgid "Bound Controls: %lu" msgstr "바운드 컨트롤들: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "고장남" @@ -859,7 +861,7 @@ msgstr "고장남" msgid "Browse" msgstr "í´ë”íƒìƒ‰" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "추가할 디렉토리 둘러보기" @@ -867,7 +869,7 @@ msgstr "추가할 디렉토리 둘러보기" msgid "Browse for an ISO directory..." msgstr "ISO 디렉토리 불러오기..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "출력 디렉토리 둘러보기" @@ -875,7 +877,7 @@ msgstr "출력 디렉토리 둘러보기" msgid "Buffer:" msgstr "버í¼:" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -885,11 +887,11 @@ msgstr "버튼" msgid "C Stick" msgstr "C 스틱" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "C-스틱" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "CPU ì—뮬레ì´í„° 엔진" @@ -938,15 +940,11 @@ msgstr "취소" msgid "Cannot open %s" msgstr "%s를 열수 ì—†ìŒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "" - #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "ì´ë²¤íŠ¸ë“¤ ë¯¸í•´ê²°ì„ ì§€ë‹Œ ì´ë²¤íŠ¸ë“¤ì„ 등ë¡í•˜ì§€ ì•Šì„ ìˆ˜ ì—†ìŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -956,7 +954,7 @@ msgstr "" "ê·¸ 파ì¼ì„ 메모리 카드로 사용할 수 ì—†ìŒ.\n" "ë‘˜ë‹¤ì˜ ìŠ¬ë¡¯ë“¤ì— ê°™ì€ íŒŒì¼ì„ 사용하려 합니까?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -985,7 +983,7 @@ msgstr "DVD_플러그ì¸ì—ì„œ ì½ì„ 수 ì—†ìŒ - DVD-ì¸í„°íŽ˜ì´ìŠ¤: 치명 msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "카탈로니아어" @@ -1002,6 +1000,7 @@ msgid "Change &Disc..." msgstr "ë””ìŠ¤í¬ ë³€ê²½(&D)..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "ë””ìŠ¤í¬ ë³€ê²½" @@ -1009,7 +1008,7 @@ msgstr "ë””ìŠ¤í¬ ë³€ê²½" msgid "Change Game" msgstr "게임 변경" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1025,8 +1024,8 @@ msgstr "표시를 zì›ê±°ë¦¬ 파ë¼ë¯¸í„°ë¡œ 변경 (ì •ì • 후ì—)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "표시를 z근거리 파ë¼ë¯¸í„°ë¡œ 변경 (ì •ì • 후ì—)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "ì—뮬레ì´í„°ê°€ ìž‘ë™í•˜ê³  있는 ë™ì•ˆì— ì´ ë³€ê²½ì€ íš¨ê³¼ê°€ ì—†ì„ ê²ë‹ˆë‹¤!" @@ -1046,31 +1045,31 @@ msgstr "치트 찾기" msgid "Cheats Manager" msgstr "치트들 관리ìž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "중국어 (간소화)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "중국어 (전통)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "DVD 루트 디렉토리 ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Choose a NAND root directory:" msgstr "NAND 루트 디렉토리 ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "ë””í´íŠ¸ ISO ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "추가할 디렉토리 ì„ íƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "열려는 íŒŒì¼ ì„ íƒ" @@ -1078,15 +1077,15 @@ msgstr "열려는 íŒŒì¼ ì„ íƒ" msgid "Choose a memory card:" msgstr "메모리 ì¹´ë“œ ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" "앱로ë”ë¡œ 사용할 파ì¼ì„ ì„ íƒ: (디렉토리들로만 êµ¬ì„±ëœ ë””ìŠ¤í¬ë“¤ì—게만 ì ìš©ë¨)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "압축해제할 í´ë”를 ì„ íƒ" @@ -1105,7 +1104,7 @@ msgstr "í´ëž˜ì‹" msgid "Clear" msgstr "깨ë—ì´" -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." msgstr "청소 실패했습니다." @@ -1119,7 +1118,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "닫기" @@ -1144,20 +1143,20 @@ msgstr "명령" msgid "Comment" msgstr "주ì„" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "주ì„:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "ISO 압축..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "ì„ íƒëœ ISO들 압축..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "ISO 압축하기" @@ -1184,13 +1183,13 @@ msgstr "패드들 설정" msgid "Configure..." msgstr "환경설정..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "íŒŒì¼ ë®ì–´ì“°ê¸° 확정" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Confirm on Stop" msgstr "중지시 확ì¸" @@ -1199,7 +1198,7 @@ msgstr "중지시 확ì¸" msgid "Connect" msgstr "ì—°ê²°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "USB 키보드 ì—°ê²°" @@ -1209,22 +1208,26 @@ msgid "Connect Wiimote %i" msgstr "위모트 %i ì—°ê²°" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "위모트 1 ì—°ê²°" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "위모트 2 ì—°ê²°" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "위모트 3 ì—°ê²°" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "위모트 4 ì—°ê²°" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Connecting..." msgstr "연결중..." @@ -1249,7 +1252,7 @@ msgstr "복사 실패했습니다" msgid "Copy to Memcard %c" msgstr "메모리카드 %c ì— ë³µì‚¬" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "코어" @@ -1279,7 +1282,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "%s ISO 파ì¼ì„ ì¸ì‹í•  수 없었습니다" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "%s 를 저장할 수 없었습니다" @@ -1304,7 +1307,7 @@ msgstr "" "\n" "CD/DVDì—ì„œ ëŒí•€ì„ 구ë™í•˜ë‚˜ìš”, 아니면 저장 파ì¼ì´ 쓰기 보호ì¼ì§€ë„?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "í™•ìž¥ìž 'ini'ì— ëŒ€í•œ 열린 ëª…ë ¹ì„ ë°œê²¬í•  수 없었습니다!" @@ -1321,7 +1324,7 @@ msgstr "" msgid "Count:" msgstr "카운트:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "êµ­ê°€:" @@ -1335,22 +1338,22 @@ msgstr "AR 코드 ìƒì„±" msgid "Create new perspective" msgstr "새로운 ê´€ì  ìƒì„±" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr "KDE-Look.orgì— ì˜í•´ 만들어ì§" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr "VistaIcons.comì— ì˜í•´ 만들어ì§" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "black_riderì— ì˜í•´ 만들어지고 ForumW.org > Web Developmentsì—ì„œ ê²Œì‹œë¨ " @@ -1386,7 +1389,7 @@ msgstr "í¬ë¡œìŠ¤íŽ˜ì´ë“œ" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "현재 디렉토리가 %sì—ì„œ wxFileSelectorë’¤ì— %së¡œ 변경ë¨!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" msgstr "ì‚¬ìš©ìž ì§€ì • 프로ì ì…˜ 핵:" @@ -1394,15 +1397,15 @@ msgstr "ì‚¬ìš©ìž ì§€ì • 프로ì ì…˜ 핵:" msgid "Custom Projection Hack Settings" msgstr "ì‚¬ìš©ìž ì§€ì • 프로ì ì…˜ 핵 설정" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." msgstr "ì¼ë¶€ ì • íˆ¬ì˜ íŒŒë¼ë¯¸í„°ë“¤ì„ 커스터마ì´ì¦ˆ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "ì²´ì½”" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "D-패드" @@ -1410,24 +1413,24 @@ msgstr "D-패드" msgid "DSP" msgstr "오디오" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP Emulator Engine" msgstr "DSP ì—뮬레ì´í„° 엔진" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE ì—뮬레ì´ì…˜ (빠름)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE ì¸í„°í”„리터 (ëŠë¦¼)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP LLE on Thread" msgstr "DSP LLE를 쓰레드ìƒì—" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "DSP LLE 리컴파ì¼ëŸ¬" @@ -1435,7 +1438,7 @@ msgstr "DSP LLE 리컴파ì¼ëŸ¬" msgid "DSP settings" msgstr "DSP 설정" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "DVD 루트:" @@ -1443,7 +1446,7 @@ msgstr "DVD 루트:" msgid "Data Size" msgstr "ë°ì´í„° í¬ê¸°" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "날짜:" @@ -1472,16 +1475,16 @@ msgstr "디버깅" msgid "Decimal" msgstr "10진수ì˜" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "ISO 압축해제..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "ì„ íƒëœ ISO들 압축해제..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "ISO 압축해제하기" @@ -1489,7 +1492,7 @@ msgstr "ISO 압축해제하기" msgid "Default" msgstr "기본" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "기본 ISO:" @@ -1533,8 +1536,8 @@ msgstr "" msgid "Device" msgstr "장비" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "장비 설정" @@ -1617,7 +1620,7 @@ msgstr "" "\n" "확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "디스í¬" @@ -1644,11 +1647,11 @@ msgstr "" msgid "Divide" msgstr "나누기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 msgid "Do you want to stop the current emulation?" msgstr "현재 ì—뮬레ì´ì…˜ì„ 중단하고 싶습니까?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "ëŒí•€" @@ -1673,12 +1676,12 @@ msgstr "ëŒí•€ ì—ë®¬ëœ ìœ„ëª¨íŠ¸ 환경설정" msgid "Dolphin FIFO" msgstr "ëŒí•€ FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "ëŒí•€ GC패드 환경설정" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 msgid "Dolphin TAS Movies (*.dtm)" msgstr "ëŒí•€ TAS ë™ì˜ìƒ (*.dtm)" @@ -1690,7 +1693,7 @@ msgstr "ëŒí•€ 위모트 환경설정" msgid "Dolphin at &Google Code" msgstr "ëŒí•€ 구글 코드(&G)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1698,7 +1701,7 @@ msgstr "" "ëŒí•€ì´ ì–´ëŠ GC/Wii ISOë„ ì°¾ì„ ìˆ˜ 없었습니다. 파ì¼ì„ 둘러보려면 여기를 ë”블í´" "릭하세요..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1728,7 +1731,7 @@ msgstr "드럼" msgid "Dummy" msgstr "ë”미" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "오디오 ë¤í”„" @@ -1774,9 +1777,9 @@ msgstr "" "\n" "확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "네ëœëž€ë“œì–´" @@ -1828,8 +1831,8 @@ msgstr "패치 편집" msgid "Edit current perspective" msgstr "현재 ê´€ì  íŽ¸ì§‘" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "편집..." @@ -1841,7 +1844,7 @@ msgstr "효과" msgid "Embedded Frame Buffer" msgstr "내장형 프레임 버í¼" -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "ì—뮬 쓰레드가 ì´ë¯¸ 구ë™ì¤‘ìž„" @@ -1879,7 +1882,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "ì—ë®¬ëœ ìœ„ëª¨íŠ¸" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "ì—뮬레ì´ì…˜ ìƒíƒœ:" @@ -1907,7 +1910,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "AR 로깅 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "오디오 병목 활성" @@ -1919,15 +1922,19 @@ msgstr "BAT 활성" msgid "Enable Block Merging" msgstr "ë¸”ë¡ í•©ì¹˜ê¸° 활성" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "ìºì‰¬ 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Cheats" msgstr "치트 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "DTK ìŒì•… 활성" @@ -1935,7 +1942,7 @@ msgstr "DTK ìŒì•… 활성" msgid "Enable Dual Core" msgstr "듀얼 코어 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "듀얼 코어 활성 (ì†ë„ìƒìŠ¹)" @@ -1947,7 +1954,7 @@ msgstr "단축키 활성(그래픽 컨트롤)" msgid "Enable Idle Skipping" msgstr "ì•„ì´ë“¤ 스킵 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "ì•„ì´ë“¤ 스킵 활성 (ì†ë„ìƒìŠ¹)" @@ -1960,7 +1967,7 @@ msgstr "MMU 활성" msgid "Enable Progressive Scan" msgstr "프로그레시브 스캔 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Enable Screen Saver" msgstr "스í¬ë¦° 세ì´ë²„ 활성" @@ -2021,7 +2028,7 @@ msgstr "" "\n" "확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2038,7 +2045,7 @@ msgstr "" "블럭 주소 í•´ì„ (BAT); 메모리 관리 유닛 함수 활성. í•˜ë“œì›¨ì–´ì— ì •í™•í•´ì§„ë‹¤, 하지" "만 ì—뮬레ì´íŠ¸ëŠ” ëŠë ¤ì§„다.(켬 = 호환성, ë” = 빠름)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" msgstr "ì‚¬ìš©ìž ì§€ì • 프로ì ì…˜ 핵 활성화" @@ -2074,9 +2081,9 @@ msgstr "" msgid "End" msgstr "ë" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "ì˜ì–´" @@ -2105,15 +2112,29 @@ msgstr "ê°™ìŒ" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "ì—러" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "ì„ íƒëœ 언어 로딩 ì—러. 시스템 기본으로 ëŒì•„갑니다." -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2147,11 +2168,12 @@ msgstr "ì—뮬레ì´í„°ì™€ 함께 ëŒí•€ 종료" msgid "Export Failed" msgstr "내보내기 실패했습니다" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "íŒŒì¼ ë‚´ë³´ë‚´ê¸°" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "(ìž…ë ¥) ê¸°ë¡ ë‚´ë³´ë‚´ê¸°" @@ -2163,7 +2185,7 @@ msgstr "(ìž…ë ¥) ê¸°ë¡ ë‚´ë³´ë‚´ê¸°..." msgid "Export Save" msgstr "저장 내보내기" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "Wii 저장 내보내기 (실험ì )" @@ -2195,44 +2217,44 @@ msgstr "추가 매개변수" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "추가 매개변수는 ''Metroid: Other M''ì—서만 유용합니다." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "모든 파ì¼ë“¤ 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "ì•±ë¡œë” ì••ì¶•í’€ê¸°..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "DOL 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "디렉토리 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "íŒŒì¼ ì••ì¶• 풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "파티션 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "%s 압축풀기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "모든 파ì¼ë“¤ 압축풀기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "디렉토리 압축풀기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "압축풀기..." @@ -2248,7 +2270,7 @@ msgstr "FIFO 플레ì´ì–´" msgid "FRANCE" msgstr "프랑스" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "FST í¬ê¸°:" @@ -2264,7 +2286,7 @@ msgstr "ë“£ê¸°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤!!" msgid "Failed to download codes." msgstr "코드들 ë‹¤ìš´ë¡œë“œì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "%së¡œ 압축풀기 실패했습니다!" @@ -2439,11 +2461,11 @@ msgstr "파ì¼ì´ 압축ë˜ì§€ 않었습니다" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: 알려지지 ì•Šì€ ì—´ê¸° 모드: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "파ì¼ì‹œìŠ¤í…œ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "'ini'파ì¼íƒ€ìž…ì€ ì•Œë ¤ì§€ì§€ ì•ŠìŒ! 열지 않겠습니다!" @@ -2463,7 +2485,7 @@ msgstr "ê°•ì œ 16:9" msgid "Force 4:3" msgstr "ê°•ì œ 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Force Console as NTSC-J" msgstr "ì½˜ì†”ì„ NTSC-Jë¡œ 강제시킴" @@ -2495,7 +2517,7 @@ msgstr "" "\n" "확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2527,6 +2549,7 @@ msgid "Frame " msgstr "프레임" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "프레임 진행" @@ -2542,7 +2565,7 @@ msgstr "프레임 범위" msgid "Frame S&kipping" msgstr "프레임 스킵(&k)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "프레임제한:" @@ -2554,9 +2577,9 @@ msgstr "녹화할 프레임" msgid "Free Look" msgstr "ìžìœ ë¡œìš´ 보기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "French" msgstr "프랑스어" @@ -2581,11 +2604,16 @@ msgstr "전체화면 í•´ìƒë„:" msgid "GCI File(*.gci)" msgstr "GCI 파ì¼(*.gci)" +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +#, fuzzy +msgid "GCMic Configuration" +msgstr "로그 환경설정" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "GC패드" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "게임 ID:" @@ -2601,7 +2629,7 @@ msgstr "ê²Œìž„ì´ êµ¬ë™ì¤‘ì´ì§€ 않습니다!" msgid "Game not found!!" msgstr "ê²Œìž„ì´ ì°¾ì„ ìˆ˜ 없습니다!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "게임-ìƒì„¸ 설정" @@ -2609,7 +2637,7 @@ msgstr "게임-ìƒì„¸ 설정" msgid "GameConfig" msgstr "게임환경" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "게임í브" @@ -2618,7 +2646,7 @@ msgid "Gamecube &Pad Settings" msgstr "게임í브 패드 설정(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "게임í브 메모리 카드들 (*.raw,*.gcp)" @@ -2641,7 +2669,8 @@ msgstr "" "(ìž˜ëª»ëœ ì½”ë“œì´ê±°ë‚˜ 코드 íƒ€ìž…ì´ ì•„ì§ ì§€ì›ì•Šëœë‹¤.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "ì¼ë°˜" @@ -2650,9 +2679,9 @@ msgstr "ì¼ë°˜" msgid "General Settings" msgstr "ì¼ë°˜ 설정" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "German" msgstr "ë…ì¼ì–´" @@ -2689,7 +2718,7 @@ msgstr "" "\n" "확신 없다면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" msgstr "그리스어" @@ -2721,7 +2750,7 @@ msgstr "핵" msgid "Header checksum failed" msgstr "í—¤ë” ì²´í¬ì„¬ 실패했습니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hebrew" msgstr "히브리어" @@ -2782,11 +2811,12 @@ msgid "Hotkey Configuration" msgstr "단축키 설정" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 msgid "Hotkeys" msgstr "단축키들" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hungarian" msgstr "í—가리어" @@ -2818,7 +2848,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - ìž˜ëª»ëœ ëŒ€ìƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "IPL 설정" @@ -2834,11 +2864,11 @@ msgstr "IR í¬ì¸í„°" msgid "IR Sensitivity:" msgstr "IR ê°ë„:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "ISO 세부사항" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "ISO 디렉토리들" @@ -2850,6 +2880,12 @@ msgstr "ì´íƒˆë¦¬ì•„" msgid "Icon" msgstr "ì•„ì´ì½˜" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" @@ -2857,7 +2893,7 @@ msgstr "" "FPSê°€ 불규칙ì ì´ë©´, ì´ ì˜µì…˜ì´ ë„ì›€ì´ ë  ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤. (켬 = 호환성, ë” = ë¹ " "름)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 msgid "" "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." @@ -2946,7 +2982,7 @@ msgstr "" "\n" "확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "게임안" @@ -2975,7 +3011,7 @@ msgstr "삽입" msgid "Insert Encrypted or Decrypted code here..." msgstr "암호화ë˜ê±°ë‚˜ 암호해ë…ëœ ì½”ë“œë¥¼ ì—¬ê¸°ì— ì‚½ìž…í•˜ì„¸ìš”..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "SD ì¹´ë“œ 삽입" @@ -2987,7 +3023,7 @@ msgstr "ì´ë¦„ì„ ì—¬ê¸°ì— ë„£ìœ¼ì‹œì˜¤..." msgid "Install WAD" msgstr "WAD 설치" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 msgid "Install to Wii Menu" msgstr "Wii ë©”ë‰´ì— ì„¤ì¹˜" @@ -2998,23 +3034,23 @@ msgstr "" "InstallExceptionHandler 호출ë¨, 하지만 ì´ í”Œëž«í¼ì€ ì•„ì§ ê·¸ê²ƒì„ ì§€ì›í•˜ì§€ 않습" "니다." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 msgid "Installing WAD..." msgstr "WAD 설치하기..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 msgid "Interface" msgstr "ì¸í„°íŽ˜ì´ìŠ¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "ì¸í„°íŽ˜ì´ìŠ¤ 설정" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "내부 LZO ì—러 - 압축 실패했습니다" -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3023,7 +3059,7 @@ msgstr "" "내부 LZO ì—러 - 압축해제 실패했습니다 (%d) (%li, %li) \n" "ìƒíƒœ ë¡œë”©ì„ ë‹¤ì‹œ 해보세요" -#: Source/Core/Core/Src/State.cpp:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "내부 LZO ì—러 - lzo_init() 실패했습니다" @@ -3031,11 +3067,11 @@ msgstr "내부 LZO ì—러 - lzo_init() 실패했습니다" msgid "Internal Resolution:" msgstr "내부 í•´ìƒë„:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "ì¸í„°í”„리터 (매우 ëŠë¦¼)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "소개화면" @@ -3052,7 +3088,7 @@ msgstr "비ì í•© ê°’!" msgid "Invalid bat.map or dir entry" msgstr "비ì í•© bat.map í˜¹ì€ ë””ë ‰í† ë¦¬ 엔트리" -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "비ì í•© ì´ë²¤íŠ¸ 타입 %i" @@ -3072,17 +3108,17 @@ msgstr "" "%s\n" " ë‹¹ì‹ ì€ ì´ ê²Œìž„ì„ ë¦¬ë¤í”„해야할 지ë„." -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "비ì í•© ê¸°ë¡ íŒŒì¼" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "비ì í•© ìƒíƒœ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Italian" msgstr "ì´íƒˆë¦¬ì•„ì–´" @@ -3090,16 +3126,16 @@ msgstr "ì´íƒˆë¦¬ì•„ì–´" msgid "JAPAN" msgstr "ì¼ë³¸" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "JIT 리컴파ì¼ëŸ¬ (권장)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "JITIL ì‹¤í—˜ì  ë¦¬ì»´íŒŒì¼ëŸ¬" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Japanese" msgstr "ì¼ë³¸ì–´" @@ -3108,16 +3144,17 @@ msgid "KOREA" msgstr "한국" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr " [ 키 ]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Korean" msgstr "한국어" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "L" @@ -3126,11 +3163,11 @@ msgid "L Button" msgstr "L 버튼" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" msgstr "L-아날로그" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "언어:" @@ -3153,6 +3190,7 @@ msgid "Left Stick" msgstr "왼쪽 스틱" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3182,7 +3220,7 @@ msgstr "" msgid "Less Than" msgstr "보다 ë” ì ì€" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "FPSë¡œ 제한" @@ -3195,34 +3233,42 @@ msgid "Load Custom Textures" msgstr "커스텀 í…스처 로드" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 1" msgstr "슬롯1 ìƒíƒœ 로드" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 2" msgstr "슬롯2 ìƒíƒœ 로드" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 3" msgstr "슬롯3 ìƒíƒœ 로드" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 4" msgstr "슬롯4 ìƒíƒœ 로드" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 msgid "Load State Slot 5" msgstr "슬롯5 ìƒíƒœ 로드" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Load State Slot 6" msgstr "슬롯6 ìƒíƒœ 로드" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Load State Slot 7" msgstr "슬롯7 ìƒíƒœ 로드" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Load State Slot 8" msgstr "슬롯8 ìƒíƒœ 로드" @@ -3230,11 +3276,11 @@ msgstr "슬롯8 ìƒíƒœ 로드" msgid "Load State..." msgstr "ìƒíƒœ 로드..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Wii 시스템 메뉴 로드" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii 시스템 메뉴 %d %c 로드" @@ -3261,7 +3307,7 @@ msgstr "ëª…ì‹œëœ íŒŒì¼ (DOL,ELF,WAD,GCM,ISO,WAD) 로드" msgid "Local" msgstr "지역" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Lock Threads to Cores" msgstr "ì½”ì–´ì— ì“°ë ˆë“œ 잠그기" @@ -3316,16 +3362,16 @@ msgstr "MMU 스피드 핵" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz ê²Œìž„ìƒ¤í¬ íŒŒì¼ë“¤(*.gcs)" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "ë©”ì¸ ìŠ¤í‹±" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "제작사 ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "제작사:" @@ -3347,7 +3393,7 @@ msgid "Memory Byte" msgstr "메모리 ë°”ì´íŠ¸" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 msgid "Memory Card" msgstr "메모리 ì¹´ë“œ" @@ -3384,7 +3430,7 @@ msgstr "" msgid "Menu" msgstr "메뉴" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "마ì´í¬" @@ -3397,7 +3443,7 @@ msgstr "최소값" msgid "Misc" msgstr "기타" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "기타 설정" @@ -3427,7 +3473,7 @@ msgid "Motion Plus" msgstr "모션 플러스" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "모터" @@ -3545,7 +3591,7 @@ msgstr "NP 탭" msgid "NP Up" msgstr "NP 위" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3584,7 +3630,7 @@ msgstr "별명 :" msgid "No Country (SDK)" msgstr "êµ­ê°€ ì—†ìŒ (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "ISO나 WADSê°€ ì—†ìŒ" @@ -3619,7 +3665,7 @@ msgstr "%s 타ì´í‹€ì— 대한 저장 í´ë”ê°€ ì—†ìŒ" msgid "None" msgstr "ì—†ìŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" msgstr "ë…¸ë¥´ì›¨ì´ ë¶ëª°ì–´" @@ -3627,16 +3673,16 @@ msgstr "ë…¸ë¥´ì›¨ì´ ë¶ëª°ì–´" msgid "Not Equal" msgstr "같지 ì•ŠìŒ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "설정 안함" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Not connected" msgstr "ì—°ê²°ë˜ì§€ ì•ŠìŒ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "참고 사항" @@ -3678,7 +3724,7 @@ msgstr "오브ì íŠ¸" msgid "Object Range" msgstr "오브ì íŠ¸ 범위" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "ë”" @@ -3693,14 +3739,15 @@ msgstr "%d 블럭들만 유용한" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "열기" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "ë‹´ê³  있는 í´ë” 열기(&c)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "Wii 저장 í´ë” 열기(&s)" @@ -3739,7 +3786,7 @@ msgid "Opens the logger" msgstr "로거를 연다" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "옵션" @@ -3816,12 +3863,12 @@ msgstr "파티션 %i" msgid "Patches" msgstr "패치" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "경로" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "ì¼ì‹œì •ì§€" @@ -3830,7 +3877,7 @@ msgstr "ì¼ì‹œì •ì§€" msgid "Per-Pixel Lighting" msgstr "픽셀단위 ê´‘ì›" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "완벽한" @@ -3841,20 +3888,22 @@ msgstr "ê´€ì  %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 msgid "Play" msgstr " 실행 " #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "(ìž…ë ¥) ê¸°ë¡ ìž¬ìƒ" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "실행/ì¼ì‹œì •ì§€" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "플레ì´ê°€ëŠ¥" @@ -3866,7 +3915,7 @@ msgstr "ìž¬ìƒ ì˜µì…˜" msgid "Players" msgstr "플레ì´ì–´" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 msgid "Please confirm..." msgstr "확ì¸í•´ì£¼ì„¸ìš”..." @@ -3878,23 +3927,23 @@ msgstr "ì €ìž¥í•˜ê¸°ì „ì— ê´€ì ì„ ìƒì„±í•´ 주세요." msgid "Plus-Minus" msgstr "플러스-마ì´ë„ˆìŠ¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Polish" msgstr "í´ëž€ë“œì–´" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 1" msgstr "í¬íŠ¸ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 2" msgstr "í¬íŠ¸ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Port 3" msgstr "í¬íŠ¸ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 msgid "Port 4" msgstr "í¬íŠ¸ 4" @@ -3903,11 +3952,11 @@ msgstr "í¬íŠ¸ 4" msgid "Port :" msgstr "í¬íŠ¸:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese" msgstr "í¬ë¥´íˆ¬ê°ˆì–´" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" msgstr "í¬ë¥´íˆ¬ê°ˆì–´ (브ë¼ì§ˆ)" @@ -3915,6 +3964,21 @@ msgstr "í¬ë¥´íˆ¬ê°ˆì–´ (브ë¼ì§ˆ)" msgid "Post-Processing Effect:" msgstr "후-처리 효과:" +#: Source/Core/Core/Src/Movie.cpp:735 +#, c-format +msgid "Premature movie end in PlayController. %u + 8 > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:829 +#, c-format +msgid "Premature movie end in PlayWiimote. %u + %d > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:806 +#, c-format +msgid "Premature movie end in PlayWiimote. %u > %u" +msgstr "" + #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "사전설정:" @@ -3957,7 +4021,7 @@ msgid "Quit" msgstr "종료" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "R" @@ -3966,7 +4030,7 @@ msgid "R Button" msgstr "R 버튼" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" msgstr "R-아날로그" @@ -3983,6 +4047,7 @@ msgid "Range" msgstr "범위" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "ì½ê¸°-ì „ìš© 모드" @@ -4054,6 +4119,7 @@ msgid "Refresh" msgstr "갱신" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "ëª©ë¡ ìƒˆë¡œ 고침" @@ -4061,10 +4127,10 @@ msgstr "ëª©ë¡ ìƒˆë¡œ 고침" msgid "Refresh game list" msgstr "게임 ëª©ë¡ ìƒˆë¡œ 고침" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 msgid "Remove" msgstr "제거" @@ -4083,6 +4149,7 @@ 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 msgid "Reset" msgstr "리셋" @@ -4105,15 +4172,15 @@ msgid "Right Stick" msgstr "오른쪽 스틱" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "진ë™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "DSP LLE를 ì „ìš© 쓰레드ìƒì—ì„œ 구ë™í•˜ê¸° (권장 안함)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "러시아어" @@ -4125,7 +4192,7 @@ msgstr "ìƒíƒœ 저장(&v) " msgid "Safe" msgstr "안전" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Sample Rate:" msgstr "샘플율:" @@ -4140,34 +4207,42 @@ msgid "Save GCI as..." msgstr "다른 ì´ë¦„으로 GCI 저장..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 1" msgstr "슬롯1 ìƒíƒœ 저장" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 2" msgstr "슬롯2 ìƒíƒœ 저장" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 3" msgstr "슬롯3 ìƒíƒœ 저장" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 4" msgstr "슬롯4 ìƒíƒœ 저장" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 msgid "Save State Slot 5" msgstr "슬롯5 ìƒíƒœ 저장" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 msgid "Save State Slot 6" msgstr "슬롯6 ìƒíƒœ 저장 " #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 msgid "Save State Slot 7" msgstr "슬롯7 ìƒíƒœ 저장" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 msgid "Save State Slot 8" msgstr "슬롯8 ìƒíƒœ 저장" @@ -4175,12 +4250,12 @@ msgstr "슬롯8 ìƒíƒœ 저장" msgid "Save State..." msgstr "ìƒíƒœ 저장..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "다른 ì´ë¦„으로 저장..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "ì••ì¶•ëœ GCM/ISO를 저장" @@ -4188,11 +4263,11 @@ msgstr "ì••ì¶•ëœ GCM/ISO를 저장" msgid "Save current perspective" msgstr "현재 ê´€ì ì„ 저장" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "압축풀린 GCM/ISO를 저장" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "%s ì˜ìƒ ìƒíƒœì €ìž¥ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤, ì˜ìƒ ê¸°ë¡ ì¤‘ì§€..." @@ -4201,16 +4276,16 @@ msgstr "%s ì˜ìƒ ìƒíƒœì €ìž¥ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤, ì˜ìƒ ê¸°ë¡ ì¤‘ì§€... msgid "Scaled EFB Copy" msgstr "스케ì¼ëœ EFB 복사" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, c-format msgid "Scanning %s" msgstr "스ìºë‹ %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "ISOë“¤ì„ ê²€ì‚¬í•˜ê¸°" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "스ìºë‹..." @@ -4226,7 +4301,7 @@ msgstr "스í¬ë¡¤ ë½" msgid "Search Filter" msgstr "í•„í„° 찾기" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "하위í´ë”들 찾기" @@ -4241,12 +4316,12 @@ msgstr "섹션 %s를 SYSCONFì—ì„œ ì°¾ì„ ìˆ˜ ì—†ìŒ" msgid "Select" msgstr "ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "ê¸°ë¡ íŒŒì¼ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 msgid "Select a Wii WAD file to install" msgstr "설치할 Wii WAD íŒŒì¼ ì„ íƒ" @@ -4272,15 +4347,15 @@ msgstr "유ë™ì ì¸ 윈ë„우즈 ì„ íƒ" msgid "Select the file to load" msgstr "로드할 íŒŒì¼ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "저장 파ì¼ì„ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "로드할 ìƒíƒœ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "저장할 ìƒíƒœ ì„ íƒ" @@ -4350,11 +4425,11 @@ msgstr "센서 ë°” 위치:" msgid "Separator" msgstr "분리ìž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "세르비아어" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "시리얼 í¬íŠ¸ 1 - ì´ê²ƒì€ ë„· ì–´ëŒ‘í„°ê°™ì€ ë””ë°”ì´ìŠ¤ê°€ 사용하는 í¬íŠ¸ì´ë‹¤" @@ -4363,7 +4438,7 @@ msgstr "시리얼 í¬íŠ¸ 1 - ì´ê²ƒì€ ë„· ì–´ëŒ‘í„°ê°™ì€ ë””ë°”ì´ìŠ¤ê°€ 사 msgid "Set" msgstr "설정" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "ë””í´íŠ¸ ISOë¡œ 설정(&d)" @@ -4377,11 +4452,11 @@ 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:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." msgstr "설정..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: 설정 파ì¼ì„ ì°¾ì„ ìˆ˜ ì—†ìŒ" @@ -4389,7 +4464,7 @@ msgstr "SetupWiiMem: 설정 파ì¼ì„ ì°¾ì„ ìˆ˜ ì—†ìŒ" msgid "Shake" msgstr "í”들기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "단축 ì´ë¦„:" @@ -4449,7 +4524,7 @@ msgstr "JAP (ì¼ë³¸ ë°©ì‹)" msgid "Show Korea" msgstr "한국" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "언어 보기:" @@ -4489,11 +4564,11 @@ msgstr "Wad" msgid "Show Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 msgid "Show a confirmation box before stopping a game." msgstr "ê²Œìž„ì„ ë©ˆì¶”ê¸° ì „ì— í™•ì¸ ìƒìž 보여주기." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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 " @@ -4556,15 +4631,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "사ì´ë“œì›¨ì´ 위모트" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "간소화 중국어" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "í¬ê¸°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 msgid "Skip BIOS" msgstr "ë°”ì´ì˜¤ìŠ¤ 스킵" @@ -4610,11 +4685,11 @@ msgstr "" msgid "Slot %i" msgstr "슬롯 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 msgid "Slot A" msgstr "슬롯 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 msgid "Slot B" msgstr "슬롯 B" @@ -4637,7 +4712,7 @@ msgstr "" "디버깅 목ì ìœ¼ë¡œë§Œ 유용합니다.\n" "소프트웨어 ë Œë”ë§ì„ í™œì„±ì„ ì •ë§ ì›í•©ë‹ˆê¹Œ? ìžì‹  없으면, '아니오'를 ì„ íƒí•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "사운드 설정" @@ -4655,9 +4730,9 @@ msgstr "사운드 ë²„í¼ ìƒì„± 실패했습니다: %s" msgid "Space" msgstr "스페ì´ìŠ¤" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Spanish" msgstr "스페ì¸ì–´" @@ -4701,7 +4776,7 @@ msgstr "스퀘어 스틱" msgid "Standard Controller" msgstr "표준 컨트롤러" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4716,14 +4791,16 @@ msgid "Start Re&cording" msgstr "(ìž…ë ¥) ê¸°ë¡ ì‹œìž‘(&c)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "(ìž…ë ¥) ê¸°ë¡ ì‹œìž‘" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "ìƒíƒœ" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "ìƒíƒœ 저장" @@ -4734,6 +4811,7 @@ msgstr "스틱" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "중지" @@ -4776,8 +4854,8 @@ msgstr "세ì´ë¸Œ 파ì¼ë“¤ì„ 성공ì ìœ¼ë¡œ 가져왔ìŒ" msgid "Swing" msgstr "스윙" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "시스템 언어:" @@ -4809,9 +4887,14 @@ msgstr "í…Œì´ë¸” 오른쪽" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" msgstr "스í¬ë¦°ìƒ· ì°ê¸°" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "테스트" @@ -4840,13 +4923,13 @@ msgstr "ê·¸ 주소는 비ì í•© 입니다" msgid "The checksum was successfully fixed" msgstr "ì²´í¬ì„¬ì´ 성공ì ìœ¼ë¡œ ê³ ì³ì¡ŒìŠµë‹ˆë‹¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "The chosen directory is already in the list" msgstr "ì„ íƒëœ 디렉토리는 ì´ë¯¸ ë¦¬ìŠ¤íŠ¸ì— ìžˆë‹¤" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, c-format msgid "" "The file %s already exists.\n" @@ -4934,7 +5017,7 @@ msgstr "ê¸°ìˆ ëœ \"%s\" 파ì¼ì€ 존재하지 않는다" msgid "The value is invalid" msgstr "ê°’ì´ ë¹„ì í•© 합니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "테마" @@ -4966,7 +5049,7 @@ msgstr "" "ì´ ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì‹œë®¬ë ˆì´í„°ëŠ” ì•¡ì…˜ ë¦¬í”Œë ˆì´ ìŠ¤ìŠ¤ë¡œ 수정한 코드를 지ì›í•˜ì§€ ì•Š" "는다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "ì´ê²ƒì€ Wii 메뉴와 ì¼ë¶€ 게임들ì—ì„œ ëŠë ¤ì§ì„ 유발할 수 있다." @@ -4988,7 +5071,7 @@ msgstr "" "\n" "확신 없다면. ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -5001,11 +5084,11 @@ msgstr "" "\n" "키보드 단축키 : ë³‘ëª©ì„ ì¦‰ê° ë„려면 눌러ë¼." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "ì´ê²ƒì€ BGMê°™ì€ ìŒì•… íŠ¸ëž™ë“¤ì„ ìž¬ìƒí•˜ëŠ” ë°ì— 쓰입니다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5031,7 +5114,7 @@ msgid "Tilt" msgstr "기울기" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr " 제목" @@ -5046,15 +5129,16 @@ msgstr "모든 로그 타입 토글" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "위" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "전통 중국어" @@ -5062,7 +5146,7 @@ msgstr "전통 중국어" msgid "Tried to load an unknown file type." msgstr "알려지지 ì•Šì€ íŒŒì¼ íƒ€ìž…ì„ ë¡œë“œì‹œë„했다." -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "트리거" @@ -5078,7 +5162,7 @@ msgstr "" "효한 SYSCONFì—ì„œ ì½ê¸° ì‹œë„\n" "위모트 bt idë“¤ì€ ìœ ìš©í•˜ì§€ 않습니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Turkish" msgstr "터키어" @@ -5158,15 +5242,6 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "id:%dì˜ ì•Œë ¤ì§€ì§€ ì•Šì€ ë©”ì‹œì§€, 플레ì´ì–´:%d 플레ì´ì–´ 킥킹으로 부터 전달ëœ!" -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"알려지지 ì•Šì€ í¬ì¸í„° %#08x\n" -"계ì†í•©ë‹ˆê¹Œ?" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5181,7 +5256,7 @@ msgstr "ì—…ë°ì´íŠ¸" msgid "Upright Wiimote" msgstr "ì—…ë¼ì´íŠ¸ 위모트" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 모드 (PAL60) 사용" @@ -5193,7 +5268,7 @@ msgstr "전체화면 사용" msgid "Use Hex" msgstr "16진수 사용" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "패닉 핸들러 사용" @@ -5247,7 +5322,7 @@ msgstr "ê°’:" msgid "Verbosity" msgstr "ìƒì„¸ì„¤ëª…" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "비디오" @@ -5255,7 +5330,7 @@ msgstr "비디오" msgid "Virtual" msgstr "ê°€ìƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "볼륨" @@ -5320,6 +5395,41 @@ msgstr "" "그리고 ë‹¹ì‹ ì˜ ë©”ëª¨ë¦¬ì¹´ë“œì— íŒŒì¼ë¡œ ê°™ì€ ì´ë¦„ì„ ê°€ì§‘ë‹ˆë‹¤\n" "계ì†í•©ë‹ˆê¹Œ?" +#: Source/Core/Core/Src/Movie.cpp:629 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, 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" +"\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" +"\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" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -5337,15 +5447,15 @@ msgstr "와ì´ë“œìŠ¤í¬ë¦° 핵" msgid "Width" msgstr "너비" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "Wii 콘솔" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 msgid "Wii NAND Root:" msgstr "Wii NAND 루트:" @@ -5353,7 +5463,7 @@ msgstr "Wii NAND 루트:" msgid "Wii Save Import" msgstr "Wii 저장 가져오기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 저장 파ì¼ë“¤ (*.bin)|*.bin" @@ -5384,7 +5494,7 @@ msgstr "" "í˜¹ì€ ì•„ë§ˆë„ ì•„ì´ë“¤ 타임 아웃ì´ê±°ë‚˜ 다른 ì›ì¸ ë•Œë¬¸ì¸ ê²ƒ 같습니다.\n" "ë‹¹ì‹ ì€ ì¦‰ì‹œ 재연결 하고 싶습니까?" -#: Source/Core/DolphinWX/Src/Main.cpp:599 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Wiimote Connected" msgstr "위모트가 ì—°ê²°ë¨" @@ -5417,9 +5527,9 @@ msgstr "윈ë„우즈 오른쪽" msgid "Word Wrap" msgstr "ìžë™ 줄바꿈" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Working..." msgstr "ìž‘ë™ì¤‘..." @@ -5480,7 +5590,7 @@ msgstr "ì í•©í•œ 10진수나 16진수나 8진수 ê°’ì„ ë„£ì–´ì•¼ 합니다." msgid "You must enter a valid profile name." msgstr "ì í•©í•œ í”„ë¡œíŒŒì¼ ì´ë¦„ì„ ë„£ì–´ì•¼ 합니다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 msgid "You must restart Dolphin in order for the change to take effect." msgstr "ë³€ê²½ì´ ì ìš©ë˜ë ¤ë©´ ëŒí•€ì„ 재시작 해야 합니다." @@ -5503,7 +5613,7 @@ msgstr "" "0x%04x ì´ì–´ì•¼í•©ë‹ˆë‹¤ (하지만 0x%04llx ìž„) \n" "새로 ìƒì„±í•˜ì‹œê² ìŠµë‹ˆê¹Œ?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "ZTP 핵" @@ -5573,7 +5683,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "ì•±ë¡œë” (.img)" @@ -5590,7 +5700,7 @@ msgstr "파ì¼: %s ì—ì„œ ë°ì´í„° ì½ê¸°ì— 실패" msgid "failed to read header" msgstr "í—¤ë” ì½ê¸°ì— 실패했습니다" -#: Source/Core/Core/Src/HW/Memmap.cpp:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: %x ì—ì„œ 옵코드 ì½ê¸°. 보고해주세요." @@ -5609,7 +5719,7 @@ msgstr "들" msgid "unknown cmd 0x%08x" msgstr "알려지지 ì•Šì€ ëª…ë ¹ 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "애플리케ì´ì…˜ 구ë™ìƒì—ì„œ wxExecuteê°€ -1ì„ ë°˜í™˜í–ˆìŠµë‹ˆë‹¤!" @@ -6159,6 +6269,13 @@ msgstr "| OR" #~ msgid "Type %d config not supported in plugin %s" #~ msgstr "%d 타입 í™˜ê²½ì€ í”ŒëŸ¬ê·¸ì¸ %s ì—ì„œ 지ì›ë˜ì§€ 않습니다" +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "알려지지 ì•Šì€ í¬ì¸í„° %#08x\n" +#~ "계ì†í•©ë‹ˆê¹Œ?" + #~ msgid "Use FPS For Limiting" #~ msgstr "ì œí•œì„ ìœ„í•´ FPS ì´ìš©" diff --git a/Languages/po/nb.po b/Languages/po/nb.po index 6f1bd324ac..d922644cbf 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: 2011-10-11 23:25-0500\n" +"POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-06-06 20:15+0100\n" "Last-Translator: Knut \n" "Language-Team: Norwegian \n" @@ -52,9 +52,9 @@ msgstr "\"%s\" er en ugyldig GCM/ISO-fil, eller ikke en GC/Wii ISO." msgid "%1$sCopy%1$s" msgstr "%1$sKopier%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -179,11 +179,11 @@ msgstr "Jukse&kode-manager" msgid "&DSP Settings" msgstr "Innstillinger for &DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "&Slett ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 msgid "&Delete selected ISOs..." msgstr "&Slett valgte ISO-filer..." @@ -247,7 +247,7 @@ msgstr "&Pause" msgid "&Play" msgstr "&Spill" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "&Egenskaper" @@ -291,7 +291,7 @@ msgstr "Vi&s" msgid "&Wiimote Settings" msgstr "Innstillinger for Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "&Wiki" @@ -340,10 +340,11 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -400,8 +401,8 @@ msgstr "" "\n" "Du mÃ¥ fremme TCP-porten til verten!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "AM-Baseboard" @@ -442,6 +443,7 @@ msgstr "" "Hvis usikker, velg EFB til tekstur isteden." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 msgid "Action" msgstr "Aksjon" @@ -541,11 +543,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Legg Til" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "Legg til Action Replay Kode" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "Legg til Patch" @@ -553,9 +555,9 @@ msgstr "Legg til Patch" msgid "Add new pane" msgstr "Legg til ny rute" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Add..." msgstr "Legg til..." @@ -607,7 +609,7 @@ msgstr "Juster analogkontrolltrykket som kreves for Ã¥ aktivere knapper." msgid "Advanced" msgstr "Avansert" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "Avanserte Innstillinger" @@ -615,28 +617,28 @@ msgstr "Avanserte Innstillinger" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Alle GC/Wii-filer (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Alle GC/Wii-bildefiler (gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "Alle GameCube GCM-filer (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Alle Save States (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO-filer (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle komprimerte GC/Wii-filer (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "Alle filer (*.*)|*.*" @@ -675,7 +677,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Applikasjonlaster klarte ikke Ã¥ laste fra fil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "Applikasjonslaster:" @@ -693,7 +695,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Arabisk" @@ -702,7 +704,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:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -710,13 +712,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:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 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:725 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspektforhold:" @@ -725,11 +727,11 @@ msgstr "Aspektforhold:" msgid "At least one pane must remain open." msgstr "Minst en rute mÃ¥ stÃ¥ Ã¥pen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" msgstr "Audio Backend:" @@ -737,7 +739,7 @@ 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:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisk" @@ -780,7 +782,7 @@ msgstr "" msgid "Back" msgstr "Tilbake" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" msgstr "Backend-innstillinger" @@ -790,7 +792,7 @@ msgid "Backend:" msgstr "Backend:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Bakgrunnsinndata" @@ -803,15 +805,15 @@ msgid "Bad File Header" msgstr "DÃ¥rlig Fil-header" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "Bannerdetaljer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "Banner:" @@ -823,7 +825,7 @@ msgstr "Bar" msgid "Basic" msgstr "Grunnleggende" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "Grunnleggende Innstillinger" @@ -852,7 +854,7 @@ msgid "Blue Right" msgstr "BlÃ¥ Høyre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Bunn" @@ -861,7 +863,7 @@ msgstr "Bunn" msgid "Bound Controls: %lu" msgstr "Bundede Kontroller: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "Ødelagt" @@ -869,7 +871,7 @@ msgstr "Ødelagt" msgid "Browse" msgstr "Bla i" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "Bla etter en mappe Ã¥ legge til" @@ -877,7 +879,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:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "Bla etter lagringssted" @@ -885,7 +887,7 @@ msgstr "Bla etter lagringssted" msgid "Buffer:" msgstr "Buffer:" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -896,11 +898,11 @@ msgstr "Knapper" msgid "C Stick" msgstr "C-joystick" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "C-joystick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "CPU-emulatormotor" @@ -949,15 +951,11 @@ msgstr "Avbryt" msgid "Cannot open %s" msgstr "Kan ikke Ã¥pne %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "" - #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "Kan ikke avregistrere events med events under behandling" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -967,7 +965,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:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -996,7 +994,7 @@ msgstr "Kan ikke lese fra DVD_Plugin - DVD-Interface: Fatal Feil" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Katalansk" @@ -1013,6 +1011,7 @@ msgid "Change &Disc..." msgstr "Endre &Disk..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "Endre Disk" @@ -1020,7 +1019,7 @@ msgstr "Endre Disk" msgid "Change Game" msgstr "Endre Spill" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1036,8 +1035,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:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "Ã… endre dette vil ikke ha noen effekt mens emulatoren kjører!" @@ -1057,31 +1056,31 @@ msgstr "Juksekodesøk" msgid "Cheats Manager" msgstr "Juksekode Manager" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Kinesisk (Simplifisert)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Kinesisk (Tradisjonell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "Velg en DVD-rotmappe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Choose a NAND root directory:" msgstr "Velg en NAND-rotmappe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "Velg en standard-ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "Velg en mappe Ã¥ legge til" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "Velg en fil Ã¥ Ã¥pne" @@ -1089,7 +1088,7 @@ msgstr "Velg en fil Ã¥ Ã¥pne" msgid "Choose a memory card:" msgstr "Velg et minnekort:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1097,8 +1096,8 @@ msgstr "" "Velg fil til Ã¥ bruke som applikasjonslaster: (gjelder kun for disker laget " "fra mapper)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "Velg mappen Ã¥ ekstrahere til" @@ -1117,7 +1116,7 @@ msgstr "Klassisk" msgid "Clear" msgstr "Tøm" -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." msgstr "Klarering feilet." @@ -1131,7 +1130,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Lukk" @@ -1156,20 +1155,20 @@ msgstr "Kommando" msgid "Comment" msgstr "Kommentar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "Kommentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "Komprimer ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "Komprimer valgte ISO-er..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "Komprimerer ISO" @@ -1196,13 +1195,13 @@ msgstr "Konfigurer Kontrollere" msgid "Configure..." msgstr "Konfigurer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "Bekreft filoverskriving" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Confirm on Stop" msgstr "Bekreft ved Stans" @@ -1211,7 +1210,7 @@ msgstr "Bekreft ved Stans" msgid "Connect" msgstr "Koble til" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "Koble til USB-tastatur" @@ -1221,22 +1220,26 @@ msgid "Connect Wiimote %i" msgstr "Koble til Wiimote %i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "Koble til Wiimote 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "Koble til Wiimote 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "Koble til Wiimote 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "Koble til Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Connecting..." msgstr "Kobler til..." @@ -1261,7 +1264,7 @@ msgstr "Kopi feilet" msgid "Copy to Memcard %c" msgstr "Kopier til Minnekort %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "Kjerne" @@ -1291,7 +1294,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Kunne ikke gjennkjenne ISO-fil %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "Kunne ikke lagre %s" @@ -1317,7 +1320,7 @@ msgstr "" "\n" "Kjører du Dolphin fra en CD/DVD, eller er lagringsfilen kanskje beskyttet?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "Kunne ikke finne Ã¥pningskommandoen for utvidelsen 'ini'!" @@ -1334,7 +1337,7 @@ msgstr "" msgid "Count:" msgstr "Antall:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "Land:" @@ -1348,21 +1351,21 @@ msgstr "Lag AR-kode" msgid "Create new perspective" msgstr "Lag nytt perspektiv" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr "Laget av KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr "Laget av VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Laget av black_rider og publisert pÃ¥ ForumW.org > Web Developments" @@ -1397,7 +1400,7 @@ msgstr "Kryssutfase" 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:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" msgstr "Selvdefinert Projeksjons-hack" @@ -1405,15 +1408,15 @@ msgstr "Selvdefinert Projeksjons-hack" msgid "Custom Projection Hack Settings" msgstr "Innstillinger for Selvdefinerte Projeksjons-hack" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." msgstr "Selvdefiner noen Ortografisk Projeksjons-parametere." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Tsjekkisk" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "D-Pad" @@ -1421,24 +1424,24 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP Emulator Engine" msgstr "CPU Emulatormotor" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE-emulering (raskt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (tregt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP LLE on Thread" msgstr "DSP LLE pÃ¥ CPU-trÃ¥d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "DSP LLE re-kompilering" @@ -1446,7 +1449,7 @@ msgstr "DSP LLE re-kompilering" msgid "DSP settings" msgstr "Innstillinger for DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "DVD-rot:" @@ -1454,7 +1457,7 @@ msgstr "DVD-rot:" msgid "Data Size" msgstr "Datastørrelse" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "Dato:" @@ -1483,16 +1486,16 @@ msgstr "Debugging" msgid "Decimal" msgstr "Desimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "Dekomprimer ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "Dekomprimer valgte ISO-filer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "Dekomprimerer ISO" @@ -1500,7 +1503,7 @@ msgstr "Dekomprimerer ISO" msgid "Default" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "Standard-ISO:" @@ -1544,8 +1547,8 @@ msgstr "" msgid "Device" msgstr "Device" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "Innstillinger for device" @@ -1630,7 +1633,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "Disk" @@ -1657,11 +1660,11 @@ msgstr "" msgid "Divide" msgstr "Del" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 msgid "Do you want to stop the current emulation?" msgstr "Vil du stoppe pÃ¥gÃ¥ende emulering?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "Dolphin" @@ -1686,12 +1689,12 @@ msgstr "Dolphin Emulert Wiimote Konfigurasjon" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC-kontroll konfigurasjon" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS-Filmer (*.dtm)" @@ -1703,7 +1706,7 @@ msgstr "Dolphin Wiimote Konfigurasjon" msgid "Dolphin at &Google Code" msgstr "Dolphin pÃ¥ &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1711,7 +1714,7 @@ msgstr "" "Dolphin kunne ikke finne noen GC/Wii ISO-filer. Dobbeltklikk her for Ã¥ bla " "etter filer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1741,7 +1744,7 @@ msgstr "Trommer" msgid "Dummy" msgstr "Juksedukke" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Dump Audio" @@ -1787,9 +1790,9 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Nederlansk" @@ -1841,8 +1844,8 @@ msgstr "Endre Patch" msgid "Edit current perspective" msgstr "Endre nÃ¥værende perspektiv" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "Endre..." @@ -1854,7 +1857,7 @@ msgstr "Effekt" msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer (EFB)" -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "Emulator-CPU-trÃ¥den kjører allerede" @@ -1892,7 +1895,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emulert Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "Emulasjonsstatus:" @@ -1920,7 +1923,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "Aktiver AR-logging" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "Aktiver Audio Throttle" @@ -1932,15 +1935,19 @@ msgstr "Aktiver BAT" msgid "Enable Block Merging" msgstr "Aktiver Block Merging" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Aktiver cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Cheats" msgstr "Aktiver Juksekoder" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "Aktiver DTK-musikk" @@ -1948,7 +1955,7 @@ msgstr "Aktiver DTK-musikk" msgid "Enable Dual Core" msgstr "Aktiver Dobbelkjerne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "Aktiver Dobbelkjerne (for bedre ytelse)" @@ -1960,7 +1967,7 @@ msgstr "Aktiver Snarveistaster" msgid "Enable Idle Skipping" msgstr "Aktiver Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "Aktiver Idle Skipping (for bedre ytelse)" @@ -1973,7 +1980,7 @@ msgstr "Aktiver MMU" msgid "Enable Progressive Scan" msgstr "Aktiver Progressiv Skanning" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Enable Screen Saver" msgstr "Aktiver Skjermsparer" @@ -2034,7 +2041,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2052,7 +2059,7 @@ msgstr "" "Unit (MMU). Nøyaktig for maskinvaren, men treg Ã¥ emulere. (PÃ… = Kompitabelt, " "AV = Raskt)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" msgstr "Tillater Selvdefinerte Projeksjons-hack" @@ -2091,9 +2098,9 @@ msgstr "" msgid "End" msgstr "Slutt" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Engelsk" @@ -2122,15 +2129,29 @@ msgstr "Lik" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Feil" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Feil ved lasting av valgt sprÃ¥k. Faller tilbake til systemstandarden." -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2164,11 +2185,12 @@ msgstr "Avslutt Dolphin med emulator" msgid "Export Failed" msgstr "Eksportering mislyktes" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "Eksporter Fil" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "Eksporter Opptak" @@ -2180,7 +2202,7 @@ msgstr "Eksporter Opptak..." msgid "Export Save" msgstr "Eksporter Lagringsfil" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "Eksporter Wii-lagringsfil (Eksperimentiell)" @@ -2212,44 +2234,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:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "Ekstraher Alle Filer..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "Ekstraher Applikasjonslaster..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "Ekstraher DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "Ekstraher Mappe..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "Ekstraher Fil..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "Ekstraher Partisjon..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "Ekstraherer %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "Ekstraherer Alle Filer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "Ekstraherer Mappe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "Ekstraherer..." @@ -2265,7 +2287,7 @@ msgstr "FIFO-spiller" msgid "FRANCE" msgstr "FRANKRIKE" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "FST-størrelse:" @@ -2281,7 +2303,7 @@ msgstr "Lytting Mislyktes!" msgid "Failed to download codes." msgstr "Nedlasting av koder mislyktes." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "Ekstrahering til %s mislyktes!" @@ -2456,11 +2478,11 @@ msgstr "Filen ikke komprimert" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Ukjent Ã¥penmodus: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "Filsystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Filtypen 'ini' er ukjent! kan ikke Ã¥pnes!" @@ -2480,7 +2502,7 @@ msgstr "Tving 16:9" msgid "Force 4:3" msgstr "Tving 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Force Console as NTSC-J" msgstr "Tving Konsoll til NTSC-J" @@ -2513,7 +2535,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2545,6 +2567,7 @@ msgid "Frame " msgstr "Stillbilde" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "Bilde-for-bilde Modus" @@ -2560,7 +2583,7 @@ msgstr "Bilderekkevidde" msgid "Frame S&kipping" msgstr "Frame S&kipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "Framelimit:" @@ -2572,9 +2595,9 @@ msgstr "Bilder Til Opptak" msgid "Free Look" msgstr "Fri Utkikk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "French" msgstr "Fransk" @@ -2599,11 +2622,16 @@ msgstr "Fullskjermsoppløsning:" msgid "GCI File(*.gci)" msgstr "GCI Fil(*.gci)" +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +#, fuzzy +msgid "GCMic Configuration" +msgstr "Konfigurer Logg" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "GC-kontroll" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "Spill-ID:" @@ -2619,7 +2647,7 @@ msgstr "Et spill kjører ikke!" msgid "Game not found!!" msgstr "Spill ikke funnet!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "Spill-spesifikke Innstillinger" @@ -2627,7 +2655,7 @@ msgstr "Spill-spesifikke Innstillinger" msgid "GameConfig" msgstr "SpillKonfigurasjon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "GameCube" @@ -2636,7 +2664,7 @@ msgid "Gamecube &Pad Settings" msgstr "Innstillinger for &GameCube-kontroll" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube-minnekort (*.raw,*.gcp)" @@ -2659,7 +2687,8 @@ msgstr "" "(Enten en dÃ¥rlig kode, eller sÃ¥ støttes ikke kodeformatet.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generelt" @@ -2668,9 +2697,9 @@ msgstr "Generelt" msgid "General Settings" msgstr "Generelle Innstillinger" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "German" msgstr "Tysk" @@ -2709,7 +2738,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ pÃ¥." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" msgstr "Gresk" @@ -2741,7 +2770,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Header-sjekksum feilet" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hebrew" msgstr "Hebraisk" @@ -2801,11 +2830,12 @@ msgid "Hotkey Configuration" msgstr "Konfigurer Snarveistaster" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 msgid "Hotkeys" msgstr "Snarveistaster" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hungarian" msgstr "Ungarsk" @@ -2835,7 +2865,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - dÃ¥rlig destinasjon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "Innstillinger for IPL" @@ -2851,11 +2881,11 @@ msgstr "IR-peker" msgid "IR Sensitivity:" msgstr "IR-sensitivitet:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "ISO-detaljer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "ISO-mapper" @@ -2867,6 +2897,12 @@ msgstr "ITALIA" msgid "Icon" msgstr "Ikon" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" @@ -2874,7 +2910,7 @@ msgstr "" "Hvis bilderatioen er erratisk, kan denne innstillingen hjelpe. (PÃ… = " "Kompitabelt, AV = Raskt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 msgid "" "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." @@ -2964,7 +3000,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "I spillet" @@ -2993,7 +3029,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:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "Sett inn SD-kort" @@ -3005,7 +3041,7 @@ msgstr "Sett inn navn her..." msgid "Install WAD" msgstr "Installer WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 msgid "Install to Wii Menu" msgstr "Installer til Wii Meny" @@ -3014,23 +3050,23 @@ 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:1363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 msgid "Installing WAD..." msgstr "Installer WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 msgid "Interface" msgstr "Kontrollpanel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "Innstillinger for kontrollpanel" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "Intern LZO-feil - komprimering mislyktes" -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3039,7 +3075,7 @@ msgstr "" "Intern LZO-feil - dekomprimering mislyktes (%d) (%li, %li) \n" "Prøv Ã¥ laste Save State'en igjen" -#: Source/Core/Core/Src/State.cpp:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "Intern LZO-feil - lzo_init() mislyktes" @@ -3047,11 +3083,11 @@ msgstr "Intern LZO-feil - lzo_init() mislyktes" msgid "Internal Resolution:" msgstr "Intern Oppløsning:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "Interpreter (VELDIG treg)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "Intro" @@ -3068,7 +3104,7 @@ msgstr "Ugyldig verdi!" msgid "Invalid bat.map or dir entry" msgstr "Ugyldig bat.map eller mappesti" -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "Ugyldig event-type %i" @@ -3088,17 +3124,17 @@ msgstr "" "%s\n" " Det kan hende du mÃ¥ re-dumpe dette spillet." -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "Ugyldig opptaksfil" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "Ugyldig save state" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Italian" msgstr "Italiensk" @@ -3106,16 +3142,16 @@ msgstr "Italiensk" msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "JIT Rekompilerer (anbefalt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "JITIL eksperimentiell rekompilerer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Japanese" msgstr "Japansk" @@ -3124,16 +3160,17 @@ msgid "KOREA" msgstr "KOREA" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "Tast" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Korean" msgstr "Koreansk" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "L" @@ -3142,11 +3179,11 @@ msgid "L Button" msgstr "L-Knappen" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" msgstr "Venstre-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "SprÃ¥k:" @@ -3169,6 +3206,7 @@ msgid "Left Stick" msgstr "Venstre Joystick" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3198,7 +3236,7 @@ msgstr "" msgid "Less Than" msgstr "Mindre Enn" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "Begrens med FPS (bilder-per-sekund)" @@ -3211,34 +3249,42 @@ msgid "Load Custom Textures" msgstr "Last inn Kustomiserte Teksturer" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 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 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 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 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 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 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 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 msgid "Load State Slot 8" msgstr "Last Inn Save State Slot 8" @@ -3246,11 +3292,11 @@ msgstr "Last Inn Save State Slot 8" msgid "Load State..." msgstr "Last Inn Save State..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Last inn Wii System Meny" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Last inn Wii System Meny %d %c" @@ -3277,7 +3323,7 @@ msgstr "Laster den spesifiserte filen (DOL,ELF,WAD,GCM,ISO)" msgid "Local" msgstr "Lokal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Lock Threads to Cores" msgstr "LÃ¥s CPU-trÃ¥der til Kjerner" @@ -3332,16 +3378,16 @@ msgstr "Ytelses-hack for MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark-filer(*.gcs)" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Hoved-joystick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "Skaper-ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "Skaper:" @@ -3363,7 +3409,7 @@ msgid "Memory Byte" msgstr "Memory Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 msgid "Memory Card" msgstr "Minnekort" @@ -3400,7 +3446,7 @@ msgstr "" msgid "Menu" msgstr "Meny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "Mic" @@ -3413,7 +3459,7 @@ msgstr "Minimum" msgid "Misc" msgstr "Diverse" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "Diverse Innstillinger" @@ -3443,7 +3489,7 @@ msgid "Motion Plus" msgstr "Motion Plus" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" @@ -3561,7 +3607,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Opp" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3600,7 +3646,7 @@ msgstr "Brukernavn :" msgid "No Country (SDK)" msgstr "Intet Land (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "Ingen ISO- eller WAD-filer funnet" @@ -3635,7 +3681,7 @@ msgstr "Ingen lagringsmappe funnet for tittel %s" msgid "None" msgstr "Ingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" msgstr "Norsk BokmÃ¥l" @@ -3643,16 +3689,16 @@ msgstr "Norsk BokmÃ¥l" msgid "Not Equal" msgstr "Ikke Lik" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "Ikke Satt" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Not connected" msgstr "Ikke tilkoblet" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "Notater" @@ -3694,7 +3740,7 @@ msgstr "Objekt" msgid "Object Range" msgstr "Objekt Radius" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "Av" @@ -3709,14 +3755,15 @@ msgstr "Kun %d blokker tilgjengelig" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Ã…pne" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "Ã…pne &tilholdsmappe" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "Ã…pne Wii-&lagringsfil-mappe" @@ -3755,7 +3802,7 @@ msgid "Opens the logger" msgstr "Ã…pner loggeren" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Alternativer" @@ -3835,12 +3882,12 @@ msgstr "Partisjon %i" msgid "Patches" msgstr "Patcher" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "Mappestier" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -3849,7 +3896,7 @@ msgstr "Pause" msgid "Per-Pixel Lighting" msgstr "Per-Pikselbelysning" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "Perfekt" @@ -3860,20 +3907,22 @@ msgstr "Perspektiv %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 msgid "Play" msgstr "Spill" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "Spill Opptak" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "Spill/Pause" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "Spillbar" @@ -3885,7 +3934,7 @@ msgstr "Avspillingsalterntiver" msgid "Players" msgstr "Spillere" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 msgid "Please confirm..." msgstr "Vennligst bekreft..." @@ -3897,23 +3946,23 @@ msgstr "Vennligst lag et persektiv før du lagrer" msgid "Plus-Minus" msgstr "Pluss-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Polish" msgstr "Polsk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 msgid "Port 4" msgstr "Port 4" @@ -3922,11 +3971,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese" msgstr "Portugisisk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" msgstr "Portugisisk (Brasilsk)" @@ -3934,6 +3983,21 @@ msgstr "Portugisisk (Brasilsk)" msgid "Post-Processing Effect:" msgstr "postprosesseringseffekt:" +#: Source/Core/Core/Src/Movie.cpp:735 +#, c-format +msgid "Premature movie end in PlayController. %u + 8 > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:829 +#, c-format +msgid "Premature movie end in PlayWiimote. %u + %d > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:806 +#, c-format +msgid "Premature movie end in PlayWiimote. %u > %u" +msgstr "" + #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "ForhÃ¥ndssatte:" @@ -3976,7 +4040,7 @@ msgid "Quit" msgstr "Avslutt" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "R" @@ -3985,7 +4049,7 @@ msgid "R Button" msgstr "R-knappen" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" msgstr "Høyre-analog" @@ -4002,6 +4066,7 @@ msgid "Range" msgstr "Rekkevidde" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "Les-kun-modus" @@ -4074,6 +4139,7 @@ msgid "Refresh" msgstr "Oppdater" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "Oppdater liste" @@ -4081,10 +4147,10 @@ msgstr "Oppdater liste" msgid "Refresh game list" msgstr "Oppdater spilliste" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 msgid "Remove" msgstr "Fjern" @@ -4103,6 +4169,7 @@ 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 msgid "Reset" msgstr "Restart" @@ -4125,15 +4192,15 @@ msgid "Right Stick" msgstr "Høyre Joystick" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 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:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "Russisk" @@ -4145,7 +4212,7 @@ msgstr "Lagre Sa&ve State" msgid "Safe" msgstr "Sikker" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Sample Rate:" msgstr "Samplingsratio:" @@ -4160,34 +4227,42 @@ msgid "Save GCI as..." msgstr "Lagre GCI som..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 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 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 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 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 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 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 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 msgid "Save State Slot 8" msgstr "Lagre Save State Slot 8" @@ -4195,12 +4270,12 @@ msgstr "Lagre Save State Slot 8" msgid "Save State..." msgstr "Lagre Save State..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "Lagre som..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "Lagre komprimert GCM/ISO" @@ -4208,11 +4283,11 @@ msgstr "Lagre komprimert GCM/ISO" msgid "Save current perspective" msgstr "Lagre nÃ¥værende perspektiv" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "Lagre dekomprimert GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Save State-film %s er korrupt, opptak avsluttes..." @@ -4221,16 +4296,16 @@ msgstr "Save State-film %s er korrupt, opptak avsluttes..." msgid "Scaled EFB Copy" msgstr "Skalert EFB-kopi" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, c-format msgid "Scanning %s" msgstr "Søker i %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "Søker etter ISO-filer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "Søker..." @@ -4246,7 +4321,7 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Søkefilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "Søk i Undermapper" @@ -4261,12 +4336,12 @@ msgstr "Seksjon %s ikke funnet i SYSCONF" msgid "Select" msgstr "Velg" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Velg Opptaksfil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 msgid "Select a Wii WAD file to install" msgstr "Velg en Wii WAD-fil Ã¥ innstallere" @@ -4292,15 +4367,15 @@ msgstr "Velg flytvindu" msgid "Select the file to load" msgstr "Velg fil Ã¥ laste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Velg lagringsfil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Velg en save state Ã¥ laste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Velg en save state Ã¥ lagre" @@ -4370,11 +4445,11 @@ msgstr "Sensorbarposisjon:" msgid "Separator" msgstr "Separatør" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "Serbisk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 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" @@ -4383,7 +4458,7 @@ msgstr "Serieport 1 - Dette er porten enheter som nettadapter bruker" msgid "Set" msgstr "Sett" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "Sett som &standard-ISO" @@ -4397,11 +4472,11 @@ 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:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." msgstr "Innstillinger..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Kan ikke finne konfigurasjonsfilen" @@ -4409,7 +4484,7 @@ msgstr "SetupWiiMem: Kan ikke finne konfigurasjonsfilen" msgid "Shake" msgstr "Rist" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "Kortnavn:" @@ -4470,7 +4545,7 @@ msgstr "Vis JAP" msgid "Show Korea" msgstr "Vis Korea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "Vis SprÃ¥k:" @@ -4510,11 +4585,11 @@ msgstr "Vis WAD" msgid "Show Wii" msgstr "Vis Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 msgid "Show a confirmation box before stopping a game." msgstr "Vis en bekreftelsesboks før spill stoppes." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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 " @@ -4578,15 +4653,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Sideveis-pekende Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Simplifisert Kinesisk" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "Størrelse" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 msgid "Skip BIOS" msgstr "Dropp BIOS" @@ -4632,11 +4707,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 msgid "Slot B" msgstr "Slot B" @@ -4659,7 +4734,7 @@ msgstr "" "Det er kun nyttig for Ã¥ debugge.\n" "Vil du virkelig benytte programvarerendering? Hvis usikker, velg 'nei'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Innstillinger for Audio" @@ -4677,9 +4752,9 @@ msgstr "Laging av lydbuffer mislyktes: %s" msgid "Space" msgstr "Mellomrom" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Spanish" msgstr "Spansk" @@ -4722,7 +4797,7 @@ msgstr "Kvadrat-joystick" msgid "Standard Controller" msgstr "Standardkontroller" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4737,14 +4812,16 @@ msgid "Start Re&cording" msgstr "Begynn &Opptak" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "Begynn Opptak" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "Save State" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "Save State-lagringsfiler" @@ -4755,6 +4832,7 @@ msgstr "Joystick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stopp" @@ -4798,8 +4876,8 @@ msgstr "Importering av lagringsfiler vellykket" msgid "Swing" msgstr "Sving" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "SystemsprÃ¥k:" @@ -4832,9 +4910,14 @@ msgstr "Tabell Høyre" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" msgstr "Ta Skjermbilde" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "Test" @@ -4863,13 +4946,13 @@ msgstr "Adressen er ugyldig" msgid "The checksum was successfully fixed" msgstr "Fiksing av sjekksummen var vellykket" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "The chosen directory is already in the list" msgstr "Den valgte mappen finnes allerede i listen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, c-format msgid "" "The file %s already exists.\n" @@ -4957,7 +5040,7 @@ msgstr "Den spesifiserte filen \"%s\" eksisterer ikke" msgid "The value is invalid" msgstr "Verdien er ugyldig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "Tema" @@ -4988,7 +5071,7 @@ msgstr "" "Denne Action Replay-simulatoren støtter ikke koder som modifiserer selve " "Action Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 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." @@ -5010,7 +5093,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -5024,12 +5107,12 @@ msgstr "" "\n" "Tastatursnarvei : Hold nede for Ã¥ deaktivere Audio Throttle." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" "Dette formatet brukes for Ã¥ spille musikkspor, som bakgrunnsmusikk (BGM)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5055,7 +5138,7 @@ msgid "Tilt" msgstr "Tilt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr "Tittel" @@ -5070,15 +5153,16 @@ msgstr "Vipp Alle Loggtyper" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Topp" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Tradisjonell Kinesisk" @@ -5086,7 +5170,7 @@ msgstr "Tradisjonell Kinesisk" msgid "Tried to load an unknown file type." msgstr "Forsøkte Ã¥ laste en ukjent filtype." -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "Triggere" @@ -5102,7 +5186,7 @@ msgstr "" "Forsøker Ã¥ lese fra ugyldig SYSCONF\n" "Wiimote bt ids er ikke tilgjengelig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Turkish" msgstr "Tyrkisk" @@ -5181,15 +5265,6 @@ msgstr "Ukjent melding mottatt med ID: %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Ukjent melding mottatt med ID: %d fra spiller: %d Sparker spiller!" -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Ukjent peker %#08x\n" -"Fortsett?" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5204,7 +5279,7 @@ msgstr "Oppdater" msgid "Upright Wiimote" msgstr "Mot-skjerm-pekende Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Bruk EuRGB60-modus (PAL60)" @@ -5216,7 +5291,7 @@ msgstr "Bruk Fullskjerm" msgid "Use Hex" msgstr "Bruk Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "Bruk Panikkadvarslere" @@ -5271,7 +5346,7 @@ msgstr "Verdi:" msgid "Verbosity" msgstr "Verbøsitet" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "Video" @@ -5279,7 +5354,7 @@ msgstr "Video" msgid "Virtual" msgstr "Virtuell" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "Volum" @@ -5344,6 +5419,41 @@ msgstr "" "og har samme navn som en fil pÃ¥ ditt minnekort\n" "Fortsette?" +#: Source/Core/Core/Src/Movie.cpp:629 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, 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" +"\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" +"\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" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -5361,15 +5471,15 @@ msgstr "Widescreen Hack" msgid "Width" msgstr "Bredde" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "Wii-konsoll" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 msgid "Wii NAND Root:" msgstr "Wii NAND-rot:" @@ -5377,7 +5487,7 @@ msgstr "Wii NAND-rot:" msgid "Wii Save Import" msgstr "Importer Wii-lagringsfil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii-lagringsfiler (*.bin)|*.bin" @@ -5408,7 +5518,7 @@ msgstr "" "eller kanskje den koblet seg fra pga. inaktivitet.\n" "Vil du koble til igjen øyeblikkelig?" -#: Source/Core/DolphinWX/Src/Main.cpp:599 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Wiimote Connected" msgstr "Wiimote Tilkoblet" @@ -5441,9 +5551,9 @@ msgstr "Windows Høyre" msgid "Word Wrap" msgstr "Ordkrumning" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Working..." msgstr "Arbeider..." @@ -5504,7 +5614,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:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 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." @@ -5527,7 +5637,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:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "ZTP-hack" @@ -5597,7 +5707,7 @@ msgstr "" msgid "^ ADD" msgstr "^ LEGG TIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "applikasjonslaster (.img)" @@ -5614,7 +5724,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:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Leser Opcode fra %x. Vennligst rapporter." @@ -5633,7 +5743,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "ukjent cmd 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returnerte -1 pÃ¥ applikasjonskjøring!" @@ -6114,6 +6224,13 @@ msgstr "| ELLER" #~ msgstr "" #~ "Dette formatet brukes vanligvis til Ã¥ spille stemme- og lyd- effekter." +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "Ukjent peker %#08x\n" +#~ "Fortsett?" + #~ msgid "Use FPS For Limiting" #~ msgstr "Bruk FPS (Bilder-per-sekund) For Begrensning" diff --git a/Languages/po/nl.po b/Languages/po/nl.po index 8e9a210221..e77719aeb3 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: 2011-10-11 23:25-0500\n" +"POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-08-07 16:43+0100\n" "Last-Translator: Goost \n" "Language-Team: DevPro Team. \n" @@ -51,9 +51,9 @@ msgstr "\"%s\" is een onjuist GCM/ISO bestand of het is geen GC/Wii ISO." msgid "%1$sCopy%1$s" msgstr "%1$sKopieer%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -178,11 +178,11 @@ msgstr "&Cheats Manager" msgid "&DSP Settings" msgstr "&DSP Instellingen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "&Verwijder ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 msgid "&Delete selected ISOs..." msgstr "&Verwijder geselecteerde ISOs ..." @@ -246,7 +246,7 @@ msgstr "&Pauze" msgid "&Play" msgstr "&Speel " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "&Eigenschappen " @@ -290,7 +290,7 @@ msgstr "&Bekijk " msgid "&Wiimote Settings" msgstr "&Wiimote Instellingen " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "" @@ -339,10 +339,11 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -400,8 +401,8 @@ msgstr "" "\n" "Je moet de TCP poort forwarden voor het hosten!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "AM-Baseboard" @@ -442,6 +443,7 @@ msgstr "" "In geval van twijfel leeg laten." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 msgid "Action" msgstr "Actie" @@ -542,11 +544,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Voeg toe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "Voeg ActionReplay Code toe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "Voeg Patch toe" @@ -554,9 +556,9 @@ msgstr "Voeg Patch toe" msgid "Add new pane" msgstr "Voeg een nieuwe paneel toe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Add..." msgstr "Voeg toe..." @@ -608,7 +610,7 @@ msgstr "Stel de vereiste analoge control druk in om de knop te activeren." msgid "Advanced" msgstr "Geavanceerd" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "Geavanceerde Instellingen" @@ -616,28 +618,28 @@ msgstr "Geavanceerde Instellingen" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Alle GC/Wii bestanden (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Alle GC/Wii images (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM bestanden (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Alle Opgeslagen Staten (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO Bestanden (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle gecomprimeerde GC/Wii ISO-bestanden (GCZ)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "Alle Bestanden (*.*)|*.*" @@ -675,7 +677,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:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "Applader:" @@ -693,7 +695,7 @@ msgstr "" "\n" "In geval van twijfel selecteer (uit)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Arabisch" @@ -702,7 +704,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:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -710,13 +712,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:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 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:725 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Beeldverhouding:" @@ -725,11 +727,11 @@ msgstr "Beeldverhouding:" msgid "At least one pane must remain open." msgstr "Er moet tenminste één paneel open blijven." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "Geluid" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" msgstr "Geluid Backend:" @@ -737,7 +739,7 @@ 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:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -776,7 +778,7 @@ msgstr "" msgid "Back" msgstr "Terug" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" msgstr "Backend Instellingen" @@ -786,7 +788,7 @@ msgid "Backend:" msgstr "Geluids backend:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Achtergrond invoer" @@ -799,15 +801,15 @@ msgid "Bad File Header" msgstr "Verkeerde bestands header" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "Banner Details" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "Banner:" @@ -819,7 +821,7 @@ msgstr "Balk" msgid "Basic" msgstr "Basis" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "Basis Instellingen" @@ -848,7 +850,7 @@ msgid "Blue Right" msgstr "Blauw Rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Onder" @@ -857,7 +859,7 @@ msgstr "Onder" msgid "Bound Controls: %lu" msgstr "Gekoppelde controls: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "Defect" @@ -865,7 +867,7 @@ msgstr "Defect" msgid "Browse" msgstr "Zoek" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "Zoek een folder om toe te voegen" @@ -873,7 +875,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:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "Zoek een uitvoer folder" @@ -881,7 +883,7 @@ msgstr "Zoek een uitvoer folder" msgid "Buffer:" msgstr "Buffer:" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -891,11 +893,11 @@ msgstr "Knoppen" msgid "C Stick" msgstr "C Stick" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "CPU Emulatie Motor" @@ -947,15 +949,11 @@ msgstr "Annuleer" msgid "Cannot open %s" msgstr "Kan %s niet openen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "" - #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "Kan geen events afmelden als er events in afwachting zijn" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -965,7 +963,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:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -994,7 +992,7 @@ msgstr "Kan niet lezen van DVD_Plugin - DVD-Interface: Fatal Error" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Catalaans" @@ -1011,6 +1009,7 @@ msgid "Change &Disc..." msgstr "Verander &Schijf" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "Verander Schijf" @@ -1018,7 +1017,7 @@ msgstr "Verander Schijf" msgid "Change Game" msgstr "Spel veranderen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1034,8 +1033,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:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 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!" @@ -1055,31 +1054,31 @@ msgstr "Cheat Zoeken" msgid "Cheats Manager" msgstr "Cheats Manager" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Chinees (Vereenvoudigd)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Chinees (Traditioneel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "Kies een DVD Station:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Choose a NAND root directory:" msgstr "Kies een NAND basismap:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "Kies een standaard ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "Kies een folder om toe te voegen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "Kies een bestand om te openen" @@ -1087,7 +1086,7 @@ msgstr "Kies een bestand om te openen" msgid "Choose a memory card:" msgstr "Kies een geheugen kaart:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1095,8 +1094,8 @@ msgstr "" "Kies Bestand te gebruiken als apploader: (geldt voor disks die alleen mappen " "uit mappen zijn opgebouwd)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "Kies de folder om naar uit te pakken" @@ -1115,7 +1114,7 @@ msgstr "Klassiek" msgid "Clear" msgstr "Legen" -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." msgstr "Legen mislukt." @@ -1129,7 +1128,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Sluit" @@ -1154,20 +1153,20 @@ msgstr "Commando" msgid "Comment" msgstr "Reactie" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "Reactie:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "Comprimeer ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "Comprimeer geselecteerde ISO's ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "ISO wordt gecomprimeerd" @@ -1194,13 +1193,13 @@ msgstr "Configureer Besturing Pads" msgid "Configure..." msgstr "Configureer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "Bevestig om bestand over te schrijven." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 #, fuzzy msgid "Confirm on Stop" msgstr "Bevestiging om te stoppen" @@ -1210,7 +1209,7 @@ msgstr "Bevestiging om te stoppen" msgid "Connect" msgstr "Verbind" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "Verbind USB Toetsenbord" @@ -1220,22 +1219,26 @@ msgid "Connect Wiimote %i" msgstr "Verbind Wiimote %i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "Verbind Wiimote 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "Verbind Wiimote 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "Verbind Wiimote 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "Verbind Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Connecting..." msgstr "Verbinden..." @@ -1260,7 +1263,7 @@ msgstr "Kopiëren mislukt" msgid "Copy to Memcard %c" msgstr "Kopieer naar MemKaart %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "Core" @@ -1290,7 +1293,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Kon ISO bestand %s niet herkennen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "Kon %s niet opslaan" @@ -1317,7 +1320,7 @@ msgstr "" "Draai je Dolphin vanaf een CD/DVD, of is het bestand misschien beveiligd " "tegen schrijven?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "Kon geen open commando vinden voor extensie 'ini'!" @@ -1334,7 +1337,7 @@ msgstr "" msgid "Count:" msgstr "Tel:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "Land:" @@ -1348,20 +1351,20 @@ msgstr "Maak AR Code" msgid "Create new perspective" msgstr "Maak een nieuwe perspective" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr "Gemaakt door KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr "Gemaakt door VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "Gemaakt door black_rider and published on ForumW.org > Web Developments" @@ -1397,7 +1400,7 @@ msgstr "" 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:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" msgstr "Aangepaste Projectie Hack" @@ -1405,15 +1408,15 @@ msgstr "Aangepaste Projectie Hack" msgid "Custom Projection Hack Settings" msgstr "Aangepaste Projectie Instellingen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." msgstr "Pas sommige orthogonale projectie parameters aan." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Tsjechisch" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "D-Pad" @@ -1421,24 +1424,24 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP Emulator Engine" msgstr "DSP Emulator Motor" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulatie (snel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE Interpreteer (Behoorlijk langzaam)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP LLE on Thread" msgstr "DSP LLE op Thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "DSP LLE hercompileerder" @@ -1446,7 +1449,7 @@ msgstr "DSP LLE hercompileerder" msgid "DSP settings" msgstr "DSP Instellingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "DVD Station:" @@ -1454,7 +1457,7 @@ msgstr "DVD Station:" msgid "Data Size" msgstr "Data grootte" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "Datum:" @@ -1484,16 +1487,16 @@ msgstr "Debug" msgid "Decimal" msgstr "Decimaal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "Decomprimeer ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "Decomprimeer geselecteerde ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "Decomprimeer ISO" @@ -1501,7 +1504,7 @@ msgstr "Decomprimeer ISO" msgid "Default" msgstr "Standaard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "Standaard ISO:" @@ -1545,8 +1548,8 @@ msgstr "" msgid "Device" msgstr "Apparaat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "Apparaat Instellingen" @@ -1632,7 +1635,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "Schijf" @@ -1659,11 +1662,11 @@ msgstr "" msgid "Divide" msgstr "Verdelen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 msgid "Do you want to stop the current emulation?" msgstr "Wil je de emulatie stoppen?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "Dolphin" @@ -1688,12 +1691,12 @@ msgstr "Dolphin Geëmuleerde Wiimote configuratie" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Configuratie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Film (*.dtm)" @@ -1705,14 +1708,14 @@ msgstr "Dolphin Wiimote configuratie" msgid "Dolphin at &Google Code" msgstr "Dolphin op &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 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:307 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1742,7 +1745,7 @@ msgstr "Drums" msgid "Dummy" msgstr "Pop" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Dump Geluid" @@ -1788,9 +1791,9 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Nederlands" @@ -1842,8 +1845,8 @@ msgstr "Wijzig Patch" msgid "Edit current perspective" msgstr "Wijzig het huidige perspectief" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "Wijzig..." @@ -1855,7 +1858,7 @@ msgstr "Effect" msgid "Embedded Frame Buffer" msgstr "Ingebedde Frame Buffer" -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "Emu Thread draait al!" @@ -1893,7 +1896,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Geëmuleerde Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "Emulatie Staat:" @@ -1921,7 +1924,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "Activeer AR Logging" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "Activeer Audio Throttle" @@ -1933,16 +1936,20 @@ msgstr "Activeer BAT" msgid "Enable Block Merging" msgstr "Activeer Block Merging" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Activeer Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Cheats" msgstr "Activeer Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "Activeer DTK Muziek" @@ -1950,7 +1957,7 @@ msgstr "Activeer DTK Muziek" msgid "Enable Dual Core" msgstr "Activeer Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "Activeer Dual Core (verhoogt de snelheid)" @@ -1962,7 +1969,7 @@ msgstr "Activeer Sneltoetsen" msgid "Enable Idle Skipping" msgstr "Activeer Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "Activeer Idle Skipping (verhoogt de snelheid)" @@ -1975,7 +1982,7 @@ msgstr "Activeer MMU" msgid "Enable Progressive Scan" msgstr "Activeer Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Enable Screen Saver" msgstr "Activeer Schermbeveiliger" @@ -2037,7 +2044,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2055,7 +2062,7 @@ msgstr "" "Management Unit. Nauwkeurig voor de hardware, maar langzaam te emuleren. " "(AAN = Compatibel, UIT = Snel)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" msgstr "Schakelt aangepaste projectie hack in" @@ -2094,9 +2101,9 @@ msgstr "" msgid "End" msgstr "Einde" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Engels" @@ -2125,17 +2132,31 @@ msgstr "Gelijk" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error (Fout)" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Fout bij het laden van de geselecteerde taal. Dolphin zal terugvallen op de " "systeemtaal." -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2170,11 +2191,12 @@ msgstr "Sluit Dolphin met emulator" msgid "Export Failed" msgstr "Exporteren Mislukt" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "Exporteer Bestand" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "Exporteer Opname..." @@ -2186,7 +2208,7 @@ msgstr "Exporteer Opname..." msgid "Export Save" msgstr "Exporteer Save" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "Exporteer Wii save (Experimenteel)" @@ -2218,44 +2240,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:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "Alle Bestanden Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "Apploader Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "DOL Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "Map Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "Bestand Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "Partitie Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "%s Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "Alle Bestanden Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "Uitpakken van de map" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "Uitpakken..." @@ -2271,7 +2293,7 @@ msgstr "FIFO Speler" msgid "FRANCE" msgstr "Frankrijk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "FST Groote:" @@ -2287,7 +2309,7 @@ msgstr "Luisteren Mislukt!!" msgid "Failed to download codes." msgstr "Mislukt om de codes te downloaden." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "Mislukt om naar %s uit te pakken!" @@ -2464,11 +2486,11 @@ msgstr "Bestand niet gecompressed" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Onbekende open mode: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "Bestand systeem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Bestandstype 'ini' is onbekend! Kan niet openen!" @@ -2488,7 +2510,7 @@ msgstr "Forceer 16:9" msgid "Force 4:3" msgstr "Forceer 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 #, fuzzy msgid "Force Console as NTSC-J" msgstr "Stel Console in als NTSC-J" @@ -2522,7 +2544,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2555,6 +2577,7 @@ msgid "Frame " msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "Frame Geavanceerd" @@ -2570,7 +2593,7 @@ msgstr "Frame Bereik" msgid "Frame S&kipping" msgstr "Frame O&verslaan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "Framelimiet:" @@ -2582,9 +2605,9 @@ msgstr "Frames om op te nemen" msgid "Free Look" msgstr "Vrije kijk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "French" msgstr "Frans" @@ -2610,11 +2633,16 @@ msgstr "Volledige Scherm Resolutie:" msgid "GCI File(*.gci)" msgstr "GCI Bestand(*.gci)" +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +#, fuzzy +msgid "GCMic Configuration" +msgstr "Logboek configuratie" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "Spel ID:" @@ -2630,7 +2658,7 @@ msgstr "Het spel draait niet!" msgid "Game not found!!" msgstr "Spel niet gevonden!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "Spel Specifieke Instellingen" @@ -2638,7 +2666,7 @@ msgstr "Spel Specifieke Instellingen" msgid "GameConfig" msgstr "Spel Config" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "Gamecube" @@ -2647,7 +2675,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube &Pad Instellingen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Kaarten (*.raw,*.gcp)" @@ -2670,7 +2698,8 @@ msgstr "" "(ofwel een onjuiste code of het type code is nog niet ondersteund.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Algemeen" @@ -2679,9 +2708,9 @@ msgstr "Algemeen" msgid "General Settings" msgstr "Algemene Instellingen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "German" msgstr "Duits" @@ -2720,7 +2749,7 @@ msgstr "" "\n" "In geval van twijfel ingevuld laten." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" msgstr "Grieks" @@ -2752,7 +2781,7 @@ msgstr "" msgid "Header checksum failed" msgstr "Header checksum is mislukt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hebrew" msgstr "Hebreeuws" @@ -2812,11 +2841,12 @@ msgid "Hotkey Configuration" msgstr "Sneltoets Configuratie" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 msgid "Hotkeys" msgstr "Hotkeys" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hungarian" msgstr "Hongaarse" @@ -2848,7 +2878,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - onjuiste bestemming" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "IPL Instellingen" @@ -2864,11 +2894,11 @@ msgstr "IR Aanwijzer" msgid "IR Sensitivity:" msgstr "IR Gevoeligheid:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "ISO Details" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "ISO Map" @@ -2880,6 +2910,12 @@ msgstr "ITALIË" msgid "Icon" msgstr "Icoon" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" @@ -2887,7 +2923,7 @@ msgstr "" "Als de FPS onregelmatig is dan kan deze optie helpen. (AAN = Veilig, UIT = " "Snel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 msgid "" "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." @@ -2979,7 +3015,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "In Game" @@ -3008,7 +3044,7 @@ msgstr "Toevoegen" msgid "Insert Encrypted or Decrypted code here..." msgstr "Voer Gecodeerde of Gedecodeerde code hier in..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "Schakel SD Card in" @@ -3020,7 +3056,7 @@ msgstr "Voeg naam hier toe" msgid "Install WAD" msgstr "Installeer WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 msgid "Install to Wii Menu" msgstr "Installeren in Wii-menu" @@ -3031,24 +3067,24 @@ msgstr "" "InstallExceptionHandler opgeroepen, maar dit platform ondersteund dit nog " "niet." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 msgid "Installing WAD..." msgstr "WAD aan het installeren..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 #, fuzzy msgid "Interface" msgstr "Interface Instellingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "Interface Instellingen" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "Interne LZO fout - compressie is mislukt" -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3057,7 +3093,7 @@ msgstr "" "Interne LZO fout - decompressie is mislukt (%d) (%li, %li) \n" "Probeer de staat opnieuw te laden" -#: Source/Core/Core/Src/State.cpp:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "Interne LZO fout - lzo_init() is mislukt" @@ -3065,11 +3101,11 @@ msgstr "Interne LZO fout - lzo_init() is mislukt" msgid "Internal Resolution:" msgstr "Interne Resolutie:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "Interpreteer (Behoorlijk langzaam)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "Intro" @@ -3086,7 +3122,7 @@ msgstr "Onjuiste waarde!" msgid "Invalid bat.map or dir entry" msgstr "Onjuiste bat.map of map vermelding" -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "Onjuist event type %i" @@ -3106,17 +3142,17 @@ msgstr "" "%s\n" "Wellicht moet je dit spel opnieuw dumpen" -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "Onjuist opname bestand" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "Onjuiste staat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Italian" msgstr "Italië" @@ -3124,16 +3160,16 @@ msgstr "Italië" msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (aanbevolen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "JITIL experimentele recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Japanese" msgstr "Japans" @@ -3142,16 +3178,17 @@ msgid "KOREA" msgstr "KOREA" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "Toets" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Korean" msgstr "Koreaans" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "" @@ -3160,11 +3197,11 @@ msgid "L Button" msgstr "L Knop" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "Taal:" @@ -3187,6 +3224,7 @@ msgid "Left Stick" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3216,7 +3254,7 @@ msgstr "" msgid "Less Than" msgstr "Minder dan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "Limiteer met behulp van FPS" @@ -3229,34 +3267,42 @@ msgid "Load Custom Textures" msgstr "Laad Aangepaste Textures" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 1" msgstr "Laad staat 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 2" msgstr "Laad staat 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 3" msgstr "Laad staat 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 4" msgstr "Laad staat 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 msgid "Load State Slot 5" msgstr "Laad staat 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Load State Slot 6" msgstr "Laad staat 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Load State Slot 7" msgstr "Laad staat 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Load State Slot 8" msgstr "Laad staat 8" @@ -3264,12 +3310,12 @@ msgstr "Laad staat 8" msgid "Load State..." msgstr "Laad staat..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 #, fuzzy msgid "Load Wii System Menu" msgstr "Laad Wii System Menu(%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Laad Wii System Menu(%d %c)" @@ -3296,7 +3342,7 @@ msgstr "Laad het opgegeven bestand (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Lokaal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Lock Threads to Cores" msgstr "Vergrendel Threads aan CPU cores" @@ -3351,16 +3397,16 @@ msgstr "MMU Snelheids Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark bestanden(*.gcs)" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "Maker ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "Maker:" @@ -3382,7 +3428,7 @@ msgid "Memory Byte" msgstr "Geheugen Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 msgid "Memory Card" msgstr "Geheugen Kaart" @@ -3419,7 +3465,7 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "Microfoon" @@ -3432,7 +3478,7 @@ msgstr "Min" msgid "Misc" msgstr "Overig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "Overige Instellingen" @@ -3462,7 +3508,7 @@ msgid "Motion Plus" msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "" @@ -3581,7 +3627,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Omhoog" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3620,7 +3666,7 @@ msgstr "Gebruikersnaam :" msgid "No Country (SDK)" msgstr "Geen land (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "Geen ISOs of WADS gevonden." @@ -3655,7 +3701,7 @@ msgstr "Geen save map gevonden voor titel %s" msgid "None" msgstr "Geen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" msgstr "Noorweegse Bokmaal" @@ -3663,16 +3709,16 @@ msgstr "Noorweegse Bokmaal" msgid "Not Equal" msgstr "Niet gelijk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "Niet ingesteld" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Not connected" msgstr "Niet verbonden" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "Opmerkingen" @@ -3714,7 +3760,7 @@ msgstr "" msgid "Object Range" msgstr "Object Bereik" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "Uit" @@ -3729,14 +3775,15 @@ msgstr "Er zijn maar %d blocks beschikaarr" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Open" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "Open &bevattende map" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "Open Wii &save map" @@ -3775,7 +3822,7 @@ msgid "Opens the logger" msgstr "Open de logger" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Opties" @@ -3856,12 +3903,12 @@ msgstr "Partitie %i" msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pauze" @@ -3870,7 +3917,7 @@ msgstr "Pauze" msgid "Per-Pixel Lighting" msgstr "Per-Pixel Belichting" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "Perfect" @@ -3881,20 +3928,22 @@ msgstr "Perspectief %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 msgid "Play" msgstr "Speel" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "Speel Opname" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "Spel/Pauze" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "Speelbaar" @@ -3906,7 +3955,7 @@ msgstr "Terugspeel Opties" msgid "Players" msgstr "Spelers" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 msgid "Please confirm..." msgstr "Bevestig alsjeblieft..." @@ -3918,23 +3967,23 @@ msgstr "Maak een perspectief voor het opslaan" msgid "Plus-Minus" msgstr "Ongeveer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Polish" msgstr "Pools" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 1" msgstr "Poort 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 2" msgstr "Poort 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Port 3" msgstr "Poort 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 msgid "Port 4" msgstr "Poort 4" @@ -3943,11 +3992,11 @@ msgstr "Poort 4" msgid "Port :" msgstr "Poort :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese" msgstr "Portugees" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" msgstr "Portugees (Braziliaans)" @@ -3955,6 +4004,21 @@ msgstr "Portugees (Braziliaans)" msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" +#: Source/Core/Core/Src/Movie.cpp:735 +#, c-format +msgid "Premature movie end in PlayController. %u + 8 > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:829 +#, c-format +msgid "Premature movie end in PlayWiimote. %u + %d > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:806 +#, c-format +msgid "Premature movie end in PlayWiimote. %u > %u" +msgstr "" + #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "Presets: " @@ -3997,7 +4061,7 @@ msgid "Quit" msgstr "Stoppen" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "" @@ -4006,7 +4070,7 @@ msgid "R Button" msgstr "R Knop" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" msgstr "" @@ -4023,6 +4087,7 @@ msgid "Range" msgstr "Afstand" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "Alleen-lezen modus" @@ -4095,6 +4160,7 @@ msgid "Refresh" msgstr "Ververs" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "Lijst Verversen" @@ -4102,10 +4168,10 @@ msgstr "Lijst Verversen" msgid "Refresh game list" msgstr "Ververs de speellijst" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 msgid "Remove" msgstr "Verwijder" @@ -4125,6 +4191,7 @@ 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 msgid "Reset" msgstr "Opnieuw" @@ -4147,15 +4214,15 @@ msgid "Right Stick" msgstr "Rechter Stick" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 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:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "Russisch" @@ -4167,7 +4234,7 @@ msgstr "S&la Staat Op" msgid "Safe" msgstr "Opslaan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Sample Rate:" msgstr "Sample Rate:" @@ -4182,34 +4249,42 @@ msgid "Save GCI as..." msgstr "Sla GCI op als..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 1" msgstr "Sla Staat 1 Op" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 2" msgstr "Sla Staat 2 Op" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 3" msgstr "Sla Staat 3 Op" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 4" msgstr "Sla Staat 4 op" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 msgid "Save State Slot 5" msgstr "Sla Staat 5 Op" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 msgid "Save State Slot 6" msgstr "Sla Staat 6 Op" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 msgid "Save State Slot 7" msgstr "Sla Staat 7 Op" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 msgid "Save State Slot 8" msgstr "Sla Staat 8 Op" @@ -4217,12 +4292,12 @@ msgstr "Sla Staat 8 Op" msgid "Save State..." msgstr "Sla staat op als..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "Opslaan als..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "Sla gecomprimeerde GCM / ISO op" @@ -4230,11 +4305,11 @@ msgstr "Sla gecomprimeerde GCM / ISO op" msgid "Save current perspective" msgstr "Sla huidige perspectief op" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "Sla gedecomprimeerd GCM / ISO op" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, 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..." @@ -4244,16 +4319,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:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, c-format msgid "Scanning %s" msgstr "Scannen van %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "Scannen voor ISO's" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "Scannen..." @@ -4269,7 +4344,7 @@ msgstr "Scroll Slot" msgid "Search Filter" msgstr "Zoekfilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "Zoeken in submappen" @@ -4284,12 +4359,12 @@ msgstr "Sectie %s niet gevonden in SYSCONF" msgid "Select" msgstr "Selecteer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Selecteer de opname Bestand" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 msgid "Select a Wii WAD file to install" msgstr "Selecteer een Wii WAD bestand om te installeren" @@ -4315,15 +4390,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:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Selecteer het save - bestand" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Selecteer de Staat om te laden" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Selecteer de Staat om op te slaan" @@ -4392,11 +4467,11 @@ msgstr "Sensor Bar Positie:" msgid "Separator" msgstr "Scheidingsteken" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "Servisch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4406,7 +4481,7 @@ msgstr "" msgid "Set" msgstr "Stel" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "Ingesteld als &standaard ISO" @@ -4421,11 +4496,11 @@ 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:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." msgstr "Instellingen..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Kan het instellingen bestand niet vinden" @@ -4433,7 +4508,7 @@ msgstr "SetupWiiMem: Kan het instellingen bestand niet vinden" msgid "Shake" msgstr "Schudden" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "Korte Naam:" @@ -4493,7 +4568,7 @@ msgstr "Toon JAP" msgid "Show Korea" msgstr "Toon Korea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "Toon Taal:" @@ -4533,11 +4608,11 @@ msgstr "Toon Wad" msgid "Show Wii" msgstr "Toon Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 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:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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 " @@ -4601,15 +4676,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Zijdelings Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Vereenvoudigd Chinees" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "Grootte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 msgid "Skip BIOS" msgstr "Sla BIOS Over" @@ -4650,11 +4725,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 msgid "Slot B" msgstr "Slot B" @@ -4678,7 +4753,7 @@ msgstr "" "Weet je zeker dat je software rendering aan wil zetten? In geval van " "twijfel, selecteer 'Nee'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Geluids Instellingen" @@ -4696,9 +4771,9 @@ msgstr "Het aanmaken van de geluids buffer is mislukt: %s" msgid "Space" msgstr "Ruimte" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Spanish" msgstr "Spaans" @@ -4742,7 +4817,7 @@ msgstr "" msgid "Standard Controller" msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4757,14 +4832,16 @@ msgid "Start Re&cording" msgstr "Start Op&nemen" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "Start Opnemen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "Staat" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "Opgeslage Staten" @@ -4775,6 +4852,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stop" @@ -4813,8 +4891,8 @@ msgstr "Succesvol save games geimporteerd" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "Systeem Taal:" @@ -4846,9 +4924,14 @@ msgstr "Rechter Tabel" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" msgstr "Neem een Schermafdruk" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "Test" @@ -4878,13 +4961,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:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "The chosen directory is already in the list" msgstr "De gekozen map is al in de lijst" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, c-format msgid "" "The file %s already exists.\n" @@ -4972,7 +5055,7 @@ msgstr "Het opgegeven bestand \"%s\" bestaat niet" msgid "The value is invalid" msgstr "De waarde is onjuist" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "Thema" @@ -5004,7 +5087,7 @@ msgstr "" "Deze action replay simulator ondersteund geen codes die de Action Replay " "zelf aanpassen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 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." @@ -5026,7 +5109,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -5042,11 +5125,11 @@ msgstr "" "\n" "Sneltoets : Houd ingedrukt om throttle gelijk uit te zetten." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Dit wordt gebruikt om muziek af te spelen, zoals achtergrondmuziek." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5072,7 +5155,7 @@ msgid "Tilt" msgstr "Kantelen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr "Titel" @@ -5087,15 +5170,16 @@ msgstr "Zet Alle Log Types Aan" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Boven" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Chinees (Traditioneel)" @@ -5103,7 +5187,7 @@ msgstr "Chinees (Traditioneel)" msgid "Tried to load an unknown file type." msgstr "Poging tot het laden van een onbekend bestands type." -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "" @@ -5119,7 +5203,7 @@ msgstr "" "Poging tot het inlezen van een ongeldige SYSCONF\n" "Wiimote bt ids zijn niet beschikbaar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Turkish" msgstr "Turks" @@ -5201,15 +5285,6 @@ msgstr "" "Onbekend bericht ontvagen met id : %d ontvangen van speler: %d Speler " "eruitgeschopt!" -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Onbekende pointer %#08x\n" -"Doorgaan?" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5224,7 +5299,7 @@ msgstr "Update" msgid "Upright Wiimote" msgstr "Wiimote rechtop" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Gebruik EuRGB60 Mode (PAL60)" @@ -5236,7 +5311,7 @@ msgstr "Gebruik &Volledig Scherm" msgid "Use Hex" msgstr "Gebruik Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "Gebruik Panic Handlers" @@ -5291,7 +5366,7 @@ msgstr "Waarde:" msgid "Verbosity" msgstr "Breedsprakigheid" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "Video" @@ -5299,7 +5374,7 @@ msgstr "Video" msgid "Virtual" msgstr "Virtueel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "Volume" @@ -5365,6 +5440,41 @@ msgstr "" "en heeft dezelfde naam als een bestand op je geheugenkaart\n" "Doorgaan?" +#: Source/Core/Core/Src/Movie.cpp:629 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, 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" +"\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" +"\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" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -5382,15 +5492,15 @@ msgstr "Breedbeeld Hack" msgid "Width" msgstr "Breedte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "Wii Console " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 msgid "Wii NAND Root:" msgstr "Wii NAND basismap:" @@ -5398,7 +5508,7 @@ msgstr "Wii NAND basismap:" msgid "Wii Save Import" msgstr "Wii Save Importeren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii save bestanden (*.bin)|*.bin" @@ -5429,7 +5539,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:599 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Wiimote Connected" msgstr "Wiimote Connected" @@ -5462,9 +5572,9 @@ msgstr "Venster Rechts" msgid "Word Wrap" msgstr "Regelafbreking" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Working..." msgstr "Werken..." @@ -5525,7 +5635,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:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Je moet Dolphin herstarten voordat deze optie effect zal hebben." @@ -5548,7 +5658,7 @@ msgstr "" "Het zou 0x%04x moet zijn, maar is 0x%04llx \n" "Wil je een nieuwe genereren?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "ZTP hack" @@ -5617,7 +5727,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ERBIJ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "applader (.img)" @@ -5634,7 +5744,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:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Lezen van Opcode vanaf %x. Graag rapporteren." @@ -5654,7 +5764,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "onbekend commando 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute retourneerde -1 bij het draaien van de applicatie!" @@ -6075,6 +6185,13 @@ msgstr "| OF" #~ msgstr "" #~ "Dit wordt meestal gebruikt om spraak-en geluidseffecten af te spelen." +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "Onbekende pointer %#08x\n" +#~ "Doorgaan?" + #~ msgid "Use FPS For Limiting" #~ msgstr "Gebruik fps voor Beperkingen." diff --git a/Languages/po/pl.po b/Languages/po/pl.po index da4063c325..6aab51aec9 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: 2011-10-11 23:25-0500\n" +"POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-08-12 17:04+0100\n" "Last-Translator: Krzysztof Baszczok \n" "Language-Team: Polish \n" @@ -49,9 +49,9 @@ msgstr "\"%s\" jest niewÅ‚aÅ›ciwym plikiem GMC/ISO lub to nie jest GC/Wii ISO" msgid "%1$sCopy%1$s" msgstr "%1$sKopiuj%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -180,11 +180,11 @@ msgstr "&Menadżer cheatów" msgid "&DSP Settings" msgstr "&Ustawienia DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "&UsuÅ„ ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 msgid "&Delete selected ISOs..." msgstr "&UsuÅ„ wybrane ISO..." @@ -248,7 +248,7 @@ msgstr "&Wstrzymaj" msgid "&Play" msgstr "&Play" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "&WÅ‚aÅ›ciwoÅ›ci" @@ -292,7 +292,7 @@ msgstr "&Widok" msgid "&Wiimote Settings" msgstr "&Ustawienia Wiilota" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "&Wiki" @@ -341,10 +341,11 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -399,8 +400,8 @@ msgstr "" "\n" "Wymagane jest przekierowanie portu TCP do hosta!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "AM-Baseboard" @@ -440,6 +441,7 @@ msgstr "" "W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 msgid "Action" msgstr "Akcja" @@ -540,11 +542,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Dodaj" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "Dodaj kod ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "Dodaj Å‚atkÄ™" @@ -552,9 +554,9 @@ msgstr "Dodaj Å‚atkÄ™" msgid "Add new pane" msgstr "Dodaj nowy panel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Add..." msgstr "Dodaj..." @@ -606,7 +608,7 @@ msgstr "Reguluje siÅ‚Ä™ nacisku wymaganego do aktywacji przycisków." msgid "Advanced" msgstr "Zaawansowane" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "Ustawienia zaawansowane" @@ -614,28 +616,28 @@ msgstr "Ustawienia zaawansowane" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Wszystkie pliki GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Wszystkie obrazy GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "Pliki GCM" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Stany zapisu (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "Wszystkie obrazy Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Spakowane obrazy GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "Wszystkie pliki (*.*)|*.*" @@ -672,7 +674,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:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "Apploader:" @@ -690,7 +692,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, wybierz (wyÅ‚Ä…czone)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Arabski" @@ -699,7 +701,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:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -707,11 +709,11 @@ msgstr "" "Czy jesteÅ› pewny by usunÄ…c te pliki?\n" "PrzepadnÄ… na zawsze!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 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:725 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporcje ekranu:" @@ -720,11 +722,11 @@ msgstr "Proporcje ekranu:" msgid "At least one pane must remain open." msgstr "Przynajmniej jeden manel musi pozostać otwarty." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" msgstr "Audio Backend :" @@ -732,7 +734,7 @@ 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:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -775,7 +777,7 @@ msgstr "" msgid "Back" msgstr "Wstecz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" msgstr "Ustawienia Backend'u" @@ -785,7 +787,7 @@ msgid "Backend:" msgstr "Backend :" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "WejÅ›cie w tle" @@ -798,15 +800,15 @@ msgid "Bad File Header" msgstr "ZÅ‚y nagłówek pliku" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr "Baner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "Szczegóły banera" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "Baner:" @@ -818,7 +820,7 @@ msgstr "Wajcha" msgid "Basic" msgstr "Podstawowy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "Ustawienia podstawowe" @@ -847,7 +849,7 @@ msgid "Blue Right" msgstr "Niebieski prawo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Dół" @@ -856,7 +858,7 @@ msgstr "Dół" msgid "Bound Controls: %lu" msgstr "Bound Controls: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "Zepsuty" @@ -864,7 +866,7 @@ msgstr "Zepsuty" msgid "Browse" msgstr "Szukaj" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "Szukaj folder do dodania" @@ -872,7 +874,7 @@ msgstr "Szukaj folder do dodania" msgid "Browse for an ISO directory..." msgstr "Szukaj folder ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "Szukaj folderu wyjÅ›ciowego" @@ -880,7 +882,7 @@ msgstr "Szukaj folderu wyjÅ›ciowego" msgid "Buffer:" msgstr "Bufor:" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -890,11 +892,11 @@ msgstr "Przyciski" msgid "C Stick" msgstr "C Stick" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "Silnik emulacji CPU" @@ -942,15 +944,11 @@ msgstr "Anuluj" msgid "Cannot open %s" msgstr "Nie moża otworzyć %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "Nie można nagrywać filmów w trybie tylko do odczytu." - #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "Nie można wyrejestrować zdarzeÅ„ podczas ich wykonywania" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -961,7 +959,7 @@ msgstr "" "%s\n" "nie jest wÅ‚aÅ›ciwym plikiem karty pamiÄ™ci GC" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -990,7 +988,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:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "KataloÅ„ski" @@ -1007,6 +1005,7 @@ msgid "Change &Disc..." msgstr "ZmieÅ„ &dysk" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "ZmieÅ„ dysk" @@ -1014,7 +1013,7 @@ msgstr "ZmieÅ„ dysk" msgid "Change Game" msgstr "ZmieÅ„ grÄ™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1030,8 +1029,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:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 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!" @@ -1052,31 +1051,31 @@ msgstr "Szukaj cheatów" msgid "Cheats Manager" msgstr "Menadżer cheatów" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "ChiÅ„ski uproszczony" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Chinski (Tradycyjny)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "Wybierz folder źródÅ‚owy DVD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Choose a NAND root directory:" msgstr "Wybierz folder źródÅ‚owy NAND" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "Wybierz domyÅ›lne ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "Wybierz folder do dodania" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "Wybierz plik do otwarcia" @@ -1084,7 +1083,7 @@ msgstr "Wybierz plik do otwarcia" msgid "Choose a memory card:" msgstr "Wybierz kartÄ™ pamiÄ™ci:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1092,8 +1091,8 @@ msgstr "" "Wybierz plik używany jako apploader: (dotyczy dysków stworzonych tylko z " "folderów)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "Wypakuj do" @@ -1112,7 +1111,7 @@ msgstr "Classic" msgid "Clear" msgstr "Wyczyść" -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." msgstr "Czyszczenie nie powiodÅ‚o siÄ™." @@ -1126,7 +1125,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Zamknij" @@ -1151,20 +1150,20 @@ msgstr "Polecenie" msgid "Comment" msgstr "Komentarz" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "Komentarz:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "Kompresuj ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "Kompresuj wybrane ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "Kompresowanie ISO" @@ -1191,13 +1190,13 @@ msgstr "Konfiguracja padów" msgid "Configure..." msgstr "Konfiguruj..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "Potwierdź nadpis pliku" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Confirm on Stop" msgstr "Potwierdź przy zatrzymaniu" @@ -1206,7 +1205,7 @@ msgstr "Potwierdź przy zatrzymaniu" msgid "Connect" msgstr "PoÅ‚Ä…cz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "PodÅ‚Ä…cz klawiaturÄ™ USB" @@ -1216,22 +1215,26 @@ msgid "Connect Wiimote %i" msgstr "PoÅ‚Ä…cz Wiilot %i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "PoÅ‚Ä…cz Wiilot 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "PoÅ‚Ä…cz Wiilot 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "PoÅ‚Ä…cz Wiilot 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "PoÅ‚Ä…cz Wiilot 4" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Connecting..." msgstr "ÅÄ…czÄ™..." @@ -1256,7 +1259,7 @@ msgstr "Kopiowanie nie powiodÅ‚o siÄ™" msgid "Copy to Memcard %c" msgstr "Kopiuj do Memcard %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "RdzeÅ„" @@ -1286,7 +1289,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Nie rozpoznao pliku ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "Nie można zapisać %s" @@ -1312,7 +1315,7 @@ msgstr "" "Uruchamiasz program z CD/DVD albo plik zapisu jest zabezpieczony przed " "zapisem?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "Nie odnaleziono polecenia otwarcia dla rozszerzenia 'ini'!" @@ -1329,7 +1332,7 @@ msgstr "" msgid "Count:" msgstr "Ilość:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "Kraj:" @@ -1343,22 +1346,22 @@ msgstr "Utwórz kod AR" msgid "Create new perspective" msgstr "Utwórz nowÄ… perspektywÄ™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr "Utworzone przez KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr "Utworzone przez VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "Utworzone przez black_rider and published on ForumW.org > Web Developments" @@ -1394,7 +1397,7 @@ msgstr "Suwak" 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:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" msgstr "Custom Projection Hack" @@ -1402,15 +1405,15 @@ msgstr "Custom Projection Hack" msgid "Custom Projection Hack Settings" msgstr "Ustawienia Custom Projection Hack" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." msgstr "WÅ‚asne parametry Orthographic Projection" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Czeski" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "D-Pad" @@ -1418,24 +1421,24 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulacja (szybkie)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (wolne)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP LLE on Thread" msgstr "WÄ…tek dla DSPLLE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "DSP LLE rekompilator" @@ -1443,7 +1446,7 @@ msgstr "DSP LLE rekompilator" msgid "DSP settings" msgstr "Ustawienia DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "ŹródÅ‚o DVD:" @@ -1451,7 +1454,7 @@ msgstr "ŹródÅ‚o DVD:" msgid "Data Size" msgstr "Rozmiar danych" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "Data:" @@ -1480,16 +1483,16 @@ msgstr "Debugowanie" msgid "Decimal" msgstr "DziesiÄ™tnie" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "Wypakuj ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "Wypakuj wybrane ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "Wypakowywanie ISO" @@ -1497,7 +1500,7 @@ msgstr "Wypakowywanie ISO" msgid "Default" msgstr "DomyÅ›lne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "DomyÅ›lne ISO:" @@ -1541,8 +1544,8 @@ msgstr "" msgid "Device" msgstr "UrzÄ…dzenie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "Ustawienia urzÄ…dzenia" @@ -1627,7 +1630,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "Dysk" @@ -1654,11 +1657,11 @@ msgstr "" msgid "Divide" msgstr "Podziel" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 msgid "Do you want to stop the current emulation?" msgstr "Zatrzymać aktualnÄ… emulacjÄ™?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "Dolphin" @@ -1683,12 +1686,12 @@ msgstr "Konfiguracja emulowanego Wiilota" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Konfiguracja GCPad'a" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmy TAS (*.dtm)" @@ -1700,7 +1703,7 @@ msgstr "Konfiguracja Wiilot'a" msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1708,7 +1711,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:307 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1738,7 +1741,7 @@ msgstr "Perkusja" msgid "Dummy" msgstr "Atrapa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Zrzut Audio" @@ -1784,9 +1787,9 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Holenderski" @@ -1838,8 +1841,8 @@ msgstr "Edytuj patch" msgid "Edit current perspective" msgstr "Edytuj bierzÄ…cÄ… perspektywÄ™" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "Edytuj..." @@ -1851,7 +1854,7 @@ msgstr "Efekt" msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer" -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "WÄ…tek emulacji jest już uruchomiony" @@ -1890,7 +1893,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emulowany Wiilot" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "Stan emulacji:" @@ -1918,7 +1921,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "WÅ‚Ä…cz log AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "WÅ‚Ä…cz Audio Throttle" @@ -1930,15 +1933,19 @@ msgstr "WÅ‚Ä…cz BAT" msgid "Enable Block Merging" msgstr "WÅ‚Ä…cz Å‚Ä…czenie bloków" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "WÅ‚Ä…cz cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Cheats" msgstr "WÅ‚Ä…cz kody" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "WÅ‚Ä…cz muzykÄ™ DTK" @@ -1946,7 +1953,7 @@ msgstr "WÅ‚Ä…cz muzykÄ™ DTK" msgid "Enable Dual Core" msgstr "WÅ‚Ä…cz 2 rdzenie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "WÅ‚Ä…cz 2 rdzenie (przyspieszenie)" @@ -1958,7 +1965,7 @@ msgstr "WÅ‚Ä…cz skróty klawiszowe" msgid "Enable Idle Skipping" msgstr "WÅ‚Ä…cz Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "WÅ‚Ä…cz Idle Skipping (przyspieszenie)" @@ -1971,7 +1978,7 @@ msgstr "WÅ‚Ä…cz MMU" msgid "Enable Progressive Scan" msgstr "WÅ‚Ä…cz Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Enable Screen Saver" msgstr "WÅ‚Ä…cz wygaszacz ekranu" @@ -2033,7 +2040,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2051,7 +2058,7 @@ msgstr "" "DokÅ‚adne dla sprzetu, lecz powolne do emulacji. (ON = kompatybilne, OFF = " "szybko)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" msgstr "WÅ‚Ä…cza Custom Projection Hack" @@ -2089,9 +2096,9 @@ msgstr "" msgid "End" msgstr "Koniec" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Angielski" @@ -2120,15 +2127,29 @@ msgstr "Równy" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "BÅ‚Ä…d" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "BÅ‚Ä…d wczytywania wybranego jÄ™zyka. Ustawienia domyÅ›lne." -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2162,11 +2183,12 @@ msgstr "WyjÅ›cie z Dolphina" msgid "Export Failed" msgstr "Eksportuj nieudany" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "Eksportuj plik" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "Eksportuj nagranie" @@ -2178,7 +2200,7 @@ msgstr "Eksportuj nagranie..." msgid "Export Save" msgstr "Eksportuj zapis" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "Eksportuj zapis Wii (eksperymentalne)" @@ -2210,44 +2232,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:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "Wypakuj wszystkie pliki..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "Wypakuj Apploader'a..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "Wypakuj DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "Wypakuj folder..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "Wypakuj plik..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "Wypakuj partycjÄ™..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "Wypakowywanie %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "Wypakowywanie wszystkich plików" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "Wypakowywanie folderu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "Wypakowywanie..." @@ -2263,7 +2285,7 @@ msgstr "FIFO Player" msgid "FRANCE" msgstr "Francja" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "Rozmiar FST:" @@ -2279,7 +2301,7 @@ msgstr "NasÅ‚uchiwanie nieudane!" msgid "Failed to download codes." msgstr "Pobieranie kodów nieudane!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "Wypakowanie do %s nie udaÅ‚o siÄ™!" @@ -2454,11 +2476,11 @@ msgstr "Plik nie skompresowany" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Nieznany tryb otwarcia: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "System plików" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Nieznany plik typu 'ini'! Nie otworzy siÄ™!" @@ -2478,7 +2500,7 @@ msgstr "WymuÅ› 16:9" msgid "Force 4:3" msgstr "WymuÅ› 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Force Console as NTSC-J" msgstr "WymuÅ› konsolÄ™ jako NTSC-J" @@ -2510,7 +2532,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2542,6 +2564,7 @@ msgid "Frame " msgstr "Ramka" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "Frame Advance" @@ -2557,7 +2580,7 @@ msgstr "ZasiÄ™g ramki" msgid "Frame S&kipping" msgstr "Frame S&kipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "Limit ramek:" @@ -2569,9 +2592,9 @@ msgstr "Ramki do nagrania" msgid "Free Look" msgstr "Free Look" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "French" msgstr "Francuski" @@ -2596,11 +2619,16 @@ msgstr "Rozdzielczość peÅ‚noekranowa:" msgid "GCI File(*.gci)" msgstr "Plik GCI(*.gci)" +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +#, fuzzy +msgid "GCMic Configuration" +msgstr "Konfiguracja Logu" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "ID gry:" @@ -2616,7 +2644,7 @@ msgstr "Gra nie jest uruchomiona!" msgid "Game not found!!" msgstr "Gry nie odnaleziono!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "Specyficzne ustawienia gry" @@ -2624,7 +2652,7 @@ msgstr "Specyficzne ustawienia gry" msgid "GameConfig" msgstr "Konfiguracja gry" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "Gamecube" @@ -2633,7 +2661,7 @@ msgid "Gamecube &Pad Settings" msgstr "Ustawienia &pada GC" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Karty pamiÄ™ci GC (*.raw,*.gcp)" @@ -2656,7 +2684,8 @@ msgstr "" "(zÅ‚y kod albo typ kodu nie jest jeszcze wspierany)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Główne" @@ -2665,9 +2694,9 @@ msgstr "Główne" msgid "General Settings" msgstr "Ustawienia ogólne" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "German" msgstr "Niemiecki" @@ -2705,7 +2734,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" msgstr "Grecki" @@ -2737,7 +2766,7 @@ msgstr "Hacki" msgid "Header checksum failed" msgstr "Suma kontrolna nagłówka nie powiodÅ‚a siÄ™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hebrew" msgstr "Hebrajski" @@ -2796,11 +2825,12 @@ msgid "Hotkey Configuration" msgstr "Konfiguracja skrótów klawiszowych" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 msgid "Hotkeys" msgstr "Skróty klawiszowe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hungarian" msgstr "WÄ™gierski" @@ -2831,7 +2861,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - zÅ‚a Å›cieżka" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "Ustawienia IPL" @@ -2847,11 +2877,11 @@ msgstr "Wskaźnik IR" msgid "IR Sensitivity:" msgstr "CzuÅ‚ość IR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "Szczegóły ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "Foldery ISO" @@ -2863,6 +2893,12 @@ msgstr "WÅ‚ochy" msgid "Icon" msgstr "Ikona" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" @@ -2870,7 +2906,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:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 msgid "" "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." @@ -2960,7 +2996,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "W grze" @@ -2989,7 +3025,7 @@ msgstr "Wstaw" msgid "Insert Encrypted or Decrypted code here..." msgstr "Wprowadź zaszyfrowany/zdeszyfrowany kod tutaj..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "Włóż kartÄ™ SD" @@ -3001,7 +3037,7 @@ msgstr "Wprowadź nazwÄ™ tutaj..." msgid "Install WAD" msgstr "Zainstaluj WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 msgid "Install to Wii Menu" msgstr "Zainstaluj do Wii Menu" @@ -3011,23 +3047,23 @@ msgid "" msgstr "" "InstallExceptionHandler wywoÅ‚any, ale ta platforma nie wspiera go jeszcze." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 msgid "Installing WAD..." msgstr "Instalacja WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 msgid "Interface" msgstr "Interfejs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "Ustawienia interfejsu" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "WewnÄ™trzny bÅ‚Ä…d LZO - kompresja nie powiodÅ‚a siÄ™" -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3036,7 +3072,7 @@ msgstr "" "WewnÄ™trzny bÅ‚Ä…d LZO - dekompresja nie powiodÅ‚a siÄ™ (%d) (%li, %li) \n" "Wczytaj stan ponownie" -#: Source/Core/Core/Src/State.cpp:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "WewnÄ™trzny bÅ‚Ä…d LZO - lzo_init() nie powiodÅ‚o siÄ™" @@ -3044,11 +3080,11 @@ msgstr "WewnÄ™trzny bÅ‚Ä…d LZO - lzo_init() nie powiodÅ‚o siÄ™" msgid "Internal Resolution:" msgstr "WewnÄ™trzna rozdzielczość:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "Interpreter (BARDZO wolny)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "Intro" @@ -3065,7 +3101,7 @@ msgstr "NiewÅ‚aÅ›ciwa wartość!" msgid "Invalid bat.map or dir entry" msgstr "NiewÅ‚aÅ›ciwe bat.map lub wejÅ›cie folderu" -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "NiewÅ‚aÅ›ciwy typ zdarzenia %i" @@ -3085,17 +3121,17 @@ msgstr "" "%s\n" "BÄ™dziesz musiaÅ‚ ponownie zrzucić grÄ™." -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "NewÅ‚aÅ›ciwy plik nagrania" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "NiewÅ‚aÅ›ciwy stan" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Italian" msgstr "WÅ‚oski" @@ -3103,16 +3139,16 @@ msgstr "WÅ‚oski" msgid "JAPAN" msgstr "Japonia" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "Rekompilator JIT (zalecany)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "Eksperymentalny rekompilator JITIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Japanese" msgstr "JapoÅ„ski" @@ -3121,16 +3157,17 @@ msgid "KOREA" msgstr "Korea" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "Klawisz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Korean" msgstr "KoreaÅ„ski" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "L" @@ -3139,11 +3176,11 @@ msgid "L Button" msgstr "L Button" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "JÄ™zyk:" @@ -3166,6 +3203,7 @@ msgid "Left Stick" msgstr "GaÅ‚ka lewa" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3195,7 +3233,7 @@ msgstr "" msgid "Less Than" msgstr "Mniej niż" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "Limit FPS" @@ -3208,34 +3246,42 @@ msgid "Load Custom Textures" msgstr "Wczytaj wÅ‚asne tekstury" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 1" msgstr "Wczytaj stan Slot 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 2" msgstr "Wczytaj stan Slot 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 3" msgstr "Wczytaj stan Slot 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 4" msgstr "Wczytaj stan Slot 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 msgid "Load State Slot 5" msgstr "Wczytaj stan Slot 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Load State Slot 6" msgstr "Wczytaj stan Slot 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Load State Slot 7" msgstr "Wczytaj stan Slot 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Load State Slot 8" msgstr "Wczytaj stan Slot 8" @@ -3243,11 +3289,11 @@ msgstr "Wczytaj stan Slot 8" msgid "Load State..." msgstr "Wczytaj stan..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Wczytaj Wii System Menu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wczytaj Wii System Menu %d %c" @@ -3274,7 +3320,7 @@ msgstr "Wczytuje okreÅ›lony plik (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Lokalny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Lock Threads to Cores" msgstr "Przypisz wÄ…tki do rdzeni" @@ -3329,16 +3375,16 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Pliki MadCatz Gameshark(*.gcs)" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Główna gaÅ‚ka" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "ID twórcy:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "Twórca:" @@ -3360,7 +3406,7 @@ msgid "Memory Byte" msgstr "Bajt pamiÄ™ci" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 msgid "Memory Card" msgstr "Karta pamiÄ™ci" @@ -3397,7 +3443,7 @@ msgstr "Wielkość pliku karty pamiÄ™ci nie odpowiada wielkoÅ›ci nagłówka" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "Mikrofon" @@ -3410,7 +3456,7 @@ msgstr "Min" msgid "Misc" msgstr "Różne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "Ustawienia różne" @@ -3440,7 +3486,7 @@ msgid "Motion Plus" msgstr "Motion Plus" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" @@ -3558,7 +3604,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3597,7 +3643,7 @@ msgstr "Ksywa:" msgid "No Country (SDK)" msgstr "No Country (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "Nie odnaleziono IOS/WAD" @@ -3632,7 +3678,7 @@ msgstr "Nie odnaleziono folderu zapisu dla tytuÅ‚u %s" msgid "None" msgstr "Å»adne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" msgstr "Norweski" @@ -3640,16 +3686,16 @@ msgstr "Norweski" msgid "Not Equal" msgstr "Nie równe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "Nie ustawiono" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Not connected" msgstr "Nie poÅ‚Ä…czono" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "Notatki" @@ -3691,7 +3737,7 @@ msgstr "Objekt" msgid "Object Range" msgstr "ZasiÄ™g objektu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "WyÅ‚Ä…czone" @@ -3706,14 +3752,15 @@ msgstr "DostÄ™pnych tylko %d bloków" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: 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:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "Otwórz &folder zawartoÅ›ci" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "Otwórz folder &zapisów Wii" @@ -3752,7 +3799,7 @@ msgid "Opens the logger" msgstr "Otwiera logera" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Opcje" @@ -3832,12 +3879,12 @@ msgstr "Partycja %i" msgid "Patches" msgstr "Patche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "Åšcieżki" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -3846,7 +3893,7 @@ msgstr "Pause" msgid "Per-Pixel Lighting" msgstr "Per-Pixel Lighting" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "Perfekcyjny" @@ -3857,20 +3904,22 @@ msgstr "Perspekrtywa %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 msgid "Play" msgstr "Play" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "Odtwórz nagranie" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "Play/Pause" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "Grywalny" @@ -3882,7 +3931,7 @@ msgstr "Opcje playback'u" msgid "Players" msgstr "Gracze" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 msgid "Please confirm..." msgstr "Potwierdź..." @@ -3894,23 +3943,23 @@ msgstr "ProszÄ™ utworzyć perspektywÄ™ przed zapisem" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Polish" msgstr "Polski" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 msgid "Port 4" msgstr "Port 4" @@ -3919,11 +3968,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese" msgstr "Portugalski" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" msgstr "Portugalski (Brazylijski)" @@ -3931,6 +3980,21 @@ msgstr "Portugalski (Brazylijski)" msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" +#: Source/Core/Core/Src/Movie.cpp:735 +#, c-format +msgid "Premature movie end in PlayController. %u + 8 > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:829 +#, c-format +msgid "Premature movie end in PlayWiimote. %u + %d > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:806 +#, c-format +msgid "Premature movie end in PlayWiimote. %u > %u" +msgstr "" + #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "Presets: " @@ -3973,7 +4037,7 @@ msgid "Quit" msgstr "Zamknij" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "R" @@ -3982,7 +4046,7 @@ msgid "R Button" msgstr "R Button" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" msgstr "R-Analog" @@ -3999,6 +4063,7 @@ msgid "Range" msgstr "ZasiÄ™g" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "Tryb tylko do odczytu" @@ -4069,6 +4134,7 @@ msgid "Refresh" msgstr "OdÅ›wież" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "OdÅ›wież listÄ™" @@ -4076,10 +4142,10 @@ msgstr "OdÅ›wież listÄ™" msgid "Refresh game list" msgstr "OdÅ›wież listÄ™ gier" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 msgid "Remove" msgstr "UsuÅ„" @@ -4098,6 +4164,7 @@ 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 msgid "Reset" msgstr "Reset" @@ -4120,15 +4187,15 @@ msgid "Right Stick" msgstr "GaÅ‚ka prawa" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Wibracje" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Wykonuj DSPLLE na dedykowanym wÄ…tku (niezalecane)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "Rosyjski" @@ -4140,7 +4207,7 @@ msgstr "Zapisz &stan" msgid "Safe" msgstr "Bezpieczny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Sample Rate:" msgstr "Wskaźnik próbkowania:" @@ -4155,34 +4222,42 @@ msgid "Save GCI as..." 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" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 2" msgstr "Zapisz stan Slot 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" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 4" msgstr "Zapisz stan Slot 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" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 msgid "Save State Slot 6" msgstr "Zapisz stan Slot 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" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 msgid "Save State Slot 8" msgstr "Zapisz stan Slot 9" @@ -4190,12 +4265,12 @@ msgstr "Zapisz stan Slot 9" msgid "Save State..." msgstr "Zapisz stan..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "Zapisz jako..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "Zapisz spakowany GCM/ISO" @@ -4203,11 +4278,11 @@ msgstr "Zapisz spakowany GCM/ISO" msgid "Save current perspective" msgstr "Zapisz bierzÄ…cÄ… perspektywÄ™" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "Zapisz wypakowany GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..." @@ -4216,16 +4291,16 @@ msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..." msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, c-format msgid "Scanning %s" msgstr "SknaujÄ™ %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "PrzeszukujÄ™ obrazy ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "PrzeszukujÄ™" @@ -4241,7 +4316,7 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Filtr wyszukiwania" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "Przeszukuj podfoldery" @@ -4256,12 +4331,12 @@ msgstr "Nie odnaleziono sekcji %s w SYSCONF" msgid "Select" msgstr "Select" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Wybierz plik nagrania" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 msgid "Select a Wii WAD file to install" msgstr "Wybierz plik Wii WAD do zainstalowania" @@ -4287,15 +4362,15 @@ msgstr "Select floating windows" msgid "Select the file to load" msgstr "Wybierz plik do wczytania" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Wybierz plik do zapisu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Wybierz stan do wczytania" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Wybierz stan do zapisu" @@ -4364,11 +4439,11 @@ msgstr "Pozycja Sensor Bar'a" msgid "Separator" msgstr "Separator" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "Serbski" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 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" @@ -4377,7 +4452,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:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "Ustaw jako domyÅ›lne ISO" @@ -4391,11 +4466,11 @@ 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:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." msgstr "Ustawienia..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Nie można odnaleźć pliku konfiguracyjnego" @@ -4403,7 +4478,7 @@ msgstr "SetupWiiMem: Nie można odnaleźć pliku konfiguracyjnego" msgid "Shake" msgstr "WstrzÄ…s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "Krótka nazwa:" @@ -4463,7 +4538,7 @@ msgstr "Pokaż JaponiÄ™" msgid "Show Korea" msgstr "Pokaż KoreÄ™" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "Pokaż jÄ™zyk:" @@ -4503,11 +4578,11 @@ msgstr "Pokaż WAD" msgid "Show Wii" msgstr "Pokaż Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 msgid "Show a confirmation box before stopping a game." msgstr "Pokazuje okno potwierdzenia przed zatrzymaniem gry." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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 " @@ -4570,15 +4645,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Willot bokiem" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "ChiÅ„ski uproszczony" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "Rozmiar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 msgid "Skip BIOS" msgstr "PomiÅ„ BIOS" @@ -4624,11 +4699,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 msgid "Slot B" msgstr "Slot B" @@ -4652,7 +4727,7 @@ msgstr "" "Czy na pewno chcesz wÅ‚Ä…czyć renderowanie programowe? W razie wÄ…tpliwoÅ›ci, " "wybierz 'Nie'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Ustawienia dźwiÄ™ku" @@ -4670,9 +4745,9 @@ msgstr "Utworzenie bufora dźwiÄ™ku nie powiodÅ‚o siÄ™: %s" msgid "Space" msgstr "Space" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Spanish" msgstr "HiszpaÅ„ski" @@ -4716,7 +4791,7 @@ msgstr "Square Stick" msgid "Standard Controller" msgstr "Standard Controller" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4731,14 +4806,16 @@ msgid "Start Re&cording" msgstr "&Rozpocznij nagrywanie" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "Rozpocznij nagrywanie" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "Stan" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "Stany zapisu" @@ -4749,6 +4826,7 @@ msgstr "GaÅ‚ka" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stop" @@ -4792,8 +4870,8 @@ msgstr "Importowanie zapisów zakoÅ„czone powodzeniem" msgid "Swing" msgstr "Zamach" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "JÄ™zyk systemu:" @@ -4825,9 +4903,14 @@ msgstr "Talerz prawo" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" msgstr "Zrób zdjÄ™cie" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "Test" @@ -4856,13 +4939,13 @@ msgstr "NieprawidÅ‚owy adres" msgid "The checksum was successfully fixed" msgstr "Suma kontrolna poprawnie naprawiona" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "The chosen directory is already in the list" msgstr "Wybrany folder jest już na liÅ›cie" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, c-format msgid "" "The file %s already exists.\n" @@ -4950,7 +5033,7 @@ msgstr "Wskazany plik \"%s\" nie istnieje." msgid "The value is invalid" msgstr "NiewÅ‚aÅ›ciwa wartość" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "Styl" @@ -4982,7 +5065,7 @@ msgstr "" "Ten symulator action replay nie wspiera kodów, które modyfikujÄ… Action " "Replay'a." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "Może powodować spowolnienie w Wii Menu i niektórych grach." @@ -5004,7 +5087,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -5021,11 +5104,11 @@ msgstr "" "Skrót klawiszowy : Przytrzymaj by natychmiastowo wyÅ‚Ä…czyc Audio " "Throttle." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Jest to używane do odtwarzania muzyki, BGM." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5050,7 +5133,7 @@ msgid "Tilt" msgstr "Przechylenie" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr "TytuÅ‚" @@ -5065,15 +5148,16 @@ msgstr "PrzeÅ‚Ä…cz wszystkie typy logów" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Góra" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "ChiÅ„ski tradycyjny" @@ -5081,7 +5165,7 @@ msgstr "ChiÅ„ski tradycyjny" msgid "Tried to load an unknown file type." msgstr "Próbowano odczytać nieznany typ pliku." -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "Spusty" @@ -5097,7 +5181,7 @@ msgstr "" "Próba odczytu z niewÅ‚aÅ›ciwego SYSCONF\n" "bt id Wiilota niedostÄ™pne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Turkish" msgstr "Turecki" @@ -5178,15 +5262,6 @@ msgstr "Nieznana wiadomość o ID: %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Nieznana wiadomość o ID: %d od gracza: %d Gracz wylatuje!" -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Nieznany wskaźnik %#08x\n" -"Kontynuować?" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5201,7 +5276,7 @@ msgstr "Aktualizuj" msgid "Upright Wiimote" msgstr "Willot pionowo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Użyj trybu EuRGB60 (PAL60)" @@ -5213,7 +5288,7 @@ msgstr "Użyj trybu peÅ‚noekranowego" msgid "Use Hex" msgstr "Użyj HEX" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "Użyj Panic Handlers" @@ -5268,7 +5343,7 @@ msgstr "Wartość:" msgid "Verbosity" msgstr "Verbosity" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "Wideo" @@ -5276,7 +5351,7 @@ msgstr "Wideo" msgid "Virtual" msgstr "Wirtualny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "Poziom" @@ -5341,6 +5416,41 @@ msgstr "" "i majÄ… takÄ… samÄ… nazwÄ™ jak plik na Twojej karcie pamiÄ™ci\n" "Kontynuować?" +#: Source/Core/Core/Src/Movie.cpp:629 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, 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" +"\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" +"\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" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -5358,15 +5468,15 @@ msgstr "Widescreen Hack" msgid "Width" msgstr "Szerokość" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "Konsola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 msgid "Wii NAND Root:" msgstr "ŹródÅ‚o Wii NAND:" @@ -5374,7 +5484,7 @@ msgstr "ŹródÅ‚o Wii NAND:" msgid "Wii Save Import" msgstr "Import zapisów Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 msgid "Wii save files (*.bin)|*.bin" msgstr "Pliki zapisu Wii (*.bin)|*.bin" @@ -5405,7 +5515,7 @@ msgstr "" "lub zbyt dÅ‚ugi czas nieobecnoÅ›ci lub coÅ› innego.\n" "PoÅ‚Ä…czyć ponownie?" -#: Source/Core/DolphinWX/Src/Main.cpp:599 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Wiimote Connected" msgstr "Wiilot poÅ‚Ä…czony" @@ -5437,9 +5547,9 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Zawijanie wierszy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Working..." msgstr "PracujÄ™..." @@ -5503,7 +5613,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "Musisz wprowadzić poprawnÄ… nazwÄ™ profilu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Musisz ponownie uruchomić program w celu zaaplikowania zmian." @@ -5526,7 +5636,7 @@ msgstr "" "Powinno być 0x%04x (jest 0x%04llx)\n" "Czy chcesz wygenerować nowy?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "ZTP hack" @@ -5597,7 +5707,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5614,7 +5724,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:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Odczyt Opcode z %x. Raportuj." @@ -5633,7 +5743,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "nieznane polecenie 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute zwróciÅ‚ -1 przy uruchamianiu programu!" @@ -5740,6 +5850,9 @@ 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 "Config..." #~ msgstr "Konfiguracja..." @@ -6170,6 +6283,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" diff --git a/Languages/po/pt.po b/Languages/po/pt.po index 9da0b1c8ec..84a31dafc3 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: 2011-10-11 23:25-0500\n" +"POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-07-23 15:53-0000\n" "Last-Translator: Zilaan \n" "Language-Team: Zilaan \n" @@ -51,9 +51,9 @@ msgstr "\"%s\" Ficheiro GCM/ISO inválido, ou não é um ISO de GC/Wii." msgid "%1$sCopy%1$s" msgstr "%1$sCopiar%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -179,11 +179,11 @@ msgstr "&Gestor de Cheats" msgid "&DSP Settings" msgstr "&Definições de DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "&Eliminar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 msgid "&Delete selected ISOs..." msgstr "&Eliminar ISOs seleccionados..." @@ -247,7 +247,7 @@ msgstr "&Pausa" msgid "&Play" msgstr "&Começar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "&Propriedades" @@ -291,7 +291,7 @@ msgstr "&Ver" msgid "&Wiimote Settings" msgstr "&Definições Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "&Wiki" @@ -340,10 +340,11 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -400,8 +401,8 @@ msgstr "" "\n" "Tem que fazer forward TCP para ser host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "AM-Baseboard" @@ -442,6 +443,7 @@ msgstr "" "Em caso de dúvida, mantenha esta opção activada." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 msgid "Action" msgstr "Acção" @@ -542,11 +544,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Adicionar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "Adicionar Código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "Adicionar Patch" @@ -554,9 +556,9 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Add..." msgstr "Adicionar..." @@ -609,7 +611,7 @@ msgstr "" msgid "Advanced" msgstr "Avançadas" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "Definições avançadas" @@ -617,28 +619,28 @@ msgstr "Definições avançadas" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Todos os ficheiros GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Todas as imagens GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "Todos os ficheiros Gamecube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Todos os Estados Guardados (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "Todos os ficheiros Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos os ficheiros GC/Wii ISO comprimidos (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "Todos os ficheiros (*.*)|*.*" @@ -675,7 +677,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:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "Apploader:" @@ -693,7 +695,7 @@ msgstr "" "\n" "Em caso de dúvida, seleccione (off)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Ãrabe" @@ -702,7 +704,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:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -710,13 +712,13 @@ msgstr "" "Tem a certeza que quer apagar estes ficheiros?\n" "Serão eliminados permanentemente!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 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:725 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção de ecrã:" @@ -725,11 +727,11 @@ 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:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "Ãudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" msgstr "Ãudio Backend :" @@ -737,7 +739,7 @@ msgstr "Ãudio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -781,7 +783,7 @@ msgstr "" msgid "Back" msgstr "Trás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" msgstr "Definições Backend" @@ -791,7 +793,7 @@ msgid "Backend:" msgstr "Backend:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Introdução em segundo plano" @@ -804,15 +806,15 @@ msgid "Bad File Header" msgstr "Cabeçalho de ficheiro inválido" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "Detalhes de Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "Banner:" @@ -824,7 +826,7 @@ msgstr "Barra" msgid "Basic" msgstr "Básico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "Definições Básicas" @@ -853,7 +855,7 @@ msgid "Blue Right" msgstr "Azul Direita" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Inferior" @@ -862,7 +864,7 @@ msgstr "Inferior" msgid "Bound Controls: %lu" msgstr "Controlos agregados: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "Inactivo" @@ -870,7 +872,7 @@ msgstr "Inactivo" msgid "Browse" msgstr "Procurar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "Procurar por uma pasta para adicionar" @@ -878,7 +880,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:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "Procurar por pasta de destino" @@ -886,7 +888,7 @@ msgstr "Procurar por pasta de destino" msgid "Buffer:" msgstr "Buffer:" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -896,11 +898,11 @@ msgstr "Botões" msgid "C Stick" msgstr "C Stick" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "Motor de emulador de CPU" @@ -953,15 +955,11 @@ msgstr "Cancelar" msgid "Cannot open %s" msgstr "Impossível abrir %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "" - #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "Impossível retirar registo de eventos quando há eventos pendentes" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -971,7 +969,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:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1001,7 +999,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:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Catalão" @@ -1018,6 +1016,7 @@ msgid "Change &Disc..." msgstr "Mudar &Disco..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "Mudar Disco" @@ -1025,7 +1024,7 @@ msgstr "Mudar Disco" msgid "Change Game" msgstr "Mudar de Jogo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1041,8 +1040,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:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 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!" @@ -1063,31 +1062,31 @@ msgstr "Procura de Cheats" msgid "Cheats Manager" msgstr "Gestor de Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Chinês (Simplificado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Chinês (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "Escolha uma pasta de raiz do DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Choose a NAND root directory:" msgstr "Escolha uma pasta de raiz NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "Escolha um ISO padrão:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "Escolha uma pasta para adicionar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "Escolha um ficheiro para abrir" @@ -1095,7 +1094,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:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1103,8 +1102,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:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "Escolha a pasta para extrair" @@ -1123,7 +1122,7 @@ msgstr "Clássico" msgid "Clear" msgstr "Limpar" -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." msgstr "Limpeza falhou" @@ -1137,7 +1136,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fechar" @@ -1162,20 +1161,20 @@ msgstr "Comando" msgid "Comment" msgstr "Comentário" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "Comentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "Comprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "Comprimir ISOs seleccionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "A comprimir ISO" @@ -1202,13 +1201,13 @@ msgstr "Configuração de Comandos" msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "Confirmar Substituição de Ficheiro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Confirm on Stop" msgstr "Confirmar Ao Parar" @@ -1217,7 +1216,7 @@ msgstr "Confirmar Ao Parar" msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "Conectar Teclado USB" @@ -1227,22 +1226,26 @@ msgid "Connect Wiimote %i" msgstr "Conectar Wiimote %i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "Conectar Wiimote 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "Conectar Wiimote 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "Conectar Wiimote 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Connecting..." msgstr "A conectar..." @@ -1267,7 +1270,7 @@ msgstr "Cópia Falhou" msgid "Copy to Memcard %c" msgstr "Copiar para o Cartão de memória %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "Core" @@ -1297,7 +1300,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Não foi possível reconhecer ficheiro ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "Não foi possível guardar %s" @@ -1324,7 +1327,7 @@ 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:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "Não foi possível encontrar comando aberto para a extensão 'ini'!" @@ -1341,7 +1344,7 @@ msgstr "" msgid "Count:" msgstr "Contador:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "País" @@ -1355,21 +1358,21 @@ msgstr "Criar um código AR" msgid "Create new perspective" msgstr "Criar nova perspectiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr "Criado por KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr "Criado por VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Criado por black_rider e publicado em ForumW.org > Web Developments" @@ -1404,7 +1407,7 @@ msgstr "Desvanecimento cruzado" 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:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" msgstr "Hack de projecção personalizada" @@ -1412,15 +1415,15 @@ 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:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." msgstr "Personalizar alguns parâmetros de Projecção Ortogonal." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Checo" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "D-Pad" @@ -1428,24 +1431,24 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP Emulator Engine" msgstr "Motor de Emulador DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP HLE emulation (fast)" msgstr "Emulação de DSP HLE (rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP LLE interpreter (slow)" msgstr "Interpretador DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP LLE on Thread" msgstr "DSP LLE em thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "Recompilador de DSP LLE" @@ -1453,7 +1456,7 @@ msgstr "Recompilador de DSP LLE" msgid "DSP settings" msgstr "Definições de DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "Raiz de DVD:" @@ -1461,7 +1464,7 @@ msgstr "Raiz de DVD:" msgid "Data Size" msgstr "Dimensão de Dados" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "Data:" @@ -1490,16 +1493,16 @@ msgstr "Depuração" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "Descomprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISOs seleccionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "A descomprimir ISO" @@ -1507,7 +1510,7 @@ msgstr "A descomprimir ISO" msgid "Default" msgstr "Padrão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "ISO Padrão:" @@ -1551,8 +1554,8 @@ msgstr "" msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "Definições de Dispositivo" @@ -1637,7 +1640,7 @@ msgstr "" "\n" "Em caso de duvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "Disco" @@ -1664,11 +1667,11 @@ msgstr "" msgid "Divide" msgstr "Dividir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 msgid "Do you want to stop the current emulation?" msgstr "Deseja parar a emulação actual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "Dolphin" @@ -1693,12 +1696,12 @@ msgstr "Configuração da emulação de Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Configuração de GCPad " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS filmes (*.dtm)" @@ -1710,7 +1713,7 @@ msgstr "Configuração Dolphin do Wiimote" msgid "Dolphin at &Google Code" msgstr "Dolphin em &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1718,7 +1721,7 @@ msgstr "" "O Dolphin não conseguiu encontrar ISOs de GC/Wii. Duplo clique aqui para " "procurar ficheiros..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1748,7 +1751,7 @@ msgstr "Tambores" msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Depositar Ãudio" @@ -1795,9 +1798,9 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Holandês" @@ -1850,8 +1853,8 @@ msgstr "Editar Patch" msgid "Edit current perspective" msgstr "Editar perspectiva actual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "Editar..." @@ -1863,7 +1866,7 @@ msgstr "Efeito" msgid "Embedded Frame Buffer" msgstr "Frame Buffer Embutido" -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "Thread de Emulador já em execução" @@ -1901,7 +1904,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wiimote Emulado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "Estado da Emulação:" @@ -1929,7 +1932,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "Activar Execução de relatórios AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "Activar Regulador Ãudio" @@ -1941,15 +1944,19 @@ msgstr "Activar BAT" msgid "Enable Block Merging" msgstr "Activar Fusão de blocos" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Activar Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Cheats" msgstr "Activar Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "Activar Música DTK" @@ -1957,7 +1964,7 @@ msgstr "Activar Música DTK" msgid "Enable Dual Core" msgstr "Activar Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "Activar Dual Core (aumento de desempenho)" @@ -1969,7 +1976,7 @@ msgstr "Activar Teclas de Atalho" msgid "Enable Idle Skipping" msgstr "Activar Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "Activar Idle Skipping (aumento de desempenho)" @@ -1982,7 +1989,7 @@ msgstr "Activar MMU" msgid "Enable Progressive Scan" msgstr "Activar Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Enable Screen Saver" msgstr "Activar Protector de Ecrã" @@ -2045,7 +2052,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2063,7 +2070,7 @@ 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:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" msgstr "Hack de projecção customizada" @@ -2101,9 +2108,9 @@ msgstr "" msgid "End" msgstr "Fim" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Inglês" @@ -2132,17 +2139,31 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erro" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Erro ao carregar o idioma seleccionado. Será revertido para o idioma padrão " "do sistema." -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2177,11 +2198,12 @@ msgstr "Sair do Dolphin com emulador" msgid "Export Failed" msgstr "A Exportação Falhou" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "Exportar Ficheiro" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "Exportar Gravação" @@ -2193,7 +2215,7 @@ msgstr "Exportar Gravação..." msgid "Export Save" msgstr "Exportar Jogo Guardado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "Exportar jogo guardado Wii (Experimental)" @@ -2225,44 +2247,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:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "Extrair Todos os Ficheiros..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "Extrair Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "Extrair DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "Extrair Pasta..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "Extrair Ficheiro..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "Extrair Partição..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "A Extrair %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "A Extrair Todos os Ficheiros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "A Extrair Pasta" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "A Extrair..." @@ -2278,7 +2300,7 @@ msgstr "Reprodutor FIFO" msgid "FRANCE" msgstr "FRANÇA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "Tamanho FST:" @@ -2294,7 +2316,7 @@ msgstr "A Escuta Falhou!!" msgid "Failed to download codes." msgstr "Falha ao descarregar códigos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "Falha ao extrair para %s!" @@ -2471,11 +2493,11 @@ 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:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "Sistema de ficheiros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Tipo de ficheiro 'ini' é desconhecido! Não será aberto!" @@ -2495,7 +2517,7 @@ msgstr "Forçar 16:9" msgid "Force 4:3" msgstr "Forçar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Force Console as NTSC-J" msgstr "Definir a consola como NTSC-J" @@ -2528,7 +2550,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:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2560,6 +2582,7 @@ msgid "Frame " msgstr "Quadro" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "Avançar Quadro" @@ -2575,7 +2598,7 @@ msgstr "Alcance de Quadros" msgid "Frame S&kipping" msgstr "S&altar Quadros" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "Limite de Quadros:" @@ -2587,9 +2610,9 @@ msgstr "Quadros para Gravar" msgid "Free Look" msgstr "Vista Livre" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "French" msgstr "Francês" @@ -2614,11 +2637,16 @@ msgstr "Resolução em ecrã Inteiro:" msgid "GCI File(*.gci)" msgstr "Ficheiro GCI(*.gci)" +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +#, fuzzy +msgid "GCMic Configuration" +msgstr "Configuração de Relatório" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "ComandoGC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "ID do Jogo:" @@ -2634,7 +2662,7 @@ msgstr "O jogo não está a correr!" msgid "Game not found!!" msgstr "Jogo não encontrado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "Definições específicas por jogo" @@ -2642,7 +2670,7 @@ msgstr "Definições específicas por jogo" msgid "GameConfig" msgstr "Configuração de Jogo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "Gamecube" @@ -2651,7 +2679,7 @@ msgid "Gamecube &Pad Settings" msgstr "Definições de Comando &Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Cartões de memória Gamecube (*.raw,*.gcp)" @@ -2674,7 +2702,8 @@ msgstr "" "(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/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -2683,9 +2712,9 @@ msgstr "Geral" msgid "General Settings" msgstr "Definições Gerais" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "German" msgstr "Alemão" @@ -2723,7 +2752,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção activada." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" msgstr "Grego" @@ -2755,7 +2784,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Verificação de Cabeçalho falhou" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hebrew" msgstr "Hebraico" @@ -2815,11 +2844,12 @@ msgid "Hotkey Configuration" msgstr "Configuração de Teclas de atalho" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 msgid "Hotkeys" msgstr "Teclas de Atalho" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hungarian" msgstr "Húngaro" @@ -2851,7 +2881,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destino inválido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "Definições IPL" @@ -2867,11 +2897,11 @@ msgstr "Ponteiro Infra Vermelho" msgid "IR Sensitivity:" msgstr "Sensibilidade de Infra Vermelhos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "Detalhes ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "Pastas ISO" @@ -2883,6 +2913,12 @@ msgstr "Itália" msgid "Icon" msgstr "Ãcone" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" @@ -2890,7 +2926,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:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 msgid "" "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." @@ -2982,7 +3018,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "Em Jogo" @@ -3011,7 +3047,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:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "Inserir Cartão SD" @@ -3023,7 +3059,7 @@ msgstr "Introduza o nome aqui..." msgid "Install WAD" msgstr "Instalar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 msgid "Install to Wii Menu" msgstr "Instalar para o Menu Wii" @@ -3033,23 +3069,23 @@ msgid "" msgstr "" "InstallExceptionHandler chamado, mas esta plataforma ainda não a suporta." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 msgid "Installing WAD..." msgstr "A Instalar WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 msgid "Interface" msgstr "Iinterface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "Definições de interface" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "Erro interno de LZO - compressão falhou" -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3058,7 +3094,7 @@ msgstr "" "Erro interno de LZO - a descompressão falhou (%d) (%li, %li) \n" "Tente carregar o estado novamente" -#: Source/Core/Core/Src/State.cpp:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "Erro interno de LZO - lzo_init() falhou" @@ -3066,11 +3102,11 @@ msgstr "Erro interno de LZO - lzo_init() falhou" msgid "Internal Resolution:" msgstr "Resolução Interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "Interpretador (Muito lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "Intro" @@ -3087,7 +3123,7 @@ msgstr "Valor inválido!" msgid "Invalid bat.map or dir entry" msgstr "bat.map inválido ou entrada de pasta" -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "Tipo de evento inválido %i" @@ -3107,17 +3143,17 @@ msgstr "" "%s\n" " Poderá ter que refazer o depósito deste jogo." -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "Ficheiro de Gravação inválido" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "Estado Inválido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Italian" msgstr "Italiano" @@ -3125,16 +3161,16 @@ msgstr "Italiano" msgid "JAPAN" msgstr "JAPÃO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "Recompilador JIT (recomendado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "Recompilador experimental JITIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Japanese" msgstr "Japonês" @@ -3143,16 +3179,17 @@ msgid "KOREA" msgstr "COREIA" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "Tecla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Korean" msgstr "Coreano" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "L" @@ -3161,11 +3198,11 @@ msgid "L Button" msgstr "Botão L" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" msgstr "L-Analógico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "Idioma:" @@ -3188,6 +3225,7 @@ msgid "Left Stick" msgstr "Stick Esquerdo" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3217,7 +3255,7 @@ msgstr "" msgid "Less Than" msgstr "Inferior que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "Limitar por FPS" @@ -3230,34 +3268,42 @@ msgid "Load Custom Textures" msgstr "Carregar Texturas Personalizadas" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 1" msgstr "Carregar Estado Slot 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 2" msgstr "Carregar Estado Slot 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 3" msgstr "Carregar Estado Slot 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 4" msgstr "Carregar Estado Slot 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 msgid "Load State Slot 5" msgstr "Carregar Estado Slot 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Load State Slot 6" msgstr "Carregar Estado Slot 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Load State Slot 7" msgstr "Carregar Estado Slot 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Load State Slot 8" msgstr "Carregar Estado Slot 8" @@ -3265,11 +3311,11 @@ msgstr "Carregar Estado Slot 8" msgid "Load State..." msgstr "Carregar Estado..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Carregar Sistema de Menu Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Sistema de Menu Wii %d%c" @@ -3296,7 +3342,7 @@ msgstr "Carrega o ficheiro especifico (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Lock Threads to Cores" msgstr "Bloqueia as threads aos núcleos" @@ -3351,16 +3397,16 @@ msgstr "MMU Hack de velocidade" msgid "MadCatz Gameshark files(*.gcs)" msgstr "ficheiros MadCatz Gameshark(*.gcs)" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick Principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "ID do autor:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "Fabricante:" @@ -3382,7 +3428,7 @@ msgid "Memory Byte" msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 msgid "Memory Card" msgstr "Cartão de memória" @@ -3419,7 +3465,7 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "Mic" @@ -3432,7 +3478,7 @@ msgstr "Min" msgid "Misc" msgstr "Diversos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "Configurações Diversas" @@ -3462,7 +3508,7 @@ msgid "Motion Plus" msgstr "Motion Plus" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" @@ -3581,7 +3627,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3620,7 +3666,7 @@ msgstr "Alcunha :" msgid "No Country (SDK)" msgstr "Sem País (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "Nenhum ISO ou WAD encontrado" @@ -3655,7 +3701,7 @@ 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:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" msgstr "Bokmaal Norueguês" @@ -3663,16 +3709,16 @@ msgstr "Bokmaal Norueguês" msgid "Not Equal" msgstr "Não igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "Não definido" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Not connected" msgstr "Não conectado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "Notas" @@ -3714,7 +3760,7 @@ msgstr "Objecto" msgid "Object Range" msgstr "Alcance de Objecto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "Desligado" @@ -3729,14 +3775,15 @@ msgstr "Apenas %d blocos disponíveis" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Abrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "Abrir &Pasta" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "Abrir Pasta de &Jogo guardado Wii " @@ -3775,7 +3822,7 @@ 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:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Opções" @@ -3855,12 +3902,12 @@ msgstr "Partição %i" msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "Caminhos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -3869,7 +3916,7 @@ msgstr "Pausa" msgid "Per-Pixel Lighting" msgstr "Iluminação por Pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "Perfeito" @@ -3880,20 +3927,22 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 msgid "Play" msgstr "Começar" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "Tocar Gravação" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "Começar/Pausar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "Jogável" @@ -3905,7 +3954,7 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 msgid "Please confirm..." msgstr "Por favor confirme..." @@ -3917,23 +3966,23 @@ msgstr "Por favor crie uma perspectiva antes de guardar" msgid "Plus-Minus" msgstr "Mais-Menos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Polish" msgstr "Polaco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 msgid "Port 4" msgstr "Port 4" @@ -3942,11 +3991,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese" msgstr "Português" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" msgstr "Português (Brasileiro)" @@ -3954,6 +4003,21 @@ msgstr "Português (Brasileiro)" msgid "Post-Processing Effect:" msgstr "Efeito de Pós-Processamento" +#: Source/Core/Core/Src/Movie.cpp:735 +#, c-format +msgid "Premature movie end in PlayController. %u + 8 > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:829 +#, c-format +msgid "Premature movie end in PlayWiimote. %u + %d > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:806 +#, c-format +msgid "Premature movie end in PlayWiimote. %u > %u" +msgstr "" + #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "Predefinições:" @@ -3996,7 +4060,7 @@ msgid "Quit" msgstr "Sair" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "R" @@ -4005,7 +4069,7 @@ msgid "R Button" msgstr "Botão R" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" msgstr "R-Analógico" @@ -4022,6 +4086,7 @@ msgid "Range" msgstr "Alcance" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "Modo só de leitura" @@ -4094,6 +4159,7 @@ msgid "Refresh" msgstr "Actualizar" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "Actualizar Lista" @@ -4101,10 +4167,10 @@ msgstr "Actualizar Lista" msgid "Refresh game list" msgstr "Actualizar lista de Jogos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 msgid "Remove" msgstr "Remover" @@ -4123,6 +4189,7 @@ 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 msgid "Reset" msgstr "Reset" @@ -4145,15 +4212,15 @@ msgid "Right Stick" msgstr "Stick Direito" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Vibração" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 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:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "Russo" @@ -4165,7 +4232,7 @@ msgstr "Gua&rdar Estado" msgid "Safe" msgstr "Seguro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Sample Rate:" msgstr "Taxa de Amostragem:" @@ -4180,34 +4247,42 @@ msgid "Save GCI as..." msgstr "Guardar GCI como..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 1" msgstr "Guardar Estado Slot 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 2" msgstr "Guardar Estado Slot 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 3" msgstr "Guardar Estado Slot 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 4" msgstr "Guardar Estado Slot 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 msgid "Save State Slot 5" msgstr "Guardar Estado Slot 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 msgid "Save State Slot 6" msgstr "Guardar Estado Slot 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 msgid "Save State Slot 7" msgstr "Guardar Estado Slot 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 msgid "Save State Slot 8" msgstr "Guardar Estado Slot 8" @@ -4215,12 +4290,12 @@ msgstr "Guardar Estado Slot 8" msgid "Save State..." msgstr "Guardar Estado..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "Guardar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "Guardar GCM/ISO comprimido" @@ -4228,11 +4303,11 @@ msgstr "Guardar GCM/ISO comprimido" msgid "Save current perspective" msgstr "Guardar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "Jogo guardado descomprimido GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, 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..." @@ -4241,16 +4316,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:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, c-format msgid "Scanning %s" msgstr "A procurar %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "A procurar ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "Em Analise..." @@ -4266,7 +4341,7 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Filtro de Pesquisa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "Procurar em Sub-Pastas" @@ -4281,12 +4356,12 @@ msgstr "Selecção %s não encontrada em SYSCONF" msgid "Select" msgstr "Seleccionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Seleccione o Ficheiro de Gravação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 msgid "Select a Wii WAD file to install" msgstr "Seleccione um ficheiro Wii WAD para instalar" @@ -4312,15 +4387,15 @@ msgstr "Seleccionar janelas flutuantes" msgid "Select the file to load" msgstr "Seleccione o ficheiro para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Seleccione o ficheiro de jogo guardado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Seleccione o estado para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Seleccione o estado para gravar" @@ -4390,11 +4465,11 @@ msgstr "Posição da Barra de Sensor:" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "Sérvio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4405,7 +4480,7 @@ msgstr "" msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "Definir como ISO &padrão" @@ -4419,11 +4494,11 @@ 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:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." msgstr "Definições..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Não consegue encontrar o ficheiro de definições" @@ -4431,7 +4506,7 @@ msgstr "SetupWiiMem: Não consegue encontrar o ficheiro de definições" msgid "Shake" msgstr "Abanar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "Abreviatura:" @@ -4491,7 +4566,7 @@ msgstr "Mostrar Japão" msgid "Show Korea" msgstr "Mostrar Coreia" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "Mostrar Idioma:" @@ -4531,11 +4606,11 @@ msgstr "Mostrar Wad" msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 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:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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 " @@ -4599,15 +4674,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote na horizontal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Chinês Simplificado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "Dimensão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 msgid "Skip BIOS" msgstr "Saltar Bios" @@ -4654,11 +4729,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 msgid "Slot B" msgstr "Slot B" @@ -4683,7 +4758,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:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Definições de Som" @@ -4701,9 +4776,9 @@ msgstr "Criação do buffer de som falhou: %s" msgid "Space" msgstr "Espaço" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Spanish" msgstr "Espanhol" @@ -4747,7 +4822,7 @@ msgstr "Stick quadrado" msgid "Standard Controller" msgstr "Comando padrão" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4762,14 +4837,16 @@ msgid "Start Re&cording" msgstr "&Começar Gravação" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "Começar Gravação" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "Estado" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "Estados Guardados" @@ -4780,6 +4857,7 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Parar" @@ -4823,8 +4901,8 @@ msgstr "Sucesso na importação de ficheiros de jogo guardado" msgid "Swing" msgstr "Balanço" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "Idioma do sistema:" @@ -4856,9 +4934,14 @@ msgstr "Table Direita" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" msgstr "Tirar Screenshot" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "Teste" @@ -4887,13 +4970,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:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "The chosen directory is already in the list" msgstr "A pasta escolhida já está na lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, c-format msgid "" "The file %s already exists.\n" @@ -4985,7 +5068,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:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "Tema" @@ -5017,7 +5100,7 @@ msgstr "" "Este simulador de Action Replay não suporta códigos que modifiquem o próprio " "Action Replay" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 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." @@ -5041,7 +5124,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -5057,11 +5140,11 @@ msgstr "" "Tecla de Atalho : Pressione continuamente para desactivar " "instantaneamente o Regulador Ãudio." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Isto é usado para tocar faixas de música, como BGM (Música de fundo)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5087,7 +5170,7 @@ msgid "Tilt" msgstr "Tilt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr "Título" @@ -5102,15 +5185,16 @@ msgstr "Alternar Todos os Tipos de Relatório" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Topo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Chinês Tradicional" @@ -5118,7 +5202,7 @@ msgstr "Chinês Tradicional" msgid "Tried to load an unknown file type." msgstr "Tentou carregar um tipo de ficheiro desconhecido." -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "Gatilhos" @@ -5134,7 +5218,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:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Turkish" msgstr "Turco" @@ -5215,15 +5299,6 @@ msgstr "" "Mensagem desconhecida com a id:%d recebida pelo jogador:%d Excluindo o " "jogador!" -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Apontador desconhecido %#08x\n" -"Continuar?" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5238,7 +5313,7 @@ msgstr "Actualizar" msgid "Upright Wiimote" msgstr "Wiimote na vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar modo EuRGB60 (PAL60)" @@ -5250,7 +5325,7 @@ msgstr "Utilizar Ecrã Inteiro" msgid "Use Hex" msgstr "Usar Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "Usar Manipuladores de Pânico" @@ -5306,7 +5381,7 @@ msgstr "Valor: " msgid "Verbosity" msgstr "Verbosidade" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "Vídeo" @@ -5314,7 +5389,7 @@ msgstr "Vídeo" msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "Volume" @@ -5381,6 +5456,41 @@ msgstr "" "e tem o mesmo nome que um ficheiro no seu cartão de memória\n" "Continuar?" +#: Source/Core/Core/Src/Movie.cpp:629 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, 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" +"\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" +"\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" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -5398,15 +5508,15 @@ msgstr "Hack de Ecrã Panorâmico" msgid "Width" msgstr "Largura" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 msgid "Wii NAND Root:" msgstr "Raiz de NAND Wii:" @@ -5414,7 +5524,7 @@ msgstr "Raiz de NAND Wii:" msgid "Wii Save Import" msgstr "Importação de Jogo Guardado Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 msgid "Wii save files (*.bin)|*.bin" msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin" @@ -5446,7 +5556,7 @@ msgstr "" "razão.\n" "Quer reconectar imediatamente?" -#: Source/Core/DolphinWX/Src/Main.cpp:599 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Wiimote Connected" msgstr "Wiimote Conectado" @@ -5479,9 +5589,9 @@ msgstr "Janelas Direita" msgid "Word Wrap" msgstr "Moldar o texto" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Working..." msgstr "A trabalhar..." @@ -5542,7 +5652,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:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 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" @@ -5565,7 +5675,7 @@ msgstr "" "Deveria ser 0x%04x (mas é 0x%04llx)\n" "Pretende gerar um novo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "ZTP hack" @@ -5637,7 +5747,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5654,7 +5764,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:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: A ler Opcode de %x. Por favor reportar." @@ -5674,7 +5784,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "cmd desconhecido 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute devolveu -1 quando a aplicação executou!" @@ -6094,6 +6204,13 @@ msgstr "| OU" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Começar a janela renderizada em ecrã inteiro" +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "Apontador desconhecido %#08x\n" +#~ "Continuar?" + #~ msgid "Use FPS For Limiting" #~ msgstr "Usar FPS como limitador" diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index a914664694..81320cdc3f 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: 2011-10-11 23:25-0500\n" +"POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-18 13:38-0600\n" "Last-Translator: Runo \n" "Language-Team: Portuguese (BR) \n" @@ -50,9 +50,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sCopiar%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -180,11 +180,11 @@ msgstr "Gerenciador de &Cheats" msgid "&DSP Settings" msgstr "Configurações do &DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "&Deletar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 msgid "&Delete selected ISOs..." msgstr "&Deletar ISOs selecionadas..." @@ -248,7 +248,7 @@ msgstr "&Pausar" msgid "&Play" msgstr "&Jogar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "&Propriedades" @@ -292,7 +292,7 @@ msgstr "&Ver" msgid "&Wiimote Settings" msgstr "Configurações de &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "&Wiki" @@ -341,10 +341,11 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -402,8 +403,8 @@ msgstr "" "\n" "Você deve redirecionar as portas TCP para ser o Host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "AM-Baseboard" @@ -444,6 +445,7 @@ msgstr "" "Se estiver em dúvida, deixe isto ativado." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 msgid "Action" msgstr "Ação" @@ -544,11 +546,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Adicionar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "Adicionar Código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "Adicionar Patch" @@ -556,9 +558,9 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painél" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Add..." msgstr "Adicionar..." @@ -610,7 +612,7 @@ msgstr "Ajustar o controle de pressão análogo requerido para ativar os botões msgid "Advanced" msgstr "Avançado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "Configurações Avançadas" @@ -618,28 +620,28 @@ msgstr "Configurações Avançadas" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Todos os arquivos de GC/WII (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Todas as imagens CG/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "Todos os arquivos Gamecube CGM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Todos os Pontos de Jogo Salvos (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "Todos os Arquivos ISO Wii" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos os arquivos ISO GC/Wii comprimidos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "Todos os arquivos (*.*)|*.*" @@ -676,7 +678,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:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "Apploader:" @@ -694,7 +696,7 @@ msgstr "" "\n" "Se estiver em dúvida, selecione (desligado)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Ãrabe" @@ -703,7 +705,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:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -711,13 +713,13 @@ msgstr "" "Você tem certeza que deseja apagar estes arquivos?\n" "Eles estarão perdidos para sempre!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 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:725 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção:" @@ -726,11 +728,11 @@ 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:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "Ãudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" msgstr "Backend de Audio" @@ -738,7 +740,7 @@ 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:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -782,7 +784,7 @@ msgstr "" msgid "Back" msgstr "Voltar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" msgstr "Configurações do Backend" @@ -792,7 +794,7 @@ msgid "Backend:" msgstr "Backend:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Input em Background" @@ -805,15 +807,15 @@ msgid "Bad File Header" msgstr "Header de Arquivo Ruim" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "Detalhes de Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "Banner:" @@ -825,7 +827,7 @@ msgstr "Alavanca" msgid "Basic" msgstr "Básico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "Configurações Básicas" @@ -854,7 +856,7 @@ msgid "Blue Right" msgstr "Azul Direito" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Embaixo" @@ -863,7 +865,7 @@ msgstr "Embaixo" msgid "Bound Controls: %lu" msgstr "Controles Acoplados: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "Quebrado" @@ -871,7 +873,7 @@ msgstr "Quebrado" msgid "Browse" msgstr "Procurar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "Procurar por um diretório para adicionar" @@ -879,7 +881,7 @@ msgstr "Procurar por um diretório para adicionar" msgid "Browse for an ISO directory..." msgstr "Procurar por um diretório ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "Procurar por um diretório de saída" @@ -887,7 +889,7 @@ msgstr "Procurar por um diretório de saída" msgid "Buffer:" msgstr "Buffer:" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -897,11 +899,11 @@ msgstr "Botões" msgid "C Stick" msgstr "C Stick" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "Engine de Emulação do CPU" @@ -952,15 +954,11 @@ msgstr "Cancelar" msgid "Cannot open %s" msgstr "Não é possível abrir %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "Não é possível gravar vídeos no modo Apenas Leitura" - #: Source/Core/Core/Src/CoreTiming.cpp:122 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:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -971,7 +969,7 @@ msgstr "" "%s\n" "não é um arquivo de Memory Card válido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1002,7 +1000,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:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Catalão" @@ -1019,6 +1017,7 @@ msgid "Change &Disc..." msgstr "Mudar &Disco..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "Mudar o Disco" @@ -1026,7 +1025,7 @@ msgstr "Mudar o Disco" msgid "Change Game" msgstr "Mudar Jogo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1042,8 +1041,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:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 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!" @@ -1063,31 +1062,31 @@ msgstr "Procura de Cheat" msgid "Cheats Manager" msgstr "Gerenciador de Cheat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Chinês (Simplificado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Chinês (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "Escolher um diretório raiz de DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Choose a NAND root directory:" msgstr "Escolha um diretório raíz para o NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "Escolher uma ISO padrão:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "Escolher um diretório para adicionar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "Escolher um arquivo para abrir" @@ -1095,7 +1094,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:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1103,8 +1102,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:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "Escolha a pasta para extrair" @@ -1123,7 +1122,7 @@ msgstr "Clássico" msgid "Clear" msgstr "Limpar" -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." msgstr "Falha na liberação." @@ -1137,7 +1136,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fechar" @@ -1162,20 +1161,20 @@ msgstr "Comandos" msgid "Comment" msgstr "Comentar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "Comentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "Comprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "Comprimir ISOs selecionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "Comprimindo ISO" @@ -1202,13 +1201,13 @@ msgstr "Configurar Controles" msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "Confirmar sobrescrição de arquivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Confirm on Stop" msgstr "Confirmar ao Parar" @@ -1217,7 +1216,7 @@ msgstr "Confirmar ao Parar" msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "Conectar Teclado USB" @@ -1227,22 +1226,26 @@ msgid "Connect Wiimote %i" msgstr "Conectar Wiimote %i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "Conectar Wiimote 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "Conectar Wiimote 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "Conectar Wiimote 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Connecting..." msgstr "Conectando..." @@ -1267,7 +1270,7 @@ msgstr "Falha na Cópia" msgid "Copy to Memcard %c" msgstr "Copiar para Cartão de Memória %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "Núcleo" @@ -1297,7 +1300,7 @@ 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:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "Não foi possível salvar %s" @@ -1324,7 +1327,7 @@ 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:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "Não foi possível encontrar comando de abertura para a extensão 'ini'!" @@ -1341,7 +1344,7 @@ msgstr "" msgid "Count:" msgstr "Contagem:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "País:" @@ -1355,21 +1358,21 @@ msgstr "Criar Código AR" msgid "Create new perspective" msgstr "Criar nova perspectiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr "Criado por KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr "Criado por VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Criado por black_rider e publicado no ForumW.org > Web Developments" @@ -1404,7 +1407,7 @@ msgstr "Crossfade" 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:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" msgstr "Hack de Projeção Customizado" @@ -1412,15 +1415,15 @@ 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:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." msgstr "Cuztomize alguns parâmetros de Projeção Ortográfica." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Tcheco" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "Direcional Digital" @@ -1428,24 +1431,24 @@ msgstr "Direcional Digital" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP Emulator Engine" msgstr "Engine de Emulação do DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP HLE emulation (fast)" msgstr "Emulação HLE do DSP (rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP LLE interpreter (slow)" msgstr "Interpretador LLE do DSP (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP LLE on Thread" msgstr "DSP LLE em Segmento" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "Recompilador LLE do DSP" @@ -1453,7 +1456,7 @@ msgstr "Recompilador LLE do DSP" msgid "DSP settings" msgstr "Configurações de Ãudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "Raiz do DVD:" @@ -1461,7 +1464,7 @@ msgstr "Raiz do DVD:" msgid "Data Size" msgstr "Tamanho de Arquivo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "Data:" @@ -1490,16 +1493,16 @@ msgstr "Debugging" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "Descomprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISOs selecionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "Descomprimindo ISO" @@ -1507,7 +1510,7 @@ msgstr "Descomprimindo ISO" msgid "Default" msgstr "Padrão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "ISO Padrão:" @@ -1551,8 +1554,8 @@ msgstr "" msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "Configurações de Dispositivo" @@ -1637,7 +1640,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "Disco" @@ -1664,11 +1667,11 @@ msgstr "" msgid "Divide" msgstr "Dividir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 msgid "Do you want to stop the current emulation?" msgstr "Você quer parar a emulação atual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "Dolphin" @@ -1693,12 +1696,12 @@ msgstr "Configuração de Wiimote Emulado do Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Configuração do GCPad do Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmes TAS Dolphin (*.dtm)" @@ -1710,7 +1713,7 @@ msgstr "Configuração de Wiimote Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin no &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1718,7 +1721,7 @@ msgstr "" "Dolphin não pôde encontrar ISOs GC/Wii. Duplo-clique aqui para procurar por " "arquivos..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1748,7 +1751,7 @@ msgstr "Bateria" msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Extrair Ãudio" @@ -1794,9 +1797,9 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Holandês" @@ -1849,8 +1852,8 @@ msgstr "Editar Patch" msgid "Edit current perspective" msgstr "Editar perspectiva atual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "Editar..." @@ -1862,7 +1865,7 @@ msgstr "Efeito" msgid "Embedded Frame Buffer" msgstr "Frame Buffer Embutido" -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "Este Segmento de Emulação já está rodando" @@ -1900,7 +1903,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emular Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "Estado de Emulação" @@ -1928,7 +1931,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "Ativar Registro AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "Ativar Throttle de Ãudio" @@ -1940,15 +1943,19 @@ msgstr "Ativar BAT" msgid "Enable Block Merging" msgstr "Ativar Block Merging" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Ativar Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Cheats" msgstr "Ativar Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "Ativar Música DTK" @@ -1956,7 +1963,7 @@ msgstr "Ativar Música DTK" msgid "Enable Dual Core" msgstr "Ativar Núcleo Duplo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "Ativar Núcleo Duplo (Aumento na velocidade)" @@ -1968,7 +1975,7 @@ msgstr "Ativar Hotkeys" msgid "Enable Idle Skipping" msgstr "Ativar Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "Ativar Idle Skipping (Aumento na velocidade)" @@ -1981,7 +1988,7 @@ msgstr "Ativar MMU" msgid "Enable Progressive Scan" msgstr "Ativar Varredura Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Enable Screen Saver" msgstr "Ativar Salva-Tela" @@ -2044,7 +2051,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2062,7 +2069,7 @@ msgstr "" "gerenciamento de memoria. Precisão para o hardware, mas devagar para ser " "emulado (ON = Compativel, OFF = Rapido)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" msgstr "Ativa Hack de Projeção Personalizado" @@ -2100,9 +2107,9 @@ msgstr "" msgid "End" msgstr "Fim" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Inglês" @@ -2131,15 +2138,29 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erro" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema." -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2174,11 +2195,12 @@ msgstr "Sair do Dolphin com o emulador" msgid "Export Failed" msgstr "Falha na Exportação" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "Exportar Arquivo" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "Exportar Gravação" @@ -2190,7 +2212,7 @@ msgstr "Exportar Gravação..." msgid "Export Save" msgstr "Exportar Save" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "Exportar save do Wii (Experimental)" @@ -2222,44 +2244,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:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "Extrair Todos os arquivos..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "Extrair Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "Extrair DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "Extrair diretorio..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "Extrair Arquivo..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "Extrair Partição..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "Extraindo %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "Extraindo todos os arquivos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "Extraindo diretorio" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "Extraindo..." @@ -2275,7 +2297,7 @@ msgstr "FIFO Player" msgid "FRANCE" msgstr "FRANÇA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "Tamanho FST:" @@ -2291,7 +2313,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:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "Falha ao extrair %s!" @@ -2466,11 +2488,11 @@ 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:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "Arquivo de sistema" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Tipo do arquivo 'ini' desconhecido! Não vai abrir!" @@ -2490,7 +2512,7 @@ msgstr "Forçar 16:9" msgid "Force 4:3" msgstr "Forçar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Force Console as NTSC-J" msgstr "Forçar Console para NTSC-J" @@ -2523,7 +2545,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2555,6 +2577,7 @@ msgid "Frame " msgstr "Quadro" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "Avançar Quadro" @@ -2570,7 +2593,7 @@ msgstr "Alcanço do Quadro" msgid "Frame S&kipping" msgstr "Frame S&kipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "Limitador de FPS:" @@ -2582,9 +2605,9 @@ msgstr "QUadros para Capturar" msgid "Free Look" msgstr "Olhar Livre" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "French" msgstr "Francês" @@ -2609,11 +2632,16 @@ msgstr "Resolução da Tela Cheia:" msgid "GCI File(*.gci)" msgstr "Arquivo GCI(*.gci)" +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +#, fuzzy +msgid "GCMic Configuration" +msgstr "Configuração do Log" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "ID do jogo:" @@ -2629,7 +2657,7 @@ msgstr "O jogo não está rodando!" msgid "Game not found!!" msgstr "Jogo não encontrado!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "Opções especificas do jogo" @@ -2637,7 +2665,7 @@ msgstr "Opções especificas do jogo" msgid "GameConfig" msgstr "Opçõesdojogo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "Gamecube" @@ -2646,7 +2674,7 @@ msgid "Gamecube &Pad Settings" msgstr "Configurações de &Controle de Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Memory Cards do Gamecube (*.raw,*.gcp)" @@ -2669,7 +2697,8 @@ msgstr "" "(É um código ruim ou um tipo de código não suportado.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -2678,9 +2707,9 @@ msgstr "Geral" msgid "General Settings" msgstr "Configurações Gerais" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "German" msgstr "Alemão" @@ -2718,7 +2747,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto ativado." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" msgstr "Grego" @@ -2750,7 +2779,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "A checagem do header falhou" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hebrew" msgstr "Hebreu" @@ -2811,11 +2840,12 @@ msgid "Hotkey Configuration" msgstr "Configuração de hotkey" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 msgid "Hotkeys" msgstr "Hotkeys" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hungarian" msgstr "Húngaro" @@ -2846,7 +2876,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - Destino ruim" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "Definições de IPL" @@ -2862,11 +2892,11 @@ msgstr "Ponteiro IR" msgid "IR Sensitivity:" msgstr "Sensibilidade IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "Detalhes da ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "Diretórios de ISO" @@ -2878,6 +2908,12 @@ msgstr "ITÃLIA" msgid "Icon" msgstr "Icone" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" @@ -2885,7 +2921,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:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 msgid "" "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." @@ -2977,7 +3013,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe esta opção desativada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "Funciona" @@ -3006,7 +3042,7 @@ msgstr "Inserir" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inserir Código Encryptado ou Decriptado aqui..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "Insira cartão SD" @@ -3018,7 +3054,7 @@ msgstr "Insira nome aqui.." msgid "Install WAD" msgstr "Instalar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 msgid "Install to Wii Menu" msgstr "Instalar para o menu do WII" @@ -3029,23 +3065,23 @@ msgstr "" "InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem " "suporte a ele." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 msgid "Installing WAD..." msgstr "Instalando WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 msgid "Interface" msgstr "Interface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "Opções de interface" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "Erro Interno do LZO - A compressão falhou" -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3054,7 +3090,7 @@ msgstr "" "Erro Interno do LZO - a descompressão falhou (%d) (%li, %li) \n" "Tente recarregar o Estado Salvo" -#: Source/Core/Core/Src/State.cpp:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "Erro Interno do LZO - lzo_init() falhou" @@ -3062,11 +3098,11 @@ msgstr "Erro Interno do LZO - lzo_init() falhou" msgid "Internal Resolution:" msgstr "Resolução Interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "Interpretador (MUITO lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "Intro" @@ -3083,7 +3119,7 @@ msgstr "Valor Inválido!" msgid "Invalid bat.map or dir entry" msgstr "Bat.map ou entrada de Diretório inválidas" -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "Tipo de evento %i inválido" @@ -3103,17 +3139,17 @@ msgstr "" "%s\n" "Você pode precisar refazer o dump deste jogo." -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "Arquivo de gravação inválido" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "Estado Salvo Inválido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Italian" msgstr "Italiano" @@ -3121,16 +3157,16 @@ msgstr "Italiano" msgid "JAPAN" msgstr "JAPÃO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "JIT recompilador (recomendado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "JITIL recompilador experimental" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Japanese" msgstr "Japonês" @@ -3139,16 +3175,17 @@ msgid "KOREA" msgstr "CORÉIA" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "Chave" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Korean" msgstr "Coreano" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "L" @@ -3157,11 +3194,11 @@ msgid "L Button" msgstr "Botão L" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" msgstr "L-Analógico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "Linguagem:" @@ -3184,6 +3221,7 @@ msgid "Left Stick" msgstr "Analógico Esquerdo" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3213,7 +3251,7 @@ msgstr "" msgid "Less Than" msgstr "Menor que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "Limitar por FPS" @@ -3226,34 +3264,42 @@ msgid "Load Custom Textures" msgstr "Carregar Texturas Personalizadas" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 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 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 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 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 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 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 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 msgid "Load State Slot 8" msgstr "Carregar Estado do Slot 8" @@ -3261,11 +3307,11 @@ msgstr "Carregar Estado do Slot 8" msgid "Load State..." msgstr "Carregar State..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Carregar Menu de Sistema do Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Menu de Sistema do Wii %d %c" @@ -3293,7 +3339,7 @@ msgstr "Carrega o arquivo especificado (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Lock Threads to Cores" msgstr "Separar tarefas em núcleos" @@ -3348,16 +3394,16 @@ msgstr "Hack de velocidade MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Arquivos de Gameshark MadCatz(*.gcs)" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Analógico Principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "ID da fabricante:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "Fabricante:" @@ -3379,7 +3425,7 @@ msgid "Memory Byte" msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 msgid "Memory Card" msgstr "Cartão de memoria" @@ -3416,7 +3462,7 @@ msgstr "O tamanho do arquivo do Memory Card é diferente do tamanho do header" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "Microfone" @@ -3429,7 +3475,7 @@ msgstr "Mínimo" msgid "Misc" msgstr "Diversas" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "Opções diversas" @@ -3460,7 +3506,7 @@ msgid "Motion Plus" msgstr "Motion Plus" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" @@ -3578,7 +3624,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3617,7 +3663,7 @@ msgstr "Nick:" msgid "No Country (SDK)" msgstr "Sem região (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "Sem ISOs ou WADs achados" @@ -3652,7 +3698,7 @@ msgstr "Nenhuma pasta de salva encontrada para o título %s" msgid "None" msgstr "Nenhum" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" msgstr "Norueguês Bokmaal" @@ -3660,16 +3706,16 @@ msgstr "Norueguês Bokmaal" msgid "Not Equal" msgstr "Não igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "Indefinido" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Not connected" msgstr "Não conectado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "Notas" @@ -3711,7 +3757,7 @@ msgstr "Objeto" msgid "Object Range" msgstr "Alcance do Objeto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "Desligado" @@ -3726,14 +3772,15 @@ msgstr "Apenas %d blocos disponíveis" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Abrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "Abrir &conteúdo da pasta" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "Abrir pasta do &save do WII" @@ -3772,7 +3819,7 @@ msgid "Opens the logger" msgstr "Abrir o logger" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Opções" @@ -3852,12 +3899,12 @@ msgstr "Partição %i" msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "Diretórios" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausar" @@ -3866,7 +3913,7 @@ msgstr "Pausar" msgid "Per-Pixel Lighting" msgstr "Iluminação Por Pixels" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "Perfeito" @@ -3877,20 +3924,22 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 msgid "Play" msgstr "Executar" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "Reproduzir Gravação" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "Executar/Pausar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "Jogável" @@ -3902,7 +3951,7 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 msgid "Please confirm..." msgstr "Favor confirmar..." @@ -3914,23 +3963,23 @@ msgstr "Favor criar uma perspectiva antes de salvar" msgid "Plus-Minus" msgstr "Positivo-Negativo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Polish" msgstr "Polonês" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 1" msgstr "Porta 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 2" msgstr "Porta 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Port 3" msgstr "Porta 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 msgid "Port 4" msgstr "Porta 4" @@ -3939,11 +3988,11 @@ msgstr "Porta 4" msgid "Port :" msgstr "Porta:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese" msgstr "Português" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" msgstr "Português (Brasil)" @@ -3951,6 +4000,21 @@ msgstr "Português (Brasil)" msgid "Post-Processing Effect:" msgstr "Efeito Pós-Processamento" +#: Source/Core/Core/Src/Movie.cpp:735 +#, c-format +msgid "Premature movie end in PlayController. %u + 8 > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:829 +#, c-format +msgid "Premature movie end in PlayWiimote. %u + %d > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:806 +#, c-format +msgid "Premature movie end in PlayWiimote. %u > %u" +msgstr "" + #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "Predefinidos:" @@ -3993,7 +4057,7 @@ msgid "Quit" msgstr "Sair" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "R" @@ -4002,7 +4066,7 @@ msgid "R Button" msgstr "Botão R" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" msgstr "R-Analógico" @@ -4019,6 +4083,7 @@ msgid "Range" msgstr "Alcance" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "Modo Somente Leitura" @@ -4089,6 +4154,7 @@ msgid "Refresh" msgstr "Atualizar" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "Atualizar Lista" @@ -4096,10 +4162,10 @@ msgstr "Atualizar Lista" msgid "Refresh game list" msgstr "Atualizar a lista de jogos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 msgid "Remove" msgstr "Remover" @@ -4118,6 +4184,7 @@ 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 msgid "Reset" msgstr "Reiniciar" @@ -4140,15 +4207,15 @@ msgid "Right Stick" msgstr "Analógico Direito" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Vibração" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 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:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "Russo" @@ -4160,7 +4227,7 @@ msgstr "Sal&var estado atual" msgid "Safe" msgstr "Seguro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Sample Rate:" msgstr "Taxa de Amostragem:" @@ -4175,34 +4242,42 @@ msgid "Save GCI as..." msgstr "Salvar GCI como..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 1" msgstr "Salvar Estado Atual no Slot 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 2" msgstr "Salvar Estado Atual no Slot 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 3" msgstr "Salvar Estado Atual no Slot 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 4" msgstr "Salvar Estado Atual no Slot 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 msgid "Save State Slot 5" msgstr "Salvar Estado Atual no Slot 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 msgid "Save State Slot 6" msgstr "Salvar Estado Atual no Slot 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 msgid "Save State Slot 7" msgstr "Salvar Estado Atual no Slot 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 msgid "Save State Slot 8" msgstr "Salvar Estado Atual no Slot 8" @@ -4210,12 +4285,12 @@ msgstr "Salvar Estado Atual no Slot 8" msgid "Save State..." msgstr "Salvar estado atual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "Salvar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "Salvar GCM/ISO comprimido" @@ -4223,11 +4298,11 @@ msgstr "Salvar GCM/ISO comprimido" msgid "Save current perspective" msgstr "Salvar perspectiva atual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "Salvar GCM/ISO descomprimido" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "O Estado Salvo capturado %s está corrompido, parando captura..." @@ -4236,16 +4311,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:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, c-format msgid "Scanning %s" msgstr "Escaneando %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "Procurando por ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "Escaneando..." @@ -4261,7 +4336,7 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Filtro de Busca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "Procurar em sub-pastas" @@ -4276,12 +4351,12 @@ msgstr "A seção %s não foi encontrada no SYSCONF" msgid "Select" msgstr "Selecionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Selecione o arquivo de Gravação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 msgid "Select a Wii WAD file to install" msgstr "Selecione um arquivo WAD de Wii para instalar" @@ -4306,15 +4381,15 @@ msgstr "Selecionar Janelas flutuantes" msgid "Select the file to load" msgstr "Selecione um arquivo para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Selecione o arquivo de salva" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Selecione um estado para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Selecione um estado para salvar" @@ -4384,11 +4459,11 @@ msgstr "Posição da Sensor Bar:" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "Sérvio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4399,7 +4474,7 @@ msgstr "" msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "Definir como ISO &padrão" @@ -4414,11 +4489,11 @@ 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:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." msgstr "Configurações..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Arquivo de configuração não encontrado" @@ -4426,7 +4501,7 @@ msgstr "SetupWiiMem: Arquivo de configuração não encontrado" msgid "Shake" msgstr "Sacudir" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "Nome Curto:" @@ -4486,7 +4561,7 @@ msgstr "Mostrar JAP" msgid "Show Korea" msgstr "Mostrar Coréia" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "Mostrar Idioma:" @@ -4526,11 +4601,11 @@ msgstr "Mostrar Wad" msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 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:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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 " @@ -4594,15 +4669,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote na Horizontal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Chinês Simplificado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "Tamanho" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 msgid "Skip BIOS" msgstr "Pular a BIOS" @@ -4649,11 +4724,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 msgid "Slot B" msgstr "Slot B" @@ -4677,7 +4752,7 @@ msgstr "" "Você realmente quer utilizar o Renderizador por Software? Se estiver em " "dúvida, pressione 'Não'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Configurações de Som" @@ -4695,9 +4770,9 @@ msgstr "Falha na criação do buffer de som: %s" msgid "Space" msgstr "Barra de Espaço" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Spanish" msgstr "Espanhol" @@ -4741,7 +4816,7 @@ msgstr "Analógico Quadrado" msgid "Standard Controller" msgstr "Controle Padrão" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4756,14 +4831,16 @@ msgid "Start Re&cording" msgstr "Iniciar Ca&ptura" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "Iniciar Captura" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "Status" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "Estados Salvos" @@ -4774,6 +4851,7 @@ msgstr "Analógico" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Parar" @@ -4817,8 +4895,8 @@ msgstr "Arquivos de salva importados com sucesso" msgid "Swing" msgstr "Balançar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "Idioma do Systema:" @@ -4850,9 +4928,14 @@ msgstr "Direita da Mesa" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" msgstr "Capturar Tela" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "Testar" @@ -4881,13 +4964,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:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "The chosen directory is already in the list" msgstr "O diretório escolhido já está na lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, c-format msgid "" "The file %s already exists.\n" @@ -4977,7 +5060,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:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "Tema" @@ -5009,7 +5092,7 @@ msgstr "" "Este simulador de Action Replay não suporta códigos que modifiquem o Action " "Replay em si." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 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." @@ -5033,7 +5116,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -5048,11 +5131,11 @@ msgstr "" "\n" "Atalho de Teclado : Segure para instantaneamente desativar o Throttle." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Isto é usado para tocar trilhas sonoras de jogos, como BGM" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5078,7 +5161,7 @@ msgid "Tilt" msgstr "Inclinar" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr "Título" @@ -5093,15 +5176,16 @@ msgstr "Ligar/Desligar Todos os Logs" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Topo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Chinês Tradicional" @@ -5109,7 +5193,7 @@ msgstr "Chinês Tradicional" msgid "Tried to load an unknown file type." msgstr "Houve a tentativa de carregar um tipo de arquivo desconhecido." -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "Gatilhos" @@ -5125,7 +5209,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:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Turkish" msgstr "Turco" @@ -5208,15 +5292,6 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!" -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Ponteiro desconhecido %#08x\n" -"Continuar?" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5231,7 +5306,7 @@ msgstr "Atualizar" msgid "Upright Wiimote" msgstr "Wiimote na Vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar modo EuRGB60 (PAL60)" @@ -5243,7 +5318,7 @@ msgstr "Usar Tela Cheia" msgid "Use Hex" msgstr "Usar Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "Usar Panic Handlers" @@ -5299,7 +5374,7 @@ msgstr "Valor:" msgid "Verbosity" msgstr "Verbosidade" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "Vídeo" @@ -5307,7 +5382,7 @@ msgstr "Vídeo" msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "Volume" @@ -5374,6 +5449,41 @@ msgstr "" "que tenham o mesmo nome de um arquivo do Memory Card\n" "Continuar?" +#: Source/Core/Core/Src/Movie.cpp:629 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, 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" +"\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" +"\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" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -5391,15 +5501,15 @@ msgstr "Hack de Widescreen" msgid "Width" msgstr "Largura" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "Console do Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 msgid "Wii NAND Root:" msgstr "Raiz do Wii NAND" @@ -5407,7 +5517,7 @@ msgstr "Raiz do Wii NAND" msgid "Wii Save Import" msgstr "Importar Save de Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 msgid "Wii save files (*.bin)|*.bin" msgstr "Arquivos de Salva do Wii (*.bin)|*.bin" @@ -5438,7 +5548,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:599 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Wiimote Connected" msgstr "Wiimote Conectado" @@ -5470,9 +5580,9 @@ msgstr "Janelas da Direita" msgid "Word Wrap" msgstr "Word Wrap" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Working..." msgstr "Funcionando..." @@ -5536,7 +5646,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:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 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." @@ -5559,7 +5669,7 @@ msgstr "" "Ele deveria ter 0x%04x (mas tem 0x%04llx)\n" "Você gostaria de gerar um novo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "Hack do ZTB" @@ -5631,7 +5741,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5648,7 +5758,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:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Lendo Opcode de %x. Favor reportar." @@ -5669,7 +5779,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Cmd 0x%08x desconhecido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute devolveu -1 ao rodar o aplicativo!" @@ -5749,6 +5859,9 @@ msgstr "| OR" #~ "vértice.\n" #~ "Esse é um comportamento mais preciso mas reduz performance." +#~ msgid "Cannot record movies in read-only mode." +#~ msgstr "Não é possível gravar vídeos no modo Apenas Leitura" + #~ msgid "Config..." #~ msgstr "Configurar..." @@ -6129,6 +6242,13 @@ msgstr "| OR" #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Isto é geralmente usado para efeitos de som e voz." +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "Ponteiro desconhecido %#08x\n" +#~ "Continuar?" + #~ msgid "Use FPS For Limiting" #~ msgstr "Usar FPS para Limitar" diff --git a/Languages/po/ru.po b/Languages/po/ru.po index 2a2b6b4a7b..be14918713 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: 2011-10-11 23:25-0500\n" +"POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-01-20 14:40+0300\n" "Last-Translator: firnis \n" "Language-Team: Russian <>\n" @@ -51,9 +51,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sКопировать%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Гц" @@ -179,11 +179,11 @@ msgstr "Менеджер &читов" msgid "&DSP Settings" msgstr "&Опции аудио" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "&Удалить ISO-файл..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 msgid "&Delete selected ISOs..." msgstr "&Удалить выбранные ISO-файлы..." @@ -249,7 +249,7 @@ msgstr "&Пауза" msgid "&Play" msgstr "&ЗапуÑтить" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "&СвойÑтва" @@ -293,7 +293,7 @@ msgstr "&Вид" msgid "&Wiimote Settings" msgstr "Опц&ии Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "" @@ -343,10 +343,11 @@ msgid "" msgstr "<Ðичего>" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "<Ðажмите кнопку>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "<СиÑтемный>" @@ -402,8 +403,8 @@ msgstr "" "\n" "Ð”Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¸Ð³Ñ€Ñ‹ вам необходимо открыть указанный порт на вашем роутере!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "" @@ -438,6 +439,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 msgid "Action" msgstr "ДейÑтвие" @@ -525,11 +527,11 @@ msgstr "Ðдаптер:" msgid "Add" msgstr "Добавить" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "Добавление ActionReplay-кода" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "Добавление патча" @@ -537,9 +539,9 @@ msgstr "Добавление патча" msgid "Add new pane" msgstr "Добавить панель" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Add..." msgstr "Добавить..." @@ -577,7 +579,7 @@ msgstr "" msgid "Advanced" msgstr "РаÑширенные" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "РаÑширенные наÑтройки" @@ -586,28 +588,28 @@ msgstr "РаÑширенные наÑтройки" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Ð’Ñе GC/Wii-файлы (elf, dol, gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Ð’Ñе образа от GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "Ð’Ñе GCM-файлы Gamecube (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Файлы быÑтрых Ñохранений (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "Файлы образов Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Сжатые образа диÑков GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "Ð’Ñе файлы (*.*)|*.*" @@ -640,7 +642,7 @@ msgstr "Загрузчик неверноего размера... Ñто точ msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "Загрузчик:" @@ -655,7 +657,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "" @@ -664,7 +666,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "Ð’Ñ‹ уверены, что хотите удалить \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -672,11 +674,11 @@ msgstr "" "Ð’Ñ‹ уверены, что хотите удалить Ñти файлы?\n" "Они иÑчезнут навÑегда!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Ð’Ñ‹ уверены, что хотите удалить Ñтот файл? Он иÑчезнет навÑегда!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Соотношение Ñторон:" @@ -685,11 +687,11 @@ msgstr "Соотношение Ñторон:" msgid "At least one pane must remain open." msgstr "Ð¥Ð¾Ñ‚Ñ Ð±Ñ‹ одна панель должна быть открыта." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 #, fuzzy msgid "Audio Backend:" msgstr "СиÑтема вывода" @@ -698,7 +700,7 @@ msgstr "СиÑтема вывода" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ ÑƒÑтройÑтва вывода звука.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Ðвто" @@ -739,7 +741,7 @@ msgstr "" msgid "Back" msgstr "Ðазад" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 #, fuzzy msgid "Backend Settings" msgstr "ОÑновные наÑтройки" @@ -751,7 +753,7 @@ msgid "Backend:" msgstr "СиÑтема вывода" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "" @@ -764,15 +766,15 @@ msgid "Bad File Header" msgstr "Ðеверный заголовок файла" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr "Логотип" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "Данные логотипа" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "Логотип:" @@ -784,7 +786,7 @@ msgstr "Панель" msgid "Basic" msgstr "ОÑновные" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "ОÑновные наÑтройки" @@ -813,7 +815,7 @@ msgid "Blue Right" msgstr "СинÑÑ Ñправа" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Ñнизу" @@ -822,7 +824,7 @@ msgstr "Ñнизу" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "Ðе работает" @@ -830,7 +832,7 @@ msgstr "Ðе работает" msgid "Browse" msgstr "Обзор" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "Выберите папку Ñ Ð¾Ð±Ñ€Ð°Ð·Ð°Ð¼Ð¸ игр" @@ -838,7 +840,7 @@ msgstr "Выберите папку Ñ Ð¾Ð±Ñ€Ð°Ð·Ð°Ð¼Ð¸ игр" msgid "Browse for an ISO directory..." msgstr "Выбор папки Ñ ISO-файлами..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "Укажите папку Ð´Ð»Ñ ÑохранениÑ" @@ -846,7 +848,7 @@ msgstr "Укажите папку Ð´Ð»Ñ ÑохранениÑ" msgid "Buffer:" msgstr "Буфер:" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -856,11 +858,11 @@ msgstr "Кнопки" msgid "C Stick" msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "Режим ÑмулÑции CPU" @@ -899,15 +901,11 @@ msgstr "Отмена" msgid "Cannot open %s" msgstr "Ðе удалоÑÑŒ открыть %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "" - #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -917,7 +915,7 @@ msgstr "" "ÐÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать Ñтот файл, как карту памÑти\n" "Ð’Ñ‹ пытаетеÑÑŒ иÑпользовать один файл в обоих Ñлотах?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -946,7 +944,7 @@ msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸Ð· DVD_Plugin - DVD-Interface: Критич msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "" @@ -963,6 +961,7 @@ msgid "Change &Disc..." msgstr "Сменить &диÑк..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 #, fuzzy msgid "Change Disc" msgstr "Сменить &диÑк..." @@ -971,7 +970,7 @@ msgstr "Сменить &диÑк..." msgid "Change Game" msgstr "Сменить игру" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -987,8 +986,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ опции вÑтупÑÑ‚ в Ñилу только поÑле перезапуÑка ÑмулÑтора." @@ -1009,33 +1008,33 @@ msgstr "ПоиÑк кодов" msgid "Cheats Manager" msgstr "Менеджер чит-кодов" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 #, fuzzy msgid "Chinese (Simplified)" msgstr "Chinese (Simplified)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "Выберите оÑновной DVD-диÑк:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 #, fuzzy msgid "Choose a NAND root directory:" msgstr "Выберите оÑновной DVD-диÑк:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "Выберите файл образа:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "Выберите папку Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð² ÑпиÑок" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "Выберите файл карты памÑти" @@ -1043,14 +1042,14 @@ msgstr "Выберите файл карты памÑти" msgid "Choose a memory card:" msgstr "Выберите карту памÑти:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "Выберите папку Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²" @@ -1069,7 +1068,7 @@ msgstr "" msgid "Clear" msgstr "ОчиÑтить" -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." msgstr "" @@ -1083,7 +1082,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Закрыть" @@ -1108,20 +1107,20 @@ msgstr "" msgid "Comment" msgstr "Комментарий" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "Комментарий:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "Сжать ISO-файл..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "Сжать выбранные ISO-файлы..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "Сжатие образа" @@ -1148,13 +1147,13 @@ msgstr "ÐаÑтроить контроллеры" msgid "Configure..." msgstr "ÐаÑтройка ÑмулÑтора..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 #, fuzzy msgid "Confirm on Stop" msgstr "Потверждение при оÑтановке ÑмулÑции" @@ -1164,7 +1163,7 @@ msgstr "Потверждение при оÑтановке ÑмулÑции" msgid "Connect" msgstr "ПодключитьÑÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "Подключить USB-клавиатуру" @@ -1174,22 +1173,26 @@ msgid "Connect Wiimote %i" msgstr "Подключить Wiimote %i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "Подключить Wiimote 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "Подключить Wiimote 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "Подключить Wiimote 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "Подключить Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Connecting..." msgstr "Подключение..." @@ -1214,7 +1217,7 @@ msgstr "" msgid "Copy to Memcard %c" msgstr "Копировать на карту памÑти %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "Ядро" @@ -1244,7 +1247,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Ðе удалоÑÑŒ определить ISO образ %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "Ðе удалоÑÑŒ Ñохранить %s" @@ -1267,7 +1270,7 @@ msgstr "" "\n" "Ð’Ñ‹ запуÑтили Dolphin Ñ CD/DVD, или файл защищен от запиÑи?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "" @@ -1282,7 +1285,7 @@ msgstr "" msgid "Count:" msgstr "Счетчик:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "Страна:" @@ -1296,21 +1299,21 @@ msgstr "Создать новый AR-код" msgid "Create new perspective" msgstr "Создать новую точку обозрениÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr "Стиль от KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr "Стиль от VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "Стиль Ñоздан black_rider'ом и опубликован на ForumW.org > Web Developments" @@ -1343,7 +1346,7 @@ msgstr "" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Ð¢ÐµÐºÑƒÑ‰Ð°Ñ Ð¿Ð°Ð¿ÐºÐ° ÑменилаÑÑŒ Ñ %s на %s поÑле wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 #, fuzzy msgid "Custom Projection Hack" msgstr "Projection-хак: " @@ -1353,15 +1356,15 @@ msgstr "Projection-хак: " msgid "Custom Projection Hack Settings" msgstr "Projection-хак: " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "" @@ -1369,27 +1372,27 @@ msgstr "" msgid "DSP" msgstr "Ðудио" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 #, fuzzy msgid "DSP Emulator Engine" msgstr "Режим ÑмулÑции CPU" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 #, fuzzy msgid "DSP LLE interpreter (slow)" msgstr "Интерпретатор (ОЧЕÐЬ медленный)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 #, fuzzy msgid "DSP LLE on Thread" msgstr "Обрабатывать DSP LLE отдельным потоком" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "" @@ -1397,7 +1400,7 @@ msgstr "" msgid "DSP settings" msgstr "ÐаÑтройка аудио (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "DVD-диÑк:" @@ -1405,7 +1408,7 @@ msgstr "DVD-диÑк:" msgid "Data Size" msgstr "Размер данных" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "Дата:" @@ -1435,16 +1438,16 @@ msgstr "Отладка" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "СнÑÑ‚ÑŒ Ñжатие Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ñ… ISO-файлов..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "" @@ -1452,7 +1455,7 @@ msgstr "" msgid "Default" msgstr "СброÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "Образ по умолчанию:" @@ -1495,8 +1498,8 @@ msgstr "" msgid "Device" msgstr "УÑтройÑтво" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "ÐаÑтройки уÑтройÑтв" @@ -1567,7 +1570,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "ДиÑк" @@ -1591,11 +1594,11 @@ msgstr "" msgid "Divide" msgstr "/" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 msgid "Do you want to stop the current emulation?" msgstr "Ð’Ñ‹ хотите оÑтановить ÑмулÑцию?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "Dolphin" @@ -1621,12 +1624,12 @@ msgstr "ÐаÑтройки Ñмулируемого Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "ÐаÑтройки Dolphin GCPad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1638,7 +1641,7 @@ msgstr "ÐаÑтройка Wiimote" msgid "Dolphin at &Google Code" msgstr "&Репозиторий на Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1646,7 +1649,7 @@ msgstr "" "Dolphin не нашел образов игр GC/Wii. Щелкните дважды по Ñтой надпиÑи, чтобы " "указать путь..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1676,7 +1679,7 @@ msgstr "Барабаны" msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "" @@ -1714,9 +1717,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 #, fuzzy msgid "Dutch" msgstr "Dutch" @@ -1770,8 +1773,8 @@ msgstr "" msgid "Edit current perspective" msgstr "Изменить точку" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "Изменить..." @@ -1783,7 +1786,7 @@ msgstr "Эффект" msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "" @@ -1810,7 +1813,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Эмулируемый Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "КачеÑтво ÑмулÑции:" @@ -1832,7 +1835,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "Включить логирование AR-Ñобытий" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "Включить аудиотроттлинг" @@ -1844,16 +1847,20 @@ msgstr "Включить BAT" msgid "Enable Block Merging" msgstr "Включить Ñовмещение блоков" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "кÑшировать" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Cheats" msgstr "Включить чит-коды" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "Включить DTK-музыку" @@ -1861,7 +1868,7 @@ msgstr "Включить DTK-музыку" msgid "Enable Dual Core" msgstr "Включить DualCore-режим" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "Включить DualCore-режим (уÑкорение)" @@ -1873,7 +1880,7 @@ msgstr "Включить горÑчие клавиши" msgid "Enable Idle Skipping" msgstr "Включить IdleSkipping-режим" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "Включить IdleSkipping-режим (уÑкорение)" @@ -1886,7 +1893,7 @@ msgstr "Включить MMU" msgid "Enable Progressive Scan" msgstr "Включить прогреÑÑивную развертку" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 #, fuzzy msgid "Enable Screen Saver" msgstr "Включить широкий Ñкран" @@ -1940,7 +1947,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -1957,7 +1964,7 @@ msgstr "" "Ðктивирует Ñмещение адреÑа блока (Block Address Translation, BAT), одну из " "функций MMU. Повышает точноÑÑ‚ÑŒ ÑмулÑции ценой ÑÐ½Ð¸Ð¶ÐµÐ½Ð¸Ñ ÑкороÑти." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 #, fuzzy msgid "Enables Custom Projection Hack" msgstr "Projection-хак: " @@ -1990,9 +1997,9 @@ msgstr "" msgid "End" msgstr "End" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 #, fuzzy msgid "English" msgstr "English" @@ -2022,15 +2029,29 @@ msgstr "Равно" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Ошибки" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Ошибка загрузки выбранного Ñзыка. ВозвращаемÑÑ Ðº Ñтандартному." -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2066,11 +2087,12 @@ msgstr "Закрыть Dolphin Ñ ÑмулÑтором" msgid "Export Failed" msgstr "ЭкÑпортирование файла" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "ЭкÑпортирование файла" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 #, fuzzy msgid "Export Recording" msgstr "&ЭкÑпортировать запиÑÑŒ процеÑÑа" @@ -2083,7 +2105,7 @@ msgstr "&ЭкÑпортировать запиÑÑŒ процеÑÑа" msgid "Export Save" msgstr "ЭкÑпортировать Ñохранение" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "ЭкÑпортировать Ñохранение Wii (ÑкÑперемент)" @@ -2116,44 +2138,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "Извлечь вÑе файлы..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "Извлечь apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "Извлечь DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "ИзвлеÑÑŒ папку..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "Извлечь файл..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "Извлечь раздел..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "Извлечение %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "Извлечение вÑех файлов" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "Извлечение папки" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "Подождите..." @@ -2169,7 +2191,7 @@ msgstr "" msgid "FRANCE" msgstr "ФРÐÐЦИЯ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "Размер ТФС:" @@ -2185,7 +2207,7 @@ msgstr "" msgid "Failed to download codes." msgstr "Ошибка ÑÐºÐ°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð´Ð¾Ð²." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "Ошибка Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ Ð² %s!" @@ -2341,11 +2363,11 @@ msgstr "Файл не Ñжат" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: неизвеÑтный режим Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2365,7 +2387,7 @@ msgstr "16:9" msgid "Force 4:3" msgstr "4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 #, fuzzy msgid "Force Console as NTSC-J" msgstr "УÑтановить регион конÑоли как NTSC-J" @@ -2391,7 +2413,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2422,6 +2444,7 @@ msgid "Frame " msgstr "РаÑширенные" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 #, fuzzy msgid "Frame Advance" msgstr "РаÑширенные" @@ -2439,7 +2462,7 @@ msgstr "РаÑширенные" msgid "Frame S&kipping" msgstr "&ПропуÑк кадров" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "Лимит кадров:" @@ -2451,9 +2474,9 @@ msgstr "" msgid "Free Look" msgstr "Свободный обзор" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 #, fuzzy msgid "French" msgstr "French" @@ -2480,11 +2503,16 @@ msgstr "Разрешение полноÑкранного режима:" msgid "GCI File(*.gci)" msgstr "Файл GCI(*.gci)" +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +#, fuzzy +msgid "GCMic Configuration" +msgstr "ÐаÑтройка \"горÑчих\" клавиш" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "ДжойÑтик" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "ID игры:" @@ -2500,7 +2528,7 @@ msgstr "Игра не запущена!" msgid "Game not found!!" msgstr "Игра не найдена!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "ПерÑональные наÑтройки игр" @@ -2508,7 +2536,7 @@ msgstr "ПерÑональные наÑтройки игр" msgid "GameConfig" msgstr "ÐаÑтройки игры" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "Gamecube" @@ -2518,7 +2546,7 @@ msgid "Gamecube &Pad Settings" msgstr "Опции &контроллера Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Файлы карт памÑти Gamecube (*.raw,*.gcp)" @@ -2539,7 +2567,8 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Общие" @@ -2549,9 +2578,9 @@ msgstr "Общие" msgid "General Settings" msgstr "ÐаÑтройки интерфейÑа" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 #, fuzzy msgid "German" msgstr "German" @@ -2584,7 +2613,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 #, fuzzy msgid "Greek" msgstr "Greek" @@ -2617,7 +2646,7 @@ msgstr "" msgid "Header checksum failed" msgstr "Ошибка контрольной Ñуммы заголовка" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 #, fuzzy msgid "Hebrew" msgstr "Hebrew" @@ -2679,11 +2708,12 @@ msgid "Hotkey Configuration" msgstr "ÐаÑтройка \"горÑчих\" клавиш" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 msgid "Hotkeys" msgstr "Клавиши" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 #, fuzzy msgid "Hungarian" msgstr "Hungarian" @@ -2714,7 +2744,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "ÐаÑтройки конÑоли (IPL)" @@ -2730,11 +2760,11 @@ msgstr "ИК указатель" msgid "IR Sensitivity:" msgstr "ЧувÑтвительноÑÑ‚ÑŒ IR-Ñигнала:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "Данные образа" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "Папки Ñ Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸ образов" @@ -2746,6 +2776,12 @@ msgstr "ИТÐЛИЯ" msgid "Icon" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 #, fuzzy msgid "" @@ -2754,7 +2790,7 @@ msgstr "" "Ðктивирует уÑтройÑтво ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ð¼Ñтью, требуетÑÑ Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… игр " "(Ð°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð²Ñ‹ÑˆÐ°ÐµÑ‚ ÑовмеÑтимоÑÑ‚ÑŒ, Ð´ÐµÐ°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ - ÑкороÑÑ‚ÑŒ)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " @@ -2838,7 +2874,7 @@ msgstr "" "Отключение оÑÐ²ÐµÑ‰ÐµÐ½Ð¸Ñ ÑƒÐ»ÑƒÑ‡ÑˆÐ°ÐµÑ‚ производительноÑÑ‚ÑŒ, но оÑвещение полноÑтью " "пропадет в играх, которые его иÑпользуют." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "Почти играбельна" @@ -2867,7 +2903,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "Ð’Ñтавьте Ñюда Ñам код (шифрованный или нешифрованный)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "Ð’Ñтавить SD-карту" @@ -2880,7 +2916,7 @@ msgstr "Введите Ð¸Ð¼Ñ ÐºÐ¾Ð´Ð°..." msgid "Install WAD" msgstr "УÑтановка Wii-меню" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 msgid "Install to Wii Menu" msgstr "УÑтановить в меню Wii" @@ -2890,25 +2926,25 @@ msgid "" msgstr "" "Вызван InstallExceptionHandler, но ваша платформа его еще не поддерживает." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 #, fuzzy msgid "Installing WAD..." msgstr "УÑтанавливаетÑÑ WAD в меню Wii..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 #, fuzzy msgid "Interface" msgstr "ÐаÑтройки интерфейÑа" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "ÐаÑтройки интерфейÑа" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "ВнутренÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ° LZO - ошибка ÑжатиÑ" -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -2917,7 +2953,7 @@ msgstr "" "ВнутренÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ° LZO - ошибка раÑпаковки (%d) (%li, %li) \n" "Попробуйте звгрузить опÑÑ‚ÑŒ" -#: Source/Core/Core/Src/State.cpp:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "ВнутренÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ° LZO - ошибка в lzo_init()" @@ -2926,11 +2962,11 @@ msgstr "ВнутренÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ° LZO - ошибка в lzo_init()" msgid "Internal Resolution:" msgstr "Разрешение полноÑкранного режима:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "Интерпретатор (ОЧЕÐЬ медленный)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "ЗаÑтавка" @@ -2947,7 +2983,7 @@ msgstr "Ðеверное значение!" msgid "Invalid bat.map or dir entry" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "Ðеверный тип ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ %i" @@ -2967,17 +3003,17 @@ msgstr "" "%s\n" " Лучше Ñделать новую копию игры." -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "Ðеверный файл запиÑи" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "Ðеверное Ñохранение" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 #, fuzzy msgid "Italian" msgstr "Italian" @@ -2986,16 +3022,16 @@ msgstr "Italian" msgid "JAPAN" msgstr "ЯПОÐИЯ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "JIT-рекомпилÑтор (рекомендуетÑÑ)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "JITIL-рекомпилÑтор (ÑкÑпериментальный)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 #, fuzzy msgid "Japanese" msgstr "Japanese" @@ -3005,17 +3041,18 @@ msgid "KOREA" msgstr "КОРЕЯ" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "КомбинациÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 #, fuzzy msgid "Korean" msgstr "Korean" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "L" @@ -3024,12 +3061,12 @@ msgid "L Button" msgstr "" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 #, fuzzy msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "Язык" @@ -3052,6 +3089,7 @@ msgid "Left Stick" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3076,7 +3114,7 @@ msgstr "" msgid "Less Than" msgstr "Меньше чем" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "" @@ -3090,41 +3128,49 @@ msgid "Load Custom Textures" msgstr "Load Hi-Res Textures" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 #, fuzzy msgid "Load State Slot 1" msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 #, fuzzy msgid "Load State Slot 2" msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 #, fuzzy msgid "Load State Slot 3" 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 "БыÑÑ‚Ñ€Ð°Ñ &загрузка" @@ -3133,12 +3179,12 @@ msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" msgid "Load State..." msgstr "Загрузить игру..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 #, fuzzy msgid "Load Wii System Menu" msgstr "Загрузить Wii System Menu (%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Загрузить Wii System Menu (%d %c)" @@ -3164,7 +3210,7 @@ msgstr "Загружает указанный файл (DOL, ELF, WAD, GCM, ISO) msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 #, fuzzy msgid "Lock Threads to Cores" msgstr "\"ПривÑзать\" потоки данных к Ñдрам" @@ -3222,16 +3268,16 @@ msgstr "УÑкорить MMU (Ñпидхак)" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Файлы Gameshark MadCatz (*.gcs)" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "ID ÑоздателÑ:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "Создатель:" @@ -3254,7 +3300,7 @@ msgid "Memory Byte" msgstr "Па&мÑÑ‚ÑŒ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 msgid "Memory Card" msgstr "Карта памÑти" @@ -3283,7 +3329,7 @@ msgstr "" msgid "Menu" msgstr "Меню" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "Мик." @@ -3297,7 +3343,7 @@ msgstr "Мик." msgid "Misc" msgstr "Разное" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "Разное" @@ -3323,7 +3369,7 @@ msgid "Motion Plus" msgstr "Motion Plus" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "" @@ -3432,7 +3478,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Вверх" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3471,7 +3517,7 @@ msgstr "Ðик :" msgid "No Country (SDK)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "ISO/WAD-файлов не обнаружено" @@ -3507,7 +3553,7 @@ msgstr "Ðе найдена папка Ñ ÑохранениÑми Ð´Ð»Ñ %s" msgid "None" msgstr "ОтÑутÑтвует" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 #, fuzzy msgid "Norwegian Bokmaal" msgstr "Norwegian Bokmaal" @@ -3516,16 +3562,16 @@ msgstr "Norwegian Bokmaal" msgid "Not Equal" msgstr "Ðе равно" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "ÐеизвеÑтно" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Not connected" msgstr "Ðе подключено" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "ПримечаниÑ" @@ -3567,7 +3613,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "Выкл" @@ -3582,14 +3628,15 @@ msgstr "ДоÑтупно только %d блоков" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Открыть" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "Открыть &папку Ñ Ð¾Ð±Ñ€Ð°Ð·Ð¾Ð¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "Открыть папку Ñ &ÑохранениÑми Wii" @@ -3628,7 +3675,7 @@ msgid "Opens the logger" msgstr "Открывает окно лога" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Опции" @@ -3703,12 +3750,12 @@ msgstr "Раздел %i" msgid "Patches" msgstr "Патчи" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "Папки" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Пауза" @@ -3718,7 +3765,7 @@ msgstr "Пауза" msgid "Per-Pixel Lighting" msgstr "ОÑвещение пикÑелÑ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "Отлично" @@ -3729,21 +3776,23 @@ msgstr "Точка %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 msgid "Play" msgstr "ЗапуÑк" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 #, fuzzy msgid "Play Recording" msgstr "Про&играть запиÑÑŒ процеÑÑа" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "Старт/Пауза" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "Играбельна" @@ -3756,7 +3805,7 @@ msgstr "Опции" msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 msgid "Please confirm..." msgstr "" @@ -3768,27 +3817,27 @@ msgstr "ПожалуйÑта, Ñоздайте точку обозрениÑ, п msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 #, fuzzy msgid "Polish" msgstr "Polish" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 #, fuzzy msgid "Port 1" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 #, fuzzy msgid "Port 2" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 #, fuzzy msgid "Port 3" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 #, fuzzy msgid "Port 4" msgstr "Порт :" @@ -3798,12 +3847,12 @@ msgstr "Порт :" msgid "Port :" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 #, fuzzy msgid "Portuguese" msgstr "Portuguese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 #, fuzzy msgid "Portuguese (Brazilian)" msgstr "Portuguese (Brazilian)" @@ -3813,6 +3862,21 @@ msgstr "Portuguese (Brazilian)" msgid "Post-Processing Effect:" msgstr "Шейдер поÑÑ‚-обработки:" +#: Source/Core/Core/Src/Movie.cpp:735 +#, c-format +msgid "Premature movie end in PlayController. %u + 8 > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:829 +#, c-format +msgid "Premature movie end in PlayWiimote. %u + %d > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:806 +#, c-format +msgid "Premature movie end in PlayWiimote. %u > %u" +msgstr "" + #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 #, fuzzy msgid "Presets: " @@ -3856,7 +3920,7 @@ msgid "Quit" msgstr "Выход" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "R" @@ -3865,7 +3929,7 @@ msgid "R Button" msgstr "" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 #, fuzzy msgid "R-Analog" msgstr "R-Analog" @@ -3883,6 +3947,7 @@ msgid "Range" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "" @@ -3956,6 +4021,7 @@ msgid "Refresh" msgstr "Обновить" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 #, fuzzy msgid "Refresh List" msgstr "&Обновить ÑпиÑок игр" @@ -3964,10 +4030,10 @@ msgstr "&Обновить ÑпиÑок игр" msgid "Refresh game list" msgstr "Обновление ÑпиÑка игр" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 msgid "Remove" msgstr "Удалить" @@ -3986,6 +4052,7 @@ 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 msgid "Reset" msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð½Ð°Ñтроек" @@ -4008,15 +4075,15 @@ msgid "Right Stick" msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "ВидбрациÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "ЗапуÑкает обработку DSP LLE в отдельном потоке (не рекомендуетÑÑ)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "РуÑÑкий" @@ -4028,7 +4095,7 @@ msgstr "БыÑтрое &Ñохранение" msgid "Safe" msgstr "безопаÑное" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 #, fuzzy msgid "Sample Rate:" msgstr "ЧаÑтота" @@ -4044,41 +4111,49 @@ msgid "Save GCI as..." msgstr "Сохранить CGI-файл как..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 #, fuzzy msgid "Save State Slot 1" msgstr "БыÑтрое &Ñохранение" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 #, fuzzy msgid "Save State Slot 2" msgstr "БыÑтрое &Ñохранение" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 #, fuzzy msgid "Save State Slot 3" 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 "БыÑтрое &Ñохранение" @@ -4087,12 +4162,12 @@ msgstr "БыÑтрое &Ñохранение" msgid "Save State..." msgstr "Сохранить игру как..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "Сохранить как..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "Выберите меÑто Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñжатого GCM/ISO-образа" @@ -4100,11 +4175,11 @@ msgstr "Выберите меÑто Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñжатого G msgid "Save current perspective" msgstr "Сохранить точку" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "Выберите меÑто Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð½ÐµÑжатого GCM/ISO-образа" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4113,16 +4188,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, fuzzy, c-format msgid "Scanning %s" msgstr "ПоиÑк..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "ПоиÑк образов диÑков" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "ПоиÑк..." @@ -4138,7 +4213,7 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Фильтр поиÑка" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "ИÑкать в подпапках" @@ -4153,12 +4228,12 @@ msgstr "Ð¡ÐµÐºÑ†Ð¸Ñ %s не найдена в SYSCONF" msgid "Select" msgstr "Выбрать" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи игрового процеÑÑа" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð°" @@ -4185,15 +4260,15 @@ msgstr "" msgid "Select the file to load" msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Выберите файл Ñохранений Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Выберите или укажите файл Ð´Ð»Ñ Ð±Ñ‹Ñтрого ÑохранениÑ" @@ -4250,11 +4325,11 @@ msgstr "МеÑтораÑположение ÑенÑора:" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4265,7 +4340,7 @@ msgstr "" msgid "Set" msgstr "Выбрать" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "Сделать &игрой по умолчанию" @@ -4279,12 +4354,12 @@ msgstr "УÑтановить картой памÑти по умолчанию % msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 #, fuzzy msgid "Settings..." msgstr "ÐаÑтройки конÑоли (IPL)" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Файл наÑтроек не найден" @@ -4292,7 +4367,7 @@ msgstr "SetupWiiMem: Файл наÑтроек не найден" msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "Короткое имÑ:" @@ -4356,7 +4431,7 @@ msgstr "JAP" msgid "Show Korea" msgstr "Кореи" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "Отображать Ñзык:" @@ -4398,11 +4473,11 @@ msgstr "WAD-файлы" msgid "Show Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 msgid "Show a confirmation box before stopping a game." msgstr "Ðктивирует Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð¾Ð± оÑтановке процеÑÑа ÑмулÑции игры." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 #, fuzzy msgid "" "Show a message box when a potentially serious error has occured.\n" @@ -4464,16 +4539,16 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Реальный Wimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 #, fuzzy msgid "Simplified Chinese" msgstr "Simplified Chinese" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "Размер" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 #, fuzzy msgid "Skip BIOS" msgstr "Пропуcтить загрузку BIOS'а GC" @@ -4510,12 +4585,12 @@ msgstr "" msgid "Slot %i" msgstr "Слот" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 #, fuzzy msgid "Slot A" msgstr "Слот" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 #, fuzzy msgid "Slot B" msgstr "Слот" @@ -4536,7 +4611,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "ÐаÑтройки ÑмулÑции звука" @@ -4554,9 +4629,9 @@ msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð°ÑƒÐ´Ð¸Ð¾-буфера %s." msgid "Space" msgstr "Пробел" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 #, fuzzy msgid "Spanish" msgstr "Spanish" @@ -4594,7 +4669,7 @@ msgstr "" msgid "Standard Controller" msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4609,15 +4684,17 @@ msgid "Start Re&cording" msgstr "Ðачать &запиÑÑŒ процеÑÑа" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 #, fuzzy msgid "Start Recording" msgstr "Ðачать &запиÑÑŒ процеÑÑа" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "СтатуÑ" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 #, fuzzy msgid "State Saves" msgstr "Удалить Ñохранение" @@ -4629,6 +4706,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Стоп" @@ -4667,8 +4745,8 @@ msgstr "Сохранение уÑпешно импортировано" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "Язык ÑиÑтемы:" @@ -4700,9 +4778,14 @@ msgstr "ÐŸÑ€Ð°Ð²Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" msgstr "Сделать Ñкриншот" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "Проверить" @@ -4733,13 +4816,13 @@ msgstr "Ðеверный адреÑ" msgid "The checksum was successfully fixed" msgstr "ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ð°Ñ Ñумма уÑпешно иÑправлена" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "The chosen directory is already in the list" msgstr "Ð’Ñ‹Ð±Ð¿Ð²Ð½Ð½Ð°Ñ Ð¿Ð°Ð¿ÐºÐ° уже в ÑпиÑке" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, fuzzy, c-format msgid "" "The file %s already exists.\n" @@ -4823,7 +4906,7 @@ msgstr "Указанный файл \"%s\" не ÑущеÑтвует" msgid "The value is invalid" msgstr "Ðеверное значение" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "Стиль" @@ -4859,7 +4942,7 @@ msgstr "" "СимулÑтор action replay не поддерживает коды, которые менÑÑŽÑ‚ Ñам Action " "Replay. " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "ÐÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ опции может привеÑти к замедлению ÑмулÑции в Wii-меню и " @@ -4876,7 +4959,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -4891,12 +4974,12 @@ msgstr "" "\n" "Удерживайте клавишу Ð´Ð»Ñ Ð±Ñ‹Ñтрого Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ опции в игре." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" "Ð”Ð°Ð½Ð½Ð°Ñ Ð¾Ñ†Ð¿Ð¸Ñ Ð²ÐºÐ»ÑŽÑ‡Ð°ÐµÑ‚ обработку музыкальных Ñ‚Ñ€Ñков (BGM, Ñ„Ð¾Ð½Ð¾Ð²Ð°Ñ Ð¼ÑƒÐ·Ñ‹ÐºÐ°)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 #, fuzzy msgid "" "This splits the Video and CPU threads, so they can be run on separate " @@ -4923,7 +5006,7 @@ msgid "Tilt" msgstr "Ðаклон" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr "Ðазвание" @@ -4940,15 +5023,16 @@ msgstr "Включить вÑе" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Ñверху" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 #, fuzzy msgid "Traditional Chinese" msgstr "Traditional Chinese" @@ -4957,7 +5041,7 @@ msgstr "Traditional Chinese" msgid "Tried to load an unknown file type." msgstr "Попытка загрузить неизвеÑтный тип файла." -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "" @@ -4971,7 +5055,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 #, fuzzy msgid "Turkish" msgstr "Turkish" @@ -5048,15 +5132,6 @@ msgstr "Получено неизвеÑтное Ñообщение Ñ id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Получено неизвеÑтное Ñообщение Ñ id : %d от игрока:%d Игрок выкинут!" -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"ÐеизвеÑтный указатель %#08x\n" -"Продолжить?" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5072,7 +5147,7 @@ msgstr "Обновить" msgid "Upright Wiimote" msgstr "Гибридный Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "ИÑпользовать EuRGB60-режим (PAL60)" @@ -5085,7 +5160,7 @@ msgstr "&ПолноÑкранный режим" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "Показывать panic-ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ (ошибки)" @@ -5130,7 +5205,7 @@ msgstr "" msgid "Verbosity" msgstr "Глубина анализа" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "Видео" @@ -5138,7 +5213,7 @@ msgstr "Видео" msgid "Virtual" msgstr "Виртуальный" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "ГромкоÑÑ‚ÑŒ" @@ -5198,6 +5273,41 @@ msgstr "" "Ñ Ñовпадающими именами будут перепиÑаны\n" "Продолжить?" +#: Source/Core/Core/Src/Movie.cpp:629 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, 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" +"\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" +"\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" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -5215,15 +5325,15 @@ msgstr "" msgid "Width" msgstr "Ширина" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD-диÑк:" @@ -5232,7 +5342,7 @@ msgstr "DVD-диÑк:" msgid "Wii Save Import" msgstr "Импорт Ñохранений Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 msgid "Wii save files (*.bin)|*.bin" msgstr "Файлы Ñохранений Wii (*.bin)|*.bin" @@ -5259,7 +5369,7 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:599 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Wiimote Connected" msgstr "Wiimote подключен" @@ -5295,9 +5405,9 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ñтрок" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Working..." msgstr "Подождите..." @@ -5359,7 +5469,7 @@ msgstr "Ðужно ввеÑти деÑÑтичное или шеÑтнадцат msgid "You must enter a valid profile name." msgstr "Введите правильное Ð¸Ð¼Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Ðеобходимо перезапуÑтить Dolphin, чтобы Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²Ñтупили в Ñилу." @@ -5380,7 +5490,7 @@ msgid "" msgstr "" "Ваш файл SYSCONF неверного размера (0x%2$04llx), а должен быть 0x%1$04x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "Включить ZTP-хак" @@ -5435,7 +5545,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "загрузчик (.img)" @@ -5452,7 +5562,7 @@ msgstr "Ðевозможно прочеÑÑ‚ÑŒ данные из файла: %s" msgid "failed to read header" msgstr "ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ°" -#: Source/Core/Core/Src/HW/Memmap.cpp:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Чтение кода операции из %x. ПожалуйÑта Ñообщите." @@ -5471,7 +5581,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "неизвеÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute вернул -1 при запуÑке приложениÑ!" @@ -5853,6 +5963,13 @@ msgstr "| OR" #~ msgid "Trying to load unsupported type %d" #~ msgstr "Попытка загрузить неподдериваемый тип %d" +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "ÐеизвеÑтный указатель %#08x\n" +#~ "Продолжить?" + #, fuzzy #~ msgid "Use FPS For Limiting" #~ msgstr "ИÑпользовать FPS Ð´Ð»Ñ Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ" diff --git a/Languages/po/sr.po b/Languages/po/sr.po index 42e341c386..7f9c8580a6 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: 2011-10-11 23:25-0500\n" +"POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-03-02 21:58+0100\n" "Last-Translator: nikolassj\n" "Language-Team: \n" @@ -50,9 +50,9 @@ msgstr "\"%s\"je GCM/ISO fajl, ili nije GC/Wii ISO." msgid "%1$sCopy%1$s" msgstr "%1$sKopiraj%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "" @@ -170,11 +170,11 @@ msgstr "&Chit Meneger " msgid "&DSP Settings" msgstr "&DSP Opcije" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "&Obrisi ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 msgid "&Delete selected ISOs..." msgstr "&Obrisi oznacene ISO fajlove..." @@ -238,7 +238,7 @@ msgstr "&Pauza" msgid "&Play" msgstr "&Pokreni" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "&Pribor/Opcije" @@ -282,7 +282,7 @@ msgstr "&Pogledaj" msgid "&Wiimote Settings" msgstr "&Wiimote Opcije" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "" @@ -331,10 +331,11 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -373,8 +374,8 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "" @@ -409,6 +410,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 msgid "Action" msgstr "Akcija" @@ -494,11 +496,11 @@ msgstr "Adapter" msgid "Add" msgstr "Dodaj" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "Dodaj ActionReplay kod" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "Dodaj Patch " @@ -506,9 +508,9 @@ msgstr "Dodaj Patch " msgid "Add new pane" msgstr "Dodaj nova okna" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Add..." msgstr "Dodaj..." @@ -546,7 +548,7 @@ msgstr "" msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "" @@ -554,28 +556,28 @@ msgstr "" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "" @@ -607,7 +609,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "" @@ -622,7 +624,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "" @@ -631,7 +633,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:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -639,11 +641,11 @@ msgstr "" "Jeste li sigurni da zelite da obrisete ove fajlove?\n" "Nestace zauvek!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 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:725 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -652,11 +654,11 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "Zvuk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" msgstr "" @@ -664,7 +666,7 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -702,7 +704,7 @@ msgstr "" msgid "Back" msgstr "Nazad " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" msgstr "" @@ -713,7 +715,7 @@ msgid "Backend:" msgstr "Nazad " #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "" @@ -726,15 +728,15 @@ msgid "Bad File Header" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr "Baner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "Detalji o Baneru" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "Baner:" @@ -746,7 +748,7 @@ msgstr "Bar" msgid "Basic" msgstr "Osnovno/ni/ne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "Osnovne opcije" @@ -775,7 +777,7 @@ msgid "Blue Right" msgstr "Blue right " #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Donji deo/dno" @@ -784,7 +786,7 @@ msgstr "Donji deo/dno" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "Ostecen/a/nje..." @@ -792,7 +794,7 @@ msgstr "Ostecen/a/nje..." msgid "Browse" msgstr "Trazi" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "" @@ -800,7 +802,7 @@ msgstr "" msgid "Browse for an ISO directory..." msgstr "Trazi ISO direktoriju" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "" @@ -808,7 +810,7 @@ msgstr "" msgid "Buffer:" msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -819,11 +821,11 @@ msgstr "Tasteri" msgid "C Stick" msgstr "C-Stick" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "CPU Emulacije \"Engine\"" @@ -862,15 +864,11 @@ msgstr "Odustani" msgid "Cannot open %s" msgstr "Nemoze otvoriti %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "" - #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -878,7 +876,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -905,7 +903,7 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "" @@ -922,6 +920,7 @@ msgid "Change &Disc..." msgstr "Promeni &Disk..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "Promeni Disk" @@ -929,7 +928,7 @@ msgstr "Promeni Disk" msgid "Change Game" msgstr "Promeni Igru" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -945,8 +944,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "" @@ -966,31 +965,31 @@ msgstr "Trazi Chit" msgid "Cheats Manager" msgstr "Chit Meneger" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Kineski (pojednostavljen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Kineski (tradicionalan)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "Biraj fajl da otvoris " @@ -998,14 +997,14 @@ msgstr "Biraj fajl da otvoris " msgid "Choose a memory card:" msgstr "Biraj memorisku karticu:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "Biraj folder u kome zelis da ekstraktujes " @@ -1024,7 +1023,7 @@ msgstr "Klasik/a" msgid "Clear" msgstr "Ocisti" -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." msgstr "\"Clear\" nije uspeo " @@ -1038,7 +1037,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Zatvori" @@ -1063,20 +1062,20 @@ msgstr "Komanda" msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "Koment:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "Kompresuj ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "Kompresuj oznaceni ISO fajlovi..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "Kompresivanje ISO fajla u toku" @@ -1103,13 +1102,13 @@ msgstr "" msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Confirm on Stop" msgstr "" @@ -1118,7 +1117,7 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "" @@ -1128,22 +1127,26 @@ msgid "Connect Wiimote %i" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Connecting..." msgstr "Povezivanje..." @@ -1168,7 +1171,7 @@ msgstr "Kopiranje neuspesno " msgid "Copy to Memcard %c" msgstr "Kopiraj na memorisku karticu %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "" @@ -1195,7 +1198,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "" @@ -1215,7 +1218,7 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "" @@ -1230,7 +1233,7 @@ msgstr "" msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "Zemlja:" @@ -1244,20 +1247,20 @@ msgstr "Kreiraj AR Kod" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" @@ -1289,7 +1292,7 @@ msgstr "" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" msgstr "" @@ -1297,15 +1300,15 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "" @@ -1313,24 +1316,24 @@ msgstr "" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP Emulator Engine" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "" @@ -1338,7 +1341,7 @@ msgstr "" msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "" @@ -1346,7 +1349,7 @@ msgstr "" msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "" @@ -1375,16 +1378,16 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "" @@ -1392,7 +1395,7 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "" @@ -1435,8 +1438,8 @@ msgstr "" msgid "Device" msgstr "Uredjaj " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "Opcije Uredjaja " @@ -1506,7 +1509,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "Disk" @@ -1530,11 +1533,11 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "Dolphin" @@ -1560,12 +1563,12 @@ msgstr "" msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1577,13 +1580,13 @@ msgstr "" msgid "Dolphin at &Google Code" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1611,7 +1614,7 @@ msgstr "" msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "" @@ -1648,9 +1651,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "" @@ -1699,8 +1702,8 @@ msgstr "" msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "" @@ -1712,7 +1715,7 @@ msgstr "" msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "" @@ -1739,7 +1742,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "" @@ -1761,7 +1764,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "" @@ -1773,15 +1776,19 @@ msgstr "" msgid "Enable Block Merging" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "" @@ -1789,7 +1796,7 @@ msgstr "" msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "" @@ -1801,7 +1808,7 @@ msgstr "" msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "" @@ -1814,7 +1821,7 @@ msgstr "" msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Enable Screen Saver" msgstr "" @@ -1861,7 +1868,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -1874,7 +1881,7 @@ msgid "" "Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" msgstr "" @@ -1903,9 +1910,9 @@ msgstr "" msgid "End" msgstr "Kraj" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "" @@ -1934,15 +1941,29 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -1974,11 +1995,12 @@ msgstr "" msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "" @@ -1990,7 +2012,7 @@ msgstr "" msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "" @@ -2022,44 +2044,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "" @@ -2075,7 +2097,7 @@ msgstr "" msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "" @@ -2091,7 +2113,7 @@ msgstr "" msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2243,11 +2265,11 @@ msgstr "" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2267,7 +2289,7 @@ msgstr "" msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Force Console as NTSC-J" msgstr "" @@ -2291,7 +2313,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2318,6 +2340,7 @@ msgid "Frame " msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "" @@ -2333,7 +2356,7 @@ msgstr "" msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "" @@ -2345,9 +2368,9 @@ msgstr "" msgid "Free Look" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "French" msgstr "" @@ -2373,11 +2396,16 @@ msgstr "Rezolucija punog ekrana " msgid "GCI File(*.gci)" msgstr "" +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +#, fuzzy +msgid "GCMic Configuration" +msgstr "Dolphin podesavanja/konfiguracija" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "" @@ -2393,7 +2421,7 @@ msgstr "Igra nije pokrenuta!" msgid "Game not found!!" msgstr "Igra nije pronadjena " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "" @@ -2401,7 +2429,7 @@ msgstr "" msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "Gamecube " @@ -2410,7 +2438,7 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2431,7 +2459,8 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2441,9 +2470,9 @@ msgstr "" msgid "General Settings" msgstr "Opcije Uredjaja " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "German" msgstr "Nemacki " @@ -2475,7 +2504,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" msgstr "" @@ -2507,7 +2536,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hebrew" msgstr "" @@ -2560,11 +2589,12 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hungarian" msgstr "" @@ -2590,7 +2620,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "" @@ -2606,11 +2636,11 @@ msgstr "" msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "ISO Detalji " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "" @@ -2622,12 +2652,18 @@ msgstr "" msgid "Icon" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 msgid "" "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." @@ -2699,7 +2735,7 @@ msgstr "" "Onemoguci \"lighting\". Poboljsava performans/brzinu ali uzrokuje da " "\"lightning\" nestane u igrama koje ga koriste." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "" @@ -2728,7 +2764,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "" @@ -2741,7 +2777,7 @@ msgstr "Ubaci ime ovde..." msgid "Install WAD" msgstr "Instaliraj Wii Meni " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 msgid "Install to Wii Menu" msgstr "" @@ -2750,30 +2786,30 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "" -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" "Try loading the state again" msgstr "" -#: Source/Core/Core/Src/State.cpp:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "" @@ -2782,11 +2818,11 @@ msgstr "" msgid "Internal Resolution:" msgstr "Rezolucija punog ekrana " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "Uvod" @@ -2803,7 +2839,7 @@ msgstr "" msgid "Invalid bat.map or dir entry" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "" @@ -2820,17 +2856,17 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Italian" msgstr "Italianski " @@ -2838,16 +2874,16 @@ msgstr "Italianski " msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (preporucljivo)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Japanese" msgstr "Japanski " @@ -2856,16 +2892,17 @@ msgid "KOREA" msgstr "KOREA " #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "Taster " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Korean" msgstr "Korejski " #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "" @@ -2874,11 +2911,11 @@ msgid "L Button" msgstr "" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "" @@ -2901,6 +2938,7 @@ msgid "Left Stick" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -2923,7 +2961,7 @@ msgstr "" msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "" @@ -2937,34 +2975,42 @@ msgid "Load Custom Textures" msgstr "Ucitaj Hi-Res Textures " #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 1" msgstr "Ucitaj State Slot 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 2" msgstr "Ucitaj State Slot 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 3" msgstr "Ucitaj State Slot 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 4" msgstr "Ucitaj State Slot 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 msgid "Load State Slot 5" msgstr "Ucitaj State Slot 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Load State Slot 6" msgstr "Uci State Slot 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Load State Slot 7" msgstr "Ucitaj State Slot 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Load State Slot 8" msgstr "Ucitaj State Slot 8" @@ -2972,12 +3018,12 @@ msgstr "Ucitaj State Slot 8" msgid "Load State..." msgstr "Ucitaj State" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 #, fuzzy msgid "Load Wii System Menu" msgstr "Ucitaj Wii Sistem Meni (%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Ucitaj Wii Sistem Meni (%d %c)" @@ -3001,7 +3047,7 @@ msgstr "" msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Lock Threads to Cores" msgstr "" @@ -3054,16 +3100,16 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "" @@ -3086,7 +3132,7 @@ msgid "Memory Byte" msgstr "&Memorija" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 msgid "Memory Card" msgstr "" @@ -3115,7 +3161,7 @@ msgstr "" msgid "Menu" msgstr "Meni" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "" @@ -3128,7 +3174,7 @@ msgstr "" msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "" @@ -3154,7 +3200,7 @@ msgid "Motion Plus" msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "" @@ -3263,7 +3309,7 @@ msgstr "" msgid "NP Up" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3302,7 +3348,7 @@ msgstr "" msgid "No Country (SDK)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "" @@ -3337,7 +3383,7 @@ msgstr "" msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" msgstr "" @@ -3345,16 +3391,16 @@ msgstr "" msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Not connected" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "" @@ -3396,7 +3442,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "Izskljucen/o" @@ -3411,14 +3457,15 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Otvori " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "" @@ -3457,7 +3504,7 @@ msgid "Opens the logger" msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Opcije " @@ -3532,12 +3579,12 @@ msgstr "" msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pauza " @@ -3547,7 +3594,7 @@ msgstr "Pauza " msgid "Per-Pixel Lighting" msgstr "Onemoguci \"Lighting\"" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "Perfektno " @@ -3558,20 +3605,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 msgid "Play" msgstr "Pokreni " #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "Pokreni snimanje " #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "" @@ -3584,7 +3633,7 @@ msgstr "Opcije " msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 msgid "Please confirm..." msgstr "" @@ -3596,23 +3645,23 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Polish" msgstr "Polski " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 msgid "Port 4" msgstr "Port 4" @@ -3621,11 +3670,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese" msgstr "Portugalski " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" msgstr "" @@ -3633,6 +3682,21 @@ msgstr "" msgid "Post-Processing Effect:" msgstr "" +#: Source/Core/Core/Src/Movie.cpp:735 +#, c-format +msgid "Premature movie end in PlayController. %u + 8 > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:829 +#, c-format +msgid "Premature movie end in PlayWiimote. %u + %d > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:806 +#, c-format +msgid "Premature movie end in PlayWiimote. %u > %u" +msgstr "" + #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "" @@ -3675,7 +3739,7 @@ msgid "Quit" msgstr "Izadji " #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "" @@ -3684,7 +3748,7 @@ msgid "R Button" msgstr "" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" msgstr "" @@ -3701,6 +3765,7 @@ msgid "Range" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "" @@ -3768,6 +3833,7 @@ msgid "Refresh" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "" @@ -3775,10 +3841,10 @@ msgstr "" msgid "Refresh game list" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 msgid "Remove" msgstr "" @@ -3794,6 +3860,7 @@ 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 msgid "Reset" msgstr "Reset/Restart " @@ -3816,15 +3883,15 @@ msgid "Right Stick" msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "" @@ -3836,7 +3903,7 @@ msgstr "" msgid "Safe" msgstr "Siguran " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Sample Rate:" msgstr "" @@ -3851,34 +3918,42 @@ msgid "Save GCI as..." msgstr "Snimaj GCI kao..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 1" msgstr "Snimaj State Slot 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 2" msgstr "Snimaj State Slot 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 3" msgstr "Snimaj State Slot 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 4" msgstr "Snimaj State Slot 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 msgid "Save State Slot 5" msgstr "Snimaj State Slot 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 msgid "Save State Slot 6" msgstr "Snimaj State Slot 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 msgid "Save State Slot 7" msgstr "Snimaj State Slot 7 " #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 msgid "Save State Slot 8" msgstr "Snimaj State Slot 8" @@ -3886,12 +3961,12 @@ msgstr "Snimaj State Slot 8" msgid "Save State..." msgstr "Snimaj state..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "Snimaj kao..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "Snimaj kompresovani GCM/ISO" @@ -3899,11 +3974,11 @@ msgstr "Snimaj kompresovani GCM/ISO" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -3912,16 +3987,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, fuzzy, c-format msgid "Scanning %s" msgstr "Skeniranje..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "Skeniranje za ISO fajlove " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "Skeniranje..." @@ -3937,7 +4012,7 @@ msgstr "" msgid "Search Filter" msgstr "Trazi Filter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "Trazi Subfoldere " @@ -3952,12 +4027,12 @@ msgstr "" msgid "Select" msgstr "Izaberi " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Izaberi Snimani fajl" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje " @@ -3984,15 +4059,15 @@ msgstr "" msgid "Select the file to load" msgstr "Izaberi fajl za ucitavanje " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Izaberi \"snimani fajl/the save state\"" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Izaberi state za ucitavanje " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Izaberi state za snimanje/save" @@ -4043,11 +4118,11 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4056,7 +4131,7 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "" @@ -4070,11 +4145,11 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." msgstr "" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "" @@ -4082,7 +4157,7 @@ msgstr "" msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "" @@ -4143,7 +4218,7 @@ msgstr "" msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "" @@ -4183,11 +4258,11 @@ msgstr "" msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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 " @@ -4241,15 +4316,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "Velicina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 #, fuzzy msgid "Skip BIOS" msgstr "Preskoci GC BIOS" @@ -4286,11 +4361,11 @@ msgstr "" msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 msgid "Slot B" msgstr "" @@ -4310,7 +4385,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "" @@ -4328,9 +4403,9 @@ msgstr "" msgid "Space" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Spanish" msgstr "" @@ -4366,7 +4441,7 @@ msgstr "" msgid "Standard Controller" msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4381,14 +4456,16 @@ msgid "Start Re&cording" msgstr "Pokreni Sni&manje" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "Pokreni Snimanje" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "" @@ -4399,6 +4476,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr " Zaustavi" @@ -4437,8 +4515,8 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "" @@ -4470,9 +4548,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" msgstr "" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "" @@ -4503,13 +4586,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, c-format msgid "" "The file %s already exists.\n" @@ -4588,7 +4671,7 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "" @@ -4614,7 +4697,7 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "" @@ -4629,7 +4712,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -4638,11 +4721,11 @@ msgid "" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4664,7 +4747,7 @@ msgid "Tilt" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr "" @@ -4679,15 +4762,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "" @@ -4695,7 +4779,7 @@ msgstr "" msgid "Tried to load an unknown file type." msgstr "" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "" @@ -4709,7 +4793,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Turkish" msgstr "" @@ -4785,13 +4869,6 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -4806,7 +4883,7 @@ msgstr "Updejt " msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -4819,7 +4896,7 @@ msgstr "&Pun Ekran" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "" @@ -4864,7 +4941,7 @@ msgstr "" msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "Video " @@ -4872,7 +4949,7 @@ msgstr "Video " msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "Jacina zvuka " @@ -4931,6 +5008,41 @@ msgstr "" "koji imaju isto ime kao i fajlovi na vasoj memoriskoj kartici\n" " Nastavi?" +#: Source/Core/Core/Src/Movie.cpp:629 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, 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" +"\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" +"\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" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -4948,15 +5060,15 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 msgid "Wii NAND Root:" msgstr "" @@ -4964,7 +5076,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -4991,7 +5103,7 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:599 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Wiimote Connected" msgstr "" @@ -5024,9 +5136,9 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Working..." msgstr "Radi..." @@ -5087,7 +5199,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5105,7 +5217,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "" @@ -5159,7 +5271,7 @@ msgstr "" msgid "^ ADD" msgstr "^ DODAJ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "" @@ -5176,7 +5288,7 @@ msgstr "" msgid "failed to read header" msgstr "" -#: Source/Core/Core/Src/HW/Memmap.cpp:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "" @@ -5195,7 +5307,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/tr.po b/Languages/po/tr.po index 120d06aad1..31ca12822d 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: 2011-10-11 23:25-0500\n" +"POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-08-19 08:38-0500\n" "Last-Translator: nlgzrgn \n" "Language-Team: nlgzrgn \n" @@ -53,9 +53,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sKopyala%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -182,11 +182,11 @@ msgstr "Hile Yöneti&cisi" msgid "&DSP Settings" msgstr "Ses Ayarları (&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "Kalıbı Sil... (&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 msgid "&Delete selected ISOs..." msgstr "Seçilen Kalıpları Sil... (&D)" @@ -250,7 +250,7 @@ msgstr "Duraklat (&P)" msgid "&Play" msgstr "Oynat (&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "Özellikler (&P)" @@ -294,7 +294,7 @@ msgstr "Görünüm (&V)" msgid "&Wiimote Settings" msgstr "&Wiimote Ayarları" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "&Wiki" @@ -343,10 +343,11 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -402,8 +403,8 @@ msgstr "" "\n" "TCP baÄŸlantı noktanızı barındırıcıya yönlendirmelisiniz!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "AM-Süpürgelik" @@ -444,6 +445,7 @@ msgstr "" "Emin deÄŸilseniz, iÅŸaretli bırakın." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 msgid "Action" msgstr "Eylem" @@ -541,11 +543,11 @@ msgstr "Dönüştürücü:" msgid "Add" msgstr "Ekle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "Action Replay Kodu Ekle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "Yama Ekle" @@ -553,9 +555,9 @@ msgstr "Yama Ekle" msgid "Add new pane" msgstr "Bölme ekle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Add..." msgstr "Ekle..." @@ -609,7 +611,7 @@ msgstr "" msgid "Advanced" msgstr "GeliÅŸmiÅŸ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "GeliÅŸmiÅŸ Ayarlar" @@ -617,28 +619,28 @@ msgstr "GeliÅŸmiÅŸ Ayarlar" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Tüm GC/Wii dosyaları (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Tüm GC/Wii kalıpları (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "Tüm GameCube GCM Dosyaları (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "Tüm Kayıtlı Oyunlar (sav,s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "Tüm Wii kalıpları (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 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:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "Tüm dosyalar (*.*)|*.*" @@ -675,7 +677,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:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "Apploader:" @@ -693,7 +695,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, kapalı seçin." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Arapça" @@ -702,7 +704,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:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -710,12 +712,12 @@ msgstr "" "Bu dosyaları gerçekten silmek istiyor musunuz?\n" "Ama geri döndürülemeyecekler!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Bu dosyayı gerçekten silmek istiyor musunuz? Ama geri döndürülemeyecektir!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "En-boy Oranı:" @@ -724,11 +726,11 @@ msgstr "En-boy Oranı:" msgid "At least one pane must remain open." msgstr "En azından bir bölme açık kalmalıdır." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "Ses" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" msgstr "Ses Arka Ucu:" @@ -736,7 +738,7 @@ msgstr "Ses Arka Ucu:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO sürücüyü açarken hata.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Otomatik" @@ -779,7 +781,7 @@ msgstr "" msgid "Back" msgstr "Geri" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" msgstr "Arka Uç Ayarları" @@ -789,7 +791,7 @@ msgid "Backend:" msgstr "Arka Uç:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Arkaplanda GiriÅŸ" @@ -802,15 +804,15 @@ msgid "Bad File Header" msgstr "Kötü Dosya Başı" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr "AfiÅŸ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "AfiÅŸ Ayrıntıları" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "AfiÅŸ:" @@ -822,7 +824,7 @@ msgstr "Çubuk" msgid "Basic" msgstr "Temel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "Temel Ayarlar" @@ -851,7 +853,7 @@ msgid "Blue Right" msgstr "Mavi SaÄŸ" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "Alt" @@ -860,7 +862,7 @@ msgstr "Alt" msgid "Bound Controls: %lu" msgstr "BaÄŸlı Denetimler: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "Bozuk" @@ -868,7 +870,7 @@ msgstr "Bozuk" msgid "Browse" msgstr "Gözat..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "Eklemek için bir klasöre gözat" @@ -876,7 +878,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:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "Çıkış klasörü için gözat" @@ -884,7 +886,7 @@ msgstr "Çıkış klasörü için gözat" msgid "Buffer:" msgstr "Tampon:" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -894,11 +896,11 @@ msgstr "Düğmeler" msgid "C Stick" msgstr "C ÇubuÄŸu" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "C ÇubuÄŸu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "CPU Emülatör Motoru" @@ -949,15 +951,11 @@ msgstr "Ä°ptal" msgid "Cannot open %s" msgstr "%s 'yi açmayı iptal et" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "Salt-okunur modda film çekilemez." - #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "Bekleyen olaylardan dolayı olaylar kayıttan kaldırılamıyor." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -968,7 +966,7 @@ msgstr "" "%s\n" "Geçerli bir Gamecube hafıza kartı dosyası deÄŸil." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -997,7 +995,7 @@ msgstr "DVD Eklentisinden okunamıyor - DVD-Arabirimi : Ölümcül Hata" msgid "Caps Lock" msgstr "Büyük Harf Kilidi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Katalanca" @@ -1014,6 +1012,7 @@ msgid "Change &Disc..." msgstr "&Diski DeÄŸiÅŸtir" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "Diski DeÄŸiÅŸtir" @@ -1021,7 +1020,7 @@ msgstr "Diski DeÄŸiÅŸtir" msgid "Change Game" msgstr "Oyunu DeÄŸiÅŸtir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1037,8 +1036,8 @@ msgstr "zFar Parametresine iÅŸaret deÄŸiÅŸtirir (düzeltme sonrası)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "zNear Parametresine iÅŸaret deÄŸiÅŸtirir (düzeltme sonrası)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "Emülatör çalışırken deÄŸiÅŸtirirseniz etki etmeyecektir!" @@ -1058,31 +1057,31 @@ msgstr "Hile Arama" msgid "Cheats Manager" msgstr "Hile Yöneticisi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Çince (Basit)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Çince (Geleneksel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "DVD kök dizinini seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Choose a NAND root directory:" msgstr "NAND kök dizinini seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "Varsayılan kalıbı seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "Eklemek için bir konum seçin" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "Açmak için bir dosya seçin" @@ -1090,7 +1089,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:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1098,8 +1097,8 @@ msgstr "" "Apploader olarak bir dosya seçin: (Sadece konumlardan yapılan disklere " "uygulanır)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "GeniÅŸletmek için bir klasör seçin" @@ -1118,7 +1117,7 @@ msgstr "Klasik" msgid "Clear" msgstr "Temizle" -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." msgstr "Temizleme baÅŸarısız." @@ -1132,7 +1131,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Kapat" @@ -1157,20 +1156,20 @@ msgstr "Komut" msgid "Comment" msgstr "Yorum" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "Yorum:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "Kalıbı sıkıştır..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "Seçili kalıpları sıkıştır..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "Kalıp sıkıştırılıyor..." @@ -1197,13 +1196,13 @@ msgstr "Kolları Yapılandır" msgid "Configure..." msgstr "Yapılandır..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "Dosyanın Ãœzerine Yazmaya Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Confirm on Stop" msgstr "Durdurma Onayı Ä°ste" @@ -1212,7 +1211,7 @@ msgstr "Durdurma Onayı Ä°ste" msgid "Connect" msgstr "BaÄŸlan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "USB Klavye BaÄŸla" @@ -1222,22 +1221,26 @@ msgid "Connect Wiimote %i" msgstr "Wiimote'u BaÄŸla : %i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "Wiimote 1'i BaÄŸla" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "Wiimote 2'yi BaÄŸla" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "Wiimote 3'ü BaÄŸla" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "Wiimote 4'ü BaÄŸla" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Connecting..." msgstr "BaÄŸlanıyor..." @@ -1262,7 +1265,7 @@ msgstr "Kopyalama baÅŸarısız." msgid "Copy to Memcard %c" msgstr "Hafıza kartı %c 'ye kopyala" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "Çekirdek" @@ -1292,7 +1295,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Kalıp dosyası %s tanınamadı." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "%s kaydedilemedi." @@ -1318,7 +1321,7 @@ msgstr "" "Dolphin'i bir CD veya DVD'den çalıştırıyor olabilir misiniz veya kayıt " "dosyası yazma korumalı olabilir mi?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "Uzantı 'ini' için açma komutu bulunamadı." @@ -1335,7 +1338,7 @@ msgstr "" msgid "Count:" msgstr "Sayı:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "Ãœlke:" @@ -1349,22 +1352,22 @@ msgstr "AR Kodu OluÅŸtur" msgid "Create new perspective" msgstr "Yeni perspektif oluÅŸtur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr "KDE-Look.org tarafından oluÅŸturulmuÅŸtur." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr "VistaIcons.com tarafından oluÅŸturulmuÅŸtur." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "black_rider tarafından oluÅŸturulup ForumW.org > Web Developments 'da " @@ -1402,7 +1405,7 @@ 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:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" msgstr "Özel Projeksiyon Hilesi" @@ -1410,15 +1413,15 @@ msgstr "Özel Projeksiyon Hilesi" msgid "Custom Projection Hack Settings" msgstr "Özel Projeksiyon Hilesi Ayarları" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." msgstr "Bazı ortografik projeksiyon parametrelerini özelleÅŸtir." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Çekçe" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "Yön TuÅŸları" @@ -1426,24 +1429,24 @@ msgstr "Yön TuÅŸları" msgid "DSP" msgstr "Ses" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP Emulator Engine" msgstr "Ses Emülatörü Motoru" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emülasyonu (Hızlı)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 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:606 msgid "DSP LLE on Thread" msgstr "Ä°ÅŸlem Birimi Ãœzerinde DSP LLE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "DSP LLE Yeniden Derleyici" @@ -1451,7 +1454,7 @@ msgstr "DSP LLE Yeniden Derleyici" msgid "DSP settings" msgstr "Ses ayarları" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "DVD Kök Dizini:" @@ -1459,7 +1462,7 @@ msgstr "DVD Kök Dizini:" msgid "Data Size" msgstr "Veri Boyutu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "Tarih:" @@ -1488,16 +1491,16 @@ msgstr "Hata ayıklama" msgid "Decimal" msgstr "Onluk taban" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "Kalıbı geniÅŸlet..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "Seçili kalıpları geniÅŸlet..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "Kalıp geniÅŸletiliyor..." @@ -1505,7 +1508,7 @@ msgstr "Kalıp geniÅŸletiliyor..." msgid "Default" msgstr "Varsayılan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "Varsayılan kalıp:" @@ -1549,8 +1552,8 @@ msgstr "" msgid "Device" msgstr "Sürücü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "Sürücü Ayarları" @@ -1635,7 +1638,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "Disk" @@ -1662,11 +1665,11 @@ msgstr "" msgid "Divide" msgstr "Böl" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 msgid "Do you want to stop the current emulation?" msgstr "Emülasyonu durdurmak istiyor musunuz?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "Dolphin" @@ -1691,12 +1694,12 @@ msgstr "Dolphin Taklit Wiimote Yapılandırması" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC Kolu Yapılandırması" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filmleri (*.dtm)" @@ -1708,7 +1711,7 @@ msgstr "Dolphin Wiimote Yapılandırması" msgid "Dolphin at &Google Code" msgstr "&Google Code'da Dolphin" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1716,7 +1719,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:307 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1746,7 +1749,7 @@ msgstr "Davullar" msgid "Dummy" msgstr "Kukla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Sesi Dök" @@ -1793,9 +1796,9 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Flemenkçe" @@ -1848,8 +1851,8 @@ msgstr "Yamayı Düzenle" msgid "Edit current perspective" msgstr "Åžu anki perspektifi düzenle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "Düzenle..." @@ -1861,7 +1864,7 @@ msgstr "Etki" msgid "Embedded Frame Buffer" msgstr "Gömülü Kare Tamponu" -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "Emülasyon Ä°ÅŸlem Birimi zaten çalışıyor." @@ -1899,7 +1902,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Taklit Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "Emülasyon Durumu:" @@ -1927,7 +1930,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "AR GeçmiÅŸine Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "Ses Hızlandırmasına Ä°zin Ver" @@ -1939,15 +1942,19 @@ msgstr "BAT'a Ä°zin Ver" msgid "Enable Block Merging" msgstr "Blok BirleÅŸimine Ä°zin Ver" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "ÖnbelleÄŸe izin ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Cheats" msgstr "Hilelere Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "DTK MüziÄŸine Ä°zin Ver" @@ -1955,7 +1962,7 @@ msgstr "DTK MüziÄŸine Ä°zin Ver" msgid "Enable Dual Core" msgstr "Çift ÇekirdeÄŸe Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "Çift ÇekirdeÄŸe Ä°zin Ver (hızı artırır)" @@ -1967,7 +1974,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:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "BoÅŸta Atlamaya Ä°zin Ver (hızı artırır)" @@ -1980,7 +1987,7 @@ msgstr "MMU'ya Ä°zin Ver" msgid "Enable Progressive Scan" msgstr "Progresif Taramaya Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Enable Screen Saver" msgstr "Ekran Koruyucusuna Ä°zin Ver" @@ -2044,7 +2051,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2061,7 +2068,7 @@ msgstr "" "Blok Adresi Çevirisine izin verir. Bu bir Hafıza Yönetim Ãœnitesi iÅŸlevidir. " "DoÄŸruluÄŸu artırır ama performansı düşürür. (Açık = Uyumlu, Kapalı = Hızlı)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" msgstr "Özel Projeksiyon Hilesini EtkinleÅŸtirir" @@ -2099,9 +2106,9 @@ msgstr "" msgid "End" msgstr "Son" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "Ä°ngilizce" @@ -2130,15 +2137,29 @@ msgstr "EÅŸit" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Hata" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 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." -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2172,11 +2193,12 @@ msgstr "Dolphin Emülatöründen Çık" msgid "Export Failed" msgstr "Verme baÅŸarısız." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "Dosya Ver" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "Çekimi Ver" @@ -2188,7 +2210,7 @@ msgstr "Çekimi Ver..." msgid "Export Save" msgstr "Kaydı Ver" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "Wii Kayıtlı Oyununu Ver (Deneysel)" @@ -2220,44 +2242,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:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "Tüm Dosyaları GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "Apploader'i GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "DOL'ü GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "Konumu GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "Dosyayı GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "Bölüntüyü GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "%s GeniÅŸletiliyor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "Tüm Dosyalar GeniÅŸletiliyor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "Konum GeniÅŸletiliyor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "GeniÅŸletiliyor..." @@ -2273,7 +2295,7 @@ msgstr "FIFO Oynatıcısı" msgid "FRANCE" msgstr "FRANSA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "FST Boyutu:" @@ -2289,7 +2311,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:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "%s 'ye geniÅŸletme baÅŸarısız!" @@ -2464,11 +2486,11 @@ 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:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "Dosya sistemi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Dosya türü 'ini' bilinmiyor! Açılmayacaktır!" @@ -2488,7 +2510,7 @@ msgstr "16:9 'a zorla" msgid "Force 4:3" msgstr "4:3 'e zorla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Force Console as NTSC-J" msgstr "Konsolu NTSC-J Olarak Zorla" @@ -2520,7 +2542,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2552,6 +2574,7 @@ msgid "Frame " msgstr "Kare" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "GeliÅŸmiÅŸ Kareleme" @@ -2567,7 +2590,7 @@ msgstr "Kare Aralığı" msgid "Frame S&kipping" msgstr "&Kare Atlama" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "Kare Sınırı:" @@ -2579,9 +2602,9 @@ msgstr "Çekilecek Kareler" msgid "Free Look" msgstr "Serbest Bakış" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "French" msgstr "Fransızca" @@ -2606,11 +2629,16 @@ msgstr "Tam Ekran Çözünürlüğü:" msgid "GCI File(*.gci)" msgstr "GCI Dosyası (*.gci)" +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +#, fuzzy +msgid "GCMic Configuration" +msgstr "GeçmiÅŸ Yapılandırması" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "GC Kolu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "Oyun ID'si:" @@ -2626,7 +2654,7 @@ msgstr "Oyun çalışmıyor!" msgid "Game not found!!" msgstr "Oyun bulunamadı!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "Oyuna Özel Ayarlar" @@ -2634,7 +2662,7 @@ msgstr "Oyuna Özel Ayarlar" msgid "GameConfig" msgstr "Oyun Yapılandırması" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "GameCube" @@ -2643,7 +2671,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube Kolu Ayarları (&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube Hafıza Kartları (*.raw,*.gcp)" @@ -2666,7 +2694,8 @@ msgstr "" "(kötü bir kod veya türü henüz desteklenmiyor.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Genel" @@ -2675,9 +2704,9 @@ msgstr "Genel" msgid "General Settings" msgstr "Genel Ayarlar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "German" msgstr "Almanca" @@ -2714,7 +2743,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" msgstr "Yunanca" @@ -2746,7 +2775,7 @@ msgstr "Hack'ler" msgid "Header checksum failed" msgstr "BaÅŸlık saÄŸlama hatası" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hebrew" msgstr "Ä°branice" @@ -2806,11 +2835,12 @@ msgid "Hotkey Configuration" msgstr "Kısayol TuÅŸu Yapılandırması" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 msgid "Hotkeys" msgstr "TuÅŸlar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hungarian" msgstr "Macarca" @@ -2840,7 +2870,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - kötü durak" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "IPL Ayarları" @@ -2856,11 +2886,11 @@ msgstr "Kızılötesi Ä°ÅŸaretleyici" msgid "IR Sensitivity:" msgstr "Kızılötesi Hassasiyeti:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "Kalıp Ayrıntıları" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "Kalıp Konumları" @@ -2872,6 +2902,12 @@ msgstr "Ä°TALYA" msgid "Icon" msgstr "Simge" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" @@ -2879,7 +2915,7 @@ msgstr "" "Saniyedeki kare sayısı düzensizse, bu seçenek size yardım edebilir. (Açık = " "Uyumlu, Kapalı = Hızlı)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 msgid "" "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." @@ -2971,7 +3007,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "Oyun İçi" @@ -3000,7 +3036,7 @@ msgstr "Ekle" msgid "Insert Encrypted or Decrypted code here..." msgstr "Åžifreli veya ÅŸifresiz kodu buraya ekleyin..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "SD Kart Ekle" @@ -3012,7 +3048,7 @@ msgstr "Adı buraya yazın..." msgid "Install WAD" msgstr "WAD Kur" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 msgid "Install to Wii Menu" msgstr "Wii Menüsüne kur" @@ -3023,23 +3059,23 @@ msgstr "" "Kurulum Özel Durum Ä°ÅŸleyici çaÄŸrıldı, ama bu platform henüz bunu " "desteklemiyor." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 msgid "Installing WAD..." msgstr "WAD kuruluyor..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 msgid "Interface" msgstr "Arabirim" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "Arabirim Ayarları" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "İç LZO Hatası - Sıkıştırma baÅŸarısız." -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3048,7 +3084,7 @@ msgstr "" "İç LZO Hatası - GeniÅŸletme baÅŸarısız (%d) (%li, %li) \n" "Durumu tekrar yüklemeyi deneyin." -#: Source/Core/Core/Src/State.cpp:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "İç LZO Hatası - lzo_init() baÅŸarısız." @@ -3056,11 +3092,11 @@ msgstr "İç LZO Hatası - lzo_init() baÅŸarısız." msgid "Internal Resolution:" msgstr "İç Çözünürlük:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "Yorumlayıcı (Çok YavaÅŸ)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "Ä°ntro" @@ -3077,7 +3113,7 @@ msgstr "Hatalı DeÄŸer!" msgid "Invalid bat.map or dir entry" msgstr "Hatalı bat.map veya konum giriÅŸi" -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "Hatalı olay türü: %i" @@ -3097,17 +3133,17 @@ msgstr "" "%s\n" "Oyunu yeniden dökmeniz gerekebilir." -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "Hatalı çekim dosyası" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "Hatalı durum" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Italian" msgstr "Ä°talyanca" @@ -3115,16 +3151,16 @@ msgstr "Ä°talyanca" msgid "JAPAN" msgstr "JAPONYA" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "JIT Yeniden Derleyici (önerilen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "JITIL Deneysel Yeniden Derleyici" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Japanese" msgstr "Japonca" @@ -3133,16 +3169,17 @@ msgid "KOREA" msgstr "KORE" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "TuÅŸ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Korean" msgstr "Korece" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "L" @@ -3151,11 +3188,11 @@ msgid "L Button" msgstr "L Düğmesi" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" msgstr "L Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "Dil:" @@ -3178,6 +3215,7 @@ msgid "Left Stick" msgstr "Sol Çubuk" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3207,7 +3245,7 @@ msgstr "" msgid "Less Than" msgstr "Daha Az" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "FPS Sınırlaması" @@ -3220,34 +3258,42 @@ msgid "Load Custom Textures" msgstr "Özel Dokuları Yükle" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 1" msgstr "Durumu Yükle : 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 2" msgstr "Durumu Yükle : 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 3" msgstr "Durumu Yükle : 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 4" msgstr "Durumu Yükle : 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 msgid "Load State Slot 5" msgstr "Durumu Yükle : 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Load State Slot 6" msgstr "Durumu Yükle : 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Load State Slot 7" msgstr "Durumu Yükle : 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Load State Slot 8" msgstr "Durumu Yükle : 8" @@ -3255,11 +3301,11 @@ msgstr "Durumu Yükle : 8" msgid "Load State..." msgstr "Durumu Yükle..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Wii Sistem Menüsünü Yükle" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii Sistem Menüsünü Yükle %d%c" @@ -3286,7 +3332,7 @@ msgstr "Belirtilen dosyayı yükler (DOL,ELF,WAD,GCM,ISO)" msgid "Local" msgstr "Yerel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Lock Threads to Cores" msgstr "Ä°ÅŸlem Birimlerini Çekirdeklere Kilitle" @@ -3341,16 +3387,16 @@ msgstr "MMU Hız Hilesi" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark dosyaları(*.gcs)" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Ana Çubuk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "Yapımcı ID'si:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "Yapımcı:" @@ -3372,7 +3418,7 @@ msgid "Memory Byte" msgstr "Hafıza Baytı" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 msgid "Memory Card" msgstr "Hafıza Kartı" @@ -3409,7 +3455,7 @@ msgstr "Hafıza kartı dosya boyutu baÅŸlık boyutuyla eÅŸleÅŸmiyor" msgid "Menu" msgstr "Menü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "Mikrofon" @@ -3422,7 +3468,7 @@ msgstr "En az" msgid "Misc" msgstr "ÇeÅŸitli" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "ÇeÅŸitli Ayarlar" @@ -3452,7 +3498,7 @@ msgid "Motion Plus" msgstr "Motion Plus" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" @@ -3570,7 +3616,7 @@ msgstr "NP Sekme" msgid "NP Up" msgstr "NP Yukarı" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3609,7 +3655,7 @@ msgstr "Takma Ad :" msgid "No Country (SDK)" msgstr "Ãœlke Yok (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "Kalıp bulunamadı" @@ -3644,7 +3690,7 @@ msgstr "BaÅŸlık %s için kayıt klasörü bulunamadı" msgid "None" msgstr "Hiçbiri" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" msgstr "Norveççe" @@ -3652,16 +3698,16 @@ msgstr "Norveççe" msgid "Not Equal" msgstr "EÅŸit DeÄŸil" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "Ayarlanmamış" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Not connected" msgstr "BaÄŸlı deÄŸil" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "Notlar" @@ -3703,7 +3749,7 @@ msgstr "Nesne" msgid "Object Range" msgstr "Nesne Aralığı" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "Kapalı" @@ -3718,14 +3764,15 @@ msgstr "Sadece %d blok kullanılabilir" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Aç" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "Dosya konumunu aç (&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "Wii kayıt kla&sörünü aç" @@ -3764,7 +3811,7 @@ 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:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Seçenekler" @@ -3844,12 +3891,12 @@ msgstr "Bölüntü %i" msgid "Patches" msgstr "Yamalar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "Yollar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Duraklat" @@ -3858,7 +3905,7 @@ msgstr "Duraklat" msgid "Per-Pixel Lighting" msgstr "Piksel Aydınlatması" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "Mükemmel" @@ -3869,20 +3916,22 @@ msgstr "Perspektif %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 msgid "Play" msgstr "Oynat" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "Çekimi Oynat" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "Oynat/Duraklat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "Oynanabilir" @@ -3894,7 +3943,7 @@ msgstr "Oynatma Seçenekleri" msgid "Players" msgstr "Oyuncular" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 msgid "Please confirm..." msgstr "Lütfen onaylayın..." @@ -3906,23 +3955,23 @@ msgstr "Kaydetmeden önce lütfen bir perspektif oluÅŸturun" msgid "Plus-Minus" msgstr "Artı-Eksi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Polish" msgstr "Lehçe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 1" msgstr "BaÄŸ. Nok. 1:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 2" msgstr "BaÄŸ. Nok. 2:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Port 3" msgstr "BaÄŸ. Nok. 3:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 msgid "Port 4" msgstr "BaÄŸ. Nok. 4:" @@ -3931,11 +3980,11 @@ msgstr "BaÄŸ. Nok. 4:" msgid "Port :" msgstr "BaÄŸ. Nok. :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese" msgstr "Portekizce" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" msgstr "Portekizce (Brezilya)" @@ -3943,6 +3992,21 @@ msgstr "Portekizce (Brezilya)" msgid "Post-Processing Effect:" msgstr "Sonradan Ä°ÅŸleme Etkisi:" +#: Source/Core/Core/Src/Movie.cpp:735 +#, c-format +msgid "Premature movie end in PlayController. %u + 8 > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:829 +#, c-format +msgid "Premature movie end in PlayWiimote. %u + %d > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:806 +#, c-format +msgid "Premature movie end in PlayWiimote. %u > %u" +msgstr "" + #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "Önayarlar:" @@ -3985,7 +4049,7 @@ msgid "Quit" msgstr "Çık" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "R" @@ -3994,7 +4058,7 @@ msgid "R Button" msgstr "R Düğmesi" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" msgstr "R Analog" @@ -4011,6 +4075,7 @@ msgid "Range" msgstr "Aralık" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "Salt Okunur Mod" @@ -4081,6 +4146,7 @@ msgid "Refresh" msgstr "Yenile" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "Listeyi Yenile" @@ -4088,10 +4154,10 @@ msgstr "Listeyi Yenile" msgid "Refresh game list" msgstr "Oyun Listesini Yenile" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 msgid "Remove" msgstr "Kaldır" @@ -4110,6 +4176,7 @@ 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 msgid "Reset" msgstr "Sıfırla" @@ -4132,15 +4199,15 @@ msgid "Right Stick" msgstr "SaÄŸ Çubuk" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Gümbürtü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 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:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "Rusça" @@ -4152,7 +4219,7 @@ msgstr "Durumu Kaydet (&V)" msgid "Safe" msgstr "Güvenli" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Sample Rate:" msgstr "Örnek Oran:" @@ -4167,34 +4234,42 @@ msgid "Save GCI as..." msgstr "GCI'yı farklı kaydet..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 1" msgstr "Durumu Kaydet : 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 2" msgstr "Durumu Kaydet : 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 3" msgstr "Durumu Kaydet : 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 4" msgstr "Durumu Kaydet : 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 msgid "Save State Slot 5" msgstr "Durumu Kaydet : 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 msgid "Save State Slot 6" msgstr "Durumu Kaydet : 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 msgid "Save State Slot 7" msgstr "Durumu Kaydet : 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 msgid "Save State Slot 8" msgstr "Durumu Kaydet : 8" @@ -4202,12 +4277,12 @@ msgstr "Durumu Kaydet : 8" msgid "Save State..." msgstr "Durumu Kaydet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "Farklı kaydet..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "Sıkıştırılan GCM/ISO'yu kaydet" @@ -4215,11 +4290,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:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "GeniÅŸletilen GCM/ISO'yu kaydet" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Kayıtlı durum filmi %s bozuk, film çekimi duruyor..." @@ -4228,16 +4303,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:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, c-format msgid "Scanning %s" msgstr "Taranıyor %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "Kalıplar taranıyor" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "Taranıyor..." @@ -4253,7 +4328,7 @@ msgstr "Kaydırma Kilidi" msgid "Search Filter" msgstr "Arama Filtresi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "Alt Klasörleri Ara" @@ -4268,12 +4343,12 @@ msgstr "SYSCONF içinde %s bölümü bulunamadı" msgid "Select" msgstr "Seç" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Çekim Dosyasını Seç" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 msgid "Select a Wii WAD file to install" msgstr "Kurmak için bir Wii WAD dosyası seçin" @@ -4299,15 +4374,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:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Kayıt dosyasını seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Yüklemek için durum seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "Kaydetmek için durum seçin" @@ -4377,11 +4452,11 @@ msgstr "Sensör Çubuk Konumu:" msgid "Separator" msgstr "Bölücü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "Sırpça" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4391,7 +4466,7 @@ msgstr "" msgid "Set" msgstr "Ayarla" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "Varsayılan Kalıp Olarak Ayarla (&D)" @@ -4405,11 +4480,11 @@ 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:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." msgstr "Ayarlar..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Ayar dosyası bulunamadı" @@ -4417,7 +4492,7 @@ msgstr "SetupWiiMem: Ayar dosyası bulunamadı" msgid "Shake" msgstr "Sallama" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "Kısa Ä°sim:" @@ -4477,7 +4552,7 @@ msgstr "Japonları Göster" msgid "Show Korea" msgstr "Korelileri Göster" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "Gösterme Dili:" @@ -4517,11 +4592,11 @@ msgstr "WAD'ları Göster" msgid "Show Wii" msgstr "Wii'leri Göster" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 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:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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 " @@ -4585,15 +4660,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Yatay Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "BasitleÅŸtirilmiÅŸ Çince" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "Boyut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 msgid "Skip BIOS" msgstr "BIOS'u Geç" @@ -4638,11 +4713,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 msgid "Slot B" msgstr "Slot B" @@ -4666,7 +4741,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:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Ses Ayarları" @@ -4684,9 +4759,9 @@ msgstr "Ses tamponu oluÅŸturulamadı: %s" msgid "Space" msgstr "BoÅŸluk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Spanish" msgstr "Ä°spanyolca" @@ -4730,7 +4805,7 @@ msgstr "Kare Çubuk" msgid "Standard Controller" msgstr "Varsayılan Denetim Aygıtı" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4745,14 +4820,16 @@ msgid "Start Re&cording" msgstr "Çekimi BaÅŸlat (&C)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "Çekimi BaÅŸlat" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "Durum" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "Durum Kayıtları" @@ -4763,6 +4840,7 @@ msgstr "Çubuk" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Durdur" @@ -4806,8 +4884,8 @@ msgstr "Kayıt dosyaları baÅŸarıyla alındı" msgid "Swing" msgstr "Sapma" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "Sistem Dili:" @@ -4839,9 +4917,14 @@ msgstr "Tablo SaÄŸ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" msgstr "Ekran Görüntüsü Al" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "Sınama" @@ -4870,13 +4953,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:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "The chosen directory is already in the list" msgstr "Seçilen konum zaten listede" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, c-format msgid "" "The file %s already exists.\n" @@ -4965,7 +5048,7 @@ msgstr "Belirtilen dosya \"%s\" bulunamadı" msgid "The value is invalid" msgstr "DeÄŸer hatalı" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "Tema" @@ -4996,7 +5079,7 @@ msgid "" msgstr "" "Bu Action Replay simülatörü, kodların kendisini düzenlemesini desteklemiyor." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 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." @@ -5018,7 +5101,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -5032,11 +5115,11 @@ msgstr "" "\n" "Klavye Kısayolu : Hızlandırmayı anında iptal etmek için basılı tutun." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Arka plan müziklerini oynatmak için kullanılır." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5062,7 +5145,7 @@ msgid "Tilt" msgstr "EÄŸim" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr "BaÅŸlık" @@ -5077,15 +5160,16 @@ msgstr "Tüm GeçmiÅŸ Türlerini Seç" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "Ãœst" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Geleneksel Çince" @@ -5093,7 +5177,7 @@ msgstr "Geleneksel Çince" msgid "Tried to load an unknown file type." msgstr "Bilinmeyen bir dosya türünü yüklemeye denedik." -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "Tetikler" @@ -5109,7 +5193,7 @@ msgstr "" "Geçersiz SYSCONF'tan okumayı deniyor\n" "Wiimote BT ID'leri mevcut deÄŸil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Turkish" msgstr "Türkçe" @@ -5190,15 +5274,6 @@ msgstr "Åžu ID ile bilinmeyen mesaj alındı : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "ID %d ile %d oyuncusundan bilinmeyen mesaj alındı. Oyuncu atılıyor!" -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Bilinmeyen iÅŸaretleyici %#08x\n" -"Devam?" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5213,7 +5288,7 @@ msgstr "Güncelle" msgid "Upright Wiimote" msgstr "Dik Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 Modunu Kullan (PAL60)" @@ -5225,7 +5300,7 @@ msgstr "Tam Ekran Kullan" msgid "Use Hex" msgstr "HEX Kullan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "Önemli Hataları Bildir" @@ -5279,7 +5354,7 @@ msgstr "DeÄŸer:" msgid "Verbosity" msgstr "Duyuru/Hata/Uyarı" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "Görüntü" @@ -5287,7 +5362,7 @@ msgstr "Görüntü" msgid "Virtual" msgstr "Sanal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "Ses" @@ -5353,6 +5428,41 @@ msgstr "" "ve hafıza kartınızdaki dosyayla aynı adda olacak.\n" "Devam?" +#: Source/Core/Core/Src/Movie.cpp:629 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, 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" +"\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" +"\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" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -5370,15 +5480,15 @@ msgstr "GeniÅŸ Ekran Hilesi" msgid "Width" msgstr "GeniÅŸlik" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "Wii Konsolu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 msgid "Wii NAND Root:" msgstr "Wii NAND Kök Dizini:" @@ -5386,7 +5496,7 @@ msgstr "Wii NAND Kök Dizini:" msgid "Wii Save Import" msgstr "Wii Kaydı Al" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii kayıt dosyaları (*.bin)|*.bin" @@ -5417,7 +5527,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:599 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Wiimote Connected" msgstr "Wiimote BaÄŸlandı" @@ -5449,9 +5559,9 @@ msgstr "Pencereleri SaÄŸa Döşe" msgid "Word Wrap" msgstr "Heceleme" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Working..." msgstr "Çalışıyor..." @@ -5514,7 +5624,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:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 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." @@ -5537,7 +5647,7 @@ msgstr "" "0x%04x olmalıdır (sizinki: 0x%04llx) \n" "Yenisini oluÅŸturmak ister misiniz?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "ZTP Hilesi" @@ -5607,7 +5717,7 @@ msgstr "" msgid "^ ADD" msgstr "^ EKLE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5624,7 +5734,7 @@ msgstr "%s dosyasından veri okunamadı" msgid "failed to read header" msgstr "baÅŸlık okunamadı" -#: Source/Core/Core/Src/HW/Memmap.cpp:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: %x 'den iÅŸlem kodu okunuyor. Lütfen bildirin." @@ -5643,7 +5753,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Bilinmeyen komut 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute uygulama çalışırken -1'e düştü!" @@ -5751,6 +5861,9 @@ msgstr "| VEYA" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "%s açılamıyor, kayıp bir iÅŸleve sahip." +#~ msgid "Cannot record movies in read-only mode." +#~ msgstr "Salt-okunur modda film çekilemez." + #~ msgid "Config..." #~ msgstr "Yapılandır..." @@ -6192,6 +6305,13 @@ msgstr "| VEYA" #~ msgid "Type %d config not supported in plugin %s" #~ msgstr "%d türü yapılandırma %s eklentisinde desteklenmiyor" +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "Bilinmeyen iÅŸaretleyici %#08x\n" +#~ "Devam?" + #~ msgid "Use FPS For Limiting" #~ msgstr "Sınırlama için FPS Kullan" diff --git a/Languages/po/zh_CN.po b/Languages/po/zh_CN.po index 25a3c517d8..10e394fc88 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: 2011-10-11 23:25-0500\n" +"POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-01-09 13:55-0800\n" "Last-Translator: thegfw \n" "Language-Team: \n" @@ -49,9 +49,9 @@ msgstr "\"%s\" ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ GCM/ISO 文件, 或者ä¸æ˜¯ä¸€ä¸ª GC/Wii msgid "%1$sCopy%1$s" msgstr "%1$så¤åˆ¶%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -176,11 +176,11 @@ msgstr "作弊ç ç®¡ç†å™¨(&C)" msgid "&DSP Settings" msgstr "音频设置(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "删除镜åƒ(&D)..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 msgid "&Delete selected ISOs..." msgstr "删除所选镜åƒ(&D)" @@ -244,7 +244,7 @@ msgstr "æš‚åœæ¸¸æˆ(&P)" msgid "&Play" msgstr "开始游æˆ(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "属性(&P)" @@ -288,7 +288,7 @@ msgstr "视图(&V)" msgid "&Wiimote Settings" msgstr "&Wiimote 设置" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "百科(&W)" @@ -337,10 +337,11 @@ msgid "" msgstr "<æ— >" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "<按任æ„é”®>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "<系统>" @@ -396,8 +397,8 @@ msgstr "" "\n" "You must forward TCP port to host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "AM-基æ¿" @@ -432,6 +433,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 msgid "Action" msgstr "æ“作" @@ -522,11 +524,11 @@ msgstr "适é…器:" msgid "Add" msgstr "添加" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "添加动作回放代ç " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "添加补ä¸" @@ -534,9 +536,9 @@ msgstr "添加补ä¸" msgid "Add new pane" msgstr "添加新é¢æ¿" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Add..." msgstr "添加..." @@ -574,7 +576,7 @@ msgstr "调整摇æ†æŽ§åˆ¶éœ€è¦æ´»åŠ¨çš„按钮." msgid "Advanced" msgstr "高级" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "高级设置" @@ -582,28 +584,28 @@ msgstr "高级设置" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "所有 GC/Wii 文件 (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "所有 GC/Wii é•œåƒ (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 文件 (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "æ‰€æœ‰å­˜æ¡£çŠ¶æ€ (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "所有 Wii é•œåƒæ–‡ä»¶ (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "所有压缩的 GC/Wii é•œåƒæ–‡ä»¶ (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "所有文件 (*.*)|*.*" @@ -636,7 +638,7 @@ msgstr "应用程åºè½½å…¥å™¨å¤§å°é”™è¯¯...这真是一个应用程åºè½½å…¥å™¨ msgid "Apploader unable to load from file" msgstr "应用程åºè½½å…¥å™¨ä¸èƒ½ä»Žæ–‡ä»¶è½½å…¥" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "应用载入器:" @@ -651,7 +653,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "" @@ -660,7 +662,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "您确定è¦åˆ é™¤ \"%s\" ?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -668,11 +670,11 @@ msgstr "" "请确认真的è¦åˆ é™¤è¿™äº›æ–‡ä»¶?\n" "这将是永久性的删除!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "请确认真的è¦åˆ é™¤è¿™äº›æ–‡ä»¶?这将是永久性的删除!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "高宽比:" @@ -681,11 +683,11 @@ msgstr "高宽比:" msgid "At least one pane must remain open." msgstr "必须有一个窗å£ä¿æŒæ‰“å¼€" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "音频" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" msgstr "音频åŽç«¯:" @@ -693,7 +695,7 @@ msgstr "音频åŽç«¯:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: 打开 AO 设备错误.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自动" @@ -732,7 +734,7 @@ msgstr "" msgid "Back" msgstr "Back" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" msgstr "åŽç«¯è®¾ç½®" @@ -743,7 +745,7 @@ msgid "Backend:" msgstr "音频åŽç«¯:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "åŽå°è¾“å…¥" @@ -756,15 +758,15 @@ msgid "Bad File Header" msgstr "无效文件头" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr "标志" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "标志详细信æ¯" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "标志:" @@ -776,7 +778,7 @@ msgstr "Bar" msgid "Basic" msgstr "基本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "基本 设置" @@ -805,7 +807,7 @@ msgid "Blue Right" msgstr "è“ å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "底部" @@ -814,7 +816,7 @@ msgstr "底部" msgid "Bound Controls: %lu" msgstr "绑定控制器: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "æŸå" @@ -822,7 +824,7 @@ msgstr "æŸå" msgid "Browse" msgstr "æµè§ˆ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "æµè§ˆè¦æ·»åŠ çš„目录" @@ -830,7 +832,7 @@ msgstr "æµè§ˆè¦æ·»åŠ çš„目录" msgid "Browse for an ISO directory..." msgstr "æµè§ˆé•œåƒç›®å½•" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "æµè§ˆè¾“出目录" @@ -838,7 +840,7 @@ msgstr "æµè§ˆè¾“出目录" msgid "Buffer:" msgstr "缓冲区:" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -849,11 +851,11 @@ msgstr "按键" msgid "C Stick" msgstr "C-摇æ†" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "C-摇æ†" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "CPU 模拟引擎" @@ -893,15 +895,11 @@ msgstr "å–消" msgid "Cannot open %s" msgstr "ä¸èƒ½æ‰“å¼€ %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "" - #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "事件未决时ä¸èƒ½å注册事件" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -911,7 +909,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:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -940,7 +938,7 @@ msgstr "ä¸èƒ½ä»Ž DVDæ’件 - DVD接å£è¯»å–æ•°æ®: 严é‡é”™è¯¯" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "" @@ -957,6 +955,7 @@ msgid "Change &Disc..." msgstr "切æ¢å…‰ç›˜(&D)..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "切æ¢å…‰ç›˜" @@ -964,7 +963,7 @@ msgstr "切æ¢å…‰ç›˜" msgid "Change Game" msgstr "切æ¢æ¸¸æˆ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -980,8 +979,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "Changing this will have no effect while the emulator is running!" @@ -1001,32 +1000,32 @@ msgstr "作弊ç æœç´¢" msgid "Cheats Manager" msgstr "金手指管ç†" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "简体中文" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "ç¹ä½“中文" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "选择一个DVD根目录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 #, fuzzy msgid "Choose a NAND root directory:" msgstr "选择一个DVD根目录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "选择一个默认镜åƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "选择一个è¦æ·»åŠ çš„目录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "选择è¦æ‰“开的文件" @@ -1034,7 +1033,7 @@ msgstr "选择è¦æ‰“开的文件" msgid "Choose a memory card:" msgstr "选择一个内存å¡" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1042,8 +1041,8 @@ msgstr "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "选择解压缩到的文件夹" @@ -1062,7 +1061,7 @@ msgstr "ç»å…¸" msgid "Clear" msgstr "清除" -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." msgstr "清除失败" @@ -1076,7 +1075,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "关闭" @@ -1101,20 +1100,20 @@ msgstr "命令" msgid "Comment" msgstr "注释" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "注释:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "压缩镜åƒ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "压缩所选镜åƒ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "压缩镜åƒä¸­" @@ -1141,13 +1140,13 @@ msgstr "设置手柄" msgid "Configure..." msgstr "设置..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "确认文件覆盖" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 #, fuzzy msgid "Confirm on Stop" msgstr "åœæ­¢æ—¶ç¡®è®¤" @@ -1157,7 +1156,7 @@ msgstr "åœæ­¢æ—¶ç¡®è®¤" msgid "Connect" msgstr "连接" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "连接 USB 键盘" @@ -1167,22 +1166,26 @@ msgid "Connect Wiimote %i" msgstr "连接 Wiimote %i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "连接 Wiimote 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "连接 Wiimote 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "连接 Wiimote 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "连接 Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Connecting..." msgstr "连接中..." @@ -1207,7 +1210,7 @@ msgstr "å¤åˆ¶å¤±è´¥" msgid "Copy to Memcard %c" msgstr "å¤åˆ¶åˆ°å†…å­˜å¡ %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "核心" @@ -1237,7 +1240,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "ä¸èƒ½è¯†åˆ« ISO 文件 %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "ä¸èƒ½ä¿å­˜ %s" @@ -1262,7 +1265,7 @@ msgstr "" "\n" "您是ä¸æ˜¯åœ¨CD/DVD上è¿è¡Œçš„Dolphin?或者存档文件带有写入ä¿æŠ¤?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "Couldn't find open command for extension 'ini'!" @@ -1279,7 +1282,7 @@ msgstr "" msgid "Count:" msgstr "æ•°é‡:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "国家:" @@ -1293,21 +1296,21 @@ msgstr "创建动作回放代ç " msgid "Create new perspective" msgstr "创建新布局" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr "Created by KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr "Created by VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Created by black_rider and published on ForumW.org > Web Developments" @@ -1339,7 +1342,7 @@ msgstr "淡入淡出" 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:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" msgstr "自定义投影修正" @@ -1347,15 +1350,15 @@ msgstr "自定义投影修正" msgid "Custom Projection Hack Settings" msgstr "自定义投影修正设置" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." msgstr "自定义一些正交投影å‚æ•°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "æ·å…‹è¯­" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "D-Pad" @@ -1363,25 +1366,25 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP音频" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP Emulator Engine" msgstr "音频模拟引擎" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP HLE emulation (fast)" msgstr "音频 HLE 模拟(很快)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP LLE interpreter (slow)" msgstr "音频 LLE 解释(很慢)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 #, fuzzy msgid "DSP LLE on Thread" msgstr "DSP LLE 于线程" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "音频 LLE é‡ç¼–译器" @@ -1389,7 +1392,7 @@ msgstr "音频 LLE é‡ç¼–译器" msgid "DSP settings" msgstr "音频设置" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "DVD 根目录:" @@ -1397,7 +1400,7 @@ msgstr "DVD 根目录:" msgid "Data Size" msgstr "æ•°æ®å¤§å°" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "日期:" @@ -1427,16 +1430,16 @@ msgstr "调试" msgid "Decimal" msgstr "å进制" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "解压缩镜åƒä¸­..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "解压缩所选镜åƒ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "解压缩镜åƒä¸­" @@ -1444,7 +1447,7 @@ msgstr "解压缩镜åƒä¸­" msgid "Default" msgstr "默认" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "默认镜åƒ:" @@ -1489,8 +1492,8 @@ msgstr "" msgid "Device" msgstr "设备" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "设备设置" @@ -1563,7 +1566,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "光盘" @@ -1588,11 +1591,11 @@ msgstr "按模拟器显示输入读å–" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 msgid "Do you want to stop the current emulation?" msgstr "您确定是å¦åœæ­¢å½“å‰æ¨¡æ‹Ÿ?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "Dolphin" @@ -1618,12 +1621,12 @@ msgstr "Dolphin 模拟 Wiimote 设置" msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC 手柄设置" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 电影 (*.dtm)" @@ -1635,13 +1638,13 @@ msgstr "Dolphin Wiimote é…ç½®" msgid "Dolphin at &Google Code" msgstr "Dolphin 于 &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 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:307 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1669,7 +1672,7 @@ msgstr "鼓" msgid "Dummy" msgstr "虚拟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "转储音频" @@ -1707,9 +1710,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "è·å…°è¯­" @@ -1763,8 +1766,8 @@ msgstr "编辑补ä¸" msgid "Edit current perspective" msgstr "编辑当å‰å¤–观" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "编辑..." @@ -1776,7 +1779,7 @@ msgstr "效果" msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "模拟线程已ç»åœ¨è¿è¡Œ" @@ -1803,7 +1806,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "模拟 Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "模拟器状æ€: " @@ -1825,7 +1828,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "å¯ç”¨åŠ¨ä½œå›žæ”¾è®°å½•" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "å¯ç”¨éŸ³é¢‘调节" @@ -1837,16 +1840,20 @@ msgstr "å¯ç”¨ BAT" msgid "Enable Block Merging" msgstr "å¯ç”¨åŒºå—åˆå¹¶" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "å¯ç”¨ç¼“å­˜" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Cheats" msgstr "å¯ç”¨ä½œå¼Š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "å¯ç”¨ DTK 音ä¹" @@ -1854,7 +1861,7 @@ msgstr "å¯ç”¨ DTK 音ä¹" msgid "Enable Dual Core" msgstr "å¯ç”¨å¤šæ ¸å¤„ç†" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "å¯ç”¨å¤šæ ¸å¤„ç†(加速)" @@ -1866,7 +1873,7 @@ msgstr "å¯ç”¨çƒ­é”®" msgid "Enable Idle Skipping" msgstr "å¯ç”¨ç©ºé—²æ­¥è¿›" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "å¯ç”¨ç©ºé—²æ­¥è¿›(加速)" @@ -1879,7 +1886,7 @@ msgstr "å¯ç”¨ MMU" msgid "Enable Progressive Scan" msgstr "å¯ç”¨é€è¡Œæ‰«æ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 #, fuzzy msgid "Enable Screen Saver" msgstr "å¯ç”¨å®½å±" @@ -1930,7 +1937,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -1948,7 +1955,7 @@ msgstr "" "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " "Fast)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" msgstr "å¯ç”¨è‡ªå®šä¹‰æŠ•å½±ä¿®æ­£" @@ -1977,9 +1984,9 @@ msgstr "" msgid "End" msgstr "End" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "英语" @@ -2008,15 +2015,29 @@ msgstr "等于" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "错误" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Error loading selected language. Falling back to system default." -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2050,11 +2071,12 @@ msgstr "Exit Dolphin with emulator" msgid "Export Failed" msgstr "导出失败" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "导出文件" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "导出录制" @@ -2066,7 +2088,7 @@ msgstr "导出录制..." msgid "Export Save" msgstr "导出存档" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "导出 Wii 存档 (实验性)" @@ -2099,44 +2121,44 @@ msgstr "外部å‚æ•°" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "解压缩所有文件..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "解压缩 Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "解压缩 DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "解压缩目录..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "解压缩文件..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "解压缩分区..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "解压缩 %s 中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "解压缩所有文件中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "解压缩目录中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "解压缩中..." @@ -2153,7 +2175,7 @@ msgstr "玩家" msgid "FRANCE" msgstr "法国" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "FST 大å°:" @@ -2169,7 +2191,7 @@ msgstr "监å¬å¤±è´¥!!" msgid "Failed to download codes." msgstr "下载代ç å¤±è´¥." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "解压缩到 %s 失败!" @@ -2340,11 +2362,11 @@ msgstr "文件ä¸æ˜¯å·²åŽ‹ç¼©æ–‡ä»¶" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: æœªçŸ¥æ‰“å¼€æ¨¡å¼ : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "文件系统" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "文件类型 'ini' 未知! ä¸èƒ½æ‰“å¼€!" @@ -2364,7 +2386,7 @@ msgstr "强制 16:9" msgid "Force 4:3" msgstr "强制 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 #, fuzzy msgid "Force Console as NTSC-J" msgstr "设置终端为 NTSC-J" @@ -2397,7 +2419,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:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2428,6 +2450,7 @@ msgid "Frame " msgstr "Frame Advance" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "Frame Advance" @@ -2445,7 +2468,7 @@ msgstr "Frame Advance" msgid "Frame S&kipping" msgstr "帧数跳跃(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "帧数é™åˆ¶:" @@ -2457,9 +2480,9 @@ msgstr "" msgid "Free Look" msgstr "自由视点" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "French" msgstr "法语" @@ -2485,11 +2508,16 @@ msgstr "å…¨å±åˆ†è¾¨çŽ‡:" msgid "GCI File(*.gci)" msgstr "GCI 文件(*.gci)" +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +#, fuzzy +msgid "GCMic Configuration" +msgstr "记录设置" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "手柄" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "æ¸¸æˆ ID:" @@ -2505,7 +2533,7 @@ msgstr "游æˆæ²¡æœ‰è¿è¡Œ!" msgid "Game not found!!" msgstr "游æˆæ²¡æ‰¾åˆ°!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "游æˆç‰¹æ®Šè®¾ç½®" @@ -2513,7 +2541,7 @@ msgstr "游æˆç‰¹æ®Šè®¾ç½®" msgid "GameConfig" msgstr "游æˆé…ç½®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "Gamecube" @@ -2522,7 +2550,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube 手柄设置(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube å†…å­˜å¡ (*.raw,*.gcp)" @@ -2545,7 +2573,8 @@ msgstr "" "(either a bad code or the code type is not yet supported.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "常规" @@ -2555,9 +2584,9 @@ msgstr "常规" msgid "General Settings" msgstr "ç•Œé¢è®¾ç½®" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "German" msgstr "德语" @@ -2589,7 +2618,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" msgstr "希腊语" @@ -2621,7 +2650,7 @@ msgstr "" msgid "Header checksum failed" msgstr "头部校检失败" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hebrew" msgstr "希伯æ¥è¯­" @@ -2679,11 +2708,12 @@ msgid "Hotkey Configuration" msgstr "热键设置" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 msgid "Hotkeys" msgstr "热键" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hungarian" msgstr "匈牙利语" @@ -2713,7 +2743,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - bad destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "IPL 设置" @@ -2729,11 +2759,11 @@ msgstr "IR 指针" msgid "IR Sensitivity:" msgstr "红外çµæ•åº¦:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "é•œåƒè¯¦ç»†ä¿¡æ¯" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "é•œåƒç›®å½•" @@ -2745,13 +2775,19 @@ msgstr "æ„大利" msgid "Icon" msgstr "图标" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 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:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 msgid "" "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." @@ -2831,7 +2867,7 @@ msgstr "" "Disable lighting. Improves performance but causes lighting to disappear in " "games which use it." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "进游æˆ" @@ -2860,7 +2896,7 @@ msgstr "æ’å…¥" msgid "Insert Encrypted or Decrypted code here..." msgstr "在这里æ’入加密的或者解密的代ç ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "æ’å…¥SDå¡" @@ -2873,7 +2909,7 @@ msgstr "在这里æ’å…¥å称..." msgid "Install WAD" msgstr "安装 Wii èœå•" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 msgid "Install to Wii Menu" msgstr "安装到Wiièœå•" @@ -2883,25 +2919,25 @@ msgid "" msgstr "" "InstallExceptionHandler called, but this platform does not yet support it." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 #, fuzzy msgid "Installing WAD..." msgstr "安装 WAD 到 Wii èœå•ä¸­..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 #, fuzzy msgid "Interface" msgstr "ç•Œé¢è®¾ç½®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "ç•Œé¢è®¾ç½®" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "内部 LZO 错误 - 压缩失败" -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -2910,7 +2946,7 @@ msgstr "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" "Try loading the state again" -#: Source/Core/Core/Src/State.cpp:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "内部 LZO 错误 - lzo_init() 失败" @@ -2919,11 +2955,11 @@ msgstr "内部 LZO 错误 - lzo_init() 失败" msgid "Internal Resolution:" msgstr "å…¨å±åˆ†è¾¨çŽ‡:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "解释器 (éžå¸¸æ…¢)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "片头" @@ -2940,7 +2976,7 @@ msgstr "无效值!" msgid "Invalid bat.map or dir entry" msgstr "无效 bat.map 或 目录项目" -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "无效事件类型 %i" @@ -2960,17 +2996,17 @@ msgstr "" "%s\n" " You may need to redump this game." -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "无效录制文件" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "Invalid state" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Italian" msgstr "æ„大利语" @@ -2978,16 +3014,16 @@ msgstr "æ„大利语" msgid "JAPAN" msgstr "日本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "JIT é‡ç¼–译器 (推è)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "JITIL 实验性é‡ç¼–译器" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Japanese" msgstr "日语" @@ -2996,16 +3032,17 @@ msgid "KOREA" msgstr "韩国" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "按键" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Korean" msgstr "韩语" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "L" @@ -3014,11 +3051,11 @@ msgid "L Button" msgstr "L é”®" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" msgstr "L-摇æ†" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "语言:" @@ -3041,6 +3078,7 @@ msgid "Left Stick" msgstr "左摇æ†" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3070,7 +3108,7 @@ msgstr "" msgid "Less Than" msgstr "å°äºŽ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "" @@ -3084,34 +3122,42 @@ msgid "Load Custom Textures" msgstr "载入精细æè´¨" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 1" msgstr "载入存档æ’槽 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 2" msgstr "载入存档æ’槽 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 3" msgstr "载入存档æ’槽 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 4" msgstr "载入存档æ’槽 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 msgid "Load State Slot 5" msgstr "载入存档æ’槽 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Load State Slot 6" msgstr "载入存档æ’槽 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Load State Slot 7" msgstr "载入存档æ’槽 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Load State Slot 8" msgstr "载入存档æ’槽 8" @@ -3119,12 +3165,12 @@ msgstr "载入存档æ’槽 8" msgid "Load State..." msgstr "载入状æ€..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 #, fuzzy msgid "Load Wii System Menu" msgstr "载入 Wii 系统èœå•(%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "载入 Wii 系统èœå•(%d %c)" @@ -3149,7 +3195,7 @@ msgstr "载入指定文件 (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "本地" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 #, fuzzy msgid "Lock Threads to Cores" msgstr "é”定线程到核心" @@ -3205,16 +3251,16 @@ msgstr "MMU 速度破解" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark 文件(*.gcs)" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "主摇æ†" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "制作者ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "制作者:" @@ -3237,7 +3283,7 @@ msgid "Memory Byte" msgstr "内存(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 msgid "Memory Card" msgstr "内存å¡" @@ -3272,7 +3318,7 @@ msgstr "" msgid "Menu" msgstr "èœå•" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "Mic" @@ -3286,7 +3332,7 @@ msgstr "Mic" msgid "Misc" msgstr "其它" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "其它设置" @@ -3312,7 +3358,7 @@ msgid "Motion Plus" msgstr "Motion Plus" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "马达" @@ -3421,7 +3467,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3460,7 +3506,7 @@ msgstr "昵称 :" msgid "No Country (SDK)" msgstr "无国家 (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "未找到镜åƒæˆ–者WAD" @@ -3496,7 +3542,7 @@ msgstr "No save folder found for title %s" msgid "None" msgstr "æ— " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" msgstr "挪å¨è¯­" @@ -3504,16 +3550,16 @@ msgstr "挪å¨è¯­" msgid "Not Equal" msgstr "ä¸ç­‰äºŽ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "未设置" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Not connected" msgstr "未连接" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "说明" @@ -3555,7 +3601,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "关闭" @@ -3570,14 +3616,15 @@ msgstr "åªæœ‰ %d 区å—有效" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "打开" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "打开包å«æ–‡ä»¶å¤¹(&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "打开 Wii 存档目录(&S)" @@ -3616,7 +3663,7 @@ msgid "Opens the logger" msgstr "打开日志" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "选项" @@ -3696,12 +3743,12 @@ msgstr "分区 %i" msgid "Patches" msgstr "è¡¥ä¸" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "路径" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "æš‚åœ" @@ -3711,7 +3758,7 @@ msgstr "æš‚åœ" msgid "Per-Pixel Lighting" msgstr "åƒç´ å…‰çº¿" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "完美" @@ -3722,20 +3769,22 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 msgid "Play" msgstr "开始" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "播放录制" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "开始/æš‚åœ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "å¯ä»¥çŽ©" @@ -3748,7 +3797,7 @@ msgstr "选项" msgid "Players" msgstr "玩家" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 msgid "Please confirm..." msgstr "请确认..." @@ -3760,23 +3809,23 @@ msgstr "Please create a perspective before saving" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Polish" msgstr "波兰语" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 1" msgstr "ç«¯å£ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 2" msgstr "ç«¯å£ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Port 3" msgstr "ç«¯å£ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 msgid "Port 4" msgstr "ç«¯å£ 4" @@ -3785,11 +3834,11 @@ msgstr "ç«¯å£ 4" msgid "Port :" msgstr "ç«¯å£ :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese" msgstr "è‘¡è„牙语" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" msgstr "è‘¡è„牙语(巴西)" @@ -3798,6 +3847,21 @@ msgstr "è‘¡è„牙语(巴西)" msgid "Post-Processing Effect:" msgstr "Post-Processing Shader:" +#: Source/Core/Core/Src/Movie.cpp:735 +#, c-format +msgid "Premature movie end in PlayController. %u + 8 > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:829 +#, c-format +msgid "Premature movie end in PlayWiimote. %u + %d > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:806 +#, c-format +msgid "Premature movie end in PlayWiimote. %u > %u" +msgstr "" + #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "预置: " @@ -3840,7 +3904,7 @@ msgid "Quit" msgstr "退出" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "R" @@ -3849,7 +3913,7 @@ msgid "R Button" msgstr "R é”®" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" msgstr "R-摇æ†" @@ -3866,6 +3930,7 @@ msgid "Range" msgstr "范围" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "åªè¯»æ¨¡å¼" @@ -3939,6 +4004,7 @@ msgid "Refresh" msgstr "刷新" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "刷新列表" @@ -3946,10 +4012,10 @@ msgstr "刷新列表" msgid "Refresh game list" msgstr "刷新游æˆåˆ—表" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 msgid "Remove" msgstr "移除" @@ -3968,6 +4034,7 @@ 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 msgid "Reset" msgstr "é‡ç½®" @@ -3990,15 +4057,15 @@ msgid "Right Stick" msgstr "å³æ‘‡æ†" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "震动" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 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:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "俄语" @@ -4010,7 +4077,7 @@ msgstr "ä¿å­˜çŠ¶æ€(&V)" msgid "Safe" msgstr "安全" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Sample Rate:" msgstr "采样率:" @@ -4025,34 +4092,42 @@ msgid "Save GCI as..." msgstr "ä¿å­˜GCI为..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 1" msgstr "存档æ’槽 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 2" msgstr "存档æ’槽 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 3" msgstr "存档æ’槽 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 4" msgstr "存档æ’槽 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 msgid "Save State Slot 5" msgstr "存档æ’槽 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 msgid "Save State Slot 6" msgstr "存档æ’槽 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 msgid "Save State Slot 7" msgstr "存档æ’槽 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 msgid "Save State Slot 8" msgstr "存档æ’槽 8" @@ -4060,12 +4135,12 @@ msgstr "存档æ’槽 8" msgid "Save State..." msgstr "ä¿å­˜çŠ¶æ€..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "å¦å­˜ä¸º..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "ä¿å­˜åŽ‹ç¼©çš„GCM/é•œåƒ" @@ -4073,11 +4148,11 @@ msgstr "ä¿å­˜åŽ‹ç¼©çš„GCM/é•œåƒ" msgid "Save current perspective" msgstr "ä¿å­˜å½“å‰è§†è§’" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "ä¿å­˜è§£åŽ‹ç¼©çš„GCM/é•œåƒ" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Savestate movie %s is corrupted, movie recording stopping..." @@ -4087,16 +4162,16 @@ msgstr "Savestate movie %s is corrupted, movie recording stopping..." msgid "Scaled EFB Copy" msgstr "EFB 比例å¤åˆ¶" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, fuzzy, c-format msgid "Scanning %s" msgstr "扫æ中..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "扫æé•œåƒä¸­" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "扫æ中..." @@ -4112,7 +4187,7 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "æœç´¢è¿‡æ»¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "æœç´¢å­ç›®å½•" @@ -4127,12 +4202,12 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "选择" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "选择录制文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 #, fuzzy msgid "Select a Wii WAD file to install" msgstr "选择è¦å¯¼å…¥çš„存档" @@ -4159,15 +4234,15 @@ msgstr "选择浮动窗å£" msgid "Select the file to load" msgstr "选择è¦è½½å…¥çš„文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "选择一个存档文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "选择è¦è½½å…¥çš„状æ€" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "选择è¦ä¿å­˜çš„状æ€" @@ -4224,11 +4299,11 @@ msgstr "传感器æ ä½ç½®" msgid "Separator" msgstr "分割" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "塞尔维亚语" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4238,7 +4313,7 @@ msgstr "" msgid "Set" msgstr "设置" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "设置为默认镜åƒ(&D)" @@ -4252,11 +4327,11 @@ 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:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." msgstr "设置..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "安装Wii内存: ä¸èƒ½æ‰¾åˆ°è®¾ç½®æ–‡ä»¶" @@ -4264,7 +4339,7 @@ msgstr "安装Wii内存: ä¸èƒ½æ‰¾åˆ°è®¾ç½®æ–‡ä»¶" msgid "Shake" msgstr "震动" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "短å称:" @@ -4326,7 +4401,7 @@ msgstr "显示日本" msgid "Show Korea" msgstr "显示韩国" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "显示语言:" @@ -4367,11 +4442,11 @@ msgstr "显示 Wad" msgid "Show Wii" msgstr "显示 Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 msgid "Show a confirmation box before stopping a game." msgstr "åœæ­¢æ¸¸æˆæ—¶æ˜¾ç¤ºç¡®è®¤å¯¹è¯æ¡†" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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 " @@ -4428,15 +4503,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Sideways Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "简体中文" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "大å°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 #, fuzzy msgid "Skip BIOS" msgstr "跳过 GC BIOS" @@ -4474,11 +4549,11 @@ msgstr "" msgid "Slot %i" msgstr "æ’槽 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 msgid "Slot A" msgstr "æ’槽 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 msgid "Slot B" msgstr "æ’槽 B" @@ -4498,7 +4573,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "声音设置" @@ -4516,9 +4591,9 @@ msgstr "声音缓冲区创建失败: %s" msgid "Space" msgstr "空格" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Spanish" msgstr "西ç­ç‰™è¯­" @@ -4554,7 +4629,7 @@ msgstr "æ–¹å—é”®" msgid "Standard Controller" msgstr "标准控制器" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4569,14 +4644,16 @@ msgid "Start Re&cording" msgstr "开始录制(&C)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "开始录制" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "状æ€" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "State Saves" @@ -4587,6 +4664,7 @@ msgstr "摇æ†" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "åœæ­¢" @@ -4625,8 +4703,8 @@ msgstr "æˆåŠŸå¯¼å…¥å­˜æ¡£æ–‡ä»¶" msgid "Swing" msgstr "Swing" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "系统语言" @@ -4659,9 +4737,14 @@ msgstr "Table Right" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" msgstr "å±å¹•æˆªå›¾(&T)" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "测试" @@ -4692,13 +4775,13 @@ msgstr "地å€æ— æ•ˆ" msgid "The checksum was successfully fixed" msgstr "校检和æˆåŠŸä¿®å¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "The chosen directory is already in the list" msgstr "选择的目录已ç»å­˜åœ¨äºŽåˆ—表" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, c-format msgid "" "The file %s already exists.\n" @@ -4783,7 +4866,7 @@ msgstr "指定的文件 \"%s\" ä¸å­˜åœ¨" msgid "The value is invalid" msgstr "这个值无效" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "主题" @@ -4815,7 +4898,7 @@ msgstr "" "This action replay simulator does not support codes that modify Action " "Replay itself." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "This could cause slow down in Wii Menu and some games." @@ -4830,7 +4913,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -4844,11 +4927,11 @@ msgstr "" "\n" "Keyboard Shortcut : Hold down to instantly disable Throttle." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "这用于播放音ä¹éŸ³è½¨,比如背景音ä¹." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4874,7 +4957,7 @@ msgid "Tilt" msgstr "Tilt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr "标题" @@ -4890,15 +4973,16 @@ msgstr "切æ¢æ‰€æœ‰æ—¥å¿—类型" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "顶部" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "ç¹ä½“中文" @@ -4906,7 +4990,7 @@ msgstr "ç¹ä½“中文" msgid "Tried to load an unknown file type." msgstr "å·²ç»å°è¯•è½½å…¥æœªçŸ¥æ–‡ä»¶ç±»åž‹." -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "扳机" @@ -4922,7 +5006,7 @@ msgstr "" "Trying to read from invalid SYSCONF\n" "Wiimote bt ids are not available" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Turkish" msgstr "土耳其语" @@ -4998,15 +5082,6 @@ msgstr "Unknown message received with id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Unknown message with id:%d received from player:%d Kicking player!" -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"未知指针 %#08x\n" -"继续?" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5021,7 +5096,7 @@ msgstr "æ›´æ–°" msgid "Upright Wiimote" msgstr "ç›´æ¡ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "使用 EuRGB60 æ¨¡å¼ (PAL60)" @@ -5034,7 +5109,7 @@ msgstr "切æ¢å…¨å±(&F)" msgid "Use Hex" msgstr "使用å六进制" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "使用警告程åº" @@ -5079,7 +5154,7 @@ msgstr "值: " msgid "Verbosity" msgstr "详细" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "视频" @@ -5087,7 +5162,7 @@ msgstr "视频" msgid "Virtual" msgstr "虚拟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "音é‡" @@ -5148,6 +5223,41 @@ msgstr "" "and have the same name as a file on your memcard\n" "Continue?" +#: Source/Core/Core/Src/Movie.cpp:629 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, 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" +"\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" +"\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" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -5165,15 +5275,15 @@ msgstr "宽å±ç ´è§£" msgid "Width" msgstr "宽度" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "Wii控制å°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD 根目录:" @@ -5182,7 +5292,7 @@ msgstr "DVD 根目录:" msgid "Wii Save Import" msgstr "导入 Wii 存档" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存档文件 (*.bin)|*.bin" @@ -5213,7 +5323,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:599 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Wiimote Connected" msgstr "Wiimote 已连接" @@ -5246,9 +5356,9 @@ msgstr "窗å£å³ä¾§" msgid "Word Wrap" msgstr "自动æ¢è¡Œ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Working..." msgstr "工作中..." @@ -5309,7 +5419,7 @@ msgstr "您必须输入一个å进制或者å六进制值." msgid "You must enter a valid profile name." msgstr "您必须输入一个有效的é…置文件å称." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 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." @@ -5330,7 +5440,7 @@ msgid "" msgstr "" "Your SYSCONF file is the wrong size - should be 0x%04x (but is 0x%04llx)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "ZTP 破解" @@ -5384,7 +5494,7 @@ msgstr "" msgid "^ ADD" msgstr "^ 加" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "应用程åºè½½å…¥å™¨ (.img)" @@ -5401,7 +5511,7 @@ msgstr "从 %s 文件读å–æ•°æ®å¤±è´¥." msgid "failed to read header" msgstr "读å–头部失败" -#: Source/Core/Core/Src/HW/Memmap.cpp:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Reading Opcode from %x. Please report." @@ -5420,7 +5530,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "未知命令 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returned -1 on application run!" @@ -5964,6 +6074,13 @@ msgstr "| 或" #~ msgid "Type %d config not supported in plugin %s" #~ msgstr "Type %d config not supported in plugin %s" +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "未知指针 %#08x\n" +#~ "继续?" + #~ msgid "Use FPS For Limiting" #~ msgstr "使用 FPS é™åˆ¶" diff --git a/Languages/po/zh_TW.po b/Languages/po/zh_TW.po index 197bb80e90..9c59bbbd6d 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: 2011-10-11 23:25-0500\n" +"POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-03-15 02:51+0800\n" "Last-Translator: khiav \n" "Language-Team: khiav&yrbn \n" @@ -49,9 +49,9 @@ msgstr "\"%s\" 為無效的 GCM/ISO æª”æ¡ˆï¼Œæˆ–éž GC/Wii ISO。" msgid "%1$sCopy%1$s" msgstr "%1$s複製%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -176,11 +176,11 @@ msgstr "作弊檔管ç†å™¨(&C)" msgid "&DSP Settings" msgstr "DSP 設定(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "刪除 ISO 檔(&D)..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 msgid "&Delete selected ISOs..." msgstr "刪除已é¸å–çš„ ISO 檔(&D)..." @@ -244,7 +244,7 @@ msgstr "æš«åœ(&P)" msgid "&Play" msgstr "執行(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "屬性(&P)" @@ -288,7 +288,7 @@ msgstr "檢視(&V)" msgid "&Wiimote Settings" msgstr "Wiimote 設定(&W)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "&Wiki" @@ -337,10 +337,11 @@ msgid "" msgstr "<ç„¡>" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "<按任æ„éµ>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "<系統>" @@ -394,8 +395,8 @@ msgstr "" "\n" "您必須至主機的 TCP 埠å£é€²è¡Œè¨­å®šï¼ï¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "AM-Baseboard" @@ -430,6 +431,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 msgid "Action" msgstr "æ“作" @@ -522,11 +524,11 @@ msgstr "é…接器：" msgid "Add" msgstr "新增" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "新增 ActionReplay 代碼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "新增修正" @@ -534,9 +536,9 @@ msgstr "新增修正" msgid "Add new pane" msgstr "新增é¢ç‰ˆ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Add..." msgstr "新增..." @@ -587,7 +589,7 @@ msgstr "調整模擬æ–桿控制壓力需è¦æ´»å‹•çš„按鈕。" msgid "Advanced" msgstr "進階" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "進階設定" @@ -595,28 +597,28 @@ msgstr "進階設定" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "所有 GC/Wii 檔案 (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "所有 GC/Wii 映åƒæª” (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 檔案 (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 msgid "All Save States (sav, s##)" msgstr "所有å³æ™‚存檔 (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "所有 Wii ISO 檔案 (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "所有已壓縮的 GC/Wii ISO 檔案 (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "所有檔案 (*.*)|*.*" @@ -649,7 +651,7 @@ msgstr "程å¼è®€å–器為錯誤的大å°...它是程å¼è®€å–器嗎？" msgid "Apploader unable to load from file" msgstr "程å¼è®€å–器無法從檔案中讀å–" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "程å¼è®€å–器：" @@ -664,7 +666,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "" @@ -673,7 +675,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "是å¦ç¢ºèªåˆªé™¤ \"%s\" ？" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -681,11 +683,11 @@ msgstr "" "是å¦çœŸçš„è¦åˆªé™¤é€™äº›æª”案？\n" "刪了之後就回ä¸ä¾†äº†å“¦ï¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "是å¦çœŸçš„è¦åˆªé™¤é€™äº›æª”案？刪了之後就回ä¸ä¾†äº†å“¦ï¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "ç•«é¢æ¯”例：" @@ -694,11 +696,11 @@ msgstr "ç•«é¢æ¯”例：" msgid "At least one pane must remain open." msgstr "必須剩餘至少一個é¢æ¿ã€‚" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "è²éŸ³" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" msgstr "è²éŸ³è£ç½®ï¼š" @@ -706,7 +708,7 @@ msgstr "è²éŸ³è£ç½®ï¼š" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon：開啟 AO è£ç½®å‡ºéŒ¯ã€‚\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" @@ -745,7 +747,7 @@ msgstr "" msgid "Back" msgstr "返回" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" msgstr "è£ç½®è¨­å®š" @@ -756,7 +758,7 @@ msgid "Backend:" msgstr "è²éŸ³è£ç½®ï¼š" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "背景輸入" @@ -769,15 +771,15 @@ msgid "Bad File Header" msgstr "æ壞的檔頭" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr "æ©«å¹…" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "圖示明細" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "橫幅：" @@ -789,7 +791,7 @@ msgstr "Bar" msgid "Basic" msgstr "基本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "基本設定" @@ -818,7 +820,7 @@ msgid "Blue Right" msgstr "è— å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 msgid "Bottom" msgstr "下方" @@ -827,7 +829,7 @@ msgstr "下方" msgid "Bound Controls: %lu" msgstr "ç¶å®šæŽ§åˆ¶å™¨ï¼š%lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "ç ´æ" @@ -835,7 +837,7 @@ msgstr "ç ´æ" msgid "Browse" msgstr "ç€è¦½" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "ç€è¦½è¦æ–°å¢žçš„資料夾" @@ -843,7 +845,7 @@ msgstr "ç€è¦½è¦æ–°å¢žçš„資料夾" msgid "Browse for an ISO directory..." msgstr "ç€è¦½ ISO 資料夾..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "ç€è¦½è¼¸å‡ºçš„資料夾" @@ -851,7 +853,7 @@ msgstr "ç€è¦½è¼¸å‡ºçš„資料夾" msgid "Buffer:" msgstr "ç·©è¡ï¼š" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -862,11 +864,11 @@ msgstr "按鈕" msgid "C Stick" msgstr "C-æ–æ¡¿" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "C-æ–æ¡¿" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "CPU 模擬引擎" @@ -906,15 +908,11 @@ msgstr "å–消" msgid "Cannot open %s" msgstr "無法開啟 %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "" - #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "事件未決定時無法註銷事件" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -924,7 +922,7 @@ msgstr "" "無法使用此檔案作為記憶å¡ã€‚\n" "您è¦åœ¨ç›¸åŒçš„æ’槽中使用相åŒçš„檔案嗎？" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -953,7 +951,7 @@ msgstr "無法讀å–從 DVD_Plugin - DVD-ç•Œé¢ï¼šåš´é‡éŒ¯èª¤" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "" @@ -970,6 +968,7 @@ msgid "Change &Disc..." msgstr "æ›´æ›å…‰ç¢Ÿ(&D)..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "æ›´æ›å…‰ç¢Ÿ" @@ -977,7 +976,7 @@ msgstr "æ›´æ›å…‰ç¢Ÿ" msgid "Change Game" msgstr "æ›´æ›éŠæˆ²" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -993,8 +992,8 @@ msgstr "更改 zFar åƒæ•¸ç¬¦è™Ÿ (在修正後)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "更改 zNear åƒæ•¸çš„符號 (在修正後)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "更改此é¸é …在模擬器執行時沒有效果ï¼" @@ -1014,32 +1013,32 @@ msgstr "尋找作弊代碼" msgid "Cheats Manager" msgstr "作弊代碼管ç†å™¨" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Chinese (Simplified)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Chinese (Traditional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "é¸æ“‡ä¸€å€‹ DVD 根目錄：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 #, fuzzy msgid "Choose a NAND root directory:" msgstr "é¸æ“‡ä¸€å€‹ DVD 根目錄：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "é¸æ“‡ä¸€å€‹é è¨­ ISO：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "é¸æ“‡ä¸€å€‹è¦æ·»åŠ çš„資料夾" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "é¸æ“‡ä¸€å€‹è¦é–‹å•Ÿçš„檔案" @@ -1047,14 +1046,14 @@ msgstr "é¸æ“‡ä¸€å€‹è¦é–‹å•Ÿçš„檔案" msgid "Choose a memory card:" msgstr "é¸æ“‡ä¸€å€‹è¨˜æ†¶å¡ï¼š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "é¸æ“‡ä½œç‚ºç¨‹å¼è®€å–器的檔案：(åƒ…ç”¨æ–¼ä¾†è®€å– å…‰ç¢Ÿçš„ç›®éŒ„çµæ§‹)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "é¸æ“‡æå–的資料夾存放ä½ç½®" @@ -1073,7 +1072,7 @@ msgstr "Classic" msgid "Clear" msgstr "清除" -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." msgstr "清除失敗。" @@ -1085,7 +1084,7 @@ msgstr "在éŠæˆ²åŸ·è¡Œæ™‚客戶端斷開連接ï¼ï¼ç¶²è·¯å°æˆ°å·²ç¶“被關閉 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "關閉" @@ -1110,20 +1109,20 @@ msgstr "命令" msgid "Comment" msgstr "註釋" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "註釋：" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "壓縮 ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "壓縮é¸æ“‡çš„ ISO 檔..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "正在壓縮 ISO" @@ -1150,13 +1149,13 @@ msgstr "設定控制器" msgid "Configure..." msgstr "模擬器設定..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "確èªæª”案覆蓋" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 #, fuzzy msgid "Confirm on Stop" msgstr "確èªåœæ­¢" @@ -1166,7 +1165,7 @@ msgstr "確èªåœæ­¢" msgid "Connect" msgstr "連接" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "連接 USB éµç›¤" @@ -1176,22 +1175,26 @@ msgid "Connect Wiimote %i" msgstr "連接 Wiimote %i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "連接 Wiimote 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "連接 Wiimote 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "連接 Wiimote 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "連接 Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Connecting..." msgstr "正在連接..." @@ -1216,7 +1219,7 @@ msgstr "複製失敗" msgid "Copy to Memcard %c" msgstr "è¤‡è£½è‡³è¨˜æ†¶å¡ %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "核心" @@ -1246,7 +1249,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "無法識別 ISO 檔案 %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "無法儲存 %s" @@ -1271,7 +1274,7 @@ msgstr "" "\n" "請確èªæ˜¯å¦ç¶“ç”± CD/DVD 執行 Dolphin，或者是檔案具有唯讀的屬性？" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "找ä¸åˆ°å‰¯æª”å 'ini' 的開啟命令ï¼" @@ -1288,7 +1291,7 @@ msgstr "" msgid "Count:" msgstr "數é‡ï¼š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "國別：" @@ -1302,20 +1305,20 @@ msgstr "建立 AR 代碼" msgid "Create new perspective" msgstr "建立一個新的é€æª¢è¦–" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr "ç”± KDE-Look.org 製åš" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 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:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr "ç”± VistaIcons.com 製åš" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "ç”± black_rider 製åšä¸¦ç™¼ä½ˆæ–¼ ForumW.org > Web Developments" @@ -1347,7 +1350,7 @@ msgstr "Crossfade" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "ç›®å‰çš„目錄在 wxFileSelector 後從 %s 更改至 %s ï¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" msgstr "自訂投影修正" @@ -1355,15 +1358,15 @@ msgstr "自訂投影修正" msgid "Custom Projection Hack Settings" msgstr "自訂投影修正設定" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." msgstr "自訂一些直線投影åƒæ•¸ã€‚" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Czech" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "åå­—æ–¹å‘éµ" @@ -1371,25 +1374,25 @@ msgstr "åå­—æ–¹å‘éµ" msgid "DSP" msgstr "è²éŸ³" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP Emulator Engine" msgstr "DSP 模擬引擎" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE 模擬器 (å¿«)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE 解釋器 (æ…¢)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 #, fuzzy msgid "DSP LLE on Thread" msgstr "DSP LLE å–®ç¨ç·šç¨‹" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "DSP LLE é‡ç·¨è­¯å™¨ (æ…¢)" @@ -1397,7 +1400,7 @@ msgstr "DSP LLE é‡ç·¨è­¯å™¨ (æ…¢)" msgid "DSP settings" msgstr "è²éŸ³è¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "DVD 根：" @@ -1405,7 +1408,7 @@ msgstr "DVD 根：" msgid "Data Size" msgstr "資料大å°" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "日期：" @@ -1435,16 +1438,16 @@ msgstr "除錯" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "解壓 ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "解壓é¸æ“‡çš„ ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "ISO 解壓中" @@ -1452,7 +1455,7 @@ msgstr "ISO 解壓中" msgid "Default" msgstr "é è¨­å€¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "é è¨­çš„ ISO：" @@ -1497,8 +1500,8 @@ msgstr "" msgid "Device" msgstr "è£ç½®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "è£ç½®è¨­å®š" @@ -1571,7 +1574,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "光碟" @@ -1596,11 +1599,11 @@ msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 msgid "Do you want to stop the current emulation?" msgstr "您è¦åœæ­¢ç›®å‰çš„模擬嗎？" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "Dolphin" @@ -1626,12 +1629,12 @@ msgstr "Dolphin 模擬 Wiimote 設定" msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC 控制器設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 影片 (*.dtm)" @@ -1643,13 +1646,13 @@ msgstr "Dolphin Wiimote 設定" msgid "Dolphin at &Google Code" msgstr "Dolphin SVN (&G)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 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:307 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1677,7 +1680,7 @@ msgstr "Drums" msgid "Dummy" msgstr "空" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "轉儲è²éŸ³" @@ -1715,9 +1718,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" msgstr "Dutch" @@ -1769,8 +1772,8 @@ msgstr "編輯修正" msgid "Edit current perspective" msgstr "編輯目å‰ç‰ˆå¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "編輯..." @@ -1782,7 +1785,7 @@ msgstr "效果" msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "模擬器線程已經執行中" @@ -1809,7 +1812,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "模擬 Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "模擬狀態：" @@ -1831,7 +1834,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "é–‹å•Ÿ AR 日誌" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "é–‹å•Ÿè²éŸ³ç¯€æµé–¥" @@ -1843,16 +1846,20 @@ msgstr "é–‹å•Ÿ BAT" msgid "Enable Block Merging" msgstr "é–‹å•Ÿå¡Šåˆä½µ" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "é–‹å•Ÿå¿«å–" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Cheats" msgstr "開啟作弊" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "é–‹å•Ÿ DTK 音樂" @@ -1860,7 +1867,7 @@ msgstr "é–‹å•Ÿ DTK 音樂" msgid "Enable Dual Core" msgstr "開啟雙核心" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "開啟雙核心 (加速)" @@ -1872,7 +1879,7 @@ msgstr "é–‹å•Ÿå¿«æ·éµ" msgid "Enable Idle Skipping" msgstr "é–‹å•Ÿç•¥éŽç©ºé–’" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "é–‹å•Ÿç•¥éŽç©ºé–’ (加速)" @@ -1885,7 +1892,7 @@ msgstr "é–‹å•Ÿ MMU" msgid "Enable Progressive Scan" msgstr "é–‹å•Ÿé€è¡ŒæŽƒçž„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 #, fuzzy msgid "Enable Screen Saver" msgstr "開啟寬螢幕" @@ -1936,7 +1943,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -1951,7 +1958,7 @@ msgstr "" "é–‹å•Ÿå¡Šä½å€è½‰æ› (BAT)：一個記憶體管ç†å–®å…ƒçš„函數。用來更精確的執行，相å°çš„模擬" "速度會變慢。(ON = 兼容ã€OFF = 快速)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" msgstr "開啟自訂投影修正" @@ -1980,9 +1987,9 @@ msgstr "" msgid "End" msgstr "End" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "English" msgstr "English" @@ -2011,15 +2018,29 @@ msgstr "等於" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "錯誤" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "讀å–é¸æ“‡çš„語系出錯。返回使用系統é è¨­å€¼ã€‚" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2052,11 +2073,12 @@ msgstr "離開 Dolphin" msgid "Export Failed" msgstr "匯出失敗" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "匯出檔案" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "匯出錄åƒ" @@ -2068,7 +2090,7 @@ msgstr "匯出錄åƒ..." msgid "Export Save" msgstr "匯出存檔" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "匯出 Wii 存檔 (實驗性)" @@ -2101,44 +2123,44 @@ msgstr "é¡å¤–åƒæ•¸" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "僅在 ''銀河戰士：å¦ä¸€å€‹ M'' 中有效的é¡å¤–åƒæ•¸ã€‚" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "æå–所有檔案..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "æå–程å¼è®€å–器..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "æå– DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "æå–資料夾..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "æå–檔案..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "æå–分割å€..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "%s æå–中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "所有檔案æå–中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "資料夾æå–中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "æå–中..." @@ -2155,7 +2177,7 @@ msgstr "玩家" msgid "FRANCE" msgstr "FRANCE" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "FST 大å°" @@ -2171,7 +2193,7 @@ msgstr "監è½å¤±æ•—ï¼ï¼" msgid "Failed to download codes." msgstr "下載代碼失敗。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "æå–至 %s 失敗ï¼" @@ -2342,11 +2364,11 @@ msgstr "檔案未壓縮" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO：未知開啟模å¼ï¼š 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "檔案系統" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "檔案類型 'ini' æœªçŸ¥ï¼ ç„¡æ³•é–‹å•Ÿï¼" @@ -2366,7 +2388,7 @@ msgstr "強制 16:9" msgid "Force 4:3" msgstr "強制 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 #, fuzzy msgid "Force Console as NTSC-J" msgstr "設定主機為 NTSC-J" @@ -2398,7 +2420,7 @@ msgstr "" "強制éŠæˆ²è¼¸å‡ºå¯¬èž¢å¹•è§£æžåº¦çš„å½±åƒã€‚\n" "注æ„這å¯èƒ½å°Žè‡´åœ–å½¢å•é¡Œ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2429,6 +2451,7 @@ msgid "Frame " msgstr "畫格步進" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "畫格步進" @@ -2446,7 +2469,7 @@ msgstr "畫格步進" msgid "Frame S&kipping" msgstr "ç•«æ ¼çœç•¥(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "畫格速é™åˆ¶ï¼š" @@ -2458,9 +2481,9 @@ msgstr "" msgid "Free Look" msgstr "自由視點" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "French" msgstr "French" @@ -2486,11 +2509,16 @@ msgstr "全螢幕顯示解æžåº¦ï¼š" msgid "GCI File(*.gci)" msgstr "GCI 檔案(*.gci)" +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +#, fuzzy +msgid "GCMic Configuration" +msgstr "記錄設定" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "GC 控制器" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "éŠæˆ² ID ：" @@ -2506,7 +2534,7 @@ msgstr "éŠæˆ²æœªåŸ·è¡Œï¼" msgid "Game not found!!" msgstr "找ä¸åˆ°éŠæˆ²ï¼ï¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "éŠæˆ²è¦æ ¼è¨­å®š" @@ -2514,7 +2542,7 @@ msgstr "éŠæˆ²è¦æ ¼è¨­å®š" msgid "GameConfig" msgstr "éŠæˆ²è¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "Gamecube" @@ -2523,7 +2551,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube 控制器設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube è¨˜æ†¶å¡ (*.raw,*.gcp)" @@ -2546,7 +2574,8 @@ msgstr "" "(一個æ毀的代碼或ä¸æ”¯æ´çš„代碼類型。)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -2556,9 +2585,9 @@ msgstr "一般" msgid "General Settings" msgstr "ç•Œé¢è¨­å®š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "German" msgstr "German" @@ -2590,7 +2619,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" msgstr "Greek" @@ -2622,7 +2651,7 @@ msgstr "" msgid "Header checksum failed" msgstr "檔頭校驗失敗" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hebrew" msgstr "Hebrew" @@ -2680,11 +2709,12 @@ msgid "Hotkey Configuration" msgstr "å¿«æ·éµè¨­å®š" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 msgid "Hotkeys" msgstr "å¿«æ·éµ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hungarian" msgstr "Hungarian" @@ -2713,7 +2743,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - æ毀的目標" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "IPL 設定" @@ -2729,11 +2759,11 @@ msgstr "IR 指示器" msgid "IR Sensitivity:" msgstr "IR éˆæ•åº¦ï¼š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "ISO 明細" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "ISO 資料夾" @@ -2745,12 +2775,18 @@ msgstr "ITALY" msgid "Icon" msgstr "圖示" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "開啟記憶體管ç†å–®å…ƒï¼ŒæŸäº›éŠæˆ²éœ€è¦ã€‚(ON = 兼容ã€OFF = 快速)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 msgid "" "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." @@ -2826,7 +2862,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "關閉光æºã€‚改善效能，但是如果在éŠæˆ²ä¸­éœ€è¦ä½¿ç”¨å…‰ç…§æ•ˆæžœå‰‡æœƒç„¡æ³•ä½œç”¨ã€‚" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "éŠæˆ²ä¸­" @@ -2855,7 +2891,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "在這裡æ’入被加密或已解密的代碼..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "æ’å…¥ SD å¡" @@ -2867,7 +2903,7 @@ msgstr "在這裡æ’å…¥å稱.." msgid "Install WAD" msgstr "å®‰è£ WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 msgid "Install to Wii Menu" msgstr "安è£è‡³ Wii é¸å–®" @@ -2876,24 +2912,24 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "調用 InstallExceptionHandler，但是這個平å°å°šæœªæ”¯æ´æ­¤åŠŸèƒ½ã€‚" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 msgid "Installing WAD..." msgstr "æ­£åœ¨å®‰è£ WAD 至 Wii é¸å–®..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 #, fuzzy msgid "Interface" msgstr "ç•Œé¢è¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "ç•Œé¢è¨­å®š" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "內部 LZO 錯誤 - 壓縮失敗" -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -2902,7 +2938,7 @@ msgstr "" "內部 LZO 錯誤 - 解壓縮失敗 (%d) (%li, %li) \n" "è«‹é‡è©¦è®€å–" -#: Source/Core/Core/Src/State.cpp:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "內部 LZO 錯誤 - lzo_init() 失敗" @@ -2911,11 +2947,11 @@ msgstr "內部 LZO 錯誤 - lzo_init() 失敗" msgid "Internal Resolution:" msgstr "全螢幕顯示解æžåº¦ï¼š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "解釋器 (éžå¸¸ç·©æ…¢)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "標題" @@ -2932,7 +2968,7 @@ msgstr "無效的數值ï¼" msgid "Invalid bat.map or dir entry" msgstr "無效的 bat.map 或目錄項目" -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "無效的事件類型 %i" @@ -2952,17 +2988,17 @@ msgstr "" "%s\n" " å¯èƒ½éœ€è¦é‡æ–°è½‰å„²é€™å€‹éŠæˆ²ã€‚" -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "無效的錄åƒæª”" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "無效的狀態" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Italian" msgstr "Italian" @@ -2970,16 +3006,16 @@ msgstr "Italian" msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "JIT é‡ç·¨è­¯å™¨ (推薦)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "JITIL 實驗性é‡ç·¨è­¯å™¨" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Japanese" msgstr "Japanese" @@ -2988,16 +3024,17 @@ msgid "KOREA" msgstr "KOREA" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "éµ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Korean" msgstr "Korean" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "L" @@ -3006,11 +3043,11 @@ msgid "L Button" msgstr "L 鈕" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" msgstr "L-類比" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "語系：" @@ -3033,6 +3070,7 @@ msgid "Left Stick" msgstr "å·¦ æ–æ¡¿" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3062,7 +3100,7 @@ msgstr "" msgid "Less Than" msgstr "å°æ–¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "" @@ -3076,34 +3114,42 @@ msgid "Load Custom Textures" msgstr "讀å–高解æžåº¦ç´‹ç†" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 1" msgstr "讀å–儲存格 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 2" msgstr "讀å–儲存格 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 3" msgstr "讀å–儲存格 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 4" msgstr "讀å–儲存格 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 msgid "Load State Slot 5" msgstr "讀å–儲存格 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Load State Slot 6" msgstr "讀å–儲存格 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Load State Slot 7" msgstr "讀å–儲存格 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Load State Slot 8" msgstr "讀å–儲存格 8" @@ -3111,12 +3157,12 @@ msgstr "讀å–儲存格 8" msgid "Load State..." msgstr "讀å–進度檔..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 #, fuzzy msgid "Load Wii System Menu" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 #, c-format msgid "Load Wii System Menu %d%c" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" @@ -3141,7 +3187,7 @@ msgstr "讀å–指定檔案 (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "本地" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 #, fuzzy msgid "Lock Threads to Cores" msgstr "鎖定線程至內核" @@ -3197,16 +3243,16 @@ msgstr "MMU 速度修正" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark 檔案(*.gcs)" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "主æ–æ¡¿" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "廠商 ID：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "廠商：" @@ -3229,7 +3275,7 @@ msgid "Memory Byte" msgstr "記憶å¡(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 msgid "Memory Card" msgstr "記憶å¡" @@ -3264,7 +3310,7 @@ msgstr "" msgid "Menu" msgstr "é¸å–®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "麥克風" @@ -3278,7 +3324,7 @@ msgstr "麥克風" msgid "Misc" msgstr "雜項" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "其它設定" @@ -3304,7 +3350,7 @@ msgid "Motion Plus" msgstr "Motion Plus" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "馬é”" @@ -3413,7 +3459,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3452,7 +3498,7 @@ msgstr "暱稱：" msgid "No Country (SDK)" msgstr "無國家 (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "找ä¸åˆ° ISO 或 WAD" @@ -3488,7 +3534,7 @@ msgstr "找ä¸åˆ°æ¨™é¡Œ %s 的存檔資料夾" msgid "None" msgstr "ç„¡" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" msgstr "Norwegian Bokmaal" @@ -3496,16 +3542,16 @@ msgstr "Norwegian Bokmaal" msgid "Not Equal" msgstr "ä¸ç›¸ç­‰" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "未設定" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Not connected" msgstr "未連接" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "註釋" @@ -3547,7 +3593,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "關閉" @@ -3562,14 +3608,15 @@ msgstr "僅 %d 個å€å¡Šå¯ç”¨" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "é–‹å•Ÿ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "開啟內容資料夾(&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "é–‹å•Ÿ Wii 存檔資料夾(&S)" @@ -3608,7 +3655,7 @@ msgid "Opens the logger" msgstr "開啟日誌記錄器" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "é¸é …" @@ -3686,12 +3733,12 @@ msgstr "åˆ†å‰²å€ %i" msgid "Patches" msgstr "修正" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "路徑" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "æš«åœ" @@ -3701,7 +3748,7 @@ msgstr "æš«åœ" msgid "Per-Pixel Lighting" msgstr "åƒç´ å…‰æº" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "完美" @@ -3712,20 +3759,22 @@ msgstr "ç‰ˆå¼ %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 msgid "Play" msgstr "執行" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "播放錄åƒ" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "執行/æš«åœ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "å¯çŽ©" @@ -3738,7 +3787,7 @@ msgstr "é¸é …" msgid "Players" msgstr "玩家" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 msgid "Please confirm..." msgstr "請確èª..." @@ -3750,23 +3799,23 @@ msgstr "請在儲存å‰å»ºç«‹ä¸€å€‹æ–°çš„é€æª¢è¦–" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Polish" msgstr "Polish" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 1" msgstr "åŸ å£ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 2" msgstr "åŸ å£ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Port 3" msgstr "åŸ å£ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 msgid "Port 4" msgstr "åŸ å£ 4" @@ -3775,11 +3824,11 @@ msgstr "åŸ å£ 4" msgid "Port :" msgstr "埠å£ï¼š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese" msgstr "Portuguese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" msgstr "Portuguese (Brazilian)" @@ -3788,6 +3837,21 @@ msgstr "Portuguese (Brazilian)" msgid "Post-Processing Effect:" msgstr "後期處ç†è‘—色器：" +#: Source/Core/Core/Src/Movie.cpp:735 +#, c-format +msgid "Premature movie end in PlayController. %u + 8 > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:829 +#, c-format +msgid "Premature movie end in PlayWiimote. %u + %d > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:806 +#, c-format +msgid "Premature movie end in PlayWiimote. %u > %u" +msgstr "" + #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "é è¨­ï¼š" @@ -3830,7 +3894,7 @@ msgid "Quit" msgstr "離開" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "R" @@ -3839,7 +3903,7 @@ msgid "R Button" msgstr "R 鈕" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" msgstr "R-類比" @@ -3856,6 +3920,7 @@ msgid "Range" msgstr "範åœ" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "唯讀模å¼" @@ -3928,6 +3993,7 @@ msgid "Refresh" msgstr "æ›´æ–°" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "更新列表" @@ -3935,10 +4001,10 @@ msgstr "更新列表" msgid "Refresh game list" msgstr "æ›´æ–°éŠæˆ²åˆ—表" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 msgid "Remove" msgstr "移除" @@ -3957,6 +4023,7 @@ 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 msgid "Reset" msgstr "é‡ç½®" @@ -3979,15 +4046,15 @@ msgid "Right Stick" msgstr "å³ æ–æ¡¿" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "震動" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "在ç¨ç«‹çš„線程中執行 DSP LLE (ä¸æŽ¨è–¦)。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "Russian" @@ -3999,7 +4066,7 @@ msgstr "儲存進度(&V)" msgid "Safe" msgstr "安全" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Sample Rate:" msgstr "å–樣率：" @@ -4014,34 +4081,42 @@ msgid "Save GCI as..." msgstr "å¦å­˜ GCI ..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 1" msgstr "儲存至儲存格 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 2" msgstr "儲存至儲存格 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 3" msgstr "儲存至儲存格 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 4" msgstr "儲存至儲存格 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 msgid "Save State Slot 5" msgstr "儲存至儲存格 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 msgid "Save State Slot 6" msgstr "儲存至儲存格 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 msgid "Save State Slot 7" msgstr "儲存至儲存格 7" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 msgid "Save State Slot 8" msgstr "儲存至儲存格 8" @@ -4049,12 +4124,12 @@ msgstr "儲存至儲存格 8" msgid "Save State..." msgstr "å¦å­˜é€²åº¦..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "å¦å­˜ç‚º..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "儲存已壓縮的 GCM/ISO" @@ -4062,11 +4137,11 @@ msgstr "儲存已壓縮的 GCM/ISO" msgid "Save current perspective" msgstr "儲存目å‰ç‰ˆå¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "儲存已解壓縮的 GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "儲存的影片 %s 是æ毀的，影片錄製åœæ­¢..." @@ -4076,16 +4151,16 @@ msgstr "儲存的影片 %s 是æ毀的，影片錄製åœæ­¢..." msgid "Scaled EFB Copy" msgstr "EFB 縮放複製" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, fuzzy, c-format msgid "Scanning %s" msgstr "正在掃瞄..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "正在掃瞄 ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "正在掃瞄..." @@ -4101,7 +4176,7 @@ msgstr "滾動鎖定" msgid "Search Filter" msgstr "æœç´¢ç¯©é¸" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "æœå°‹å­è³‡æ–™å¤¾" @@ -4116,12 +4191,12 @@ msgstr "é …ç›® %s 在 SYSCONF 中找ä¸åˆ°" msgid "Select" msgstr "é¸æ“‡" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "é¸æ“‡å·²éŒ„製的檔案" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 msgid "Select a Wii WAD file to install" msgstr "é¸æ“‡è¦å®‰è£çš„ Wii WAD" @@ -4147,15 +4222,15 @@ msgstr "é¸æ“‡æµ®å‹•è¦–窗" msgid "Select the file to load" msgstr "é¸æ“‡è¦è®€å–的檔案" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "é¸æ“‡å­˜æª”" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "é¸æ“‡è¦è®€å–的進度" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 msgid "Select the state to save" msgstr "é¸æ“‡è¦å„²å­˜çš„進度" @@ -4212,11 +4287,11 @@ msgstr "傳感器ä½ç½®ï¼š" msgid "Separator" msgstr "分離器" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "Serbian" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "åŸ å£ 1 - 這是類似於網å¡ç­‰è£ç½®ä½¿ç”¨çš„埠å£ã€‚" @@ -4225,7 +4300,7 @@ msgstr "åŸ å£ 1 - 這是類似於網å¡ç­‰è£ç½®ä½¿ç”¨çš„埠å£ã€‚" msgid "Set" msgstr "設定" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "設為é è¨­ ISO (&D)" @@ -4239,11 +4314,11 @@ 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:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." msgstr "設定..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem：無法找到設定檔" @@ -4251,7 +4326,7 @@ msgstr "SetupWiiMem：無法找到設定檔" msgid "Shake" msgstr "æ–晃" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "短å：" @@ -4313,7 +4388,7 @@ msgstr "顯示 JAP" msgid "Show Korea" msgstr "顯示 Korea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "顯示語系：" @@ -4354,11 +4429,11 @@ msgstr "顯示 Wad" msgid "Show Wii" msgstr "顯示 Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 msgid "Show a confirmation box before stopping a game." msgstr "在åœæ­¢éŠæˆ²å¾Œé¡¯ç¤ºä¸€å€‹ç¢ºèªæ¡†ã€‚" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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 " @@ -4415,15 +4490,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "æ©«æ¡ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Simplified Chinese" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "大å°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 #, fuzzy msgid "Skip BIOS" msgstr "ç•¥éŽ GC BIOS" @@ -4461,11 +4536,11 @@ msgstr "" msgid "Slot %i" msgstr "儲存格 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 msgid "Slot A" msgstr "æ’槽 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 msgid "Slot B" msgstr "æ’槽 B" @@ -4485,7 +4560,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "è²éŸ³è¨­å®š" @@ -4503,9 +4578,9 @@ msgstr "è²éŸ³ç·©è¡å»ºç«‹å¤±æ•—：%s" msgid "Space" msgstr "Space" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Spanish" msgstr "Spanish" @@ -4541,7 +4616,7 @@ msgstr "Square Stick" msgid "Standard Controller" msgstr "標準控制器" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4556,14 +4631,16 @@ msgid "Start Re&cording" msgstr "開始錄製(&C)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "開始錄製" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "狀態" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "å³æ™‚存檔" @@ -4574,6 +4651,7 @@ msgstr "æ–æ¡¿" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "åœæ­¢" @@ -4612,8 +4690,8 @@ msgstr "æˆåŠŸåŒ¯å…¥å­˜æª”" msgid "Swing" msgstr "æ®èˆž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "系統語系：" @@ -4646,9 +4724,14 @@ msgstr "Table å³" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" msgstr "截å–ç•«é¢" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "測試" @@ -4679,13 +4762,13 @@ msgstr "ä½å€ç„¡æ•ˆ" msgid "The checksum was successfully fixed" msgstr "校驗已經被æˆåŠŸä¿®å¾©" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "The chosen directory is already in the list" msgstr "é¸å–的資料夾已經在列表中" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, c-format msgid "" "The file %s already exists.\n" @@ -4766,7 +4849,7 @@ msgstr "指定的檔案 \"%s\" ä¸å­˜åœ¨" msgid "The value is invalid" msgstr "這個數值無效" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "佈景主題" @@ -4794,7 +4877,7 @@ msgid "" "Replay itself." msgstr "Action replay 模擬器ä¸æ”¯æ´è¢« Action Replay 自身修改的代碼。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "這å¯èƒ½æœƒä½¿ Wii Menu 和部分éŠæˆ²é™é€Ÿã€‚" @@ -4809,7 +4892,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -4823,11 +4906,11 @@ msgstr "" "\n" "éµç›¤å¿«æ·éµ ：按ä½å¯ä»¥ç«‹å³é—œé–‰ç¯€æµé–¥ã€‚" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "這是用來播放音樂曲目，如背景音樂 (BGM) 。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4851,7 +4934,7 @@ msgid "Tilt" msgstr "傾斜" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr "標題" @@ -4867,15 +4950,16 @@ msgstr "å…¨é¸/全部å–消" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 msgid "Top" msgstr "上方" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Traditional Chinese" @@ -4883,7 +4967,7 @@ msgstr "Traditional Chinese" msgid "Tried to load an unknown file type." msgstr "已嘗試讀å–從未知的檔案類型。" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "扳機" @@ -4899,7 +4983,7 @@ msgstr "" "嘗試讀å–從無效的 SYSCONF\n" "Wiimote bt ids 是無效的" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Turkish" msgstr "Turkish" @@ -4975,15 +5059,6 @@ msgstr "接收到帶有未知 id 的錯誤訊æ¯ï¼š%d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "知訊æ¯å¸¶æœ‰ id:%d 接收於玩家:%d 正在æ出玩家ï¼" -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"未知的指示器 %#08x\n" -"是å¦ç¹¼çºŒï¼Ÿ" - #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -4998,7 +5073,7 @@ msgstr "æ›´æ–°" msgid "Upright Wiimote" msgstr "ç›´æ¡ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "使用 EuRGB60 æ¨¡å¼ (PAL60)" @@ -5011,7 +5086,7 @@ msgstr "全螢幕(&F)" msgid "Use Hex" msgstr "使用 Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "顯示錯誤æ示" @@ -5056,7 +5131,7 @@ msgstr "數值：" msgid "Verbosity" msgstr "事件" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "å½±åƒ" @@ -5064,7 +5139,7 @@ msgstr "å½±åƒ" msgid "Virtual" msgstr "虛擬" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "音é‡" @@ -5125,6 +5200,41 @@ msgstr "" "以åŠåœ¨æ‚¨è¨˜æ†¶å¡ä¸­ 相åŒæª”案å的檔案\n" "è¦ç¹¼çºŒå—Žï¼Ÿ" +#: Source/Core/Core/Src/Movie.cpp:629 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, 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" +"\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" +"\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" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -5142,15 +5252,15 @@ msgstr "寬螢幕修正" msgid "Width" msgstr "寬度" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "Wii 主機" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD 根：" @@ -5159,7 +5269,7 @@ msgstr "DVD 根：" msgid "Wii Save Import" msgstr "匯入 Wii 存檔" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存檔 (*.bin)|*.bin" @@ -5190,7 +5300,7 @@ msgstr "" "或閒置的時間太久。\n" "是å¦è¦é‡æ–°é€£æŽ¥ï¼Ÿ" -#: Source/Core/DolphinWX/Src/Main.cpp:599 +#: Source/Core/DolphinWX/Src/Main.cpp:598 msgid "Wiimote Connected" msgstr "Wiimote 已連接" @@ -5223,9 +5333,9 @@ msgstr "視窗 å³" msgid "Word Wrap" msgstr "自動æ›è¡Œ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Working..." msgstr "執行中..." @@ -5286,7 +5396,7 @@ msgstr "您必須輸入一個有效的å進制，å六進制或八進制的數 msgid "You must enter a valid profile name." msgstr "您必須輸入一個有效的設定檔å稱。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 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." @@ -5309,7 +5419,7 @@ msgstr "" "應該是 0x%04x (è€Œéž 0x%04llx)\n" "是å¦è¦å»ºç«‹æ–°çš„檔案？" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "ZTP 修正" @@ -5363,7 +5473,7 @@ msgstr "" msgid "^ ADD" msgstr "^ 新增" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "程å¼è®€å–器 (.img)" @@ -5380,7 +5490,7 @@ msgstr "無法讀å–資料，從檔案： %s" msgid "failed to read header" msgstr "讀å–檔頭失敗" -#: Source/Core/Core/Src/HW/Memmap.cpp:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT：從 %x ä¸­è®€å– Opcode 。請回報。" @@ -5399,7 +5509,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "未知的 cmd 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute 返回 -1 在應用程å¼åŸ·è¡Œæ™‚ï¼" @@ -5902,6 +6012,13 @@ msgstr "| 或" #~ msgid "Type %d config not supported in plugin %s" #~ msgstr "é¡žåž‹ %d 設定檔ä¸æ”¯æ´æ’件 %s" +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "未知的指示器 %#08x\n" +#~ "是å¦ç¹¼çºŒï¼Ÿ" + #~ msgid "Use FPS For Limiting" #~ msgstr "使用 FPS 進行é™åˆ¶" From 4ecb48eaf8218ecef4888070e3ca134aad9fc45f Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sun, 18 Dec 2011 14:03:57 -0600 Subject: [PATCH 193/381] Update a few more translations and add Farsi. --- Languages/po/es.po | 15 +- Languages/po/fa.po | 5307 ++++++++++++++++++++++ Languages/po/hu.po | 61 +- Source/Core/DolphinWX/Src/ConfigMain.cpp | 2 + 4 files changed, 5350 insertions(+), 35 deletions(-) create mode 100644 Languages/po/fa.po diff --git a/Languages/po/es.po b/Languages/po/es.po index 7dfaa956c6..f989ce37bf 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: 2011-12-18 13:39-0600\n" -"PO-Revision-Date: 2011-10-15 23:23+0100\n" +"PO-Revision-Date: 2011-12-09 00:28+0100\n" "Last-Translator: Petiso Carambanal \n" "Language-Team: DARIO_FF \n" "Language: Spanish\n" @@ -1803,7 +1803,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Dutch" -msgstr "Alemán" +msgstr "Holandés" #: Source/Core/DolphinWX/Src/FrameTools.cpp:129 msgid "E&xit" @@ -2077,7 +2077,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Activa el escaneo progresivo si es soportadopor elsoftware emulado.\n" +"Activa el escaneo progresivo si es soportado por el software emulado.\n" "A muchos juegos no les afecta esto.\n" "Si está inseguro, déjelo sin marcar." @@ -2739,10 +2739,10 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Aumenta bastante la calidad de las texturas generadas utilizando los efectos " -"de renderización para la textura.\n" +"Mejora bastante la calidad de las texturas generadas usando los efectos de " +"renderización para la textura.\n" "Aumentar la resolución interna va a mejorar el efecto de este ajuste.\n" -"Diminuye ligeramente el desempeño y probablemente provoca fallos (aunque es " +"Reduce ligeramente el desempeño y posiblemente cause fallos (altamente " "improbable).\n" "\n" "Si está inseguro, déjelo marcado." @@ -3526,6 +3526,9 @@ msgstr "" "\n" "\n" "\n" +"\n" +"\n" +"\n" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:72 msgid "Multiply" diff --git a/Languages/po/fa.po b/Languages/po/fa.po new file mode 100644 index 0000000000..e73a5c95ba --- /dev/null +++ b/Languages/po/fa.po @@ -0,0 +1,5307 @@ +# Translation of dolphin-emu.pot to Farsi +# Copyright (C) 2003-2011 +# This file is distributed under the same license as the dolphin-emu package. +# Hamed Khakbiz , 2011 +# +msgid "" +msgstr "" +"Project-Id-Version: Dolphin Emu\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +"PO-Revision-Date: 2011-12-18 14:00-0600\n" +"Last-Translator: Hamed Khakbiz \n" +"Language-Team: Hamed 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:510 +msgid " (too many to display)" +msgstr "(بسیار زیاد است برای نمایش دادن)" + +#: Source/Core/DolphinWX/Src/NetWindow.cpp:257 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:485 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:524 +msgid " Game : " +msgstr "بازی :" + +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +msgid "! NOT" +msgstr "! خیر" + +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 +#, c-format +msgid "" +"\"%s\" does not exist.\n" +" Create a new 16MB Memcard?" +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 "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193 +#, c-format +msgid "%1$sCopy%1$s" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: 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 +#, fuzzy, c-format +msgid "%i connected" +msgstr "Wiimote متصل شد" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296 +#, c-format +msgid "%s already exists, overwrite?" +msgstr "" + +#: Source/Core/DiscIO/Src/CompressedBlob.cpp:167 +#, c-format +msgid "%s failed to be scrubbed. Probably the image is corrupt." +msgstr "" + +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 +#, c-format +msgid "" +"%s failed to load as a memorycard \n" +" Card file size is invalid (0x%x bytes)" +msgstr "" + +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 +#, c-format +msgid "" +"%s failed to load as a memorycard \n" +" Card size is invalid (0x%x bytes)" +msgstr "" + +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 +#, c-format +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 "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 +#, c-format +msgid "%s failed to open" +msgstr "" + +#: Source/Core/Core/Src/DSP/DSPCore.cpp:97 +#, c-format +msgid "" +"%s has an incorrect hash.\n" +"Would you like to stop now to fix the problem?\n" +"If you select \"No\", audio will be garbled." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360 +#, c-format +msgid "%s is a 0 byte file" +msgstr "" + +#: Source/Core/DiscIO/Src/CompressedBlob.cpp:159 +#, c-format +msgid "%s is already compressed! Cannot compress it further." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345 +#, c-format +msgid "%s is too long for the filename, max chars is 45" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:199 +#, c-format +msgid "%sDelete%s" +msgstr "%sپاک کردن%s" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:197 +#, c-format +msgid "%sExport GCI%s" +msgstr "%sصادر کردن GCI%s" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:195 +#, c-format +msgid "%sImport GCI%s" +msgstr "%sوارد کردن GCI%s" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#, c-format +msgid "%u Free Blocks; %u Free Dir Entries" +msgstr "" + +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +msgid "&& AND" +msgstr "&& Ùˆ" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +msgid "&About..." +msgstr "&درباره..." + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +msgid "&Boot from DVD Drive..." +msgstr "&بوت شدن از دی ÙˆÛŒ دی" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +msgid "&Breakpoints" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +msgid "&Browse for ISOs..." +msgstr "&جوستوجو برای Ùایلهای ISO" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +msgid "&Cheats Manager" +msgstr "&مدریت کدهای تقلب" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +msgid "&DSP Settings" +msgstr "&تنظیمات صدا DSP" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +msgid "&Delete ISO..." +msgstr "&پاک کردن Ùایل ISO" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +msgid "&Delete selected ISOs..." +msgstr "&پاک کردن Ùایل ISO انطخاب شده" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +msgid "&Emulation" +msgstr "&شبیه سازی" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +msgid "&File" +msgstr "&Ùایل" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +msgid "&Frame Advance" +msgstr "&Ùریم پیشرÙته" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +msgid "&Fullscreen" +msgstr "&تمام صÙحه" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +msgid "&Graphics Settings" +msgstr "&تنظیمات گراÙیک" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +msgid "&Help" +msgstr "&Ú©Ù…Ú©" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +msgid "&Hotkey Settings" +msgstr "&تنظیم شرت کاتها" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +msgid "&JIT" +msgstr "&JIT" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +msgid "&Load State" +msgstr "&بارگیری حالت" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +msgid "&Memcard Manager (GC)" +msgstr "&مدریت کارت حاÙظه (GC)" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +msgid "&Memory" +msgstr "&حاÙظه" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +msgid "&Open..." +msgstr "&باز کردن..." + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +msgid "&Options" +msgstr "&اختیارات" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +msgid "&Pause" +msgstr "Ù…Ú©Ø«" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +msgid "&Play" +msgstr "&شروع بازی" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +msgid "&Properties" +msgstr "خواص" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +msgid "&Read-only mode" +msgstr "&حالت Ùقط خواندنی" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +msgid "&Refresh List" +msgstr "&به روز کردن لیست" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +msgid "&Registers" +msgstr "ثبت کردن" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +msgid "&Reset" +msgstr "&شروع دوباره" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +msgid "&Sound" +msgstr "&صدا" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +msgid "&Stop" +msgstr "&توقÙ" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +msgid "&Tools" +msgstr "&ابزارها" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +msgid "&Video" +msgstr "&ویدیو" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +msgid "&View" +msgstr "&دیدن" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +msgid "&Wiimote Settings" +msgstr "&تنظیمات Wiimote" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +msgid "&Wiki" +msgstr "&ویکی" + +#: Source/Core/DolphinWX/Src/PHackSettings.cpp:58 +msgid "(-)+zFar" +msgstr "" + +#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53 +msgid "(-)+zNear" +msgstr "" + +#: Source/Core/DolphinWX/Src/PHackSettings.cpp:98 +msgid "(UNKNOWN)" +msgstr "(ناشناخته)" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 +msgid "(off)" +msgstr "(خاموش)" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +msgid "16 bit" +msgstr "Û±Û¶ بیت" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +msgid "32 bit" +msgstr "Û³Û² بیت" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +msgid "3D Vision" +msgstr "نمایش سه بعدی" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +msgid "8 bit" +msgstr "Û¸ بیت" + +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:42 +msgid "" +msgstr "<اسم را اینجا وارد کنید>" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 +msgid "" +msgstr "<سایز تصویر پیدا نشد>" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +msgid "" +msgstr "<هیچ>" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +msgid "" +msgstr "<Ùشار کلید>" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +msgid "" +msgstr "<سیستم>" + +#: Source/Core/DolphinWX/Src/NetWindow.cpp:188 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:222 +msgid "A NetPlay window is already open!!" +msgstr "صÙحه NetPlay باز است!!" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +msgid "A game is not currently running." +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 "" + +#: Source/Core/DolphinWX/Src/NetWindow.cpp:93 +msgid "" +"ALERT:\n" +"\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" +"\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" +"Wiimote support has not been implemented.\n" +"\n" +"You must forward TCP port to host!!" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +msgid "AM-Baseboard" +msgstr "" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +msgid "AR Codes" +msgstr "کدهای اکشن ریپلی" + +#: Source/Core/DolphinWX/Src/AboutDolphin.h:33 +msgid "About Dolphin" +msgstr "درباره دلÙین" + +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +msgid "Acceleration" +msgstr "شتاب دهنده" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "دقت" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +msgid "Accurate VBeam emulation" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +msgid "" +"Accurately emulate EFB copies.\n" +"Some games depend on this for certain graphical effects or gameplay " +"functionality.\n" +"\n" +"If unsure, check EFB to Texture instead." +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +msgid "Action" +msgstr "اکشن" + +#: Source/Core/Core/Src/ARDecrypt.cpp:481 +#, c-format +msgid "" +"Action Replay Code Decryption Error:\n" +"Parity Check Failed\n" +"\n" +"Culprit Code:\n" +"%s" +msgstr "" + +#: Source/Core/Core/Src/ActionReplay.cpp:669 +#, c-format +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +msgstr "" + +#: Source/Core/Core/Src/ActionReplay.cpp:756 +#, c-format +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " +"(%s)" +msgstr "" + +#: Source/Core/Core/Src/ActionReplay.cpp:549 +#, 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 +#, c-format +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Write To " +"Pointer (%s)" +msgstr "" + +#: Source/Core/Core/Src/ActionReplay.cpp:803 +#, c-format +msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" +msgstr "" + +#: Source/Core/Core/Src/ActionReplay.cpp:684 +#, c-format +msgid "" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgstr "" + +#: Source/Core/Core/Src/ActionReplay.cpp:196 +#, c-format +msgid "Action Replay Error: invalid AR code line: %s" +msgstr "" + +#: Source/Core/Core/Src/ActionReplay.cpp:873 +#, c-format +msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" +msgstr "" + +#: Source/Core/Core/Src/ActionReplay.cpp:946 +#, c-format +msgid "Action Replay: Invalid Normal Code Type %08x (%s)" +msgstr "" + +#: Source/Core/Core/Src/ActionReplay.cpp:897 +#, c-format +msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" +msgstr "" + +#: Source/Core/Core/Src/ActionReplay.cpp:839 +#, c-format +msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 +msgid "Adapter:" +msgstr "آداپتور" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 +msgid "Add" +msgstr "اضاÙÙ‡ کردن" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +msgid "Add ActionReplay Code" +msgstr "اضاÙÙ‡ کردن کد اکشن ریپلی" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +msgid "Add Patch" +msgstr "اضاÙÙ‡ کردن وصله" + +#: Source/Core/DolphinWX/Src/FrameAui.cpp:506 +msgid "Add new pane" +msgstr "اضاÙÙ‡ کردن تکه جدید" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +msgid "Add..." +msgstr "اضاÙÙ‡ کردن..." + +#: Source/Core/DolphinWX/Src/NetWindow.cpp:74 +msgid "Address :" +msgstr "آدرس :" + +#: Source/Core/DolphinWX/Src/PHackSettings.cpp:57 +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" +"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/PHackSettings.cpp:52 +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" +"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 +msgid "Adjust the analog control pressure required to activate buttons." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +msgid "Advanced" +msgstr "پیشرÙته" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +msgid "Advanced Settings" +msgstr "تنظیمات پیشرÙته" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +msgid "All GC/Wii images (gcm, iso, ciso, gcz)" +msgstr "" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +msgid "All Gamecube GCM files (gcm)" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +msgid "All Save States (sav, s##)" +msgstr "" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +msgid "All Wii ISO files (iso)" +msgstr "تمام اسناد Wii ISO" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +msgid "All compressed GC/Wii ISO files (gcz)" +msgstr "تمام اسناد Ùشرده شده GC/Wii ISO" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +msgid "All files (*.*)|*.*" +msgstr "تمام اسناد (*.*)|*.*" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +msgid "" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"emulation window.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +msgid "Alternate Wiimote Timing" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 +msgid "Anisotropic Filtering:" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 +msgid "Anti-Aliasing:" +msgstr "" + +#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:317 +msgid "Apploader is the wrong size...is it really an apploader?" +msgstr "" + +#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:311 +msgid "Apploader unable to load from file" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +msgid "Apploader:" +msgstr "" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +msgid "Apply" +msgstr "اعمال کردن" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +msgid "" +"Apply a post-processing effect after finishing a frame.\n" +"\n" +"If unsure, select (off)." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +msgid "Arabic" +msgstr "عربی" + +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#, c-format +msgid "Are you sure you want to delete \"%s\"?" +msgstr "" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +msgid "" +"Are you sure you want to delete these files?\n" +"They will be gone forever!" +msgstr "" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +msgid "Are you sure you want to delete this file? It will be gone forever!" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 +msgid "Aspect Ratio:" +msgstr "نصبت طول به عرض تصویر:" + +#: Source/Core/DolphinWX/Src/FrameAui.cpp:69 +msgid "At least one pane must remain open." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +msgid "Audio" +msgstr "صدا" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +msgid "Audio Backend:" +msgstr "پشتوانه صدا" + +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +msgid "AudioCommon: Error opening AO device.\n" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +msgid "Auto" +msgstr "اتوماتیک" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 +msgid "Auto (Multiple of 640x528)" +msgstr "اتوماتیک (ضریب Û¶Û´Û°xÛµÛ²Û¸)" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 +msgid "Auto (Window Size)" +msgstr "اتوماتیک (سایز پنجره)" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +msgid "Auto adjust Window Size" +msgstr "تنظیم اتوماتیک سایز پنجره" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +msgid "" +"Automatically adjusts the window size to your internal resolution.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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/WXInputBase.cpp:27 +msgid "Back" +msgstr "برگشت" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +msgid "Backend Settings" +msgstr "تنضیمات پشتوانه" + +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 +msgid "Backend:" +msgstr "پشتوانه:" + +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 +msgid "Background Input" +msgstr "" + +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:279 +msgid "Backward" +msgstr "به عقب" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264 +msgid "Bad File Header" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 +msgid "Banner" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +msgid "Banner Details" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +msgid "Banner:" +msgstr "" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57 +msgid "Bar" +msgstr "نوار" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +msgid "Basic" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +msgid "Basic Settings" +msgstr "" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22 +msgid "Bass" +msgstr "" + +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 +msgid "Block Allocation Table checksum failed" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +msgid "Blocks" +msgstr "بلوک ها" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21 +msgid "Blue" +msgstr "آبی" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24 +msgid "Blue Left" +msgstr "" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25 +msgid "Blue Right" +msgstr "" + +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +msgid "Bottom" +msgstr "پائین" + +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#, c-format +msgid "Bound Controls: %lu" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +msgid "Broken" +msgstr "خراب" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +msgid "Browse" +msgstr "جوستجو" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 +msgid "Browse for a directory to add" +msgstr "جوستجو پوشه برای اضاÙÙ‡ کردن" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +msgid "Browse for an ISO directory..." +msgstr "جوستجو برای پوشه ISO..." + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +msgid "Browse for output directory" +msgstr "جوستجو برای پوشه خروجی" + +#: Source/Core/DolphinWX/Src/NetWindow.cpp:315 +msgid "Buffer:" +msgstr "" + +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 +msgid "Buttons" +msgstr "دکمه ها" + +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:61 +msgid "C Stick" +msgstr "" + +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +msgid "C-Stick" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +msgid "CPU Emulator Engine" +msgstr "موتور جوستجو پردازشگر" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +msgid "Cache Display Lists" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +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:88 +msgid "" +"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" +"Decreases emulation speed by some percent (depending on your GPU).\n" +"This usually is a safe enhancement, but might cause issues sometimes.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 +msgid "Cancel" +msgstr "لغو کردن" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240 +#, c-format +msgid "Cannot open %s" +msgstr "" + +#: Source/Core/Core/Src/CoreTiming.cpp:122 +msgid "Cannot unregister events with events pending" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#, c-format +msgid "" +"Cannot use that file as a memory card.\n" +"%s\n" +"is not a valid gamecube memory card file" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +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:1858 +#, 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:1872 +#, c-format +msgid "Cant find WiiMote by connection handle %02x" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 +msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49 +msgid "Caps Lock" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +msgid "Catalan" +msgstr "" + +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +msgid "Center" +msgstr "مرکز" + +#: Source/Core/DolphinWX/Src/NetWindow.cpp:562 +msgid "Change" +msgstr "تغییر" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +msgid "Change &Disc..." +msgstr "تغییر &دیسک..." + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +msgid "Change Disc" +msgstr "تغییر دیسک" + +#: Source/Core/DolphinWX/Src/NetWindow.cpp:550 +msgid "Change Game" +msgstr "تغییر بازی" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +msgid "" +"Change the language of the user interface.\n" +"Requires restart." +msgstr "" +"تغییر زبان برنامه.\n" +"شروع دوباره برنامه لازم است." + +#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59 +msgid "Changes sign to zFar Parameter (after correction)" +msgstr "" + +#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54 +msgid "Changes sign to zNear Parameter (after correction)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +msgid "Changing this will have no effect while the emulator is running!" +msgstr "این تغییر در زمانی Ú©Ù‡ شبیه ساز در حال کار Ù…ÛŒ باشد اثری نخواهد داشت!" + +#: Source/Core/DolphinWX/Src/NetWindow.cpp:282 +msgid "Chat" +msgstr "Ú¯Ù¾ زدن" + +#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:46 +msgid "Cheat Code" +msgstr "کد تقلب" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +msgid "Cheat Search" +msgstr "جوستجو برای کد تقلب" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +msgid "Cheats Manager" +msgstr "مدریت کدهای تقلب" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +msgid "Chinese (Simplified)" +msgstr "چینی (ساده شده)" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +msgid "Chinese (Traditional)" +msgstr "چینی (سنتی)" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +msgid "Choose a DVD root directory:" +msgstr "انتخاب پوشه برای DVD:" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +msgid "Choose a NAND root directory:" +msgstr "انتخاب پوشه برای NAND:" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +msgid "Choose a default ISO:" +msgstr "انتخاب ISO پیش Ùرز:" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Choose a directory to add" +msgstr "انتخاب پوشه برای اضاÙÙ‡ کردن" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +msgid "Choose a file to open" +msgstr "انتخاب سند برای باز کردن" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:214 +msgid "Choose a memory card:" +msgstr "انتخاب کارت حاÙظه:" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +msgid "" +"Choose file to use as apploader: (applies to discs constructed from " +"directories only)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +msgid "Choose the folder to extract to" +msgstr "انتخاب پوشه برای استخراج در آن" + +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297 +msgid "Circle Stick" +msgstr "" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52 +msgid "Classic" +msgstr "کلاسیک" + +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +msgid "Clear" +msgstr "پاک کردن" + +#: Source/Core/Core/Src/CoreTiming.cpp:174 +msgid "Clear failed." +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 "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +msgid "Close" +msgstr "بستن" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +msgid "Co&nfigure..." +msgstr "Ù¾ÛŒ&کربندی..." + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +msgid "Code Info" +msgstr "مشخصات کد" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 +msgid "Code: " +msgstr "کد:" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:134 +msgid "Command" +msgstr "دستور" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +msgid "Comment" +msgstr "توضیح" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +msgid "Comment:" +msgstr "توضیح:" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +msgid "Compress ISO..." +msgstr "Ùشرده کردن ISO..." + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +msgid "Compress selected ISOs..." +msgstr "Ùشرده کردن ISO انتخاب شده..." + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +msgid "Compressing ISO" +msgstr "در حال Ùشرده کردن ISO" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +msgid "Config" +msgstr "پیکربندی" + +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 +#: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 +msgid "Configure" +msgstr "پیکربندی" + +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +msgid "Configure Control" +msgstr "کنترل پیکربندی" + +#: Source/Core/DolphinWX/Src/NetWindow.cpp:293 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:581 +msgid "Configure Pads" +msgstr "پیکربندی گیم پدها" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +msgid "Configure..." +msgstr "پیکربندی..." + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +msgid "Confirm File Overwrite" +msgstr "تائید بازنویسی سند" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +msgid "Confirm on Stop" +msgstr "تائید برای توقÙ" + +#: Source/Core/DolphinWX/Src/NetWindow.cpp:67 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 +msgid "Connect" +msgstr "اتصال" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +msgid "Connect USB Keyboard" +msgstr "اتصال کیبورد USB" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#, c-format +msgid "Connect Wiimote %i" +msgstr "اتصال Wiimote %i" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +msgid "Connect Wiimote 1" +msgstr "اتصال Wiimote Û±" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +msgid "Connect Wiimote 2" +msgstr "اتصال Wiimote Û²" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +msgid "Connect Wiimote 3" +msgstr "اتصال Wiimote Û³" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +msgid "Connect Wiimote 4" +msgstr "اتصال Wiimote Û´" + +#: Source/Core/DolphinWX/Src/Main.cpp:597 +msgid "Connecting..." +msgstr "در حال اتصال..." + +#: Source/Core/DolphinWX/Src/FrameAui.cpp:154 +msgid "Console" +msgstr "ميز Ùرمان" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46 +msgid "Control" +msgstr "کنترل" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:186 +msgid "Convert to GCI" +msgstr "تبدیل به GCI" + +#: Source/Core/Core/Src/CoreParameter.cpp:377 +msgid "Copy failed" +msgstr "Ú©Ù¾ÛŒ با شکست مواجه شد" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#, c-format +msgid "Copy to Memcard %c" +msgstr "Ú©Ù¾ÛŒ به کارت حاÙظه %c" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +msgid "Core" +msgstr "هسته" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:151 +#, c-format +msgid "Could not create %s" +msgstr "" + +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#, c-format +msgid "Could not initialize backend %s." +msgstr "" + +#: 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 "" + +#: Source/Core/Core/Src/CoreParameter.cpp:294 +#, c-format +msgid "Could not recognize ISO file %s" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#, c-format +msgid "Could not save %s" +msgstr "" + +#: Source/Core/DolphinWX/Src/NetWindow.cpp:545 +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 "" + +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#, 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?" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +msgid "Couldn't find open command for extension 'ini'!" +msgstr "" + +#: Source/Core/Core/Src/BootManager.cpp:128 +msgid "" +"Couldn't init the core.\n" +"Check your configuration." +msgstr "" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 +msgid "Count:" +msgstr "شماردن:" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +msgid "Country:" +msgstr "کشور:" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 +msgid "Create AR Code" +msgstr "ساخت کد اکشن ریپلی" + +#: Source/Core/DolphinWX/Src/FrameAui.cpp:542 +#: Source/Core/DolphinWX/Src/FrameAui.cpp:607 +msgid "Create new perspective" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +msgid "Created by KDE-Look.org" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +msgid "" +"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +msgid "Created by VistaIcons.com" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +msgid "Created by black_rider and published on ForumW.org > Web Developments" +msgstr "" + +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +msgid "Creator: " +msgstr "سازنده:" + +#: Source/Core/Common/Src/MsgHandler.cpp:68 +msgid "Critical" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +msgid "Crop" +msgstr "حذ٠قسمتى تصوير" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +msgid "" +"Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48 +msgid "Crossfade" +msgstr "ضرب دری" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#, c-format +msgid "Current dir changed from %s to %s after wxFileSelector!" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +msgid "Custom Projection Hack" +msgstr "" + +#: Source/Core/DolphinWX/Src/PHackSettings.h:30 +msgid "Custom Projection Hack Settings" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +msgid "Customize some Orthographic Projection parameters." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +msgid "Czech" +msgstr "چکوسلواکی" + +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 +msgid "D-Pad" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +msgid "DSP" +msgstr "صدا DSP" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +msgid "DSP Emulator Engine" +msgstr "موتور شبیه ساز صدا DSP" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +msgid "DSP HLE emulation (fast)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +msgid "DSP LLE interpreter (slow)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +msgid "DSP LLE on Thread" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +msgid "DSP LLE recompiler" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +msgid "DSP settings" +msgstr "تنظیمات صدا DSP" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +msgid "DVD Root:" +msgstr "ریشه DVD:" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +msgid "Data Size" +msgstr "سایزه داده" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +msgid "Date:" +msgstr "تاریخ:" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +msgid "Datel MaxDrive/Pro files(*.sav)" +msgstr "" + +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:259 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296 +msgid "Dead Zone" +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +msgid "Debug" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +msgid "Debugging" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:76 +msgid "Decimal" +msgstr "دسیمال" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +msgid "Decompress ISO..." +msgstr "ناهمÙشرده کردن ISO..." + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +msgid "Decompress selected ISOs..." +msgstr "ناهمÙشرده کردن ISO انتخاب شده..." + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +msgid "Decompressing ISO" +msgstr "در حال ناهمÙشرده کردن ISO" + +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +msgid "Default" +msgstr "پیش Ùرز" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +msgid "Default ISO:" +msgstr ":ISO پیش Ùرز" + +#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +msgid "Default font" +msgstr "دست خط پیش Ùرز" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +msgid "Delete" +msgstr "پاک کردن" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +msgid "Delete Save" +msgstr "پاک کردن Save" + +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 +#, c-format +msgid "Delete the existing file '%s'?" +msgstr "آیا سند موجود پاک شود '%s'ØŸ" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +msgid "Description" +msgstr "شرح" + +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +msgid "Detect" +msgstr "شناسایی" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +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 +msgid "Device" +msgstr "دستگاه" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +msgid "Device Settings" +msgstr "تنظیمات دستگاه" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:45 +msgid "Dial" +msgstr "" + +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 +msgid "Direct3D11" +msgstr "" + +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 +msgid "Direct3D9" +msgstr "" + +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 +msgid "" +"Directory checksum failed\n" +" and Directory backup checksum failed" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +msgid "Disable" +msgstr "غیر Ùعال" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +msgid "Disable Fog" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +msgid "Disable Lighting" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +msgid "Disable Per-Pixel Depth" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +msgid "Disable Textures" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +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" +"\n" +"If unsure, leave this checked." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +msgid "" +"Disable texturing.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +msgid "Disc" +msgstr "دیسک" + +#: Source/Core/DiscIO/Src/DriveBlob.cpp:109 +#: Source/Core/DiscIO/Src/DriveBlob.cpp:128 +msgid "Disc Read Error" +msgstr "خواندن دیسک با مشکل مواجه گردید" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +msgid "Display" +msgstr "نمایش" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +msgid "" +"Display the inputs read by the emulator.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:77 +msgid "Divide" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +msgid "Do you want to stop the current emulation?" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +msgid "Dolphin" +msgstr "دلÙین" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 +#, c-format +msgid "Dolphin %s Graphics Configuration" +msgstr "دلÙین %s پیکردی بندی گرÙیک" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +msgid "Dolphin &Web Site" +msgstr "دلÙین &وب سایت" + +#: Source/Core/DolphinWX/Src/ConfigMain.h:37 +msgid "Dolphin Configuration" +msgstr "پیکر بندی دلÙین" + +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +msgid "Dolphin Emulated Wiimote Configuration" +msgstr "پیکربندی Wiimote شبیه سازی شده دلÙین" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:289 +msgid "Dolphin FIFO" +msgstr "دلÙین FIFO" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "پیکربندی GCPad دلÙین" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +msgid "Dolphin TAS Movies (*.dtm)" +msgstr "دلÙین TAS Movies (*.dtm)" + +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +msgid "Dolphin Wiimote Configuration" +msgstr "پیکربندی Wiimote دلÙین" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +msgid "Dolphin at &Google Code" +msgstr "دلÙین در &Google Code" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +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:343 +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:55 +msgid "Down" +msgstr "پائین" + +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +msgid "Download Codes (WiiRD Database)" +msgstr "دانلود کدها (WiiRD Database)" + +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#, c-format +msgid "Downloaded %lu codes. (added %lu)" +msgstr "کدهای %lu دانلود شده. (added %lu)" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31 +msgid "Drums" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +msgid "Dummy" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +msgid "Dump Audio" +msgstr "نسخه بردارى صدا" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +msgid "Dump EFB Target" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +msgid "Dump Frames" +msgstr "نسخه بردارى Ùریم" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +msgid "Dump Textures" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +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:112 +msgid "" +"Dump decoded game textures to User/Dump/Textures//\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +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:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +msgid "Dutch" +msgstr "هلندی" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +msgid "E&xit" +msgstr "Ø®&روج" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 +msgid "EFB Copies" +msgstr "" + +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 +#, 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 "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +msgid "EUROPE" +msgstr "اوروپا" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:145 +msgid "Early Memory Updates" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +msgid "Edit" +msgstr "ویرایش" + +#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30 +msgid "Edit ActionReplay Code" +msgstr "ویریش کدهای اکشن ریپلی" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +msgid "Edit Config" +msgstr "ویرایش پيکربندى" + +#: Source/Core/DolphinWX/Src/PatchAddEdit.h:30 +msgid "Edit Patch" +msgstr "ویرایش وصله" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +msgid "Edit current perspective" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +msgid "Edit..." +msgstr "ویرایش..." + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44 +msgid "Effect" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 +msgid "Embedded Frame Buffer" +msgstr "" + +#: Source/Core/Core/Src/Core.cpp:174 +msgid "Emu Thread already running" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +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" +"\n" +"If unsure, check virtual XFB emulation instead." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +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" +"\n" +"If unsure, leave this checked." +msgstr "" + +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +msgid "Emulated Wiimote" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +msgid "Emulation State: " +msgstr "" + +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +msgid "Enable" +msgstr "Ùراهم کردن" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +msgid "" +"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 "" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +msgid "Enable AR Logging" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 +msgid "Enable Audio Throttle" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +msgid "Enable BAT" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +msgid "Enable Block Merging" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +msgid "Enable Cache" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +msgid "Enable Cheats" +msgstr "Ùعال کردن کدهای تقلب" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +msgid "Enable DTK Music" +msgstr "Ùعال کردن موزیک DTK" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +msgid "Enable Dual Core" +msgstr "Ùعال کردن پردانده با دو هسته یا بیشتر" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +msgid "Enable Dual Core (speedup)" +msgstr "Ùعال کردن پردانده با دو هسته یا بیشتر (بالا بردن سرعت)" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +msgid "Enable Hotkeys" +msgstr "Ùعال کردن شرت کاتها" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +msgid "Enable Idle Skipping" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +msgid "Enable Idle Skipping (speedup)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +msgid "Enable MMU" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +msgid "Enable Progressive Scan" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +msgid "Enable Screen Saver" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +msgid "Enable WideScreen" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +msgid "Enable Wireframe" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +msgid "" +"Enable anisotropic filtering.\n" +"Enhances visual quality of textures that are at oblique viewing angles.\n" +"Might cause issues in a small number of games.\n" +"\n" +"If unsure, select 1x." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +msgid "" +"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " +"Compatible)" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +msgid "Enable pages" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +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 "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +msgid "" +"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 "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +msgid "" +"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " +"ANY other game." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +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:337 +msgid "Enables Custom Projection Hack" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +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 "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +msgid "" +"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " +"OFF = Fast)" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +msgid "" +"Encode frame dumps using the FFV1 codec.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50 +msgid "End" +msgstr "پایان" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +msgid "English" +msgstr "انگلیسی" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 +msgid "Enhancements" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameAui.cpp:606 +msgid "Enter a name for the new perspective:" +msgstr "" + +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:190 +#, c-format +msgid "Entry %d/%d" +msgstr "" + +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:84 +#, c-format +msgid "Entry 1/%d" +msgstr "" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +msgid "Equal" +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "خطا" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +#: Source/Core/DolphinWX/Src/Main.cpp:346 +msgid "Error loading selected language. Falling back to system default." +msgstr "" + +#: Source/Core/Common/Src/ChunkFile.h:180 +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#, c-format +msgid "" +"Error: Trying to access %s fonts but they are not loaded. Games may not show " +"fonts correctly, or crash." +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 +msgid "Escape" +msgstr "گریختن" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26 +msgid "Euphoria" +msgstr "" + +#: Source/Core/Core/Src/MemTools.cpp:214 +#, c-format +msgid "Exception handler - access below memory space. %08llx%08llx" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 +msgid "Execute" +msgstr "اجرا کردن" + +#: Source/Core/DolphinWX/Src/Main.cpp:139 +msgid "Exit Dolphin with emulator" +msgstr "خروج دلÙین با شبیه ساز" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +msgid "Export Failed" +msgstr "صادر کردن با شکست مواجه شد" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +msgid "Export File" +msgstr "صادر کردن سند" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +msgid "Export Recording" +msgstr "صادر کردن ضبط" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +msgid "Export Recording..." +msgstr "صادر کردن ضبط..." + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +msgid "Export Save" +msgstr "صادر کردن Save" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +msgid "Export Wii save (Experimental)" +msgstr "صادر کردن Wii save (آزمایشی)" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +msgid "Export all saves" +msgstr "صادر کردن تمام Save ها" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80 +msgid "Export failed, try again?" +msgstr "صادر کردن با شکست مواجه شد, سعی دوباره؟" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +msgid "Export save as..." +msgstr "صادر کردن Save با عنوان..." + +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +msgid "Extension" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +msgid "External Frame Buffer" +msgstr "" + +#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60 +msgid "Extra Parameter" +msgstr "" + +#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61 +msgid "Extra Parameter useful in ''Metroid: Other M'' only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +msgid "Extract All Files..." +msgstr "استخراج کردن تمامی اسناد..." + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +msgid "Extract Apploader..." +msgstr "استخراج کردن Apploader..." + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +msgid "Extract DOL..." +msgstr "استخراج کردن DOL..." + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +msgid "Extract Directory..." +msgstr "استخراج کردن پوشه..." + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +msgid "Extract File..." +msgstr "استخراج کردن سند..." + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +msgid "Extract Partition..." +msgstr "استخراج کردن پارتیشن..." + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#, c-format +msgid "Extracting %s" +msgstr "استخراج کردن %s" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +msgid "Extracting All Files" +msgstr "استخراج کردن تمامی اسناد" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +msgid "Extracting Directory" +msgstr "استخراج کردن پوشه" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +msgid "Extracting..." +msgstr "استخراج کردن..." + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 +msgid "FIFO Byte" +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:38 +msgid "FIFO Player" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +msgid "FRANCE" +msgstr "Ùرانسه" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +msgid "FST Size:" +msgstr "" + +#: Source/Core/Core/Src/NetPlayClient.cpp:77 +msgid "Failed to Connect!" +msgstr "اتصال با شکست مواجه شد!" + +#: Source/Core/DolphinWX/Src/NetWindow.cpp:212 +msgid "Failed to Listen!!" +msgstr "" + +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +msgid "Failed to download codes." +msgstr "دانلود کدها با شکست مواجه شد." + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#, c-format +msgid "Failed to extract to %s!" +msgstr "" + +#: Source/Core/Core/Src/DSP/DSPCore.cpp:66 +#, c-format +msgid "" +"Failed to load DSP ROM:\t%s\n" +"\n" +"This file is required to use DSP LLE.\n" +"It is not included with Dolphin as it contains copyrighted data.\n" +"Use DSPSpy to dump the file from your physical console.\n" +"\n" +"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 "" + +#: 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 "" + +#: 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 "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 +msgid "Failed to read banner.bin" +msgstr "" + +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 +msgid "" +"Failed to read block allocation table backup correctly\n" +"(0x8000-0x9FFF)" +msgstr "" + +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 +msgid "" +"Failed to read block allocation table correctly\n" +"(0x6000-0x7FFF)" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286 +#, c-format +msgid "Failed to read data from file %d" +msgstr "" + +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 +msgid "" +"Failed to read directory backup correctly\n" +"(0x4000-0x5FFF)" +msgstr "" + +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 +msgid "" +"Failed to read directory correctly\n" +"(0x2000-0x3FFF)" +msgstr "" + +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 +msgid "" +"Failed to read header correctly\n" +"(0x0000-0x1FFF)" +msgstr "" + +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 +msgid "" +"Failed to read save data\n" +"(0xA000-)\n" +"Memcard may be truncated" +msgstr "" + +#: Source/Core/DiscIO/Src/VolumeGC.cpp:61 +msgid "Failed to read unique ID from disc image" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:83 +msgid "Failed to write BT.DINF to SYSCONF" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228 +msgid "Failed to write bkhdr" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164 +#, c-format +msgid "Failed to write header for %s" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258 +#, c-format +msgid "Failed to write header for file %d" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "سریع" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +msgid "Fast version of the MMU. Does not work for every game." +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +msgid "Fifo Player" +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:88 +msgid "File Info" +msgstr "مشخصات سند" + +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +msgid "File contained no codes." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415 +msgid "File converted to .gci" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:430 +msgid "" +"File could not be opened\n" +"or does not have a valid extension" +msgstr "" + +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 +#, c-format +msgid "" +"File has the extension \"%s\"\n" +"valid extensions are (.raw/.gcp)" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +msgid "File is not recognized as a memcard" +msgstr "" + +#: Source/Core/DiscIO/Src/CompressedBlob.cpp:294 +msgid "File not compressed" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#, c-format +msgid "FileIO: Unknown open mode : 0x%02x" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +msgid "Filesystem" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +msgid "Filetype 'ini' is unknown! Will not open!" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +msgid "First Block" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +msgid "Fix Checksums" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +msgid "Force 16:9" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +msgid "Force 4:3" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +msgid "Force Console as NTSC-J" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +msgid "Force Texture Filtering" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +msgid "" +"Force texture filtering even if the emulated game explicitly disabled it.\n" +"Improves texture quality slightly but causes glitches in some games.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +msgid "" +"Force the game to output graphics for widescreen resolutions.\n" +"Causes graphical glitches is some games.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +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." +msgstr "" + +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 +msgid "" +"Format as ascii (NTSC\\PAL)?\n" +"Choose no for sjis (NTSC-J)" +msgstr "" + +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:278 +msgid "Forward" +msgstr "جلو" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 +msgid "Frame" +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 +msgid "Frame " +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +msgid "Frame Advance" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +msgid "Frame Dumps use FFV1" +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105 +msgid "Frame Range" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +msgid "Frame S&kipping" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +msgid "Framelimit:" +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189 +msgid "Frames To Record" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +msgid "Free Look" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +msgid "French" +msgstr "Ùرانسوی" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38 +msgid "Frets" +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:107 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:126 +msgid "From" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +msgid "FullScr" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +msgid "Fullscreen resolution:" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:533 +msgid "GCI File(*.gci)" +msgstr "" + +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +#, fuzzy +msgid "GCMic Configuration" +msgstr "تنضیمات ثبت وقايع" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +msgid "GCPad" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +msgid "Game ID:" +msgstr "" + +#: Source/Core/Core/Src/NetPlay.cpp:228 +msgid "Game is already running!" +msgstr "" + +#: Source/Core/Core/Src/NetPlay.cpp:258 +msgid "Game isn't running!" +msgstr "" + +#: Source/Core/DolphinWX/Src/NetWindow.cpp:383 +msgid "Game not found!!" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +msgid "Game-Specific Settings" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +msgid "GameConfig" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +msgid "Gamecube" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +msgid "Gamecube &Pad Settings" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +msgid "Gamecube Memory Cards (*.raw,*.gcp)" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +msgid "Gamecube Pad settings" +msgstr "" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +msgid "Gecko Codes" +msgstr "" + +#: Source/Core/Core/Src/GeckoCode.cpp:139 +#, 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.)" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 +msgid "General" +msgstr "Ú©Ù„ÛŒ" + +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +msgid "General Settings" +msgstr "تنظیمات Ú©Ù„ÛŒ" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +msgid "German" +msgstr "" + +#: Source/Core/Core/Src/ActionReplay.cpp:451 +#, c-format +msgid "GetARCode: Index is greater than ar code list size %lu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +msgid "Graphics" +msgstr "گرÙیک" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +msgid "Graphics settings" +msgstr "تنظیمات گراÙیک" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +msgid "Greater Than" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +msgid "" +"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" +"\n" +"If unsure, leave this checked." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Greek" +msgstr "یونانی" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22 +msgid "Green" +msgstr "سبز" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24 +msgid "Green Left" +msgstr "" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25 +msgid "Green Right" +msgstr "" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35 +msgid "Guitar" +msgstr "گیتار" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250 +msgid "HCI_CMD_INQUIRY is called, please report!" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 +msgid "Hacks" +msgstr "" + +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 +msgid "Header checksum failed" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +msgid "Hebrew" +msgstr "" + +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +msgid "Height" +msgstr "ارتÙاع" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:61 +msgid "Help" +msgstr "Ú©Ù…Ú©" + +#: Source/Core/DolphinWX/Src/Main.cpp:196 +msgid "" +"Hi,\n" +"\n" +"Dolphin requires that your CPU has support for SSE2 extensions.\n" +"Unfortunately your CPU does not support them, so Dolphin will not run.\n" +"\n" +"Sayonara!\n" +msgstr "" + +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +msgid "Hide" +msgstr "مخÙÛŒ" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +msgid "Hide Mouse Cursor" +msgstr "مخÙÛŒ کردن نشانگر" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +msgid "" +"Hides the mouse cursor if it's on top of the emulation window.\n" +"\n" +"If unsure, leave this checked." +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 +msgid "Home" +msgstr "خانه" + +#: Source/Core/DolphinWX/Src/NetWindow.cpp:69 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:122 +msgid "Host" +msgstr "میزبان" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.h:44 +msgid "Hotkey Configuration" +msgstr "پیگربندی شرت کات" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +msgid "Hotkeys" +msgstr "کاتها" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +msgid "Hungarian" +msgstr "مجارستانی" + +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +msgid "Hybrid Wiimote" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#, 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:795 +#, c-format +msgid "" +"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 "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +msgid "IOCTL_ES_READCONTENT - bad destination" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +msgid "IPL Settings" +msgstr "" + +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +msgid "IR" +msgstr "" + +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +msgid "IR Pointer" +msgstr "" + +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +msgid "IR Sensitivity:" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +msgid "ISO Details" +msgstr "جزئیات ISO" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +msgid "ISO Directories" +msgstr "پوشه های ISO" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +msgid "ITALY" +msgstr "ايتاليا" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +msgid "Icon" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +msgid "" +"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +msgid "" +"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." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 +msgid "Ignore Format Changes" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +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" +"\n" +"If unsure, leave this checked." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +msgid "Import Save" +msgstr " وارد کردن Save" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59 +msgid "Import failed, try again?" +msgstr "وارد کردن با شکست مواجه شد, سعی دوباره؟" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:456 +msgid "" +"Imported file has gsc extension\n" +"but does not have a correct header" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +msgid "Imported file has invalid length" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +msgid "" +"Imported file has sav extension\n" +"but does not have a correct header" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +msgid "" +"Improves performance but causes glitches in most games which rely on proper " +"fog emulation.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +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:347 +msgid "In Game" +msgstr "در بازی" + +#: Source/Core/DolphinWX/Src/NetWindow.cpp:592 +msgid "In-Game" +msgstr "در-بازی" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +msgid "Info" +msgstr "مشخصات" + +#: Source/Core/Common/Src/MsgHandler.cpp:65 +msgid "Information" +msgstr "مشخصات" + +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +msgid "Input" +msgstr "ورودی" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:60 +msgid "Insert" +msgstr "درج" + +#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:175 +msgid "Insert Encrypted or Decrypted code here..." +msgstr "درج کد رمز شده Ùˆ یا کش٠رمز..." + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +msgid "Insert SD Card" +msgstr "درج کارت SD" + +#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:33 +msgid "Insert name here.." +msgstr "درج اسم..." + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +msgid "Install WAD" +msgstr "نصب WAD" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +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 "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +msgid "Installing WAD..." +msgstr "در حال نصب WAD..." + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +msgid "Interface" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +msgid "Interface Settings" +msgstr "" + +#: Source/Core/Core/Src/State.cpp:242 +msgid "Internal LZO Error - compression failed" +msgstr "" + +#: Source/Core/Core/Src/State.cpp:338 +#, c-format +msgid "" +"Internal LZO Error - decompression failed (%d) (%li, %li) \n" +"Try loading the state again" +msgstr "" + +#: Source/Core/Core/Src/State.cpp:461 +msgid "Internal LZO Error - lzo_init() failed" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 +msgid "Internal Resolution:" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +msgid "Interpreter (VERY slow)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +msgid "Intro" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194 +#, c-format +msgid "Invalid Size(%x) or Magic word (%x)" +msgstr "سایز نا معتبر (%x) یا Magic word (%x)" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 +msgid "Invalid Value!" +msgstr "مقدار نا معتبر" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:464 +msgid "Invalid bat.map or dir entry" +msgstr "bat.map نا معتبر یا ورودی پوشه" + +#: Source/Core/Core/Src/CoreTiming.cpp:536 +#, c-format +msgid "Invalid event type %i" +msgstr "واقعه نا معتبر %i" + +#: Source/Core/Core/Src/HW/DVDInterface.cpp:314 +msgid "Invalid file" +msgstr "سند نا معتبر" + +#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:40 +#, c-format +msgid "" +"Invalid opening.bnr found in gcm:\n" +"%s\n" +" You may need to redump this game." +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:503 +msgid "Invalid recording file" +msgstr "سند ضبط نا معتبر" + +#: Source/Core/Core/Src/Core.cpp:489 +msgid "Invalid state" +msgstr "وضیعت نا معتبر" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +msgid "Italian" +msgstr "ایتالیائی" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +msgid "JAPAN" +msgstr "ژاپن" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +msgid "JIT Recompiler (recommended)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +msgid "JITIL experimental recompiler" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +msgid "Japanese" +msgstr "ژاپنی" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +msgid "KOREA" +msgstr "کره" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +msgid "Key" +msgstr "کلید" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +msgid "Korean" +msgstr "کره ای" + +#. i18n: Left +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +msgid "L" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39 +msgid "L Button" +msgstr "" + +#. i18n: Left-Analog +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +msgid "L-Analog" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +msgid "Language:" +msgstr "زبان:" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +msgid "Last Overwritten State" +msgstr "آخرین State بازنویسی شده" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +msgid "Last Saved State" +msgstr "آخرین State ذخیره شده" + +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 +msgid "Left" +msgstr "Ú†Ù¾" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60 +msgid "Left Stick" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +msgid "" +"Left click to detect hotkeys.\n" +"Enter space to clear." +msgstr "" + +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +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 +msgid "" +"Left/Right-click for more options.\n" +"Middle-click to clear." +msgstr "" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +msgid "Less Than" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +msgid "Limit by FPS" +msgstr "" + +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +msgid "Load" +msgstr "بارگیری" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +msgid "Load Custom Textures" +msgstr "بارگیری Texture دلخواه" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +msgid "Load State Slot 1" +msgstr "بارگیری State شکا٠۱" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +msgid "Load State Slot 2" +msgstr "بارگیری State شکا٠۲" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +msgid "Load State Slot 3" +msgstr "بارگیری State شکا٠۳" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +msgid "Load State Slot 4" +msgstr "بارگیری State شکا٠۴" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +msgid "Load State Slot 5" +msgstr "بارگیری State شکا٠۵" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +msgid "Load State Slot 6" +msgstr "بارگیری State شکا٠۶" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +msgid "Load State Slot 7" +msgstr "بارگیری State شکا٠۷" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +msgid "Load State Slot 8" +msgstr "بارگیری State شکا٠۸" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +msgid "Load State..." +msgstr "بارگیری State..." + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +#, c-format +msgid "Load Wii System Menu %d%c" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +msgid "" +"Load custom textures from User/Load/Textures//\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49 +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:590 +msgid "Local" +msgstr "محلی" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +msgid "Lock Threads to Cores" +msgstr "" + +#: Source/Core/DolphinWX/Src/LogWindow.h:51 +msgid "Log" +msgstr "ثبت وقايع" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +msgid "Log Configuration" +msgstr "تنضیمات ثبت وقايع" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +msgid "Log Types" +msgstr "نوع ثبت وقايع" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +msgid "Logger Outputs" +msgstr "خروجی ثبت وقايع" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 +msgid "Logging" +msgstr "در حال ثبت وقايع" + +#: Source/Core/Core/Src/NetPlayClient.cpp:255 +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 "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119 +#, c-format +msgid "" +"MD5 mismatch\n" +" %016llx%016llx != %016llx%016llx" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +msgid "MMU Speed Hack" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +msgid "MadCatz Gameshark files(*.gcs)" +msgstr "" + +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 +msgid "Main Stick" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +msgid "Maker ID:" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +msgid "Maker:" +msgstr "" + +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +msgid "Max" +msgstr "حداکثر" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +msgid "Memcard already has a save for this title" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 +msgid "Memcard already opened" +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:438 +msgid "Memory Byte" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +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 "" + +#: Source/Core/Core/Src/CoreParameter.cpp:369 +#, c-format +msgid "" +"Memory Card filename in Slot %c is incorrect\n" +"Region not specified\n" +"\n" +"Slot %c path was changed to\n" +"%s\n" +"Would you like to copy the old file to this new location?\n" +msgstr "" + +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 +msgid "Memorycard filesize does not match the header size" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47 +msgid "Menu" +msgstr "Ùهرست انتخاب" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +msgid "Mic" +msgstr "میکروÙÙ†" + +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +msgid "Min" +msgstr "حداقل" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +msgid "Misc" +msgstr "متÙرقه" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +msgid "Misc Settings" +msgstr "تنظیمات متÙرقه" + +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:240 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:294 +msgid "Modifier" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +msgid "" +"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 "" + +#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +msgid "Monospaced font" +msgstr "" + +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +msgid "Motion Plus" +msgstr "" + +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +msgid "Motor" +msgstr "موتور" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +msgid "" +"Move the mouse pointer over an option to display a detailed description.\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"\n" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:72 +msgid "Multiply" +msgstr "ضریب" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +msgid "" +"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " +"effect on emulated wiimotes." +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:126 +msgid "NP Add" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121 +msgid "NP Begin" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:129 +msgid "NP Decimal" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123 +msgid "NP Delete" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:130 +msgid "NP Divide" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117 +msgid "NP Down" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120 +msgid "NP End" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108 +msgid "NP Enter" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:124 +msgid "NP Equal" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113 +msgid "NP Home" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122 +msgid "NP Insert" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114 +msgid "NP Left" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:125 +msgid "NP Multiply" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119 +msgid "NP Page Down" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118 +msgid "NP Page Up" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116 +msgid "NP Right" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:127 +msgid "NP Separator" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106 +msgid "NP Space" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:128 +msgid "NP Subtract" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107 +msgid "NP Tab" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115 +msgid "NP Up" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 +#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 +msgid "Name:" +msgstr "اسم:" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +msgid "Name: " +msgstr "اسم:" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +msgid "Native GCI files(*.gci)" +msgstr "" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +msgid "New Scan" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +msgid "Next Page" +msgstr "صÙحه بعد" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +msgid "Next Scan" +msgstr "" + +#: Source/Core/DolphinWX/Src/NetWindow.cpp:52 +msgid "Nickname :" +msgstr "اسم مستعار" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +msgid "No Country (SDK)" +msgstr "" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +msgid "No ISOs or WADS found" +msgstr "هیچ ISO Ùˆ یا WAD یاÙت نشده است" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508 +#, c-format +msgid "No banner file found for title %s" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameAui.cpp:513 +msgid "No docking" +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:385 +msgid "No file loaded" +msgstr "هیچ سندی بارگیری نشده است" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +msgid "No free dir index entries" +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:421 +msgid "No recorded file" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 +#, c-format +msgid "No save folder found for title %s" +msgstr "" + +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:598 +msgid "None" +msgstr "هیچکدام" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +msgid "Norwegian Bokmaal" +msgstr "" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +msgid "Not Equal" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +msgid "Not Set" +msgstr "" + +#: Source/Core/DolphinWX/Src/Main.cpp:596 +msgid "Not connected" +msgstr "" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +msgid "Notes" +msgstr "" + +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +msgid "Notes: " +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameAui.cpp:70 +#: Source/Core/DolphinWX/Src/FrameAui.cpp:73 +#: 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 +msgid "Notice" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:102 +msgid "Num Lock" +msgstr "" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +msgid "Number Of Codes: " +msgstr "" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +msgid "Nunchuk" +msgstr "" + +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +msgid "Nunchuk Acceleration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:403 +msgid "Object" +msgstr "شیی" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +msgid "Object Range" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +msgid "Off" +msgstr "خاموش" + +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:61 +msgid "Offset:" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#, c-format +msgid "Only %d blocks available" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +msgid "Open" +msgstr "گشودن" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +msgid "Open &containing folder" +msgstr "" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +msgid "Open Wii &save folder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +msgid "Open file..." +msgstr "گشودن سند" + +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#, c-format +msgid "OpenAL: can't create context for device %s" +msgstr "" + +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +msgid "OpenAL: can't find sound devices" +msgstr "" + +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#, c-format +msgid "OpenAL: can't open device %s" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +msgid "OpenCL Texture Decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +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" +msgstr "اختیارات" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22 +msgid "Orange" +msgstr "نارنجی" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:470 +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:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +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 "" + +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +msgid "Output" +msgstr "خروجی" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +msgid "P&lay Recording..." +msgstr "" + +#: Source/Core/Core/Src/HW/GCPad.cpp:29 +msgid "Pad" +msgstr "" + +#: Source/Core/DolphinWX/Src/NetWindow.cpp:600 +msgid "Pad " +msgstr "" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:34 +msgid "Pads" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105 +msgid "Page Down" +msgstr "صÙحه پائینی" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104 +msgid "Page Up" +msgstr "صÙحه بالایی" + +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +msgid "Pair Up" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35 +msgid "Paragraph" +msgstr "" + +#: Source/Core/DolphinWX/Src/PHackSettings.cpp:63 +msgid "Parameters" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#, c-format +msgid "Partition %i" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +msgid "Patches" +msgstr "وصله ها" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +msgid "Paths" +msgstr "مسیرها" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 +msgid "Pause" +msgstr "Ù…Ú©Ø«" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +msgid "Per-Pixel Lighting" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +msgid "Perfect" +msgstr "کامل" + +#: Source/Core/DolphinWX/Src/FrameAui.cpp:608 +#, c-format +msgid "Perspective %d" +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +msgid "Play" +msgstr "شروع بازی" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +msgid "Play Recording" +msgstr "شروع ضبط" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +msgid "Play/Pause" +msgstr "شروع بازی/Ù…Ú©Ø«" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +msgid "Playable" +msgstr "قابل بازی" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 +msgid "Playback Options" +msgstr "" + +#: Source/Core/DolphinWX/Src/NetWindow.cpp:288 +msgid "Players" +msgstr "بازی کنان" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +msgid "Please confirm..." +msgstr "لطÙا تایید کنید..." + +#: Source/Core/DolphinWX/Src/FrameAui.cpp:578 +msgid "Please create a perspective before saving" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:36 +msgid "Plus-Minus" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +msgid "Polish" +msgstr "لهستانی" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +msgid "Port 1" +msgstr "درگاه Û±" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +msgid "Port 2" +msgstr "درگاه Û²" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +msgid "Port 3" +msgstr "درگاه Û³" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +msgid "Port 4" +msgstr "درگاه Û´" + +#: Source/Core/DolphinWX/Src/NetWindow.cpp:81 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:114 +msgid "Port :" +msgstr "درگاه :" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +msgid "Portuguese" +msgstr "پرتقال" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +msgid "Portuguese (Brazilian)" +msgstr "پرتقال" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 +msgid "Post-Processing Effect:" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:735 +#, c-format +msgid "Premature movie end in PlayController. %u + 8 > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:829 +#, c-format +msgid "Premature movie end in PlayWiimote. %u + %d > %u" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:806 +#, c-format +msgid "Premature movie end in PlayWiimote. %u > %u" +msgstr "" + +#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 +msgid "Presets: " +msgstr "حالت های از پيش تنظيم شده" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:202 +msgid "Prev Page" +msgstr "صÙحه قبلی" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +msgid "Previous Page" +msgstr "صÙحه قبلی" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +msgid "Previous Value" +msgstr "مقدار قبلی" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:57 +msgid "Print" +msgstr "چاپ" + +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +msgid "Profile" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.h:55 +msgid "Properties" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +msgid "Purge Cache" +msgstr "" + +#: Source/Core/Common/Src/MsgHandler.cpp:66 +msgid "Question" +msgstr "سوال" + +#: Source/Core/DolphinWX/Src/NetWindow.cpp:146 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:303 +msgid "Quit" +msgstr "خارج شدن" + +#. i18n: Right +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +msgid "R" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40 +msgid "R Button" +msgstr "" + +#. i18n: Right-Analog +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 +msgid "R-Analog" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +msgid "RAM" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +msgid "RUSSIA" +msgstr "روسیه" + +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +msgid "Range" +msgstr "محدوده" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +msgid "Read-only mode" +msgstr "حالت Ùقط خواندنی" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +msgid "Real" +msgstr "واقعی" + +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +msgid "Real Wiimote" +msgstr "Wiimote واقعی" + +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#, fuzzy +msgid "Real Wiimotes" +msgstr "Wiimote واقعی" + +#: Source/Core/DolphinWX/Src/Frame.cpp:163 +msgid "Reconnect Wiimote Confirm" +msgstr "" + +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +msgid "Reconnect Wiimote on State Loading" +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:178 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:336 +msgid "Record" +msgstr "ضبط" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 +msgid "Recording Info" +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 +msgid "Recording Options" +msgstr "" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21 +msgid "Red" +msgstr "قرمز" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24 +msgid "Red Left" +msgstr "" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25 +msgid "Red Right" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +msgid "" +"Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" +"This makes the rendered picture look less blocky.\n" +"Heavily decreases emulation speed and sometimes causes issues.\n" +"\n" +"If unsure, select None." +msgstr "" + +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +msgid "Refresh" +msgstr "به روز کردن" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +msgid "Refresh List" +msgstr "به روز کردن لیست" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +msgid "Refresh game list" +msgstr "به روز کردن لیست بازی" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +msgid "Remove" +msgstr "پاک کردن" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +msgid "" +"Render the scene as a wireframe.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +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 +msgid "Reset" +msgstr "شروع دوباره" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +msgid "Results" +msgstr "نتایج" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29 +msgid "Return" +msgstr "برگشت" + +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 +msgid "Right" +msgstr "راست" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61 +msgid "Right Stick" +msgstr "" + +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 +msgid "Rumble" +msgstr "شوک" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +msgid "Run DSP LLE on a dedicated thread (not recommended)." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +msgid "Russian" +msgstr "روسی" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +msgid "Sa&ve State" +msgstr "ذخ&یره State" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "بی خطر" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +msgid "Sample Rate:" +msgstr "نرخ نمونه برداری صدا" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +msgid "Save" +msgstr "ذخیره" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +msgid "Save GCI as..." +msgstr "ذخیره GCI با عنوان" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +msgid "Save State Slot 1" +msgstr "ذخیره State شکا٠۱" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +msgid "Save State Slot 2" +msgstr "ذخیره State شکا٠۲" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +msgid "Save State Slot 3" +msgstr "ذخیره State شکا٠۳" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +msgid "Save State Slot 4" +msgstr "ذخیره State شکا٠۴" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +msgid "Save State Slot 5" +msgstr "ذخیره State شکا٠۵" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +msgid "Save State Slot 6" +msgstr "ذخیره State شکا٠۶" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +msgid "Save State Slot 7" +msgstr "ذخیره State شکا٠۷" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +msgid "Save State Slot 8" +msgstr "ذخیره State شکا٠۸" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +msgid "Save State..." +msgstr "ذخیره State..." + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +msgid "Save as..." +msgstr "ذخیره با عنوان" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +msgid "Save compressed GCM/ISO" +msgstr "ذخیره GCM/ISO Ùشرده" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +msgid "Save current perspective" +msgstr "" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +msgid "Save decompressed GCM/ISO" +msgstr "ذخیره GCM/ISO ناهمÙشرده" + +#: Source/Core/Core/Src/Movie.cpp:585 +#, c-format +msgid "Savestate movie %s is corrupted, movie recording stopping..." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +msgid "Scaled EFB Copy" +msgstr "" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +#, c-format +msgid "Scanning %s" +msgstr "" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +msgid "Scanning for ISOs" +msgstr "" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +msgid "Scanning..." +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +msgid "ScrShot" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103 +msgid "Scroll Lock" +msgstr "" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +msgid "Search Filter" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +msgid "Search Subfolders" +msgstr "" + +#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 +#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#, c-format +msgid "Section %s not found in SYSCONF" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +msgid "Select" +msgstr "انتخاب" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "انتخاب سند ضبط شده" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +msgid "Select a Wii WAD file to install" +msgstr "انتخاب سند Wii WAD برای نصب" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +msgid "" +"Select a hardware adapter to use.\n" +"\n" +"If unsure, use the first one." +msgstr "انتخاب آداپتور سخت اÙزاری" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:520 +msgid "Select a save file to import" +msgstr "انتخاب سند Save برای وارد کردن" + +#: Source/Core/DolphinWX/Src/FrameAui.cpp:362 +msgid "Select floating windows" +msgstr "انتخاب پنجره شناور" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +msgid "Select the file to load" +msgstr "انتخاب سند برای بارگیری" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +msgid "Select the save file" +msgstr "انتخاب سند Save" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +msgid "Select the state to load" +msgstr "انتخاب State برای بارگیری" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +msgid "Select the state to save" +msgstr "انتخاب State برای ذخیره" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +msgid "" +"Select what aspect ratio to use when rendering:\n" +"Auto: Use the native aspect ratio\n" +"Force 16:9: Stretch the picture to an aspect ratio of 16:9.\n" +"Force 4:3: Stretch the picture to an aspect ratio of 4:3.\n" +"Stretch to Window: Stretch the picture to the window size.\n" +"\n" +"If unsure, select Auto." +msgstr "" + +#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +msgid "Selected font" +msgstr "دست خط انتخاب شده" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +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" +"\n" +"If unsure, use your desktop resolution.\n" +"If still unsure, use the highest resolution which works for you." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +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" +"Note that the Direct3D backends are only available on Windows.\n" +"\n" +"If unsure, use Direct3D 9." +msgstr "" + +#: Source/Core/DolphinWX/Src/NetWindow.cpp:275 +msgid "Send" +msgstr "Ùرستادن" + +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +msgid "Sensor Bar Position:" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:74 +msgid "Separator" +msgstr "جدا کننده" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +msgid "Serbian" +msgstr "صربستانی" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +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 "" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +msgid "Set as &default ISO" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#, c-format +msgid "Set as default Memcard %c" +msgstr "" + +#: Source/Core/Core/Src/ActionReplay.cpp:462 +#, c-format +msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +msgid "Settings..." +msgstr "تنظیمات" + +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +msgid "SetupWiiMem: Cant find setting file" +msgstr "" + +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +msgid "Shake" +msgstr "لرزش" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +msgid "Short Name:" +msgstr "اسم کوتاه:" + +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:75 +#, fuzzy +msgid "Shoulder Buttons" +msgstr "دکمه ها" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +msgid "Show &Console" +msgstr "نمایش &میز Ùرمان" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +msgid "Show &Log" +msgstr "نمایش &ثبت وقايع" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +msgid "Show &Statusbar" +msgstr "نمایش &نوار وضیعت" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +msgid "Show &Toolbar" +msgstr "نمایش &نوار ابزار" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +msgid "Show Drives" +msgstr "نمایش درایوها" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +msgid "Show EFB Copy Regions" +msgstr "نمایش منطقه Ú©Ù¾ÛŒ EFB" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +msgid "Show FPS" +msgstr "نمایش Ùریم بر سانیه" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +msgid "Show France" +msgstr "نمایش Ùرانسه" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +msgid "Show GameCube" +msgstr "نمایش GameCube" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +msgid "Show Input Display" +msgstr "نمایش ورودی تصویر" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +msgid "Show Italy" +msgstr "نمایش ایتالیا" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +msgid "Show JAP" +msgstr "نمایش ژاپن" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +msgid "Show Korea" +msgstr "نمایش کره" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +msgid "Show Language:" +msgstr "نمایش زبان:" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +msgid "Show Log &Configuration" +msgstr "نمایش ثبت وقايع" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +msgid "Show PAL" +msgstr "نمایش PAL" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +msgid "Show Platforms" +msgstr "نمایش پایگاه" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +msgid "Show Regions" +msgstr "نمایش منطقه" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +msgid "Show Statistics" +msgstr "نمایش آمار" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +msgid "Show Taiwan" +msgstr "نمایش تایوان" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +msgid "Show USA" +msgstr "نمایش آمریکا" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +msgid "Show Wad" +msgstr "نمایش Wad" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +msgid "Show Wii" +msgstr "نمایش Wii" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +msgid "Show a confirmation box before stopping a game." +msgstr "نمایش پنجره تعید قبل از متوق٠کردن بازی" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +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:812 +msgid "Show first block" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +msgid "Show save blocks" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +msgid "Show save comment" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +msgid "Show save icon" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +msgid "Show save title" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +msgid "" +"Show the number of frames rendered per second as a measure of emulation " +"speed.\n" +"\n" +"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 +msgid "Show unknown" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +msgid "" +"Show various statistics.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +msgid "Sideways Wiimote" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +msgid "Simplified Chinese" +msgstr "چینی ساده شده" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 +msgid "Size" +msgstr "سایز" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +msgid "Skip BIOS" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +msgid "Skip Dest. Alpha Pass" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +msgid "Skip EFB Access from CPU" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +msgid "" +"Skip the destination alpha pass used in many games for various graphical " +"effects.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#, c-format +msgid "Slot %i" +msgstr "شکا٠%i" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +msgid "Slot A" +msgstr "شکا٠A" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +msgid "Slot B" +msgstr "شکا٠B" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 +msgid "Snapshot" +msgstr "عکس Ùورى" + +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:52 +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" +"It's only useful for debugging purposes.\n" +"Do you really want to enable software rendering? If unsure, select 'No'." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +msgid "Sound Settings" +msgstr "تنضیمات صدا" + +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#, c-format +msgid "Sound backend %s is not valid." +msgstr "" + +#: Source/Core/AudioCommon/Src/DSoundStream.cpp:59 +#, c-format +msgid "Sound buffer creation failed: %s" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:31 +msgid "Space" +msgstr "Ùضا" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +msgid "Spanish" +msgstr "اسپانیائی" + +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +msgid "Speaker Volume:" +msgstr "حجم صدای اسپیکر" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +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" +"\n" +"If unsure, select 640x528." +msgstr "" + +#: Source/Core/DolphinWX/Src/Main.cpp:144 +msgid "Specify a video backend" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +msgid "Speed up Disc Transfer Rate" +msgstr "" + +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:243 +msgid "Square Stick" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +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:309 +msgid "Start" +msgstr "شروع" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +msgid "Start &NetPlay" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +msgid "Start Re&cording" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +msgid "Start Recording" +msgstr "" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 +msgid "State" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +msgid "State Saves" +msgstr "" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 +msgid "Stick" +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:312 +msgid "Stop" +msgstr "توقÙ" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +msgid "Stretch to Window" +msgstr "" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43 +msgid "Strum" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:75 +msgid "Subtract" +msgstr "کاستن" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77 +#, c-format +msgid "Successfully exported file to %s" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56 +msgid "Successfully imported save files" +msgstr "" + +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +msgid "Swing" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +msgid "System Language:" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +msgid "TAIWAN" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 +#, fuzzy +msgid "TAS Input" +msgstr "ورودی" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28 +msgid "Tab" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameAui.cpp:509 +msgid "Tab split" +msgstr "" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37 +msgid "Table Left" +msgstr "" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38 +msgid "Table Right" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +msgid "Take Screenshot" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +msgid "Test" +msgstr "محک زدن" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +msgid "Texture Cache" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +msgid "Texture Format Overlay" +msgstr "" + +#: Source/Core/Core/Src/CoreParameter.cpp:228 +msgid "The WAD has been installed successfully" +msgstr "" + +#: Source/Core/Core/Src/ActionReplay.cpp:197 +msgid "The address is invalid" +msgstr "آدرس بی اعتبار است" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:509 +msgid "The checksum was successfully fixed" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "The chosen directory is already in the list" +msgstr "" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#, c-format +msgid "" +"The file %s already exists.\n" +"Do you wish to replace it?" +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 "" + +#: Source/Core/AudioCommon/Src/WaveFile.cpp:44 +#, c-format +msgid "The file %s was already open, the file header will not be written." +msgstr "" + +#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#, c-format +msgid "The file you specified (%s) does not exist" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameAui.cpp:627 +msgid "The name can not be empty" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameAui.cpp:619 +msgid "The name can not contain the character ','" +msgstr "" + +#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:141 +msgid "The resulting decrypted AR code doesn't contain any lines." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +msgid "The save you are trying to copy has an invalid file size" +msgstr "" + +#: Source/Core/DolphinWX/Src/Main.cpp:353 +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 "" + +#: Source/Core/Core/Src/NetPlayClient.cpp:40 +msgid "The server is full!" +msgstr "" + +#: Source/Core/Core/Src/NetPlayClient.cpp:46 +msgid "The server responded: the game is currently running!" +msgstr "" + +#: Source/Core/Core/Src/NetPlayClient.cpp:49 +msgid "The server sent an unknown error message!" +msgstr "" + +#: Source/Core/Core/Src/CoreParameter.cpp:122 +#, c-format +msgid "The specified file \"%s\" does not exist" +msgstr "" + +#: Source/Core/Core/Src/ActionReplay.cpp:198 +msgid "The value is invalid" +msgstr "مقدار بی اعتبار است" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +msgid "Theme" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 +msgid "Theme selection went wrong" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +msgid "" +"There must be a ticket for 00000001/00000002. Your NAND dump is probably " +"incomplete." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +msgid "" +"These settings override core Dolphin settings.\n" +"Undetermined means the game uses Dolphin's setting." +msgstr "" + +#: Source/Core/Core/Src/ActionReplay.cpp:356 +msgid "" +"This action replay simulator does not support codes that modify Action " +"Replay itself." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "This could cause slow down in Wii Menu and some games." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +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 "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +msgid "This is used to play music tracks, like BGM." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +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." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +msgid "This will let you Manually Edit the INI config file" +msgstr "" + +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:249 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254 +msgid "Threshold" +msgstr "" + +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +msgid "Tilt" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 +msgid "Title" +msgstr "عنوان" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:114 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:133 +msgid "To" +msgstr "به" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +msgid "Toggle All Log Types" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: 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:274 +msgid "Top" +msgstr "اوج" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +msgid "Traditional Chinese" +msgstr "چینی سنتی" + +#: Source/Core/Core/Src/Boot/Boot.cpp:407 +msgid "Tried to load an unknown file type." +msgstr "" + +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 +msgid "Triggers" +msgstr "" + +#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +msgid "Trying to read from invalid SYSCONF" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:43 +msgid "" +"Trying to read from invalid SYSCONF\n" +"Wiimote bt ids are not available" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +msgid "Turkish" +msgstr "ترکی" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29 +msgid "Turntable" +msgstr "ديسک" + +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:70 +msgid "Type" +msgstr "نوع" + +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +msgid "UDP Port:" +msgstr "" + +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +msgid "UDP Wiimote" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +msgid "UNKNOWN" +msgstr "ناشناخته" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +msgid "USA" +msgstr "آمریکا" + +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:224 +msgid "" +"Unable to create patch from given values.\n" +"Entry not modified." +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" +"Would you like to ignore this line and continue parsing?" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#, c-format +msgid "Undefined %i" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +msgid "Undo Load State" +msgstr "" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +msgid "Unknown" +msgstr "ناشناخته" + +#: Source/Core/Core/Src/HW/DVDInterface.cpp:894 +#, c-format +msgid "Unknown DVD command %08x - fatal error" +msgstr "" + +#: Source/Core/Common/Src/SysConf.cpp:145 +#, c-format +msgid "Unknown entry type %i in SYSCONF (%s@%x)!" +msgstr "" + +#: Source/Core/Core/Src/NetPlayClient.cpp:228 +#, c-format +msgid "Unknown message received with id : %d" +msgstr "" + +#: Source/Core/Core/Src/NetPlayServer.cpp:504 +#, c-format +msgid "Unknown message with id:%d received from player:%d Kicking player!" +msgstr "" + +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 +msgid "Up" +msgstr "بالا" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +msgid "Update" +msgstr "به روز کردن" + +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +msgid "Upright Wiimote" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +msgid "Use EuRGB60 Mode (PAL60)" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +msgid "Use Fullscreen" +msgstr "" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 +msgid "Use Hex" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +msgid "Use Panic Handlers" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +msgid "" +"Use multiple threads to decode textures.\n" +"Might result in a speedup (especially on CPUs with more than two cores).\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +msgid "Utility" +msgstr "کاربردی" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 +msgid "V-Sync" +msgstr "" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +msgid "Value" +msgstr "مقدار" + +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72 +msgid "Value:" +msgstr "مقدار:" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 +msgid "Value: " +msgstr "مقدار:" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +msgid "Verbosity" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +msgid "Video" +msgstr "ویدیو" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +msgid "Virtual" +msgstr "مجازی" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +msgid "Volume" +msgstr "حجم صدا" + +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#, c-format +msgid "WAD installation failed: error creating %s" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +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 "" + +#: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 +msgid "Warning" +msgstr "اختار" + +#: Source/Core/Core/Src/Boot/Boot.cpp:272 +msgid "Warning - starting DOL in wrong console mode!" +msgstr "" + +#: Source/Core/Core/Src/Boot/Boot.cpp:322 +msgid "Warning - starting ELF in wrong console mode!" +msgstr "" + +#: Source/Core/Core/Src/Boot/Boot.cpp:217 +msgid "Warning - starting ISO in wrong console mode!" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519 +#, c-format +msgid "" +"Warning! it is advised to backup all files in the folder:\n" +"%s\n" +"Do you wish to continue?" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#, c-format +msgid "" +"Warning: This will overwrite any existing saves that are in the folder:\n" +"%s\n" +"and have the same name as a file on your memcard\n" +"Continue?" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:629 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, 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" +"\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" +"\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" +msgstr "" + +#: Source/Core/AudioCommon/Src/WaveFile.cpp:106 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +msgid "WaveFileWriter - file not open." +msgstr "" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56 +msgid "Whammy" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +msgid "Widescreen Hack" +msgstr "" + +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +msgid "Width" +msgstr "عرض" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +msgid "Wii" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +msgid "Wii Console" +msgstr "ميز Ùرمان Wii" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +msgid "Wii NAND Root:" +msgstr "ریشه Wii NAND:" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +msgid "Wii Save Import" +msgstr "وارد کردن Wii Save" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +msgid "Wii save files (*.bin)|*.bin" +msgstr "سند Wii save (*.bin)|*.bin" + +#: Source/Core/DiscIO/Src/WiiWad.cpp:81 +msgid "WiiWAD: Could not read from file" +msgstr "WiiWAD: قادر به خواندن از سند نیست" + +#: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +msgid "Wiimote" +msgstr "" + +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#, fuzzy, c-format +msgid "Wiimote %i" +msgstr "اتصال Wiimote %i" + +#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#, c-format +msgid "" +"Wiimote %i has been disconnected by system.\n" +"Maybe this game doesn't support multi-wiimote,\n" +"or maybe it is due to idle time out or other reason.\n" +"Do you want to reconnect immediately?" +msgstr "" + +#: Source/Core/DolphinWX/Src/Main.cpp:598 +msgid "Wiimote Connected" +msgstr "Wiimote متصل شد" + +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +msgid "Wiimote Motor" +msgstr "موتور Wiimote" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +msgid "Wiimote settings" +msgstr "تنضیمات Wiimote" + +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#, fuzzy +msgid "Wiimotes" +msgstr "Wiimote واقعی" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:131 +msgid "Windows Left" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:133 +msgid "Windows Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:132 +msgid "Windows Right" +msgstr "" + +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +msgid "Word Wrap" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +msgid "Working..." +msgstr "در حال کار کردن..." + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +msgid "Write to Console" +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +msgid "Write to File" +msgstr "" + +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +msgid "Write to Window" +msgstr "" + +#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60 +#, c-format +msgid "XAudio2 CreateSourceVoice failed: %#X" +msgstr "" + +#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114 +#, c-format +msgid "XAudio2 init failed: %#X" +msgstr "" + +#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124 +#, c-format +msgid "XAudio2 master voice creation failed: %#X" +msgstr "" + +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21 +msgid "Yellow" +msgstr "زرد" + +#: Source/Core/Core/Src/DSP/DSPCore.cpp:107 +msgid "" +"You are using free dsp roms made by Dolphin Team.\n" +"Only Zelda ucode games will work correctly with them.\n" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameAui.cpp:72 +msgid "You can't close panes that have pages in them." +msgstr "" + +#: Source/Core/DolphinWX/Src/NetWindow.cpp:194 +msgid "You must choose a game!!" +msgstr "شما باید بازی را انتخاب کنید!!" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 +msgid "You must enter a name!" +msgstr "شما باید اسم را وارد کنید!" + +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +msgid "You must enter a valid decimal, hexadecimal or octal value." +msgstr "" + +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +msgid "You must enter a valid profile name." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +msgid "You must restart Dolphin in order for the change to take effect." +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 "" + +#: Source/Core/Common/Src/SysConf.cpp:58 +#, c-format +msgid "" +"Your SYSCONF file is the wrong size.\n" +"It should be 0x%04x (but is 0x%04llx)\n" +"Do you want to generate a new one?" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +msgid "ZTP hack" +msgstr "" + +#: Source/Core/Core/Src/ActionReplay.cpp:388 +msgid "Zero 3 code not supported" +msgstr "" + +#: Source/Core/Core/Src/ActionReplay.cpp:410 +#, c-format +msgid "Zero code unknown to dolphin: %08x" +msgstr "" + +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +msgid "[ waiting ]" +msgstr "[انتظار]" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +msgid "" +"[BROKEN]\n" +"Highlight regions the EFB was copied from.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/PHackSettings.cpp:90 +msgid "[Custom]" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +msgid "" +"[EXPERIMENTAL]\n" +"Speeds up emulation a bit by caching display lists.\n" +"Possibly causes issues though.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +msgid "^ ADD" +msgstr "^ اضاÙÙ‡ کردن" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +msgid "apploader (.img)" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185 +msgid "failed to read bk header" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375 +#, c-format +msgid "failed to read data from file: %s" +msgstr "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97 +msgid "failed to read header" +msgstr "" + +#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#, c-format +msgid "iCacheJIT: Reading Opcode from %x. Please report." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108 +#, c-format +msgid "not a wii save or read failure for file header size %x" +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:461 +msgid "s" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#, c-format +msgid "unknown cmd 0x%08x" +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +msgid "wxExecute returned -1 on application run!" +msgstr "" + +#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55 +msgid "zFar Correction: " +msgstr "" + +#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50 +msgid "zNear Correction: " +msgstr "" + +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +msgid "| OR" +msgstr "" + +#~ msgid "Connected to %i Wiimotes" +#~ msgstr "اتصال به Wiimotes %i" + +#~ msgid "Danish" +#~ msgstr "دانمارکی" + +#~ msgid "" +#~ "Dolphin has not been configured with an install location,\n" +#~ "Keep Dolphin portable?" +#~ msgstr "" +#~ "دلÙین با مکان نصب شده پيکربندى نشده است.\n" +#~ "دلÙین را Portable نگاه دارم؟" + +#~ msgid "Hide Shader Errors" +#~ msgstr "مخÙÛŒ کردن خطاهای Shader" + +#~ msgid "Input Source" +#~ msgstr "منبع ورودی" + +#~ msgid "Install directory could not be saved" +#~ msgstr "نصب پوشه قابل ذخیره شدن نیست" diff --git a/Languages/po/hu.po b/Languages/po/hu.po index 13710600e6..d39eec28db 100644 --- a/Languages/po/hu.po +++ b/Languages/po/hu.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-12-18 13:39-0600\n" -"PO-Revision-Date: 2011-06-04 14:29+0100\n" +"PO-Revision-Date: 2011-12-18 13:41-0600\n" "Last-Translator: Delirious \n" "Language-Team: Delirious \n" "Language: Hungarian\n" @@ -58,9 +58,9 @@ msgid "%d Hz" msgstr "%d Hz" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 -#, fuzzy, c-format +#, c-format msgid "%i connected" -msgstr "Leválasztva" +msgstr "%i csatlakoztatva" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296 @@ -74,22 +74,22 @@ msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s tisztítása sikertelen. Valószínűleg a képfájl sérült." #: Source/Core/Core/Src/HW/GCMemcard.cpp:97 -#, fuzzy, c-format +#, c-format msgid "" "%s failed to load as a memorycard \n" " Card file size is invalid (0x%x bytes)" msgstr "" -"A memóriakártya betöltése sikertelen\n" -" A kártya mérete nem megfelelÅ‘ (%04X)" +"%s memóriakártyakénti betöltése sikertelen\n" +" A kártya fájlmérete nem megfelelÅ‘ (0x%x bájt)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:112 -#, fuzzy, c-format +#, c-format msgid "" "%s failed to load as a memorycard \n" " Card size is invalid (0x%x bytes)" msgstr "" -"A memóriakártya betöltése sikertelen\n" -" A kártya mérete nem megfelelÅ‘ (%04X)" +"%s memóriakártyakénti betöltése sikertelen\n" +" A kártya mérete nem megfelelÅ‘ (0x%x bájt)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format @@ -97,6 +97,9 @@ 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 memóriakártyakénti betöltése sikertelen\n" +"a fájl nem elég nagy ahhoz, hogy megfelelÅ‘ memóriakártya fájl lehessen (0x%x " +"bájt)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -426,7 +429,6 @@ msgid "Accurate VBeam emulation" msgstr "Pontos VBeam emuláció" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -#, fuzzy msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -438,7 +440,7 @@ msgstr "" "Néhány játék számára elengedhetetlen bizonyos grafikai effektushoz vagy a " "játszhatóság végett.\n" "\n" -"Ha bizonytalan vagy, válaszd az EFB textúrába lehetÅ‘séget inkább." +"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 @@ -654,9 +656,8 @@ msgstr "" "Ha bizonytalan vagy, hagyd kijelöletlenül." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -#, fuzzy msgid "Alternate Wiimote Timing" -msgstr "Emulált Wiimote" +msgstr "Változtatható Wiimote idÅ‘zítés" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -892,9 +893,8 @@ msgid "Buttons" msgstr "Gombok" #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:61 -#, fuzzy msgid "C Stick" -msgstr "C-kar" +msgstr "C kar" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" @@ -957,14 +957,15 @@ msgid "Cannot unregister events with events pending" msgstr "Nem lehet események bejegyzéseket törölni függÅ‘ben lévÅ‘ eseményekkel" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 -#, fuzzy, c-format +#, c-format msgid "" "Cannot use that file as a memory card.\n" "%s\n" "is not a valid gamecube memory card file" 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?" +"%s\n" +"fájl nem megfelelÅ‘ GameCube memóriakártya fájl" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" @@ -1376,7 +1377,7 @@ msgstr "KészítÅ‘:" #: Source/Core/Common/Src/MsgHandler.cpp:68 msgid "Critical" -msgstr "" +msgstr "Kritikus" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" @@ -2731,7 +2732,6 @@ msgid "Greater Than" msgstr "Nagyobb mint" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -#, fuzzy msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -3458,7 +3458,7 @@ msgstr "" #: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" -msgstr "" +msgstr "A memóriakártya fájlmérete nem egyezik a fejléc méretével" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:47 msgid "Menu" @@ -4097,9 +4097,8 @@ msgid "Real Wiimote" msgstr "Valódi Wiimote" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 -#, fuzzy msgid "Real Wiimotes" -msgstr "Valódi Wiimote" +msgstr "Valódi Wiimote-ok" #: Source/Core/DolphinWX/Src/Frame.cpp:163 msgid "Reconnect Wiimote Confirm" @@ -4509,9 +4508,8 @@ msgid "Short Name:" msgstr "Rövid cím:" #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:75 -#, fuzzy msgid "Shoulder Buttons" -msgstr "Gombok" +msgstr "Oldalsó gombok" #: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "Show &Console" @@ -4912,9 +4910,8 @@ msgstr "TAJVAN" #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 -#, fuzzy msgid "TAS Input" -msgstr "Bemenet" +msgstr "TAS bemenet" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:28 msgid "Tab" @@ -5248,6 +5245,8 @@ msgid "" "Unable to create patch from given values.\n" "Entry not modified." msgstr "" +"A megadott értékek alapján nem sikerült a patch létrehozása.\n" +"Bejegyzés módosítás nem történt." #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:123 #, c-format @@ -5532,9 +5531,9 @@ msgid "Wiimote" msgstr "Wiimote" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 -#, fuzzy, c-format +#, c-format msgid "Wiimote %i" -msgstr "Wiimote" +msgstr "Wiimote %i" #: Source/Core/DolphinWX/Src/Frame.cpp:162 #, c-format @@ -5562,7 +5561,6 @@ msgid "Wiimote settings" msgstr "Wiimote beállítások" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 -#, fuzzy msgid "Wiimotes" msgstr "Wiimote" @@ -5624,6 +5622,8 @@ msgid "" "You are using free dsp roms made by Dolphin Team.\n" "Only Zelda ucode games will work correctly with them.\n" msgstr "" +"A Dolphin Team által készített szabadon használható dsp romokat használsz.\n" +"Csak a Zelda ucode játékok működnek megfelelÅ‘en a használatával.\n" #: Source/Core/DolphinWX/Src/FrameAui.cpp:72 msgid "You can't close panes that have pages in them." @@ -5890,6 +5890,9 @@ msgstr "| VAGY" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "%s nem nyitható meg, hiányzik egy szükséges funkció" +#~ msgid "Cannot record movies in read-only mode." +#~ msgstr "A mozgások rögzítése nem lehetséges írásvédett módban." + #~ msgid "Config..." #~ msgstr "Beállítások..." diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index c364267362..01b3496e2b 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -55,6 +55,7 @@ static const wxLanguage langIds[] = wxLANGUAGE_CZECH, wxLANGUAGE_DUTCH, wxLANGUAGE_ENGLISH, + wxLANGUAGE_FARSI, wxLANGUAGE_FRENCH, wxLANGUAGE_GERMAN, wxLANGUAGE_GREEK, @@ -294,6 +295,7 @@ void CConfigMain::InitializeGUILists() arrayStringFor_InterfaceLang.Add(_("Czech")); arrayStringFor_InterfaceLang.Add(_("Dutch")); arrayStringFor_InterfaceLang.Add(_("English")); + arrayStringFor_InterfaceLang.Add(_("Farsi")); arrayStringFor_InterfaceLang.Add(_("French")); arrayStringFor_InterfaceLang.Add(_("German")); arrayStringFor_InterfaceLang.Add(_("Greek")); From 6f27a29d51265bee469a722240c6abff5eb57443 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Mon, 19 Dec 2011 00:54:45 +0100 Subject: [PATCH 194/381] Prefer static libs from Externals on OS X. Several people had trouble building against systemwide installed libs. And even if the build succeeds, the resulting bundle would not work on other Macs. --- CMakeLists.txt | 46 ++++++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d9addeb58..46e7f2b75c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -288,7 +288,7 @@ else() endif() if(X11_FOUND) -check_lib(XRANDR Xrandr) + check_lib(XRANDR Xrandr) endif() if(XRANDR_FOUND) add_definitions(-DHAVE_XRANDR=1) @@ -358,23 +358,27 @@ include_directories(Source/Core/VideoUICommon/Src) add_subdirectory(Externals/Bochs_disasm) include_directories(Externals/Bochs_disasm) -check_lib(LZO lzo2 lzo/lzo1x.h QUIET) +if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + check_lib(LZO lzo2 lzo/lzo1x.h QUIET) +endif() if(LZO_FOUND) message("Using shared lzo") else() - message("Shared lzo not found, falling back to the static library") + message("Using static lzo from Externals") add_subdirectory(Externals/LZO) include_directories(Externals/LZO) set(LZO lzo2) endif() -include(FindSDL OPTIONAL) +if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + include(FindSDL OPTIONAL) +endif() if(SDL_FOUND) message("Using shared SDL") include_directories(${SDL_INCLUDE_DIR}) else(SDL_FOUND) # TODO: Use the prebuilt one on Windows - message("Shared SDL not found, falling back to the static library") + message("Using static SDL from Externals") include_directories(Externals/SDL Externals/SDL/include) add_subdirectory(Externals/SDL) endif(SDL_FOUND) @@ -382,20 +386,24 @@ endif(SDL_FOUND) set(SFML_FIND_VERSION TRUE) set(SFML_FIND_VERSION_MAJOR 1) set(SFML_FIND_VERSION_MINOR 5) -include(FindSFML OPTIONAL) +if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + include(FindSFML OPTIONAL) +endif() if(SFML_FOUND AND NOT SFML_VERSION_MAJOR) # SFML 1.x doesn't define SFML_VERSION_MAJOR message("Using shared SFML") else() - message("Shared SFML < 2.0 not found, falling back to the static library") + message("Using static SFML ${SFML_FIND_VERSION_MAJOR}.${SFML_FIND_VERSION_MINOR} from Externals") add_subdirectory(Externals/SFML) include_directories(Externals/SFML/include) endif() -check_lib(SOIL SOIL SOIL/SOIL.h QUIET) +if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + check_lib(SOIL SOIL SOIL/SOIL.h QUIET) +endif() if(SOIL_FOUND) message("Using shared SOIL") else() - message("Shared SOIL not found, falling back to the static library") + message("Using static SOIL from Externals") add_subdirectory(Externals/SOIL) include_directories(Externals/SOIL) endif() @@ -419,16 +427,20 @@ if(WIN32) find_library(GLEW glew32s PATHS Externals/GLew) include_directories(Externals/GLew/include) else() - check_lib(GLEW GLEW GL/glew.h) + if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + check_lib(GLEW GLEW GL/glew.h) + endif() if(NOT GLEW_FOUND) - message("Shared GLEW not found, falling back to the static library") + message("Using static GLEW from Externals") add_subdirectory(Externals/GLew) include_directories(Externals/GLew/include) endif(NOT GLEW_FOUND) - check_lib(CG Cg Cg/cg.h) + if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + check_lib(CG Cg Cg/cg.h) + endif() if(NOT CG_FOUND) - message("Shared Cg not found, falling back to the static library") + message("Using static Cg from Externals") include_directories(Externals) endif(NOT CG_FOUND) check_lib(CGGL CgGL Cg/cgGL.h) @@ -444,8 +456,10 @@ endif() option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF) if(NOT DISABLE_WX) - include(FindwxWidgets OPTIONAL) - FIND_PACKAGE(wxWidgets COMPONENTS core aui adv) + if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + include(FindwxWidgets OPTIONAL) + FIND_PACKAGE(wxWidgets COMPONENTS core aui adv) + endif() if(wxWidgets_FOUND) EXECUTE_PROCESS( @@ -491,7 +505,7 @@ if(NOT DISABLE_WX) if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") message(FATAL_ERROR "wxWidgets not found. It is required to build the GUI") endif() - message("Shared wxWidgets not found, falling back to the static library") + message("Using static wxWidgets from Externals") if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") add_definitions(-D__WXOSX_COCOA__) include_directories(Externals/wxWidgets3) From 15dac4584f74bf925d52e5416c558b81e8916b5c Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Mon, 19 Dec 2011 02:57:00 +0100 Subject: [PATCH 195/381] Override PATH on OS X to avoid picking up pkg-config from MacPorts. --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 46e7f2b75c..80584b2555 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,6 +118,7 @@ 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") From 4a88d5ae9318decd4bf76152200fbf92b3bdb035 Mon Sep 17 00:00:00 2001 From: nitsuja Date: Sun, 18 Dec 2011 19:30:04 -0800 Subject: [PATCH 196/381] fix for wiimote dying if you use savesetates too fast (by dying I mean all wiimote slots permanently disconnecting until emulation reset) --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp | 2 +- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 24da87c257..dbd450785d 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 @@ -129,7 +129,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::DoState(PointerWrap &p) // Reset the connection of all connected wiimotes for (unsigned int i = 0; i < 4; i++) { - if (m_WiiMotes[i].IsConnected()) + if (!m_WiiMotes[i].IsInactive()) { m_WiiMotes[i].Activate(false); m_WiiMotes[i].Activate(true); 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 21a7d7e1bd..f3180c7dc9 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 @@ -59,6 +59,7 @@ public: // we really have to clean all this code bool IsConnected() const { return m_ConnectionState == CONN_COMPLETE; } + bool IsInactive() const { return m_ConnectionState == CONN_INACTIVE; } bool LinkChannel(); void ResetChannels(); void Activate(bool ready); From 567e90bbd58599934bede69eb3f72c36493d4370 Mon Sep 17 00:00:00 2001 From: nitsuja Date: Sun, 18 Dec 2011 20:38:54 -0800 Subject: [PATCH 197/381] fix for an un-threadsafe call to UpdateGUI (oops) --- Source/Core/DolphinWX/Src/Frame.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 846971e884..e7c4fca067 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -863,8 +863,12 @@ int GetCmdForHotkey(unsigned int key) void OnAfterLoadCallback() { + // warning: this gets called from the CPU thread, so we should only queue things to do on the proper thread if(main_frame) - main_frame->UpdateGUI(); + { + wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATEGUI); + main_frame->GetEventHandler()->AddPendingEvent(event); + } } void TASManipFunction(SPADStatus *PadStatus, int controllerID) From a73ad3554c8a33762d97dacd52bf38e888ab8d43 Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Sun, 18 Dec 2011 21:42:20 -0800 Subject: [PATCH 198/381] add the function to read all unicode gamenames from a wad file --- Source/Core/DiscIO/Src/Volume.h | 1 + Source/Core/DiscIO/Src/VolumeWad.cpp | 45 +++++++++++++++++++++++++++- Source/Core/DiscIO/Src/VolumeWad.h | 1 + 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/Source/Core/DiscIO/Src/Volume.h b/Source/Core/DiscIO/Src/Volume.h index f1bb5d3773..ec20e47b6c 100644 --- a/Source/Core/DiscIO/Src/Volume.h +++ b/Source/Core/DiscIO/Src/Volume.h @@ -38,6 +38,7 @@ public: virtual std::string GetUniqueID() const = 0; virtual std::string GetMakerID() const = 0; virtual std::string GetName() const = 0; + virtual bool GetWName(std::vector& _rwNames) const {return false;}; virtual u32 GetFSTSize() const = 0; virtual std::string GetApploaderDate() const = 0; diff --git a/Source/Core/DiscIO/Src/VolumeWad.cpp b/Source/Core/DiscIO/Src/VolumeWad.cpp index 5fd81cca8b..0cdfc85925 100644 --- a/Source/Core/DiscIO/Src/VolumeWad.cpp +++ b/Source/Core/DiscIO/Src/VolumeWad.cpp @@ -107,6 +107,45 @@ bool CVolumeWAD::GetTitleID(u8* _pBuffer) const return true; } +bool CVolumeWAD::GetWName(std::vector& _rwNames) const +{ + u32 footer_size; + + if (!Read(0x1C, 4, (u8*)&footer_size)) + { + return false; + } + //Japanese, English, German, French, Spanish, Italian, Dutch, unknown, unknown, Korean + + // Offset to the english title + for (int i = 0; i < 10; i++) + { + u16 temp[42]; + std::wstring out_temp; + + if (!Read(0x9C + (i*84) + OpeningBnrOffset, 84, (u8*)&temp) || Common::swap32(footer_size) < 0xF1 + || !temp[0]) + { + _rwNames.push_back(L""); + continue; + } + for (int i = 0; i < 42; ++i) + { + u16 t = Common::swap16(temp[i]); + if (t == 0 && i > 0) + { + if (out_temp.at(out_temp.size()-1) != ' ') + out_temp.push_back(' '); + } + else + out_temp.push_back(t); + } + + _rwNames.push_back(out_temp); + } + return true; +} + std::string CVolumeWAD::GetName() const { u32 footer_size; @@ -114,9 +153,13 @@ std::string CVolumeWAD::GetName() const if (!Read(0x1C, 4, (u8*)&footer_size)) return ""; + + //Japanese, English, German, French, Spanish, Italian, Dutch, unknown, unknown, Korean + // Offset to the english title char temp[84]; - if (!Read(0xF1 + OpeningBnrOffset, 84, (u8*)&temp) || Common::swap32(footer_size) < 0xF1) + if (!Read(0xF1 + OpeningBnrOffset, 84, (u8*)&temp) || Common::swap32(footer_size) < 0xF1 || + !Common::swap16(temp[0])) return ""; // Remove the null bytes due to 16bit char length diff --git a/Source/Core/DiscIO/Src/VolumeWad.h b/Source/Core/DiscIO/Src/VolumeWad.h index 06bd772699..956844acd1 100644 --- a/Source/Core/DiscIO/Src/VolumeWad.h +++ b/Source/Core/DiscIO/Src/VolumeWad.h @@ -39,6 +39,7 @@ public: std::string GetUniqueID() const; std::string GetMakerID() const; std::string GetName() const; + bool GetWName(std::vector& _rwNames) const; u32 GetFSTSize() const { return 0; } std::string GetApploaderDate() const { return "0"; } ECountry GetCountry() const; From 7f4efa094ee23b05bb349a333ef55ae0d5276a6c Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Sun, 18 Dec 2011 21:56:13 -0800 Subject: [PATCH 199/381] add the function to read the game name and description from the banner as unicode --- Source/Core/DiscIO/Src/BannerLoader.h | 3 +- Source/Core/DiscIO/Src/BannerLoaderWii.cpp | 38 ++++++++++++++++++++++ Source/Core/DiscIO/Src/BannerLoaderWii.h | 3 ++ 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/Source/Core/DiscIO/Src/BannerLoader.h b/Source/Core/DiscIO/Src/BannerLoader.h index 02d60858e4..1fe48dd364 100644 --- a/Source/Core/DiscIO/Src/BannerLoader.h +++ b/Source/Core/DiscIO/Src/BannerLoader.h @@ -39,10 +39,11 @@ class IBannerLoader virtual bool GetBanner(u32* _pBannerImage) = 0; virtual bool GetName(std::string* _rName) = 0; - + virtual bool GetName(std::vector& _rNames) {return false;}; virtual bool GetCompany(std::string& _rCompany) = 0; virtual bool GetDescription(std::string* _rDescription) = 0; + virtual bool GetDescription(std::wstring& _rDescription) {return false;}; protected: diff --git a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp index 9c02ef8d08..88a660c739 100644 --- a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp +++ b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp @@ -164,6 +164,26 @@ bool CBannerLoaderWii::GetName(std::string* _rName) return false; } +bool CBannerLoaderWii::GetName(std::vector& _rNames) +{ + if (IsValid()) + { + // find Banner type + SWiiBanner* pBanner = (SWiiBanner*)m_pBannerFile; + + std::wstring temp; + for (int i = 0; i < WII_BANNER_COMMENT_SIZE; ++i) + { + temp.push_back(Common::swap16(pBanner->m_Comment[0][i])); + } + temp.push_back('\0'); + _rNames.push_back(temp); + return true; + } + + return false; +} + bool CBannerLoaderWii::GetCompany(std::string& _rCompany) { _rCompany = "N/A"; @@ -190,6 +210,24 @@ bool CBannerLoaderWii::GetDescription(std::string* _rDescription) return false; } +bool CBannerLoaderWii::GetDescription(std::wstring& _rDescription) +{ + if (IsValid()) + { + // find Banner type + SWiiBanner* pBanner = (SWiiBanner*)m_pBannerFile; + + std::wstring description; + for (int i = 0; i < WII_BANNER_COMMENT_SIZE; ++i) + description.push_back(Common::swap16(pBanner->m_Comment[1][i])); + + description.push_back('\0'); + _rDescription = description; + return true; + } + return false; +} + void CBannerLoaderWii::decode5A3image(u32* dst, u16* src, int width, int height) { for (int y = 0; y < height; y += 4) diff --git a/Source/Core/DiscIO/Src/BannerLoaderWii.h b/Source/Core/DiscIO/Src/BannerLoaderWii.h index fb28f5a2e0..bfc87dc19e 100644 --- a/Source/Core/DiscIO/Src/BannerLoaderWii.h +++ b/Source/Core/DiscIO/Src/BannerLoaderWii.h @@ -37,10 +37,13 @@ class CBannerLoaderWii virtual bool GetName(std::string* _rName); + bool GetName(std::vector& _rNames); + virtual bool GetCompany(std::string& _rCompany); virtual bool GetDescription(std::string* _rDescription); + bool GetDescription(std::wstring& _rDescription); private: From de4e3e7462c86c2eac4383d80dd917a81a9a6cfa Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Sun, 18 Dec 2011 22:01:46 -0800 Subject: [PATCH 200/381] add wstring name(s)/description to the cachefile, use when available in gamelist and properties window --- Source/Core/Common/Src/ChunkFile.h | 16 ++- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 95 ++++++++-------- Source/Core/DolphinWX/Src/ISOFile.cpp | 100 +++++++++++++++-- Source/Core/DolphinWX/Src/ISOFile.h | 4 + Source/Core/DolphinWX/Src/ISOProperties.cpp | 116 ++++++++++++-------- 5 files changed, 226 insertions(+), 105 deletions(-) diff --git a/Source/Core/Common/Src/ChunkFile.h b/Source/Core/Common/Src/ChunkFile.h index b0662d2517..4ed781dcbd 100644 --- a/Source/Core/Common/Src/ChunkFile.h +++ b/Source/Core/Common/Src/ChunkFile.h @@ -154,7 +154,21 @@ public: } (*ptr) += stringLen; } - + + void Do(std::wstring &x) + { + int stringLen = sizeof(wchar_t)*((int)x.length() + 1); + Do(stringLen); + + switch (mode) { + 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; + } + (*ptr) += stringLen; + } + template void DoArray(T *x, int count) { DoVoid((void *)x, sizeof(T) * count); diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 05f8c8365a..22fdd89a8d 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -465,61 +465,62 @@ void CGameListCtrl::InsertItemInReportView(long _Index) // Set the game's banner in the second column SetItemColumnImage(_Index, COLUMN_BANNER, ImageIndex); + + std::wstring wname; + const std::wstring& wdescription = rISOFile.GetDescription(); + std::string company; - if (rISOFile.GetPlatform() != GameListItem::WII_WAD) + // We show the company string on Gamecube only + // On Wii we show the description instead as the company string is empty + if (rISOFile.GetPlatform() == GameListItem::GAMECUBE_DISC) + company = rISOFile.GetCompany().c_str(); + + switch (rISOFile.GetCountry()) { - std::string company; - - // We show the company string on Gamecube only - // On Wii we show the description instead as the company string is empty - if (rISOFile.GetPlatform() == GameListItem::GAMECUBE_DISC) - company = rISOFile.GetCompany().c_str(); - - switch (rISOFile.GetCountry()) + case DiscIO::IVolume::COUNTRY_TAIWAN: + case DiscIO::IVolume::COUNTRY_JAPAN: { - case DiscIO::IVolume::COUNTRY_TAIWAN: - case DiscIO::IVolume::COUNTRY_JAPAN: - { - wxString name = wxString(rISOFile.GetName(0).c_str(), SJISConv); - m_gameList.append(StringFromFormat("%s (J)\n", (const char *)name.c_str())); - SetItem(_Index, COLUMN_TITLE, name, -1); - SetItem(_Index, COLUMN_NOTES, wxString(company.size() ? - company.c_str() : rISOFile.GetDescription(0).c_str(), - SJISConv), -1); - } - break; - case DiscIO::IVolume::COUNTRY_USA: - m_gameList.append(StringFromFormat("%s (U)\n", rISOFile.GetName(0).c_str())); - SetItem(_Index, COLUMN_TITLE, - wxString::From8BitData(rISOFile.GetName(0).c_str()), -1); - SetItem(_Index, COLUMN_NOTES, - wxString::From8BitData(company.size() ? - company.c_str() : rISOFile.GetDescription(0).c_str()), -1); - break; - default: - m_gameList.append(StringFromFormat("%s (E)\n", - rISOFile.GetName(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str())); - SetItem(_Index, COLUMN_TITLE, - wxString::From8BitData( - rISOFile.GetName(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str()), - -1); - SetItem(_Index, COLUMN_NOTES, - wxString::From8BitData(company.size() ? - company.c_str() : - rISOFile.GetDescription(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str()), - -1); - break; + rISOFile.GetName(wname, -1); + wxString name = wxString(rISOFile.GetName(0).c_str(), SJISConv); + m_gameList.append(StringFromFormat("%s (J)\n", (const char *)name.c_str())); + SetItem(_Index, COLUMN_TITLE, name, -1); + SetItem(_Index, COLUMN_NOTES, wxString(company.size() ? + company.c_str() : rISOFile.GetDescription(0).c_str(), + SJISConv), -1); } - } - else // It's a Wad file - { - m_gameList.append(StringFromFormat("%s (WAD)\n", rISOFile.GetName(0).c_str())); + break; + case DiscIO::IVolume::COUNTRY_USA: + rISOFile.GetName(wname); SetItem(_Index, COLUMN_TITLE, - wxString(rISOFile.GetName(0).c_str(), SJISConv), -1); + wxString::From8BitData(rISOFile.GetName(0).c_str()), -1); + m_gameList.append(StringFromFormat("%s (U)\n", rISOFile.GetName(0).c_str())); SetItem(_Index, COLUMN_NOTES, - wxString(rISOFile.GetDescription(0).c_str(), SJISConv), -1); + wxString::From8BitData(company.size() ? + company.c_str() : rISOFile.GetDescription(0).c_str()), -1); + break; + default: + rISOFile.GetName(wname, SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage); + + SetItem(_Index, COLUMN_TITLE, + wxString::From8BitData( + rISOFile.GetName(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str()), + -1); + m_gameList.append(StringFromFormat("%s (E)\n", + rISOFile.GetName(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str())); + SetItem(_Index, COLUMN_NOTES, + wxString::From8BitData(company.size() ? + company.c_str() : + rISOFile.GetDescription(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str()), + -1); + break; } + if (wname.length()) + SetItem(_Index, COLUMN_TITLE, wname, -1); + if (wdescription.length()) + SetItem(_Index, COLUMN_NOTES, wdescription, -1); + + #ifndef _WIN32 // Emulation state SetItemColumnImage(_Index, COLUMN_EMULATION_STATE, m_EmuStateImageIndex[rISOFile.GetEmuState()]); diff --git a/Source/Core/DolphinWX/Src/ISOFile.cpp b/Source/Core/DolphinWX/Src/ISOFile.cpp index 8505203322..d2fb1098ee 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 0x10B +#define CACHE_REVISION 0x10C #define DVD_BANNER_WIDTH 96 #define DVD_BANNER_HEIGHT 32 @@ -63,18 +63,26 @@ GameListItem::GameListItem(const std::string& _rFileName) if (!DiscIO::IsVolumeWadFile(pVolume)) m_Platform = DiscIO::IsVolumeWiiDisc(pVolume) ? WII_DISC : GAMECUBE_DISC; else + { m_Platform = WII_WAD; + pVolume->GetWName(m_wNames); + } m_Company = "N/A"; + + + m_Name[0] = pVolume->GetName(); + + if(m_Name[0] == "") // Couldn't find the name in the WAD... + { + std::string FileName; + SplitPath(m_FileName, NULL, &FileName, NULL); + m_Name[0] = FileName; // Then just display the filename... Better than something like "No Name" + } + for (int i = 0; i < 6; i++) { - m_Name[i] = pVolume->GetName(); - if(m_Name[i] == "") // Couldn't find the name in the WAD... - { - std::string FileName; - SplitPath(_rFileName, NULL, &FileName, NULL); - m_Name[i] = FileName; // Then just display the filename... Better than something like "No Name" - } + m_Name[i] = m_Name[0]; m_Description[i] = "No Description"; } m_Country = pVolume->GetCountry(); @@ -95,9 +103,13 @@ GameListItem::GameListItem(const std::string& _rFileName) { if (pBannerLoader->IsValid()) { - pBannerLoader->GetName(m_Name); //m_Country == DiscIO::IVolume::COUNTRY_JAP ? 1 : 0); + m_wNames.clear(); + if (!pBannerLoader->GetName(m_wNames)) + pBannerLoader->GetName(m_Name); pBannerLoader->GetCompany(m_Company); - pBannerLoader->GetDescription(m_Description); + if (!pBannerLoader->GetDescription(m_wDescription)) + pBannerLoader->GetDescription(m_Description); + if (pBannerLoader->GetBanner(g_ImageTemp)) { // resize vector to image size @@ -116,6 +128,25 @@ GameListItem::GameListItem(const std::string& _rFileName) delete pFileSystem; } + std::vector::iterator i, end = m_wNames.end(); + std::wstring wFileName; + for (i = m_wNames.begin(); i != end; ++i) + { + if (*i == L"") + { + if (!wFileName.length()) + { + std::string FileName; + 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]); + wFileName.push_back(0); + } + *i = wFileName; + } + } delete pVolume; @@ -172,9 +203,31 @@ void GameListItem::DoState(PointerWrap &p) { p.Do(m_Name[0]); p.Do(m_Name[1]); p.Do(m_Name[2]); p.Do(m_Name[3]); p.Do(m_Name[4]); p.Do(m_Name[5]); + + int wNamesSize = m_wNames.size(); + p.Do(wNamesSize); + + if (p.mode == p.MODE_READ) + { + for (int i = 0; i < wNamesSize; ++i) + { + std::wstring temp; + p.Do(temp); + m_wNames.push_back(temp); + } + } + else + { + for (int i = 0; i < wNamesSize; ++i) + { + p.Do(m_wNames[i]); + } + } + p.Do(m_Company); p.Do(m_Description[0]); p.Do(m_Description[1]); p.Do(m_Description[2]); p.Do(m_Description[3]); p.Do(m_Description[4]); p.Do(m_Description[5]); + p.Do(m_wDescription); p.Do(m_UniqueID); p.Do(m_FileSize); p.Do(m_VolumeSize); @@ -211,6 +264,11 @@ const std::string& GameListItem::GetDescription(int index) const return m_Description[0]; } +const std::wstring& GameListItem::GetDescription() const +{ + return m_wDescription; +} + const std::string& GameListItem::GetName(int index) const { if ((index >=0) && (index < 6)) @@ -220,6 +278,28 @@ const std::string& GameListItem::GetName(int index) const return m_Name[0]; } +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 (m_wNames.size() > index) + { + wName = m_wNames[index]; + return true; + } + } + if (m_wNames.size() > 0) + { + wName = m_wNames[0]; + return true; + } + return false; + +} + const std::string GameListItem::GetWiiFSPath() const { DiscIO::IVolume *Iso = DiscIO::CreateVolumeFromFilename(m_FileName); diff --git a/Source/Core/DolphinWX/Src/ISOFile.h b/Source/Core/DolphinWX/Src/ISOFile.h index 35cec18772..fe7d3d6c6c 100644 --- a/Source/Core/DolphinWX/Src/ISOFile.h +++ b/Source/Core/DolphinWX/Src/ISOFile.h @@ -35,8 +35,10 @@ public: bool IsValid() const {return m_Valid;} const std::string& GetFileName() const {return m_FileName;} const std::string& GetName(int index) const; + bool GetName(std::wstring& wName, int index=0) const; const std::string& GetCompany() const {return m_Company;} const std::string& GetDescription(int index) const; + const std::wstring& GetDescription() const; const std::string& GetUniqueID() const {return m_UniqueID;} const std::string GetWiiFSPath() const; DiscIO::IVolume::ECountry GetCountry() const {return m_Country;} @@ -63,8 +65,10 @@ public: private: std::string m_FileName; std::string m_Name[6]; + std::vector m_wNames; std::string m_Company; std::string m_Description[6]; + std::wstring m_wDescription; std::string m_UniqueID; std::string m_issues; diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index 731cfac932..71771e48a7 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -154,7 +154,15 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW } // Disk header and apploader - m_Name->SetValue(wxString(OpenISO->GetName().c_str(), wxConvUTF8)); + + std::wstring wname; + wxString name; + if (OpenGameListItem->GetName(wname)) + name = wname; + else + name = wxString(OpenISO->GetName().c_str(), wxConvUTF8); + m_Name->SetValue(name); + m_GameID->SetValue(wxString(OpenISO->GetUniqueID().c_str(), wxConvUTF8)); switch (OpenISO->GetCountry()) { @@ -1253,53 +1261,67 @@ void CISOProperties::OnChangeBannerLang(wxCommandEvent& event) void CISOProperties::ChangeBannerDetails(int lang) { - if (OpenGameListItem->GetCountry() == DiscIO::IVolume::COUNTRY_JAPAN - || OpenGameListItem->GetCountry() == DiscIO::IVolume::COUNTRY_TAIWAN - || OpenGameListItem->GetPlatform() == GameListItem::WII_WAD) - { + std::wstring wname; + wxString shortName, + comment, + maker; + #ifdef _WIN32 - wxCSConv SJISConv(*(wxCSConv*)wxConvCurrent); - static bool validCP932 = ::IsValidCodePage(932) != 0; - if (validCP932) - { - SJISConv = wxCSConv(wxFontMapper::GetEncodingName(wxFONTENCODING_SHIFT_JIS)); - } - else - { - WARN_LOG(COMMON, "Cannot Convert from Charset Windows Japanese cp 932"); - } -#else - wxCSConv SJISConv(wxFontMapper::GetEncodingName(wxFONTENCODING_EUC_JP)); -#endif - - wxString name = wxString(OpenGameListItem->GetName(0).c_str(), SJISConv); - - // Updates the informations shown in the window - m_ShortName->SetValue(name); - m_Comment->SetValue(wxString(OpenGameListItem->GetDescription(0).c_str(), SJISConv)); - m_Maker->SetValue(wxString(OpenGameListItem->GetCompany().c_str(), SJISConv));//dev too - - std::string filename, extension; - SplitPath(OpenGameListItem->GetFileName(), 0, &filename, &extension); - - // Also sets the window's title - SetTitle(wxString::Format(wxT("%s%s"), - wxString(StringFromFormat("%s%s: %s - ", filename.c_str(), extension.c_str(), OpenGameListItem->GetUniqueID().c_str()).c_str(), *wxConvCurrent).c_str(), - name.c_str())); - } - else // Do the same for PAL/US Games (assuming ISO 8859-1) + wxCSConv SJISConv(*(wxCSConv*)wxConvCurrent); + static bool validCP932 = ::IsValidCodePage(932) != 0; + if (validCP932) { - wxString name = wxString::From8BitData(OpenGameListItem->GetName(lang).c_str()); - - m_ShortName->SetValue(name); - m_Comment->SetValue(wxString::From8BitData(OpenGameListItem->GetDescription(lang).c_str())); - m_Maker->SetValue(wxString::From8BitData(OpenGameListItem->GetCompany().c_str()));//dev too - - std::string filename, extension; - SplitPath(OpenGameListItem->GetFileName(), 0, &filename, &extension); - - SetTitle(wxString::Format(wxT("%s%s"), - wxString::From8BitData(StringFromFormat("%s%s: %s - ", filename.c_str(), extension.c_str(), OpenGameListItem->GetUniqueID().c_str()).c_str()).c_str(), - name.c_str())); + SJISConv = wxCSConv(wxFontMapper::GetEncodingName(wxFONTENCODING_SHIFT_JIS)); } + else + { + WARN_LOG(COMMON, "Cannot Convert from Charset Windows Japanese cp 932"); + } +#else + wxCSConv SJISConv(wxFontMapper::GetEncodingName(wxFONTENCODING_EUC_JP)); +#endif + switch (OpenGameListItem->GetCountry()) + { + case DiscIO::IVolume::COUNTRY_TAIWAN: + case DiscIO::IVolume::COUNTRY_JAPAN: + + if (OpenGameListItem->GetName(wname, -1)) + shortName = wname; + else + shortName = wxString(OpenGameListItem->GetName(0).c_str(), SJISConv); + + if ((comment = OpenGameListItem->GetDescription()).size() == 0) + comment = wxString(OpenGameListItem->GetDescription(0).c_str(), SJISConv); + maker = wxString(OpenGameListItem->GetCompany().c_str(), SJISConv); + break; + case DiscIO::IVolume::COUNTRY_USA: + if (OpenGameListItem->GetName(wname)) + shortName = wname; + else + shortName = wxString::From8BitData(OpenGameListItem->GetName(0).c_str()); + if ((comment = OpenGameListItem->GetDescription()).size() == 0) + comment = wxString(OpenGameListItem->GetDescription(0).c_str(), SJISConv); + maker = wxString::From8BitData(OpenGameListItem->GetCompany().c_str()); + break; + default: + if (OpenGameListItem->GetName(wname, lang)) + shortName = wname; + else + shortName = wxString::From8BitData(OpenGameListItem->GetName(lang).c_str()); + if ((comment = OpenGameListItem->GetDescription()).size() == 0) + comment = wxString(OpenGameListItem->GetDescription(lang).c_str(), SJISConv); + maker = wxString::From8BitData(OpenGameListItem->GetCompany().c_str()); + break; + + break; + } + // Updates the informations shown in the window + m_ShortName->SetValue(shortName); + m_Comment->SetValue(comment); + m_Maker->SetValue(maker);//dev too + + std::string filename, extension; + SplitPath(OpenGameListItem->GetFileName(), 0, &filename, &extension); + // Also sets the window's title + SetTitle(wxString(StringFromFormat("%s%s: %s - ", filename.c_str(), extension.c_str(), OpenGameListItem->GetUniqueID().c_str()).c_str(), *wxConvCurrent)+shortName); } From 3e773f093df179370faff6021a5c9a85af6181f7 Mon Sep 17 00:00:00 2001 From: nitsuja Date: Mon, 19 Dec 2011 15:13:26 -0800 Subject: [PATCH 201/381] fixed a freeze on emu shutdown in windows build --- Source/Core/VideoCommon/Src/EmuWindow.cpp | 30 +++++++++++++++++++ Source/Core/VideoCommon/Src/EmuWindow.h | 1 + Source/Plugins/Plugin_VideoDX11/Src/main.cpp | 6 ++-- Source/Plugins/Plugin_VideoDX9/Src/main.cpp | 2 +- Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp | 5 ++-- 5 files changed, 38 insertions(+), 6 deletions(-) diff --git a/Source/Core/VideoCommon/Src/EmuWindow.cpp b/Source/Core/VideoCommon/Src/EmuWindow.cpp index ff96887a32..30dca24cb1 100644 --- a/Source/Core/VideoCommon/Src/EmuWindow.cpp +++ b/Source/Core/VideoCommon/Src/EmuWindow.cpp @@ -36,6 +36,9 @@ WNDCLASSEX wndClass; const TCHAR m_szClassName[] = _T("DolphinEmuWnd"); int g_winstyle; static volatile bool s_sizing; +static const int TITLE_TEXT_BUF_SIZE = 1024; +TCHAR m_titleTextBuffer[TITLE_TEXT_BUF_SIZE]; +static const int WM_SETTEXT_CUSTOM = WM_USER + WM_SETTEXT; bool IsSizing() { @@ -225,6 +228,10 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam ) PostMessage(m_hParent, WM_USER, WM_USER_SETCURSOR, 0); return true; + case WM_SETTEXT_CUSTOM: + SendMessage(hWnd, WM_SETTEXT, wParam, lParam); + break; + default: return DefWindowProc(hWnd, iMsg, wParam, lParam); } @@ -357,4 +364,27 @@ void SetSize(int width, int height) MoveWindow(m_hWnd, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, TRUE); } +void SetWindowText(const TCHAR* text) +{ + // the simple way. + // we don't do this because it's a blocking call and the GUI thread might be waiting for us. + //::SetWindowText(m_hWnd, text); + + // copy to m_titleTextBuffer in such a way that + // it remains null-terminated and without garbage data at every point in time, + // in case another thread reads it while we're doing this. + for (int i = 0; i < TITLE_TEXT_BUF_SIZE-1; ++i) + { + m_titleTextBuffer[i+1] = 0; + TCHAR c = text[i]; + m_titleTextBuffer[i] = c; + if (!c) + break; + } + + // the OS doesn't allow posting WM_SETTEXT, + // so we post our own message and convert it to that in WndProc + PostMessage(m_hWnd, WM_SETTEXT_CUSTOM, 0, (LPARAM)m_titleTextBuffer); +} + } diff --git a/Source/Core/VideoCommon/Src/EmuWindow.h b/Source/Core/VideoCommon/Src/EmuWindow.h index 1403ffcf57..bf5aa73cdf 100644 --- a/Source/Core/VideoCommon/Src/EmuWindow.h +++ b/Source/Core/VideoCommon/Src/EmuWindow.h @@ -14,6 +14,7 @@ void Close(); void SetSize(int displayWidth, int displayHeight); bool IsSizing(); void OSDMenu(WPARAM wParam); +void SetWindowText(const TCHAR* text); } diff --git a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp index ba93890e2b..f6fe1127a3 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp @@ -68,9 +68,9 @@ unsigned int VideoBackend::PeekMessages() void VideoBackend::UpdateFPSDisplay(const char *text) { - char temp[512]; - sprintf_s(temp, sizeof temp, "%s | DX11 | %s", scm_rev_str, text); - SetWindowTextA(EmuWindow::GetWnd(), temp); + TCHAR temp[512]; + swprintf_s(temp, sizeof(temp)/sizeof(TCHAR), _T("%hs | DX11 | %hs"), scm_rev_str, text); + EmuWindow::SetWindowText(temp); } std::string VideoBackend::GetName() diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp index 1d733f7dc3..727fa73a00 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp @@ -78,7 +78,7 @@ void VideoBackend::UpdateFPSDisplay(const char *text) { TCHAR temp[512]; swprintf_s(temp, sizeof(temp)/sizeof(TCHAR), _T("%hs | DX9 | %hs"), scm_rev_str, text); - SetWindowText(EmuWindow::GetWnd(), temp); + EmuWindow::SetWindowText(temp); } std::string VideoBackend::GetName() diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp index bedcaa6245..cbdb702885 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp @@ -73,8 +73,9 @@ void OpenGL_SetWindowText(const char *text) #elif defined(__APPLE__) [GLWin.cocoaWin setTitle: [NSString stringWithUTF8String: text]]; #elif defined(_WIN32) - // TODO convert text to unicode and change SetWindowTextA to SetWindowText - SetWindowTextA(EmuWindow::GetWnd(), text); + 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.) From 3006d0696c28eb86615d45a313bdbcdedc43df28 Mon Sep 17 00:00:00 2001 From: nitsuja Date: Mon, 19 Dec 2011 16:38:07 -0800 Subject: [PATCH 202/381] fix the read-only menu item being disabled when emulation is paused (the hotkey was fine but I guess some people still use the menu) --- 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 59a9687dde..2ca28ce4dd 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -1632,7 +1632,7 @@ void CFrame::UpdateGUI() } } - GetMenuBar()->FindItem(IDM_RECORDREADONLY)->Enable(Running); + GetMenuBar()->FindItem(IDM_RECORDREADONLY)->Enable(Running || Paused); if (!Initialized && !m_bGameLoading) { From 33f0f9fd9fc6d66c82038b00d90a277b97a6e661 Mon Sep 17 00:00:00 2001 From: nitsuja Date: Mon, 19 Dec 2011 21:52:47 -0800 Subject: [PATCH 203/381] fix ZWW intro music crackling with DSPHLE --- .../Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp index a3e787cd8c..67f354007e 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp @@ -426,18 +426,15 @@ void CUCode_Zelda::RenderVoice_Raw(ZeldaVoicePB &PB, s16 *_Buffer, int _Size) PB.Unk36[0] = (u16)(ACC0 >> 16); - // This subtract does really not make much sense at all. ACC0 -= AX0 << 16; if ((s64)ACC0 < 0) { - // There's something wrong with this looping code. - - ERROR_LOG(DSPHLE, "Raw loop: ReadAudio size = %04x 34:%04x %08x", PB.Unk36[0], PB.raw[0x34 ^ 1], (int)ACC0); + // ERROR_LOG(DSPHLE, "Raw loop: ReadAudio size = %04x 34:%04x %08x", PB.Unk36[0], PB.raw[0x34 ^ 1], (int)ACC0); Decoder21_ReadAudio(PB, PB.Unk36[0], _Buffer); - ACC0 = _Size << 16; - ACC0 -= PB.Unk36[0] << 16; + ACC0 = -(s64)ACC0; + _Buffer += PB.Unk36[0]; PB.raw[0x34 ^ 1] = 0; From 9ddb67d4a96a53698a71a7f3c8936c2437dd81de Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Tue, 20 Dec 2011 01:35:12 -0800 Subject: [PATCH 204/381] fix shift-jis conversion on linux, and check for the codepage on windows in the memorycard manager like everywhere else --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 4 +++- Source/Core/DolphinWX/Src/ISOProperties.cpp | 6 ++++-- Source/Core/DolphinWX/Src/LogWindow.cpp | 7 ++++--- Source/Core/DolphinWX/Src/MemcardManager.cpp | 16 ++++++++++++++-- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 22fdd89a8d..53485199e3 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -446,7 +446,9 @@ void CGameListCtrl::InsertItemInReportView(long _Index) WARN_LOG(COMMON, "Cannot Convert from Charset Windows Japanese cp 932"); } #else - wxCSConv SJISConv(wxFontMapper::GetEncodingName(wxFONTENCODING_EUC_JP)); + // on linux the wrong string is returned from wxFontMapper::GetEncodingName(wxFONTENCODING_SHIFT_JIS) + // it returns CP-932, in order to use iconv we need to use CP932 + wxCSConv SJISConv(L"CP932"); #endif GameListItem& rISOFile = *m_ISOFiles[_Index]; diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index 71771e48a7..40c78bba4e 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -1278,8 +1278,10 @@ void CISOProperties::ChangeBannerDetails(int lang) WARN_LOG(COMMON, "Cannot Convert from Charset Windows Japanese cp 932"); } #else - wxCSConv SJISConv(wxFontMapper::GetEncodingName(wxFONTENCODING_EUC_JP)); -#endif + // on linux the wrong string is returned from wxFontMapper::GetEncodingName(wxFONTENCODING_SHIFT_JIS) + // it returns CP-932, in order to use iconv we need to use CP932 + wxCSConv SJISConv(L"CP932"); +#endif switch (OpenGameListItem->GetCountry()) { case DiscIO::IVolume::COUNTRY_TAIWAN: diff --git a/Source/Core/DolphinWX/Src/LogWindow.cpp b/Source/Core/DolphinWX/Src/LogWindow.cpp index 94b542eb2f..3942988efe 100644 --- a/Source/Core/DolphinWX/Src/LogWindow.cpp +++ b/Source/Core/DolphinWX/Src/LogWindow.cpp @@ -41,7 +41,7 @@ CLogWindow::CLogWindow(CFrame *parent, wxWindowID id, const wxPoint& pos, , x(0), y(0), winpos(0) , Parent(parent) , m_LogAccess(true) , m_Log(NULL), m_cmdline(NULL), m_FontChoice(NULL) - , m_SJISConv(wxT("")) + , m_SJISConv(*(wxCSConv*)wxConvCurrent) { #ifdef _WIN32 static bool validCP932 = ::IsValidCodePage(932) != 0; @@ -52,10 +52,11 @@ CLogWindow::CLogWindow(CFrame *parent, wxWindowID id, const wxPoint& pos, else { WARN_LOG(COMMON, "Cannot Convert from Charset Windows Japanese cp 932"); - m_SJISConv = *(wxCSConv*)wxConvCurrent; } #else - m_SJISConv = wxCSConv(wxFontMapper::GetEncodingName(wxFONTENCODING_EUC_JP)); + // on linux the wrong string is returned from wxFontMapper::GetEncodingName(wxFONTENCODING_SHIFT_JIS) + // it returns CP-932, in order to use iconv we need to use CP932 + m_SJISConv = wxCSConv(L"CP932"); #endif m_LogManager = LogManager::GetInstance(); diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp index 7eb0243e2c..68ae0f9ff2 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.cpp +++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp @@ -701,10 +701,22 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card) if (!memoryCard[card]->DEntry_Comment2(j, comment)) comment[0]=0; bool ascii = memoryCard[card]->IsAsciiEncoding(); + #ifdef _WIN32 - wxCSConv SJISConv(wxFontMapper::GetEncodingName(wxFONTENCODING_SHIFT_JIS)); + wxCSConv SJISConv(*(wxCSConv*)wxConvCurrent); + static bool validCP932 = ::IsValidCodePage(932) != 0; + if (validCP932) + { + SJISConv = wxCSConv(wxFontMapper::GetEncodingName(wxFONTENCODING_SHIFT_JIS)); + } + else + { + WARN_LOG(COMMON, "Cannot Convert from Charset Windows Japanese cp 932"); + } #else - wxCSConv SJISConv(wxFontMapper::GetEncodingName(wxFONTENCODING_EUC_JP)); + // on linux the wrong string is returned from wxFontMapper::GetEncodingName(wxFONTENCODING_SHIFT_JIS) + // it returns CP-932, in order to use iconv we need to use CP932 + wxCSConv SJISConv(L"CP932"); #endif wxTitle = wxString(title, ascii ? *wxConvCurrent : SJISConv); wxComment = wxString(comment, ascii ? *wxConvCurrent : SJISConv); From e4c4602d9e2004c22cee9d72c2607c688d6d817b Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Tue, 20 Dec 2011 02:10:40 -0800 Subject: [PATCH 205/381] use windows-1252 for gamename/description, fixes copyright/tm symbol in the gamelist & isoproperties --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 15 ++++++++------- Source/Core/DolphinWX/Src/ISOProperties.cpp | 15 ++++++++------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 53485199e3..35b664a22d 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -434,6 +434,7 @@ void CGameListCtrl::InsertItemInReportView(long _Index) // company: 0x007030 int ImageIndex = -1; + wxCSConv WindowsCP1252(wxFontMapper::GetEncodingName(wxFONTENCODING_CP1252)); #ifdef _WIN32 wxCSConv SJISConv(*(wxCSConv*)wxConvCurrent); static bool validCP932 = ::IsValidCodePage(932) != 0; @@ -494,25 +495,25 @@ void CGameListCtrl::InsertItemInReportView(long _Index) case DiscIO::IVolume::COUNTRY_USA: rISOFile.GetName(wname); SetItem(_Index, COLUMN_TITLE, - wxString::From8BitData(rISOFile.GetName(0).c_str()), -1); + wxString(rISOFile.GetName(0).c_str(), WindowsCP1252), -1); m_gameList.append(StringFromFormat("%s (U)\n", rISOFile.GetName(0).c_str())); SetItem(_Index, COLUMN_NOTES, - wxString::From8BitData(company.size() ? - company.c_str() : rISOFile.GetDescription(0).c_str()), -1); + wxString(company.size() ? + company.c_str() : rISOFile.GetDescription(0).c_str(), WindowsCP1252), -1); break; default: rISOFile.GetName(wname, SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage); SetItem(_Index, COLUMN_TITLE, - wxString::From8BitData( - rISOFile.GetName(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str()), + wxString( + rISOFile.GetName(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str(), WindowsCP1252), -1); m_gameList.append(StringFromFormat("%s (E)\n", rISOFile.GetName(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str())); SetItem(_Index, COLUMN_NOTES, - wxString::From8BitData(company.size() ? + wxString(company.size() ? company.c_str() : - rISOFile.GetDescription(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str()), + rISOFile.GetDescription(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str(), WindowsCP1252), -1); break; } diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index 40c78bba4e..51bbdcda30 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -1265,7 +1265,8 @@ void CISOProperties::ChangeBannerDetails(int lang) wxString shortName, comment, maker; - + + wxCSConv WindowsCP1252(wxFontMapper::GetEncodingName(wxFONTENCODING_CP1252)); #ifdef _WIN32 wxCSConv SJISConv(*(wxCSConv*)wxConvCurrent); static bool validCP932 = ::IsValidCodePage(932) != 0; @@ -1300,19 +1301,19 @@ void CISOProperties::ChangeBannerDetails(int lang) if (OpenGameListItem->GetName(wname)) shortName = wname; else - shortName = wxString::From8BitData(OpenGameListItem->GetName(0).c_str()); + shortName = wxString(OpenGameListItem->GetName(0).c_str(), WindowsCP1252); if ((comment = OpenGameListItem->GetDescription()).size() == 0) - comment = wxString(OpenGameListItem->GetDescription(0).c_str(), SJISConv); - maker = wxString::From8BitData(OpenGameListItem->GetCompany().c_str()); + comment = wxString(OpenGameListItem->GetDescription(0).c_str(), WindowsCP1252); + maker = wxString(OpenGameListItem->GetCompany().c_str(), WindowsCP1252); break; default: if (OpenGameListItem->GetName(wname, lang)) shortName = wname; else - shortName = wxString::From8BitData(OpenGameListItem->GetName(lang).c_str()); + shortName = wxString(OpenGameListItem->GetName(lang).c_str(), WindowsCP1252); if ((comment = OpenGameListItem->GetDescription()).size() == 0) - comment = wxString(OpenGameListItem->GetDescription(lang).c_str(), SJISConv); - maker = wxString::From8BitData(OpenGameListItem->GetCompany().c_str()); + comment = wxString(OpenGameListItem->GetDescription(lang).c_str(), WindowsCP1252); + maker = wxString(OpenGameListItem->GetCompany().c_str(), WindowsCP1252); break; break; From 8f6c25a5aa27f0c8df1d12a79f3082eae7c6c092 Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Tue, 20 Dec 2011 02:19:46 -0800 Subject: [PATCH 206/381] cleanup: merge handling of ntsc/pal games in gamelist/isoproperties --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 27 +++++++++------------ Source/Core/DolphinWX/Src/ISOProperties.cpp | 15 +++--------- 2 files changed, 15 insertions(+), 27 deletions(-) diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 35b664a22d..eb510fd37e 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -434,7 +434,6 @@ void CGameListCtrl::InsertItemInReportView(long _Index) // company: 0x007030 int ImageIndex = -1; - wxCSConv WindowsCP1252(wxFontMapper::GetEncodingName(wxFONTENCODING_CP1252)); #ifdef _WIN32 wxCSConv SJISConv(*(wxCSConv*)wxConvCurrent); static bool validCP932 = ::IsValidCodePage(932) != 0; @@ -477,7 +476,7 @@ void CGameListCtrl::InsertItemInReportView(long _Index) // On Wii we show the description instead as the company string is empty if (rISOFile.GetPlatform() == GameListItem::GAMECUBE_DISC) company = rISOFile.GetCompany().c_str(); - + int SelectedLanguage = SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage; switch (rISOFile.GetCountry()) { case DiscIO::IVolume::COUNTRY_TAIWAN: @@ -493,28 +492,24 @@ void CGameListCtrl::InsertItemInReportView(long _Index) } break; case DiscIO::IVolume::COUNTRY_USA: - rISOFile.GetName(wname); - SetItem(_Index, COLUMN_TITLE, - wxString(rISOFile.GetName(0).c_str(), WindowsCP1252), -1); - m_gameList.append(StringFromFormat("%s (U)\n", rISOFile.GetName(0).c_str())); - SetItem(_Index, COLUMN_NOTES, - wxString(company.size() ? - company.c_str() : rISOFile.GetDescription(0).c_str(), WindowsCP1252), -1); - break; - default: - rISOFile.GetName(wname, SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage); + SelectedLanguage = 0; + default: + { + wxCSConv WindowsCP1252(wxFontMapper::GetEncodingName(wxFONTENCODING_CP1252)); + rISOFile.GetName(wname, SelectedLanguage); SetItem(_Index, COLUMN_TITLE, wxString( - rISOFile.GetName(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str(), WindowsCP1252), + rISOFile.GetName(SelectedLanguage).c_str(), WindowsCP1252), -1); - m_gameList.append(StringFromFormat("%s (E)\n", - rISOFile.GetName(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str())); + m_gameList.append(StringFromFormat("%s (%c)\n", + rISOFile.GetName(SelectedLanguage).c_str(), (rISOFile.GetCountry() == DiscIO::IVolume::COUNTRY_USA)?'U':'E')); SetItem(_Index, COLUMN_NOTES, wxString(company.size() ? company.c_str() : - rISOFile.GetDescription(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str(), WindowsCP1252), + rISOFile.GetDescription(SelectedLanguage).c_str(), WindowsCP1252), -1); + } break; } diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index 51bbdcda30..85b95f3cb4 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -1266,7 +1266,6 @@ void CISOProperties::ChangeBannerDetails(int lang) comment, maker; - wxCSConv WindowsCP1252(wxFontMapper::GetEncodingName(wxFONTENCODING_CP1252)); #ifdef _WIN32 wxCSConv SJISConv(*(wxCSConv*)wxConvCurrent); static bool validCP932 = ::IsValidCodePage(932) != 0; @@ -1298,15 +1297,10 @@ void CISOProperties::ChangeBannerDetails(int lang) maker = wxString(OpenGameListItem->GetCompany().c_str(), SJISConv); break; case DiscIO::IVolume::COUNTRY_USA: - if (OpenGameListItem->GetName(wname)) - shortName = wname; - else - shortName = wxString(OpenGameListItem->GetName(0).c_str(), WindowsCP1252); - if ((comment = OpenGameListItem->GetDescription()).size() == 0) - comment = wxString(OpenGameListItem->GetDescription(0).c_str(), WindowsCP1252); - maker = wxString(OpenGameListItem->GetCompany().c_str(), WindowsCP1252); - break; + lang = 0; default: + { + wxCSConv WindowsCP1252(wxFontMapper::GetEncodingName(wxFONTENCODING_CP1252)); if (OpenGameListItem->GetName(wname, lang)) shortName = wname; else @@ -1314,8 +1308,7 @@ void CISOProperties::ChangeBannerDetails(int lang) if ((comment = OpenGameListItem->GetDescription()).size() == 0) comment = wxString(OpenGameListItem->GetDescription(lang).c_str(), WindowsCP1252); maker = wxString(OpenGameListItem->GetCompany().c_str(), WindowsCP1252); - break; - + } break; } // Updates the informations shown in the window From 825e2ea4df8315e488f1a94311e4ecf50b846329 Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Thu, 22 Dec 2011 14:28:12 -0800 Subject: [PATCH 207/381] fix an ascii/wxstring in gamelistctrl, replace fromascii("") with wxemptystring, don't push_back 0 at the end of wstrings --- Source/Core/DiscIO/Src/BannerLoaderWii.cpp | 4 +--- Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.cpp | 4 ++-- Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp | 6 +++--- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 4 ++-- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp index 88a660c739..ab66a346d4 100644 --- a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp +++ b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp @@ -176,7 +176,6 @@ bool CBannerLoaderWii::GetName(std::vector& _rNames) { temp.push_back(Common::swap16(pBanner->m_Comment[0][i])); } - temp.push_back('\0'); _rNames.push_back(temp); return true; } @@ -220,8 +219,7 @@ bool CBannerLoaderWii::GetDescription(std::wstring& _rDescription) std::wstring description; for (int i = 0; i < WII_BANNER_COMMENT_SIZE; ++i) description.push_back(Common::swap16(pBanner->m_Comment[1][i])); - - description.push_back('\0'); + _rDescription = description; return true; } diff --git a/Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.cpp b/Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.cpp index 863d09436c..ca275ba66a 100644 --- a/Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.cpp @@ -27,10 +27,10 @@ wxString CDSPRegTable::GetValue(int row, int col) { case 0: return wxString::FromAscii(pdregname(row)); case 1: return wxString::Format(wxT("0x%04x"), DSPCore_ReadRegister(row)); - default: return wxString::FromAscii(""); + default: return wxEmptyString; } } - return wxString::FromAscii(""); + return wxEmptyString; } void CDSPRegTable::SetValue(int, int, const wxString &) diff --git a/Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp b/Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp index ecd706cf9a..c4a30fd522 100644 --- a/Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp @@ -56,18 +56,18 @@ wxString CRegTable::GetValue(int row, int col) case 2: return wxString::FromAscii(GetFPRName(row)); case 3: return wxString::Format(wxT("%016llx"), riPS0(row)); case 4: return wxString::Format(wxT("%016llx"), riPS1(row)); - default: return wxString::FromAscii(""); + default: return wxEmptyString; } } else { if (row - 32 < NUM_SPECIALS) { switch (col) { case 0: return wxString::FromAscii(special_reg_names[row - 32]); case 1: return wxString::Format(wxT("%08x"), GetSpecialRegValue(row - 32)); - default: return wxString::FromAscii(""); + default: return wxEmptyString; } } } - return wxString::FromAscii(""); + return wxEmptyString; } static void SetSpecialRegValue(int reg, u32 value) { diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index eb510fd37e..9dbbf656e9 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -1179,7 +1179,7 @@ void CGameListCtrl::CompressSelection(bool _compress) if (wxFileExists(wxString::FromAscii(OutputFileName.c_str())) && wxMessageBox( wxString::Format(_("The file %s already exists.\nDo you wish to replace it?"), - OutputFileName.c_str()), + wxString(OutputFileName.c_str(), *wxConvCurrent).c_str()), _("Confirm File Overwrite"), wxYES_NO) == wxNO) continue; @@ -1207,7 +1207,7 @@ void CGameListCtrl::CompressSelection(bool _compress) if (wxFileExists(wxString::FromAscii(OutputFileName.c_str())) && wxMessageBox( wxString::Format(_("The file %s already exists.\nDo you wish to replace it?"), - OutputFileName.c_str()), + wxString(OutputFileName.c_str(), *wxConvCurrent).c_str()), _("Confirm File Overwrite"), wxYES_NO) == wxNO) continue; From d389f7139b00c1a48578cda5ab10384498eb39dd Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Thu, 22 Dec 2011 15:53:41 -0800 Subject: [PATCH 208/381] restore wii sorting order by using the ascii string from the banner instead of the iso file --- Source/Core/DolphinWX/Src/ISOFile.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/DolphinWX/Src/ISOFile.cpp b/Source/Core/DolphinWX/Src/ISOFile.cpp index d2fb1098ee..9734e97131 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 0x10C +#define CACHE_REVISION 0x10D #define DVD_BANNER_WIDTH 96 #define DVD_BANNER_HEIGHT 32 @@ -104,11 +104,11 @@ GameListItem::GameListItem(const std::string& _rFileName) if (pBannerLoader->IsValid()) { m_wNames.clear(); - if (!pBannerLoader->GetName(m_wNames)) - pBannerLoader->GetName(m_Name); + pBannerLoader->GetName(m_wNames); + pBannerLoader->GetName(m_Name); pBannerLoader->GetCompany(m_Company); - if (!pBannerLoader->GetDescription(m_wDescription)) - pBannerLoader->GetDescription(m_Description); + pBannerLoader->GetDescription(m_wDescription); + pBannerLoader->GetDescription(m_Description); if (pBannerLoader->GetBanner(g_ImageTemp)) { From 070c9330889be5f9273c2f88a32ef02d727585b1 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 25 Dec 2011 00:03:45 +0100 Subject: [PATCH 209/381] Revert "Add unimplemented device map for sdio/slot1 and slot2. Fixes #4932." This reverts commit 9a627e89fb2e5a8f00ad158fde595926298cc573. The attempted Kirby: Return to Dreamland fix does not work properly and while it fixes this particular game, it completely breaks SD card support on Dolphin. BTW, I've never head of /dev/sdio/slot2 before... --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 2 -- 1 file changed, 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 2f79e2bc91..2fa2587e60 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -93,8 +93,6 @@ void Init() g_DeviceMap[i] = new CWII_IPC_HLE_Device_net_ip_top(i, std::string("/dev/net/ip/top")); i++; g_DeviceMap[i] = new CWII_IPC_HLE_Device_usb_kbd(i, std::string("/dev/usb/kbd")); i++; g_DeviceMap[i] = new CWII_IPC_HLE_Device_sdio_slot0(i, std::string("/dev/sdio/slot0")); i++; - g_DeviceMap[i] = new CWII_IPC_HLE_Device_sdio_slot0(i, std::string("/dev/sdio/slot1")); i++; - g_DeviceMap[i] = new CWII_IPC_HLE_Device_sdio_slot0(i, std::string("/dev/sdio/slot2")); i++; g_DeviceMap[i] = new CWII_IPC_HLE_Device_stub(i, std::string("/dev/usb/hid")); i++; g_DeviceMap[i] = new IWII_IPC_HLE_Device(i, std::string("_Unimplemented_Device_")); From af8a866afc201ae2c79a45321faadcbfa8a93f2a Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 25 Dec 2011 01:55:25 +0100 Subject: [PATCH 210/381] Implement what was done by r9a627e89 using a stub device This is arguably better then using the slot0 device for slot1, because it maps the real hardware better (nothing can be mounted on slot1 on a Wii AFAICT). This also makes Kirby: Return to Dreamland work properly and fixes some of the SD card problems (libs do not expect to have the same SD card mounted two times in RW...). --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 1 + 1 file changed, 1 insertion(+) 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 2fa2587e60..0aa66b496a 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -93,6 +93,7 @@ void Init() g_DeviceMap[i] = new CWII_IPC_HLE_Device_net_ip_top(i, std::string("/dev/net/ip/top")); i++; g_DeviceMap[i] = new CWII_IPC_HLE_Device_usb_kbd(i, std::string("/dev/usb/kbd")); i++; g_DeviceMap[i] = new CWII_IPC_HLE_Device_sdio_slot0(i, std::string("/dev/sdio/slot0")); i++; + g_DeviceMap[i] = new CWII_IPC_HLE_Device_stub(i, std::string("/dev/sdio/slot1")); i++; g_DeviceMap[i] = new CWII_IPC_HLE_Device_stub(i, std::string("/dev/usb/hid")); i++; g_DeviceMap[i] = new IWII_IPC_HLE_Device(i, std::string("_Unimplemented_Device_")); From 1df7af35e994f651cd628a9cc5c11745381a1cb7 Mon Sep 17 00:00:00 2001 From: skidau Date: Thu, 29 Dec 2011 12:05:36 +1100 Subject: [PATCH 211/381] Reset errno to zero before testing it after the strtoul call. Fixes issue 5078. --- Source/Core/Common/Src/StringUtil.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/Core/Common/Src/StringUtil.cpp b/Source/Core/Common/Src/StringUtil.cpp index cdd1016210..664987d350 100644 --- a/Source/Core/Common/Src/StringUtil.cpp +++ b/Source/Core/Common/Src/StringUtil.cpp @@ -125,6 +125,10 @@ std::string StripQuotes(const std::string& s) bool TryParse(const std::string &str, u32 *const output) { char *endptr = NULL; + + // Reset errno to a value other than ERANGE + errno = 0; + unsigned long value = strtoul(str.c_str(), &endptr, 0); if (!endptr || *endptr) From f7ef58ff9a44dff06be78a5c2dd34586ffa71591 Mon Sep 17 00:00:00 2001 From: skidau Date: Thu, 29 Dec 2011 21:18:35 +1100 Subject: [PATCH 212/381] Removed the VID/PID validation for Wiimotes allowing Dolphin to detect third party wiimotes with a VID/PID that is different to Nintendo's. Checked for timeouts reported by the bluetooth stack. Added RVL-CNT-01-TR detection. --- Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 65 +++++-------------- .../Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 17 ----- 2 files changed, 16 insertions(+), 66 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index e7316a896d..c22e1972dc 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -124,11 +124,6 @@ inline void init_lib() } } -// VID = Nintendo, PID = Wiimote -static int VIDLength = 3; -static int VID[3] = {0x057E, 0x0001, 0x0002}; -static int PID[3] = {0x0306, 0x0002, 0x00F7}; - namespace WiimoteReal { @@ -210,39 +205,23 @@ int FindWiimotes(Wiimote** wm, int max_wiimotes) attr.Size = sizeof(attr); HidD_GetAttributes(dev, &attr); - bool foundWiimote = false; - for (int i = 0; i < VIDLength; i++) - { - if (attr.VendorID == VID[i] && attr.ProductID == PID[i]) - { - foundWiimote = true; - break; - } - } + // 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); - if (foundWiimote) + if (!wm[k]->Connect()) { - // This is a 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); - wm[k]->dev_handle = dev; - memcpy(wm[k]->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; - } - else - ++found_wiimotes; + ERROR_LOG(WIIMOTE, "Unable to connect to wiimote %i.", wm[k]->index + 1); + delete wm[k]; + wm[k] = NULL; + CloseHandle(dev); } else { - // Not a wiimote - CloseHandle(dev); + ++found_wiimotes; } } @@ -399,28 +378,16 @@ int Wiimote::IOWrite(unsigned char* buf, int len) return i; } -#if 0 dw = GetLastError(); // Checking for 121 = timeout on semaphore/device off/disconnected to // avoid trouble with other stacks toshiba/widcomm - // 995 = The I/O operation has been aborted because of a thread exit or - // an application request. - - if ( (dw == 121) || (dw == 995) ) + if (dw == 121) { - NOTICE_LOG(WIIMOTE, "IOWrite[MSBT_STACK_UNKNOWN]"); + NOTICE_LOG(WIIMOTE, "IOWrite[MSBT_STACK_UNKNOWN]: Timeout"); RealDisconnect(); } else ERROR_LOG(WIIMOTE, "IOWrite[MSBT_STACK_UNKNOWN]: ERROR: %08x", dw); -#endif - - - // If the part below causes trouble on WIDCOMM/TOSHIBA stack uncomment - // the lines above, and comment out the 3 lines below instead. - - NOTICE_LOG(WIIMOTE, "IOWrite[MSBT_STACK_UNKNOWN]"); - RealDisconnect(); return 0; } @@ -456,8 +423,8 @@ int PairUp(bool unpair) { init_lib(); - // match strings like "Nintendo RVL-WBC-01", "Nintendo RVL-CNT-01" - const std::wregex wiimote_device_name(L"Nintendo RVL-\\w{3}-\\d{2}"); + // 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; diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index d1e2826ed3..f5ded4125d 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -142,23 +142,6 @@ void Wiimote::InterruptChannel(const u16 channel, const void* const data, const rpt.second = (u8)size; memcpy(rpt.first, (u8*)data, size); - // some hax, since we just send the last data report to Dolphin on each Update() call - // , make the wiimote only send updated data reports when data changes - // == less bt traffic, eliminates some unneeded packets - //if (WM_REPORT_MODE == ((u8*)data)[1]) - //{ - // // also delete the last data report - // if (m_last_data_report.first) - // { - // delete[] m_last_data_report.first; - // m_last_data_report.first = NULL; - // } - - // // nice var names :p, this seems to be this one - // ((wm_report_mode*)(rpt.first + 2))->all_the_time = false; - // //((wm_report_mode*)(data + 2))->continuous = false; - //} - // Convert output DATA packets to SET_REPORT packets. // Nintendo Wiimotes work without this translation, but 3rd // party ones don't. From cfee6d84731c30edb9cdbac62988620b3476db68 Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 31 Dec 2011 09:51:41 +1100 Subject: [PATCH 213/381] Stubbed the /dev/usb/oh1 path. Fixes issue 4936. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 1 + 1 file changed, 1 insertion(+) 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 0aa66b496a..921d704a69 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -95,6 +95,7 @@ void Init() g_DeviceMap[i] = new CWII_IPC_HLE_Device_sdio_slot0(i, std::string("/dev/sdio/slot0")); i++; g_DeviceMap[i] = new CWII_IPC_HLE_Device_stub(i, std::string("/dev/sdio/slot1")); i++; g_DeviceMap[i] = new CWII_IPC_HLE_Device_stub(i, std::string("/dev/usb/hid")); i++; + g_DeviceMap[i] = new CWII_IPC_HLE_Device_stub(i, std::string("/dev/usb/oh1")); i++; g_DeviceMap[i] = new IWII_IPC_HLE_Device(i, std::string("_Unimplemented_Device_")); g_LastDeviceID = IPC_FIRST_FILEIO_ID; From 80504efcdf6df7a459b47d52bd4ee64902f6e4f1 Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 31 Dec 2011 15:18:48 +1100 Subject: [PATCH 214/381] Changed the Gecko code handling to the native code handler. This provides full compatibility with all Gecko codes. To use the native code handler, place the kenobiwii.bin file into the Sys directory. Dolphin will silently fall-back to the emulated code handler if the file is not there. Fixes issue 4561. --- Source/Core/Common/Src/CommonPaths.h | 2 + Source/Core/Core/Src/Boot/Boot.cpp | 11 ++- Source/Core/Core/Src/GeckoCode.cpp | 98 ++++++++++++++++++++++++ Source/Core/Core/Src/GeckoCode.h | 1 + Source/Core/Core/Src/PatchEngine.cpp | 5 +- Source/Core/Core/Src/PowerPC/PowerPC.cpp | 6 +- Source/Core/Core/Src/PowerPC/PowerPC.h | 1 + 7 files changed, 117 insertions(+), 7 deletions(-) diff --git a/Source/Core/Common/Src/CommonPaths.h b/Source/Core/Common/Src/CommonPaths.h index 8d37482ce1..150453928e 100644 --- a/Source/Core/Common/Src/CommonPaths.h +++ b/Source/Core/Common/Src/CommonPaths.h @@ -126,6 +126,8 @@ #define WII_USA_SETTING "setting-usa.txt" #define WII_JAP_SETTING "setting-jpn.txt" +#define GECKO_CODE_HANDLER "kenobiwii.bin" + // Subdirs in Sys #define GC_SYS_DIR "GC" #define WII_SYS_DIR "Wii" diff --git a/Source/Core/Core/Src/Boot/Boot.cpp b/Source/Core/Core/Src/Boot/Boot.cpp index 5a9880533e..3dcbf5730c 100644 --- a/Source/Core/Core/Src/Boot/Boot.cpp +++ b/Source/Core/Core/Src/Boot/Boot.cpp @@ -195,10 +195,13 @@ bool CBoot::BootUp() NOTICE_LOG(BOOT, "Booting %s", _StartupPara.m_strFilename.c_str()); - // HLE jump to loader (homebrew) - HLE::Patch(0x80001800, "HBReload"); - const u8 stubstr[] = { 'S', 'T', 'U', 'B', 'H', 'A', 'X', 'X' }; - Memory::WriteBigEData(stubstr, 0x80001804, 8); + // HLE jump to loader (homebrew). Disabled when Gecko is active as it interferes with the code handler + if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats) + { + HLE::Patch(0x80001800, "HBReload"); + const u8 stubstr[] = { 'S', 'T', 'U', 'B', 'H', 'A', 'X', 'X' }; + Memory::WriteBigEData(stubstr, 0x80001804, 8); + } g_symbolDB.Clear(); VideoInterface::Preset(_StartupPara.bNTSC); diff --git a/Source/Core/Core/Src/GeckoCode.cpp b/Source/Core/Core/Src/GeckoCode.cpp index 9ea30b9fb0..207aa8fb8b 100644 --- a/Source/Core/Core/Src/GeckoCode.cpp +++ b/Source/Core/Core/Src/GeckoCode.cpp @@ -5,6 +5,8 @@ #include "ConfigManager.h" #include "vector" +#include "PowerPC/PowerPC.h" +#include "CommonPaths.h" namespace Gecko { @@ -40,6 +42,9 @@ static struct // codes execute when counter is 0 static int code_execution_counter = 0; +// Track whether the code handler has been installed +static bool code_handler_installed = false; + // the currently active codes std::vector active_codes; @@ -93,6 +98,64 @@ void SetActiveCodes(const std::vector& gcodes) } inserted_asm_codes.clear(); + + code_handler_installed = false; +} + +bool InstallCodeHandler() +{ + std::string data; + std::string _rCodeHandlerFilename = File::GetSysDirectory() + GECKO_CODE_HANDLER; + if (!File::ReadFileToString(false, _rCodeHandlerFilename.c_str(), data)) + return false; + + // Install code handler + Memory::WriteBigEData((const u8*)data.data(), 0x80001800, data.length()); + + // Turn off Pause on start + Memory::Write_U32(0, 0x80001808); + + // Write the Game ID into the location expected by WiiRD + Memory::WriteBigEData(Memory::GetPointer(0x80000000), 0x80001800, 6); + + // Create GCT in memory + Memory::Write_U32(0x00d0c0de, 0x800027d0); + Memory::Write_U32(0x00d0c0de, 0x800027d4); + + std::lock_guard lk(active_codes_lock); + + int i = 0; + std::vector::iterator + gcodes_iter = active_codes.begin(), + gcodes_end = active_codes.end(); + for (; gcodes_iter!=gcodes_end; ++gcodes_iter) + { + if (gcodes_iter->enabled) + { + current_code = codes_start = &*gcodes_iter->codes.begin(); + codes_end = &*gcodes_iter->codes.end(); + for (; current_code < codes_end; ++current_code) + { + const GeckoCode::Code& code = *current_code; + Memory::Write_U32(code.address, 0x800027d8 + i); + Memory::Write_U32(code.data, 0x800027d8 + i + 4); + i += 8; + } + } + } + + Memory::Write_U32(0xff000000, 0x800027d8 + i); + Memory::Write_U32(0x00000000, 0x800027d8 + i + 4); + + // Turn on codes + Memory::Write_U8(1, 0x80001807); + + // Invalidate the icache + for (int i = 0; i < data.length(); i += 32) + { + PowerPC::ppcState.iCache.Invalidate(0x80001800 + i); + } + return true; } bool RunGeckoCode(GeckoCode& gecko_code) @@ -168,6 +231,41 @@ bool RunActiveCodes() return true; } +void RunCodeHandler() +{ + if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats) + { + if (!code_handler_installed) + code_handler_installed = InstallCodeHandler(); + + if (code_handler_installed) + { + if (PC == LR) + { + u32 oldLR = LR; + PowerPC::CoreMode oldMode = PowerPC::GetMode(); + + PC = 0x800018A8; + LR = 0; + + // Execute the code handler in interpreter mode to track when it exits + PowerPC::SetMode(PowerPC::MODE_INTERPRETER); + + while (PC != 0) + PowerPC::SingleStep(); + + PowerPC::SetMode(oldMode); + PC = LR = oldLR; + } + } + else + { + // Use the emulated code handler + Gecko::RunActiveCodes(); + } + } +} + const std::map >& GetInsertedAsmCodes() { return inserted_asm_codes; } diff --git a/Source/Core/Core/Src/GeckoCode.h b/Source/Core/Core/Src/GeckoCode.h index 016e38f3d2..1cd83bdf65 100644 --- a/Source/Core/Core/Src/GeckoCode.h +++ b/Source/Core/Core/Src/GeckoCode.h @@ -67,6 +67,7 @@ namespace Gecko void SetActiveCodes(const std::vector& gcodes); bool RunActiveCodes(); + void RunCodeHandler(); const std::map >& GetInsertedAsmCodes(); } // namespace Gecko diff --git a/Source/Core/Core/Src/PatchEngine.cpp b/Source/Core/Core/Src/PatchEngine.cpp index 6528ad6752..74e778c916 100644 --- a/Source/Core/Core/Src/PatchEngine.cpp +++ b/Source/Core/Core/Src/PatchEngine.cpp @@ -210,13 +210,14 @@ void ApplyPatches(const std::vector &patches) void ApplyFramePatches() { ApplyPatches(onFrame); + + // Run the Gecko code handler + Gecko::RunCodeHandler(); } void ApplyARPatches() { ActionReplay::RunAllActive(); - // w/e this can be changed later - Gecko::RunActiveCodes(); } } // namespace diff --git a/Source/Core/Core/Src/PowerPC/PowerPC.cpp b/Source/Core/Core/Src/PowerPC/PowerPC.cpp index a247ec5035..7e5d9ba763 100644 --- a/Source/Core/Core/Src/PowerPC/PowerPC.cpp +++ b/Source/Core/Core/Src/PowerPC/PowerPC.cpp @@ -213,6 +213,11 @@ void Shutdown() state = CPU_POWERDOWN; } +CoreMode GetMode() +{ + return mode; +} + void SetMode(CoreMode new_mode) { if (new_mode == mode) @@ -223,7 +228,6 @@ void SetMode(CoreMode new_mode) switch (mode) { case MODE_INTERPRETER: // Switching from JIT to interpreter - jit->ClearCache(); // Remove all those nasty JIT patches. cpu_core_base = interpreter; break; diff --git a/Source/Core/Core/Src/PowerPC/PowerPC.h b/Source/Core/Core/Src/PowerPC/PowerPC.h index 9ac979bcfb..54690ac6b5 100644 --- a/Source/Core/Core/Src/PowerPC/PowerPC.h +++ b/Source/Core/Core/Src/PowerPC/PowerPC.h @@ -97,6 +97,7 @@ void Init(int cpu_core); void Shutdown(); void DoState(PointerWrap &p); +CoreMode GetMode(); void SetMode(CoreMode _coreType); void SingleStep(); From c53593a40a765557dbf5127a8c0bd2531e416148 Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 1 Jan 2012 14:32:54 +1100 Subject: [PATCH 215/381] Moved the Audio Throttle option to the Framelimit drop-down. The Audio Throttle should never be used alongside the frame limiter as that can cause audio sync issues. --- Source/Core/AudioCommon/Src/AudioCommonConfig.cpp | 5 ++--- Source/Core/AudioCommon/Src/AudioCommonConfig.h | 1 - Source/Core/Core/Src/Core.cpp | 8 ++++---- Source/Core/DolphinWX/Src/ConfigMain.cpp | 10 +++------- Source/Core/DolphinWX/Src/ConfigMain.h | 1 - 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp index 1ab4c261e2..07698ada9a 100644 --- a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp @@ -18,6 +18,7 @@ #include "AudioCommon.h" #include "CommonPaths.h" #include "FileUtil.h" +#include "..\..\Core\Src\ConfigManager.h" AudioCommonConfig ac_Config; @@ -31,7 +32,6 @@ void AudioCommonConfig::Load() file.Load(File::GetUserPath(F_DSPCONFIG_IDX)); file.Get("Config", "EnableDTKMusic", &m_EnableDTKMusic, true); - file.Get("Config", "EnableThrottle", &m_EnableThrottle, true); file.Get("Config", "EnableJIT", &m_EnableJIT, true); file.Get("Config", "DumpAudio", &m_DumpAudio, false); #if defined __linux__ && HAVE_ALSA @@ -54,7 +54,6 @@ void AudioCommonConfig::SaveSettings() file.Load(File::GetUserPath(F_DSPCONFIG_IDX)); file.Set("Config", "EnableDTKMusic", m_EnableDTKMusic); - file.Set("Config", "EnableThrottle", m_EnableThrottle); file.Set("Config", "EnableJIT", m_EnableJIT); file.Set("Config", "DumpAudio", m_DumpAudio); file.Set("Config", "Backend", sBackend); @@ -67,7 +66,7 @@ void AudioCommonConfig::SaveSettings() // Update according to the values (stream/mixer) void AudioCommonConfig::Update() { if (soundStream) { - soundStream->GetMixer()->SetThrottle(m_EnableThrottle); + soundStream->GetMixer()->SetThrottle(SConfig::GetInstance().m_Framelimit == 2); soundStream->GetMixer()->SetDTKMusic(m_EnableDTKMusic); soundStream->SetVolume(m_Volume); } diff --git a/Source/Core/AudioCommon/Src/AudioCommonConfig.h b/Source/Core/AudioCommon/Src/AudioCommonConfig.h index 49124344e0..076ef2d4e1 100644 --- a/Source/Core/AudioCommon/Src/AudioCommonConfig.h +++ b/Source/Core/AudioCommon/Src/AudioCommonConfig.h @@ -34,7 +34,6 @@ struct AudioCommonConfig { bool m_EnableDTKMusic; - bool m_EnableThrottle; bool m_EnableJIT; bool m_DumpAudio; int m_Volume; diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index fe5fddbdd5..c1f9cf4415 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -547,11 +547,11 @@ void RequestRefreshInfo() // This should only be called from VI void VideoThrottle() { - u32 TargetVPS = (SConfig::GetInstance().m_Framelimit > 1) ? - SConfig::GetInstance().m_Framelimit * 5 : VideoInterface::TargetRefreshRate; + u32 TargetVPS = (SConfig::GetInstance().m_Framelimit > 2) ? + (SConfig::GetInstance().m_Framelimit - 1) * 5 : VideoInterface::TargetRefreshRate; - // Disable the frame-limiter when the throttle (Tab) key is held down - if (SConfig::GetInstance().m_Framelimit && !Host_GetKeyState('\t')) + // Disable the frame-limiter when the throttle (Tab) key is held down. Audio throttle: m_Framelimit = 2 + if (SConfig::GetInstance().m_Framelimit && SConfig::GetInstance().m_Framelimit != 2 && !Host_GetKeyState('\t')) { u32 frametime = ((SConfig::GetInstance().b_UseFPS)? Common::AtomicLoad(DrawnFrame) : DrawnVideo) * 1000 / TargetVPS; diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 01b3496e2b..fdca309aee 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -238,6 +238,7 @@ void CConfigMain::InitializeGUILists() // Framelimit arrayStringFor_Framelimit.Add(_("Off")); arrayStringFor_Framelimit.Add(_("Auto")); + arrayStringFor_Framelimit.Add(_("Audio")); for (int i = 10; i <= 120; i += 5) // from 10 to 120 arrayStringFor_Framelimit.Add(wxString::Format(wxT("%i"), i)); @@ -360,7 +361,6 @@ void CConfigMain::InitializeGUIValues() VolumeText->SetLabel(wxString::Format(wxT("%d %%"), ac_Config.m_Volume)); EnableDTKMusic->SetValue(ac_Config.m_EnableDTKMusic ? true : false); DSPThread->SetValue(startup_params.bDSPThread); - EnableThrottle->SetValue(ac_Config.m_EnableThrottle ? true : false); DumpAudio->SetValue(ac_Config.m_DumpAudio ? true : false); FrequencySelection->SetSelection( FrequencySelection->FindString(wxString::Format(_("%d Hz"), ac_Config.iFrequency))); @@ -484,7 +484,7 @@ void CConfigMain::InitializeGUITooltips() { // General - Basic CPUThread->SetToolTip(_("This splits the Video and CPU threads, so they can be run on separate cores.\nCauses major speed improvements on PCs with more than one core, but can also cause occasional crashes/glitches.")); - Framelimit->SetToolTip(_("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.")); + Framelimit->SetToolTip(_("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).")); // General - Advanced _NTSCJ->SetToolTip(_("Forces NTSC-J mode for using the Japanese ROM font.\nLeft unchecked, dolphin defaults to NTSC-U and automatically enables this setting when playing Japanese games.")); @@ -504,7 +504,6 @@ void CConfigMain::InitializeGUITooltips() // Audio tooltips EnableDTKMusic->SetToolTip(_("This is used to play music tracks, like BGM.")); DSPThread->SetToolTip(_("Run DSP LLE on a dedicated thread (not recommended).")); - EnableThrottle->SetToolTip(_("This is used to control game speed by sound throttle.\nDisabling this could cause abnormal game speed, such as too fast.\nBut sometimes enabling this could cause constant noise.\n\nKeyboard Shortcut : Hold down to instantly disable Throttle.")); 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!")); @@ -606,8 +605,6 @@ void CConfigMain::CreateGUIControls() EnableDTKMusic = new wxCheckBox(AudioPage, ID_ENABLE_DTK_MUSIC, _("Enable DTK Music"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); DSPThread = new wxCheckBox(AudioPage, ID_DSPTHREAD, _("DSP LLE on Thread")); - EnableThrottle = new wxCheckBox(AudioPage, ID_ENABLE_THROTTLE, _("Enable Audio Throttle"), - wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); DumpAudio = new wxCheckBox(AudioPage, ID_DUMP_AUDIO, _("Dump Audio"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); VolumeSlider = new wxSlider(AudioPage, ID_VOLUME, 0, 1, 100, @@ -625,7 +622,6 @@ void CConfigMain::CreateGUIControls() sbAudioSettings->Add(DSPEngine, 0, wxALL | wxEXPAND, 5); sbAudioSettings->Add(EnableDTKMusic, 0, wxALL, 5); sbAudioSettings->Add(DSPThread, 0, wxALL, 5); - sbAudioSettings->Add(EnableThrottle, 0, wxALL, 5); sbAudioSettings->Add(DumpAudio, 0, wxALL, 5); wxStaticBoxSizer *sbVolume = new wxStaticBoxSizer(wxVERTICAL, AudioPage, _("Volume")); @@ -841,6 +837,7 @@ void CConfigMain::CoreSettingsChanged(wxCommandEvent& event) break; case ID_FRAMELIMIT: SConfig::GetInstance().m_Framelimit = Framelimit->GetSelection(); + ac_Config.Update(); break; case ID_FRAMELIMIT_USEFPSFORLIMITING: SConfig::GetInstance().b_UseFPS = UseFPSForLimiting->IsChecked(); @@ -922,7 +919,6 @@ void CConfigMain::AudioSettingsChanged(wxCommandEvent& event) default: ac_Config.m_EnableDTKMusic = EnableDTKMusic->GetValue(); - ac_Config.m_EnableThrottle = EnableThrottle->GetValue(); ac_Config.m_DumpAudio = DumpAudio->GetValue(); long int frequency; diff --git a/Source/Core/DolphinWX/Src/ConfigMain.h b/Source/Core/DolphinWX/Src/ConfigMain.h index e89a3c148a..3ec798fb8e 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.h +++ b/Source/Core/DolphinWX/Src/ConfigMain.h @@ -157,7 +157,6 @@ private: wxSlider* VolumeSlider; wxStaticText* VolumeText; wxCheckBox* EnableDTKMusic; - wxCheckBox* EnableThrottle; wxCheckBox* DumpAudio; wxArrayString wxArrayBackends; wxChoice* BackendSelection; From 5a914744a213509063775469df14d2a3865d0c1c Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 1 Jan 2012 16:12:53 +1100 Subject: [PATCH 216/381] Added some support for the OE flag. Thanks to j4ck.fr0st for the tip. --- Source/Core/Core/Src/PowerPC/Gekko.h | 2 + .../Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 92 +++++++++++++++++-- 2 files changed, 88 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Gekko.h b/Source/Core/Core/Src/PowerPC/Gekko.h index 76e34f7a8d..1ce6fae4cd 100644 --- a/Source/Core/Core/Src/PowerPC/Gekko.h +++ b/Source/Core/Core/Src/PowerPC/Gekko.h @@ -303,6 +303,8 @@ union UFPR }; #define XER_CA_MASK 0x20000000 +#define XER_OV_MASK 0x40000000 +#define XER_SO_MASK 0x80000000 // XER union UReg_XER { diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index b72e14f252..351536ba56 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -703,7 +703,18 @@ void Jit64::subfcx(UGeckoInstruction inst) MOV(32, gpr.R(d), R(EAX)); gpr.UnlockAll(); - if (inst.OE) PanicAlert("OE: subfcx"); + if (inst.OE) + { + FixupBranch jno = J_CC(CC_NO); + //XER[OV/SO] = 1 + OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK)); + OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_OV_MASK)); + FixupBranch exit = J(); + SetJumpTarget(jno); + //XER[OV] = 0 + AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); + SetJumpTarget(exit); + } if (inst.Rc) { ComputeRC(R(EAX)); } @@ -743,7 +754,18 @@ void Jit64::subfex(UGeckoInstruction inst) gpr.UnlockAll(); gpr.UnlockAllX(); - if (inst.OE) PanicAlert("OE: subfex"); + if (inst.OE) + { + FixupBranch jno = J_CC(CC_NO); + //XER[OV/SO] = 1 + OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK)); + OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_OV_MASK)); + FixupBranch exit = J(); + SetJumpTarget(jno); + //XER[OV] = 0 + AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); + SetJumpTarget(exit); + } if (inst.Rc) { ComputeRC(R(EAX)); } @@ -843,7 +865,18 @@ void Jit64::subfx(UGeckoInstruction inst) gpr.UnlockAll(); } - if (inst.OE) PanicAlert("OE: subfx"); + if (inst.OE) + { + FixupBranch jno = J_CC(CC_NO); + //XER[OV/SO] = 1 + OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK)); + OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_OV_MASK)); + FixupBranch exit = J(); + SetJumpTarget(jno); + //XER[OV] = 0 + AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); + SetJumpTarget(exit); + } if (inst.Rc) { ComputeRC(gpr.R(d)); @@ -895,6 +928,18 @@ void Jit64::mullwx(UGeckoInstruction inst) gpr.UnlockAll(); } + if (inst.OE) + { + FixupBranch jno = J_CC(CC_NO); + //XER[OV/SO] = 1 + OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK)); + OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_OV_MASK)); + FixupBranch exit = J(); + SetJumpTarget(jno); + //XER[OV] = 0 + AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); + SetJumpTarget(exit); + } if (inst.Rc) { ComputeRC(gpr.R(d)); @@ -965,6 +1010,18 @@ void Jit64::divwux(UGeckoInstruction inst) gpr.UnlockAllX(); } + if (inst.OE) + { + FixupBranch jno = J_CC(CC_NO); + //XER[OV/SO] = 1 + OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK)); + OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_OV_MASK)); + FixupBranch exit = J(); + SetJumpTarget(jno); + //XER[OV] = 0 + AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); + SetJumpTarget(exit); + } if (inst.Rc) { ComputeRC(gpr.R(d)); @@ -976,8 +1033,6 @@ void Jit64::addx(UGeckoInstruction inst) INSTRUCTION_START JITDISABLE(Integer) int a = inst.RA, b = inst.RB, d = inst.RD; - if (inst.OE) - NOTICE_LOG(DYNA_REC, "Add - OE enabled :("); if (gpr.R(a).IsImm() && gpr.R(b).IsImm()) { @@ -1007,6 +1062,19 @@ void Jit64::addx(UGeckoInstruction inst) gpr.UnlockAll(); } + if (inst.OE) + { + FixupBranch jno = J_CC(CC_NO); + //XER[OV/SO] = 1 + OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK)); + OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_OV_MASK)); + FixupBranch exit = J(); + SetJumpTarget(jno); + //XER[OV] = 0 + AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); + SetJumpTarget(exit); + } + if (inst.Rc) { ComputeRC(gpr.R(d)); @@ -1053,7 +1121,6 @@ void Jit64::addcx(UGeckoInstruction inst) INSTRUCTION_START JITDISABLE(Integer) int a = inst.RA, b = inst.RB, d = inst.RD; - _assert_msg_(DYNA_REC, !inst.OE, "Add - OE enabled :("); if ((d == a) || (d == b)) { @@ -1074,6 +1141,19 @@ void Jit64::addcx(UGeckoInstruction inst) gpr.UnlockAll(); } + if (inst.OE) + { + FixupBranch jno = J_CC(CC_NO); + //XER[OV/SO] = 1 + OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK)); + OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_OV_MASK)); + FixupBranch exit = J(); + SetJumpTarget(jno); + //XER[OV] = 0 + AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); + SetJumpTarget(exit); + } + if (inst.Rc) { ComputeRC(gpr.R(d)); From ba545ec1e9cf9f4457b7b2424b5187be277bd49f Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 1 Jan 2012 18:09:39 +1100 Subject: [PATCH 217/381] Build fix --- Source/Core/AudioCommon/Src/AudioCommonConfig.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp index 07698ada9a..533c6b4313 100644 --- a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp @@ -18,7 +18,7 @@ #include "AudioCommon.h" #include "CommonPaths.h" #include "FileUtil.h" -#include "..\..\Core\Src\ConfigManager.h" +#include "../../Core/Src/ConfigManager.h" AudioCommonConfig ac_Config; From 6f1b2d7748c2ebe5db7e17d0308f4106d04e71d4 Mon Sep 17 00:00:00 2001 From: nitsuja Date: Fri, 30 Dec 2011 20:22:48 -0800 Subject: [PATCH 218/381] name all audio threads (that I know how to) for debugging, as suggested in response to revision d00b719966ed. --- Source/Core/AudioCommon/Src/AOSoundStream.cpp | 2 ++ Source/Core/AudioCommon/Src/AlsaSoundStream.cpp | 1 + Source/Core/AudioCommon/Src/DSoundStream.cpp | 4 ++-- Source/Core/AudioCommon/Src/OpenALStream.cpp | 2 ++ Source/Core/AudioCommon/Src/PulseAudioStream.cpp | 2 ++ 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Source/Core/AudioCommon/Src/AOSoundStream.cpp b/Source/Core/AudioCommon/Src/AOSoundStream.cpp index e864ad1211..99ae2e661c 100644 --- a/Source/Core/AudioCommon/Src/AOSoundStream.cpp +++ b/Source/Core/AudioCommon/Src/AOSoundStream.cpp @@ -25,6 +25,8 @@ void AOSound::SoundLoop() { + Common::SetCurrentThreadName("Audio thread - ao"); + uint_32 numBytesToRender = 256; ao_initialize(); default_driver = ao_default_driver_id(); diff --git a/Source/Core/AudioCommon/Src/AlsaSoundStream.cpp b/Source/Core/AudioCommon/Src/AlsaSoundStream.cpp index 76f13b6cb1..710275d55a 100644 --- a/Source/Core/AudioCommon/Src/AlsaSoundStream.cpp +++ b/Source/Core/AudioCommon/Src/AlsaSoundStream.cpp @@ -60,6 +60,7 @@ void AlsaSound::SoundLoop() thread_data = 2; return; } + Common::SetCurrentThreadName("Audio thread - alsa"); while (!thread_data) { m_mixer->Mix(reinterpret_cast(mix_buffer), frames_to_deliver); diff --git a/Source/Core/AudioCommon/Src/DSoundStream.cpp b/Source/Core/AudioCommon/Src/DSoundStream.cpp index 78e79e1057..b252dc90c5 100644 --- a/Source/Core/AudioCommon/Src/DSoundStream.cpp +++ b/Source/Core/AudioCommon/Src/DSoundStream.cpp @@ -96,7 +96,7 @@ bool DSound::WriteDataToBuffer(DWORD dwOffset, // Our own write // The audio thread. void DSound::SoundLoop() { - Common::SetCurrentThreadName("Audio thread"); + Common::SetCurrentThreadName("Audio thread - dsound"); currentPos = 0; lastPos = 0; @@ -132,7 +132,7 @@ bool DSound::Start() DWORD num1; short* p1; - dsBuffer->Lock(0, bufferSize, (void* *)&p1, &num1, 0, 0, 0); + 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); diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp index 91d2b3270c..99220f0ed2 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.cpp +++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp @@ -121,6 +121,8 @@ void OpenALStream::Clear(bool mute) void OpenALStream::SoundLoop() { + Common::SetCurrentThreadName("Audio thread - openal"); + ALenum err; u32 ulFrequency = m_mixer->GetSampleRate(); diff --git a/Source/Core/AudioCommon/Src/PulseAudioStream.cpp b/Source/Core/AudioCommon/Src/PulseAudioStream.cpp index 6b3f9e7217..4851b4bd12 100644 --- a/Source/Core/AudioCommon/Src/PulseAudioStream.cpp +++ b/Source/Core/AudioCommon/Src/PulseAudioStream.cpp @@ -58,6 +58,8 @@ void PulseAudio::Update() // Called on audio thread. void PulseAudio::SoundLoop() { + Common::SetCurrentThreadName("Audio thread - pulse"); + thread_running = PulseInit(); while (thread_running) From f0d7b8122f4c00ce188604f6e2522b73af91872b Mon Sep 17 00:00:00 2001 From: nitsuja Date: Fri, 30 Dec 2011 20:37:46 -0800 Subject: [PATCH 219/381] increased fault tolerance of shader cache files. more specifically: if the emulator stops unexpectedly, it is quite possible that one of the shader cache files will have some bytes near the end that never got their values filled in. this change adds an index number at the end of each entry as extra verification that the entry is valid, so that invalid entries can be ignored (and eventually overwritten) instead of causing crashes. --- Source/Core/Common/Src/LinearDiskCache.h | 39 +++++++++++++++++++----- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/Source/Core/Common/Src/LinearDiskCache.h b/Source/Core/Common/Src/LinearDiskCache.h index f213d2959e..ac10b5ef20 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 = 6967 + LINEAR_DISKCACHE_VER = 6969 }; // On disk format: @@ -71,36 +71,58 @@ public: // close any currently opened file Close(); + m_num_entries = 0; // try opening for reading/writing - m_file.open(filename, ios_base::in | ios_base::out | ios_base::binary | ios_base::app); + m_file.open(filename, ios_base::in | ios_base::out | ios_base::binary); + + m_file.seekg(0, std::ios::end); + std::fstream::pos_type end_pos = m_file.tellg(); + m_file.seekg(0, std::ios::beg); + std::fstream::pos_type start_pos = m_file.tellg(); + std::streamoff file_size = end_pos - start_pos; if (m_file.is_open() && ValidateHeader()) { // good header, read some key/value pairs - u32 num_entries = 0; K key; V *value = NULL; u32 value_size; + u32 entry_number; + + std::fstream::pos_type last_pos = m_file.tellg(); while (Read(&value_size)) { + std::streamoff next_extent = (last_pos - start_pos) + sizeof(value_size) + value_size; + if (next_extent > file_size) + break; + delete[] value; value = new V[value_size]; // read key/value and pass to reader - if (Read(&key) && Read(value, value_size)) + if (Read(&key) && + Read(value, value_size) && + Read(&entry_number) && + entry_number == m_num_entries+1) + { reader.Read(key, value, value_size); + } else + { break; + } - ++num_entries; + m_num_entries++; + last_pos = m_file.tellg(); } + m_file.seekp(last_pos); m_file.clear(); delete[] value; - return num_entries; + return m_num_entries; } // failed to open file for reading or bad header @@ -127,10 +149,12 @@ public: // Appends a key-value pair to the store. void Append(const K &key, const V *value, u32 value_size) { - // TODO: Should do a check that we don't already have "key"? + // TODO: Should do a check that we don't already have "key"? (I think each caller does that already.) Write(&value_size); Write(&key); Write(value, value_size); + m_num_entries++; + Write(&m_num_entries); } private: @@ -174,6 +198,7 @@ private: } m_header; std::fstream m_file; + u32 m_num_entries; }; #endif // _LINEAR_DISKCACHE From 0d9e87da1844238672c0152312789404e9f7d686 Mon Sep 17 00:00:00 2001 From: nitsuja Date: Fri, 30 Dec 2011 20:51:17 -0800 Subject: [PATCH 220/381] prevent CLogWindow::UpdateLog from constantly burning through timer objects, because it was allocating memory a lot and making it hard to debug some things. I think this should be faster even in release builds, but any speedup is probably too tiny to measure. --- Source/Core/DolphinWX/Src/LogWindow.cpp | 77 +++++++++++++------------ Source/Core/DolphinWX/Src/LogWindow.h | 1 + 2 files changed, 42 insertions(+), 36 deletions(-) diff --git a/Source/Core/DolphinWX/Src/LogWindow.cpp b/Source/Core/DolphinWX/Src/LogWindow.cpp index 3942988efe..489d81c08d 100644 --- a/Source/Core/DolphinWX/Src/LogWindow.cpp +++ b/Source/Core/DolphinWX/Src/LogWindow.cpp @@ -39,7 +39,7 @@ CLogWindow::CLogWindow(CFrame *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name) : wxPanel(parent, id, pos, size, style, name) , x(0), y(0), winpos(0) - , Parent(parent) , m_LogAccess(true) + , Parent(parent), m_ignoreLogTimer(false), m_LogAccess(true) , m_Log(NULL), m_cmdline(NULL), m_FontChoice(NULL) , m_SJISConv(*(wxCSConv*)wxConvCurrent) { @@ -279,6 +279,7 @@ void CLogWindow::OnWrapLineCheck(wxCommandEvent& event) void CLogWindow::OnLogTimer(wxTimerEvent& WXUNUSED(event)) { if (!m_LogAccess) return; + if (m_ignoreLogTimer) return; UpdateLog(); // Scroll to the last line @@ -294,52 +295,56 @@ void CLogWindow::UpdateLog() if (!m_LogAccess) return; if (!m_Log) return; - m_LogTimer->Stop(); + // m_LogTimer->Stop(); + // instead of stopping the timer, let's simply ignore its calls during UpdateLog, + // because repeatedly stopping and starting a timer churns memory (and potentially leaks it). + m_ignoreLogTimer = true; + if (!msgQueue.empty()) { - std::lock_guard lk(m_LogSection); - int msgQueueSize = (int)msgQueue.size(); - for (int i = 0; i < msgQueueSize; i++) - { - switch (msgQueue.front().first) + std::lock_guard lk(m_LogSection); + int msgQueueSize = (int)msgQueue.size(); + for (int i = 0; i < msgQueueSize; i++) { - - case ERROR_LEVEL: - m_Log->SetDefaultStyle(wxTextAttr(*wxRED)); - break; + switch (msgQueue.front().first) + { + case ERROR_LEVEL: + m_Log->SetDefaultStyle(wxTextAttr(*wxRED)); + break; - case WARNING_LEVEL: - m_Log->SetDefaultStyle(wxTextAttr(wxColour(255, 255, 0))); // YELLOW - break; + case WARNING_LEVEL: + m_Log->SetDefaultStyle(wxTextAttr(wxColour(255, 255, 0))); // YELLOW + break; - case NOTICE_LEVEL: - m_Log->SetDefaultStyle(wxTextAttr(*wxGREEN)); - break; + case NOTICE_LEVEL: + m_Log->SetDefaultStyle(wxTextAttr(*wxGREEN)); + break; - case INFO_LEVEL: - m_Log->SetDefaultStyle(wxTextAttr(*wxCYAN)); - break; + case INFO_LEVEL: + m_Log->SetDefaultStyle(wxTextAttr(*wxCYAN)); + break; - case DEBUG_LEVEL: - m_Log->SetDefaultStyle(wxTextAttr(*wxLIGHT_GREY)); - break; + case DEBUG_LEVEL: + m_Log->SetDefaultStyle(wxTextAttr(*wxLIGHT_GREY)); + break; - default: - m_Log->SetDefaultStyle(wxTextAttr(*wxWHITE)); - break; + default: + m_Log->SetDefaultStyle(wxTextAttr(*wxWHITE)); + break; + } + if (msgQueue.front().second.size()) + { + int j = m_Log->GetLastPosition(); + m_Log->AppendText(msgQueue.front().second); + // White timestamp + m_Log->SetStyle(j, j + 9, wxTextAttr(*wxWHITE)); + } + msgQueue.pop(); } - if (msgQueue.front().second.size()) - { - int j = m_Log->GetLastPosition(); - m_Log->AppendText(msgQueue.front().second); - // White timestamp - m_Log->SetStyle(j, j + 9, wxTextAttr(*wxWHITE)); - } - msgQueue.pop(); - } } // unlock log - m_LogTimer->Start(UPDATETIME); + // m_LogTimer->Start(UPDATETIME); + m_ignoreLogTimer = false; } void CLogWindow::Log(LogTypes::LOG_LEVELS level, const char *text) diff --git a/Source/Core/DolphinWX/Src/LogWindow.h b/Source/Core/DolphinWX/Src/LogWindow.h index ba5724cb0c..a4b25f12c3 100644 --- a/Source/Core/DolphinWX/Src/LogWindow.h +++ b/Source/Core/DolphinWX/Src/LogWindow.h @@ -62,6 +62,7 @@ private: wxFont DefaultFont, MonoSpaceFont; std::vector LogFont; wxTimer *m_LogTimer; + bool m_ignoreLogTimer; LogManager *m_LogManager; std::queue > msgQueue; bool m_writeFile, m_writeConsole, m_writeWindow, m_LogAccess; From 59e93bff78f54a0cff3f2c6558ed1a69b47a9534 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 1 Jan 2012 20:45:15 +0100 Subject: [PATCH 221/381] Fix a crash at startup with Dolphin on Linux compiled in debug mode Use the clobber list instead of the stack to save rbx when executing the cpuid instruction with inline assembly. This avoids breaking GCC assumptions about the stack pointer location. --- Source/Core/Common/Src/CPUDetect.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Source/Core/Common/Src/CPUDetect.cpp b/Source/Core/Common/Src/CPUDetect.cpp index 99e43f5c46..93e9d25087 100644 --- a/Source/Core/Common/Src/CPUDetect.cpp +++ b/Source/Core/Common/Src/CPUDetect.cpp @@ -43,27 +43,25 @@ static inline void do_cpuid(unsigned int *eax, unsigned int *ebx, // 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__ ( - "pushq %%rbx;" "cpuid;" "movl %%ebx,%1;" - "popq %%rbx;" : "=a" (*eax), "=S" (*ebx), "=c" (*ecx), "=d" (*edx) : "a" (*eax) + : "rbx" ); #else __asm__ ( - "pushl %%ebx;" "cpuid;" "movl %%ebx,%1;" - "popl %%ebx;" : "=a" (*eax), "=S" (*ebx), "=c" (*ecx), "=d" (*edx) : "a" (*eax) + : "ebx" ); #endif } From 008fd446f5e8679c23d767ac766c3f89712b4f13 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 1 Jan 2012 22:54:30 +0100 Subject: [PATCH 222/381] Replace some printfs from the PPC Interpreter code by Dolphin logger calls --- Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp index 1e368939cf..a8277d868a 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp @@ -158,7 +158,7 @@ int Interpreter::SingleStepInner(void) #if defined(_DEBUG) || defined(DEBUGFAST) if (PowerPC::ppcState.gpr[1] == 0) { - printf("%i Corrupt stack", PowerPC::ppcState.DebugCount); + WARN_LOG(POWERPC, "%i Corrupt stack", PowerPC::ppcState.DebugCount); } PowerPC::ppcState.DebugCount++; #endif @@ -284,7 +284,7 @@ void Interpreter::unknown_instruction(UGeckoInstruction _inst) { char disasm[256]; DisassembleGekko(Memory::ReadUnchecked_U32(last_pc), last_pc, disasm, 256); - printf("Last PC = %08x : %s\n", last_pc, disasm); + NOTICE_LOG(POWERPC, "Last PC = %08x : %s", last_pc, disasm); Dolphin_Debugger::PrintCallstack(); _dbg_assert_msg_(POWERPC, 0, "\nIntCPU: Unknown instr %08x at PC = %08x last_PC = %08x LR = %08x\n", _inst.hex, PC, last_pc, LR); } From 96600ef48df5f801e265e95024df0fa894dc0930 Mon Sep 17 00:00:00 2001 From: skidau Date: Mon, 2 Jan 2012 13:53:39 +1100 Subject: [PATCH 223/381] Added a note to try the native code handler in the error message window. Added copyright notices. --- Source/Core/Core/Src/GeckoCode.cpp | 16 +++++++++++++++- Source/Core/Core/Src/GeckoCode.h | 13 +++++++++++++ Source/Core/Core/Src/GeckoCodeConfig.cpp | 13 +++++++++++++ Source/Core/Core/Src/GeckoCodeConfig.h | 13 +++++++++++++ Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp | 13 +++++++++++++ Source/Core/DolphinWX/Src/GeckoCodeDiag.h | 13 +++++++++++++ 6 files changed, 80 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/GeckoCode.cpp b/Source/Core/Core/Src/GeckoCode.cpp index 207aa8fb8b..2bbe101cee 100644 --- a/Source/Core/Core/Src/GeckoCode.cpp +++ b/Source/Core/Core/Src/GeckoCode.cpp @@ -1,3 +1,17 @@ +// 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/ + #include "GeckoCode.h" #include "Thread.h" @@ -200,7 +214,7 @@ bool RunGeckoCode(GeckoCode& gecko_code) gecko_code.enabled = false; PanicAlertT("GeckoCode failed to run (CT%i CST%i) (%s)" - "\n(either a bad code or the code type is not yet supported.)" + "\n(either a bad code or the code type is not yet supported. Try using the native code handler by placing the kenobiwii.bin file into the Sys directory and restarting Dolphin.)" , code.type, code.subtype, gecko_code.name.c_str()); return false; } diff --git a/Source/Core/Core/Src/GeckoCode.h b/Source/Core/Core/Src/GeckoCode.h index 1cd83bdf65..d9a53dcfc3 100644 --- a/Source/Core/Core/Src/GeckoCode.h +++ b/Source/Core/Core/Src/GeckoCode.h @@ -1,3 +1,16 @@ +// 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/ #ifndef __GECKOCODE_h__ #define __GECKOCODE_h__ diff --git a/Source/Core/Core/Src/GeckoCodeConfig.cpp b/Source/Core/Core/Src/GeckoCodeConfig.cpp index f0e5a0585b..a23d531f7e 100644 --- a/Source/Core/Core/Src/GeckoCodeConfig.cpp +++ b/Source/Core/Core/Src/GeckoCodeConfig.cpp @@ -1,3 +1,16 @@ +// 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/ #include "GeckoCodeConfig.h" diff --git a/Source/Core/Core/Src/GeckoCodeConfig.h b/Source/Core/Core/Src/GeckoCodeConfig.h index d7e28086c7..0ae630f784 100644 --- a/Source/Core/Core/Src/GeckoCodeConfig.h +++ b/Source/Core/Core/Src/GeckoCodeConfig.h @@ -1,3 +1,16 @@ +// 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/ #ifndef __GECKOCODECONFIG_h__ #define __GECKOCODECONFIG_h__ diff --git a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp b/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp index c491424376..e9089c6006 100644 --- a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp +++ b/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp @@ -1,3 +1,16 @@ +// 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/ #include "GeckoCodeDiag.h" diff --git a/Source/Core/DolphinWX/Src/GeckoCodeDiag.h b/Source/Core/DolphinWX/Src/GeckoCodeDiag.h index 92328d5f43..338c57c6e9 100644 --- a/Source/Core/DolphinWX/Src/GeckoCodeDiag.h +++ b/Source/Core/DolphinWX/Src/GeckoCodeDiag.h @@ -1,3 +1,16 @@ +// 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/ #ifndef __GECKOCODEDIAG_h__ #define __GECKOCODEDIAG_h__ From f4d8e527b5c81e4a181f41105a71aec932d3810a Mon Sep 17 00:00:00 2001 From: skidau Date: Mon, 2 Jan 2012 15:14:30 +1100 Subject: [PATCH 224/381] Updated the Gecko code handler to the latest version from Gecko OS 1.9.3.1. Added a check to ensure that the number of codes fits in memory (maximum 231 codes). Store a copy of codehandler.bin in the Sys directory. --- Data/Sys/codehandler.bin | Bin 0 -> 4288 bytes Source/Core/Common/Src/CommonPaths.h | 2 +- Source/Core/Core/Src/GeckoCode.cpp | 24 +++++++++++++++--------- 3 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 Data/Sys/codehandler.bin diff --git a/Data/Sys/codehandler.bin b/Data/Sys/codehandler.bin new file mode 100644 index 0000000000000000000000000000000000000000..7a95e724b1e69655f521c67e22e2b8c0479007dd GIT binary patch literal 4288 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 literal 0 HcmV?d00001 diff --git a/Source/Core/Common/Src/CommonPaths.h b/Source/Core/Common/Src/CommonPaths.h index 150453928e..d319fb541e 100644 --- a/Source/Core/Common/Src/CommonPaths.h +++ b/Source/Core/Common/Src/CommonPaths.h @@ -126,7 +126,7 @@ #define WII_USA_SETTING "setting-usa.txt" #define WII_JAP_SETTING "setting-jpn.txt" -#define GECKO_CODE_HANDLER "kenobiwii.bin" +#define GECKO_CODE_HANDLER "codehandler.bin" // Subdirs in Sys #define GC_SYS_DIR "GC" diff --git a/Source/Core/Core/Src/GeckoCode.cpp b/Source/Core/Core/Src/GeckoCode.cpp index 2bbe101cee..c0b7af3779 100644 --- a/Source/Core/Core/Src/GeckoCode.cpp +++ b/Source/Core/Core/Src/GeckoCode.cpp @@ -118,6 +118,7 @@ void SetActiveCodes(const std::vector& gcodes) bool InstallCodeHandler() { + u32 codelist_location = 0x800028B8; // Debugger on location (0x800022A8 = Debugger off, using codehandleronly.bin) std::string data; std::string _rCodeHandlerFilename = File::GetSysDirectory() + GECKO_CODE_HANDLER; if (!File::ReadFileToString(false, _rCodeHandlerFilename.c_str(), data)) @@ -127,14 +128,14 @@ bool InstallCodeHandler() Memory::WriteBigEData((const u8*)data.data(), 0x80001800, data.length()); // Turn off Pause on start - Memory::Write_U32(0, 0x80001808); + Memory::Write_U32(0, 0x80002774); // Write the Game ID into the location expected by WiiRD Memory::WriteBigEData(Memory::GetPointer(0x80000000), 0x80001800, 6); // Create GCT in memory - Memory::Write_U32(0x00d0c0de, 0x800027d0); - Memory::Write_U32(0x00d0c0de, 0x800027d4); + Memory::Write_U32(0x00d0c0de, codelist_location); + Memory::Write_U32(0x00d0c0de, codelist_location + 4); std::lock_guard lk(active_codes_lock); @@ -151,15 +152,20 @@ bool InstallCodeHandler() for (; current_code < codes_end; ++current_code) { const GeckoCode::Code& code = *current_code; - Memory::Write_U32(code.address, 0x800027d8 + i); - Memory::Write_U32(code.data, 0x800027d8 + i + 4); - i += 8; + + // Make sure we have enough memory to hold the code list + if ((codelist_location + 24 + i) < 0x80003000) + { + Memory::Write_U32(code.address, codelist_location + 8 + i); + Memory::Write_U32(code.data, codelist_location + 12 + i); + i += 8; + } } } } - Memory::Write_U32(0xff000000, 0x800027d8 + i); - Memory::Write_U32(0x00000000, 0x800027d8 + i + 4); + Memory::Write_U32(0xff000000, codelist_location + 8 + i); + Memory::Write_U32(0x00000000, codelist_location + 12 + i); // Turn on codes Memory::Write_U8(1, 0x80001807); @@ -214,7 +220,7 @@ bool RunGeckoCode(GeckoCode& gecko_code) gecko_code.enabled = false; PanicAlertT("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 kenobiwii.bin file into the Sys directory and restarting Dolphin.)" + "\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.)" , code.type, code.subtype, gecko_code.name.c_str()); return false; } From d6bf166694e78d511b5000eff2a9778de08daec1 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 2 Jan 2012 03:42:00 -0500 Subject: [PATCH 225/381] Fixed and streamlined overflow detection, improved subtraction methods, general flag-based optimizations including GenerateRC() which uses the sign/zero flag of the last operation --- Source/Core/Core/Src/PowerPC/Jit64/Jit.h | 4 + .../Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 680 +++++++++++------- 2 files changed, 441 insertions(+), 243 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h index 38de5c8fa2..832417f82f 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h @@ -147,7 +147,11 @@ public: void WriteCallInterpreter(UGeckoInstruction _inst); void Cleanup(); + void GenerateConstantOverflow(bool overflow); + void GenerateOverflow(); + void GenerateOverflowFinalizeCarry(bool oe, bool inv = false); void GenerateCarry(); + void GenerateRC(); void ComputeRC(const Gen::OpArg & arg); void tri_op(int d, int a, int b, bool reversible, void (XEmitter::*op)(Gen::X64Reg, Gen::OpArg)); diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index 351536ba56..6d6626dfdf 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -24,6 +24,64 @@ #include "JitRegCache.h" #include "JitAsm.h" +void Jit64::GenerateConstantOverflow(bool overflow) +{ + if (overflow) + { + //XER[OV/SO] = 1 + OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK | XER_OV_MASK)); + } + else + { + //XER[OV] = 0 + AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); + } +} + +void Jit64::GenerateOverflow() +{ + FixupBranch jno = J_CC(CC_NO); + //XER[OV/SO] = 1 + OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK | XER_OV_MASK)); + FixupBranch exit = J(); + SetJumpTarget(jno); + //XER[OV] = 0 + AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); + SetJumpTarget(exit); +} + +// Assumes CA is clear +void Jit64::GenerateOverflowFinalizeCarry(bool oe, bool inv) +{ + // USES_XER + if (oe) + { + FixupBranch jno = J_CC(CC_NO); + // Do carry + FixupBranch carry1 = J_CC(inv ? CC_C : CC_NC); + JitSetCA(); + SetJumpTarget(carry1); + //XER[OV/SO] = 1 + OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK | XER_OV_MASK)); + FixupBranch exit = J(); + SetJumpTarget(jno); + // Do carry + FixupBranch carry2 = J_CC(inv ? CC_C : CC_NC); + JitSetCA(); + SetJumpTarget(carry2); + //XER[OV] = 0 + AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); + SetJumpTarget(exit); + } + else + { + // Output carry is inverted + FixupBranch carry1 = J_CC(inv ? CC_C : CC_NC); + JitSetCA(); + SetJumpTarget(carry1); + } +} + // Assumes that the flags were just set through an addition. void Jit64::GenerateCarry() { // USES_XER @@ -35,6 +93,24 @@ void Jit64::GenerateCarry() { SetJumpTarget(pContinue); } +// Assumes that Sign and Zero flags were set by the last operation. Preserves all flags and registers. +void Jit64::GenerateRC() { + FixupBranch pZero = J_CC(CC_Z); + FixupBranch pNegative = J_CC(CC_S); + MOV(8, M(&PowerPC::ppcState.cr_fast[0]), Imm8(0x4)); // Result > 0 + FixupBranch continue1 = J(); + + SetJumpTarget(pNegative); + MOV(8, M(&PowerPC::ppcState.cr_fast[0]), Imm8(0x8)); // Result < 0 + FixupBranch continue2 = J(); + + SetJumpTarget(pZero); + MOV(8, M(&PowerPC::ppcState.cr_fast[0]), Imm8(0x2)); // Result == 0 + + SetJumpTarget(continue1); + SetJumpTarget(continue2); +} + void Jit64::ComputeRC(const Gen::OpArg & arg) { if( arg.IsImm() ) { @@ -79,11 +155,20 @@ void Jit64::regimmop(int d, int a, bool binary, u32 value, Operation doop, void if (gpr.R(a).IsImm() && !carry) { gpr.SetImmediate32(d, doop((u32)gpr.R(a).offset, value)); + if (Rc) + { + ComputeRC(gpr.R(d)); + } } else if (a == d) { gpr.KillImmediate(d, true, true); (this->*op)(32, gpr.R(d), Imm32(value)); //m_GPR[d] = m_GPR[_inst.RA] + _inst.SIMM_16; + if (Rc) + { + // All of the possible passed operators affect Sign/Zero flags + GenerateRC(); + } if (carry) GenerateCarry(); } @@ -92,6 +177,11 @@ void Jit64::regimmop(int d, int a, bool binary, u32 value, Operation doop, void gpr.BindToRegister(d, false); MOV(32, gpr.R(d), gpr.R(a)); (this->*op)(32, gpr.R(d), Imm32(value)); //m_GPR[d] = m_GPR[_inst.RA] + _inst.SIMM_16; + if (Rc) + { + // All of the possible passed operators affect Sign/Zero flags + GenerateRC(); + } if (carry) GenerateCarry(); } @@ -100,15 +190,15 @@ void Jit64::regimmop(int d, int a, bool binary, u32 value, Operation doop, void { // a == 0, which for these instructions imply value = 0 gpr.SetImmediate32(d, value); + if (Rc) + { + ComputeRC(gpr.R(d)); + } } else { _assert_msg_(DYNA_REC, 0, "WTF regimmop"); } - if (Rc) - { - ComputeRC(gpr.R(d)); - } gpr.UnlockAll(); } @@ -435,6 +525,10 @@ void Jit64::boolX(UGeckoInstruction inst) gpr.SetImmediate32(a, (u32)gpr.R(s).offset ^ (u32)gpr.R(b).offset); else if (inst.SUBOP10 == 284) /* eqvx */ gpr.SetImmediate32(a, ~((u32)gpr.R(s).offset ^ (u32)gpr.R(b).offset)); + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } else if (s == b) { @@ -475,6 +569,10 @@ void Jit64::boolX(UGeckoInstruction inst) { PanicAlert("WTF!"); } + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } else if ((a == s) || (a == b)) { @@ -485,11 +583,19 @@ void Jit64::boolX(UGeckoInstruction inst) if (inst.SUBOP10 == 28) /* andx */ { AND(32, gpr.R(a), operand); + if (inst.Rc) + { + GenerateRC(); + } } else if (inst.SUBOP10 == 476) /* nandx */ { AND(32, gpr.R(a), operand); NOT(32, gpr.R(a)); + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } else if (inst.SUBOP10 == 60) /* andcx */ { @@ -504,15 +610,27 @@ void Jit64::boolX(UGeckoInstruction inst) NOT(32, R(EAX)); AND(32, gpr.R(a), R(EAX)); } + if (inst.Rc) + { + GenerateRC(); + } } else if (inst.SUBOP10 == 444) /* orx */ { OR(32, gpr.R(a), operand); + if (inst.Rc) + { + GenerateRC(); + } } else if (inst.SUBOP10 == 124) /* norx */ { OR(32, gpr.R(a), operand); NOT(32, gpr.R(a)); + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } else if (inst.SUBOP10 == 412) /* orcx */ { @@ -527,15 +645,27 @@ void Jit64::boolX(UGeckoInstruction inst) NOT(32, R(EAX)); OR(32, gpr.R(a), R(EAX)); } + if (inst.Rc) + { + GenerateRC(); + } } else if (inst.SUBOP10 == 316) /* xorx */ { XOR(32, gpr.R(a), operand); + if (inst.Rc) + { + GenerateRC(); + } } else if (inst.SUBOP10 == 284) /* eqvx */ { - XOR(32, gpr.R(a), operand); NOT(32, gpr.R(a)); + XOR(32, gpr.R(a), operand); + if (inst.Rc) + { + GenerateRC(); + } } else { @@ -552,46 +682,78 @@ void Jit64::boolX(UGeckoInstruction inst) { MOV(32, gpr.R(a), gpr.R(s)); AND(32, gpr.R(a), gpr.R(b)); + if (inst.Rc) + { + GenerateRC(); + } } else if (inst.SUBOP10 == 476) /* nandx */ { MOV(32, gpr.R(a), gpr.R(s)); AND(32, gpr.R(a), gpr.R(b)); NOT(32, gpr.R(a)); + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } else if (inst.SUBOP10 == 60) /* andcx */ { MOV(32, gpr.R(a), gpr.R(b)); NOT(32, gpr.R(a)); AND(32, gpr.R(a), gpr.R(s)); + if (inst.Rc) + { + GenerateRC(); + } } else if (inst.SUBOP10 == 444) /* orx */ { MOV(32, gpr.R(a), gpr.R(s)); OR(32, gpr.R(a), gpr.R(b)); + if (inst.Rc) + { + GenerateRC(); + } } else if (inst.SUBOP10 == 124) /* norx */ { MOV(32, gpr.R(a), gpr.R(s)); OR(32, gpr.R(a), gpr.R(b)); NOT(32, gpr.R(a)); + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } else if (inst.SUBOP10 == 412) /* orcx */ { MOV(32, gpr.R(a), gpr.R(b)); NOT(32, gpr.R(a)); OR(32, gpr.R(a), gpr.R(s)); + if (inst.Rc) + { + GenerateRC(); + } } else if (inst.SUBOP10 == 316) /* xorx */ { MOV(32, gpr.R(a), gpr.R(s)); XOR(32, gpr.R(a), gpr.R(b)); + if (inst.Rc) + { + GenerateRC(); + } } else if (inst.SUBOP10 == 284) /* eqvx */ { MOV(32, gpr.R(a), gpr.R(s)); - XOR(32, gpr.R(a), gpr.R(b)); NOT(32, gpr.R(a)); + XOR(32, gpr.R(a), gpr.R(b)); + if (inst.Rc) + { + GenerateRC(); + } } else { @@ -599,11 +761,6 @@ void Jit64::boolX(UGeckoInstruction inst) } gpr.UnlockAll(); } - - if (inst.Rc) - { - ComputeRC(gpr.R(a)); - } } void Jit64::extsbx(UGeckoInstruction inst) @@ -670,11 +827,45 @@ void Jit64::subfic(UGeckoInstruction inst) gpr.Lock(a, d); gpr.BindToRegister(d, a == d, true); int imm = inst.SIMM_16; - MOV(32, R(EAX), gpr.R(a)); - NOT(32, R(EAX)); - ADD(32, R(EAX), Imm32(imm + 1)); - MOV(32, gpr.R(d), R(EAX)); - GenerateCarry(); + if (d == a) + { + if (imm == 0) + { + JitClearCA(); + // Flags act exactly like subtracting from 0 + NEG(32, gpr.R(d)); + // Output carry is inverted + FixupBranch carry1 = J_CC(CC_C); + JitSetCA(); + SetJumpTarget(carry1); + } + else if (imm == -1) + { + // CA is always set in this case + JitSetCA(); + NOT(32, gpr.R(d)); + } + else + { + JitClearCA(); + NOT(32, gpr.R(d)); + ADD(32, gpr.R(d), Imm32(imm+1)); + // Output carry is normal + FixupBranch carry1 = J_CC(CC_NC); + JitSetCA(); + SetJumpTarget(carry1); + } + } + else + { + JitClearCA(); + MOV(32, gpr.R(d), Imm32(imm)); + SUB(32, gpr.R(d), gpr.R(a)); + // Output carry is inverted + FixupBranch carry1 = J_CC(CC_C); + JitSetCA(); + SetJumpTarget(carry1); + } gpr.UnlockAll(); // This instruction has no RC flag } @@ -687,37 +878,28 @@ void Jit64::subfcx(UGeckoInstruction inst) gpr.Lock(a, b, d); gpr.BindToRegister(d, (d == a || d == b), true); - // For some reason, I could not get the jit versions of sub* - // working with x86 sub...so we use the ~a + b + 1 method JitClearCA(); - MOV(32, R(EAX), gpr.R(a)); - NOT(32, R(EAX)); - ADD(32, R(EAX), gpr.R(b)); - FixupBranch carry1 = J_CC(CC_NC); - JitSetCA(); - SetJumpTarget(carry1); - ADD(32, R(EAX), Imm32(1)); - FixupBranch carry2 = J_CC(CC_NC); - JitSetCA(); - SetJumpTarget(carry2); - MOV(32, gpr.R(d), R(EAX)); - - gpr.UnlockAll(); - if (inst.OE) + if (d == b) { - FixupBranch jno = J_CC(CC_NO); - //XER[OV/SO] = 1 - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK)); - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_OV_MASK)); - FixupBranch exit = J(); - SetJumpTarget(jno); - //XER[OV] = 0 - AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); - SetJumpTarget(exit); + SUB(32, gpr.R(d), gpr.R(a)); + } + else if (d == a) + { + MOV(32, R(EAX), gpr.R(a)); + MOV(32, gpr.R(d), gpr.R(b)); + SUB(32, gpr.R(d), R(EAX)); + } + else + { + MOV(32, gpr.R(d), gpr.R(b)); + SUB(32, gpr.R(d), gpr.R(a)); } if (inst.Rc) { - ComputeRC(R(EAX)); + GenerateRC(); } + GenerateOverflowFinalizeCarry(inst.OE, true); + + gpr.UnlockAll(); } void Jit64::subfex(UGeckoInstruction inst) @@ -729,46 +911,36 @@ void Jit64::subfex(UGeckoInstruction inst) gpr.Lock(a, b, d); gpr.BindToRegister(d, (d == a || d == b), true); - // Get CA - MOV(32, R(ECX), M(&PowerPC::ppcState.spr[SPR_XER])); - SHR(32, R(ECX), Imm8(29)); - AND(32, R(ECX), Imm32(1)); - // Don't need it anymore + // Get CA and clear it + MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); JitClearCA(); - - // ~a + b - MOV(32, R(EAX), gpr.R(a)); - NOT(32, R(EAX)); - ADD(32, R(EAX), gpr.R(b)); - FixupBranch carry1 = J_CC(CC_NC); - JitSetCA(); - SetJumpTarget(carry1); - - // + CA - ADD(32, R(EAX), R(ECX)); - FixupBranch carry2 = J_CC(CC_NC); - JitSetCA(); - SetJumpTarget(carry2); - - MOV(32, gpr.R(d), R(EAX)); + SHR(32, R(EAX), Imm8(30)); + + // Convert carry to borrow + CMC(); + + if (d == b) + { + SBB(32, gpr.R(d), gpr.R(a)); + } + else if (d == a) + { + MOV(32, R(EAX), gpr.R(a)); + MOV(32, gpr.R(d), gpr.R(b)); + SBB(32, gpr.R(d), R(EAX)); + } + else + { + MOV(32, gpr.R(d), gpr.R(b)); + SBB(32, gpr.R(d), gpr.R(a)); + } + if (inst.Rc) { + GenerateRC(); + } + GenerateOverflowFinalizeCarry(inst.OE, true); gpr.UnlockAll(); gpr.UnlockAllX(); - if (inst.OE) - { - FixupBranch jno = J_CC(CC_NO); - //XER[OV/SO] = 1 - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK)); - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_OV_MASK)); - FixupBranch exit = J(); - SetJumpTarget(jno); - //XER[OV] = 0 - AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); - SetJumpTarget(exit); - } - if (inst.Rc) { - ComputeRC(R(EAX)); - } } void Jit64::subfmex(UGeckoInstruction inst) @@ -777,35 +949,24 @@ void Jit64::subfmex(UGeckoInstruction inst) INSTRUCTION_START JITDISABLE(Integer) int a = inst.RA, d = inst.RD; - - if (d == a) + gpr.Lock(a, d); + gpr.BindToRegister(d, d == a); + + MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); + JitClearCA(); + SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag + if (d != a) { - gpr.Lock(d); - gpr.BindToRegister(d, true); - MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag - NOT(32, gpr.R(d)); - ADC(32, gpr.R(d), Imm32(0xFFFFFFFF)); - GenerateCarry(); - gpr.UnlockAll(); - } - else - { - gpr.Lock(a, d); - gpr.BindToRegister(d, false); - MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag MOV(32, gpr.R(d), gpr.R(a)); - NOT(32, gpr.R(d)); - ADC(32, gpr.R(d), Imm32(0xFFFFFFFF)); - GenerateCarry(); - gpr.UnlockAll(); } - - if (inst.Rc) - { - ComputeRC(gpr.R(d)); - } + NOT(32, gpr.R(d)); + ADC(32, gpr.R(d), Imm32(0xFFFFFFFF)); + if (inst.Rc) + { + GenerateRC(); + } + GenerateOverflowFinalizeCarry(inst.OE); + gpr.UnlockAll(); } void Jit64::subfzex(UGeckoInstruction inst) @@ -815,34 +976,24 @@ void Jit64::subfzex(UGeckoInstruction inst) JITDISABLE(Integer) int a = inst.RA, d = inst.RD; - if (d == a) + gpr.Lock(a, d); + gpr.BindToRegister(d, d == a); + MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); + JitClearCA(); + SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag + if (d != a) { - gpr.Lock(d); - gpr.BindToRegister(d, true); - MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag - NOT(32, gpr.R(d)); - ADC(32, gpr.R(d), Imm8(0)); - GenerateCarry(); - gpr.UnlockAll(); - } - else - { - gpr.Lock(a, d); - gpr.BindToRegister(d, false); - MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag MOV(32, gpr.R(d), gpr.R(a)); - NOT(32, gpr.R(d)); - ADC(32, gpr.R(d), Imm8(0)); - GenerateCarry(); - gpr.UnlockAll(); } - - if (inst.Rc) - { - ComputeRC(gpr.R(d)); - } + NOT(32, gpr.R(d)); + ADC(32, gpr.R(d), Imm8(0)); + if (inst.Rc) + { + GenerateRC(); + } + GenerateOverflowFinalizeCarry(inst.OE); + + gpr.UnlockAll(); } void Jit64::subfx(UGeckoInstruction inst) @@ -853,34 +1004,46 @@ void Jit64::subfx(UGeckoInstruction inst) if (gpr.R(a).IsImm() && gpr.R(b).IsImm()) { - gpr.SetImmediate32(d, (u32)gpr.R(b).offset - (u32)gpr.R(a).offset); + s32 i = (s32)gpr.R(b).offset, j = (s32)gpr.R(a).offset; + gpr.SetImmediate32(d, i - j); + if (inst.RC) + { + ComputeRC(gpr.R(d)); + } + if (inst.OE) + { + GenerateConstantOverflow((s64)(i - j) != (s64)i - (s64)j); + } } else { gpr.Lock(a, b, d); gpr.BindToRegister(d, (d == a || d == b), true); - MOV(32, R(EAX), gpr.R(b)); - SUB(32, R(EAX), gpr.R(a)); - MOV(32, gpr.R(d), R(EAX)); + if (d == b) + { + SUB(32, gpr.R(d), gpr.R(a)); + } + else if (d == a) + { + MOV(32, R(EAX), gpr.R(a)); + MOV(32, gpr.R(d), gpr.R(b)); + SUB(32, gpr.R(d), R(EAX)); + } + else + { + MOV(32, gpr.R(d), gpr.R(b)); + SUB(32, gpr.R(d), gpr.R(a)); + } + if (inst.Rc) + { + GenerateRC(); + } + if (inst.OE) + { + GenerateOverflow(); + } gpr.UnlockAll(); } - - if (inst.OE) - { - FixupBranch jno = J_CC(CC_NO); - //XER[OV/SO] = 1 - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK)); - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_OV_MASK)); - FixupBranch exit = J(); - SetJumpTarget(jno); - //XER[OV] = 0 - AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); - SetJumpTarget(exit); - } - if (inst.Rc) - { - ComputeRC(gpr.R(d)); - } } void Jit64::mulli(UGeckoInstruction inst) @@ -911,7 +1074,12 @@ void Jit64::mullwx(UGeckoInstruction inst) if (gpr.R(a).IsImm() && gpr.R(b).IsImm()) { - gpr.SetImmediate32(d, (s32)gpr.R(a).offset * (s32)gpr.R(b).offset); + s32 i = (s32)gpr.R(a).offset, j = (s32)gpr.R(b).offset; + gpr.SetImmediate32(d, i * j); + if (inst.OE) + { + GenerateConstantOverflow((s64)(i*j) != (s64)i * (s64)j); + } } else { @@ -925,21 +1093,12 @@ void Jit64::mullwx(UGeckoInstruction inst) MOV(32, gpr.R(d), gpr.R(b)); IMUL(32, gpr.RX(d), gpr.R(a)); } + if (inst.OE) + { + GenerateOverflow(); + } gpr.UnlockAll(); } - - if (inst.OE) - { - FixupBranch jno = J_CC(CC_NO); - //XER[OV/SO] = 1 - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK)); - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_OV_MASK)); - FixupBranch exit = J(); - SetJumpTarget(jno); - //XER[OV] = 0 - AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); - SetJumpTarget(exit); - } if (inst.Rc) { ComputeRC(gpr.R(d)); @@ -972,7 +1131,9 @@ void Jit64::mulhwux(UGeckoInstruction inst) } if (inst.Rc) + { ComputeRC(gpr.R(d)); + } } void Jit64::divwux(UGeckoInstruction inst) @@ -984,9 +1145,21 @@ void Jit64::divwux(UGeckoInstruction inst) if (gpr.R(a).IsImm() && gpr.R(b).IsImm()) { if( gpr.R(b).offset == 0 ) + { gpr.SetImmediate32(d, 0); + if (inst.OE) + { + GenerateConstantOverflow(true); + } + } else + { gpr.SetImmediate32(d, (u32)gpr.R(a).offset / (u32)gpr.R(b).offset); + if (inst.OE) + { + GenerateConstantOverflow(false); + } + } } else { @@ -1000,28 +1173,24 @@ void Jit64::divwux(UGeckoInstruction inst) // doesn't handle if OE is set, but int doesn't either... FixupBranch not_div_by_zero = J_CC(CC_NZ); MOV(32, gpr.R(d), R(EDX)); - MOV(32, R(EAX), gpr.R(d)); + if (inst.OE) + { + GenerateConstantOverflow(true); + } + //MOV(32, R(EAX), gpr.R(d)); FixupBranch end = J(); SetJumpTarget(not_div_by_zero); DIV(32, gpr.R(b)); MOV(32, gpr.R(d), R(EAX)); + if (inst.OE) + { + GenerateConstantOverflow(false); + } SetJumpTarget(end); gpr.UnlockAll(); gpr.UnlockAllX(); } - if (inst.OE) - { - FixupBranch jno = J_CC(CC_NO); - //XER[OV/SO] = 1 - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK)); - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_OV_MASK)); - FixupBranch exit = J(); - SetJumpTarget(jno); - //XER[OV] = 0 - AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); - SetJumpTarget(exit); - } if (inst.Rc) { ComputeRC(gpr.R(d)); @@ -1036,9 +1205,18 @@ void Jit64::addx(UGeckoInstruction inst) if (gpr.R(a).IsImm() && gpr.R(b).IsImm()) { - gpr.SetImmediate32(d, (u32)gpr.R(a).offset + (u32)gpr.R(b).offset); + s32 i = (s32)gpr.R(a).offset, j = (s32)gpr.R(b).offset; + gpr.SetImmediate32(d, i + j); + if (inst.Rc) + { + ComputeRC(gpr.R(d)); + } + if (inst.OE) + { + GenerateConstantOverflow((s64)(i + j) != (s64)i + (s64)j); + } } - else if (gpr.R(a).IsSimpleReg() && gpr.R(b).IsSimpleReg()) + else if (gpr.R(a).IsSimpleReg() && gpr.R(b).IsSimpleReg() && !inst.Rc && !inst.OE) { gpr.Lock(a, b, d); gpr.BindToRegister(d, false); @@ -1051,6 +1229,14 @@ void Jit64::addx(UGeckoInstruction inst) gpr.Lock(a, b, d); gpr.BindToRegister(d, true); ADD(32, gpr.R(d), gpr.R(operand)); + if (inst.Rc) + { + GenerateRC(); + } + if (inst.OE) + { + GenerateOverflow(); + } gpr.UnlockAll(); } else @@ -1059,26 +1245,16 @@ void Jit64::addx(UGeckoInstruction inst) gpr.BindToRegister(d, false); MOV(32, gpr.R(d), gpr.R(a)); ADD(32, gpr.R(d), gpr.R(b)); + if (inst.Rc) + { + GenerateRC(); + } + if (inst.OE) + { + GenerateOverflow(); + } gpr.UnlockAll(); } - - if (inst.OE) - { - FixupBranch jno = J_CC(CC_NO); - //XER[OV/SO] = 1 - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK)); - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_OV_MASK)); - FixupBranch exit = J(); - SetJumpTarget(jno); - //XER[OV] = 0 - AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); - SetJumpTarget(exit); - } - - if (inst.Rc) - { - ComputeRC(gpr.R(d)); - } } void Jit64::addex(UGeckoInstruction inst) @@ -1093,9 +1269,14 @@ void Jit64::addex(UGeckoInstruction inst) gpr.Lock(a, b, d); gpr.BindToRegister(d, true); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); + JitClearCA(); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag ADC(32, gpr.R(d), gpr.R((d == a) ? b : a)); - GenerateCarry(); + if (inst.Rc) + { + GenerateRC(); + } + GenerateOverflowFinalizeCarry(inst.OE); gpr.UnlockAll(); } else @@ -1103,17 +1284,17 @@ void Jit64::addex(UGeckoInstruction inst) gpr.Lock(a, b, d); gpr.BindToRegister(d, false); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); + JitClearCA(); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag MOV(32, gpr.R(d), gpr.R(a)); ADC(32, gpr.R(d), gpr.R(b)); - GenerateCarry(); + if (inst.Rc) + { + GenerateRC(); + } + GenerateOverflowFinalizeCarry(inst.OE); gpr.UnlockAll(); } - - if (inst.Rc) - { - ComputeRC(gpr.R(d)); - } } void Jit64::addcx(UGeckoInstruction inst) @@ -1127,37 +1308,29 @@ void Jit64::addcx(UGeckoInstruction inst) int operand = ((d == a) ? b : a); gpr.Lock(a, b, d); gpr.BindToRegister(d, true); + JitClearCA(); ADD(32, gpr.R(d), gpr.R(operand)); - GenerateCarry(); + if (inst.Rc) + { + GenerateRC(); + } + GenerateOverflowFinalizeCarry(inst.OE); gpr.UnlockAll(); } else { gpr.Lock(a, b, d); gpr.BindToRegister(d, false); + JitClearCA(); MOV(32, gpr.R(d), gpr.R(a)); ADD(32, gpr.R(d), gpr.R(b)); - GenerateCarry(); + if (inst.Rc) + { + GenerateRC(); + } + GenerateOverflowFinalizeCarry(inst.OE); gpr.UnlockAll(); } - - if (inst.OE) - { - FixupBranch jno = J_CC(CC_NO); - //XER[OV/SO] = 1 - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK)); - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_OV_MASK)); - FixupBranch exit = J(); - SetJumpTarget(jno); - //XER[OV] = 0 - AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); - SetJumpTarget(exit); - } - - if (inst.Rc) - { - ComputeRC(gpr.R(d)); - } } void Jit64::addmex(UGeckoInstruction inst) @@ -1172,9 +1345,14 @@ void Jit64::addmex(UGeckoInstruction inst) gpr.Lock(d); gpr.BindToRegister(d, true); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); + JitClearCA(); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag ADC(32, gpr.R(d), Imm32(0xFFFFFFFF)); - GenerateCarry(); + if (inst.Rc) + { + GenerateRC(); + } + GenerateOverflowFinalizeCarry(inst.OE); gpr.UnlockAll(); } else @@ -1182,17 +1360,17 @@ void Jit64::addmex(UGeckoInstruction inst) gpr.Lock(a, d); gpr.BindToRegister(d, false); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); + JitClearCA(); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag MOV(32, gpr.R(d), gpr.R(a)); ADC(32, gpr.R(d), Imm32(0xFFFFFFFF)); - GenerateCarry(); + if (inst.Rc) + { + GenerateRC(); + } + GenerateOverflowFinalizeCarry(inst.OE); gpr.UnlockAll(); } - - if (inst.Rc) - { - ComputeRC(gpr.R(d)); - } } void Jit64::addzex(UGeckoInstruction inst) @@ -1207,9 +1385,14 @@ void Jit64::addzex(UGeckoInstruction inst) gpr.Lock(d); gpr.BindToRegister(d, true); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); + JitClearCA(); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag ADC(32, gpr.R(d), Imm8(0)); - GenerateCarry(); + if (inst.Rc) + { + GenerateRC(); + } + GenerateOverflowFinalizeCarry(inst.OE); gpr.UnlockAll(); } else @@ -1217,17 +1400,17 @@ void Jit64::addzex(UGeckoInstruction inst) gpr.Lock(a, d); gpr.BindToRegister(d, false); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); + JitClearCA(); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag MOV(32, gpr.R(d), gpr.R(a)); ADC(32, gpr.R(d), Imm8(0)); - GenerateCarry(); + if (inst.Rc) + { + GenerateRC(); + } + GenerateOverflowFinalizeCarry(inst.OE); gpr.UnlockAll(); } - - if (inst.Rc) - { - ComputeRC(gpr.R(d)); - } } void Jit64::rlwinmx(UGeckoInstruction inst) @@ -1360,6 +1543,14 @@ void Jit64::negx(UGeckoInstruction inst) if (gpr.R(a).IsImm()) { gpr.SetImmediate32(d, ~((u32)gpr.R(a).offset) + 1); + if (inst.Rc) + { + ComputeRC(gpr.R(d)); + } + if (inst.OE) + { + GenerateConstantOverflow(gpr.R(d).offset == 0x80000000); + } } else { @@ -1368,13 +1559,16 @@ void Jit64::negx(UGeckoInstruction inst) if (a != d) MOV(32, gpr.R(d), gpr.R(a)); NEG(32, gpr.R(d)); + if (inst.Rc) + { + GenerateRC(); + } + if (inst.OE) + { + GenerateOverflow(); + } gpr.UnlockAll(); } - - if (inst.Rc) - { - ComputeRC(gpr.R(d)); - } } void Jit64::srwx(UGeckoInstruction inst) From 8d673541797d6008965da1f2d895e69bfdb101b5 Mon Sep 17 00:00:00 2001 From: calc84maniac Date: Mon, 2 Jan 2012 04:00:47 -0500 Subject: [PATCH 226/381] Fixed a bad typo. Why are there different inst.Rc and inst.RC variables? >_> --- Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index 6d6626dfdf..5af80baf5d 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -1006,7 +1006,7 @@ void Jit64::subfx(UGeckoInstruction inst) { s32 i = (s32)gpr.R(b).offset, j = (s32)gpr.R(a).offset; gpr.SetImmediate32(d, i - j); - if (inst.RC) + if (inst.Rc) { ComputeRC(gpr.R(d)); } From 67e38fb6c654cae2e693fabe520f5c3a94970850 Mon Sep 17 00:00:00 2001 From: skidau Date: Tue, 3 Jan 2012 01:17:52 +1100 Subject: [PATCH 227/381] Fixed the safe write path of the stfd instruction in the JIT. Fixes issue 4001. --- .../PowerPC/Jit64/Jit_LoadStoreFloating.cpp | 99 ++++++++----------- 1 file changed, 41 insertions(+), 58 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp index 55990d6abf..46e888f935 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp @@ -172,80 +172,63 @@ void Jit64::stfd(UGeckoInstruction inst) int s = inst.RS; int a = inst.RA; - if (!a) - { - Default(inst); - return; + + u32 mem_mask = Memory::ADDR_MASK_HW_ACCESS; + if (Core::g_CoreStartupParameter.bMMU || + Core::g_CoreStartupParameter.iTLBHack) { + mem_mask |= Memory::ADDR_MASK_MEM1; } - s32 offset = (s32)(s16)inst.SIMM_16; +#ifdef ENABLE_MEM_CHECK + if (Core::g_CoreStartupParameter.bEnableDebugging) + { + mem_mask |= Memory::EXRAM_MASK; + } +#endif + gpr.FlushLockX(ABI_PARAM1); gpr.Lock(a); fpr.Lock(s); gpr.BindToRegister(a, true, false); + + s32 offset = (s32)(s16)inst.SIMM_16; LEA(32, ABI_PARAM1, MDisp(gpr.R(a).GetSimpleReg(), offset)); - TEST(32, R(ABI_PARAM1), Imm32(0x0c000000)); - FixupBranch not_ram = J_CC(CC_Z); - // Assume that any hardware writes using this instruction will go to the FIFO. - // Star Wars - The Force Unleashed uses this trick. + TEST(32, R(ABI_PARAM1), Imm32(mem_mask)); + FixupBranch safe = J_CC(CC_NZ); + + // Fast routine if (cpu_info.bSSSE3) { MOVAPD(XMM0, fpr.R(s)); - PSHUFB(XMM0, M((void *)bswapShuffle1x8)); - CALL(asm_routines.fifoDirectWriteXmm64); - } else { - // This ain't working yet - MOVAPD(XMM0, fpr.R(s)); - MOVQ_xmm(M(&temp64), XMM0); - MOV(32, R(EAX), M(&temp64)); - MOV(32, R(ABI_PARAM1), M((void*)((u8 *)&temp64 + 4))); - BSWAP(32, EAX); - BSWAP(32, ABI_PARAM1); - MOV(32, M(((u8 *)&temp64) + 4), R(EAX)); - MOV(32, M((u8 *)&temp64), R(ABI_PARAM1)); - MOVQ_xmm(XMM0, M(&temp64)); - CALL(asm_routines.fifoDirectWriteXmm64); - } - FixupBranch quit = J(false); - SetJumpTarget(not_ram); -#ifdef _M_IX86 - AND(32, R(ABI_PARAM1), Imm32(Memory::MEMVIEW32_MASK)); -#endif - if (cpu_info.bSSSE3) { - MOVAPD(XMM0, fpr.R(s)); - PSHUFB(XMM0, M((void *)bswapShuffle1x8)); + PSHUFB(XMM0, M((void*)bswapShuffle1x8)); #ifdef _M_X64 MOVQ_xmm(MComplex(RBX, ABI_PARAM1, SCALE_1, 0), XMM0); #else + AND(32, R(ECX), Imm32(Memory::MEMVIEW32_MASK)); MOVQ_xmm(MDisp(ABI_PARAM1, (u32)Memory::base), XMM0); #endif } else { -#ifdef _M_X64 - fpr.BindToRegister(s, true, false); - MOVSD(M(&temp64), fpr.RX(s)); + MOVAPD(XMM0, fpr.R(s)); + MOVD_xmm(R(EAX), XMM0); + UnsafeWriteRegToReg(EAX, ABI_PARAM1, 32, 4); - MEMCHECK_START - - MOV(64, R(EAX), M(&temp64)); - BSWAP(64, EAX); - MOV(64, MComplex(RBX, ABI_PARAM1, SCALE_1, 0), R(EAX)); - - MEMCHECK_END -#else - fpr.BindToRegister(s, true, false); - MOVSD(M(&temp64), fpr.RX(s)); - - MEMCHECK_START - - MOV(32, R(EAX), M(&temp64)); - BSWAP(32, EAX); - MOV(32, MDisp(ABI_PARAM1, (u32)Memory::base + 4), R(EAX)); - MOV(32, R(EAX), M((void*)((u8 *)&temp64 + 4))); - BSWAP(32, EAX); - MOV(32, MDisp(ABI_PARAM1, (u32)Memory::base), R(EAX)); - - MEMCHECK_END -#endif + PSRLQ(XMM0, 32); + MOVD_xmm(R(EAX), XMM0); + UnsafeWriteRegToReg(EAX, ABI_PARAM1, 32, 0); } - SetJumpTarget(quit); + FixupBranch exit = J(); + SetJumpTarget(safe); + + // Safe but slow routine + MOVAPD(XMM0, fpr.R(s)); + MOVD_xmm(R(EAX), XMM0); + SafeWriteRegToReg(EAX, ABI_PARAM1, 32, 4); + + PSRLQ(XMM0, 32); + MOVD_xmm(R(EAX), XMM0); + LEA(32, ABI_PARAM1, MDisp(gpr.R(a).GetSimpleReg(), offset)); + SafeWriteRegToReg(EAX, ABI_PARAM1, 32, 0); + + SetJumpTarget(exit); + gpr.UnlockAll(); gpr.UnlockAllX(); fpr.UnlockAll(); From a2bd91b7266826199ba4b407ac22639d4cd9334d Mon Sep 17 00:00:00 2001 From: calc84maniac Date: Mon, 2 Jan 2012 11:50:01 -0500 Subject: [PATCH 228/381] Removed an extraneous FlushLockX, further optimized simultaneous handling of carry/overflow. --- Source/Core/Core/Src/PowerPC/Jit64/Jit.h | 2 +- .../Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 58 +++++++++---------- .../Core/Src/PowerPC/JitCommon/Jit_Util.cpp | 8 +++ .../Core/Src/PowerPC/JitCommon/Jit_Util.h | 1 + 4 files changed, 37 insertions(+), 32 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h index 832417f82f..9d9b57658b 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h @@ -149,7 +149,7 @@ public: void GenerateConstantOverflow(bool overflow); void GenerateOverflow(); - void GenerateOverflowFinalizeCarry(bool oe, bool inv = false); + void FinalizeCarryOverflow(bool oe, bool inv = false); void GenerateCarry(); void GenerateRC(); void ComputeRC(const Gen::OpArg & arg); diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index 5af80baf5d..b246a2cc9e 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -50,8 +50,8 @@ void Jit64::GenerateOverflow() SetJumpTarget(exit); } -// Assumes CA is clear -void Jit64::GenerateOverflowFinalizeCarry(bool oe, bool inv) +// Assumes CA,OV are clear +void Jit64::FinalizeCarryOverflow(bool oe, bool inv) { // USES_XER if (oe) @@ -69,8 +69,6 @@ void Jit64::GenerateOverflowFinalizeCarry(bool oe, bool inv) FixupBranch carry2 = J_CC(inv ? CC_C : CC_NC); JitSetCA(); SetJumpTarget(carry2); - //XER[OV] = 0 - AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); SetJumpTarget(exit); } else @@ -878,7 +876,7 @@ void Jit64::subfcx(UGeckoInstruction inst) gpr.Lock(a, b, d); gpr.BindToRegister(d, (d == a || d == b), true); - JitClearCA(); + JitClearCAOV(inst.OE); if (d == b) { SUB(32, gpr.R(d), gpr.R(a)); @@ -897,7 +895,7 @@ void Jit64::subfcx(UGeckoInstruction inst) if (inst.Rc) { GenerateRC(); } - GenerateOverflowFinalizeCarry(inst.OE, true); + FinalizeCarryOverflow(inst.OE, true); gpr.UnlockAll(); } @@ -907,13 +905,12 @@ void Jit64::subfex(UGeckoInstruction inst) INSTRUCTION_START; JITDISABLE(Integer) int a = inst.RA, b = inst.RB, d = inst.RD; - gpr.FlushLockX(ECX); gpr.Lock(a, b, d); gpr.BindToRegister(d, (d == a || d == b), true); - // Get CA and clear it + // Get CA and clear it (along with OV if applicable) MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCA(); + JitClearCAOV(inst.OE); SHR(32, R(EAX), Imm8(30)); // Convert carry to borrow @@ -937,10 +934,9 @@ void Jit64::subfex(UGeckoInstruction inst) if (inst.Rc) { GenerateRC(); } - GenerateOverflowFinalizeCarry(inst.OE, true); + FinalizeCarryOverflow(inst.OE, true); gpr.UnlockAll(); - gpr.UnlockAllX(); } void Jit64::subfmex(UGeckoInstruction inst) @@ -953,7 +949,7 @@ void Jit64::subfmex(UGeckoInstruction inst) gpr.BindToRegister(d, d == a); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCA(); + JitClearCAOV(inst.OE); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag if (d != a) { @@ -965,7 +961,7 @@ void Jit64::subfmex(UGeckoInstruction inst) { GenerateRC(); } - GenerateOverflowFinalizeCarry(inst.OE); + FinalizeCarryOverflow(inst.OE); gpr.UnlockAll(); } @@ -979,7 +975,7 @@ void Jit64::subfzex(UGeckoInstruction inst) gpr.Lock(a, d); gpr.BindToRegister(d, d == a); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCA(); + JitClearCAOV(inst.OE); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag if (d != a) { @@ -991,7 +987,7 @@ void Jit64::subfzex(UGeckoInstruction inst) { GenerateRC(); } - GenerateOverflowFinalizeCarry(inst.OE); + FinalizeCarryOverflow(inst.OE); gpr.UnlockAll(); } @@ -1269,14 +1265,14 @@ void Jit64::addex(UGeckoInstruction inst) gpr.Lock(a, b, d); gpr.BindToRegister(d, true); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCA(); + JitClearCAOV(inst.OE); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag ADC(32, gpr.R(d), gpr.R((d == a) ? b : a)); if (inst.Rc) { GenerateRC(); } - GenerateOverflowFinalizeCarry(inst.OE); + FinalizeCarryOverflow(inst.OE); gpr.UnlockAll(); } else @@ -1284,7 +1280,7 @@ void Jit64::addex(UGeckoInstruction inst) gpr.Lock(a, b, d); gpr.BindToRegister(d, false); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCA(); + JitClearCAOV(inst.OE); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag MOV(32, gpr.R(d), gpr.R(a)); ADC(32, gpr.R(d), gpr.R(b)); @@ -1292,7 +1288,7 @@ void Jit64::addex(UGeckoInstruction inst) { GenerateRC(); } - GenerateOverflowFinalizeCarry(inst.OE); + FinalizeCarryOverflow(inst.OE); gpr.UnlockAll(); } } @@ -1308,27 +1304,27 @@ void Jit64::addcx(UGeckoInstruction inst) int operand = ((d == a) ? b : a); gpr.Lock(a, b, d); gpr.BindToRegister(d, true); - JitClearCA(); + JitClearCAOV(inst.OE); ADD(32, gpr.R(d), gpr.R(operand)); if (inst.Rc) { GenerateRC(); } - GenerateOverflowFinalizeCarry(inst.OE); + FinalizeCarryOverflow(inst.OE); gpr.UnlockAll(); } else { gpr.Lock(a, b, d); gpr.BindToRegister(d, false); - JitClearCA(); + JitClearCAOV(inst.OE); MOV(32, gpr.R(d), gpr.R(a)); ADD(32, gpr.R(d), gpr.R(b)); if (inst.Rc) { GenerateRC(); } - GenerateOverflowFinalizeCarry(inst.OE); + FinalizeCarryOverflow(inst.OE); gpr.UnlockAll(); } } @@ -1345,14 +1341,14 @@ void Jit64::addmex(UGeckoInstruction inst) gpr.Lock(d); gpr.BindToRegister(d, true); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCA(); + JitClearCAOV(inst.OE); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag ADC(32, gpr.R(d), Imm32(0xFFFFFFFF)); if (inst.Rc) { GenerateRC(); } - GenerateOverflowFinalizeCarry(inst.OE); + FinalizeCarryOverflow(inst.OE); gpr.UnlockAll(); } else @@ -1360,7 +1356,7 @@ void Jit64::addmex(UGeckoInstruction inst) gpr.Lock(a, d); gpr.BindToRegister(d, false); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCA(); + JitClearCAOV(inst.OE); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag MOV(32, gpr.R(d), gpr.R(a)); ADC(32, gpr.R(d), Imm32(0xFFFFFFFF)); @@ -1368,7 +1364,7 @@ void Jit64::addmex(UGeckoInstruction inst) { GenerateRC(); } - GenerateOverflowFinalizeCarry(inst.OE); + FinalizeCarryOverflow(inst.OE); gpr.UnlockAll(); } } @@ -1385,14 +1381,14 @@ void Jit64::addzex(UGeckoInstruction inst) gpr.Lock(d); gpr.BindToRegister(d, true); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCA(); + JitClearCAOV(inst.OE); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag ADC(32, gpr.R(d), Imm8(0)); if (inst.Rc) { GenerateRC(); } - GenerateOverflowFinalizeCarry(inst.OE); + FinalizeCarryOverflow(inst.OE); gpr.UnlockAll(); } else @@ -1400,7 +1396,7 @@ void Jit64::addzex(UGeckoInstruction inst) gpr.Lock(a, d); gpr.BindToRegister(d, false); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCA(); + JitClearCAOV(inst.OE); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag MOV(32, gpr.R(d), gpr.R(a)); ADC(32, gpr.R(d), Imm8(0)); @@ -1408,7 +1404,7 @@ void Jit64::addzex(UGeckoInstruction inst) { GenerateRC(); } - GenerateOverflowFinalizeCarry(inst.OE); + FinalizeCarryOverflow(inst.OE); gpr.UnlockAll(); } } diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp index 8abf0fc18a..b1f8a01f96 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp @@ -352,3 +352,11 @@ void EmuCodeBlock::JitSetCA() { OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_CA_MASK)); //XER.CA = 1 } + +void EmuCodeBlock::JitClearCAOV(bool oe) +{ + if (oe) + AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_CA_MASK & ~XER_OV_MASK)); //XER.CA, XER.OV = 0 + else + AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_CA_MASK)); //XER.CA = 0 +} \ No newline at end of file diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.h b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.h index 70d4e294e4..e151c5e914 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.h +++ b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.h @@ -38,6 +38,7 @@ public: void WriteFloatToConstRamAddress(const Gen::X64Reg& xmm_reg, u32 address); void JitClearCA(); void JitSetCA(); + void JitClearCAOV(bool oe); void ForceSinglePrecisionS(Gen::X64Reg xmm); void ForceSinglePrecisionP(Gen::X64Reg xmm); From 7d262ff1f423ba44d931d3cd79f837446c36ee0f Mon Sep 17 00:00:00 2001 From: calc84maniac Date: Mon, 2 Jan 2012 15:07:36 -0500 Subject: [PATCH 229/381] rlwimix optimizations --- .../Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 78 ++++++++++++++++--- 1 file changed, 66 insertions(+), 12 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index b246a2cc9e..cfac1728d6 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -1476,25 +1476,79 @@ void Jit64::rlwimix(UGeckoInstruction inst) { u32 mask = Helper_Mask(inst.MB,inst.ME); gpr.SetImmediate32(a, ((u32)gpr.R(a).offset & ~mask) | (_rotl((u32)gpr.R(s).offset,inst.SH) & mask)); + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } else { gpr.Lock(a, s); - gpr.KillImmediate(a, true, true); + gpr.BindToRegister(a, true, true); u32 mask = Helper_Mask(inst.MB, inst.ME); - MOV(32, R(EAX), gpr.R(s)); - AND(32, gpr.R(a), Imm32(~mask)); - if (inst.SH) - ROL(32, R(EAX), Imm8(inst.SH)); - AND(32, R(EAX), Imm32(mask)); - OR(32, gpr.R(a), R(EAX)); + if (mask == 0 || (a == s && inst.SH == 0)) + { + if (inst.RC) + { + ComputeRC(gpr.R(a)); + } + } + else if (mask == 0xFFFFFFFF) + { + if (a != s) + { + MOV(32, gpr.R(a), gpr.R(s)); + } + if (inst.SH) + { + ROL(32, gpr.R(a), Imm8(inst.SH)); + } + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } + } + else if (inst.SH) + { + if (mask == -(1 << inst.SH)) + { + MOV(32, R(EAX), gpr.R(s)); + SHL(32, R(EAX), Imm8(inst.SH)); + AND(32, gpr.R(a), Imm32(~mask)); + OR(32, gpr.R(a), R(EAX)); + } + else if (mask == (1 << inst.SH) - 1) + { + MOV(32, R(EAX), gpr.R(s)); + SHR(32, R(EAX), Imm8(32-inst.SH)); + AND(32, gpr.R(a), Imm32(~mask)); + OR(32, gpr.R(a), R(EAX)); + } + else + { + MOV(32, R(EAX), gpr.R(s)); + ROL(32, R(EAX), Imm8(inst.SH)); + XOR(32, R(EAX), gpr.R(a)); + AND(32, R(EAX), Imm32(mask)); + XOR(32, gpr.R(a), R(EAX)); + } + if (inst.Rc) + { + GenerateRC(); + } + } + else + { + XOR(32, gpr.R(a), gpr.R(s)); + AND(32, gpr.R(a), Imm32(~mask)); + XOR(32, gpr.R(a), gpr.R(s)); + if (inst.Rc) + { + GenerateRC(); + } + } gpr.UnlockAll(); } - - if (inst.Rc) - { - ComputeRC(gpr.R(a)); - } } void Jit64::rlwnmx(UGeckoInstruction inst) From ce807720074de5e3b27cfb4fc06005c38f6b7fc6 Mon Sep 17 00:00:00 2001 From: calc84maniac Date: Mon, 2 Jan 2012 17:30:54 -0500 Subject: [PATCH 230/381] rolwinmix and rlwnmx optimizations, another Rc/RC typo fixed --- .../Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index cfac1728d6..bf57681295 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -1556,31 +1556,35 @@ void Jit64::rlwnmx(UGeckoInstruction inst) INSTRUCTION_START JITDISABLE(Integer) int a = inst.RA, b = inst.RB, s = inst.RS; - + u32 mask = Helper_Mask(inst.MB, inst.ME); if (gpr.R(b).IsImm() && gpr.R(s).IsImm()) { gpr.SetImmediate32(a, _rotl((u32)gpr.R(s).offset, (u32)gpr.R(b).offset & 0x1F) & mask); + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } else { gpr.FlushLockX(ECX); gpr.Lock(a, b, s); - gpr.KillImmediate(a, (a == s || a == b), true); - MOV(32, R(EAX), gpr.R(s)); + gpr.BindToRegister(a, true, true); MOV(32, R(ECX), gpr.R(b)); - AND(32, R(ECX), Imm32(0x1f)); - ROL(32, R(EAX), R(ECX)); - AND(32, R(EAX), Imm32(mask)); - MOV(32, gpr.R(a), R(EAX)); + if (a != s) + { + MOV(32, gpr.R(a), gpr.R(s)); + } + ROL(32, gpr.R(a), R(ECX)); + AND(32, gpr.R(a), Imm32(mask)); + if (inst.Rc) + { + GenerateRC(); + } gpr.UnlockAll(); gpr.UnlockAllX(); } - - if (inst.Rc) - { - ComputeRC(gpr.R(a)); - } } void Jit64::negx(UGeckoInstruction inst) From 42cdda42c9ac4d3f5e176ada57a3f13eedc3284b Mon Sep 17 00:00:00 2001 From: calc84maniac Date: Mon, 2 Jan 2012 17:34:07 -0500 Subject: [PATCH 231/381] Erp, some changes were not committed --- .../Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index bf57681295..c2726fc7de 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -1422,6 +1422,10 @@ void Jit64::rlwinmx(UGeckoInstruction inst) result = _rotl(result, inst.SH); result &= Helper_Mask(inst.MB, inst.ME); gpr.SetImmediate32(a, result); + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } else { @@ -1435,10 +1439,18 @@ void Jit64::rlwinmx(UGeckoInstruction inst) if (inst.MB == 0 && inst.ME==31-inst.SH) { SHL(32, gpr.R(a), Imm8(inst.SH)); + if (inst.Rc) + { + GenerateRC(); + } } else if (inst.ME == 31 && inst.MB == 32 - inst.SH) { SHR(32, gpr.R(a), Imm8(inst.MB)); + if (inst.Rc) + { + GenerateRC(); + } } else { @@ -1452,16 +1464,19 @@ void Jit64::rlwinmx(UGeckoInstruction inst) { written = true; AND(32, gpr.R(a), Imm32(Helper_Mask(inst.MB, inst.ME))); + if (inst.Rc) + { + GenerateRC(); + } + } + else if (inst.Rc) + { + ComputeRC(gpr.R(a)); } _assert_msg_(DYNA_REC, written, "W T F!!!"); } gpr.UnlockAll(); } - - if (inst.Rc) - { - ComputeRC(gpr.R(a)); - } } @@ -1488,7 +1503,7 @@ void Jit64::rlwimix(UGeckoInstruction inst) u32 mask = Helper_Mask(inst.MB, inst.ME); if (mask == 0 || (a == s && inst.SH == 0)) { - if (inst.RC) + if (inst.Rc) { ComputeRC(gpr.R(a)); } From f575c2c3be88fa9b7d9327c8a4e90ca84d2bcf30 Mon Sep 17 00:00:00 2001 From: calc84maniac Date: Mon, 2 Jan 2012 18:00:28 -0500 Subject: [PATCH 232/381] srwx and slwx optimizations --- .../Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 54 +++++++++++-------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index c2726fc7de..b0be8517c7 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -1652,28 +1652,33 @@ void Jit64::srwx(UGeckoInstruction inst) { u32 amount = (u32)gpr.R(b).offset; gpr.SetImmediate32(a, (amount & 0x20) ? 0 : ((u32)gpr.R(s).offset >> (amount & 0x1f))); + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } else { gpr.FlushLockX(ECX); gpr.Lock(a, b, s); - gpr.BindToRegister(a, a == s || a == b || s == b, true); + gpr.BindToRegister(a, true, true); MOV(32, R(ECX), gpr.R(b)); - XOR(32, R(EAX), R(EAX)); TEST(32, R(ECX), Imm32(32)); - FixupBranch branch = J_CC(CC_NZ); - MOV(32, R(EAX), gpr.R(s)); - SHR(32, R(EAX), R(ECX)); + if (a != s) + { + MOV(32, gpr.R(a), gpr.R(s)); + } + FixupBranch branch = J_CC(CC_Z); + XOR(32, gpr.R(a), gpr.R(a)); SetJumpTarget(branch); - MOV(32, gpr.R(a), R(EAX)); + SHR(32, gpr.R(a), R(ECX)); + if (inst.Rc) + { + GenerateRC(); + } gpr.UnlockAll(); gpr.UnlockAllX(); } - - if (inst.Rc) - { - ComputeRC(gpr.R(a)); - } } void Jit64::slwx(UGeckoInstruction inst) @@ -1688,28 +1693,33 @@ void Jit64::slwx(UGeckoInstruction inst) { u32 amount = (u32)gpr.R(b).offset; gpr.SetImmediate32(a, (amount & 0x20) ? 0 : (u32)gpr.R(s).offset << amount); + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } else { gpr.FlushLockX(ECX); gpr.Lock(a, b, s); - gpr.BindToRegister(a, a == s || a == b || s == b, true); + gpr.BindToRegister(a, true, true); MOV(32, R(ECX), gpr.R(b)); - XOR(32, R(EAX), R(EAX)); TEST(32, R(ECX), Imm32(32)); - FixupBranch branch = J_CC(CC_NZ); - MOV(32, R(EAX), gpr.R(s)); - SHL(32, R(EAX), R(ECX)); + if (a != s) + { + MOV(32, gpr.R(a), gpr.R(s)); + } + FixupBranch branch = J_CC(CC_Z); + XOR(32, gpr.R(a), gpr.R(a)); SetJumpTarget(branch); - MOV(32, gpr.R(a), R(EAX)); + SHL(32, gpr.R(a), R(ECX)); + if (inst.Rc) + { + GenerateRC(); + } gpr.UnlockAll(); gpr.UnlockAllX(); } - - if (inst.Rc) - { - ComputeRC(gpr.R(a)); - } } void Jit64::srawx(UGeckoInstruction inst) From d399e6b26d698f2e43f46e54bfac9db4b40f14cd Mon Sep 17 00:00:00 2001 From: skidau Date: Tue, 3 Jan 2012 10:20:20 +1100 Subject: [PATCH 233/381] Reordered the safe write path of the stfd instruction. --- .../Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp index 46e888f935..41c9a3ceb7 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp @@ -172,6 +172,11 @@ void Jit64::stfd(UGeckoInstruction inst) int s = inst.RS; int a = inst.RA; + if (!a) + { + Default(inst); + return; + } u32 mem_mask = Memory::ADDR_MASK_HW_ACCESS; if (Core::g_CoreStartupParameter.bMMU || @@ -219,14 +224,15 @@ void Jit64::stfd(UGeckoInstruction inst) // Safe but slow routine MOVAPD(XMM0, fpr.R(s)); - MOVD_xmm(R(EAX), XMM0); - SafeWriteRegToReg(EAX, ABI_PARAM1, 32, 4); - PSRLQ(XMM0, 32); MOVD_xmm(R(EAX), XMM0); - LEA(32, ABI_PARAM1, MDisp(gpr.R(a).GetSimpleReg(), offset)); SafeWriteRegToReg(EAX, ABI_PARAM1, 32, 0); + MOVAPD(XMM0, fpr.R(s)); + MOVD_xmm(R(EAX), XMM0); + LEA(32, ABI_PARAM1, MDisp(gpr.R(a).GetSimpleReg(), offset)); + SafeWriteRegToReg(EAX, ABI_PARAM1, 32, 4); + SetJumpTarget(exit); gpr.UnlockAll(); From ab54000d73653b81fc269867db65e70e6c5fe72b Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 2 Jan 2012 03:42:00 -0500 Subject: [PATCH 234/381] Fixed and streamlined overflow detection, improved subtraction methods, general flag-based optimizations including GenerateRC() which uses the sign/zero flag of the last operation --- Source/Core/Core/Src/PowerPC/Jit64/Jit.h | 4 + .../Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 680 +++++++++++------- 2 files changed, 441 insertions(+), 243 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h index 38de5c8fa2..832417f82f 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h @@ -147,7 +147,11 @@ public: void WriteCallInterpreter(UGeckoInstruction _inst); void Cleanup(); + void GenerateConstantOverflow(bool overflow); + void GenerateOverflow(); + void GenerateOverflowFinalizeCarry(bool oe, bool inv = false); void GenerateCarry(); + void GenerateRC(); void ComputeRC(const Gen::OpArg & arg); void tri_op(int d, int a, int b, bool reversible, void (XEmitter::*op)(Gen::X64Reg, Gen::OpArg)); diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index 351536ba56..6d6626dfdf 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -24,6 +24,64 @@ #include "JitRegCache.h" #include "JitAsm.h" +void Jit64::GenerateConstantOverflow(bool overflow) +{ + if (overflow) + { + //XER[OV/SO] = 1 + OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK | XER_OV_MASK)); + } + else + { + //XER[OV] = 0 + AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); + } +} + +void Jit64::GenerateOverflow() +{ + FixupBranch jno = J_CC(CC_NO); + //XER[OV/SO] = 1 + OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK | XER_OV_MASK)); + FixupBranch exit = J(); + SetJumpTarget(jno); + //XER[OV] = 0 + AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); + SetJumpTarget(exit); +} + +// Assumes CA is clear +void Jit64::GenerateOverflowFinalizeCarry(bool oe, bool inv) +{ + // USES_XER + if (oe) + { + FixupBranch jno = J_CC(CC_NO); + // Do carry + FixupBranch carry1 = J_CC(inv ? CC_C : CC_NC); + JitSetCA(); + SetJumpTarget(carry1); + //XER[OV/SO] = 1 + OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK | XER_OV_MASK)); + FixupBranch exit = J(); + SetJumpTarget(jno); + // Do carry + FixupBranch carry2 = J_CC(inv ? CC_C : CC_NC); + JitSetCA(); + SetJumpTarget(carry2); + //XER[OV] = 0 + AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); + SetJumpTarget(exit); + } + else + { + // Output carry is inverted + FixupBranch carry1 = J_CC(inv ? CC_C : CC_NC); + JitSetCA(); + SetJumpTarget(carry1); + } +} + // Assumes that the flags were just set through an addition. void Jit64::GenerateCarry() { // USES_XER @@ -35,6 +93,24 @@ void Jit64::GenerateCarry() { SetJumpTarget(pContinue); } +// Assumes that Sign and Zero flags were set by the last operation. Preserves all flags and registers. +void Jit64::GenerateRC() { + FixupBranch pZero = J_CC(CC_Z); + FixupBranch pNegative = J_CC(CC_S); + MOV(8, M(&PowerPC::ppcState.cr_fast[0]), Imm8(0x4)); // Result > 0 + FixupBranch continue1 = J(); + + SetJumpTarget(pNegative); + MOV(8, M(&PowerPC::ppcState.cr_fast[0]), Imm8(0x8)); // Result < 0 + FixupBranch continue2 = J(); + + SetJumpTarget(pZero); + MOV(8, M(&PowerPC::ppcState.cr_fast[0]), Imm8(0x2)); // Result == 0 + + SetJumpTarget(continue1); + SetJumpTarget(continue2); +} + void Jit64::ComputeRC(const Gen::OpArg & arg) { if( arg.IsImm() ) { @@ -79,11 +155,20 @@ void Jit64::regimmop(int d, int a, bool binary, u32 value, Operation doop, void if (gpr.R(a).IsImm() && !carry) { gpr.SetImmediate32(d, doop((u32)gpr.R(a).offset, value)); + if (Rc) + { + ComputeRC(gpr.R(d)); + } } else if (a == d) { gpr.KillImmediate(d, true, true); (this->*op)(32, gpr.R(d), Imm32(value)); //m_GPR[d] = m_GPR[_inst.RA] + _inst.SIMM_16; + if (Rc) + { + // All of the possible passed operators affect Sign/Zero flags + GenerateRC(); + } if (carry) GenerateCarry(); } @@ -92,6 +177,11 @@ void Jit64::regimmop(int d, int a, bool binary, u32 value, Operation doop, void gpr.BindToRegister(d, false); MOV(32, gpr.R(d), gpr.R(a)); (this->*op)(32, gpr.R(d), Imm32(value)); //m_GPR[d] = m_GPR[_inst.RA] + _inst.SIMM_16; + if (Rc) + { + // All of the possible passed operators affect Sign/Zero flags + GenerateRC(); + } if (carry) GenerateCarry(); } @@ -100,15 +190,15 @@ void Jit64::regimmop(int d, int a, bool binary, u32 value, Operation doop, void { // a == 0, which for these instructions imply value = 0 gpr.SetImmediate32(d, value); + if (Rc) + { + ComputeRC(gpr.R(d)); + } } else { _assert_msg_(DYNA_REC, 0, "WTF regimmop"); } - if (Rc) - { - ComputeRC(gpr.R(d)); - } gpr.UnlockAll(); } @@ -435,6 +525,10 @@ void Jit64::boolX(UGeckoInstruction inst) gpr.SetImmediate32(a, (u32)gpr.R(s).offset ^ (u32)gpr.R(b).offset); else if (inst.SUBOP10 == 284) /* eqvx */ gpr.SetImmediate32(a, ~((u32)gpr.R(s).offset ^ (u32)gpr.R(b).offset)); + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } else if (s == b) { @@ -475,6 +569,10 @@ void Jit64::boolX(UGeckoInstruction inst) { PanicAlert("WTF!"); } + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } else if ((a == s) || (a == b)) { @@ -485,11 +583,19 @@ void Jit64::boolX(UGeckoInstruction inst) if (inst.SUBOP10 == 28) /* andx */ { AND(32, gpr.R(a), operand); + if (inst.Rc) + { + GenerateRC(); + } } else if (inst.SUBOP10 == 476) /* nandx */ { AND(32, gpr.R(a), operand); NOT(32, gpr.R(a)); + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } else if (inst.SUBOP10 == 60) /* andcx */ { @@ -504,15 +610,27 @@ void Jit64::boolX(UGeckoInstruction inst) NOT(32, R(EAX)); AND(32, gpr.R(a), R(EAX)); } + if (inst.Rc) + { + GenerateRC(); + } } else if (inst.SUBOP10 == 444) /* orx */ { OR(32, gpr.R(a), operand); + if (inst.Rc) + { + GenerateRC(); + } } else if (inst.SUBOP10 == 124) /* norx */ { OR(32, gpr.R(a), operand); NOT(32, gpr.R(a)); + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } else if (inst.SUBOP10 == 412) /* orcx */ { @@ -527,15 +645,27 @@ void Jit64::boolX(UGeckoInstruction inst) NOT(32, R(EAX)); OR(32, gpr.R(a), R(EAX)); } + if (inst.Rc) + { + GenerateRC(); + } } else if (inst.SUBOP10 == 316) /* xorx */ { XOR(32, gpr.R(a), operand); + if (inst.Rc) + { + GenerateRC(); + } } else if (inst.SUBOP10 == 284) /* eqvx */ { - XOR(32, gpr.R(a), operand); NOT(32, gpr.R(a)); + XOR(32, gpr.R(a), operand); + if (inst.Rc) + { + GenerateRC(); + } } else { @@ -552,46 +682,78 @@ void Jit64::boolX(UGeckoInstruction inst) { MOV(32, gpr.R(a), gpr.R(s)); AND(32, gpr.R(a), gpr.R(b)); + if (inst.Rc) + { + GenerateRC(); + } } else if (inst.SUBOP10 == 476) /* nandx */ { MOV(32, gpr.R(a), gpr.R(s)); AND(32, gpr.R(a), gpr.R(b)); NOT(32, gpr.R(a)); + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } else if (inst.SUBOP10 == 60) /* andcx */ { MOV(32, gpr.R(a), gpr.R(b)); NOT(32, gpr.R(a)); AND(32, gpr.R(a), gpr.R(s)); + if (inst.Rc) + { + GenerateRC(); + } } else if (inst.SUBOP10 == 444) /* orx */ { MOV(32, gpr.R(a), gpr.R(s)); OR(32, gpr.R(a), gpr.R(b)); + if (inst.Rc) + { + GenerateRC(); + } } else if (inst.SUBOP10 == 124) /* norx */ { MOV(32, gpr.R(a), gpr.R(s)); OR(32, gpr.R(a), gpr.R(b)); NOT(32, gpr.R(a)); + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } else if (inst.SUBOP10 == 412) /* orcx */ { MOV(32, gpr.R(a), gpr.R(b)); NOT(32, gpr.R(a)); OR(32, gpr.R(a), gpr.R(s)); + if (inst.Rc) + { + GenerateRC(); + } } else if (inst.SUBOP10 == 316) /* xorx */ { MOV(32, gpr.R(a), gpr.R(s)); XOR(32, gpr.R(a), gpr.R(b)); + if (inst.Rc) + { + GenerateRC(); + } } else if (inst.SUBOP10 == 284) /* eqvx */ { MOV(32, gpr.R(a), gpr.R(s)); - XOR(32, gpr.R(a), gpr.R(b)); NOT(32, gpr.R(a)); + XOR(32, gpr.R(a), gpr.R(b)); + if (inst.Rc) + { + GenerateRC(); + } } else { @@ -599,11 +761,6 @@ void Jit64::boolX(UGeckoInstruction inst) } gpr.UnlockAll(); } - - if (inst.Rc) - { - ComputeRC(gpr.R(a)); - } } void Jit64::extsbx(UGeckoInstruction inst) @@ -670,11 +827,45 @@ void Jit64::subfic(UGeckoInstruction inst) gpr.Lock(a, d); gpr.BindToRegister(d, a == d, true); int imm = inst.SIMM_16; - MOV(32, R(EAX), gpr.R(a)); - NOT(32, R(EAX)); - ADD(32, R(EAX), Imm32(imm + 1)); - MOV(32, gpr.R(d), R(EAX)); - GenerateCarry(); + if (d == a) + { + if (imm == 0) + { + JitClearCA(); + // Flags act exactly like subtracting from 0 + NEG(32, gpr.R(d)); + // Output carry is inverted + FixupBranch carry1 = J_CC(CC_C); + JitSetCA(); + SetJumpTarget(carry1); + } + else if (imm == -1) + { + // CA is always set in this case + JitSetCA(); + NOT(32, gpr.R(d)); + } + else + { + JitClearCA(); + NOT(32, gpr.R(d)); + ADD(32, gpr.R(d), Imm32(imm+1)); + // Output carry is normal + FixupBranch carry1 = J_CC(CC_NC); + JitSetCA(); + SetJumpTarget(carry1); + } + } + else + { + JitClearCA(); + MOV(32, gpr.R(d), Imm32(imm)); + SUB(32, gpr.R(d), gpr.R(a)); + // Output carry is inverted + FixupBranch carry1 = J_CC(CC_C); + JitSetCA(); + SetJumpTarget(carry1); + } gpr.UnlockAll(); // This instruction has no RC flag } @@ -687,37 +878,28 @@ void Jit64::subfcx(UGeckoInstruction inst) gpr.Lock(a, b, d); gpr.BindToRegister(d, (d == a || d == b), true); - // For some reason, I could not get the jit versions of sub* - // working with x86 sub...so we use the ~a + b + 1 method JitClearCA(); - MOV(32, R(EAX), gpr.R(a)); - NOT(32, R(EAX)); - ADD(32, R(EAX), gpr.R(b)); - FixupBranch carry1 = J_CC(CC_NC); - JitSetCA(); - SetJumpTarget(carry1); - ADD(32, R(EAX), Imm32(1)); - FixupBranch carry2 = J_CC(CC_NC); - JitSetCA(); - SetJumpTarget(carry2); - MOV(32, gpr.R(d), R(EAX)); - - gpr.UnlockAll(); - if (inst.OE) + if (d == b) { - FixupBranch jno = J_CC(CC_NO); - //XER[OV/SO] = 1 - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK)); - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_OV_MASK)); - FixupBranch exit = J(); - SetJumpTarget(jno); - //XER[OV] = 0 - AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); - SetJumpTarget(exit); + SUB(32, gpr.R(d), gpr.R(a)); + } + else if (d == a) + { + MOV(32, R(EAX), gpr.R(a)); + MOV(32, gpr.R(d), gpr.R(b)); + SUB(32, gpr.R(d), R(EAX)); + } + else + { + MOV(32, gpr.R(d), gpr.R(b)); + SUB(32, gpr.R(d), gpr.R(a)); } if (inst.Rc) { - ComputeRC(R(EAX)); + GenerateRC(); } + GenerateOverflowFinalizeCarry(inst.OE, true); + + gpr.UnlockAll(); } void Jit64::subfex(UGeckoInstruction inst) @@ -729,46 +911,36 @@ void Jit64::subfex(UGeckoInstruction inst) gpr.Lock(a, b, d); gpr.BindToRegister(d, (d == a || d == b), true); - // Get CA - MOV(32, R(ECX), M(&PowerPC::ppcState.spr[SPR_XER])); - SHR(32, R(ECX), Imm8(29)); - AND(32, R(ECX), Imm32(1)); - // Don't need it anymore + // Get CA and clear it + MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); JitClearCA(); - - // ~a + b - MOV(32, R(EAX), gpr.R(a)); - NOT(32, R(EAX)); - ADD(32, R(EAX), gpr.R(b)); - FixupBranch carry1 = J_CC(CC_NC); - JitSetCA(); - SetJumpTarget(carry1); - - // + CA - ADD(32, R(EAX), R(ECX)); - FixupBranch carry2 = J_CC(CC_NC); - JitSetCA(); - SetJumpTarget(carry2); - - MOV(32, gpr.R(d), R(EAX)); + SHR(32, R(EAX), Imm8(30)); + + // Convert carry to borrow + CMC(); + + if (d == b) + { + SBB(32, gpr.R(d), gpr.R(a)); + } + else if (d == a) + { + MOV(32, R(EAX), gpr.R(a)); + MOV(32, gpr.R(d), gpr.R(b)); + SBB(32, gpr.R(d), R(EAX)); + } + else + { + MOV(32, gpr.R(d), gpr.R(b)); + SBB(32, gpr.R(d), gpr.R(a)); + } + if (inst.Rc) { + GenerateRC(); + } + GenerateOverflowFinalizeCarry(inst.OE, true); gpr.UnlockAll(); gpr.UnlockAllX(); - if (inst.OE) - { - FixupBranch jno = J_CC(CC_NO); - //XER[OV/SO] = 1 - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK)); - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_OV_MASK)); - FixupBranch exit = J(); - SetJumpTarget(jno); - //XER[OV] = 0 - AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); - SetJumpTarget(exit); - } - if (inst.Rc) { - ComputeRC(R(EAX)); - } } void Jit64::subfmex(UGeckoInstruction inst) @@ -777,35 +949,24 @@ void Jit64::subfmex(UGeckoInstruction inst) INSTRUCTION_START JITDISABLE(Integer) int a = inst.RA, d = inst.RD; - - if (d == a) + gpr.Lock(a, d); + gpr.BindToRegister(d, d == a); + + MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); + JitClearCA(); + SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag + if (d != a) { - gpr.Lock(d); - gpr.BindToRegister(d, true); - MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag - NOT(32, gpr.R(d)); - ADC(32, gpr.R(d), Imm32(0xFFFFFFFF)); - GenerateCarry(); - gpr.UnlockAll(); - } - else - { - gpr.Lock(a, d); - gpr.BindToRegister(d, false); - MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag MOV(32, gpr.R(d), gpr.R(a)); - NOT(32, gpr.R(d)); - ADC(32, gpr.R(d), Imm32(0xFFFFFFFF)); - GenerateCarry(); - gpr.UnlockAll(); } - - if (inst.Rc) - { - ComputeRC(gpr.R(d)); - } + NOT(32, gpr.R(d)); + ADC(32, gpr.R(d), Imm32(0xFFFFFFFF)); + if (inst.Rc) + { + GenerateRC(); + } + GenerateOverflowFinalizeCarry(inst.OE); + gpr.UnlockAll(); } void Jit64::subfzex(UGeckoInstruction inst) @@ -815,34 +976,24 @@ void Jit64::subfzex(UGeckoInstruction inst) JITDISABLE(Integer) int a = inst.RA, d = inst.RD; - if (d == a) + gpr.Lock(a, d); + gpr.BindToRegister(d, d == a); + MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); + JitClearCA(); + SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag + if (d != a) { - gpr.Lock(d); - gpr.BindToRegister(d, true); - MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag - NOT(32, gpr.R(d)); - ADC(32, gpr.R(d), Imm8(0)); - GenerateCarry(); - gpr.UnlockAll(); - } - else - { - gpr.Lock(a, d); - gpr.BindToRegister(d, false); - MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag MOV(32, gpr.R(d), gpr.R(a)); - NOT(32, gpr.R(d)); - ADC(32, gpr.R(d), Imm8(0)); - GenerateCarry(); - gpr.UnlockAll(); } - - if (inst.Rc) - { - ComputeRC(gpr.R(d)); - } + NOT(32, gpr.R(d)); + ADC(32, gpr.R(d), Imm8(0)); + if (inst.Rc) + { + GenerateRC(); + } + GenerateOverflowFinalizeCarry(inst.OE); + + gpr.UnlockAll(); } void Jit64::subfx(UGeckoInstruction inst) @@ -853,34 +1004,46 @@ void Jit64::subfx(UGeckoInstruction inst) if (gpr.R(a).IsImm() && gpr.R(b).IsImm()) { - gpr.SetImmediate32(d, (u32)gpr.R(b).offset - (u32)gpr.R(a).offset); + s32 i = (s32)gpr.R(b).offset, j = (s32)gpr.R(a).offset; + gpr.SetImmediate32(d, i - j); + if (inst.RC) + { + ComputeRC(gpr.R(d)); + } + if (inst.OE) + { + GenerateConstantOverflow((s64)(i - j) != (s64)i - (s64)j); + } } else { gpr.Lock(a, b, d); gpr.BindToRegister(d, (d == a || d == b), true); - MOV(32, R(EAX), gpr.R(b)); - SUB(32, R(EAX), gpr.R(a)); - MOV(32, gpr.R(d), R(EAX)); + if (d == b) + { + SUB(32, gpr.R(d), gpr.R(a)); + } + else if (d == a) + { + MOV(32, R(EAX), gpr.R(a)); + MOV(32, gpr.R(d), gpr.R(b)); + SUB(32, gpr.R(d), R(EAX)); + } + else + { + MOV(32, gpr.R(d), gpr.R(b)); + SUB(32, gpr.R(d), gpr.R(a)); + } + if (inst.Rc) + { + GenerateRC(); + } + if (inst.OE) + { + GenerateOverflow(); + } gpr.UnlockAll(); } - - if (inst.OE) - { - FixupBranch jno = J_CC(CC_NO); - //XER[OV/SO] = 1 - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK)); - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_OV_MASK)); - FixupBranch exit = J(); - SetJumpTarget(jno); - //XER[OV] = 0 - AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); - SetJumpTarget(exit); - } - if (inst.Rc) - { - ComputeRC(gpr.R(d)); - } } void Jit64::mulli(UGeckoInstruction inst) @@ -911,7 +1074,12 @@ void Jit64::mullwx(UGeckoInstruction inst) if (gpr.R(a).IsImm() && gpr.R(b).IsImm()) { - gpr.SetImmediate32(d, (s32)gpr.R(a).offset * (s32)gpr.R(b).offset); + s32 i = (s32)gpr.R(a).offset, j = (s32)gpr.R(b).offset; + gpr.SetImmediate32(d, i * j); + if (inst.OE) + { + GenerateConstantOverflow((s64)(i*j) != (s64)i * (s64)j); + } } else { @@ -925,21 +1093,12 @@ void Jit64::mullwx(UGeckoInstruction inst) MOV(32, gpr.R(d), gpr.R(b)); IMUL(32, gpr.RX(d), gpr.R(a)); } + if (inst.OE) + { + GenerateOverflow(); + } gpr.UnlockAll(); } - - if (inst.OE) - { - FixupBranch jno = J_CC(CC_NO); - //XER[OV/SO] = 1 - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK)); - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_OV_MASK)); - FixupBranch exit = J(); - SetJumpTarget(jno); - //XER[OV] = 0 - AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); - SetJumpTarget(exit); - } if (inst.Rc) { ComputeRC(gpr.R(d)); @@ -972,7 +1131,9 @@ void Jit64::mulhwux(UGeckoInstruction inst) } if (inst.Rc) + { ComputeRC(gpr.R(d)); + } } void Jit64::divwux(UGeckoInstruction inst) @@ -984,9 +1145,21 @@ void Jit64::divwux(UGeckoInstruction inst) if (gpr.R(a).IsImm() && gpr.R(b).IsImm()) { if( gpr.R(b).offset == 0 ) + { gpr.SetImmediate32(d, 0); + if (inst.OE) + { + GenerateConstantOverflow(true); + } + } else + { gpr.SetImmediate32(d, (u32)gpr.R(a).offset / (u32)gpr.R(b).offset); + if (inst.OE) + { + GenerateConstantOverflow(false); + } + } } else { @@ -1000,28 +1173,24 @@ void Jit64::divwux(UGeckoInstruction inst) // doesn't handle if OE is set, but int doesn't either... FixupBranch not_div_by_zero = J_CC(CC_NZ); MOV(32, gpr.R(d), R(EDX)); - MOV(32, R(EAX), gpr.R(d)); + if (inst.OE) + { + GenerateConstantOverflow(true); + } + //MOV(32, R(EAX), gpr.R(d)); FixupBranch end = J(); SetJumpTarget(not_div_by_zero); DIV(32, gpr.R(b)); MOV(32, gpr.R(d), R(EAX)); + if (inst.OE) + { + GenerateConstantOverflow(false); + } SetJumpTarget(end); gpr.UnlockAll(); gpr.UnlockAllX(); } - if (inst.OE) - { - FixupBranch jno = J_CC(CC_NO); - //XER[OV/SO] = 1 - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK)); - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_OV_MASK)); - FixupBranch exit = J(); - SetJumpTarget(jno); - //XER[OV] = 0 - AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); - SetJumpTarget(exit); - } if (inst.Rc) { ComputeRC(gpr.R(d)); @@ -1036,9 +1205,18 @@ void Jit64::addx(UGeckoInstruction inst) if (gpr.R(a).IsImm() && gpr.R(b).IsImm()) { - gpr.SetImmediate32(d, (u32)gpr.R(a).offset + (u32)gpr.R(b).offset); + s32 i = (s32)gpr.R(a).offset, j = (s32)gpr.R(b).offset; + gpr.SetImmediate32(d, i + j); + if (inst.Rc) + { + ComputeRC(gpr.R(d)); + } + if (inst.OE) + { + GenerateConstantOverflow((s64)(i + j) != (s64)i + (s64)j); + } } - else if (gpr.R(a).IsSimpleReg() && gpr.R(b).IsSimpleReg()) + else if (gpr.R(a).IsSimpleReg() && gpr.R(b).IsSimpleReg() && !inst.Rc && !inst.OE) { gpr.Lock(a, b, d); gpr.BindToRegister(d, false); @@ -1051,6 +1229,14 @@ void Jit64::addx(UGeckoInstruction inst) gpr.Lock(a, b, d); gpr.BindToRegister(d, true); ADD(32, gpr.R(d), gpr.R(operand)); + if (inst.Rc) + { + GenerateRC(); + } + if (inst.OE) + { + GenerateOverflow(); + } gpr.UnlockAll(); } else @@ -1059,26 +1245,16 @@ void Jit64::addx(UGeckoInstruction inst) gpr.BindToRegister(d, false); MOV(32, gpr.R(d), gpr.R(a)); ADD(32, gpr.R(d), gpr.R(b)); + if (inst.Rc) + { + GenerateRC(); + } + if (inst.OE) + { + GenerateOverflow(); + } gpr.UnlockAll(); } - - if (inst.OE) - { - FixupBranch jno = J_CC(CC_NO); - //XER[OV/SO] = 1 - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK)); - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_OV_MASK)); - FixupBranch exit = J(); - SetJumpTarget(jno); - //XER[OV] = 0 - AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); - SetJumpTarget(exit); - } - - if (inst.Rc) - { - ComputeRC(gpr.R(d)); - } } void Jit64::addex(UGeckoInstruction inst) @@ -1093,9 +1269,14 @@ void Jit64::addex(UGeckoInstruction inst) gpr.Lock(a, b, d); gpr.BindToRegister(d, true); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); + JitClearCA(); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag ADC(32, gpr.R(d), gpr.R((d == a) ? b : a)); - GenerateCarry(); + if (inst.Rc) + { + GenerateRC(); + } + GenerateOverflowFinalizeCarry(inst.OE); gpr.UnlockAll(); } else @@ -1103,17 +1284,17 @@ void Jit64::addex(UGeckoInstruction inst) gpr.Lock(a, b, d); gpr.BindToRegister(d, false); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); + JitClearCA(); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag MOV(32, gpr.R(d), gpr.R(a)); ADC(32, gpr.R(d), gpr.R(b)); - GenerateCarry(); + if (inst.Rc) + { + GenerateRC(); + } + GenerateOverflowFinalizeCarry(inst.OE); gpr.UnlockAll(); } - - if (inst.Rc) - { - ComputeRC(gpr.R(d)); - } } void Jit64::addcx(UGeckoInstruction inst) @@ -1127,37 +1308,29 @@ void Jit64::addcx(UGeckoInstruction inst) int operand = ((d == a) ? b : a); gpr.Lock(a, b, d); gpr.BindToRegister(d, true); + JitClearCA(); ADD(32, gpr.R(d), gpr.R(operand)); - GenerateCarry(); + if (inst.Rc) + { + GenerateRC(); + } + GenerateOverflowFinalizeCarry(inst.OE); gpr.UnlockAll(); } else { gpr.Lock(a, b, d); gpr.BindToRegister(d, false); + JitClearCA(); MOV(32, gpr.R(d), gpr.R(a)); ADD(32, gpr.R(d), gpr.R(b)); - GenerateCarry(); + if (inst.Rc) + { + GenerateRC(); + } + GenerateOverflowFinalizeCarry(inst.OE); gpr.UnlockAll(); } - - if (inst.OE) - { - FixupBranch jno = J_CC(CC_NO); - //XER[OV/SO] = 1 - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_SO_MASK)); - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_OV_MASK)); - FixupBranch exit = J(); - SetJumpTarget(jno); - //XER[OV] = 0 - AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); - SetJumpTarget(exit); - } - - if (inst.Rc) - { - ComputeRC(gpr.R(d)); - } } void Jit64::addmex(UGeckoInstruction inst) @@ -1172,9 +1345,14 @@ void Jit64::addmex(UGeckoInstruction inst) gpr.Lock(d); gpr.BindToRegister(d, true); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); + JitClearCA(); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag ADC(32, gpr.R(d), Imm32(0xFFFFFFFF)); - GenerateCarry(); + if (inst.Rc) + { + GenerateRC(); + } + GenerateOverflowFinalizeCarry(inst.OE); gpr.UnlockAll(); } else @@ -1182,17 +1360,17 @@ void Jit64::addmex(UGeckoInstruction inst) gpr.Lock(a, d); gpr.BindToRegister(d, false); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); + JitClearCA(); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag MOV(32, gpr.R(d), gpr.R(a)); ADC(32, gpr.R(d), Imm32(0xFFFFFFFF)); - GenerateCarry(); + if (inst.Rc) + { + GenerateRC(); + } + GenerateOverflowFinalizeCarry(inst.OE); gpr.UnlockAll(); } - - if (inst.Rc) - { - ComputeRC(gpr.R(d)); - } } void Jit64::addzex(UGeckoInstruction inst) @@ -1207,9 +1385,14 @@ void Jit64::addzex(UGeckoInstruction inst) gpr.Lock(d); gpr.BindToRegister(d, true); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); + JitClearCA(); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag ADC(32, gpr.R(d), Imm8(0)); - GenerateCarry(); + if (inst.Rc) + { + GenerateRC(); + } + GenerateOverflowFinalizeCarry(inst.OE); gpr.UnlockAll(); } else @@ -1217,17 +1400,17 @@ void Jit64::addzex(UGeckoInstruction inst) gpr.Lock(a, d); gpr.BindToRegister(d, false); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); + JitClearCA(); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag MOV(32, gpr.R(d), gpr.R(a)); ADC(32, gpr.R(d), Imm8(0)); - GenerateCarry(); + if (inst.Rc) + { + GenerateRC(); + } + GenerateOverflowFinalizeCarry(inst.OE); gpr.UnlockAll(); } - - if (inst.Rc) - { - ComputeRC(gpr.R(d)); - } } void Jit64::rlwinmx(UGeckoInstruction inst) @@ -1360,6 +1543,14 @@ void Jit64::negx(UGeckoInstruction inst) if (gpr.R(a).IsImm()) { gpr.SetImmediate32(d, ~((u32)gpr.R(a).offset) + 1); + if (inst.Rc) + { + ComputeRC(gpr.R(d)); + } + if (inst.OE) + { + GenerateConstantOverflow(gpr.R(d).offset == 0x80000000); + } } else { @@ -1368,13 +1559,16 @@ void Jit64::negx(UGeckoInstruction inst) if (a != d) MOV(32, gpr.R(d), gpr.R(a)); NEG(32, gpr.R(d)); + if (inst.Rc) + { + GenerateRC(); + } + if (inst.OE) + { + GenerateOverflow(); + } gpr.UnlockAll(); } - - if (inst.Rc) - { - ComputeRC(gpr.R(d)); - } } void Jit64::srwx(UGeckoInstruction inst) From 4cb1af0f133ea7e7a434f25d01646381f9b3b30b Mon Sep 17 00:00:00 2001 From: calc84maniac Date: Mon, 2 Jan 2012 04:00:47 -0500 Subject: [PATCH 235/381] Fixed a bad typo. Why are there different inst.Rc and inst.RC variables? >_> --- Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index 6d6626dfdf..5af80baf5d 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -1006,7 +1006,7 @@ void Jit64::subfx(UGeckoInstruction inst) { s32 i = (s32)gpr.R(b).offset, j = (s32)gpr.R(a).offset; gpr.SetImmediate32(d, i - j); - if (inst.RC) + if (inst.Rc) { ComputeRC(gpr.R(d)); } From a6d041bfa963cbed78b1edd18057d2ce9353a0b7 Mon Sep 17 00:00:00 2001 From: calc84maniac Date: Mon, 2 Jan 2012 11:50:01 -0500 Subject: [PATCH 236/381] Removed an extraneous FlushLockX, further optimized simultaneous handling of carry/overflow. --- Source/Core/Core/Src/PowerPC/Jit64/Jit.h | 2 +- .../Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 58 +++++++++---------- .../Core/Src/PowerPC/JitCommon/Jit_Util.cpp | 8 +++ .../Core/Src/PowerPC/JitCommon/Jit_Util.h | 1 + 4 files changed, 37 insertions(+), 32 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h index 832417f82f..9d9b57658b 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h @@ -149,7 +149,7 @@ public: void GenerateConstantOverflow(bool overflow); void GenerateOverflow(); - void GenerateOverflowFinalizeCarry(bool oe, bool inv = false); + void FinalizeCarryOverflow(bool oe, bool inv = false); void GenerateCarry(); void GenerateRC(); void ComputeRC(const Gen::OpArg & arg); diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index 5af80baf5d..b246a2cc9e 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -50,8 +50,8 @@ void Jit64::GenerateOverflow() SetJumpTarget(exit); } -// Assumes CA is clear -void Jit64::GenerateOverflowFinalizeCarry(bool oe, bool inv) +// Assumes CA,OV are clear +void Jit64::FinalizeCarryOverflow(bool oe, bool inv) { // USES_XER if (oe) @@ -69,8 +69,6 @@ void Jit64::GenerateOverflowFinalizeCarry(bool oe, bool inv) FixupBranch carry2 = J_CC(inv ? CC_C : CC_NC); JitSetCA(); SetJumpTarget(carry2); - //XER[OV] = 0 - AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_OV_MASK)); SetJumpTarget(exit); } else @@ -878,7 +876,7 @@ void Jit64::subfcx(UGeckoInstruction inst) gpr.Lock(a, b, d); gpr.BindToRegister(d, (d == a || d == b), true); - JitClearCA(); + JitClearCAOV(inst.OE); if (d == b) { SUB(32, gpr.R(d), gpr.R(a)); @@ -897,7 +895,7 @@ void Jit64::subfcx(UGeckoInstruction inst) if (inst.Rc) { GenerateRC(); } - GenerateOverflowFinalizeCarry(inst.OE, true); + FinalizeCarryOverflow(inst.OE, true); gpr.UnlockAll(); } @@ -907,13 +905,12 @@ void Jit64::subfex(UGeckoInstruction inst) INSTRUCTION_START; JITDISABLE(Integer) int a = inst.RA, b = inst.RB, d = inst.RD; - gpr.FlushLockX(ECX); gpr.Lock(a, b, d); gpr.BindToRegister(d, (d == a || d == b), true); - // Get CA and clear it + // Get CA and clear it (along with OV if applicable) MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCA(); + JitClearCAOV(inst.OE); SHR(32, R(EAX), Imm8(30)); // Convert carry to borrow @@ -937,10 +934,9 @@ void Jit64::subfex(UGeckoInstruction inst) if (inst.Rc) { GenerateRC(); } - GenerateOverflowFinalizeCarry(inst.OE, true); + FinalizeCarryOverflow(inst.OE, true); gpr.UnlockAll(); - gpr.UnlockAllX(); } void Jit64::subfmex(UGeckoInstruction inst) @@ -953,7 +949,7 @@ void Jit64::subfmex(UGeckoInstruction inst) gpr.BindToRegister(d, d == a); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCA(); + JitClearCAOV(inst.OE); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag if (d != a) { @@ -965,7 +961,7 @@ void Jit64::subfmex(UGeckoInstruction inst) { GenerateRC(); } - GenerateOverflowFinalizeCarry(inst.OE); + FinalizeCarryOverflow(inst.OE); gpr.UnlockAll(); } @@ -979,7 +975,7 @@ void Jit64::subfzex(UGeckoInstruction inst) gpr.Lock(a, d); gpr.BindToRegister(d, d == a); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCA(); + JitClearCAOV(inst.OE); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag if (d != a) { @@ -991,7 +987,7 @@ void Jit64::subfzex(UGeckoInstruction inst) { GenerateRC(); } - GenerateOverflowFinalizeCarry(inst.OE); + FinalizeCarryOverflow(inst.OE); gpr.UnlockAll(); } @@ -1269,14 +1265,14 @@ void Jit64::addex(UGeckoInstruction inst) gpr.Lock(a, b, d); gpr.BindToRegister(d, true); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCA(); + JitClearCAOV(inst.OE); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag ADC(32, gpr.R(d), gpr.R((d == a) ? b : a)); if (inst.Rc) { GenerateRC(); } - GenerateOverflowFinalizeCarry(inst.OE); + FinalizeCarryOverflow(inst.OE); gpr.UnlockAll(); } else @@ -1284,7 +1280,7 @@ void Jit64::addex(UGeckoInstruction inst) gpr.Lock(a, b, d); gpr.BindToRegister(d, false); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCA(); + JitClearCAOV(inst.OE); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag MOV(32, gpr.R(d), gpr.R(a)); ADC(32, gpr.R(d), gpr.R(b)); @@ -1292,7 +1288,7 @@ void Jit64::addex(UGeckoInstruction inst) { GenerateRC(); } - GenerateOverflowFinalizeCarry(inst.OE); + FinalizeCarryOverflow(inst.OE); gpr.UnlockAll(); } } @@ -1308,27 +1304,27 @@ void Jit64::addcx(UGeckoInstruction inst) int operand = ((d == a) ? b : a); gpr.Lock(a, b, d); gpr.BindToRegister(d, true); - JitClearCA(); + JitClearCAOV(inst.OE); ADD(32, gpr.R(d), gpr.R(operand)); if (inst.Rc) { GenerateRC(); } - GenerateOverflowFinalizeCarry(inst.OE); + FinalizeCarryOverflow(inst.OE); gpr.UnlockAll(); } else { gpr.Lock(a, b, d); gpr.BindToRegister(d, false); - JitClearCA(); + JitClearCAOV(inst.OE); MOV(32, gpr.R(d), gpr.R(a)); ADD(32, gpr.R(d), gpr.R(b)); if (inst.Rc) { GenerateRC(); } - GenerateOverflowFinalizeCarry(inst.OE); + FinalizeCarryOverflow(inst.OE); gpr.UnlockAll(); } } @@ -1345,14 +1341,14 @@ void Jit64::addmex(UGeckoInstruction inst) gpr.Lock(d); gpr.BindToRegister(d, true); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCA(); + JitClearCAOV(inst.OE); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag ADC(32, gpr.R(d), Imm32(0xFFFFFFFF)); if (inst.Rc) { GenerateRC(); } - GenerateOverflowFinalizeCarry(inst.OE); + FinalizeCarryOverflow(inst.OE); gpr.UnlockAll(); } else @@ -1360,7 +1356,7 @@ void Jit64::addmex(UGeckoInstruction inst) gpr.Lock(a, d); gpr.BindToRegister(d, false); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCA(); + JitClearCAOV(inst.OE); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag MOV(32, gpr.R(d), gpr.R(a)); ADC(32, gpr.R(d), Imm32(0xFFFFFFFF)); @@ -1368,7 +1364,7 @@ void Jit64::addmex(UGeckoInstruction inst) { GenerateRC(); } - GenerateOverflowFinalizeCarry(inst.OE); + FinalizeCarryOverflow(inst.OE); gpr.UnlockAll(); } } @@ -1385,14 +1381,14 @@ void Jit64::addzex(UGeckoInstruction inst) gpr.Lock(d); gpr.BindToRegister(d, true); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCA(); + JitClearCAOV(inst.OE); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag ADC(32, gpr.R(d), Imm8(0)); if (inst.Rc) { GenerateRC(); } - GenerateOverflowFinalizeCarry(inst.OE); + FinalizeCarryOverflow(inst.OE); gpr.UnlockAll(); } else @@ -1400,7 +1396,7 @@ void Jit64::addzex(UGeckoInstruction inst) gpr.Lock(a, d); gpr.BindToRegister(d, false); MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCA(); + JitClearCAOV(inst.OE); SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag MOV(32, gpr.R(d), gpr.R(a)); ADC(32, gpr.R(d), Imm8(0)); @@ -1408,7 +1404,7 @@ void Jit64::addzex(UGeckoInstruction inst) { GenerateRC(); } - GenerateOverflowFinalizeCarry(inst.OE); + FinalizeCarryOverflow(inst.OE); gpr.UnlockAll(); } } diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp index 8abf0fc18a..b1f8a01f96 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp @@ -352,3 +352,11 @@ void EmuCodeBlock::JitSetCA() { OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_CA_MASK)); //XER.CA = 1 } + +void EmuCodeBlock::JitClearCAOV(bool oe) +{ + if (oe) + AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_CA_MASK & ~XER_OV_MASK)); //XER.CA, XER.OV = 0 + else + AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_CA_MASK)); //XER.CA = 0 +} \ No newline at end of file diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.h b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.h index 70d4e294e4..e151c5e914 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.h +++ b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.h @@ -38,6 +38,7 @@ public: void WriteFloatToConstRamAddress(const Gen::X64Reg& xmm_reg, u32 address); void JitClearCA(); void JitSetCA(); + void JitClearCAOV(bool oe); void ForceSinglePrecisionS(Gen::X64Reg xmm); void ForceSinglePrecisionP(Gen::X64Reg xmm); From 9530bd0292b36a73c0d9764f011560640d1126e5 Mon Sep 17 00:00:00 2001 From: calc84maniac Date: Mon, 2 Jan 2012 15:07:36 -0500 Subject: [PATCH 237/381] rlwimix optimizations --- .../Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 78 ++++++++++++++++--- 1 file changed, 66 insertions(+), 12 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index b246a2cc9e..cfac1728d6 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -1476,25 +1476,79 @@ void Jit64::rlwimix(UGeckoInstruction inst) { u32 mask = Helper_Mask(inst.MB,inst.ME); gpr.SetImmediate32(a, ((u32)gpr.R(a).offset & ~mask) | (_rotl((u32)gpr.R(s).offset,inst.SH) & mask)); + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } else { gpr.Lock(a, s); - gpr.KillImmediate(a, true, true); + gpr.BindToRegister(a, true, true); u32 mask = Helper_Mask(inst.MB, inst.ME); - MOV(32, R(EAX), gpr.R(s)); - AND(32, gpr.R(a), Imm32(~mask)); - if (inst.SH) - ROL(32, R(EAX), Imm8(inst.SH)); - AND(32, R(EAX), Imm32(mask)); - OR(32, gpr.R(a), R(EAX)); + if (mask == 0 || (a == s && inst.SH == 0)) + { + if (inst.RC) + { + ComputeRC(gpr.R(a)); + } + } + else if (mask == 0xFFFFFFFF) + { + if (a != s) + { + MOV(32, gpr.R(a), gpr.R(s)); + } + if (inst.SH) + { + ROL(32, gpr.R(a), Imm8(inst.SH)); + } + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } + } + else if (inst.SH) + { + if (mask == -(1 << inst.SH)) + { + MOV(32, R(EAX), gpr.R(s)); + SHL(32, R(EAX), Imm8(inst.SH)); + AND(32, gpr.R(a), Imm32(~mask)); + OR(32, gpr.R(a), R(EAX)); + } + else if (mask == (1 << inst.SH) - 1) + { + MOV(32, R(EAX), gpr.R(s)); + SHR(32, R(EAX), Imm8(32-inst.SH)); + AND(32, gpr.R(a), Imm32(~mask)); + OR(32, gpr.R(a), R(EAX)); + } + else + { + MOV(32, R(EAX), gpr.R(s)); + ROL(32, R(EAX), Imm8(inst.SH)); + XOR(32, R(EAX), gpr.R(a)); + AND(32, R(EAX), Imm32(mask)); + XOR(32, gpr.R(a), R(EAX)); + } + if (inst.Rc) + { + GenerateRC(); + } + } + else + { + XOR(32, gpr.R(a), gpr.R(s)); + AND(32, gpr.R(a), Imm32(~mask)); + XOR(32, gpr.R(a), gpr.R(s)); + if (inst.Rc) + { + GenerateRC(); + } + } gpr.UnlockAll(); } - - if (inst.Rc) - { - ComputeRC(gpr.R(a)); - } } void Jit64::rlwnmx(UGeckoInstruction inst) From ff6d0d056affeb31ce64e4ac4590254f773e42a7 Mon Sep 17 00:00:00 2001 From: calc84maniac Date: Mon, 2 Jan 2012 17:30:54 -0500 Subject: [PATCH 238/381] rolwinmix and rlwnmx optimizations, another Rc/RC typo fixed --- .../Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index cfac1728d6..bf57681295 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -1556,31 +1556,35 @@ void Jit64::rlwnmx(UGeckoInstruction inst) INSTRUCTION_START JITDISABLE(Integer) int a = inst.RA, b = inst.RB, s = inst.RS; - + u32 mask = Helper_Mask(inst.MB, inst.ME); if (gpr.R(b).IsImm() && gpr.R(s).IsImm()) { gpr.SetImmediate32(a, _rotl((u32)gpr.R(s).offset, (u32)gpr.R(b).offset & 0x1F) & mask); + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } else { gpr.FlushLockX(ECX); gpr.Lock(a, b, s); - gpr.KillImmediate(a, (a == s || a == b), true); - MOV(32, R(EAX), gpr.R(s)); + gpr.BindToRegister(a, true, true); MOV(32, R(ECX), gpr.R(b)); - AND(32, R(ECX), Imm32(0x1f)); - ROL(32, R(EAX), R(ECX)); - AND(32, R(EAX), Imm32(mask)); - MOV(32, gpr.R(a), R(EAX)); + if (a != s) + { + MOV(32, gpr.R(a), gpr.R(s)); + } + ROL(32, gpr.R(a), R(ECX)); + AND(32, gpr.R(a), Imm32(mask)); + if (inst.Rc) + { + GenerateRC(); + } gpr.UnlockAll(); gpr.UnlockAllX(); } - - if (inst.Rc) - { - ComputeRC(gpr.R(a)); - } } void Jit64::negx(UGeckoInstruction inst) From 9c4106027ce7ff4847b2e06d25a4cadf30e27faf Mon Sep 17 00:00:00 2001 From: calc84maniac Date: Mon, 2 Jan 2012 17:34:07 -0500 Subject: [PATCH 239/381] Erp, some changes were not committed --- .../Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index bf57681295..c2726fc7de 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -1422,6 +1422,10 @@ void Jit64::rlwinmx(UGeckoInstruction inst) result = _rotl(result, inst.SH); result &= Helper_Mask(inst.MB, inst.ME); gpr.SetImmediate32(a, result); + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } else { @@ -1435,10 +1439,18 @@ void Jit64::rlwinmx(UGeckoInstruction inst) if (inst.MB == 0 && inst.ME==31-inst.SH) { SHL(32, gpr.R(a), Imm8(inst.SH)); + if (inst.Rc) + { + GenerateRC(); + } } else if (inst.ME == 31 && inst.MB == 32 - inst.SH) { SHR(32, gpr.R(a), Imm8(inst.MB)); + if (inst.Rc) + { + GenerateRC(); + } } else { @@ -1452,16 +1464,19 @@ void Jit64::rlwinmx(UGeckoInstruction inst) { written = true; AND(32, gpr.R(a), Imm32(Helper_Mask(inst.MB, inst.ME))); + if (inst.Rc) + { + GenerateRC(); + } + } + else if (inst.Rc) + { + ComputeRC(gpr.R(a)); } _assert_msg_(DYNA_REC, written, "W T F!!!"); } gpr.UnlockAll(); } - - if (inst.Rc) - { - ComputeRC(gpr.R(a)); - } } @@ -1488,7 +1503,7 @@ void Jit64::rlwimix(UGeckoInstruction inst) u32 mask = Helper_Mask(inst.MB, inst.ME); if (mask == 0 || (a == s && inst.SH == 0)) { - if (inst.RC) + if (inst.Rc) { ComputeRC(gpr.R(a)); } From 6ecae3e556ce8ac75ea137ef8258c332b4941cf6 Mon Sep 17 00:00:00 2001 From: calc84maniac Date: Mon, 2 Jan 2012 18:00:28 -0500 Subject: [PATCH 240/381] srwx and slwx optimizations --- .../Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 54 +++++++++++-------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index c2726fc7de..b0be8517c7 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -1652,28 +1652,33 @@ void Jit64::srwx(UGeckoInstruction inst) { u32 amount = (u32)gpr.R(b).offset; gpr.SetImmediate32(a, (amount & 0x20) ? 0 : ((u32)gpr.R(s).offset >> (amount & 0x1f))); + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } else { gpr.FlushLockX(ECX); gpr.Lock(a, b, s); - gpr.BindToRegister(a, a == s || a == b || s == b, true); + gpr.BindToRegister(a, true, true); MOV(32, R(ECX), gpr.R(b)); - XOR(32, R(EAX), R(EAX)); TEST(32, R(ECX), Imm32(32)); - FixupBranch branch = J_CC(CC_NZ); - MOV(32, R(EAX), gpr.R(s)); - SHR(32, R(EAX), R(ECX)); + if (a != s) + { + MOV(32, gpr.R(a), gpr.R(s)); + } + FixupBranch branch = J_CC(CC_Z); + XOR(32, gpr.R(a), gpr.R(a)); SetJumpTarget(branch); - MOV(32, gpr.R(a), R(EAX)); + SHR(32, gpr.R(a), R(ECX)); + if (inst.Rc) + { + GenerateRC(); + } gpr.UnlockAll(); gpr.UnlockAllX(); } - - if (inst.Rc) - { - ComputeRC(gpr.R(a)); - } } void Jit64::slwx(UGeckoInstruction inst) @@ -1688,28 +1693,33 @@ void Jit64::slwx(UGeckoInstruction inst) { u32 amount = (u32)gpr.R(b).offset; gpr.SetImmediate32(a, (amount & 0x20) ? 0 : (u32)gpr.R(s).offset << amount); + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } else { gpr.FlushLockX(ECX); gpr.Lock(a, b, s); - gpr.BindToRegister(a, a == s || a == b || s == b, true); + gpr.BindToRegister(a, true, true); MOV(32, R(ECX), gpr.R(b)); - XOR(32, R(EAX), R(EAX)); TEST(32, R(ECX), Imm32(32)); - FixupBranch branch = J_CC(CC_NZ); - MOV(32, R(EAX), gpr.R(s)); - SHL(32, R(EAX), R(ECX)); + if (a != s) + { + MOV(32, gpr.R(a), gpr.R(s)); + } + FixupBranch branch = J_CC(CC_Z); + XOR(32, gpr.R(a), gpr.R(a)); SetJumpTarget(branch); - MOV(32, gpr.R(a), R(EAX)); + SHL(32, gpr.R(a), R(ECX)); + if (inst.Rc) + { + GenerateRC(); + } gpr.UnlockAll(); gpr.UnlockAllX(); } - - if (inst.Rc) - { - ComputeRC(gpr.R(a)); - } } void Jit64::srawx(UGeckoInstruction inst) From ca287e7957c7a6ddca4275ce8299c9730e38ac29 Mon Sep 17 00:00:00 2001 From: skidau Date: Tue, 3 Jan 2012 15:36:32 +1100 Subject: [PATCH 241/381] Removed the "Reload MemCard on load state" hack as it is no longer needed with the new save states system. Fixes issue 4898. --- Source/Core/Core/Src/ConfigManager.cpp | 2 -- Source/Core/Core/Src/ConfigManager.h | 4 ---- Source/Core/Core/Src/HW/EXI_Channel.cpp | 6 +----- Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp | 12 ++---------- Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h | 1 - 5 files changed, 3 insertions(+), 22 deletions(-) diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index e70b021a0c..da8337bd04 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -223,7 +223,6 @@ void SConfig::SaveSettings() ini.Set("Core", "SelectedLanguage", m_LocalCoreStartupParameter.SelectedLanguage); ini.Set("Core", "MemcardA", m_strMemoryCardA); ini.Set("Core", "MemcardB", m_strMemoryCardB); - ini.Set("Core", "ReloadMemcardOnState", b_reloadMCOnState); ini.Set("Core", "SlotA", m_EXIDevice[0]); ini.Set("Core", "SlotB", m_EXIDevice[1]); ini.Set("Core", "SerialPort1", m_EXIDevice[2]); @@ -354,7 +353,6 @@ void SConfig::LoadSettings() ini.Get("Core", "SelectedLanguage", &m_LocalCoreStartupParameter.SelectedLanguage, 0); ini.Get("Core", "MemcardA", &m_strMemoryCardA); ini.Get("Core", "MemcardB", &m_strMemoryCardB); - ini.Get("Core", "ReloadMemcardOnState", &b_reloadMCOnState, true); ini.Get("Core", "SlotA", (int*)&m_EXIDevice[0], EXIDEVICE_MEMORYCARD); ini.Get("Core", "SlotB", (int*)&m_EXIDevice[1], EXIDEVICE_NONE); ini.Get("Core", "SerialPort1", (int*)&m_EXIDevice[2], EXIDEVICE_NONE); diff --git a/Source/Core/Core/Src/ConfigManager.h b/Source/Core/Core/Src/ConfigManager.h index 35ac8269e9..0c8f3f1af1 100644 --- a/Source/Core/Core/Src/ConfigManager.h +++ b/Source/Core/Core/Src/ConfigManager.h @@ -47,10 +47,6 @@ struct SConfig : NonCopyable std::string m_strMemoryCardA; std::string m_strMemoryCardB; - // eject and reload the memory card on state - // in ZTP and other games if the save file has been deleted from the memory card - //this is necessary to save after loading a savestate - bool b_reloadMCOnState; TEXIDevices m_EXIDevice[3]; SIDevices m_SIDevice[4]; std::string m_bba_mac; diff --git a/Source/Core/Core/Src/HW/EXI_Channel.cpp b/Source/Core/Core/Src/HW/EXI_Channel.cpp index c29a6f2bb2..91cb691546 100644 --- a/Source/Core/Core/Src/HW/EXI_Channel.cpp +++ b/Source/Core/Core/Src/HW/EXI_Channel.cpp @@ -284,8 +284,6 @@ void CEXIChannel::DoState(PointerWrap &p) p.Do(m_Control); p.Do(m_ImmData); - bool reloadOnState = SConfig::GetInstance().b_reloadMCOnState; - for (int d = 0; d < NUM_DEVICES; ++d) { IEXIDevice* pDevice = m_pDevices[d]; @@ -299,9 +297,7 @@ void CEXIChannel::DoState(PointerWrap &p) // also, if no movie is active, we'll assume the user wants to keep their current devices // instead of the ones they had when the savestate was created, // unless the device is NONE (since ChangeDevice sets that temporarily). - if(p.GetMode() != PointerWrap::MODE_READ || - (pDevice->m_deviceType != EXIDEVICE_NONE && - reloadOnState && !Movie::IsRecordingInput() && !Movie::IsPlayingInput())) + if(p.GetMode() != PointerWrap::MODE_READ) { delete pSaveDevice; } diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp index 88116e9c7c..e7f052b864 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp @@ -52,7 +52,6 @@ CEXIMemoryCard::CEXIMemoryCard(const int index) 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) ? "memcardA" : "memcardB", FlushCallback); - reloadOnState = SConfig::GetInstance().b_reloadMCOnState; interruptSwitch = 0; m_bInterruptSet = 0; @@ -426,14 +425,7 @@ void CEXIMemoryCard::TransferByte(u8 &byte) void CEXIMemoryCard::OnAfterLoad() { - // hack for memory card switching, so you can load an old savestate and expect your newer memcard data to show up. - // it breaks movie sync, so we disable it if a movie is active. - // this was moved out of DoState because other things that got loaded later conflicted with it. - // note: the reloadOnState flag is almost always true. maybe only a few TASers have it off. - if (reloadOnState && !Movie::IsRecordingInput() && !Movie::IsPlayingInput()) - { - ExpansionInterface::ChangeDevice(card_index, EXIDEVICE_MEMORYCARD, 0); - } + } void CEXIMemoryCard::DoState(PointerWrap &p) @@ -441,7 +433,7 @@ void CEXIMemoryCard::DoState(PointerWrap &p) // for movie sync, we need to save/load memory card contents (and other data) in savestates. // otherwise, we'll assume the user wants to keep their memcards and saves separate, // unless we're loading (in which case we let the savestate contents decide, in order to stay aligned with them). - bool storeContents = (!reloadOnState || Movie::IsRecordingInput() || Movie::IsPlayingInput()); + bool storeContents = (Movie::IsRecordingInput() || Movie::IsPlayingInput()); p.Do(storeContents); if (storeContents) diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h index ac2cdd69f8..5da8c63183 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h +++ b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h @@ -71,7 +71,6 @@ private: std::string m_strFilename; int card_index; int et_this_card; - bool reloadOnState; //! memory card state // STATE_TO_SAVE From aa47a8c69053725d2131c48b199eac6a3f8dbc82 Mon Sep 17 00:00:00 2001 From: calc84maniac Date: Tue, 3 Jan 2012 00:37:43 -0500 Subject: [PATCH 242/381] x86 shift of 0 doesn't update flags, check the value manually --- .../Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index b0be8517c7..0be20dc4e6 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -1652,10 +1652,6 @@ void Jit64::srwx(UGeckoInstruction inst) { u32 amount = (u32)gpr.R(b).offset; gpr.SetImmediate32(a, (amount & 0x20) ? 0 : ((u32)gpr.R(s).offset >> (amount & 0x1f))); - if (inst.Rc) - { - ComputeRC(gpr.R(a)); - } } else { @@ -1672,13 +1668,14 @@ void Jit64::srwx(UGeckoInstruction inst) XOR(32, gpr.R(a), gpr.R(a)); SetJumpTarget(branch); SHR(32, gpr.R(a), R(ECX)); - if (inst.Rc) - { - GenerateRC(); - } gpr.UnlockAll(); gpr.UnlockAllX(); } + // Shift of 0 doesn't update flags, so compare manually just in case + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } void Jit64::slwx(UGeckoInstruction inst) @@ -1693,10 +1690,6 @@ void Jit64::slwx(UGeckoInstruction inst) { u32 amount = (u32)gpr.R(b).offset; gpr.SetImmediate32(a, (amount & 0x20) ? 0 : (u32)gpr.R(s).offset << amount); - if (inst.Rc) - { - ComputeRC(gpr.R(a)); - } } else { @@ -1713,13 +1706,14 @@ void Jit64::slwx(UGeckoInstruction inst) XOR(32, gpr.R(a), gpr.R(a)); SetJumpTarget(branch); SHL(32, gpr.R(a), R(ECX)); - if (inst.Rc) - { - GenerateRC(); - } gpr.UnlockAll(); gpr.UnlockAllX(); } + // Shift of 0 doesn't update flags, so compare manually just in case + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } void Jit64::srawx(UGeckoInstruction inst) From 69b2d4ddc1cb552fb11814079d0c989007ba1efe Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 31 Dec 2011 15:18:48 +1100 Subject: [PATCH 243/381] Changed the Gecko code handling to the native code handler. This provides full compatibility with all Gecko codes. To use the native code handler, place the kenobiwii.bin file into the Sys directory. Dolphin will silently fall-back to the emulated code handler if the file is not there. Fixes issue 4561. --- Source/Core/Common/Src/CommonPaths.h | 2 + Source/Core/Core/Src/Boot/Boot.cpp | 11 ++- Source/Core/Core/Src/GeckoCode.cpp | 98 ++++++++++++++++++++++++ Source/Core/Core/Src/GeckoCode.h | 1 + Source/Core/Core/Src/PatchEngine.cpp | 5 +- Source/Core/Core/Src/PowerPC/PowerPC.cpp | 6 +- Source/Core/Core/Src/PowerPC/PowerPC.h | 1 + 7 files changed, 117 insertions(+), 7 deletions(-) diff --git a/Source/Core/Common/Src/CommonPaths.h b/Source/Core/Common/Src/CommonPaths.h index 8d37482ce1..150453928e 100644 --- a/Source/Core/Common/Src/CommonPaths.h +++ b/Source/Core/Common/Src/CommonPaths.h @@ -126,6 +126,8 @@ #define WII_USA_SETTING "setting-usa.txt" #define WII_JAP_SETTING "setting-jpn.txt" +#define GECKO_CODE_HANDLER "kenobiwii.bin" + // Subdirs in Sys #define GC_SYS_DIR "GC" #define WII_SYS_DIR "Wii" diff --git a/Source/Core/Core/Src/Boot/Boot.cpp b/Source/Core/Core/Src/Boot/Boot.cpp index 5a9880533e..3dcbf5730c 100644 --- a/Source/Core/Core/Src/Boot/Boot.cpp +++ b/Source/Core/Core/Src/Boot/Boot.cpp @@ -195,10 +195,13 @@ bool CBoot::BootUp() NOTICE_LOG(BOOT, "Booting %s", _StartupPara.m_strFilename.c_str()); - // HLE jump to loader (homebrew) - HLE::Patch(0x80001800, "HBReload"); - const u8 stubstr[] = { 'S', 'T', 'U', 'B', 'H', 'A', 'X', 'X' }; - Memory::WriteBigEData(stubstr, 0x80001804, 8); + // HLE jump to loader (homebrew). Disabled when Gecko is active as it interferes with the code handler + if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats) + { + HLE::Patch(0x80001800, "HBReload"); + const u8 stubstr[] = { 'S', 'T', 'U', 'B', 'H', 'A', 'X', 'X' }; + Memory::WriteBigEData(stubstr, 0x80001804, 8); + } g_symbolDB.Clear(); VideoInterface::Preset(_StartupPara.bNTSC); diff --git a/Source/Core/Core/Src/GeckoCode.cpp b/Source/Core/Core/Src/GeckoCode.cpp index 9ea30b9fb0..207aa8fb8b 100644 --- a/Source/Core/Core/Src/GeckoCode.cpp +++ b/Source/Core/Core/Src/GeckoCode.cpp @@ -5,6 +5,8 @@ #include "ConfigManager.h" #include "vector" +#include "PowerPC/PowerPC.h" +#include "CommonPaths.h" namespace Gecko { @@ -40,6 +42,9 @@ static struct // codes execute when counter is 0 static int code_execution_counter = 0; +// Track whether the code handler has been installed +static bool code_handler_installed = false; + // the currently active codes std::vector active_codes; @@ -93,6 +98,64 @@ void SetActiveCodes(const std::vector& gcodes) } inserted_asm_codes.clear(); + + code_handler_installed = false; +} + +bool InstallCodeHandler() +{ + std::string data; + std::string _rCodeHandlerFilename = File::GetSysDirectory() + GECKO_CODE_HANDLER; + if (!File::ReadFileToString(false, _rCodeHandlerFilename.c_str(), data)) + return false; + + // Install code handler + Memory::WriteBigEData((const u8*)data.data(), 0x80001800, data.length()); + + // Turn off Pause on start + Memory::Write_U32(0, 0x80001808); + + // Write the Game ID into the location expected by WiiRD + Memory::WriteBigEData(Memory::GetPointer(0x80000000), 0x80001800, 6); + + // Create GCT in memory + Memory::Write_U32(0x00d0c0de, 0x800027d0); + Memory::Write_U32(0x00d0c0de, 0x800027d4); + + std::lock_guard lk(active_codes_lock); + + int i = 0; + std::vector::iterator + gcodes_iter = active_codes.begin(), + gcodes_end = active_codes.end(); + for (; gcodes_iter!=gcodes_end; ++gcodes_iter) + { + if (gcodes_iter->enabled) + { + current_code = codes_start = &*gcodes_iter->codes.begin(); + codes_end = &*gcodes_iter->codes.end(); + for (; current_code < codes_end; ++current_code) + { + const GeckoCode::Code& code = *current_code; + Memory::Write_U32(code.address, 0x800027d8 + i); + Memory::Write_U32(code.data, 0x800027d8 + i + 4); + i += 8; + } + } + } + + Memory::Write_U32(0xff000000, 0x800027d8 + i); + Memory::Write_U32(0x00000000, 0x800027d8 + i + 4); + + // Turn on codes + Memory::Write_U8(1, 0x80001807); + + // Invalidate the icache + for (int i = 0; i < data.length(); i += 32) + { + PowerPC::ppcState.iCache.Invalidate(0x80001800 + i); + } + return true; } bool RunGeckoCode(GeckoCode& gecko_code) @@ -168,6 +231,41 @@ bool RunActiveCodes() return true; } +void RunCodeHandler() +{ + if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats) + { + if (!code_handler_installed) + code_handler_installed = InstallCodeHandler(); + + if (code_handler_installed) + { + if (PC == LR) + { + u32 oldLR = LR; + PowerPC::CoreMode oldMode = PowerPC::GetMode(); + + PC = 0x800018A8; + LR = 0; + + // Execute the code handler in interpreter mode to track when it exits + PowerPC::SetMode(PowerPC::MODE_INTERPRETER); + + while (PC != 0) + PowerPC::SingleStep(); + + PowerPC::SetMode(oldMode); + PC = LR = oldLR; + } + } + else + { + // Use the emulated code handler + Gecko::RunActiveCodes(); + } + } +} + const std::map >& GetInsertedAsmCodes() { return inserted_asm_codes; } diff --git a/Source/Core/Core/Src/GeckoCode.h b/Source/Core/Core/Src/GeckoCode.h index 016e38f3d2..1cd83bdf65 100644 --- a/Source/Core/Core/Src/GeckoCode.h +++ b/Source/Core/Core/Src/GeckoCode.h @@ -67,6 +67,7 @@ namespace Gecko void SetActiveCodes(const std::vector& gcodes); bool RunActiveCodes(); + void RunCodeHandler(); const std::map >& GetInsertedAsmCodes(); } // namespace Gecko diff --git a/Source/Core/Core/Src/PatchEngine.cpp b/Source/Core/Core/Src/PatchEngine.cpp index 6528ad6752..74e778c916 100644 --- a/Source/Core/Core/Src/PatchEngine.cpp +++ b/Source/Core/Core/Src/PatchEngine.cpp @@ -210,13 +210,14 @@ void ApplyPatches(const std::vector &patches) void ApplyFramePatches() { ApplyPatches(onFrame); + + // Run the Gecko code handler + Gecko::RunCodeHandler(); } void ApplyARPatches() { ActionReplay::RunAllActive(); - // w/e this can be changed later - Gecko::RunActiveCodes(); } } // namespace diff --git a/Source/Core/Core/Src/PowerPC/PowerPC.cpp b/Source/Core/Core/Src/PowerPC/PowerPC.cpp index a247ec5035..7e5d9ba763 100644 --- a/Source/Core/Core/Src/PowerPC/PowerPC.cpp +++ b/Source/Core/Core/Src/PowerPC/PowerPC.cpp @@ -213,6 +213,11 @@ void Shutdown() state = CPU_POWERDOWN; } +CoreMode GetMode() +{ + return mode; +} + void SetMode(CoreMode new_mode) { if (new_mode == mode) @@ -223,7 +228,6 @@ void SetMode(CoreMode new_mode) switch (mode) { case MODE_INTERPRETER: // Switching from JIT to interpreter - jit->ClearCache(); // Remove all those nasty JIT patches. cpu_core_base = interpreter; break; diff --git a/Source/Core/Core/Src/PowerPC/PowerPC.h b/Source/Core/Core/Src/PowerPC/PowerPC.h index 9ac979bcfb..54690ac6b5 100644 --- a/Source/Core/Core/Src/PowerPC/PowerPC.h +++ b/Source/Core/Core/Src/PowerPC/PowerPC.h @@ -97,6 +97,7 @@ void Init(int cpu_core); void Shutdown(); void DoState(PointerWrap &p); +CoreMode GetMode(); void SetMode(CoreMode _coreType); void SingleStep(); From 318d3cff02cd7543acf18c8b83db6f982fe8bd48 Mon Sep 17 00:00:00 2001 From: skidau Date: Mon, 2 Jan 2012 13:53:39 +1100 Subject: [PATCH 244/381] Added a note to try the native code handler in the error message window. Added copyright notices. --- Source/Core/Core/Src/GeckoCode.cpp | 16 +++++++++++++++- Source/Core/Core/Src/GeckoCode.h | 13 +++++++++++++ Source/Core/Core/Src/GeckoCodeConfig.cpp | 13 +++++++++++++ Source/Core/Core/Src/GeckoCodeConfig.h | 13 +++++++++++++ Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp | 13 +++++++++++++ Source/Core/DolphinWX/Src/GeckoCodeDiag.h | 13 +++++++++++++ 6 files changed, 80 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/GeckoCode.cpp b/Source/Core/Core/Src/GeckoCode.cpp index 207aa8fb8b..2bbe101cee 100644 --- a/Source/Core/Core/Src/GeckoCode.cpp +++ b/Source/Core/Core/Src/GeckoCode.cpp @@ -1,3 +1,17 @@ +// 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/ + #include "GeckoCode.h" #include "Thread.h" @@ -200,7 +214,7 @@ bool RunGeckoCode(GeckoCode& gecko_code) gecko_code.enabled = false; PanicAlertT("GeckoCode failed to run (CT%i CST%i) (%s)" - "\n(either a bad code or the code type is not yet supported.)" + "\n(either a bad code or the code type is not yet supported. Try using the native code handler by placing the kenobiwii.bin file into the Sys directory and restarting Dolphin.)" , code.type, code.subtype, gecko_code.name.c_str()); return false; } diff --git a/Source/Core/Core/Src/GeckoCode.h b/Source/Core/Core/Src/GeckoCode.h index 1cd83bdf65..d9a53dcfc3 100644 --- a/Source/Core/Core/Src/GeckoCode.h +++ b/Source/Core/Core/Src/GeckoCode.h @@ -1,3 +1,16 @@ +// 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/ #ifndef __GECKOCODE_h__ #define __GECKOCODE_h__ diff --git a/Source/Core/Core/Src/GeckoCodeConfig.cpp b/Source/Core/Core/Src/GeckoCodeConfig.cpp index f0e5a0585b..a23d531f7e 100644 --- a/Source/Core/Core/Src/GeckoCodeConfig.cpp +++ b/Source/Core/Core/Src/GeckoCodeConfig.cpp @@ -1,3 +1,16 @@ +// 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/ #include "GeckoCodeConfig.h" diff --git a/Source/Core/Core/Src/GeckoCodeConfig.h b/Source/Core/Core/Src/GeckoCodeConfig.h index d7e28086c7..0ae630f784 100644 --- a/Source/Core/Core/Src/GeckoCodeConfig.h +++ b/Source/Core/Core/Src/GeckoCodeConfig.h @@ -1,3 +1,16 @@ +// 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/ #ifndef __GECKOCODECONFIG_h__ #define __GECKOCODECONFIG_h__ diff --git a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp b/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp index c491424376..e9089c6006 100644 --- a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp +++ b/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp @@ -1,3 +1,16 @@ +// 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/ #include "GeckoCodeDiag.h" diff --git a/Source/Core/DolphinWX/Src/GeckoCodeDiag.h b/Source/Core/DolphinWX/Src/GeckoCodeDiag.h index 92328d5f43..338c57c6e9 100644 --- a/Source/Core/DolphinWX/Src/GeckoCodeDiag.h +++ b/Source/Core/DolphinWX/Src/GeckoCodeDiag.h @@ -1,3 +1,16 @@ +// 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/ #ifndef __GECKOCODEDIAG_h__ #define __GECKOCODEDIAG_h__ From b9547a07f580410bf565a6de88b20f209ed14f95 Mon Sep 17 00:00:00 2001 From: skidau Date: Mon, 2 Jan 2012 15:14:30 +1100 Subject: [PATCH 245/381] Updated the Gecko code handler to the latest version from Gecko OS 1.9.3.1. Added a check to ensure that the number of codes fits in memory (maximum 231 codes). Store a copy of codehandler.bin in the Sys directory. --- Data/Sys/codehandler.bin | Bin 0 -> 4288 bytes Source/Core/Common/Src/CommonPaths.h | 2 +- Source/Core/Core/Src/GeckoCode.cpp | 24 +++++++++++++++--------- 3 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 Data/Sys/codehandler.bin diff --git a/Data/Sys/codehandler.bin b/Data/Sys/codehandler.bin new file mode 100644 index 0000000000000000000000000000000000000000..7a95e724b1e69655f521c67e22e2b8c0479007dd GIT binary patch literal 4288 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 literal 0 HcmV?d00001 diff --git a/Source/Core/Common/Src/CommonPaths.h b/Source/Core/Common/Src/CommonPaths.h index 150453928e..d319fb541e 100644 --- a/Source/Core/Common/Src/CommonPaths.h +++ b/Source/Core/Common/Src/CommonPaths.h @@ -126,7 +126,7 @@ #define WII_USA_SETTING "setting-usa.txt" #define WII_JAP_SETTING "setting-jpn.txt" -#define GECKO_CODE_HANDLER "kenobiwii.bin" +#define GECKO_CODE_HANDLER "codehandler.bin" // Subdirs in Sys #define GC_SYS_DIR "GC" diff --git a/Source/Core/Core/Src/GeckoCode.cpp b/Source/Core/Core/Src/GeckoCode.cpp index 2bbe101cee..c0b7af3779 100644 --- a/Source/Core/Core/Src/GeckoCode.cpp +++ b/Source/Core/Core/Src/GeckoCode.cpp @@ -118,6 +118,7 @@ void SetActiveCodes(const std::vector& gcodes) bool InstallCodeHandler() { + u32 codelist_location = 0x800028B8; // Debugger on location (0x800022A8 = Debugger off, using codehandleronly.bin) std::string data; std::string _rCodeHandlerFilename = File::GetSysDirectory() + GECKO_CODE_HANDLER; if (!File::ReadFileToString(false, _rCodeHandlerFilename.c_str(), data)) @@ -127,14 +128,14 @@ bool InstallCodeHandler() Memory::WriteBigEData((const u8*)data.data(), 0x80001800, data.length()); // Turn off Pause on start - Memory::Write_U32(0, 0x80001808); + Memory::Write_U32(0, 0x80002774); // Write the Game ID into the location expected by WiiRD Memory::WriteBigEData(Memory::GetPointer(0x80000000), 0x80001800, 6); // Create GCT in memory - Memory::Write_U32(0x00d0c0de, 0x800027d0); - Memory::Write_U32(0x00d0c0de, 0x800027d4); + Memory::Write_U32(0x00d0c0de, codelist_location); + Memory::Write_U32(0x00d0c0de, codelist_location + 4); std::lock_guard lk(active_codes_lock); @@ -151,15 +152,20 @@ bool InstallCodeHandler() for (; current_code < codes_end; ++current_code) { const GeckoCode::Code& code = *current_code; - Memory::Write_U32(code.address, 0x800027d8 + i); - Memory::Write_U32(code.data, 0x800027d8 + i + 4); - i += 8; + + // Make sure we have enough memory to hold the code list + if ((codelist_location + 24 + i) < 0x80003000) + { + Memory::Write_U32(code.address, codelist_location + 8 + i); + Memory::Write_U32(code.data, codelist_location + 12 + i); + i += 8; + } } } } - Memory::Write_U32(0xff000000, 0x800027d8 + i); - Memory::Write_U32(0x00000000, 0x800027d8 + i + 4); + Memory::Write_U32(0xff000000, codelist_location + 8 + i); + Memory::Write_U32(0x00000000, codelist_location + 12 + i); // Turn on codes Memory::Write_U8(1, 0x80001807); @@ -214,7 +220,7 @@ bool RunGeckoCode(GeckoCode& gecko_code) gecko_code.enabled = false; PanicAlertT("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 kenobiwii.bin file into the Sys directory and restarting Dolphin.)" + "\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.)" , code.type, code.subtype, gecko_code.name.c_str()); return false; } From daf7e965219eb61f36c19d2f2a6c12276c5a371e Mon Sep 17 00:00:00 2001 From: skidau Date: Tue, 3 Jan 2012 01:17:52 +1100 Subject: [PATCH 246/381] Fixed the safe write path of the stfd instruction in the JIT. Fixes issue 4001. --- .../PowerPC/Jit64/Jit_LoadStoreFloating.cpp | 99 ++++++++----------- 1 file changed, 41 insertions(+), 58 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp index 55990d6abf..46e888f935 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp @@ -172,80 +172,63 @@ void Jit64::stfd(UGeckoInstruction inst) int s = inst.RS; int a = inst.RA; - if (!a) - { - Default(inst); - return; + + u32 mem_mask = Memory::ADDR_MASK_HW_ACCESS; + if (Core::g_CoreStartupParameter.bMMU || + Core::g_CoreStartupParameter.iTLBHack) { + mem_mask |= Memory::ADDR_MASK_MEM1; } - s32 offset = (s32)(s16)inst.SIMM_16; +#ifdef ENABLE_MEM_CHECK + if (Core::g_CoreStartupParameter.bEnableDebugging) + { + mem_mask |= Memory::EXRAM_MASK; + } +#endif + gpr.FlushLockX(ABI_PARAM1); gpr.Lock(a); fpr.Lock(s); gpr.BindToRegister(a, true, false); + + s32 offset = (s32)(s16)inst.SIMM_16; LEA(32, ABI_PARAM1, MDisp(gpr.R(a).GetSimpleReg(), offset)); - TEST(32, R(ABI_PARAM1), Imm32(0x0c000000)); - FixupBranch not_ram = J_CC(CC_Z); - // Assume that any hardware writes using this instruction will go to the FIFO. - // Star Wars - The Force Unleashed uses this trick. + TEST(32, R(ABI_PARAM1), Imm32(mem_mask)); + FixupBranch safe = J_CC(CC_NZ); + + // Fast routine if (cpu_info.bSSSE3) { MOVAPD(XMM0, fpr.R(s)); - PSHUFB(XMM0, M((void *)bswapShuffle1x8)); - CALL(asm_routines.fifoDirectWriteXmm64); - } else { - // This ain't working yet - MOVAPD(XMM0, fpr.R(s)); - MOVQ_xmm(M(&temp64), XMM0); - MOV(32, R(EAX), M(&temp64)); - MOV(32, R(ABI_PARAM1), M((void*)((u8 *)&temp64 + 4))); - BSWAP(32, EAX); - BSWAP(32, ABI_PARAM1); - MOV(32, M(((u8 *)&temp64) + 4), R(EAX)); - MOV(32, M((u8 *)&temp64), R(ABI_PARAM1)); - MOVQ_xmm(XMM0, M(&temp64)); - CALL(asm_routines.fifoDirectWriteXmm64); - } - FixupBranch quit = J(false); - SetJumpTarget(not_ram); -#ifdef _M_IX86 - AND(32, R(ABI_PARAM1), Imm32(Memory::MEMVIEW32_MASK)); -#endif - if (cpu_info.bSSSE3) { - MOVAPD(XMM0, fpr.R(s)); - PSHUFB(XMM0, M((void *)bswapShuffle1x8)); + PSHUFB(XMM0, M((void*)bswapShuffle1x8)); #ifdef _M_X64 MOVQ_xmm(MComplex(RBX, ABI_PARAM1, SCALE_1, 0), XMM0); #else + AND(32, R(ECX), Imm32(Memory::MEMVIEW32_MASK)); MOVQ_xmm(MDisp(ABI_PARAM1, (u32)Memory::base), XMM0); #endif } else { -#ifdef _M_X64 - fpr.BindToRegister(s, true, false); - MOVSD(M(&temp64), fpr.RX(s)); + MOVAPD(XMM0, fpr.R(s)); + MOVD_xmm(R(EAX), XMM0); + UnsafeWriteRegToReg(EAX, ABI_PARAM1, 32, 4); - MEMCHECK_START - - MOV(64, R(EAX), M(&temp64)); - BSWAP(64, EAX); - MOV(64, MComplex(RBX, ABI_PARAM1, SCALE_1, 0), R(EAX)); - - MEMCHECK_END -#else - fpr.BindToRegister(s, true, false); - MOVSD(M(&temp64), fpr.RX(s)); - - MEMCHECK_START - - MOV(32, R(EAX), M(&temp64)); - BSWAP(32, EAX); - MOV(32, MDisp(ABI_PARAM1, (u32)Memory::base + 4), R(EAX)); - MOV(32, R(EAX), M((void*)((u8 *)&temp64 + 4))); - BSWAP(32, EAX); - MOV(32, MDisp(ABI_PARAM1, (u32)Memory::base), R(EAX)); - - MEMCHECK_END -#endif + PSRLQ(XMM0, 32); + MOVD_xmm(R(EAX), XMM0); + UnsafeWriteRegToReg(EAX, ABI_PARAM1, 32, 0); } - SetJumpTarget(quit); + FixupBranch exit = J(); + SetJumpTarget(safe); + + // Safe but slow routine + MOVAPD(XMM0, fpr.R(s)); + MOVD_xmm(R(EAX), XMM0); + SafeWriteRegToReg(EAX, ABI_PARAM1, 32, 4); + + PSRLQ(XMM0, 32); + MOVD_xmm(R(EAX), XMM0); + LEA(32, ABI_PARAM1, MDisp(gpr.R(a).GetSimpleReg(), offset)); + SafeWriteRegToReg(EAX, ABI_PARAM1, 32, 0); + + SetJumpTarget(exit); + gpr.UnlockAll(); gpr.UnlockAllX(); fpr.UnlockAll(); From 32755aa48ce88d8da6964c662a55851a317cea15 Mon Sep 17 00:00:00 2001 From: skidau Date: Tue, 3 Jan 2012 10:20:20 +1100 Subject: [PATCH 247/381] Reordered the safe write path of the stfd instruction. --- .../Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp index 46e888f935..41c9a3ceb7 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp @@ -172,6 +172,11 @@ void Jit64::stfd(UGeckoInstruction inst) int s = inst.RS; int a = inst.RA; + if (!a) + { + Default(inst); + return; + } u32 mem_mask = Memory::ADDR_MASK_HW_ACCESS; if (Core::g_CoreStartupParameter.bMMU || @@ -219,14 +224,15 @@ void Jit64::stfd(UGeckoInstruction inst) // Safe but slow routine MOVAPD(XMM0, fpr.R(s)); - MOVD_xmm(R(EAX), XMM0); - SafeWriteRegToReg(EAX, ABI_PARAM1, 32, 4); - PSRLQ(XMM0, 32); MOVD_xmm(R(EAX), XMM0); - LEA(32, ABI_PARAM1, MDisp(gpr.R(a).GetSimpleReg(), offset)); SafeWriteRegToReg(EAX, ABI_PARAM1, 32, 0); + MOVAPD(XMM0, fpr.R(s)); + MOVD_xmm(R(EAX), XMM0); + LEA(32, ABI_PARAM1, MDisp(gpr.R(a).GetSimpleReg(), offset)); + SafeWriteRegToReg(EAX, ABI_PARAM1, 32, 4); + SetJumpTarget(exit); gpr.UnlockAll(); From a812e3bd3d4ddd6b882774e7ded151572119411b Mon Sep 17 00:00:00 2001 From: skidau Date: Tue, 3 Jan 2012 15:36:32 +1100 Subject: [PATCH 248/381] Removed the "Reload MemCard on load state" hack as it is no longer needed with the new save states system. Fixes issue 4898. --- Source/Core/Core/Src/ConfigManager.cpp | 2 -- Source/Core/Core/Src/ConfigManager.h | 4 ---- Source/Core/Core/Src/HW/EXI_Channel.cpp | 6 +----- Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp | 12 ++---------- Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h | 1 - 5 files changed, 3 insertions(+), 22 deletions(-) diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index e70b021a0c..da8337bd04 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -223,7 +223,6 @@ void SConfig::SaveSettings() ini.Set("Core", "SelectedLanguage", m_LocalCoreStartupParameter.SelectedLanguage); ini.Set("Core", "MemcardA", m_strMemoryCardA); ini.Set("Core", "MemcardB", m_strMemoryCardB); - ini.Set("Core", "ReloadMemcardOnState", b_reloadMCOnState); ini.Set("Core", "SlotA", m_EXIDevice[0]); ini.Set("Core", "SlotB", m_EXIDevice[1]); ini.Set("Core", "SerialPort1", m_EXIDevice[2]); @@ -354,7 +353,6 @@ void SConfig::LoadSettings() ini.Get("Core", "SelectedLanguage", &m_LocalCoreStartupParameter.SelectedLanguage, 0); ini.Get("Core", "MemcardA", &m_strMemoryCardA); ini.Get("Core", "MemcardB", &m_strMemoryCardB); - ini.Get("Core", "ReloadMemcardOnState", &b_reloadMCOnState, true); ini.Get("Core", "SlotA", (int*)&m_EXIDevice[0], EXIDEVICE_MEMORYCARD); ini.Get("Core", "SlotB", (int*)&m_EXIDevice[1], EXIDEVICE_NONE); ini.Get("Core", "SerialPort1", (int*)&m_EXIDevice[2], EXIDEVICE_NONE); diff --git a/Source/Core/Core/Src/ConfigManager.h b/Source/Core/Core/Src/ConfigManager.h index 35ac8269e9..0c8f3f1af1 100644 --- a/Source/Core/Core/Src/ConfigManager.h +++ b/Source/Core/Core/Src/ConfigManager.h @@ -47,10 +47,6 @@ struct SConfig : NonCopyable std::string m_strMemoryCardA; std::string m_strMemoryCardB; - // eject and reload the memory card on state - // in ZTP and other games if the save file has been deleted from the memory card - //this is necessary to save after loading a savestate - bool b_reloadMCOnState; TEXIDevices m_EXIDevice[3]; SIDevices m_SIDevice[4]; std::string m_bba_mac; diff --git a/Source/Core/Core/Src/HW/EXI_Channel.cpp b/Source/Core/Core/Src/HW/EXI_Channel.cpp index c29a6f2bb2..91cb691546 100644 --- a/Source/Core/Core/Src/HW/EXI_Channel.cpp +++ b/Source/Core/Core/Src/HW/EXI_Channel.cpp @@ -284,8 +284,6 @@ void CEXIChannel::DoState(PointerWrap &p) p.Do(m_Control); p.Do(m_ImmData); - bool reloadOnState = SConfig::GetInstance().b_reloadMCOnState; - for (int d = 0; d < NUM_DEVICES; ++d) { IEXIDevice* pDevice = m_pDevices[d]; @@ -299,9 +297,7 @@ void CEXIChannel::DoState(PointerWrap &p) // also, if no movie is active, we'll assume the user wants to keep their current devices // instead of the ones they had when the savestate was created, // unless the device is NONE (since ChangeDevice sets that temporarily). - if(p.GetMode() != PointerWrap::MODE_READ || - (pDevice->m_deviceType != EXIDEVICE_NONE && - reloadOnState && !Movie::IsRecordingInput() && !Movie::IsPlayingInput())) + if(p.GetMode() != PointerWrap::MODE_READ) { delete pSaveDevice; } diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp index 88116e9c7c..e7f052b864 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp @@ -52,7 +52,6 @@ CEXIMemoryCard::CEXIMemoryCard(const int index) 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) ? "memcardA" : "memcardB", FlushCallback); - reloadOnState = SConfig::GetInstance().b_reloadMCOnState; interruptSwitch = 0; m_bInterruptSet = 0; @@ -426,14 +425,7 @@ void CEXIMemoryCard::TransferByte(u8 &byte) void CEXIMemoryCard::OnAfterLoad() { - // hack for memory card switching, so you can load an old savestate and expect your newer memcard data to show up. - // it breaks movie sync, so we disable it if a movie is active. - // this was moved out of DoState because other things that got loaded later conflicted with it. - // note: the reloadOnState flag is almost always true. maybe only a few TASers have it off. - if (reloadOnState && !Movie::IsRecordingInput() && !Movie::IsPlayingInput()) - { - ExpansionInterface::ChangeDevice(card_index, EXIDEVICE_MEMORYCARD, 0); - } + } void CEXIMemoryCard::DoState(PointerWrap &p) @@ -441,7 +433,7 @@ void CEXIMemoryCard::DoState(PointerWrap &p) // for movie sync, we need to save/load memory card contents (and other data) in savestates. // otherwise, we'll assume the user wants to keep their memcards and saves separate, // unless we're loading (in which case we let the savestate contents decide, in order to stay aligned with them). - bool storeContents = (!reloadOnState || Movie::IsRecordingInput() || Movie::IsPlayingInput()); + bool storeContents = (Movie::IsRecordingInput() || Movie::IsPlayingInput()); p.Do(storeContents); if (storeContents) diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h index ac2cdd69f8..5da8c63183 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h +++ b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h @@ -71,7 +71,6 @@ private: std::string m_strFilename; int card_index; int et_this_card; - bool reloadOnState; //! memory card state // STATE_TO_SAVE From b88d0aa53f6098212efa3a379734e57d7b6f164f Mon Sep 17 00:00:00 2001 From: calc84maniac Date: Tue, 3 Jan 2012 00:37:43 -0500 Subject: [PATCH 249/381] x86 shift of 0 doesn't update flags, check the value manually --- .../Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index b0be8517c7..0be20dc4e6 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -1652,10 +1652,6 @@ void Jit64::srwx(UGeckoInstruction inst) { u32 amount = (u32)gpr.R(b).offset; gpr.SetImmediate32(a, (amount & 0x20) ? 0 : ((u32)gpr.R(s).offset >> (amount & 0x1f))); - if (inst.Rc) - { - ComputeRC(gpr.R(a)); - } } else { @@ -1672,13 +1668,14 @@ void Jit64::srwx(UGeckoInstruction inst) XOR(32, gpr.R(a), gpr.R(a)); SetJumpTarget(branch); SHR(32, gpr.R(a), R(ECX)); - if (inst.Rc) - { - GenerateRC(); - } gpr.UnlockAll(); gpr.UnlockAllX(); } + // Shift of 0 doesn't update flags, so compare manually just in case + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } void Jit64::slwx(UGeckoInstruction inst) @@ -1693,10 +1690,6 @@ void Jit64::slwx(UGeckoInstruction inst) { u32 amount = (u32)gpr.R(b).offset; gpr.SetImmediate32(a, (amount & 0x20) ? 0 : (u32)gpr.R(s).offset << amount); - if (inst.Rc) - { - ComputeRC(gpr.R(a)); - } } else { @@ -1713,13 +1706,14 @@ void Jit64::slwx(UGeckoInstruction inst) XOR(32, gpr.R(a), gpr.R(a)); SetJumpTarget(branch); SHL(32, gpr.R(a), R(ECX)); - if (inst.Rc) - { - GenerateRC(); - } gpr.UnlockAll(); gpr.UnlockAllX(); } + // Shift of 0 doesn't update flags, so compare manually just in case + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } void Jit64::srawx(UGeckoInstruction inst) From b23a3df5e866288df5c90ff76cca8757382efcf1 Mon Sep 17 00:00:00 2001 From: calc84maniac Date: Tue, 3 Jan 2012 10:03:12 -0500 Subject: [PATCH 250/381] More x86 shift fixing --- Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index 0be20dc4e6..56456bbf75 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -1436,7 +1436,7 @@ void Jit64::rlwinmx(UGeckoInstruction inst) MOV(32, gpr.R(a), gpr.R(s)); } - if (inst.MB == 0 && inst.ME==31-inst.SH) + if (inst.SH && inst.MB == 0 && inst.ME==31-inst.SH) { SHL(32, gpr.R(a), Imm8(inst.SH)); if (inst.Rc) @@ -1444,7 +1444,7 @@ void Jit64::rlwinmx(UGeckoInstruction inst) GenerateRC(); } } - else if (inst.ME == 31 && inst.MB == 32 - inst.SH) + else if (inst.SH && inst.ME == 31 && inst.MB == 32 - inst.SH) { SHR(32, gpr.R(a), Imm8(inst.MB)); if (inst.Rc) From 415aad3b03b28c734d3c9ec8d4ee1e6b99db8815 Mon Sep 17 00:00:00 2001 From: calc84maniac Date: Tue, 3 Jan 2012 10:57:58 -0500 Subject: [PATCH 251/381] Fixed some GCC compiler warnings --- Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 4 ++-- Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index 56456bbf75..22da415d37 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -1525,14 +1525,14 @@ void Jit64::rlwimix(UGeckoInstruction inst) } else if (inst.SH) { - if (mask == -(1 << inst.SH)) + if (mask == -(1U << inst.SH)) { MOV(32, R(EAX), gpr.R(s)); SHL(32, R(EAX), Imm8(inst.SH)); AND(32, gpr.R(a), Imm32(~mask)); OR(32, gpr.R(a), R(EAX)); } - else if (mask == (1 << inst.SH) - 1) + else if (mask == (1U << inst.SH) - 1) { MOV(32, R(EAX), gpr.R(s)); SHR(32, R(EAX), Imm8(32-inst.SH)); diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp index b1f8a01f96..26abb5a890 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp @@ -359,4 +359,4 @@ void EmuCodeBlock::JitClearCAOV(bool oe) AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_CA_MASK & ~XER_OV_MASK)); //XER.CA, XER.OV = 0 else AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~XER_CA_MASK)); //XER.CA = 0 -} \ No newline at end of file +} From 363cf39ca9c6d33efe83d97e9c0101a3195c011a Mon Sep 17 00:00:00 2001 From: calc84maniac Date: Wed, 4 Jan 2012 02:27:04 -0500 Subject: [PATCH 252/381] Got rid of no-longer-valid assert 'W T F !!!' --- Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index 22da415d37..bcd94cd42f 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -1454,15 +1454,12 @@ void Jit64::rlwinmx(UGeckoInstruction inst) } else { - bool written = false; if (inst.SH != 0) { ROL(32, gpr.R(a), Imm8(inst.SH)); - written = true; } if (!(inst.MB==0 && inst.ME==31)) { - written = true; AND(32, gpr.R(a), Imm32(Helper_Mask(inst.MB, inst.ME))); if (inst.Rc) { @@ -1473,7 +1470,6 @@ void Jit64::rlwinmx(UGeckoInstruction inst) { ComputeRC(gpr.R(a)); } - _assert_msg_(DYNA_REC, written, "W T F!!!"); } gpr.UnlockAll(); } From 88df9d25a1986eae93d36961e5eb0b930fb37702 Mon Sep 17 00:00:00 2001 From: nitsuja Date: Wed, 4 Jan 2012 00:51:18 -0800 Subject: [PATCH 253/381] fixed potential crash in wii fileio --- .../Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 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 8a2cec7bea..d17e50e0cd 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 @@ -182,15 +182,21 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) u32 ReturnValue = FS_INVALID_ARGUMENT; const s32 SeekPosition = Memory::Read_U32(_CommandAddress + 0xC); const s32 Mode = Memory::Read_U32(_CommandAddress + 0x10); - const u64 fileSize = m_pFileHandle.GetSize(); - INFO_LOG(WII_IPC_FILEIO, "FileIO: Seek Pos: 0x%08x, Mode: %i (%s, Length=0x%08llx)", SeekPosition, Mode, m_Name.c_str(), fileSize); - - // Set seek mode - int seek_mode[3] = {SEEK_SET, SEEK_CUR, SEEK_END}; - - if (Mode >= 0 && Mode <= 2) + if (m_pFileHandle == NULL) { + ERROR_LOG(WII_IPC_FILEIO, "FILEIO: Seek failed because of null file handle - %s", m_Name.c_str()); + ReturnValue = FS_FILE_NOT_EXIST; + } + else if (Mode >= 0 && Mode <= 2) + { + const u64 fileSize = m_pFileHandle.GetSize(); + + INFO_LOG(WII_IPC_FILEIO, "FileIO: Seek Pos: 0x%08x, Mode: %i (%s, Length=0x%08llx)", SeekPosition, Mode, m_Name.c_str(), fileSize); + + // Set seek mode + int seek_mode[3] = {SEEK_SET, SEEK_CUR, SEEK_END}; + // POSIX allows seek past EOF, the Wii does not. // TODO: Can we check this without tell'ing/seek'ing twice? const u64 curPos = m_pFileHandle.Tell(); @@ -335,6 +341,7 @@ void CWII_IPC_HLE_Device_FileIO::DoState(PointerWrap &p) { if (have_file_handle) { + // TODO: isn't it naive and error-prone to assume that the file hasn't changed since we created the savestate? Open(0, m_Mode); _dbg_assert_msg_(WII_IPC_HLE, m_pFileHandle, "bad filehandle"); } From fe5a82357aba0ea23291f66b33b84964ec3cd548 Mon Sep 17 00:00:00 2001 From: nitsuja Date: Sun, 18 Dec 2011 23:58:28 -0800 Subject: [PATCH 254/381] fix potential wiimote playback desync --- .../Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp | 46 +++++++++++++------ .../Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h | 1 + 2 files changed, 34 insertions(+), 13 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp index 5afc5b522d..6f7f80ece7 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp @@ -301,7 +301,7 @@ Wiimote::Wiimote( const unsigned int index ) m_options->settings.push_back(new ControlGroup::Setting(_trans("Upright Wiimote"), false)); // TODO: This value should probably be re-read if SYSCONF gets changed - m_sensor_bar_on_top = (bool)SConfig::GetInstance().m_SYSCONF->GetData("BT.BAR"); + m_sensor_bar_on_top = SConfig::GetInstance().m_SYSCONF->GetData("BT.BAR") != 0; // --- reset eeprom/register/values to default --- Reset(); @@ -318,7 +318,6 @@ std::string Wiimote::GetName() const bool Wiimote::Step() { const bool has_focus = HAS_FOCUS; - const bool is_sideways = m_options->settings[1]->value != 0; // TODO: change this a bit m_motion_plus_present = m_extension->settings[0]->value != 0; @@ -329,13 +328,10 @@ bool Wiimote::Step() m_rumble->controls[0]->control_ref->State(m_rumble_on); - // update buttons in status struct - m_status.buttons = 0; - if (has_focus) + // when a movie is active, this button status update is disabled (moved), because movies only record data reports. + if(!(Movie::IsPlayingInput() || Movie::IsRecordingInput())) { - m_buttons->GetState(&m_status.buttons, button_bitmasks); - m_dpad->GetState(&m_status.buttons, is_sideways ? dpad_sideways_bitmasks : dpad_bitmasks); - UDPTLayer::GetButtons(m_udp, &m_status.buttons); + UpdateButtonsStatus(has_focus); } // check if there is a read data request @@ -375,8 +371,27 @@ bool Wiimote::Step() return false; } +void Wiimote::UpdateButtonsStatus(bool has_focus) +{ + // update buttons in status struct + m_status.buttons = 0; + if (has_focus) + { + const bool is_sideways = m_options->settings[1]->value != 0; + m_buttons->GetState(&m_status.buttons, button_bitmasks); + m_dpad->GetState(&m_status.buttons, is_sideways ? dpad_sideways_bitmasks : dpad_bitmasks); + UDPTLayer::GetButtons(m_udp, &m_status.buttons); + } +} + void Wiimote::GetCoreData(u8* const data) { + // when a movie is active, the button update happens here instead of Wiimote::Step, to avoid potential desync issues. + if(Movie::IsPlayingInput() || Movie::IsRecordingInput()) + { + UpdateButtonsStatus(HAS_FOCUS); + } + *(wm_core*)data |= m_status.buttons; } @@ -639,7 +654,12 @@ void Wiimote::Update() const ReportFeatures& rptf = reporting_mode_features[m_reporting_mode - WM_REPORT_CORE]; rptf_size = rptf.size; - if (!Movie::IsPlayingInput() || !Movie::PlayWiimote(m_index, data, rptf, m_reg_ir.mode)) + if (Movie::IsPlayingInput() && Movie::PlayWiimote(m_index, data, rptf, m_reg_ir.mode)) + { + if (rptf.core) + m_status.buttons = *(wm_core*)(data + rptf.core); + } + else { data[0] = 0xA1; data[1] = m_reporting_mode; @@ -741,10 +761,10 @@ void Wiimote::Update() } } } - if (Movie::IsRecordingInput()) - { - Movie::RecordWiimote(m_index, data, rptf, m_reg_ir.mode); - } + } + if (Movie::IsRecordingInput()) + { + Movie::RecordWiimote(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/HW/WiimoteEmu/WiimoteEmu.h b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h index ecc86ad5b3..17a3a2adfc 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h +++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h @@ -113,6 +113,7 @@ protected: bool Step(); void HidOutputReport(const wm_report* const sr, const bool send_ack = true); void HandleExtensionSwap(); + void UpdateButtonsStatus(bool has_focus); void GetCoreData(u8* const data); void GetAccelData(u8* const data, u8* const buttons); From c6ce58ab6448815dc7d07eef1000eb1d43fbec1c Mon Sep 17 00:00:00 2001 From: nitsuja Date: Fri, 23 Dec 2011 01:40:57 -0600 Subject: [PATCH 255/381] fixed a wii recording desync (some remote init code was running in playback but not recording) --- Source/Core/Core/Src/HW/Wiimote.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/HW/Wiimote.cpp b/Source/Core/Core/Src/HW/Wiimote.cpp index 149c1db01e..30ab7af141 100644 --- a/Source/Core/Core/Src/HW/Wiimote.cpp +++ b/Source/Core/Core/Src/HW/Wiimote.cpp @@ -48,7 +48,8 @@ void Initialize(void* const hwnd) WiimoteReal::Initialize(); - if (Movie::IsPlayingInput()) // reload Wiimotes with our settings + // reload Wiimotes with our settings + if (Movie::IsPlayingInput() || Movie::IsRecordingInput()) Movie::ChangeWiiPads(); } From ced8ca7219f91c37494f16e41cb635d1c3c23439 Mon Sep 17 00:00:00 2001 From: nitsuja Date: Mon, 26 Dec 2011 05:09:30 -0600 Subject: [PATCH 256/381] better support for RTC when recording --- Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp | 23 +++++++++++++----- Source/Core/Core/Src/Movie.cpp | 29 ++++++++++------------- Source/Core/Core/Src/Movie.h | 10 ++++---- 3 files changed, 34 insertions(+), 28 deletions(-) diff --git a/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp b/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp index 85bfd2428e..144270e798 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp @@ -25,6 +25,8 @@ #include "MemoryUtil.h" #include "FileUtil.h" #include "../Movie.h" +#include "../CoreTiming.h" +#include "SystemTimers.h" // We should provide an option to choose from the above, or figure out the checksum (the algo in yagcd seems wrong) // so that people can change default language. @@ -342,14 +344,23 @@ void CEXIIPL::TransferByte(u8& _uByte) u32 CEXIIPL::GetGCTime() { u64 ltime = 0; - const u32 cJanuary2000 = 0x386D4380; // Seconds between 1.1.1970 and 1.1.2000 + static const u32 cJanuary2000 = 0x386D4380; // Seconds between 1.1.1970 and 1.1.2000 - // hack in some netplay stuff - ltime = NetPlay_GetGCTime(); if (Movie::IsRecordingInput() || Movie::IsPlayingInput()) - ltime = 1234567890; // TODO: Should you be able to set a custom time in movies? - else if (0 == ltime) - ltime = Common::Timer::GetLocalTimeSinceJan1970(); + { + ltime = Movie::GetRecordingStartTime(); + + // let's keep time moving forward, regardless of what it starts at + ltime += CoreTiming::GetTicks() / SystemTimers::GetTicksPerSecond(); + } + else + { + // hack in some netplay stuff + ltime = NetPlay_GetGCTime(); + + if (0 == ltime) + ltime = Common::Timer::GetLocalTimeSinceJan1970(); + } return ((u32)ltime - cJanuary2000); diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 07564c69a8..b478af4743 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -29,6 +29,7 @@ #include "IPC_HLE/WII_IPC_HLE_Device_usb.h" #include "VideoBackendBase.h" #include "State.h" +#include "Timer.h" // large enough for just over 24 hours of single-player recording #define MAX_DTM_LENGTH (40 * 1024 * 1024) @@ -53,6 +54,7 @@ u64 g_currentByte = 0, g_totalBytes = 0; 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_bRecordingFromSaveState = false; bool g_bPolled = false; @@ -64,6 +66,7 @@ std::string g_InputDisplay[8]; ManipFunction mfunc = NULL; + std::string GetInputDisplay() { std::string inputDisplay = ""; @@ -196,6 +199,11 @@ bool IsReadOnly() return g_bReadOnly; } +u64 GetRecordingStartTime() +{ + return g_recordingStartTime; +} + bool IsUsingPad(int controller) { return ((g_numPads & (1 << controller)) != 0); @@ -264,6 +272,7 @@ bool BeginRecordingInput(int 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; @@ -532,6 +541,7 @@ bool PlayInput(const char *filename) g_totalFrames = tmpHeader.frameCount; g_totalLagCount = tmpHeader.lagCount; g_totalInputCount = tmpHeader.inputCount; + g_recordingStartTime = tmpHeader.recordingStartTime; g_currentFrame = 0; g_currentLagCount = 0; @@ -630,7 +640,7 @@ void LoadInput(const char *filename) } else if(g_currentByte > 0 && g_totalBytes > 0) { - // verify identical from movie start to thee save's current frame + // verify identical from movie start to the save's current frame u32 len = (u32)g_currentByte; u8* movInput = new u8[len]; t_record.ReadArray(movInput, (size_t)len); @@ -676,20 +686,6 @@ void LoadInput(const char *filename) g_rerecords = tmpHeader.numRerecords; - if(g_currentSaveVersion == 0) - { - // attempt support for old savestates with movies but without movie-related data in DoState. - // I'm just guessing here and the old logic was kind of broken anyway, so this probably doesn't work well. - g_totalFrames = tmpHeader.frameCount; - if(g_totalFrames < tmpHeader.deprecated_totalFrameCount) - g_totalFrames = tmpHeader.deprecated_totalFrameCount; - u64 frameStart = tmpHeader.deprecated_frameStart ? tmpHeader.deprecated_frameStart : tmpHeader.frameCount; - g_currentFrame = frameStart; - g_currentByte = frameStart * 8; - g_currentLagCount = tmpHeader.lagCount; - g_currentInputCount = tmpHeader.inputCount; - } - if (!afterEnd) { if (g_bReadOnly) @@ -817,7 +813,7 @@ bool PlayWiimote(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf, if (size != sizeInMovie) { - PanicAlertT("Error in PlayWiimote. %u != %u, byte %d.\nSorry, Wii recording is temporarily broken.", sizeInMovie, size, g_currentByte); + PanicAlertT("Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %d.)%s", sizeInMovie, size, g_currentByte, (g_numPads & 0xF)?" Try re-creating the recording with all GameCube controllers disabled.":""); EndPlayInput(!g_bReadOnly); return false; } @@ -880,6 +876,7 @@ void SaveRecording(const char *filename) header.lagCount = g_totalLagCount; header.inputCount = g_totalInputCount; header.numRerecords = g_rerecords; + header.recordingStartTime = g_recordingStartTime; // TODO header.uniqueID = 0; diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h index 3df376270e..9e01c48df1 100644 --- a/Source/Core/Core/Src/Movie.h +++ b/Source/Core/Core/Src/Movie.h @@ -89,7 +89,7 @@ struct DTMHeader { u64 frameCount; // Number of frames in the recording u64 inputCount; // Number of input frames in recording u64 lagCount; // Number of lag frames in the recording - u64 uniqueID; // A Unique ID comprised of: md5(time + Game ID) + 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) @@ -97,12 +97,9 @@ struct DTMHeader { u8 audioEmulator[16]; // UTF-8 representation of the audio emulator u8 padBackend[16]; // UTF-8 representation of the input backend - // hack, data that was only used for savestates and would more properly be stored in the savestate itself - // the hack has been removed, but these remain defined and reserved here for legacy support purposes - u64 deprecated_frameStart; // NOT USED ANYMORE (use g_currentFrame) - u64 deprecated_totalFrameCount; // NOT USED ANYMORE (use g_totalFrames or header.frameCount) + u64 recordingStartTime; // seconds since 1970 that recording started (used for RTC) - u8 reserved[111]; // Make heading 256 bytes, just because we can + u8 reserved[119]; // Make heading 256 bytes, just because we can }; #pragma pack(pop) @@ -117,6 +114,7 @@ bool IsRecordingInputFromSaveState(); bool IsJustStartingRecordingInputFromSaveState(); bool IsPlayingInput(); bool IsReadOnly(); +u64 GetRecordingStartTime(); bool IsUsingPad(int controller); bool IsUsingWiimote(int wiimote); From 81a1efab8e61c7611f8f0ac3b4793d25c99d605a Mon Sep 17 00:00:00 2001 From: nitsuja Date: Mon, 2 Jan 2012 01:29:16 -0800 Subject: [PATCH 257/381] fixed an issue where the CPU sometimes single-steps an extra time after pausing --- Source/Core/Common/Src/Thread.h | 7 +++++++ Source/Core/Core/Src/HW/CPU.cpp | 1 + 2 files changed, 8 insertions(+) diff --git a/Source/Core/Common/Src/Thread.h b/Source/Core/Common/Src/Thread.h index ba713ed64c..e711fcab5c 100644 --- a/Source/Core/Common/Src/Thread.h +++ b/Source/Core/Common/Src/Thread.h @@ -72,6 +72,13 @@ public: is_set = false; } + void Reset() + { + std::unique_lock lk(m_mutex); + // no other action required, since wait loops on the predicate and any lingering signal will get cleared on the first iteration + is_set = false; + } + private: class IsSet { diff --git a/Source/Core/Core/Src/HW/CPU.cpp b/Source/Core/Core/Src/HW/CPU.cpp index 69b5055c9f..0f461b0fc5 100644 --- a/Source/Core/Core/Src/HW/CPU.cpp +++ b/Source/Core/Core/Src/HW/CPU.cpp @@ -115,6 +115,7 @@ void CCPU::EnableStepping(const bool _bStepping) if (_bStepping) { PowerPC::Pause(); + m_StepEvent.Reset(); g_video_backend->EmuStateChange(EMUSTATE_CHANGE_PAUSE); DSP::GetDSPEmulator()->DSP_ClearAudioBuffer(true); } From 39613a95a80db27d262ad8ed4b75858c78aeed83 Mon Sep 17 00:00:00 2001 From: nitsuja Date: Mon, 2 Jan 2012 02:20:22 -0800 Subject: [PATCH 258/381] initialize the uninitialized --- Source/Core/Common/Src/VideoBackendBase.h | 4 +++ Source/Core/Core/Src/Core.cpp | 2 ++ Source/Core/Core/Src/CoreTiming.cpp | 1 + Source/Core/Core/Src/HW/AudioInterface.cpp | 6 ++++ Source/Core/Core/Src/HW/GPFifo.cpp | 1 + Source/Core/Core/Src/HW/HW.cpp | 1 + Source/Core/Core/Src/HW/SI.cpp | 6 ++-- Source/Core/Core/Src/HW/SystemTimers.cpp | 13 +++++--- Source/Core/Core/Src/HW/SystemTimers.h | 1 + Source/Core/Core/Src/HW/VideoInterface.cpp | 26 ++++++++++++++++ Source/Core/Core/Src/Movie.cpp | 30 ++++++++++++++++++- Source/Core/Core/Src/Movie.h | 1 + Source/Core/Core/Src/PowerPC/PPCCache.cpp | 10 +++++++ Source/Core/Core/Src/PowerPC/PPCCache.h | 3 +- Source/Core/Core/Src/PowerPC/PowerPC.cpp | 13 +++++++- .../Core/VideoCommon/Src/CommandProcessor.cpp | 7 +++++ Source/Core/VideoCommon/Src/MainBase.cpp | 12 ++++++++ Source/Core/VideoCommon/Src/PixelEngine.cpp | 10 +++++++ .../VideoCommon/Src/VertexShaderManager.cpp | 6 ++++ Source/Core/VideoCommon/Src/VideoState.cpp | 11 +++++++ Source/Core/VideoCommon/Src/VideoState.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 + 24 files changed, 157 insertions(+), 11 deletions(-) diff --git a/Source/Core/Common/Src/VideoBackendBase.h b/Source/Core/Common/Src/VideoBackendBase.h index 667a3d3a32..28c8f23246 100644 --- a/Source/Core/Common/Src/VideoBackendBase.h +++ b/Source/Core/Common/Src/VideoBackendBase.h @@ -140,6 +140,7 @@ class VideoBackendHardware : public VideoBackend { void DoState(PointerWrap &p); void RunLoop(bool enable); + bool Initialize(void *&) { InitializeShared(); return true; } void EmuStateChange(EMUSTATE_CHANGE); @@ -165,6 +166,9 @@ class VideoBackendHardware : public VideoBackend readFn16 Video_PERead16(); writeFn16 Video_PEWrite16(); writeFn32 Video_PEWrite32(); + +protected: + void InitializeShared(); }; #endif diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index c1f9cf4415..bd4267c074 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -346,6 +346,8 @@ void EmuThread() DisplayMessage(cpu_info.Summarize(), 8000); DisplayMessage(_CoreParameter.m_strFilename, 3000); + Movie::Init(); + HW::Init(); if (!g_video_backend->Initialize(g_pWindowHandle)) diff --git a/Source/Core/Core/Src/CoreTiming.cpp b/Source/Core/Core/Src/CoreTiming.cpp index 979add358b..235593d679 100644 --- a/Source/Core/Core/Src/CoreTiming.cpp +++ b/Source/Core/Core/Src/CoreTiming.cpp @@ -133,6 +133,7 @@ void Init() void Shutdown() { + MoveEvents(); ClearPendingEvents(); UnregisterAllEvents(); diff --git a/Source/Core/Core/Src/HW/AudioInterface.cpp b/Source/Core/Core/Src/HW/AudioInterface.cpp index 4f1fbb920f..40b0c620b3 100644 --- a/Source/Core/Core/Src/HW/AudioInterface.cpp +++ b/Source/Core/Core/Src/HW/AudioInterface.cpp @@ -153,6 +153,12 @@ void Init() m_Volume.hex = 0; m_SampleCounter = 0; m_InterruptTiming = 0; + + g_LastCPUTime = 0; + g_CPUCyclesPerSample = 0xFFFFFFFFFFFULL; + + g_AISSampleRate = 48000; + g_AIDSampleRate = 32000; } void Shutdown() diff --git a/Source/Core/Core/Src/HW/GPFifo.cpp b/Source/Core/Core/Src/HW/GPFifo.cpp index 486c757587..4d72317e0d 100644 --- a/Source/Core/Core/Src/HW/GPFifo.cpp +++ b/Source/Core/Core/Src/HW/GPFifo.cpp @@ -54,6 +54,7 @@ void DoState(PointerWrap &p) void Init() { ResetGatherPipe(); + memset(m_gatherPipe, 0, sizeof(m_gatherPipe)); } bool IsEmpty() diff --git a/Source/Core/Core/Src/HW/HW.cpp b/Source/Core/Core/Src/HW/HW.cpp index ad5ecc404a..0ec08b7d97 100644 --- a/Source/Core/Core/Src/HW/HW.cpp +++ b/Source/Core/Core/Src/HW/HW.cpp @@ -43,6 +43,7 @@ namespace HW void Init() { CoreTiming::Init(); + SystemTimers::PreInit(); State::Init(); diff --git a/Source/Core/Core/Src/HW/SI.cpp b/Source/Core/Core/Src/HW/SI.cpp index cd80c14daf..09697f4965 100644 --- a/Source/Core/Core/Src/HW/SI.cpp +++ b/Source/Core/Core/Src/HW/SI.cpp @@ -246,10 +246,8 @@ void Init() g_Channel[i].m_InHi.Hex = 0; g_Channel[i].m_InLo.Hex = 0; - if (Movie::IsUsingPad(i)) - AddDevice(SIDEVICE_GC_CONTROLLER, i); - else if (Movie::IsRecordingInput() || Movie::IsPlayingInput()) - AddDevice(SIDEVICE_NONE, i); + if (Movie::IsRecordingInput() || Movie::IsPlayingInput()) + AddDevice(Movie::IsUsingPad(i) ? SIDEVICE_GC_CONTROLLER : SIDEVICE_NONE, i); else AddDevice(SConfig::GetInstance().m_SIDevice[i], i); } diff --git a/Source/Core/Core/Src/HW/SystemTimers.cpp b/Source/Core/Core/Src/HW/SystemTimers.cpp index bfc2b61af6..b9f9fe0107 100644 --- a/Source/Core/Core/Src/HW/SystemTimers.cpp +++ b/Source/Core/Core/Src/HW/SystemTimers.cpp @@ -231,12 +231,19 @@ void PatchEngineCallback(u64 userdata, int cyclesLate) CoreTiming::ScheduleEvent(VideoInterface::GetTicksPerFrame() - cyclesLate, et_PatchEngine); } +// split from Init to break a circular dependency between VideoInterface::Init and SystemTimers::Init +void PreInit() +{ + if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii) + CPU_CORE_CLOCK = 729000000u; + else + CPU_CORE_CLOCK = 486000000u; +} + void Init() { if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii) { - CPU_CORE_CLOCK = 729000000u; - if (!DSP::GetDSPEmulator()->IsLLE()) DSP_PERIOD = (int)(GetTicksPerSecond() * 0.003f); @@ -253,8 +260,6 @@ void Init() } else { - CPU_CORE_CLOCK = 486000000u; - if (!DSP::GetDSPEmulator()->IsLLE()) DSP_PERIOD = (int)(GetTicksPerSecond() * 0.005f); } diff --git a/Source/Core/Core/Src/HW/SystemTimers.h b/Source/Core/Core/Src/HW/SystemTimers.h index ec8e425907..629593bc1d 100644 --- a/Source/Core/Core/Src/HW/SystemTimers.h +++ b/Source/Core/Core/Src/HW/SystemTimers.h @@ -24,6 +24,7 @@ namespace SystemTimers { u32 GetTicksPerSecond(); +void PreInit(); void Init(); void Shutdown(); diff --git a/Source/Core/Core/Src/HW/VideoInterface.cpp b/Source/Core/Core/Src/HW/VideoInterface.cpp index 40b95f53f9..677f30921f 100644 --- a/Source/Core/Core/Src/HW/VideoInterface.cpp +++ b/Source/Core/Core/Src/HW/VideoInterface.cpp @@ -158,6 +158,29 @@ void Preset(bool _bNTSC) void Init() { + m_VerticalTimingRegister.Hex = 0; + m_DisplayControlRegister.Hex = 0; + m_HTiming0.Hex = 0; + m_HTiming1.Hex = 0; + m_VBlankTimingOdd.Hex = 0; + m_VBlankTimingEven.Hex = 0; + m_BurstBlankingOdd.Hex = 0; + m_BurstBlankingEven.Hex = 0; + m_XFBInfoTop.Hex = 0; + m_XFBInfoBottom.Hex = 0; + m_3DFBInfoTop.Hex = 0; + m_3DFBInfoBottom.Hex = 0; + m_VBeamPos = 0; + m_HBeamPos = 0; + m_HorizontalStepping.Hex = 0; + m_HorizontalScaling.Hex = 0; + m_UnkAARegister = 0; + m_Clock = 0; + m_DTVStatus.Hex = 0; + m_FBWidth = 0; + m_BorderHBlank.Hex = 0; + memset(&m_FilterCoefTables, 0, sizeof(m_FilterCoefTables)); + fields = Core::g_CoreStartupParameter.bVBeam ? 1 : 2; m_DTVStatus.ntsc_j = Core::g_CoreStartupParameter.bForceNTSCJ; @@ -165,6 +188,9 @@ void Init() for (int i = 0; i < 4; i++) m_InterruptRegister[i].Hex = 0; + for (int i = 0; i < 2; i++) + m_LatchRegister[i].Hex = 0; + m_DisplayControlRegister.Hex = 0; UpdateParameters(); } diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index b478af4743..9c2fb02d64 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -105,6 +105,34 @@ void FrameUpdate() g_bPolled = false; } +// called when game is booting up, even if no movie is active, +// but potentially after BeginRecordingInput or PlayInput has been called. +void Init() +{ + g_bPolled = false; + g_bFrameStep = false; + g_bFrameStop = false; + g_frameSkipCounter = g_framesToSkip; + memset(&g_padState, 0, sizeof(g_padState)); + for (int i = 0; i < 8; ++i) + g_InputDisplay[i].clear(); + + if (!IsPlayingInput() && !IsRecordingInput()) + { + g_bRecordingFromSaveState = false; + g_rerecords = 0; + g_numPads = 0; + g_currentByte = 0; + 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; + } +} + void InputUpdate() { g_currentInputCount++; @@ -813,7 +841,7 @@ bool PlayWiimote(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf, if (size != sizeInMovie) { - PanicAlertT("Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %d.)%s", sizeInMovie, size, g_currentByte, (g_numPads & 0xF)?" Try re-creating the recording with all GameCube controllers disabled.":""); + PanicAlertT("Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s", (u32)sizeInMovie, (u32)size, (u32)g_currentByte, (g_numPads & 0xF)?" Try re-creating the recording with all GameCube controllers disabled (in Configure > Gamecube > Device Settings).":""); EndPlayInput(!g_bReadOnly); return false; } diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h index 9e01c48df1..16d0ba4997 100644 --- a/Source/Core/Core/Src/Movie.h +++ b/Source/Core/Core/Src/Movie.h @@ -105,6 +105,7 @@ struct DTMHeader { void FrameUpdate(); void InputUpdate(); +void Init(); void SetPolledDevice(); diff --git a/Source/Core/Core/Src/PowerPC/PPCCache.cpp b/Source/Core/Core/Src/PowerPC/PPCCache.cpp index af40568813..704caa4a2c 100644 --- a/Source/Core/Core/Src/PowerPC/PPCCache.cpp +++ b/Source/Core/Core/Src/PowerPC/PPCCache.cpp @@ -80,6 +80,16 @@ namespace PowerPC jit->GetBlockCache()->ClearSafe(); } + void InstructionCache::Init() + { + memset(data, 0, sizeof(data)); + memset(tags, 0, sizeof(tags)); + memset(way_from_valid, 0, sizeof(way_from_valid)); + memset(way_from_plru, 0, sizeof(way_from_plru)); + + Reset(); + } + void InstructionCache::Invalidate(u32 addr) { if (!HID0.ICE) diff --git a/Source/Core/Core/Src/PowerPC/PPCCache.h b/Source/Core/Core/Src/PowerPC/PPCCache.h index c2e428946c..6d62720d43 100644 --- a/Source/Core/Core/Src/PowerPC/PPCCache.h +++ b/Source/Core/Core/Src/PowerPC/PPCCache.h @@ -50,9 +50,10 @@ namespace PowerPC #endif InstructionCache(); - void Reset(); u32 ReadInstruction(u32 addr); void Invalidate(u32 addr); + void Init(); + void Reset(); }; } diff --git a/Source/Core/Core/Src/PowerPC/PowerPC.cpp b/Source/Core/Core/Src/PowerPC/PowerPC.cpp index 7e5d9ba763..2ae520faab 100644 --- a/Source/Core/Core/Src/PowerPC/PowerPC.cpp +++ b/Source/Core/Core/Src/PowerPC/PowerPC.cpp @@ -154,6 +154,17 @@ void Init(int cpu_core) //but still - set any useful sse options here #endif + 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)); + ResetRegisters(); PPCTables::InitTables(cpu_core); @@ -197,7 +208,7 @@ void Init(int cpu_core) } state = CPU_STEPPING; - ppcState.iCache.Reset(); + ppcState.iCache.Init(); } void Shutdown() diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp index ad05a9797e..67c8f411fa 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp @@ -109,6 +109,8 @@ void Init() m_CPCtrlReg.Hex = 0; + m_CPClearReg.Hex = 0; + m_bboxleft = 0; m_bboxtop = 0; m_bboxright = 640; @@ -130,6 +132,11 @@ void Init() interruptFinishWaiting = false; interruptTokenWaiting = false; + bProcessFifoToLoWatermark = false; + bProcessFifoAllDistance = false; + isPossibleWaitingSetDrawDone = false; + OnOverflow = false; + et_UpdateInterrupts = CoreTiming::RegisterEvent("UpdateInterrupts", UpdateInterrupts_Wrapper); } diff --git a/Source/Core/VideoCommon/Src/MainBase.cpp b/Source/Core/VideoCommon/Src/MainBase.cpp index 1fc8b15bec..af21ebbb94 100644 --- a/Source/Core/VideoCommon/Src/MainBase.cpp +++ b/Source/Core/VideoCommon/Src/MainBase.cpp @@ -171,6 +171,18 @@ u32 VideoBackendHardware::Video_AccessEFB(EFBAccessType type, u32 x, u32 y, u32 static volatile u32 s_doStateRequested = false; +void VideoBackendHardware::InitializeShared() +{ + VideoCommon_Init(); + + s_swapRequested = 0; + s_efbAccessRequested = 0; + s_FifoShuttingDown = 0; + memset((void*)&s_beginFieldArgs, 0, sizeof(s_beginFieldArgs)); + memset(&s_accessEFBArgs, 0, sizeof(s_accessEFBArgs)); + s_AccessEFBResult = 0; +} + static volatile struct { unsigned char **ptr; diff --git a/Source/Core/VideoCommon/Src/PixelEngine.cpp b/Source/Core/VideoCommon/Src/PixelEngine.cpp index 90f1546ebd..456e0fb535 100644 --- a/Source/Core/VideoCommon/Src/PixelEngine.cpp +++ b/Source/Core/VideoCommon/Src/PixelEngine.cpp @@ -155,6 +155,16 @@ void SetFinish_OnMainThread(u64 userdata, int cyclesLate); void Init() { m_Control.Hex = 0; + m_ZConf.Hex = 0; + m_AlphaConf.Hex = 0; + m_DstAlphaConf.Hex = 0; + m_AlphaModeConf.Hex = 0; + m_AlphaRead.Hex = 0; + + g_bSignalTokenInterrupt = false; + g_bSignalFinishInterrupt = false; + interruptSetToken = false; + interruptSetFinish = false; et_SetTokenOnMainThread = CoreTiming::RegisterEvent("SetToken", SetToken_OnMainThread); et_SetFinishOnMainThread = CoreTiming::RegisterEvent("SetFinish", SetFinish_OnMainThread); diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp index a18829fde2..d7d25c5c85 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp @@ -150,6 +150,12 @@ void VertexShaderManager::Init() memset(&xfregs, 0, sizeof(xfregs)); memset(xfmem, 0, sizeof(xfmem)); ResetView(); + + // TODO: should these go inside ResetView()? + Matrix44::LoadIdentity(s_viewportCorrection); + memset(g_fProjectionMatrix, 0, sizeof(g_fProjectionMatrix)); + for (int i = 0; i < 4; ++i) + g_fProjectionMatrix[i*5] = 1.0f; } void VertexShaderManager::Shutdown() diff --git a/Source/Core/VideoCommon/Src/VideoState.cpp b/Source/Core/VideoCommon/Src/VideoState.cpp index 1a23410fcc..b1c1ed0889 100644 --- a/Source/Core/VideoCommon/Src/VideoState.cpp +++ b/Source/Core/VideoCommon/Src/VideoState.cpp @@ -60,3 +60,14 @@ void VideoCommon_RunLoop(bool enable) { EmulatorState(enable); } + +void VideoCommon_Init() +{ + memset(arraybases, 0, sizeof(arraybases)); + memset(arraystrides, 0, sizeof(arraystrides)); + memset(&MatrixIndexA, 0, sizeof(MatrixIndexA)); + memset(&MatrixIndexB, 0, sizeof(MatrixIndexB)); + memset(&g_VtxDesc, 0, sizeof(g_VtxDesc)); + memset(g_VtxAttr, 0, sizeof(g_VtxAttr)); + memset(texMem, 0, TMEM_SIZE); +} diff --git a/Source/Core/VideoCommon/Src/VideoState.h b/Source/Core/VideoCommon/Src/VideoState.h index b29cf17257..e596d9ad05 100644 --- a/Source/Core/VideoCommon/Src/VideoState.h +++ b/Source/Core/VideoCommon/Src/VideoState.h @@ -23,5 +23,6 @@ void VideoCommon_DoState(PointerWrap &p); void VideoCommon_RunLoop(bool enable); +void VideoCommon_Init(); #endif // _VIDEOSTATE_H diff --git a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp index f6fe1127a3..ba3a67108b 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp @@ -150,6 +150,7 @@ void VideoBackend::ShowConfig(void *_hParent) bool VideoBackend::Initialize(void *&window_handle) { + InitializeShared(); InitBackendInfo(); frameCount = 0; diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp index 727fa73a00..6c52219f97 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp @@ -132,6 +132,7 @@ void VideoBackend::ShowConfig(void* parent) bool VideoBackend::Initialize(void *&window_handle) { + InitializeShared(); InitBackendInfo(); frameCount = 0; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp index a25f9cd839..251512fe6b 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp @@ -155,6 +155,7 @@ void VideoBackend::ShowConfig(void *_hParent) bool VideoBackend::Initialize(void *&window_handle) { + InitializeShared(); InitBackendInfo(); frameCount = 0; From ecc63651c73d4e3f59d742c656dda54d017e6bde Mon Sep 17 00:00:00 2001 From: calc84maniac Date: Wed, 4 Jan 2012 14:05:55 -0500 Subject: [PATCH 259/381] srawx/srawix optimizations --- .../Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index bcd94cd42f..367c7e8158 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -1722,32 +1722,28 @@ void Jit64::srawx(UGeckoInstruction inst) int s = inst.RS; gpr.Lock(a, s, b); gpr.FlushLockX(ECX); - gpr.BindToRegister(a, a == s || a == b, true); + gpr.BindToRegister(a, true, true); + JitClearCA(); MOV(32, R(ECX), gpr.R(b)); - TEST(32, R(ECX), Imm32(32)); - FixupBranch topBitSet = J_CC(CC_NZ); if (a != s) MOV(32, gpr.R(a), gpr.R(s)); - MOV(32, R(EAX), Imm32(1)); - SHL(32, R(EAX), R(ECX)); - ADD(32, R(EAX), Imm32(0x7FFFFFFF)); - AND(32, R(EAX), gpr.R(a)); - ADD(32, R(EAX), Imm32(-1)); - CMP(32, R(EAX), Imm32(-1)); - SETcc(CC_L, R(EAX)); + TEST(32, R(ECX), Imm32(32)); + FixupBranch topBitSet = J_CC(CC_NZ); + LEA(32, EAX, MComplex(gpr.RX(a), gpr.RX(a), 1, 0)); SAR(32, gpr.R(a), R(ECX)); - AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~(1 << 29))); - SHL(32, R(EAX), Imm8(29)); - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), R(EAX)); + NOT(32, R(ECX)); + SHL(32, R(EAX), R(ECX)); + TEST(32, R(EAX), gpr.R(a)); + FixupBranch nocarry1 = J_CC(CC_Z); + JitSetCA(); FixupBranch end = J(); SetJumpTarget(topBitSet); - MOV(32, R(EAX), gpr.R(s)); - SAR(32, R(EAX), Imm8(31)); - MOV(32, gpr.R(a), R(EAX)); - AND(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(~(1 << 29))); - AND(32, R(EAX), Imm32(1<<29)); - OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), R(EAX)); + SAR(32, gpr.R(a), Imm8(31)); + FixupBranch nocarry2 = J_CC(CC_Z); + JitSetCA(); SetJumpTarget(end); + SetJumpTarget(nocarry1); + SetJumpTarget(nocarry2); gpr.UnlockAll(); gpr.UnlockAllX(); @@ -1767,19 +1763,22 @@ void Jit64::srawix(UGeckoInstruction inst) { gpr.Lock(a, s); gpr.BindToRegister(a, a == s, true); - MOV(32, R(EAX), gpr.R(s)); - MOV(32, gpr.R(a), R(EAX)); - SAR(32, gpr.R(a), Imm8(amount)); - CMP(32, R(EAX), Imm8(0)); - FixupBranch nocarry1 = J_CC(CC_GE); - TEST(32, R(EAX), Imm32((u32)0xFFFFFFFF >> (32 - amount))); // were any 1s shifted out? - FixupBranch nocarry2 = J_CC(CC_Z); - JitSetCA(); - FixupBranch carry = J(false); - SetJumpTarget(nocarry1); - SetJumpTarget(nocarry2); JitClearCA(); - SetJumpTarget(carry); + MOV(32, R(EAX), gpr.R(s)); + if (a != s) + { + MOV(32, gpr.R(a), R(EAX)); + } + SAR(32, gpr.R(a), Imm8(amount)); + if (inst.Rc) + { + GenerateRC(); + } + SHL(32, R(EAX), Imm8(32-amount)); + TEST(32, R(EAX), gpr.R(a)); + FixupBranch nocarry = J_CC(CC_Z); + JitSetCA(); + SetJumpTarget(nocarry); gpr.UnlockAll(); } else @@ -1789,13 +1788,14 @@ void Jit64::srawix(UGeckoInstruction inst) JitClearCA(); gpr.BindToRegister(a, a == s, true); if (a != s) + { MOV(32, gpr.R(a), gpr.R(s)); + } + if (inst.Rc) { + ComputeRC(gpr.R(a)); + } gpr.UnlockAll(); } - - if (inst.Rc) { - ComputeRC(gpr.R(a)); - } } // count leading zeroes From 60cddf0823a05a1f4b8690e23b267bc20f5d80fc Mon Sep 17 00:00:00 2001 From: calc84maniac Date: Thu, 5 Jan 2012 18:27:04 -0500 Subject: [PATCH 260/381] Fixed some BindToRegister calls (removing unnecessary MOV instructions for speedup) --- Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index 367c7e8158..b3c38efd3a 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -1581,7 +1581,7 @@ void Jit64::rlwnmx(UGeckoInstruction inst) { gpr.FlushLockX(ECX); gpr.Lock(a, b, s); - gpr.BindToRegister(a, true, true); + gpr.BindToRegister(a, (a == b || a == s), true); MOV(32, R(ECX), gpr.R(b)); if (a != s) { @@ -1653,7 +1653,7 @@ void Jit64::srwx(UGeckoInstruction inst) { gpr.FlushLockX(ECX); gpr.Lock(a, b, s); - gpr.BindToRegister(a, true, true); + gpr.BindToRegister(a, (a == b || a == s), true); MOV(32, R(ECX), gpr.R(b)); TEST(32, R(ECX), Imm32(32)); if (a != s) @@ -1691,7 +1691,7 @@ void Jit64::slwx(UGeckoInstruction inst) { gpr.FlushLockX(ECX); gpr.Lock(a, b, s); - gpr.BindToRegister(a, true, true); + gpr.BindToRegister(a, (a == b || a == s), true); MOV(32, R(ECX), gpr.R(b)); TEST(32, R(ECX), Imm32(32)); if (a != s) @@ -1722,7 +1722,7 @@ void Jit64::srawx(UGeckoInstruction inst) int s = inst.RS; gpr.Lock(a, s, b); gpr.FlushLockX(ECX); - gpr.BindToRegister(a, true, true); + gpr.BindToRegister(a, (a == s || a == b), true); JitClearCA(); MOV(32, R(ECX), gpr.R(b)); if (a != s) From a7a6a1859e2a96ea356c9b4e6e8f5a52be604fa5 Mon Sep 17 00:00:00 2001 From: calc84maniac Date: Thu, 5 Jan 2012 19:07:31 -0500 Subject: [PATCH 261/381] subfex optimization when RD==RA --- .../Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index b3c38efd3a..4b68b32036 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -913,28 +913,31 @@ void Jit64::subfex(UGeckoInstruction inst) JitClearCAOV(inst.OE); SHR(32, R(EAX), Imm8(30)); - // Convert carry to borrow - CMC(); - + bool invertedCarry = false; if (d == b) { + // Convert carry to borrow + CMC(); SBB(32, gpr.R(d), gpr.R(a)); + invertedCarry = true; } else if (d == a) { - MOV(32, R(EAX), gpr.R(a)); - MOV(32, gpr.R(d), gpr.R(b)); - SBB(32, gpr.R(d), R(EAX)); + NOT(32, gpr.R(d)); + ADC(32, gpr.R(d), gpr.R(b)); } else { + // Convert carry to borrow + CMC(); MOV(32, gpr.R(d), gpr.R(b)); SBB(32, gpr.R(d), gpr.R(a)); + invertedCarry = true; } if (inst.Rc) { GenerateRC(); } - FinalizeCarryOverflow(inst.OE, true); + FinalizeCarryOverflow(inst.OE, invertedCarry); gpr.UnlockAll(); } From 5a15d58964e29149634a47edae9edb887fe020d8 Mon Sep 17 00:00:00 2001 From: calc84maniac Date: Thu, 5 Jan 2012 22:36:27 -0500 Subject: [PATCH 262/381] Added emitters for BT/BTR/BTS/BTC x86 instructions, optimized extended arithmetic PowerPC instructions --- Source/Core/Common/Src/x64Emitter.cpp | 33 ++++++ Source/Core/Common/Src/x64Emitter.h | 7 ++ Source/Core/Core/Src/PowerPC/Jit64/Jit.h | 2 + .../Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 112 +++++++++++------- 4 files changed, 111 insertions(+), 43 deletions(-) diff --git a/Source/Core/Common/Src/x64Emitter.cpp b/Source/Core/Common/Src/x64Emitter.cpp index 9acfac5864..7583ef0fc3 100644 --- a/Source/Core/Common/Src/x64Emitter.cpp +++ b/Source/Core/Common/Src/x64Emitter.cpp @@ -834,6 +834,39 @@ void XEmitter::SHL(int bits, OpArg dest, OpArg shift) {WriteShift(bits, dest, sh void XEmitter::SHR(int bits, OpArg dest, OpArg shift) {WriteShift(bits, dest, shift, 5);} void XEmitter::SAR(int bits, OpArg dest, OpArg shift) {WriteShift(bits, dest, shift, 7);} +// index can be either imm8 or register, don't use memory destination because it's slow +void XEmitter::WriteBitTest(int bits, OpArg &dest, OpArg &index, int ext) +{ + if (dest.IsImm()) + { + _assert_msg_(DYNA_REC, 0, "WriteBitTest - can't test imms"); + } + if ((index.IsImm() && index.GetImmBits() != 8)) + { + _assert_msg_(DYNA_REC, 0, "WriteBitTest - illegal argument"); + } + if (bits == 16) Write8(0x66); + if (index.IsImm()) + { + dest.WriteRex(this, bits, bits); + Write8(0x0F); Write8(0xBA); + dest.WriteRest(this, 1, (X64Reg)ext); + Write8((u8)index.offset); + } + else + { + X64Reg operand = index.GetSimpleReg(); + dest.WriteRex(this, bits, bits, operand); + Write8(0x0F); Write8(0x83 + 8*ext); + dest.WriteRest(this, 1, operand); + } +} + +void XEmitter::BT(int bits, OpArg dest, OpArg index) {WriteBitTest(bits, dest, index, 4);} +void XEmitter::BTS(int bits, OpArg dest, OpArg index) {WriteBitTest(bits, dest, index, 5);} +void XEmitter::BTR(int bits, OpArg dest, OpArg index) {WriteBitTest(bits, dest, index, 6);} +void XEmitter::BTC(int bits, OpArg dest, OpArg index) {WriteBitTest(bits, dest, index, 7);} + void OpArg::WriteSingleByteOp(XEmitter *emit, u8 op, X64Reg _operandReg, int bits) { if (bits == 16) diff --git a/Source/Core/Common/Src/x64Emitter.h b/Source/Core/Common/Src/x64Emitter.h index 9ffb890f54..6bd9291eea 100644 --- a/Source/Core/Common/Src/x64Emitter.h +++ b/Source/Core/Common/Src/x64Emitter.h @@ -249,6 +249,7 @@ private: void WriteMulDivType(int bits, OpArg src, int ext); void WriteBitSearchType(int bits, X64Reg dest, OpArg src, u8 byte2); void WriteShift(int bits, OpArg dest, OpArg &shift, int ext); + void WriteBitTest(int bits, OpArg &dest, OpArg &index, int ext); void WriteMXCSR(OpArg arg, int ext); void WriteSSEOp(int size, u8 sseOp, bool packed, X64Reg regOp, OpArg arg, int extrabytes = 0); void WriteNormalOp(XEmitter *emit, int bits, NormalOp op, const OpArg &a1, const OpArg &a2); @@ -374,6 +375,12 @@ public: void SHR(int bits, OpArg dest, OpArg shift); void SAR(int bits, OpArg dest, OpArg shift); + // Bit Test + void BT(int bits, OpArg dest, OpArg index); + void BTS(int bits, OpArg dest, OpArg index); + void BTR(int bits, OpArg dest, OpArg index); + void BTC(int bits, OpArg dest, OpArg index); + // Extend EAX into EDX in various ways void CWD(int bits = 16); inline void CDQ() {CWD(32);} diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h index 9d9b57658b..8a13af741a 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h @@ -150,6 +150,8 @@ public: void GenerateConstantOverflow(bool overflow); void GenerateOverflow(); void FinalizeCarryOverflow(bool oe, bool inv = false); + void GetCarryEAXAndClear(); + void FinalizeCarryGenerateOverflowEAX(bool oe, bool inv = false); void GenerateCarry(); void GenerateRC(); void ComputeRC(const Gen::OpArg & arg); diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index 4b68b32036..7c79fce963 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -73,13 +73,53 @@ void Jit64::FinalizeCarryOverflow(bool oe, bool inv) } else { - // Output carry is inverted + // Do carry FixupBranch carry1 = J_CC(inv ? CC_C : CC_NC); JitSetCA(); SetJumpTarget(carry1); } } +void Jit64::GetCarryEAXAndClear() +{ + MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); + BTR(32, R(EAX), Imm8(29)); +} + +// Assumes that XER is in EAX and that the CA bit is clear. +void Jit64::FinalizeCarryGenerateOverflowEAX(bool oe, bool inv) +{ + // USES_XER + if (oe) + { + FixupBranch jno = J_CC(CC_NO); + // Do carry + FixupBranch carry1 = J_CC(inv ? CC_C : CC_NC); + OR(32, R(EAX), Imm32(XER_CA_MASK)); + SetJumpTarget(carry1); + //XER[OV/SO] = 1 + OR(32, R(EAX), Imm32(XER_SO_MASK | XER_OV_MASK)); + FixupBranch exit = J(); + SetJumpTarget(jno); + // Do carry + FixupBranch carry2 = J_CC(inv ? CC_C : CC_NC); + JitSetCA(); + SetJumpTarget(carry2); + //XER[OV] = 0 + AND(32, R(EAX), Imm32(~XER_OV_MASK)); + SetJumpTarget(exit); + } + else + { + // Do carry + FixupBranch carry1 = J_CC(inv ? CC_C : CC_NC); + OR(32, R(EAX), Imm32(XER_CA_MASK)); + SetJumpTarget(carry1); + } + // Dump EAX back into XER + MOV(32, M(&PowerPC::ppcState.spr[SPR_XER]), R(EAX)); +} + // Assumes that the flags were just set through an addition. void Jit64::GenerateCarry() { // USES_XER @@ -908,10 +948,7 @@ void Jit64::subfex(UGeckoInstruction inst) gpr.Lock(a, b, d); gpr.BindToRegister(d, (d == a || d == b), true); - // Get CA and clear it (along with OV if applicable) - MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCAOV(inst.OE); - SHR(32, R(EAX), Imm8(30)); + GetCarryEAXAndClear(); bool invertedCarry = false; if (d == b) @@ -928,16 +965,14 @@ void Jit64::subfex(UGeckoInstruction inst) } else { - // Convert carry to borrow - CMC(); - MOV(32, gpr.R(d), gpr.R(b)); - SBB(32, gpr.R(d), gpr.R(a)); - invertedCarry = true; + MOV(32, gpr.R(d), gpr.R(a)); + NOT(32, gpr.R(d)); + ADC(32, gpr.R(d), gpr.R(b)); } if (inst.Rc) { GenerateRC(); } - FinalizeCarryOverflow(inst.OE, invertedCarry); + FinalizeCarryGenerateOverflowEAX(inst.OE, invertedCarry); gpr.UnlockAll(); } @@ -951,9 +986,7 @@ void Jit64::subfmex(UGeckoInstruction inst) gpr.Lock(a, d); gpr.BindToRegister(d, d == a); - MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCAOV(inst.OE); - SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag + GetCarryEAXAndClear(); if (d != a) { MOV(32, gpr.R(d), gpr.R(a)); @@ -964,7 +997,7 @@ void Jit64::subfmex(UGeckoInstruction inst) { GenerateRC(); } - FinalizeCarryOverflow(inst.OE); + FinalizeCarryGenerateOverflowEAX(inst.OE); gpr.UnlockAll(); } @@ -977,9 +1010,8 @@ void Jit64::subfzex(UGeckoInstruction inst) gpr.Lock(a, d); gpr.BindToRegister(d, d == a); - MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCAOV(inst.OE); - SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag + + GetCarryEAXAndClear(); if (d != a) { MOV(32, gpr.R(d), gpr.R(a)); @@ -990,7 +1022,7 @@ void Jit64::subfzex(UGeckoInstruction inst) { GenerateRC(); } - FinalizeCarryOverflow(inst.OE); + FinalizeCarryGenerateOverflowEAX(inst.OE); gpr.UnlockAll(); } @@ -1267,31 +1299,29 @@ void Jit64::addex(UGeckoInstruction inst) { gpr.Lock(a, b, d); gpr.BindToRegister(d, true); - MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCAOV(inst.OE); - SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag + + GetCarryEAXAndClear(); ADC(32, gpr.R(d), gpr.R((d == a) ? b : a)); if (inst.Rc) { GenerateRC(); } - FinalizeCarryOverflow(inst.OE); + FinalizeCarryGenerateOverflowEAX(inst.OE); gpr.UnlockAll(); } else { gpr.Lock(a, b, d); gpr.BindToRegister(d, false); - MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCAOV(inst.OE); - SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag + + GetCarryEAXAndClear(); MOV(32, gpr.R(d), gpr.R(a)); ADC(32, gpr.R(d), gpr.R(b)); if (inst.Rc) { GenerateRC(); } - FinalizeCarryOverflow(inst.OE); + FinalizeCarryGenerateOverflowEAX(inst.OE); gpr.UnlockAll(); } } @@ -1343,31 +1373,29 @@ void Jit64::addmex(UGeckoInstruction inst) { gpr.Lock(d); gpr.BindToRegister(d, true); - MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCAOV(inst.OE); - SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag + + GetCarryEAXAndClear(); ADC(32, gpr.R(d), Imm32(0xFFFFFFFF)); if (inst.Rc) { GenerateRC(); } - FinalizeCarryOverflow(inst.OE); + FinalizeCarryGenerateOverflowEAX(inst.OE); gpr.UnlockAll(); } else { gpr.Lock(a, d); gpr.BindToRegister(d, false); - MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCAOV(inst.OE); - SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag + + GetCarryEAXAndClear(); MOV(32, gpr.R(d), gpr.R(a)); ADC(32, gpr.R(d), Imm32(0xFFFFFFFF)); if (inst.Rc) { GenerateRC(); } - FinalizeCarryOverflow(inst.OE); + FinalizeCarryGenerateOverflowEAX(inst.OE); gpr.UnlockAll(); } } @@ -1383,31 +1411,29 @@ void Jit64::addzex(UGeckoInstruction inst) { gpr.Lock(d); gpr.BindToRegister(d, true); - MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCAOV(inst.OE); - SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag + + GetCarryEAXAndClear(); ADC(32, gpr.R(d), Imm8(0)); if (inst.Rc) { GenerateRC(); } - FinalizeCarryOverflow(inst.OE); + FinalizeCarryGenerateOverflowEAX(inst.OE); gpr.UnlockAll(); } else { gpr.Lock(a, d); gpr.BindToRegister(d, false); - MOV(32, R(EAX), M(&PowerPC::ppcState.spr[SPR_XER])); - JitClearCAOV(inst.OE); - SHR(32, R(EAX), Imm8(30)); // shift the carry flag out into the x86 carry flag + + GetCarryEAXAndClear(); MOV(32, gpr.R(d), gpr.R(a)); ADC(32, gpr.R(d), Imm8(0)); if (inst.Rc) { GenerateRC(); } - FinalizeCarryOverflow(inst.OE); + FinalizeCarryGenerateOverflowEAX(inst.OE); gpr.UnlockAll(); } } From 8fb1a02f6bb2eb83bfe9bfbc95eb260ca7feef4b Mon Sep 17 00:00:00 2001 From: calc84maniac Date: Thu, 5 Jan 2012 22:39:17 -0500 Subject: [PATCH 263/381] Fixed small error for instructions with overflow enabled --- Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index 7c79fce963..8df9853781 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -103,7 +103,7 @@ void Jit64::FinalizeCarryGenerateOverflowEAX(bool oe, bool inv) SetJumpTarget(jno); // Do carry FixupBranch carry2 = J_CC(inv ? CC_C : CC_NC); - JitSetCA(); + OR(32, R(EAX), Imm32(XER_CA_MASK)); SetJumpTarget(carry2); //XER[OV] = 0 AND(32, R(EAX), Imm32(~XER_OV_MASK)); From b33be736cd41292c964611385c1dc792364a1119 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 6 Jan 2012 13:45:51 +0100 Subject: [PATCH 264/381] D3D9/11: Degrade a PanicAlert related to EFB format changes to an ERROR_LOG --- Source/Plugins/Plugin_VideoDX11/Src/Render.cpp | 4 ++-- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 2 +- 2 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 53cf9fd4d9..07fe88d2b5 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -748,7 +748,7 @@ void Renderer::ReinterpretPixelData(unsigned int convtype) else if (convtype == 2) pixel_shader = PixelShaderCache::ReinterpRGBA6ToRGB8(true); else { - PanicAlert("Trying to reinterpret pixel data with unsupported conversion type %d", convtype); + ERROR_LOG(VIDEO, "Trying to reinterpret pixel data with unsupported conversion type %d", convtype); return; } @@ -1428,4 +1428,4 @@ void Renderer::SetInterlacingMode() // TODO } -} // namespace DX11 \ No newline at end of file +} // namespace DX11 diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index 93b37e211a..773172b0b8 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -761,7 +761,7 @@ void Renderer::ReinterpretPixelData(unsigned int convtype) else if (convtype == 2) pixel_shader = PixelShaderCache::ReinterpRGBA6ToRGB8(); else { - PanicAlert("Trying to reinterpret pixel data with unsupported conversion type %d", convtype); + ERROR_LOG(VIDEO, "Trying to reinterpret pixel data with unsupported conversion type %d", convtype); return; } From 9ab69febe546ed498f3a6831c2c8ff363a373352 Mon Sep 17 00:00:00 2001 From: nitsuja Date: Sat, 7 Jan 2012 20:46:41 -0800 Subject: [PATCH 265/381] fix for stack corruption caused by certain DSP LLE JIT ABI calls. if you were getting crashes or freezes as a result of using the "DSP LLE on Thread" option, this might fix that. --- Source/Core/Common/Src/ABI.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Source/Core/Common/Src/ABI.cpp b/Source/Core/Common/Src/ABI.cpp index 08e021f083..63a8e76934 100644 --- a/Source/Core/Common/Src/ABI.cpp +++ b/Source/Core/Common/Src/ABI.cpp @@ -189,7 +189,7 @@ unsigned int XEmitter::ABI_GetAlignedFrameSize(unsigned int frameSize) { #ifdef __GNUC__ (frameSize + 15) & -16; #else - frameSize; + (frameSize + 3) & -4; #endif return alignedSize; } @@ -200,16 +200,15 @@ void XEmitter::ABI_AlignStack(unsigned int frameSize) { // Linux requires the stack to be 16-byte aligned before calls that put SSE // vectors on the stack, but since we do not keep track of which calls do that, // it is effectively every call as well. -// Windows binaries compiled with MSVC do not have such a restriction, but I +// Windows binaries compiled with MSVC do not have such a restriction*, but I // expect that GCC on Windows acts the same as GCC on Linux in this respect. // It would be nice if someone could verify this. -#ifdef __GNUC__ +// *However, the MSVC optimizing compiler assumes a 4-byte-aligned stack at times. unsigned int fillSize = ABI_GetAlignedFrameSize(frameSize) - (frameSize + 4); if (fillSize != 0) { SUB(32, R(ESP), Imm8(fillSize)); } -#endif } void XEmitter::ABI_RestoreStack(unsigned int frameSize) { From 31ff1907a4718c7323acc8b8a8c59795697f6643 Mon Sep 17 00:00:00 2001 From: nitsuja Date: Fri, 23 Dec 2011 11:55:17 -0600 Subject: [PATCH 266/381] added an option to log to the attached Windows debugger (so e.g. NOTICE_LOG messages can show up in Visual Studio's output window) --- Source/Core/Common/Src/LogManager.cpp | 13 +++++ Source/Core/Common/Src/LogManager.h | 12 +++++ Source/Core/DolphinWX/Src/LogConfigWindow.cpp | 53 ++++++++++++++++++- Source/Core/DolphinWX/Src/LogConfigWindow.h | 5 +- Source/Core/DolphinWX/Src/LogWindow.cpp | 16 ++++++ Source/Core/DolphinWX/Src/LogWindow.h | 2 +- 6 files changed, 97 insertions(+), 4 deletions(-) diff --git a/Source/Core/Common/Src/LogManager.cpp b/Source/Core/Common/Src/LogManager.cpp index d95e76ac5b..a79c413cf8 100644 --- a/Source/Core/Common/Src/LogManager.cpp +++ b/Source/Core/Common/Src/LogManager.cpp @@ -85,12 +85,17 @@ LogManager::LogManager() m_fileLog = new FileLogListener(File::GetUserPath(F_MAINLOG_IDX).c_str()); m_consoleLog = new ConsoleListener(); + m_debuggerLog = new DebuggerLogListener(); for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i) { m_Log[i]->SetEnable(true); m_Log[i]->AddListener(m_fileLog); m_Log[i]->AddListener(m_consoleLog); +#ifdef _MSC_VER + if (IsDebuggerPresent()) + m_Log[i]->AddListener(m_debuggerLog); +#endif } } @@ -100,6 +105,7 @@ LogManager::~LogManager() { m_logManager->RemoveListener((LogTypes::LOG_TYPE)i, m_fileLog); m_logManager->RemoveListener((LogTypes::LOG_TYPE)i, m_consoleLog); + m_logManager->RemoveListener((LogTypes::LOG_TYPE)i, m_debuggerLog); } for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i) @@ -187,3 +193,10 @@ void FileLogListener::Log(LogTypes::LOG_LEVELS, const char *msg) std::lock_guard lk(m_log_lock); m_logfile << msg << std::flush; } + +void DebuggerLogListener::Log(LogTypes::LOG_LEVELS, const char *msg) +{ +#if _MSC_VER + ::OutputDebugStringA(msg); +#endif +} diff --git a/Source/Core/Common/Src/LogManager.h b/Source/Core/Common/Src/LogManager.h index 3f2b5cd168..1722c0b1bf 100644 --- a/Source/Core/Common/Src/LogManager.h +++ b/Source/Core/Common/Src/LogManager.h @@ -58,6 +58,12 @@ private: bool m_enable; }; +class DebuggerLogListener : public LogListener +{ +public: + void Log(LogTypes::LOG_LEVELS, const char *msg); +}; + class LogContainer { public: @@ -97,6 +103,7 @@ private: LogContainer* m_Log[LogTypes::NUMBER_OF_LOGS]; FileLogListener *m_fileLog; ConsoleListener *m_consoleLog; + DebuggerLogListener *m_debuggerLog; static LogManager *m_logManager; // Singleton. Ugh. LogManager(); @@ -153,6 +160,11 @@ public: return m_consoleLog; } + DebuggerLogListener *GetDebuggerListener() const + { + return m_debuggerLog; + } + static LogManager* GetInstance() { return m_logManager; diff --git a/Source/Core/DolphinWX/Src/LogConfigWindow.cpp b/Source/Core/DolphinWX/Src/LogConfigWindow.cpp index f8219b179e..d771a75c30 100644 --- a/Source/Core/DolphinWX/Src/LogConfigWindow.cpp +++ b/Source/Core/DolphinWX/Src/LogConfigWindow.cpp @@ -62,6 +62,14 @@ void LogConfigWindow::CreateGUIControls() _connect_macro_(m_writeConsoleCB, LogConfigWindow::OnWriteConsoleChecked, wxEVT_COMMAND_CHECKBOX_CLICKED, this); m_writeWindowCB = new wxCheckBox(this, wxID_ANY, _("Write to Window")); _connect_macro_(m_writeWindowCB, LogConfigWindow::OnWriteWindowChecked, wxEVT_COMMAND_CHECKBOX_CLICKED, 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); + } +#endif wxButton *btn_toggle_all = new wxButton(this, wxID_ANY, _("Toggle All Log Types"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); @@ -75,7 +83,17 @@ void LogConfigWindow::CreateGUIControls() wxStaticBoxSizer* sbOutputs = new wxStaticBoxSizer(wxVERTICAL, this, _("Logger Outputs")); sbOutputs->Add(m_writeFileCB, 0, wxDOWN, 1); sbOutputs->Add(m_writeConsoleCB, 0, wxDOWN, 1); - sbOutputs->Add(m_writeWindowCB, 0); +#ifdef _MSC_VER + if (m_writeDebuggerCB) + { + sbOutputs->Add(m_writeWindowCB, 0, wxDOWN, 1); + sbOutputs->Add(m_writeDebuggerCB, 0); + } + else +#endif + { + sbOutputs->Add(m_writeWindowCB, 0); + } wxStaticBoxSizer* sbLogTypes = new wxStaticBoxSizer(wxVERTICAL, this, _("Log Types")); sbLogTypes->Add(m_checks, 1, wxEXPAND); @@ -107,6 +125,17 @@ void LogConfigWindow::LoadSettings() m_writeConsoleCB->SetValue(m_writeConsole); ini.Get("Options", "WriteToWindow", &m_writeWindow, true); m_writeWindowCB->SetValue(m_writeWindow); +#ifdef _MSC_VER + if (IsDebuggerPresent()) + { + ini.Get("Options", "WriteToDebugger", &m_writeDebugger, true); + m_writeDebuggerCB->SetValue(m_writeDebugger); + } + else +#endif + { + m_writeDebugger = false; + } for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i) { bool log_enabled; @@ -125,6 +154,10 @@ void LogConfigWindow::SaveSettings() ini.Set("Options", "WriteToFile", m_writeFile); ini.Set("Options", "WriteToConsole", m_writeConsole); ini.Set("Options", "WriteToWindow", m_writeWindow); +#ifdef _MSC_VER + if (IsDebuggerPresent()) + ini.Set("Options", "WriteToDebugger", m_writeDebugger); +#endif for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i) ini.Set("Logs", m_LogManager->GetShortName((LogTypes::LOG_TYPE)i), m_checks->IsChecked(i)); ini.Save(File::GetUserPath(F_LOGGERCONFIG_IDX)); @@ -183,6 +216,21 @@ void LogConfigWindow::OnWriteWindowChecked(wxCommandEvent& event) } } +void LogConfigWindow::OnWriteDebuggerChecked(wxCommandEvent& event) +{ + for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i) + { + m_writeDebugger = event.IsChecked(); + if (m_checks->IsChecked(i)) + { + if (m_writeDebugger) + m_LogManager->AddListener((LogTypes::LOG_TYPE)i, (LogListener *)m_LogManager->GetDebuggerListener()); + else + m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, (LogListener *)m_LogManager->GetDebuggerListener()); + } + } +} + void LogConfigWindow::OnToggleAll(wxCommandEvent& WXUNUSED(event)) { for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i) @@ -207,12 +255,15 @@ void LogConfigWindow::ToggleLog(int _logType, bool enable) m_LogManager->AddListener(logType, m_LogManager->GetFileListener()); if (m_writeConsole) m_LogManager->AddListener(logType, m_LogManager->GetConsoleListener()); + if (m_writeDebugger) + m_LogManager->AddListener(logType, m_LogManager->GetDebuggerListener()); } else { m_LogManager->RemoveListener(logType, (LogListener *)m_LogWindow); m_LogManager->RemoveListener(logType, m_LogManager->GetFileListener()); m_LogManager->RemoveListener(logType, m_LogManager->GetConsoleListener()); + m_LogManager->RemoveListener(logType, m_LogManager->GetDebuggerListener()); } } diff --git a/Source/Core/DolphinWX/Src/LogConfigWindow.h b/Source/Core/DolphinWX/Src/LogConfigWindow.h index ac3f4409a2..5a08486409 100644 --- a/Source/Core/DolphinWX/Src/LogConfigWindow.h +++ b/Source/Core/DolphinWX/Src/LogConfigWindow.h @@ -37,11 +37,11 @@ public: private: LogManager *m_LogManager; CLogWindow *m_LogWindow; - bool m_writeFile, m_writeConsole, m_writeWindow; + bool m_writeFile, m_writeConsole, m_writeWindow, m_writeDebugger; bool enableAll; // Controls - wxCheckBox *m_writeFileCB, *m_writeConsoleCB, *m_writeWindowCB; + wxCheckBox *m_writeFileCB, *m_writeConsoleCB, *m_writeWindowCB, *m_writeDebuggerCB; wxCheckListBox* m_checks; wxRadioBox *m_verbosity; @@ -50,6 +50,7 @@ private: void OnWriteFileChecked(wxCommandEvent& event); void OnWriteConsoleChecked(wxCommandEvent& event); void OnWriteWindowChecked(wxCommandEvent& event); + void OnWriteDebuggerChecked(wxCommandEvent& event); void OnToggleAll(wxCommandEvent& event); void ToggleLog(int _logType, bool enable); void OnLogCheck(wxCommandEvent& event); diff --git a/Source/Core/DolphinWX/Src/LogWindow.cpp b/Source/Core/DolphinWX/Src/LogWindow.cpp index 489d81c08d..f2a1b3d8b8 100644 --- a/Source/Core/DolphinWX/Src/LogWindow.cpp +++ b/Source/Core/DolphinWX/Src/LogWindow.cpp @@ -85,6 +85,16 @@ void CLogWindow::CreateGUIControls() ini.Get("Options", "WriteToFile", &m_writeFile, false); ini.Get("Options", "WriteToConsole", &m_writeConsole, true); ini.Get("Options", "WriteToWindow", &m_writeWindow, true); +#ifdef _MSC_VER + if (IsDebuggerPresent()) + { + ini.Get("Options", "WriteToDebugger", &m_writeDebugger, true); + } + else +#endif + { + m_writeDebugger = false; + } for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i) { bool enable; @@ -104,6 +114,12 @@ void CLogWindow::CreateGUIControls() m_LogManager->AddListener((LogTypes::LOG_TYPE)i, m_LogManager->GetConsoleListener()); else m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, m_LogManager->GetConsoleListener()); + + if (m_writeDebugger && enable) + m_LogManager->AddListener((LogTypes::LOG_TYPE)i, m_LogManager->GetDebuggerListener()); + else + m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, m_LogManager->GetDebuggerListener()); + m_LogManager->SetLogLevel((LogTypes::LOG_TYPE)i, (LogTypes::LOG_LEVELS)(verbosity)); } diff --git a/Source/Core/DolphinWX/Src/LogWindow.h b/Source/Core/DolphinWX/Src/LogWindow.h index a4b25f12c3..86fd1d3b4f 100644 --- a/Source/Core/DolphinWX/Src/LogWindow.h +++ b/Source/Core/DolphinWX/Src/LogWindow.h @@ -65,7 +65,7 @@ private: bool m_ignoreLogTimer; LogManager *m_LogManager; std::queue > msgQueue; - bool m_writeFile, m_writeConsole, m_writeWindow, m_LogAccess; + bool m_writeFile, m_writeConsole, m_writeWindow, m_writeDebugger, m_LogAccess; // Controls wxBoxSizer *sBottom; From 79ca43226cfa5363bf6826d14c9518c7b26f6078 Mon Sep 17 00:00:00 2001 From: calc84maniac Date: Mon, 9 Jan 2012 00:10:13 -0500 Subject: [PATCH 267/381] Added SHRD/SHLD x86 emitters, further optimized srawx --- Source/Core/Common/Src/x64Emitter.cpp | 63 +++++++++++++++++++ Source/Core/Common/Src/x64Emitter.h | 4 ++ .../Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 5 +- 3 files changed, 69 insertions(+), 3 deletions(-) diff --git a/Source/Core/Common/Src/x64Emitter.cpp b/Source/Core/Common/Src/x64Emitter.cpp index 7583ef0fc3..00c58a0fbc 100644 --- a/Source/Core/Common/Src/x64Emitter.cpp +++ b/Source/Core/Common/Src/x64Emitter.cpp @@ -867,6 +867,69 @@ void XEmitter::BTS(int bits, OpArg dest, OpArg index) {WriteBitTest(bits, dest, void XEmitter::BTR(int bits, OpArg dest, OpArg index) {WriteBitTest(bits, dest, index, 6);} void XEmitter::BTC(int bits, OpArg dest, OpArg index) {WriteBitTest(bits, dest, index, 7);} +//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"); + } + if (!src.IsSimpleReg()) + { + _assert_msg_(DYNA_REC, 0, "SHRD - must use simple register as source"); + } + if ((shift.IsSimpleReg() && shift.GetSimpleReg() != ECX) || (shift.IsImm() && shift.GetImmBits() != 8)) + { + _assert_msg_(DYNA_REC, 0, "SHRD - illegal shift"); + } + if (bits == 16) Write8(0x66); + X64Reg operand = src.GetSimpleReg(); + dest.WriteRex(this, bits, bits, operand); + if (shift.GetImmBits() == 8) + { + Write8(0x0F); Write8(0xAC); + dest.WriteRest(this, 1, operand); + Write8((u8)shift.offset); + } + else + { + Write8(0x0F); Write8(0xAD); + dest.WriteRest(this, 0, operand); + } +} + +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"); + } + if (!src.IsSimpleReg()) + { + _assert_msg_(DYNA_REC, 0, "SHLD - must use simple register as source"); + } + if ((shift.IsSimpleReg() && shift.GetSimpleReg() != ECX) || (shift.IsImm() && shift.GetImmBits() != 8)) + { + _assert_msg_(DYNA_REC, 0, "SHLD - illegal shift"); + } + if (bits == 16) Write8(0x66); + X64Reg operand = src.GetSimpleReg(); + dest.WriteRex(this, bits, bits, operand); + if (shift.GetImmBits() == 8) + { + Write8(0x0F); Write8(0xA4); + dest.WriteRest(this, 1, operand); + Write8((u8)shift.offset); + } + else + { + Write8(0x0F); Write8(0xA5); + dest.WriteRest(this, 0, operand); + } +} + void OpArg::WriteSingleByteOp(XEmitter *emit, u8 op, X64Reg _operandReg, int bits) { if (bits == 16) diff --git a/Source/Core/Common/Src/x64Emitter.h b/Source/Core/Common/Src/x64Emitter.h index 6bd9291eea..3b699c81a0 100644 --- a/Source/Core/Common/Src/x64Emitter.h +++ b/Source/Core/Common/Src/x64Emitter.h @@ -381,6 +381,10 @@ public: void BTR(int bits, OpArg dest, OpArg index); void BTC(int bits, OpArg dest, OpArg index); + // Double-Precision Shift + void SHRD(int bits, OpArg dest, OpArg src, OpArg shift); + void SHLD(int bits, OpArg dest, OpArg src, OpArg shift); + // Extend EAX into EDX in various ways void CWD(int bits = 16); inline void CDQ() {CWD(32);} diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index 8df9853781..21ae8908c8 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -1758,10 +1758,9 @@ void Jit64::srawx(UGeckoInstruction inst) MOV(32, gpr.R(a), gpr.R(s)); TEST(32, R(ECX), Imm32(32)); FixupBranch topBitSet = J_CC(CC_NZ); - LEA(32, EAX, MComplex(gpr.RX(a), gpr.RX(a), 1, 0)); + XOR(32, R(EAX), R(EAX)); + SHRD(32, R(EAX), gpr.R(a), R(ECX)); SAR(32, gpr.R(a), R(ECX)); - NOT(32, R(ECX)); - SHL(32, R(EAX), R(ECX)); TEST(32, R(EAX), gpr.R(a)); FixupBranch nocarry1 = J_CC(CC_Z); JitSetCA(); From bef3d7229eca9a7f9568abf72de6b4d467feee9f Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 27 Nov 2011 23:17:10 -0800 Subject: [PATCH 268/381] Ensure comment strings in CBannerLoaderWii::SWiiBanner are null-terminated. Fixes issue 5012. Signed-off-by: Shawn Hoffman --- Source/Core/DiscIO/Src/BannerLoaderWii.cpp | 95 ++++++++++------------ Source/Core/DiscIO/Src/BannerLoaderWii.h | 25 ++++-- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp index ab66a346d4..b23dc4d91a 100644 --- a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp +++ b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp @@ -144,43 +144,57 @@ bool CBannerLoaderWii::GetBanner(u32* _pBannerImage) return true; } -bool CBannerLoaderWii::GetName(std::string* _rName) +bool CBannerLoaderWii::GetStringFromComments(const CommentIndex index, std::string& s) +{ + bool ret = false; + + if (IsValid()) + { + // find Banner type + SWiiBanner *pBanner = (SWiiBanner*)m_pBannerFile; + + // Ensure the string is null-terminating, since the banner format + // doesn't require it + u16 *src = new u16[COMMENT_SIZE + 1]; + memcpy(src, &pBanner->m_Comment[index], COMMENT_SIZE * sizeof(u16)); + src[COMMENT_SIZE] = 0; + + ret = CopyBeUnicodeToString(s, src, COMMENT_SIZE + 1); + + delete [] src; + } + + return ret; +} + +bool CBannerLoaderWii::GetStringFromComments(const CommentIndex index, std::wstring& s) { if (IsValid()) { // find Banner type SWiiBanner* pBanner = (SWiiBanner*)m_pBannerFile; - std::string name; - if (CopyBeUnicodeToString(name, pBanner->m_Comment[0], WII_BANNER_COMMENT_SIZE)) - { - for (int i = 0; i < 6; i++) - { - _rName[i] = name; - } - return true; - } + std::wstring description; + for (int i = 0; i < COMMENT_SIZE; ++i) + description.push_back(Common::swap16(pBanner->m_Comment[index][i])); + + s = description; + return true; } return false; } +bool CBannerLoaderWii::GetName(std::string* _rName) +{ + return GetStringFromComments(NAME_IDX, *_rName); +} + bool CBannerLoaderWii::GetName(std::vector& _rNames) { - if (IsValid()) - { - // find Banner type - SWiiBanner* pBanner = (SWiiBanner*)m_pBannerFile; - - std::wstring temp; - for (int i = 0; i < WII_BANNER_COMMENT_SIZE; ++i) - { - temp.push_back(Common::swap16(pBanner->m_Comment[0][i])); - } - _rNames.push_back(temp); - return true; - } - - return false; + std::wstring temp; + bool ret = GetStringFromComments(NAME_IDX, temp); + _rNames.push_back(temp); + return ret; } bool CBannerLoaderWii::GetCompany(std::string& _rCompany) @@ -191,39 +205,12 @@ bool CBannerLoaderWii::GetCompany(std::string& _rCompany) bool CBannerLoaderWii::GetDescription(std::string* _rDescription) { - if (IsValid()) - { - // find Banner type - SWiiBanner* pBanner = (SWiiBanner*)m_pBannerFile; - - std::string description; - if (CopyBeUnicodeToString(description, pBanner->m_Comment[1], WII_BANNER_COMMENT_SIZE)) - { - for (int i = 0; i< 6; i++) - { - _rDescription[i] = description; - } - return true; - } - } - return false; + return GetStringFromComments(DESC_IDX, *_rDescription); } bool CBannerLoaderWii::GetDescription(std::wstring& _rDescription) { - if (IsValid()) - { - // find Banner type - SWiiBanner* pBanner = (SWiiBanner*)m_pBannerFile; - - std::wstring description; - for (int i = 0; i < WII_BANNER_COMMENT_SIZE; ++i) - description.push_back(Common::swap16(pBanner->m_Comment[1][i])); - - _rDescription = description; - return true; - } - return false; + return GetStringFromComments(DESC_IDX, _rDescription); } void CBannerLoaderWii::decode5A3image(u32* dst, u16* src, int width, int height) diff --git a/Source/Core/DiscIO/Src/BannerLoaderWii.h b/Source/Core/DiscIO/Src/BannerLoaderWii.h index bfc87dc19e..83733cf5ed 100644 --- a/Source/Core/DiscIO/Src/BannerLoaderWii.h +++ b/Source/Core/DiscIO/Src/BannerLoaderWii.h @@ -47,9 +47,18 @@ class CBannerLoaderWii private: - #define WII_BANNER_TEXTURE_SIZE (192 * 64 * 2) - #define WII_BANNER_ICON_SIZE ( 48 * 48 * 2) - #define WII_BANNER_COMMENT_SIZE 32 + enum + { + TEXTURE_SIZE = 192 * 64 * 2, + ICON_SIZE = 48 * 48 * 2, + COMMENT_SIZE = 32 + }; + + enum CommentIndex + { + NAME_IDX, + DESC_IDX + }; struct SWiiBanner { @@ -59,9 +68,10 @@ class CBannerLoaderWii u16 m_Speed; u8 m_Unknown[22]; - u16 m_Comment[2][WII_BANNER_COMMENT_SIZE]; - u8 m_BannerTexture[WII_BANNER_TEXTURE_SIZE]; - u8 m_IconTexture[8][WII_BANNER_ICON_SIZE]; + // Not null terminated! + u16 m_Comment[2][COMMENT_SIZE]; + u8 m_BannerTexture[TEXTURE_SIZE]; + u8 m_IconTexture[8][ICON_SIZE]; } ; u8* m_pBannerFile; @@ -69,6 +79,9 @@ class CBannerLoaderWii bool m_IsValid; void decode5A3image(u32* dst, u16* src, int width, int height); + + bool GetStringFromComments(const CommentIndex index, std::string& s); + bool GetStringFromComments(const CommentIndex index, std::wstring& s); }; } // namespace From 96d56cd8effd5fd847ea489bb48a9b02fe6fb2ec Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Wed, 18 Jan 2012 22:41:35 -0800 Subject: [PATCH 269/381] fix for memcard manager using sjis for ascii encoded string thanks to gerbilsoft for finding my mistake, fixes issue 5148 --- Source/Core/Core/Src/HW/GCMemcard.cpp | 4 ++-- Source/Core/Core/Src/HW/GCMemcard.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/HW/GCMemcard.cpp b/Source/Core/Core/Src/HW/GCMemcard.cpp index 2471e76599..cab7d950a2 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.cpp +++ b/Source/Core/Core/Src/HW/GCMemcard.cpp @@ -1126,7 +1126,7 @@ bool GCMemcard::Format(u8 * card_data, bool sjis, u16 SizeMb) gcp.bat_backup = (BlockAlloc *)(card_data + BLOCK_SIZE*4); *(u16*)gcp.hdr->SizeMb = BE16(SizeMb); - *(u16*)gcp.hdr->Encoding = BE16(sjis ? 1 : 0); + gcp.hdr->Encoding = BE16(sjis ? 1 : 0); FormatInternal(gcp); return true; @@ -1148,7 +1148,7 @@ bool GCMemcard::Format(bool sjis, u16 SizeMb) gcp.bat_backup = &bat_backup; *(u16*)hdr.SizeMb = BE16(SizeMb); - *(u16*)hdr.Encoding = BE16(sjis ? 1 : 0); + hdr.Encoding = BE16(sjis ? 1 : 0); FormatInternal(gcp); m_sizeMb = SizeMb; diff --git a/Source/Core/Core/Src/HW/GCMemcard.h b/Source/Core/Core/Src/HW/GCMemcard.h index 5aa0a3c97f..8c7baa4774 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.h +++ b/Source/Core/Core/Src/HW/GCMemcard.h @@ -91,7 +91,7 @@ private: // end Serial in libogc u8 deviceID[2]; //0x0020 2 0 if formated in slot A 1 if formated in slot B u8 SizeMb[2]; //0x0022 2 size of memcard in Mbits - u8 Encoding[2]; //0x0024 2 encoding (ASCII or japanese) + u16 Encoding; //0x0024 2 encoding (ASCII or japanese) u8 Unused1[468]; //0x0026 468 unused (0xff) u8 UpdateCounter[2];//0x01fa 2 update Counter (?, probably unused) u16 Checksum; //0x01fc 2 Additive Checksum From 2d6d73df95ff064f43260570f3f6487d55385585 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 21 Jan 2012 14:58:29 +0100 Subject: [PATCH 270/381] [maintenance] Add a note explaining why we aren't emulating CP clear register writes. For further reference, see also r700f5eabc752. --- Source/Core/VideoCommon/Src/CommandProcessor.cpp | 13 ++++++++----- Source/Core/VideoCommon/Src/CommandProcessor.h | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp index 67c8f411fa..fc85b8e39d 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp @@ -311,6 +311,7 @@ void Write16(const u16 _Value, const u32 _Address) UCPClearReg tmpCtrl(_Value); m_CPClearReg.Hex = tmpCtrl.Hex; DEBUG_LOG(COMMANDPROCESSOR,"\t write to CLEAR_REGISTER : %04x", _Value); + SetCpClearRegister(); } break; @@ -677,13 +678,15 @@ void SetCpControlRegister() } +// NOTE: The implementation of this function should be correct, but we intentionally aren't using it at the moment. +// We don't emulate proper GP timing anyway at the moment, so this code would just slow down emulation. void SetCpClearRegister() { - if (IsOnThread()) - { - if (!m_CPClearReg.ClearFifoUnderflow && m_CPClearReg.ClearFifoOverflow) - bProcessFifoToLoWatermark = true; - } +// if (IsOnThread()) +// { +// if (!m_CPClearReg.ClearFifoUnderflow && m_CPClearReg.ClearFifoOverflow) +// bProcessFifoToLoWatermark = true; +// } } } // end of namespace CommandProcessor diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.h b/Source/Core/VideoCommon/Src/CommandProcessor.h index 7fb4e5a45f..db6772d66d 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.h +++ b/Source/Core/VideoCommon/Src/CommandProcessor.h @@ -158,6 +158,7 @@ void UpdateInterruptsFromVideoBackend(u64 userdata); bool AllowIdleSkipping(); +void SetCpClearRegister(); void SetCpControlRegister(); void SetCpStatusRegister(); void SetOverflowStatusFromGatherPipe(); From a7f3f61598132c1524d8a2b3d659bf73a0ae4db3 Mon Sep 17 00:00:00 2001 From: calc84maniac Date: Sun, 22 Jan 2012 19:56:53 -0500 Subject: [PATCH 271/381] [Jit64] Constant unsigned division and constant multiplication optimizations. Also, signed division can now be recompiled. --- Source/Core/Core/Src/PowerPC/Jit64/Jit.h | 1 + .../Core/Src/PowerPC/Jit64/Jit64_Tables.cpp | 4 +- .../Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 244 +++++++++++++++++- 3 files changed, 237 insertions(+), 12 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h index 8a13af741a..c01c1b017b 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h @@ -179,6 +179,7 @@ public: void mulhwux(UGeckoInstruction inst); void mullwx(UGeckoInstruction inst); void divwux(UGeckoInstruction inst); + void divwx(UGeckoInstruction inst); void srawix(UGeckoInstruction inst); void srawx(UGeckoInstruction inst); void addex(UGeckoInstruction inst); diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp index 474dabdd2f..93963513ee 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp @@ -311,8 +311,8 @@ static GekkoOPTemplate table31_2[] = {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}}, - {491, &Jit64::Default}, //"divwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, - {1003, &Jit64::Default}, //"divwox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, + {491, &Jit64::divwx}, //"divwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, + {1003, &Jit64::divwx}, //"divwox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, {459, &Jit64::divwux}, //"divwux", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, {971, &Jit64::divwux}, //"divwuox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, {75, &Jit64::Default}, //"mulhwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index 21ae8908c8..ba51309c85 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -162,7 +162,10 @@ void Jit64::ComputeRC(const Gen::OpArg & arg) { } else { - CMP(32, arg, Imm8(0)); + if (arg.IsSimpleReg()) + TEST(32, arg, arg); + else + CMP(32, arg, Imm8(0)); FixupBranch pLesser = J_CC(CC_L); FixupBranch pGreater = J_CC(CC_G); MOV(8, M(&PowerPC::ppcState.cr_fast[0]), Imm8(0x2)); // _x86Reg == 0 @@ -1082,17 +1085,39 @@ void Jit64::mulli(UGeckoInstruction inst) INSTRUCTION_START JITDISABLE(Integer) int a = inst.RA, d = inst.RD; + u32 imm = inst.SIMM_16; if (gpr.R(a).IsImm()) { - gpr.SetImmediate32(d, (s32)gpr.R(a).offset * (s32)inst.SIMM_16); + gpr.SetImmediate32(d, (u32)gpr.R(a).offset * imm); } else { gpr.Lock(a, d); gpr.BindToRegister(d, (d == a), true); - gpr.KillImmediate(a, true, false); - IMUL(32, gpr.RX(d), gpr.R(a), Imm32((u32)(s32)inst.SIMM_16)); + if (imm == 0) + XOR(32, gpr.R(d), gpr.R(d)); + else if(imm == -1) + { + if (d != a) + MOV(32, gpr.R(d), gpr.R(a)); + NEG(32, gpr.R(d)); + } + else if((imm & (imm - 1)) == 0) + { + u32 shift = 0; + if (imm & 0xFFFF0000) shift |= 16; + if (imm & 0xFF00FF00) shift |= 8; + if (imm & 0xF0F0F0F0) shift |= 4; + if (imm & 0xCCCCCCCC) shift |= 2; + if (imm & 0xAAAAAAAA) shift |= 1; + if (d != a) + MOV(32, gpr.R(d), gpr.R(a)); + if (shift) + SHL(32, gpr.R(d), Imm8(shift)); + } + else + IMUL(32, gpr.RX(d), gpr.R(a), Imm32(imm)); gpr.UnlockAll(); } } @@ -1116,13 +1141,42 @@ void Jit64::mullwx(UGeckoInstruction inst) { gpr.Lock(a, b, d); gpr.BindToRegister(d, (d == a || d == b), true); - if (d == a) { + if (gpr.R(a).IsImm() || gpr.R(b).IsImm()) + { + u32 imm = gpr.R(a).IsImm() ? (u32)gpr.R(a).offset : (u32)gpr.R(b).offset; + int src = gpr.R(a).IsImm() ? b : a; + if (imm == 0) + XOR(32, gpr.R(d), gpr.R(d)); + else if(imm == -1) + { + if (d != src) + MOV(32, gpr.R(d), gpr.R(src)); + NEG(32, gpr.R(d)); + } + else if((imm & (imm - 1)) == 0 && !inst.OE) + { + u32 shift = 0; + if (imm & 0xFFFF0000) shift |= 16; + if (imm & 0xFF00FF00) shift |= 8; + if (imm & 0xF0F0F0F0) shift |= 4; + if (imm & 0xCCCCCCCC) shift |= 2; + if (imm & 0xAAAAAAAA) shift |= 1; + if (d != src) + MOV(32, gpr.R(d), gpr.R(src)); + if (shift) + SHL(32, gpr.R(d), Imm8(shift)); + } + else + IMUL(32, gpr.RX(d), gpr.R(src), Imm32(imm)); + } + else if (d == a) IMUL(32, gpr.RX(d), gpr.R(b)); - } else if (d == b) { - IMUL(32, gpr.RX(d), gpr.R(a)); - } else { - MOV(32, gpr.R(d), gpr.R(b)); + else if (d == b) IMUL(32, gpr.RX(d), gpr.R(a)); + else + { + MOV(32, gpr.R(d), gpr.R(b)); + IMUL(32, gpr.RX(d), gpr.R(a)); } if (inst.OE) { @@ -1192,6 +1246,103 @@ void Jit64::divwux(UGeckoInstruction inst) } } } + else if (gpr.R(b).IsImm()) + { + u32 divisor = (u32)gpr.R(b).offset; + if (divisor == 0) + { + gpr.SetImmediate32(d, 0); + if (inst.OE) + { + GenerateConstantOverflow(true); + } + } + else + { + u32 shift = 31; + while(!(divisor & (1 << shift))) + shift--; + + if (divisor == (1 << shift)) + { + gpr.Lock(a, b, d); + gpr.BindToRegister(d, d == a, true); + if (d != a) + MOV(32, gpr.R(d), gpr.R(a)); + if (shift) + SHR(32, gpr.R(d), Imm8(shift)); + } + else + { + u64 magic_dividend = 0x100000000ULL << shift; + u32 magic = (u32)(magic_dividend / divisor); + u32 max_quotient = magic >> shift; + + // Test for failure in round-up method + if (((u64)(magic+1) * (max_quotient*divisor-1)) >> (shift + 32) != max_quotient-1) + { + // If failed, use slower round-down method +#ifdef _M_X64 + gpr.Lock(a, b, d); + gpr.BindToRegister(d, d == a, true); + MOV(32, R(EAX), Imm32(magic)); + if (d != a) + MOV(32, gpr.R(d), gpr.R(a)); + IMUL(64, gpr.RX(d), R(RAX)); + ADD(64, gpr.R(d), R(RAX)); + SHR(64, gpr.R(d), Imm8(shift+32)); +#else + gpr.FlushLockX(EDX); + gpr.Lock(a, b, d); + gpr.BindToRegister(d, d == a, true); + MOV(32, R(EAX), Imm32(magic)); + MUL(32, gpr.R(a)); + XOR(32, gpr.R(d), gpr.R(d)); + ADD(32, R(EAX), Imm32(magic)); + ADC(32, gpr.R(d), R(EDX)); + if (shift) + SHR(32, gpr.R(d), Imm8(shift)); + gpr.UnlockAllX(); +#endif + } + else + { + // If success, use faster round-up method +#ifdef _M_X64 + gpr.Lock(a, b, d); + gpr.BindToRegister(a, true, false); + gpr.BindToRegister(d, false, true); + if (d == a) + { + MOV(32, R(EAX), Imm32(magic+1)); + IMUL(64, gpr.RX(d), R(RAX)); + } + else + { + MOV(32, gpr.R(d), Imm32(magic+1)); + IMUL(64, gpr.RX(d), gpr.R(a)); + } + SHR(64, gpr.R(d), Imm8(shift+32)); +#else + gpr.FlushLockX(EDX); + gpr.Lock(a, b, d); + gpr.BindToRegister(d, d == a, true); + MOV(32, R(EAX), Imm32(magic+1)); + MUL(32, gpr.R(a)); + MOV(32, gpr.R(d), R(EDX)); + if (shift) + SHR(32, gpr.R(d), Imm8(shift)); + gpr.UnlockAllX(); +#endif + } + } + if (inst.OE) + { + GenerateConstantOverflow(false); + } + gpr.UnlockAll(); + } + } else { gpr.FlushLockX(EDX); @@ -1201,7 +1352,6 @@ void Jit64::divwux(UGeckoInstruction inst) XOR(32, R(EDX), R(EDX)); gpr.KillImmediate(b, true, false); CMP(32, gpr.R(b), Imm32(0)); - // doesn't handle if OE is set, but int doesn't either... FixupBranch not_div_by_zero = J_CC(CC_NZ); MOV(32, gpr.R(d), R(EDX)); if (inst.OE) @@ -1228,6 +1378,80 @@ void Jit64::divwux(UGeckoInstruction inst) } } +void Jit64::divwx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + int a = inst.RA, b = inst.RB, d = inst.RD; + + 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) + { + gpr.SetImmediate32(d, (i >> 31) ^ j); + if (inst.OE) + { + GenerateConstantOverflow(true); + } + } + else + { + gpr.SetImmediate32(d, i / j); + if (inst.OE) + { + GenerateConstantOverflow(false); + } + } + } + else + { + gpr.FlushLockX(EDX); + gpr.Lock(a, b, d); + gpr.BindToRegister(d, (d == a || d == b), true); + MOV(32, R(EAX), gpr.R(a)); + CDQ(); + gpr.BindToRegister(b, true, false); + TEST(32, gpr.R(b), gpr.R(b)); + FixupBranch not_div_by_zero = J_CC(CC_NZ); + MOV(32, gpr.R(d), R(EDX)); + if (inst.OE) + { + GenerateConstantOverflow(true); + } + FixupBranch end1 = J(); + SetJumpTarget(not_div_by_zero); + CMP(32, gpr.R(b), R(EDX)); + FixupBranch not_div_by_neg_one = J_CC(CC_NZ); + MOV(32, gpr.R(d), R(EAX)); + NEG(32, gpr.R(d)); + FixupBranch no_overflow = J_CC(CC_NO); + XOR(32, gpr.R(d), gpr.R(d)); + if (inst.OE) + { + GenerateConstantOverflow(true); + } + FixupBranch end2 = J(); + SetJumpTarget(not_div_by_neg_one); + IDIV(32, gpr.R(b)); + MOV(32, gpr.R(d), R(EAX)); + SetJumpTarget(no_overflow); + if (inst.OE) + { + GenerateConstantOverflow(false); + } + SetJumpTarget(end1); + SetJumpTarget(end2); + gpr.UnlockAll(); + gpr.UnlockAllX(); + } + + if (inst.Rc) + { + ComputeRC(gpr.R(d)); + } +} + void Jit64::addx(UGeckoInstruction inst) { INSTRUCTION_START From fd616ccb0c09ab8f7cc2fb10a762e93b33c5c609 Mon Sep 17 00:00:00 2001 From: calc84maniac Date: Sun, 22 Jan 2012 21:54:39 -0500 Subject: [PATCH 272/381] [Jit64] Register-based shift instructions optimized on 64-bit processors --- .../Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 72 +++++++++++++++++-- 1 file changed, 66 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index ba51309c85..4980b4d7a4 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -1904,6 +1904,19 @@ void Jit64::srwx(UGeckoInstruction inst) } else { +#ifdef _M_X64 + gpr.FlushLockX(ECX); + gpr.Lock(a, b, s); + gpr.BindToRegister(a, (a == b || a == s), true); + MOV(32, R(ECX), gpr.R(b)); + if (a != s) + { + MOV(32, gpr.R(a), gpr.R(s)); + } + SHR(64, gpr.R(a), R(ECX)); + gpr.UnlockAll(); + gpr.UnlockAllX(); +#else gpr.FlushLockX(ECX); gpr.Lock(a, b, s); gpr.BindToRegister(a, (a == b || a == s), true); @@ -1919,6 +1932,7 @@ void Jit64::srwx(UGeckoInstruction inst) SHR(32, gpr.R(a), R(ECX)); gpr.UnlockAll(); gpr.UnlockAllX(); +#endif } // Shift of 0 doesn't update flags, so compare manually just in case if (inst.Rc) @@ -1939,9 +1953,35 @@ void Jit64::slwx(UGeckoInstruction inst) { u32 amount = (u32)gpr.R(b).offset; gpr.SetImmediate32(a, (amount & 0x20) ? 0 : (u32)gpr.R(s).offset << amount); + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } } else { +#ifdef _M_X64 + gpr.FlushLockX(ECX); + gpr.Lock(a, b, s); + gpr.BindToRegister(a, (a == b || a == s), true); + MOV(32, R(ECX), gpr.R(b)); + if (a != s) + { + MOV(32, gpr.R(a), gpr.R(s)); + } + SHL(64, gpr.R(a), R(ECX)); + if (inst.Rc) + { + AND(32, gpr.R(a), gpr.R(a)); + GenerateRC(); + } + else + { + MOV(32, gpr.R(a), gpr.R(a)); + } + gpr.UnlockAll(); + gpr.UnlockAllX(); +#else gpr.FlushLockX(ECX); gpr.Lock(a, b, s); gpr.BindToRegister(a, (a == b || a == s), true); @@ -1957,11 +1997,12 @@ void Jit64::slwx(UGeckoInstruction inst) SHL(32, gpr.R(a), R(ECX)); gpr.UnlockAll(); gpr.UnlockAllX(); - } - // Shift of 0 doesn't update flags, so compare manually just in case - if (inst.Rc) - { - ComputeRC(gpr.R(a)); + // Shift of 0 doesn't update flags, so compare manually just in case + if (inst.Rc) + { + ComputeRC(gpr.R(a)); + } +#endif } } @@ -1973,6 +2014,25 @@ void Jit64::srawx(UGeckoInstruction inst) int a = inst.RA; int b = inst.RB; int s = inst.RS; +#ifdef _M_X64 + gpr.Lock(a, s, b); + gpr.FlushLockX(ECX); + gpr.BindToRegister(a, (a == s || a == b), true); + JitClearCA(); + MOV(32, R(ECX), gpr.R(b)); + if (a != s) + MOV(32, gpr.R(a), gpr.R(s)); + SHL(64, gpr.R(a), Imm8(32)); + SAR(64, gpr.R(a), R(ECX)); + MOV(32, R(EAX), gpr.R(a)); + SHR(64, gpr.R(a), Imm8(32)); + TEST(32, gpr.R(a), R(EAX)); + FixupBranch nocarry = J_CC(CC_Z); + JitSetCA(); + SetJumpTarget(nocarry); + gpr.UnlockAll(); + gpr.UnlockAllX(); +#else gpr.Lock(a, s, b); gpr.FlushLockX(ECX); gpr.BindToRegister(a, (a == s || a == b), true); @@ -1998,7 +2058,7 @@ void Jit64::srawx(UGeckoInstruction inst) SetJumpTarget(nocarry2); gpr.UnlockAll(); gpr.UnlockAllX(); - +#endif if (inst.Rc) { ComputeRC(gpr.R(a)); } From 04a7e33f0b629622ff851f962b9ab707f70a1b35 Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Fri, 27 Jan 2012 00:30:52 -0800 Subject: [PATCH 273/381] proper unicode literal and wstring to wxstring conversions. Fixes issue 5156. --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 45 +++++++++----------- Source/Core/DolphinWX/Src/ISOProperties.cpp | 12 +++--- Source/Core/DolphinWX/Src/LogWindow.cpp | 2 +- Source/Core/DolphinWX/Src/MemcardManager.cpp | 2 +- 4 files changed, 29 insertions(+), 32 deletions(-) diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 9dbbf656e9..8e0a498915 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -448,7 +448,7 @@ void CGameListCtrl::InsertItemInReportView(long _Index) #else // on linux the wrong string is returned from wxFontMapper::GetEncodingName(wxFONTENCODING_SHIFT_JIS) // it returns CP-932, in order to use iconv we need to use CP932 - wxCSConv SJISConv(L"CP932"); + wxCSConv SJISConv(wxT("CP932")); #endif GameListItem& rISOFile = *m_ISOFiles[_Index]; @@ -468,10 +468,13 @@ void CGameListCtrl::InsertItemInReportView(long _Index) // Set the game's banner in the second column SetItemColumnImage(_Index, COLUMN_BANNER, ImageIndex); - std::wstring wname; - const std::wstring& wdescription = rISOFile.GetDescription(); + std::wstring wstring_name; + const std::wstring& wstring_description = rISOFile.GetDescription(); std::string company; + wxString name; + wxString description; + // We show the company string on Gamecube only // On Wii we show the description instead as the company string is empty if (rISOFile.GetPlatform() == GameListItem::GAMECUBE_DISC) @@ -482,13 +485,11 @@ void CGameListCtrl::InsertItemInReportView(long _Index) case DiscIO::IVolume::COUNTRY_TAIWAN: case DiscIO::IVolume::COUNTRY_JAPAN: { - rISOFile.GetName(wname, -1); - wxString name = wxString(rISOFile.GetName(0).c_str(), SJISConv); + rISOFile.GetName(wstring_name, -1); + name = wxString(rISOFile.GetName(0).c_str(), SJISConv); m_gameList.append(StringFromFormat("%s (J)\n", (const char *)name.c_str())); - SetItem(_Index, COLUMN_TITLE, name, -1); - SetItem(_Index, COLUMN_NOTES, wxString(company.size() ? - company.c_str() : rISOFile.GetDescription(0).c_str(), - SJISConv), -1); + description = wxString(company.size() ? company.c_str() : + rISOFile.GetDescription(0).c_str(), SJISConv); } break; case DiscIO::IVolume::COUNTRY_USA: @@ -496,28 +497,24 @@ void CGameListCtrl::InsertItemInReportView(long _Index) default: { wxCSConv WindowsCP1252(wxFontMapper::GetEncodingName(wxFONTENCODING_CP1252)); - rISOFile.GetName(wname, SelectedLanguage); + rISOFile.GetName(wstring_name, SelectedLanguage); - SetItem(_Index, COLUMN_TITLE, - wxString( - rISOFile.GetName(SelectedLanguage).c_str(), WindowsCP1252), - -1); + 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')); - SetItem(_Index, COLUMN_NOTES, - wxString(company.size() ? - company.c_str() : - rISOFile.GetDescription(SelectedLanguage).c_str(), WindowsCP1252), - -1); + description = wxString(company.size() ? company.c_str() : + rISOFile.GetDescription(SelectedLanguage).c_str(), WindowsCP1252); } break; } - if (wname.length()) - SetItem(_Index, COLUMN_TITLE, wname, -1); - if (wdescription.length()) - SetItem(_Index, COLUMN_NOTES, wdescription, -1); - + if (wstring_name.length()) + name = wstring_name.c_str(); + if (wstring_description.length()) + description = wstring_description.c_str(); + + SetItem(_Index, COLUMN_TITLE, name, -1); + SetItem(_Index, COLUMN_NOTES, description, -1); #ifndef _WIN32 // Emulation state diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index 85b95f3cb4..b5e5c82d1d 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -158,7 +158,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW std::wstring wname; wxString name; if (OpenGameListItem->GetName(wname)) - name = wname; + name = wname.c_str(); else name = wxString(OpenISO->GetName().c_str(), wxConvUTF8); m_Name->SetValue(name); @@ -1280,7 +1280,7 @@ void CISOProperties::ChangeBannerDetails(int lang) #else // on linux the wrong string is returned from wxFontMapper::GetEncodingName(wxFONTENCODING_SHIFT_JIS) // it returns CP-932, in order to use iconv we need to use CP932 - wxCSConv SJISConv(L"CP932"); + wxCSConv SJISConv(wxT("CP932")); #endif switch (OpenGameListItem->GetCountry()) { @@ -1288,11 +1288,11 @@ void CISOProperties::ChangeBannerDetails(int lang) case DiscIO::IVolume::COUNTRY_JAPAN: if (OpenGameListItem->GetName(wname, -1)) - shortName = wname; + shortName = wname.c_str(); else shortName = wxString(OpenGameListItem->GetName(0).c_str(), SJISConv); - if ((comment = OpenGameListItem->GetDescription()).size() == 0) + if ((comment = OpenGameListItem->GetDescription().c_str()).size() == 0) comment = wxString(OpenGameListItem->GetDescription(0).c_str(), SJISConv); maker = wxString(OpenGameListItem->GetCompany().c_str(), SJISConv); break; @@ -1302,10 +1302,10 @@ void CISOProperties::ChangeBannerDetails(int lang) { wxCSConv WindowsCP1252(wxFontMapper::GetEncodingName(wxFONTENCODING_CP1252)); if (OpenGameListItem->GetName(wname, lang)) - shortName = wname; + shortName = wname.c_str(); else shortName = wxString(OpenGameListItem->GetName(lang).c_str(), WindowsCP1252); - if ((comment = OpenGameListItem->GetDescription()).size() == 0) + if ((comment = OpenGameListItem->GetDescription().c_str()).size() == 0) comment = wxString(OpenGameListItem->GetDescription(lang).c_str(), WindowsCP1252); maker = wxString(OpenGameListItem->GetCompany().c_str(), WindowsCP1252); } diff --git a/Source/Core/DolphinWX/Src/LogWindow.cpp b/Source/Core/DolphinWX/Src/LogWindow.cpp index f2a1b3d8b8..0d11ef0142 100644 --- a/Source/Core/DolphinWX/Src/LogWindow.cpp +++ b/Source/Core/DolphinWX/Src/LogWindow.cpp @@ -56,7 +56,7 @@ CLogWindow::CLogWindow(CFrame *parent, wxWindowID id, const wxPoint& pos, #else // on linux the wrong string is returned from wxFontMapper::GetEncodingName(wxFONTENCODING_SHIFT_JIS) // it returns CP-932, in order to use iconv we need to use CP932 - m_SJISConv = wxCSConv(L"CP932"); + m_SJISConv = wxCSConv(wxT("CP932")); #endif m_LogManager = LogManager::GetInstance(); diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp index 68ae0f9ff2..98390122e2 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.cpp +++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp @@ -716,7 +716,7 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card) #else // on linux the wrong string is returned from wxFontMapper::GetEncodingName(wxFONTENCODING_SHIFT_JIS) // it returns CP-932, in order to use iconv we need to use CP932 - wxCSConv SJISConv(L"CP932"); + wxCSConv SJISConv(wxT("CP932")); #endif wxTitle = wxString(title, ascii ? *wxConvCurrent : SJISConv); wxComment = wxString(comment, ascii ? *wxConvCurrent : SJISConv); From c5008fe9dea7baf3368e214fe70e148d3bcca83b Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 26 Dec 2011 17:35:27 +0100 Subject: [PATCH 274/381] TextureCache: Renaming some variables OGL: Fix a possible bug at texture dumping OGL: Add a TODO about a possible bug --- .../Core/VideoCommon/Src/TextureCacheBase.cpp | 30 +++++++++---------- .../Core/VideoCommon/Src/TextureCacheBase.h | 26 ++++++++-------- .../Plugin_VideoDX11/Src/TextureCache.cpp | 2 +- .../Plugin_VideoDX11/Src/VertexManager.cpp | 2 +- .../Plugin_VideoDX9/Src/TextureCache.cpp | 10 +++---- .../Plugin_VideoDX9/Src/VertexManager.cpp | 2 +- .../Plugin_VideoOGL/Src/TextureCache.cpp | 6 ++-- .../Plugin_VideoOGL/Src/VertexManager.cpp | 2 +- 8 files changed, 41 insertions(+), 39 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index 3550227389..b56dc171aa 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -266,7 +266,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, } if (((entry->isRenderTarget || entry->isDynamic) && hash_value == entry->hash && address == entry->addr) - || ((address == entry->addr) && (hash_value == entry->hash) && full_format == entry->format && entry->mipLevels == maxlevel)) + || ((address == entry->addr) && (hash_value == entry->hash) && full_format == entry->format && entry->num_mipmaps == maxlevel)) { entry->isDynamic = false; goto return_entry; @@ -279,8 +279,8 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, texture_is_dynamic = (entry->isRenderTarget || entry->isDynamic) && !g_ActiveConfig.bCopyEFBToTexture; if (!entry->isRenderTarget && - ((!entry->isDynamic && width == entry->realW && height == entry->realH && full_format == entry->format && entry->mipLevels == maxlevel) - || (entry->isDynamic && entry->realW == width && entry->realH == height))) + ((!entry->isDynamic && width == entry->native_width && height == entry->native_height && full_format == entry->format && entry->num_mipmaps == maxlevel) + || (entry->isDynamic && entry->native_width == width && entry->native_height == height))) { // reuse the texture } @@ -332,7 +332,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, // Sometimes, we can get around recreating a texture if only the number of mip levels gets 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 - entry->mipLevels = maxlevel; + entry->num_mipmaps = maxlevel; GFX_DEBUGGER_PAUSE_AT(NEXT_NEW_TEXTURE, true); } @@ -341,11 +341,11 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, entry->format = full_format; entry->size_in_bytes = texture_size; - entry->virtualW = width; - entry->virtualH = height; + entry->native_width = nativeW; + entry->native_height = nativeH; - entry->realW = nativeW; - entry->realH = nativeH; + entry->virtual_width = width; + entry->virtual_height = height; entry->isRenderTarget = false; entry->isNonPow2 = false; @@ -633,8 +633,8 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat TCacheEntryBase *entry = textures[dstAddr]; if (entry) { - if ((entry->isRenderTarget && entry->virtualW == scaled_tex_w && entry->virtualH == scaled_tex_h) - || (entry->isDynamic && entry->realW == tex_w && entry->realH == tex_h)) + if ((entry->isRenderTarget && entry->virtual_width == scaled_tex_w && entry->virtual_height == scaled_tex_h) + || (entry->isDynamic && entry->native_width == tex_w && entry->native_height == tex_h)) { texture_is_dynamic = entry->isDynamic; } @@ -660,14 +660,14 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat entry->addr = dstAddr; entry->hash = 0; - entry->realW = tex_w; - entry->realH = tex_h; + entry->native_width = tex_w; + entry->native_height = tex_h; - entry->virtualW = scaled_tex_w; - entry->virtualH = scaled_tex_h; + entry->virtual_width = scaled_tex_w; + entry->virtual_height = scaled_tex_h; entry->format = dstFormat; - entry->mipLevels = 0; + entry->num_mipmaps = 0; entry->isRenderTarget = true; entry->isNonPow2 = true; diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.h b/Source/Core/VideoCommon/Src/TextureCacheBase.h index 1c86e64006..f115b367b4 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.h +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.h @@ -16,29 +16,31 @@ class TextureCache public: struct TCacheEntryBase { - // TODO: organize + // common members u32 addr; u32 size_in_bytes; u64 hash; - //u32 paletteHash; - u32 oldpixel; + //u32 pal_hash; u32 format; - - int frameCount; - unsigned int realW, realH; // Texture dimensions from the GameCube's point of view - unsigned int virtualW, virtualH; // Texture dimensions from OUR point of view - // Real and virtual dimensions are usually the same, but may be - // different if e.g. we use high-res textures. Then, realW,realH will - // be the dimensions of the original GameCube texture and - // virtualW,virtualH will be the dimensions of the high-res texture. + //bool is_preloaded; - unsigned int mipLevels; + unsigned int num_mipmaps; + unsigned int native_width, native_height; // Texture dimensions from the GameCube's point of view + unsigned int virtual_width, virtual_height; // Texture dimensions from OUR point of view - for hires textures or scaled EFB copies + + // EFB copies bool isRenderTarget; // copied from EFB bool isDynamic; // Used for hybrid EFB copies to enable checks for CPU modifications + + // deprecated members + u32 oldpixel; + int frameCount; bool isNonPow2; // doesn't seem to be used anywhere + + //TCacheEntryBase() //{ // // TODO: remove these diff --git a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp index 39018c83bc..b1a5398d7d 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp @@ -107,7 +107,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo g_renderer->ResetAPIState(); // stretch picture with increased internal resolution - const D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, (float)virtualW, (float)virtualH); + const D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, (float)virtual_width, (float)virtual_height); D3D::context->RSSetViewports(1, &vp); // set transformation diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp index e1e40047e4..9087b6dac1 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp @@ -233,7 +233,7 @@ void VertexManager::vFlush() if (tentry) { // 0s are probably for no manual wrapping needed. - PixelShaderManager::SetTexDims(i, tentry->realW, tentry->realH, 0, 0); + PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height, 0, 0); } else ERROR_LOG(VIDEO, "error loading texture"); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp index 7c741e08a9..3f12678ca4 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp @@ -90,15 +90,15 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo // Stretch picture with increased internal resolution vp.X = 0; vp.Y = 0; - vp.Width = virtualW; - vp.Height = virtualH; + vp.Width = virtual_width; + vp.Height = virtual_height; vp.MinZ = 0.0f; vp.MaxZ = 1.0f; D3D::dev->SetViewport(&vp); RECT destrect; - destrect.bottom = virtualH; + destrect.bottom = virtual_height; destrect.left = 0; - destrect.right = virtualW; + destrect.right = virtual_width; destrect.top = 0; PixelShaderManager::SetColorMatrix(colmat); // set transformation @@ -133,7 +133,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo D3D::drawShadedTexQuad(read_texture, &sourcerect, Renderer::GetTargetWidth(), Renderer::GetTargetHeight(), - virtualW, virtualH, + virtual_width, virtual_height, // TODO: why is D3DFMT_D24X8 singled out here? why not D3DFMT_D24X4S4/D24S8/D24FS8/D32/D16/D15S1 too, or none of them? PixelShaderCache::GetDepthMatrixProgram(SSAAMode, (srcFormat == PIXELFMT_Z24) && bformat != FOURCC_RAWZ && bformat != D3DFMT_D24X8), VertexShaderCache::GetSimpleVertexShader(SSAAMode)); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp index d9c33b67ef..c6bddb7468 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp @@ -142,7 +142,7 @@ void VertexManager::vFlush() if (tentry) { // 0s are probably for no manual wrapping needed. - PixelShaderManager::SetTexDims(i, tentry->realW, tentry->realH, 0, 0); + PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height, 0, 0); } else ERROR_LOG(VIDEO, "error loading texture"); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp index 4a9431a563..91cc48d7d9 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp @@ -124,7 +124,7 @@ bool TextureCache::TCacheEntry::Save(const char filename[]) std::string tga_filename(filename); tga_filename.replace(tga_filename.size() - 3, 3, "tga"); - return SaveTexture(tga_filename.c_str(), GL_TEXTURE_2D, texture, realW, realH); + return SaveTexture(tga_filename.c_str(), GL_TEXTURE_2D, texture, virtual_width, virtual_height); } TextureCache::TCacheEntryBase* TextureCache::CreateTexture(unsigned int width, @@ -294,7 +294,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo glEnable(GL_TEXTURE_RECTANGLE_ARB); glBindTexture(GL_TEXTURE_RECTANGLE_ARB, read_texture); - glViewport(0, 0, virtualW, virtualH); + glViewport(0, 0, virtual_width, virtual_height); PixelShaderCache::SetCurrentShader((srcFormat == PIXELFMT_Z24) ? PixelShaderCache::GetDepthMatrixProgram() : PixelShaderCache::GetColorMatrixProgram()); PixelShaderManager::SetColorMatrix(colmat); // set transformation @@ -337,7 +337,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo { static int count = 0; SaveTexture(StringFromFormat("%sefb_frame_%i.tga", File::GetUserPath(D_DUMPTEXTURES_IDX).c_str(), - count++).c_str(), GL_TEXTURE_2D, texture, realW, realH); + count++).c_str(), GL_TEXTURE_2D, texture, virtual_width, virtual_height); } } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp index 5144c328d9..e3b55987ec 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp @@ -160,7 +160,7 @@ void VertexManager::vFlush() if (tentry) { // 0s are probably for no manual wrapping needed. - PixelShaderManager::SetTexDims(i, tentry->realW, tentry->realH, 0, 0); + PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height, 0, 0); if (g_ActiveConfig.iLog & CONF_SAVETEXTURES) { From 94a8536b8cc44ab1435982695bc4a245e9f38f75 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 26 Dec 2011 18:05:01 +0100 Subject: [PATCH 275/381] TextureCacheBase: Simplify texture cache entry initialization --- .../Core/VideoCommon/Src/TextureCacheBase.cpp | 52 ++++++------------- .../Core/VideoCommon/Src/TextureCacheBase.h | 29 +++++++++++ 2 files changed, 46 insertions(+), 35 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index b56dc171aa..a5db110c7a 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -135,7 +135,7 @@ void TextureCache::MakeRangeDynamic(u32 start_address, u32 size) const int rangePosition = iter->second->IntersectsMemoryRange(start_address, size); if (0 == rangePosition) { - iter->second->hash = 0; + iter->second->SetHashes(TEXHASH_INVALID); } } } @@ -190,8 +190,8 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, const unsigned int nativeH = height; bool isPow2; - u64 hash_value = 0; - u64 texHash = 0; + u64 hash_value = TEXHASH_INVALID; + u64 texHash = TEXHASH_INVALID; u32 texID = address; u32 full_format = texformat; const u32 texture_size = TexDecoder_GetTextureSizeInBytes(expandedWidth, expandedHeight, texformat); @@ -252,7 +252,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, } else { - hash_value = 0; + hash_value = TEXHASH_INVALID; } } else @@ -262,7 +262,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, } else if ((entry->isRenderTarget || entry->isDynamic) && g_ActiveConfig.bCopyEFBToTexture) { - hash_value = 0; + hash_value = TEXHASH_INVALID; } if (((entry->isRenderTarget || entry->isDynamic) && hash_value == entry->hash && address == entry->addr) @@ -332,24 +332,15 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, // Sometimes, we can get around recreating a texture if only the number of mip levels gets 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 - entry->num_mipmaps = maxlevel; + entry->num_mipmaps = maxlevel; // TODO: Does this actually work? We can't really adjust mipmap settings per-stage... GFX_DEBUGGER_PAUSE_AT(NEXT_NEW_TEXTURE, true); } - entry->addr = address; - entry->format = full_format; - entry->size_in_bytes = texture_size; - - entry->native_width = nativeW; - entry->native_height = nativeH; - - entry->virtual_width = width; - entry->virtual_height = height; - - entry->isRenderTarget = false; + entry->SetGeneralParameters(address, texture_size, full_format, entry->num_mipmaps); + entry->SetDimensions(nativeW, nativeH, width, height); + entry->SetEFBCopyParameters(false, texture_is_dynamic); entry->isNonPow2 = false; - entry->isDynamic = texture_is_dynamic; entry->oldpixel = *(u32*)ptr; @@ -472,9 +463,9 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat cbufid = 5; break; - case 12: // Z16L - copy lower 16 depth bits - // expected to be used as an IA8 texture (upper 8 bits stored as intensity, lower 8 bits stored as alpha) - // Used e.g. in Zelda: Skyward Sword + case 12: // Z16L - copy lower 16 depth bits + // expected to be used as an IA8 texture (upper 8 bits stored as intensity, lower 8 bits stored as alpha) + // Used e.g. in Zelda: Skyward Sword colmat[1] = colmat[5] = colmat[9] = colmat[14] = 1.0f; cbufid = 6; break; @@ -657,21 +648,12 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat // create the texture textures[dstAddr] = entry = g_texture_cache->CreateRenderTargetTexture(scaled_tex_w, scaled_tex_h); - entry->addr = dstAddr; - entry->hash = 0; - - entry->native_width = tex_w; - entry->native_height = tex_h; - - entry->virtual_width = scaled_tex_w; - entry->virtual_height = scaled_tex_h; - - entry->format = dstFormat; - entry->num_mipmaps = 0; - - entry->isRenderTarget = true; + // TODO: Using the wrong dstFormat, dumb... + entry->SetGeneralParameters(dstAddr, 0, dstFormat, 0); + entry->SetDimensions(tex_w, tex_h, scaled_tex_w, scaled_tex_h); + entry->SetEFBCopyParameters(true, false); + entry->SetHashes(TEXHASH_INVALID); entry->isNonPow2 = true; - entry->isDynamic = false; } entry->frameCount = frameCount; diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.h b/Source/Core/VideoCommon/Src/TextureCacheBase.h index f115b367b4..5ef0c3c464 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.h +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.h @@ -16,6 +16,8 @@ class TextureCache public: struct TCacheEntryBase { +#define TEXHASH_INVALID 0 + // common members u32 addr; u32 size_in_bytes; @@ -29,6 +31,33 @@ public: unsigned int native_width, native_height; // Texture dimensions from the GameCube's point of view unsigned int virtual_width, virtual_height; // Texture dimensions from OUR point of view - for hires textures or scaled EFB copies + 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; + } + + 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; + } + + void SetHashes(u64 hash/*, u32 pal_hash*/) + { + this->hash = hash; + //this->pal_hash = pal_hash; + } + + void SetEFBCopyParameters(bool is_efb_copy, bool is_dynamic) + { + isRenderTarget = is_efb_copy; + isDynamic = is_dynamic; + } // EFB copies bool isRenderTarget; // copied from EFB From 9c39952c3415e1592098b46c801d668b3049fa83 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 26 Dec 2011 18:33:05 +0100 Subject: [PATCH 276/381] TextureCacheBase: Kill deprecated entry member isNonPow2 TextureCacheBase: Add a TODO about a potential bug --- .../Core/VideoCommon/Src/TextureCacheBase.cpp | 4 +- .../Core/VideoCommon/Src/TextureCacheBase.h | 38 ++++++------------- 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index a5db110c7a..8bca9e36d9 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -93,7 +93,7 @@ void TextureCache::Cleanup() tcend = textures.end(); while (iter != tcend) { - if (frameCount > TEXTURE_KILL_THRESHOLD + iter->second->frameCount) + if (frameCount > TEXTURE_KILL_THRESHOLD + iter->second->frameCount) // TODO: Deleting EFB copies might not be a good idea here... { delete iter->second; textures.erase(iter++); @@ -340,7 +340,6 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, entry->SetGeneralParameters(address, texture_size, full_format, entry->num_mipmaps); entry->SetDimensions(nativeW, nativeH, width, height); entry->SetEFBCopyParameters(false, texture_is_dynamic); - entry->isNonPow2 = false; entry->oldpixel = *(u32*)ptr; @@ -653,7 +652,6 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat entry->SetDimensions(tex_w, tex_h, scaled_tex_w, scaled_tex_h); entry->SetEFBCopyParameters(true, false); entry->SetHashes(TEXHASH_INVALID); - entry->isNonPow2 = true; } entry->frameCount = frameCount; diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.h b/Source/Core/VideoCommon/Src/TextureCacheBase.h index 5ef0c3c464..5625958b76 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.h +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.h @@ -31,6 +31,17 @@ public: unsigned int native_width, native_height; // Texture dimensions from the GameCube's point of view unsigned int virtual_width, virtual_height; // Texture dimensions from OUR point of view - for hires textures or scaled EFB copies + // EFB copies + bool isRenderTarget; // copied from EFB + bool isDynamic; // Used for hybrid EFB copies to enable checks for CPU modifications + + // used to delete textures which haven't been used for TEXTURE_KILL_THRESHOLD frames + int frameCount; + + // deprecated members + u32 oldpixel; + + void SetGeneralParameters(u32 addr, u32 size, u32 format, unsigned int num_mipmaps) { this->addr = addr; @@ -59,33 +70,6 @@ public: isDynamic = is_dynamic; } - // EFB copies - bool isRenderTarget; // copied from EFB - bool isDynamic; // Used for hybrid EFB copies to enable checks for CPU modifications - - // deprecated members - u32 oldpixel; - int frameCount; - bool isNonPow2; // doesn't seem to be used anywhere - - - - //TCacheEntryBase() - //{ - // // TODO: remove these - // isRenderTarget = 0; - // hash = 0; - // //paletteHash = 0; - // oldpixel = 0; - // addr = 0; - // size_in_bytes = 0; - // frameCount = 0; - // isNonPow2 = true; - // w = 0; - // h = 0; - // scaledW = 0; - // scaledH = 0; - //} virtual ~TCacheEntryBase(); From 8bc9e443fd5ceb7b5f4b11ccf600d6ca5f332427 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 26 Dec 2011 18:45:22 +0100 Subject: [PATCH 277/381] TextureCacheBase: De-uglify entry lookup a bit --- .../Core/VideoCommon/Src/TextureCacheBase.cpp | 38 +++++++------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index 8bca9e36d9..e2d74e18e5 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -88,9 +88,8 @@ TextureCache::~TextureCache() void TextureCache::Cleanup() { - TexCache::iterator - iter = textures.begin(), - tcend = textures.end(); + TexCache::iterator iter = textures.begin(); + 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... @@ -236,33 +235,24 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, TCacheEntryBase *entry = textures[texID]; if (entry) { - if (!g_ActiveConfig.bSafeTextureCache) + if (g_ActiveConfig.bSafeTextureCache) { - if (entry->isRenderTarget || entry->isDynamic) + if (g_ActiveConfig.bCopyEFBToTexture && (entry->isRenderTarget || entry->isDynamic)) + hash_value = TEXHASH_INVALID; + } + else + { + if (!(entry->isRenderTarget || entry->isDynamic)) + hash_value = *(u32*)ptr; + else if (g_ActiveConfig.bCopyEFBToTexture) + hash_value = TEXHASH_INVALID; + else { - if (!g_ActiveConfig.bCopyEFBToTexture) - { hash_value = GetHash64(ptr, texture_size, g_ActiveConfig.iSafeTextureCache_ColorSamples); if (isPaletteTexture) - { - hash_value ^= GetHash64(&texMem[tlutaddr], palette_size, - g_ActiveConfig.iSafeTextureCache_ColorSamples); - } - } - else - { - hash_value = TEXHASH_INVALID; - } + hash_value ^= GetHash64(&texMem[tlutaddr], palette_size, g_ActiveConfig.iSafeTextureCache_ColorSamples); } - else - { - hash_value = *(u32*)ptr; - } - } - else if ((entry->isRenderTarget || entry->isDynamic) && g_ActiveConfig.bCopyEFBToTexture) - { - hash_value = TEXHASH_INVALID; } if (((entry->isRenderTarget || entry->isDynamic) && hash_value == entry->hash && address == entry->addr) From dcf18fbaaf20cf1eade8c76eccd7fcd279b43957 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 26 Dec 2011 19:17:04 +0100 Subject: [PATCH 278/381] TextureCacheBase: Force autogenerating mipmaps if custom textures are used --- Source/Core/VideoCommon/Src/TextureCacheBase.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index e2d74e18e5..afe4ce8abc 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -282,7 +282,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, } } } - + if (g_ActiveConfig.bHiresTextures) { // Load Custom textures @@ -298,16 +298,14 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, { expandedWidth = width = newWidth; expandedHeight = height = newHeight; - - // TODO: shouldn't generating mips be forced on now? - // native mips with a custom texture wouldn't make sense } } if (pcfmt == PC_TEX_FMT_NONE) pcfmt = TexDecoder_Decode(temp, ptr, expandedWidth, - expandedHeight, texformat, tlutaddr, tlutfmt, g_ActiveConfig.backend_info.bUseRGBATextures); + expandedHeight, texformat, tlutaddr, tlutfmt, g_ActiveConfig.backend_info.bUseRGBATextures); + UseNativeMips = UseNativeMips && (width == nativeW && height == nativeH); // Only load native mips if their dimensions fit to our virtual texture dimensions isPow2 = !((width & (width - 1)) || (height & (height - 1))); texLevels = (isPow2 && UseNativeMips && maxlevel) ? GetPow2(std::max(width, height)) : !isPow2; @@ -330,13 +328,11 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, entry->SetGeneralParameters(address, texture_size, full_format, entry->num_mipmaps); entry->SetDimensions(nativeW, nativeH, width, height); entry->SetEFBCopyParameters(false, texture_is_dynamic); - entry->oldpixel = *(u32*)ptr; if (g_ActiveConfig.bSafeTextureCache || entry->isDynamic) entry->hash = hash_value; else - // don't like rand() here entry->hash = *(u32*)ptr = (u32)(((double)rand() / RAND_MAX) * 0xFFFFFFFF); // load texture From f68ee87e0e03b909d66a8a333297499d357aa22b Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 26 Dec 2011 19:45:13 +0100 Subject: [PATCH 279/381] TextureCacheBase: De-uglify texcache entry lookup even more + documentation --- .../Core/VideoCommon/Src/TextureCacheBase.cpp | 48 +++++++++++-------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index afe4ce8abc..1c6f8a4718 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -235,6 +235,9 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, TCacheEntryBase *entry = textures[texID]; if (entry) { + // 1. Adjust reference hash: + // safe texcache: reference hash was calculated above for normal textures. 0 for virtual EFB copies. + // unsafe texcache: 0 for virtual EFB copies. Safe hash for dynamic EFB copies. First pixel for normal textures. if (g_ActiveConfig.bSafeTextureCache) { if (g_ActiveConfig.bCopyEFBToTexture && (entry->isRenderTarget || entry->isDynamic)) @@ -255,31 +258,38 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, } } - if (((entry->isRenderTarget || entry->isDynamic) && hash_value == entry->hash && address == entry->addr) - || ((address == entry->addr) && (hash_value == entry->hash) && full_format == entry->format && entry->num_mipmaps == maxlevel)) + // 2. a) For EFB copies, only the hash and the texture address need to match + if ((entry->isRenderTarget || entry->isDynamic) && hash_value == entry->hash && address == entry->addr) { + // 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()) entry->isDynamic = false; goto return_entry; } + + // 2. b) For normal textures, all texture parameters need to match + if (address == entry->addr && hash_value == entry->hash && full_format == entry->format && + entry->num_mipmaps == maxlevel && entry->native_width == nativeW && entry->native_height == nativeH) + { + goto return_entry; + } + + // 3. If we reach this line, we'll have to upload the new texture data to VRAM. + // If we're lucky, the texture parameters didn't change and we can reuse the internal texture object instead of destroying and recreating it. + texture_is_dynamic = (entry->isRenderTarget || entry->isDynamic) && !g_ActiveConfig.bCopyEFBToTexture; + + // 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->isRenderTarget && + ((!entry->isDynamic && width == entry->native_width && height == entry->native_height && full_format == entry->format && entry->num_mipmaps == maxlevel) + || (entry->isDynamic && entry->native_width == width && entry->native_height == height))) + { + // reuse the texture + } else { - // Let's reload the new texture data into the same texture, - // instead of destroying it and having to create a new one. - // Might speed up movie playback very, very slightly. - texture_is_dynamic = (entry->isRenderTarget || entry->isDynamic) && !g_ActiveConfig.bCopyEFBToTexture; - - if (!entry->isRenderTarget && - ((!entry->isDynamic && width == entry->native_width && height == entry->native_height && full_format == entry->format && entry->num_mipmaps == maxlevel) - || (entry->isDynamic && entry->native_width == width && entry->native_height == height))) - { - // reuse the texture - } - else - { - // delete the texture and make a new one - delete entry; - entry = NULL; - } + // delete the texture and make a new one + delete entry; + entry = NULL; } } From 0c1e015ec3172ecab09f0315b98aeadd1191f4a4 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 26 Dec 2011 20:05:32 +0100 Subject: [PATCH 280/381] TextureCacheBase: Small change --- Source/Core/VideoCommon/Src/TextureCacheBase.cpp | 2 +- Source/Core/VideoCommon/Src/TextureCacheBase.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index 1c6f8a4718..c29646273a 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -367,7 +367,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); + entry->Load(currentWidth, currentHeight, expandedWidth, level, false); ptr += ((std::max(mipWidth, bsw) * std::max(mipHeight, bsh) * bsdepth) >> 1); mipWidth >>= 1; diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.h b/Source/Core/VideoCommon/Src/TextureCacheBase.h index 5625958b76..7b14d737d2 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.h +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.h @@ -77,7 +77,7 @@ public: virtual bool Save(const char filename[]) = 0; virtual void Load(unsigned int width, unsigned int height, - unsigned int expanded_width, unsigned int level, bool autogen_mips = false) = 0; + unsigned int expanded_width, unsigned int level, bool autogen_mips) = 0; virtual void FromRenderTarget(u32 dstAddr, unsigned int dstFormat, unsigned int srcFormat, const EFBRectangle& srcRect, bool isIntensity, bool scaleByHalf, unsigned int cbufid, From 93dbd93a8d35e3a87ae1c918369e952be3404b59 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 26 Dec 2011 21:11:31 +0100 Subject: [PATCH 281/381] TextureCacheBase: More cleanup... --- .../Core/VideoCommon/Src/TextureCacheBase.cpp | 53 ++++++++++--------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index c29646273a..926b86b29a 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -191,10 +191,10 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, u64 hash_value = TEXHASH_INVALID; u64 texHash = TEXHASH_INVALID; + u64 tlut_hash = TEXHASH_INVALID; u32 texID = address; u32 full_format = texformat; const u32 texture_size = TexDecoder_GetTextureSizeInBytes(expandedWidth, expandedHeight, texformat); - const u32 palette_size = TexDecoder_GetPaletteSize(texformat); bool texture_is_dynamic = false; unsigned int texLevels; PC_TexFormat pcfmt = PC_TEX_FMT_NONE; @@ -204,37 +204,40 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, if (isPaletteTexture) full_format = texformat | (tlutfmt << 16); - // hires texture loading and texture dumping require accurate hashes - if (g_ActiveConfig.bSafeTextureCache || g_ActiveConfig.bHiresTextures || g_ActiveConfig.bDumpTextures) + if (isPaletteTexture && (g_ActiveConfig.bSafeTextureCache || g_ActiveConfig.bHiresTextures || g_ActiveConfig.bDumpTextures)) { - texHash = GetHash64(ptr, texture_size, g_ActiveConfig.iSafeTextureCache_ColorSamples); - - if (isPaletteTexture) - { - // WARNING! texID != address now => may break CopyRenderTargetToTexture (cf. TODO up) - // tlut size can be up to 32768B (GX_TF_C14X2) but Safer == Slower. - // This trick (to change the texID depending on the TLUT addr) is a trick to get around - // an issue with metroid prime's fonts, where it has multiple sets of fonts on top of - // each other stored in a single texture, and uses the palette to make different characters - // visible or invisible. Thus, unless we want to recreate the textures for every drawn character, - // we must make sure that texture with different tluts get different IDs. - - const u64 tlutHash = GetHash64(texMem + tlutaddr, palette_size, - g_ActiveConfig.iSafeTextureCache_ColorSamples); - - texHash ^= tlutHash; - - if (g_ActiveConfig.bSafeTextureCache) - texID ^= ((u32)tlutHash) ^ (u32)(tlutHash >> 32); - } + const u32 palette_size = TexDecoder_GetPaletteSize(texformat); + tlut_hash = GetHash64(&texMem[tlutaddr], palette_size, g_ActiveConfig.iSafeTextureCache_ColorSamples); + // NOTE: For non-paletted textures, texID is equal to the texture address. + // A paletted texture, however, may have multiple texIDs assigned though depending on the currently used tlut. + // This (changing texID depending on the tlut_hash) is a trick to get around + // an issue with Metroid Prime's fonts (it has multiple sets of fonts on each other + // stored in a single texture and uses the palette to make different characters + // visible or invisible. Thus, unless we want to recreate the textures for every drawn character, + // we must make sure that a paletted texture gets assigned multiple IDs for each tlut used. + // + // TODO: Because texID isn't always the same as the address now, CopyRenderTargetToTexture might be broken now if (g_ActiveConfig.bSafeTextureCache) - hash_value = texHash; + texID ^= ((u32)tlut_hash) ^(u32)(tlut_hash >> 32); } + TCacheEntryBase *entry = textures[texID]; if (entry) { + // hires texture loading and texture dumping require accurate hashes + if (g_ActiveConfig.bSafeTextureCache || g_ActiveConfig.bHiresTextures || g_ActiveConfig.bDumpTextures) + { + texHash = GetHash64(ptr, texture_size, g_ActiveConfig.iSafeTextureCache_ColorSamples); + + if (isPaletteTexture) + texHash ^= tlut_hash; + + if (g_ActiveConfig.bSafeTextureCache) + hash_value = texHash; + } + // 1. Adjust reference hash: // safe texcache: reference hash was calculated above for normal textures. 0 for virtual EFB copies. // unsafe texcache: 0 for virtual EFB copies. Safe hash for dynamic EFB copies. First pixel for normal textures. @@ -254,7 +257,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, hash_value = GetHash64(ptr, texture_size, g_ActiveConfig.iSafeTextureCache_ColorSamples); if (isPaletteTexture) - hash_value ^= GetHash64(&texMem[tlutaddr], palette_size, g_ActiveConfig.iSafeTextureCache_ColorSamples); + hash_value ^= tlut_hash; // TODO: Ugly, this is using Safe Texture Cache parameters in nonsafe TC } } From 8c2d87f668ccc2f210bfbd379a04ced272a52d54 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 26 Dec 2011 21:37:18 +0100 Subject: [PATCH 282/381] TextureCacheBase: Move around stuff, add some TODOs --- .../Core/VideoCommon/Src/TextureCacheBase.cpp | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index 926b86b29a..e7df59275e 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -173,12 +173,9 @@ 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) { - // necessary? if (0 == address) return NULL; - u8* ptr = Memory::GetPointer(address); - // TexelSizeInNibbles(format)*width*height/16; const unsigned int bsw = TexDecoder_GetBlockWidthInTexels(texformat) - 1; const unsigned int bsh = TexDecoder_GetBlockHeightInTexels(texformat) - 1; @@ -187,20 +184,17 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, unsigned int expandedHeight = (height + bsh) & (~bsh); const unsigned int nativeW = width; const unsigned int nativeH = height; - bool isPow2; - u64 hash_value = TEXHASH_INVALID; - u64 texHash = TEXHASH_INVALID; - u64 tlut_hash = TEXHASH_INVALID; + // TODO: Force STC enabled when using custom textures or when dumping textures. There's no need for having two different texture hashes then. u32 texID = address; + u64 hash_value = TEXHASH_INVALID; // Hash assigned to texcache entry + u64 texHash = TEXHASH_INVALID; // Accurate hash used for texture dumping, hires texture lookup. Equal to hash_value with STC. + u64 tlut_hash = TEXHASH_INVALID; + u32 full_format = texformat; - const u32 texture_size = TexDecoder_GetTextureSizeInBytes(expandedWidth, expandedHeight, texformat); - bool texture_is_dynamic = false; - unsigned int texLevels; PC_TexFormat pcfmt = PC_TEX_FMT_NONE; const bool isPaletteTexture = (texformat == GX_TF_C4 || texformat == GX_TF_C8 || texformat == GX_TF_C14X2); - if (isPaletteTexture) full_format = texformat | (tlutfmt << 16); @@ -223,6 +217,11 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, } + bool texture_is_dynamic = false; + const u32 texture_size = TexDecoder_GetTextureSizeInBytes(expandedWidth, expandedHeight, texformat); + + u8* ptr = Memory::GetPointer(address); + TCacheEntryBase *entry = textures[texID]; if (entry) { @@ -318,6 +317,8 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, pcfmt = TexDecoder_Decode(temp, ptr, expandedWidth, expandedHeight, texformat, tlutaddr, tlutfmt, g_ActiveConfig.backend_info.bUseRGBATextures); + bool isPow2; + unsigned int texLevels; UseNativeMips = UseNativeMips && (width == nativeW && height == nativeH); // Only load native mips if their dimensions fit to our virtual texture dimensions isPow2 = !((width & (width - 1)) || (height & (height - 1))); texLevels = (isPow2 && UseNativeMips && maxlevel) ? @@ -333,6 +334,8 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, // Sometimes, we can get around recreating a texture if only the number of mip levels gets 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... GFX_DEBUGGER_PAUSE_AT(NEXT_NEW_TEXTURE, true); From 5239ba88c99c5516b412aa3dc408a448b2bd7eba Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 26 Dec 2011 22:04:59 +0100 Subject: [PATCH 283/381] TextureCache: Remove unsafe texture cache --- Source/Core/DolphinWX/Src/VideoConfigDiag.cpp | 14 ++-- Source/Core/DolphinWX/Src/VideoConfigDiag.h | 7 +- .../Core/VideoCommon/Src/TextureCacheBase.cpp | 64 ++++--------------- .../Core/VideoCommon/Src/TextureCacheBase.h | 3 - Source/Core/VideoCommon/Src/VideoConfig.cpp | 12 +--- Source/Core/VideoCommon/Src/VideoConfig.h | 1 - .../Plugins/Plugin_VideoDX11/Src/Render.cpp | 7 +- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 7 +- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 3 +- 9 files changed, 26 insertions(+), 92 deletions(-) diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp index 45e239a835..8e1d221c39 100644 --- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp @@ -455,18 +455,14 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con wxStaticBoxSizer* const szr_safetex = new wxStaticBoxSizer(wxHORIZONTAL, page_hacks, _("Texture Cache")); // 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, 3, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_BOTTOM); + 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); RegisterControl(stc_slider, wxGetTranslation(stc_desc)); - if (vconfig.bSafeTextureCache) - { - if (vconfig.iSafeTextureCache_ColorSamples == 0) stc_slider->SetValue(0); - else if (vconfig.iSafeTextureCache_ColorSamples == 512) stc_slider->SetValue(1); - else if (vconfig.iSafeTextureCache_ColorSamples == 128) stc_slider->SetValue(2); - else stc_slider->Disable(); // Using custom number of samples; TODO: Inform the user why this is disabled.. - } - else stc_slider->SetValue(3); + if (vconfig.iSafeTextureCache_ColorSamples == 0) stc_slider->SetValue(0); + else if (vconfig.iSafeTextureCache_ColorSamples == 512) stc_slider->SetValue(1); + else if (vconfig.iSafeTextureCache_ColorSamples == 128) stc_slider->SetValue(2); + else stc_slider->Disable(); // Using custom number of samples; TODO: Inform the user why this is disabled.. szr_safetex->Add(new wxStaticText(page_hacks, wxID_ANY, _("Accuracy:")), 0, wxALL, 5); szr_safetex->AddStretchSpacer(1); diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.h b/Source/Core/DolphinWX/Src/VideoConfigDiag.h index 5765524f03..e6b13a4092 100644 --- a/Source/Core/DolphinWX/Src/VideoConfigDiag.h +++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.h @@ -120,12 +120,7 @@ protected: void Event_Stc(wxCommandEvent &ev) { int samples[] = { 0, 512, 128 }; - if (ev.GetInt() < 3) - { - vconfig.iSafeTextureCache_ColorSamples = samples[ev.GetInt()]; - vconfig.bSafeTextureCache = true; - } - else vconfig.bSafeTextureCache = false; + vconfig.iSafeTextureCache_ColorSamples = samples[ev.GetInt()]; ev.Skip(); } diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index e7df59275e..369712bede 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -23,28 +23,19 @@ enum TextureCache *g_texture_cache; - GC_ALIGNED16(u8 *TextureCache::temp) = NULL; +GC_ALIGNED16(u8 *TextureCache::temp) = NULL; TextureCache::TexCache TextureCache::textures; bool TextureCache::DeferredInvalidate; TextureCache::TCacheEntryBase::~TCacheEntryBase() { - if (0 == addr) - return; - - if (!isRenderTarget && !g_ActiveConfig.bSafeTextureCache) - { - u32 *const ptr = (u32*)Memory::GetPointer(addr); - if (ptr && *ptr == hash) - *ptr = oldpixel; - } } TextureCache::TextureCache() { if (!temp) - temp =(u8*) AllocateAlignedMemory(TEMP_SIZE,16); + temp = (u8*)AllocateAlignedMemory(TEMP_SIZE,16); TexDecoder_SetTexFmtOverlayOptions(g_ActiveConfig.bTexFmtOverlayEnable, g_ActiveConfig.bTexFmtOverlayCenter); if(g_ActiveConfig.bHiresTextures && !g_ActiveConfig.bDumpTextures) HiresTextures::Init(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str()); @@ -198,7 +189,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, if (isPaletteTexture) full_format = texformat | (tlutfmt << 16); - if (isPaletteTexture && (g_ActiveConfig.bSafeTextureCache || g_ActiveConfig.bHiresTextures || g_ActiveConfig.bDumpTextures)) + if (isPaletteTexture) { const u32 palette_size = TexDecoder_GetPaletteSize(texformat); tlut_hash = GetHash64(&texMem[tlutaddr], palette_size, g_ActiveConfig.iSafeTextureCache_ColorSamples); @@ -212,8 +203,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, // we must make sure that a paletted texture gets assigned multiple IDs for each tlut used. // // TODO: Because texID isn't always the same as the address now, CopyRenderTargetToTexture might be broken now - if (g_ActiveConfig.bSafeTextureCache) - texID ^= ((u32)tlut_hash) ^(u32)(tlut_hash >> 32); + texID ^= ((u32)tlut_hash) ^(u32)(tlut_hash >> 32); } @@ -225,40 +215,15 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, TCacheEntryBase *entry = textures[texID]; if (entry) { - // hires texture loading and texture dumping require accurate hashes - if (g_ActiveConfig.bSafeTextureCache || g_ActiveConfig.bHiresTextures || g_ActiveConfig.bDumpTextures) - { - texHash = GetHash64(ptr, texture_size, g_ActiveConfig.iSafeTextureCache_ColorSamples); + // 1. Calculate reference hash: + // calculated from RAM texture data for normal textures. Hashes for paletted textures are modified by tlut_hash. 0 for virtual EFB copies. + hash_value = texHash = GetHash64(ptr, texture_size, g_ActiveConfig.iSafeTextureCache_ColorSamples); - if (isPaletteTexture) - texHash ^= tlut_hash; + if (isPaletteTexture) + hash_value = texHash ^= tlut_hash; - if (g_ActiveConfig.bSafeTextureCache) - hash_value = texHash; - } - - // 1. Adjust reference hash: - // safe texcache: reference hash was calculated above for normal textures. 0 for virtual EFB copies. - // unsafe texcache: 0 for virtual EFB copies. Safe hash for dynamic EFB copies. First pixel for normal textures. - if (g_ActiveConfig.bSafeTextureCache) - { - if (g_ActiveConfig.bCopyEFBToTexture && (entry->isRenderTarget || entry->isDynamic)) - hash_value = TEXHASH_INVALID; - } - else - { - if (!(entry->isRenderTarget || entry->isDynamic)) - hash_value = *(u32*)ptr; - else if (g_ActiveConfig.bCopyEFBToTexture) - hash_value = TEXHASH_INVALID; - else - { - hash_value = GetHash64(ptr, texture_size, g_ActiveConfig.iSafeTextureCache_ColorSamples); - - if (isPaletteTexture) - hash_value ^= tlut_hash; // TODO: Ugly, this is using Safe Texture Cache parameters in nonsafe TC - } - } + if (g_ActiveConfig.bCopyEFBToTexture && (entry->isRenderTarget || entry->isDynamic)) + hash_value = TEXHASH_INVALID; // 2. a) For EFB copies, only the hash and the texture address need to match if ((entry->isRenderTarget || entry->isDynamic) && hash_value == entry->hash && address == entry->addr) @@ -344,12 +309,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, entry->SetGeneralParameters(address, texture_size, full_format, entry->num_mipmaps); entry->SetDimensions(nativeW, nativeH, width, height); entry->SetEFBCopyParameters(false, texture_is_dynamic); - entry->oldpixel = *(u32*)ptr; - - if (g_ActiveConfig.bSafeTextureCache || entry->isDynamic) - entry->hash = hash_value; - else - entry->hash = *(u32*)ptr = (u32)(((double)rand() / RAND_MAX) * 0xFFFFFFFF); + entry->hash = hash_value; // load texture entry->Load(width, height, expandedWidth, 0, (texLevels == 0)); diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.h b/Source/Core/VideoCommon/Src/TextureCacheBase.h index 7b14d737d2..7bc8c01480 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.h +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.h @@ -38,9 +38,6 @@ public: // used to delete textures which haven't been used for TEXTURE_KILL_THRESHOLD frames int frameCount; - // deprecated members - u32 oldpixel; - void SetGeneralParameters(u32 addr, u32 size, u32 format, unsigned int num_mipmaps) { diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp index b6ba76f45e..5bb6e4dd99 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.cpp +++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp @@ -57,12 +57,8 @@ void VideoConfig::Load(const char *ini_file) iniFile.Get("Settings", "Crop", &bCrop, false); iniFile.Get("Settings", "UseXFB", &bUseXFB, 0); iniFile.Get("Settings", "UseRealXFB", &bUseRealXFB, 0); - iniFile.Get("Settings", "UseNativeMips", &bUseNativeMips, false); - - iniFile.Get("Settings", "SafeTextureCache", &bSafeTextureCache, true); // Settings - //Safe texture cache params + iniFile.Get("Settings", "UseNativeMips", &bUseNativeMips, false); iniFile.Get("Settings", "SafeTextureCacheColorSamples", &iSafeTextureCache_ColorSamples,128); - iniFile.Get("Settings", "ShowFPS", &bShowFPS, false); // Settings iniFile.Get("Settings", "ShowInputDisplay", &bShowInputDisplay, false); iniFile.Get("Settings", "OverlayStats", &bOverlayStats, false); @@ -134,7 +130,6 @@ void VideoConfig::GameIniLoad(const char *ini_file) iniFile.GetIfExists("Video_Settings", "UseXFB", &bUseXFB); iniFile.GetIfExists("Video_Settings", "UseRealXFB", &bUseRealXFB); iniFile.GetIfExists("Video_Settings", "UseNativeMips", &bUseNativeMips); - iniFile.GetIfExists("Video_Settings", "SafeTextureCache", &bSafeTextureCache); iniFile.GetIfExists("Video_Settings", "SafeTextureCacheColorSamples", &iSafeTextureCache_ColorSamples); iniFile.GetIfExists("Video_Settings", "DLOptimize", &iCompileDLsLevel); iniFile.GetIfExists("Video_Settings", "HiresTextures", &bHiresTextures); @@ -196,11 +191,7 @@ void VideoConfig::Save(const char *ini_file) iniFile.Set("Settings", "UseXFB", bUseXFB); iniFile.Set("Settings", "UseRealXFB", bUseRealXFB); iniFile.Set("Settings", "UseNativeMips", bUseNativeMips); - - iniFile.Set("Settings", "SafeTextureCache", bSafeTextureCache); - //safe texture cache params iniFile.Set("Settings", "SafeTextureCacheColorSamples", iSafeTextureCache_ColorSamples); - iniFile.Set("Settings", "ShowFPS", bShowFPS); iniFile.Set("Settings", "ShowInputDisplay", bShowInputDisplay); iniFile.Set("Settings", "OverlayStats", bOverlayStats); @@ -279,7 +270,6 @@ void VideoConfig::GameIniSave(const char* default_ini, const char* game_ini) SET_IF_DIFFERS("Video_Settings", "UseXFB", bUseXFB); SET_IF_DIFFERS("Video_Settings", "UseRealXFB", bUseRealXFB); SET_IF_DIFFERS("Video_Settings", "UseNativeMips", bUseNativeMips); - SET_IF_DIFFERS("Video_Settings", "SafeTextureCache", bSafeTextureCache); SET_IF_DIFFERS("Video_Settings", "SafeTextureCacheColorSamples", iSafeTextureCache_ColorSamples); SET_IF_DIFFERS("Video_Settings", "DLOptimize", iCompileDLsLevel); SET_IF_DIFFERS("Video_Settings", "HiresTextures", bHiresTextures); diff --git a/Source/Core/VideoCommon/Src/VideoConfig.h b/Source/Core/VideoCommon/Src/VideoConfig.h index 3bd833cc73..7c846676bb 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.h +++ b/Source/Core/VideoCommon/Src/VideoConfig.h @@ -129,7 +129,6 @@ struct VideoConfig bool bOSDHotKey; bool bCopyEFBToTexture; bool bCopyEFBScaled; - bool bSafeTextureCache; int iSafeTextureCache_ColorSamples; int iPhackvalue[4]; std::string sPhackvalue[2]; diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index 07fe88d2b5..9328969abf 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -1106,12 +1106,11 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons DLCache::ProgressiveCleanup(); TextureCache::Cleanup(); - // reload textures if these settings changed - if (g_Config.bSafeTextureCache != g_ActiveConfig.bSafeTextureCache || - g_Config.bUseNativeMips != g_ActiveConfig.bUseNativeMips) + // Reload textures if this settings changes + if (g_Config.bUseNativeMips != g_ActiveConfig.bUseNativeMips) TextureCache::Invalidate(false); - // Enable any configuration changes + // Enable configuration changes UpdateActiveConfig(); SetWindowSize(fbWidth, fbHeight); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index 773172b0b8..f649323b73 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -1114,12 +1114,11 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons DLCache::ProgressiveCleanup(); TextureCache::Cleanup(); - // reload textures if these settings changed - if (g_Config.bSafeTextureCache != g_ActiveConfig.bSafeTextureCache || - g_Config.bUseNativeMips != g_ActiveConfig.bUseNativeMips) + // Reload textures if these settings changed + if (g_Config.bUseNativeMips != g_ActiveConfig.bUseNativeMips) TextureCache::Invalidate(false); - // Enable any configuration changes + // Enable configuration changes UpdateActiveConfig(); SetWindowSize(fbWidth, fbHeight); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index e4c9dd8511..9883d35fbb 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -1394,8 +1394,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons g_Config.iSaveTargetId = 0; // reload textures if these settings changed - if (g_Config.bSafeTextureCache != g_ActiveConfig.bSafeTextureCache || - g_Config.bUseNativeMips != g_ActiveConfig.bUseNativeMips) + if (g_Config.bUseNativeMips != g_ActiveConfig.bUseNativeMips) TextureCache::Invalidate(false); if (g_Config.bCopyEFBToTexture != g_ActiveConfig.bCopyEFBToTexture) From 67129404dd8d6944ccc5ad1ae24ece33ae5c8bba Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 26 Dec 2011 23:14:12 +0100 Subject: [PATCH 284/381] TextureCacheBase: Small bugfix Added documentation for hybrid EFB copy stuff --- .../Core/VideoCommon/Src/TextureCacheBase.cpp | 48 +++++++++++++++---- .../Core/VideoCommon/Src/TextureCacheBase.h | 2 +- 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index 369712bede..7c78b6f937 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -189,6 +189,10 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, if (isPaletteTexture) full_format = texformat | (tlutfmt << 16); + u8* ptr = Memory::GetPointer(address); + const u32 texture_size = TexDecoder_GetTextureSizeInBytes(expandedWidth, expandedHeight, texformat); + + hash_value = texHash = GetHash64(ptr, texture_size, g_ActiveConfig.iSafeTextureCache_ColorSamples); if (isPaletteTexture) { const u32 palette_size = TexDecoder_GetPaletteSize(texformat); @@ -204,24 +208,15 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, // // TODO: Because texID isn't always the same as the address now, CopyRenderTargetToTexture might be broken now texID ^= ((u32)tlut_hash) ^(u32)(tlut_hash >> 32); + hash_value = texHash ^= tlut_hash; } - bool texture_is_dynamic = false; - const u32 texture_size = TexDecoder_GetTextureSizeInBytes(expandedWidth, expandedHeight, texformat); - - u8* ptr = Memory::GetPointer(address); - TCacheEntryBase *entry = textures[texID]; if (entry) { // 1. Calculate reference hash: // calculated from RAM texture data for normal textures. Hashes for paletted textures are modified by tlut_hash. 0 for virtual EFB copies. - hash_value = texHash = GetHash64(ptr, texture_size, g_ActiveConfig.iSafeTextureCache_ColorSamples); - - if (isPaletteTexture) - hash_value = texHash ^= tlut_hash; - if (g_ActiveConfig.bCopyEFBToTexture && (entry->isRenderTarget || entry->isDynamic)) hash_value = TEXHASH_INVALID; @@ -378,6 +373,39 @@ return_entry: void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat, unsigned int srcFormat, const EFBRectangle& srcRect, bool isIntensity, bool scaleByHalf) { + // Emulation methods: + // - EFB to RAM: + // Encodes the requested EFB data at its native resolution to the emulated RAM using shaders. + // Load() decodes the data from there again (using TextureDecoder) if the EFB copy is being used as a texture again. + // Advantage: CPU can read data from the EFB copy and we don't lose any important updates to the texture + // Disadvantage: Encoding+decoding steps often are redundant because only some games read or modify EFB copies before using them as textures. + // - EFB to texture: + // Copies the requested EFB data to a texture object in VRAM, performing any color conversion using shaders. + // Advantage: Works for many games, since in most cases EFB copies aren't read or modified at all before being used as a texture again. + // Since we don't do any further encoding or decoding here, this method is much faster. + // It also allows enhancing the visual quality by doing scaled EFB copies. + // - hybrid EFB copies: + // 1) Whenever this function gets called, encode the requested EFB data to RAM (like EFB to RAM) + // 2a) If we haven't copied to the specified dstAddr yet, copy the requested EFB data to a texture object in VRAM as well (like EFB to texture) + // Create a texture cache entry for the render target (isRenderTarget = true, isDynamic = false) + // Store a hash of the encoded RAM data in the texcache entry. + // 2b) If we already have created a texcache entry for dstAddr (i.e. if we copied to dstAddr before) AND isDynamic is false: + // Do the same like above, but reuse the old texcache entry instead of creating a new one. + // 2c) If we already have created a texcache entry for dstAddr AND isDynamic is true (isRenderTarget will be false then) + // Only encode the texture to RAM (like EFB to RAM) and store a hash of the encoded data in the existing texcache entry. + // Do NOT copy the requested EFB data to a VRAM object. Reason: the texture is dynamic, i.e. the CPU is modifying it. Storing a VRAM copy is useless, because we'd end up deleting it and reloading the data from RAM again anyway. + // 3) If the EFB copy gets used as a texture, compare the source RAM hash with the hash you stored when encoding the EFB data to RAM. + // 3a) If the two hashes match AND isDynamic is still false, reuse the VRAM copy you created + // 3b) If the two hashes differ AND isDynamic is still false, screw your existing VRAM copy. Set isRenderTarget to false and isDynamic to true. + // Redecode the source RAM data to a VRAM object. The entry basically behaves like a normal texture now. + // 3c) If isDynamic is true, treat the EFB copy like a normal texture. + // Advantage: Neither as fast as EFB to texture nor as slow as EFB to RAM, so it's a good compromise. + // Non-dynamic EFB copies can be visually enhanced like with EFB to texture. + // Compatibility ideally is as good as with EFB to RAM. + // Disadvantage: Depends on accurate texture hashing being enabled. However, with accurate hashing you end up being as slow as EFB to RAM anyway. + // + // Disadvantage of all methods: Calling this function requires the GPU to perform a pipeline flush which stalls any further CPU processing. + float colmat[28] = {0}; float *const fConstAdd = colmat + 16; float *const ColorMask = colmat + 20; diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.h b/Source/Core/VideoCommon/Src/TextureCacheBase.h index 7bc8c01480..6062e5accb 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.h +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.h @@ -33,7 +33,7 @@ public: // EFB copies bool isRenderTarget; // copied from EFB - bool isDynamic; // Used for hybrid EFB copies to enable checks for CPU modifications + bool isDynamic; // Used for hybrid EFB copies to enable checks for CPU modifications, see CopyFromRenderTarget for details // used to delete textures which haven't been used for TEXTURE_KILL_THRESHOLD frames int frameCount; From 3b38295cbd08c98e7654e8715a88f4456cd61de5 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 27 Dec 2011 00:05:26 +0100 Subject: [PATCH 285/381] TextureCacheBase: De-uglify hybrid EFB copies (documentation needs updating though) TextureCacheBase: Fixed dynamic EFB copies being set to normal textures. --- .../Core/VideoCommon/Src/TextureCacheBase.cpp | 36 ++++++++----------- .../Core/VideoCommon/Src/TextureCacheBase.h | 18 +++++----- .../Plugin_VideoDX11/Src/TextureCache.cpp | 2 +- .../Plugin_VideoDX9/Src/TextureCache.cpp | 2 +- .../Plugin_VideoOGL/Src/TextureCache.cpp | 2 +- 5 files changed, 27 insertions(+), 33 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index 7c78b6f937..9b4891b98e 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -157,7 +157,7 @@ void TextureCache::ClearRenderTargets() iter = textures.begin(), tcend = textures.end(); for (; iter!=tcend; ++iter) - iter->second->isRenderTarget = false; + iter->second->efbcopy_state = EC_NO_COPY; } TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, @@ -211,20 +211,18 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, hash_value = texHash ^= tlut_hash; } - bool texture_is_dynamic = false; TCacheEntryBase *entry = textures[texID]; if (entry) { // 1. Calculate reference hash: // calculated from RAM texture data for normal textures. Hashes for paletted textures are modified by tlut_hash. 0 for virtual EFB copies. - if (g_ActiveConfig.bCopyEFBToTexture && (entry->isRenderTarget || entry->isDynamic)) + if (g_ActiveConfig.bCopyEFBToTexture && entry->IsEfbCopy()) hash_value = TEXHASH_INVALID; // 2. a) For EFB copies, only the hash and the texture address need to match - if ((entry->isRenderTarget || entry->isDynamic) && hash_value == entry->hash && address == entry->addr) + if (entry->IsEfbCopy() && hash_value == entry->hash && address == entry->addr) { // 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()) - entry->isDynamic = false; goto return_entry; } @@ -237,13 +235,11 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, // 3. If we reach this line, we'll have to upload the new texture data to VRAM. // If we're lucky, the texture parameters didn't change and we can reuse the internal texture object instead of destroying and recreating it. - texture_is_dynamic = (entry->isRenderTarget || entry->isDynamic) && !g_ActiveConfig.bCopyEFBToTexture; - + // // 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->isRenderTarget && - ((!entry->isDynamic && width == entry->native_width && height == entry->native_height && full_format == entry->format && entry->num_mipmaps == maxlevel) - || (entry->isDynamic && entry->native_width == width && entry->native_height == height))) + if ((entry->efbcopy_state == EC_NO_COPY && width == entry->native_width && height == entry->native_height && full_format == entry->format && entry->num_mipmaps == maxlevel) + || (entry->efbcopy_state == EC_VRAM_DYNAMIC && entry->native_width == width && entry->native_height == height)) { // reuse the texture } @@ -297,14 +293,16 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, // // 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... + entry->efbcopy_state = EC_NO_COPY; GFX_DEBUGGER_PAUSE_AT(NEXT_NEW_TEXTURE, true); } entry->SetGeneralParameters(address, texture_size, full_format, entry->num_mipmaps); entry->SetDimensions(nativeW, nativeH, width, height); - entry->SetEFBCopyParameters(false, texture_is_dynamic); entry->hash = hash_value; + if (g_ActiveConfig.bCopyEFBToTexture) entry->efbcopy_state = EC_NO_COPY; + else if (entry->IsEfbCopy()) entry->efbcopy_state = EC_VRAM_DYNAMIC; // load texture entry->Load(width, height, expandedWidth, 0, (texLevels == 0)); @@ -608,15 +606,15 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat unsigned int scaled_tex_w = g_ActiveConfig.bCopyEFBScaled ? Renderer::EFBToScaledX(tex_w) : tex_w; unsigned int scaled_tex_h = g_ActiveConfig.bCopyEFBScaled ? Renderer::EFBToScaledY(tex_h) : tex_h; - bool texture_is_dynamic = false; TCacheEntryBase *entry = textures[dstAddr]; if (entry) { - if ((entry->isRenderTarget && entry->virtual_width == scaled_tex_w && entry->virtual_height == scaled_tex_h) - || (entry->isDynamic && entry->native_width == tex_w && entry->native_height == tex_h)) + if ((entry->efbcopy_state == EC_VRAM_READY && entry->virtual_width == scaled_tex_w && entry->virtual_height == scaled_tex_h) + || (entry->efbcopy_state == EC_VRAM_DYNAMIC && entry->native_width == tex_w && entry->native_height == tex_h)) { - texture_is_dynamic = entry->isDynamic; + scaled_tex_w = tex_w; + scaled_tex_h = tex_h; } else { @@ -626,12 +624,6 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat } } - if (texture_is_dynamic) - { - scaled_tex_w = tex_w; - scaled_tex_h = tex_h; - } - if (NULL == entry) { // create the texture @@ -640,8 +632,8 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat // TODO: Using the wrong dstFormat, dumb... entry->SetGeneralParameters(dstAddr, 0, dstFormat, 0); entry->SetDimensions(tex_w, tex_h, scaled_tex_w, scaled_tex_h); - entry->SetEFBCopyParameters(true, false); entry->SetHashes(TEXHASH_INVALID); + entry->efbcopy_state = EC_VRAM_READY; } entry->frameCount = frameCount; diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.h b/Source/Core/VideoCommon/Src/TextureCacheBase.h index 6062e5accb..88a76776df 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.h +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.h @@ -14,6 +14,13 @@ class TextureCache { public: + enum EFBCopyState + { + EC_NO_COPY, + EC_VRAM_READY, + EC_VRAM_DYNAMIC, + }; + struct TCacheEntryBase { #define TEXHASH_INVALID 0 @@ -32,8 +39,9 @@ public: unsigned int virtual_width, virtual_height; // Texture dimensions from OUR point of view - for hires textures or scaled EFB copies // EFB copies - bool isRenderTarget; // copied from EFB - bool isDynamic; // Used for hybrid EFB copies to enable checks for CPU modifications, see CopyFromRenderTarget for details + enum EFBCopyState efbcopy_state; + + bool IsEfbCopy() { return efbcopy_state != EC_NO_COPY; } // used to delete textures which haven't been used for TEXTURE_KILL_THRESHOLD frames int frameCount; @@ -61,12 +69,6 @@ public: //this->pal_hash = pal_hash; } - void SetEFBCopyParameters(bool is_efb_copy, bool is_dynamic) - { - isRenderTarget = is_efb_copy; - isDynamic = is_dynamic; - } - virtual ~TCacheEntryBase(); diff --git a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp index b1a5398d7d..05f0fa8629 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp @@ -102,7 +102,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo bool isIntensity, bool scaleByHalf, unsigned int cbufid, const float *colmat) { - if (!isDynamic || g_ActiveConfig.bCopyEFBToTexture) + if (efbcopy_state != EC_VRAM_DYNAMIC || g_ActiveConfig.bCopyEFBToTexture) { g_renderer->ResetAPIState(); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp index 3f12678ca4..3bbd622c66 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp @@ -78,7 +78,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo FramebufferManager::GetEFBDepthTexture() : FramebufferManager::GetEFBColorTexture(); - if (!isDynamic || g_ActiveConfig.bCopyEFBToTexture) + if (efbcopy_state != EC_VRAM_DYNAMIC || g_ActiveConfig.bCopyEFBToTexture) { LPDIRECT3DSURFACE9 Rendersurf = NULL; texture->GetSurfaceLevel(0, &Rendersurf); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp index 91cc48d7d9..cc50cdc753 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp @@ -278,7 +278,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo GL_REPORT_ERRORD(); - if (false == isDynamic || g_ActiveConfig.bCopyEFBToTexture) + if (efbcopy_state != EC_VRAM_DYNAMIC || g_ActiveConfig.bCopyEFBToTexture) { if (s_TempFramebuffer == 0) glGenFramebuffersEXT(1, (GLuint*)&s_TempFramebuffer); From a02df43e6d6b3950561c8df85851e5f24284c0fb Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Thu, 29 Dec 2011 23:48:08 +0100 Subject: [PATCH 286/381] TextureConverter (OGL/D3D9): Kill EncodeToRam because it wasn't used anywhere and it basically does the same as EncodeToRamFromTexture anyway --- .../Plugin_VideoDX9/Src/TextureConverter.cpp | 69 ------------------ .../Plugin_VideoDX9/Src/TextureConverter.h | 3 - .../Plugin_VideoOGL/Src/TextureConverter.cpp | 71 ------------------- .../Plugin_VideoOGL/Src/TextureConverter.h | 3 - 4 files changed, 146 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.cpp b/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.cpp index d14a3f29ea..e52cc4ebfb 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.cpp @@ -313,75 +313,6 @@ void EncodeToRamUsingShader(LPDIRECT3DPIXELSHADER9 shader, LPDIRECT3DTEXTURE9 sr hr = s_texConvReadSurface->UnlockRect(); } -void EncodeToRam(u32 address, bool bFromZBuffer, bool bIsIntensityFmt, u32 copyfmt, int bScaleByHalf, const EFBRectangle& source) -{ - u32 format = copyfmt; - - if (bFromZBuffer) - { - format |= _GX_TF_ZTF; - if (copyfmt == 11) - format = GX_TF_Z16; - else if (format < GX_TF_Z8 || format > GX_TF_Z24X8) - format |= _GX_TF_CTF; - } - else - if (copyfmt > GX_TF_RGBA8 || (copyfmt < GX_TF_RGB565 && !bIsIntensityFmt)) - format |= _GX_TF_CTF; - - LPDIRECT3DPIXELSHADER9 texconv_shader = GetOrCreateEncodingShader(format); - if (!texconv_shader) - return; - - u8 *dest_ptr = Memory::GetPointer(address); - - LPDIRECT3DTEXTURE9 source_texture = bFromZBuffer ? FramebufferManager::GetEFBDepthTexture() : FramebufferManager::GetEFBColorTexture(); - int width = (source.right - source.left) >> bScaleByHalf; - int height = (source.bottom - source.top) >> bScaleByHalf; - - int size_in_bytes = TexDecoder_GetTextureSizeInBytes(width, height, format); - - // Invalidate any existing texture covering this memory range. - // TODO - don't delete the texture if it already exists, just replace the contents. - TextureCache::InvalidateRange(address, size_in_bytes); - - u16 blkW = TexDecoder_GetBlockWidthInTexels(format) - 1; - u16 blkH = TexDecoder_GetBlockHeightInTexels(format) - 1; - u16 samples = TextureConversionShader::GetEncodedSampleCount(format); - - // only copy on cache line boundaries - // extra pixels are copied but not displayed in the resulting texture - s32 expandedWidth = (width + blkW) & (~blkW); - s32 expandedHeight = (height + blkH) & (~blkH); - - float sampleStride = bScaleByHalf ? 2.f : 1.f; - TextureConversionShader::SetShaderParameters( - (float)expandedWidth, - (float)Renderer::EFBToScaledY(expandedHeight), // TODO: Why do we scale this? - (float)Renderer::EFBToScaledX(source.left), - (float)Renderer::EFBToScaledY(source.top), - Renderer::EFBToScaledXf(sampleStride), - Renderer::EFBToScaledYf(sampleStride), - (float)Renderer::GetTargetWidth(), - (float)Renderer::GetTargetHeight()); - - TargetRectangle scaledSource; - scaledSource.top = 0; - scaledSource.bottom = expandedHeight; - scaledSource.left = 0; - scaledSource.right = expandedWidth / samples; - int cacheBytes = 32; - if ((format & 0x0f) == 6) - cacheBytes = 64; - - int readStride = (expandedWidth * cacheBytes) / TexDecoder_GetBlockWidthInTexels(format); - g_renderer->ResetAPIState(); - EncodeToRamUsingShader(texconv_shader, source_texture, scaledSource, dest_ptr, expandedWidth / samples, expandedHeight, readStride, true, bScaleByHalf > 0,1.0f); - D3D::dev->SetRenderTarget(0, FramebufferManager::GetEFBColorRTSurface()); - D3D::dev->SetDepthStencilSurface(FramebufferManager::GetEFBDepthRTSurface()); - g_renderer->RestoreAPIState(); -} - u64 EncodeToRamFromTexture(u32 address,LPDIRECT3DTEXTURE9 source_texture, u32 SourceW, u32 SourceH, bool bFromZBuffer, bool bIsIntensityFmt, u32 copyfmt, int bScaleByHalf, const EFBRectangle& source) { u32 format = copyfmt; diff --git a/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.h b/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.h index aa4757e4c9..ca19d864e9 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.h +++ b/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.h @@ -35,9 +35,6 @@ namespace TextureConverter void Init(); void Shutdown(); -void EncodeToRam(u32 address, bool bFromZBuffer, bool bIsIntensityFmt, - u32 copyfmt, int bScaleByHalf, const EFBRectangle& source); - void EncodeToRamYUYV(LPDIRECT3DTEXTURE9 srcTexture, const TargetRectangle& sourceRc, u8* destAddr, int dstWidth, int dstHeight,float Gamma); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp index c715775194..688c7cd5bc 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp @@ -250,77 +250,6 @@ void EncodeToRamUsingShader(FRAGMENTSHADER& shader, GLuint srcTexture, const Tar } -void EncodeToRam(u32 address, bool bFromZBuffer, bool bIsIntensityFmt, u32 copyfmt, int bScaleByHalf, const EFBRectangle& source) -{ - u32 format = copyfmt; - - if (bFromZBuffer) - { - format |= _GX_TF_ZTF; - if (copyfmt == 11) - format = GX_TF_Z16; - else if (format < GX_TF_Z8 || format > GX_TF_Z24X8) - format |= _GX_TF_CTF; - } - else - if (copyfmt > GX_TF_RGBA8 || (copyfmt < GX_TF_RGB565 && !bIsIntensityFmt)) - format |= _GX_TF_CTF; - - FRAGMENTSHADER& texconv_shader = GetOrCreateEncodingShader(format); - if (texconv_shader.glprogid == 0) - return; - - u8 *dest_ptr = Memory::GetPointer(address); - - GLuint source_texture = bFromZBuffer ? FramebufferManager::ResolveAndGetDepthTarget(source) : FramebufferManager::ResolveAndGetRenderTarget(source); - - int width = (source.right - source.left) >> bScaleByHalf; - int height = (source.bottom - source.top) >> bScaleByHalf; - - int size_in_bytes = TexDecoder_GetTextureSizeInBytes(width, height, format); - - // Invalidate any existing texture covering this memory range. - // TODO - don't delete the texture if it already exists, just replace the contents. - TextureCache::InvalidateRange(address, size_in_bytes); - - u16 blkW = TexDecoder_GetBlockWidthInTexels(format) - 1; - u16 blkH = TexDecoder_GetBlockHeightInTexels(format) - 1; - u16 samples = TextureConversionShader::GetEncodedSampleCount(format); - - // only copy on cache line boundaries - // extra pixels are copied but not displayed in the resulting texture - s32 expandedWidth = (width + blkW) & (~blkW); - s32 expandedHeight = (height + blkH) & (~blkH); - - float sampleStride = bScaleByHalf ? 2.f : 1.f; - TextureConversionShader::SetShaderParameters( - (float)expandedWidth, - (float)Renderer::EFBToScaledY(expandedHeight), // TODO: Why do we scale this? - (float)Renderer::EFBToScaledX(source.left), - (float)Renderer::EFBToScaledY(EFB_HEIGHT - source.top - expandedHeight), - Renderer::EFBToScaledXf(sampleStride), - Renderer::EFBToScaledYf(sampleStride)); - - TargetRectangle scaledSource; - scaledSource.top = 0; - scaledSource.bottom = expandedHeight; - scaledSource.left = 0; - scaledSource.right = expandedWidth / samples; - int cacheBytes = 32; - if ((format & 0x0f) == 6) - cacheBytes = 64; - - int readStride = (expandedWidth * cacheBytes) / TexDecoder_GetBlockWidthInTexels(format); - g_renderer->ResetAPIState(); - EncodeToRamUsingShader(texconv_shader, source_texture, scaledSource, dest_ptr, expandedWidth / samples, expandedHeight, readStride, true, bScaleByHalf > 0); - FramebufferManager::SetFramebuffer(0); - VertexShaderManager::SetViewportChanged(); - glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0); - TextureCache::DisableStage(0); - g_renderer->RestoreAPIState(); - GL_REPORT_ERRORD(); -} - u64 EncodeToRamFromTexture(u32 address,GLuint source_texture, bool bFromZBuffer, bool bIsIntensityFmt, u32 copyfmt, int bScaleByHalf, const EFBRectangle& source) { u32 format = copyfmt; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.h b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.h index 719ac1b7fc..7748b798c6 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.h @@ -32,9 +32,6 @@ namespace TextureConverter void Init(); void Shutdown(); -void EncodeToRam(u32 address, bool bFromZBuffer, bool bIsIntensityFmt, - u32 copyfmt, int bScaleByHalf, const EFBRectangle& source); - void EncodeToRamYUYV(GLuint srcTexture, const TargetRectangle& sourceRc, u8* destAddr, int dstWidth, int dstHeight); From cc54ee7d946da000b635beae03d998543a02d71d Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 30 Dec 2011 01:00:34 +0100 Subject: [PATCH 287/381] TextureCache: Move EFB copy cache code from TextureConverter to TextureCache --- .../Plugin_VideoDX11/Src/TextureCache.cpp | 18 +++++------ .../Plugin_VideoDX9/Src/TextureCache.cpp | 30 ++++++++++++------- .../Plugin_VideoDX9/Src/TextureConverter.cpp | 21 ++++--------- .../Plugin_VideoDX9/Src/TextureConverter.h | 3 +- .../Plugin_VideoOGL/Src/TextureCache.cpp | 12 +++++++- .../Plugin_VideoOGL/Src/TextureConverter.cpp | 15 ++-------- .../Plugin_VideoOGL/Src/TextureConverter.h | 3 +- 7 files changed, 51 insertions(+), 51 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp index 05f0fa8629..ce9bee771e 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp @@ -149,17 +149,15 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo if (!g_ActiveConfig.bCopyEFBToTexture) { u8* dst = Memory::GetPointer(dstAddr); - size_t encodeSize = g_encoder->Encode(dst, dstFormat, srcFormat, srcRect, isIntensity, scaleByHalf); - hash = GetHash64(dst, encodeSize, g_ActiveConfig.iSafeTextureCache_ColorSamples); - if (g_ActiveConfig.bEFBCopyCacheEnable) - { - // If the texture in RAM is already in the texture cache, - // do not copy it again as it has not changed. - if (TextureCache::Find(dstAddr, hash)) - return; - } + size_t encoded_size = g_encoder->Encode(dst, dstFormat, srcFormat, srcRect, isIntensity, scaleByHalf); - TextureCache::MakeRangeDynamic(dstAddr, encodeSize); + hash = GetHash64(dst, (int)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, (u32)encoded_size); + else if (!TextureCache::Find(addr, hash)) + TextureCache::MakeRangeDynamic(addr, (u32)encoded_size); } } diff --git a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp index 3bbd622c66..bc84857795 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp @@ -21,6 +21,7 @@ #include "Statistics.h" #include "MemoryUtil.h" #include "Hash.h" +#include "HW/Memmap.h" #include "CommonPaths.h" #include "FileUtil.h" @@ -143,16 +144,25 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo if (!g_ActiveConfig.bCopyEFBToTexture) { - hash = TextureConverter::EncodeToRamFromTexture( - addr, - read_texture, - Renderer::GetTargetWidth(), - Renderer::GetTargetHeight(), - srcFormat == PIXELFMT_Z24, - isIntensity, - dstFormat, - scaleByHalf, - srcRect); + int encoded_size = TextureConverter::EncodeToRamFromTexture( + addr, + read_texture, + Renderer::GetTargetWidth(), + Renderer::GetTargetHeight(), + srcFormat == PIXELFMT_Z24, + isIntensity, + dstFormat, + scaleByHalf, + srcRect); + + u8* dst = Memory::GetPointer(addr); + 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)) + TextureCache::MakeRangeDynamic(addr,encoded_size); } D3D::RefreshSamplerState(0, D3DSAMP_MINFILTER); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.cpp b/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.cpp index e52cc4ebfb..7c38b154b9 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.cpp @@ -252,10 +252,10 @@ void EncodeToRamUsingShader(LPDIRECT3DPIXELSHADER9 shader, LPDIRECT3DTEXTURE9 sr s_texConvReadSurface = TrnBuffers[index].ReadSurface; Rendersurf = TrnBuffers[index].RenderSurface; - + hr = D3D::dev->SetDepthStencilSurface(NULL); hr = D3D::dev->SetRenderTarget(0, Rendersurf); - + if (linearFilter) { D3D::ChangeSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR); @@ -290,7 +290,7 @@ void EncodeToRamUsingShader(LPDIRECT3DPIXELSHADER9 shader, LPDIRECT3DTEXTURE9 sr D3D::RefreshSamplerState(0, D3DSAMP_MINFILTER); // .. and then read back the results. // TODO: make this less slow. - + hr = D3D::dev->GetRenderTargetData(Rendersurf,s_texConvReadSurface); D3DLOCKED_RECT drect; @@ -313,7 +313,7 @@ void EncodeToRamUsingShader(LPDIRECT3DPIXELSHADER9 shader, LPDIRECT3DTEXTURE9 sr hr = s_texConvReadSurface->UnlockRect(); } -u64 EncodeToRamFromTexture(u32 address,LPDIRECT3DTEXTURE9 source_texture, u32 SourceW, u32 SourceH, bool bFromZBuffer, bool bIsIntensityFmt, u32 copyfmt, int bScaleByHalf, const EFBRectangle& source) +int EncodeToRamFromTexture(u32 address,LPDIRECT3DTEXTURE9 source_texture, u32 SourceW, u32 SourceH, bool bFromZBuffer, bool bIsIntensityFmt, u32 copyfmt, int bScaleByHalf, const EFBRectangle& source) { u32 format = copyfmt; @@ -371,16 +371,7 @@ u64 EncodeToRamFromTexture(u32 address,LPDIRECT3DTEXTURE9 source_texture, u32 So int readStride = (expandedWidth * cacheBytes) / TexDecoder_GetBlockWidthInTexels(format); EncodeToRamUsingShader(texconv_shader, source_texture, scaledSource, dest_ptr, expandedWidth / samples, expandedHeight, readStride, true, bScaleByHalf > 0,1.0f); - u64 hash = GetHash64(dest_ptr,size_in_bytes,g_ActiveConfig.iSafeTextureCache_ColorSamples); - if (g_ActiveConfig.bEFBCopyCacheEnable) - { - // If the texture in RAM is already in the texture cache, do not copy it again as it has not changed. - if (TextureCache::Find(address, hash)) - return hash; - } - - TextureCache::MakeRangeDynamic(address,size_in_bytes); - return hash; + return size_in_bytes; // TODO: D3D11 is calculating this value differently! } void EncodeToRamYUYV(LPDIRECT3DTEXTURE9 srcTexture, const TargetRectangle& sourceRc, u8* destAddr, int dstWidth, int dstHeight,float Gamma) @@ -421,7 +412,7 @@ void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, LPDIRECT3DTEXTURE destTexture->GetSurfaceLevel(0,&Rendersurf); D3D::dev->SetDepthStencilSurface(NULL); D3D::dev->SetRenderTarget(0, Rendersurf); - + D3DVIEWPORT9 vp; // Stretch picture with increased internal resolution diff --git a/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.h b/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.h index ca19d864e9..4036f21447 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.h +++ b/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.h @@ -40,7 +40,8 @@ void EncodeToRamYUYV(LPDIRECT3DTEXTURE9 srcTexture, const TargetRectangle& sourc void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, LPDIRECT3DTEXTURE9 destTexture); -u64 EncodeToRamFromTexture(u32 address,LPDIRECT3DTEXTURE9 source_texture, u32 SourceW, u32 SourceH, bool bFromZBuffer, bool bIsIntensityFmt, u32 copyfmt, int bScaleByHalf, const EFBRectangle& source); +// returns size of the encoded data (in bytes) +int EncodeToRamFromTexture(u32 address,LPDIRECT3DTEXTURE9 source_texture, u32 SourceW, u32 SourceH, bool bFromZBuffer, bool bIsIntensityFmt, u32 copyfmt, int bScaleByHalf, const EFBRectangle& source); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp index cc50cdc753..a1a7691907 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp @@ -39,6 +39,7 @@ #include "Globals.h" #include "Hash.h" #include "HiresTextures.h" +#include "HW/Memmap.h" #include "ImageWrite.h" #include "MemoryUtil.h" #include "PixelShaderCache.h" @@ -317,7 +318,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo if (false == g_ActiveConfig.bCopyEFBToTexture) { - hash = TextureConverter::EncodeToRamFromTexture( + int encoded_size = TextureConverter::EncodeToRamFromTexture( addr, read_texture, srcFormat == PIXELFMT_Z24, @@ -325,6 +326,15 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo dstFormat, scaleByHalf, srcRect); + + u8* dst = Memory::GetPointer(addr); + 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)) + TextureCache::MakeRangeDynamic(addr,encoded_size); } FramebufferManager::SetFramebuffer(0); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp index 688c7cd5bc..c73d3abdbf 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp @@ -250,7 +250,7 @@ void EncodeToRamUsingShader(FRAGMENTSHADER& shader, GLuint srcTexture, const Tar } -u64 EncodeToRamFromTexture(u32 address,GLuint source_texture, bool bFromZBuffer, bool bIsIntensityFmt, u32 copyfmt, int bScaleByHalf, const EFBRectangle& source) +int EncodeToRamFromTexture(u32 address,GLuint source_texture, bool bFromZBuffer, bool bIsIntensityFmt, u32 copyfmt, int bScaleByHalf, const EFBRectangle& source) { u32 format = copyfmt; @@ -308,19 +308,8 @@ u64 EncodeToRamFromTexture(u32 address,GLuint source_texture, bool bFromZBuffer, EncodeToRamUsingShader(texconv_shader, source_texture, scaledSource, dest_ptr, expandedWidth / samples, expandedHeight, readStride, true, bScaleByHalf > 0 && !bFromZBuffer); + return size_in_bytes; // TODO: D3D11 is calculating this value differently! - u64 hash = GetHash64(dest_ptr, size_in_bytes, - g_ActiveConfig.iSafeTextureCache_ColorSamples); - if (g_ActiveConfig.bEFBCopyCacheEnable) - { - // If the texture in RAM is already in the texture cache, - // do not copy it again as it has not changed. - if (TextureCache::Find(address, hash)) - return hash; - } - - TextureCache::MakeRangeDynamic(address,size_in_bytes); - return hash; } void EncodeToRamYUYV(GLuint srcTexture, const TargetRectangle& sourceRc, u8* destAddr, int dstWidth, int dstHeight) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.h b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.h index 7748b798c6..4113778603 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.h @@ -37,7 +37,8 @@ void EncodeToRamYUYV(GLuint srcTexture, const TargetRectangle& sourceRc, void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, GLuint destTexture); -u64 EncodeToRamFromTexture(u32 address, GLuint source_texture, bool bFromZBuffer, bool bIsIntensityFmt, u32 copyfmt, int bScaleByHalf, const EFBRectangle& source); +// returns size of the encoded data (in bytes) +int EncodeToRamFromTexture(u32 address, GLuint source_texture, bool bFromZBuffer, bool bIsIntensityFmt, u32 copyfmt, int bScaleByHalf, const EFBRectangle& source); } From 9fed10fc75d63f38f97acbfcf68d4b1ee67ebb2a Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 30 Dec 2011 01:10:42 +0100 Subject: [PATCH 288/381] Remove SaveTexture declaration in VideoCommon since it's only actually defined in OpenGL --- Source/Core/VideoCommon/Src/ImageWrite.h | 1 - 1 file changed, 1 deletion(-) diff --git a/Source/Core/VideoCommon/Src/ImageWrite.h b/Source/Core/VideoCommon/Src/ImageWrite.h index 962ee5b5e7..9ea6cab859 100644 --- a/Source/Core/VideoCommon/Src/ImageWrite.h +++ b/Source/Core/VideoCommon/Src/ImageWrite.h @@ -21,7 +21,6 @@ #include "Common.h" bool SaveTGA(const char* filename, int width, int height, void* pdata); -bool SaveTexture(const char* filename, u32 textarget, u32 tex, int width, int height); bool SaveData(const char* filename, const char* pdata); #endif // _IMAGEWRITE_H From b34b6e47f20b055e3b35f28f04e99fc6de86415b Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 24 Jan 2012 15:25:01 +0100 Subject: [PATCH 289/381] TextureCacheBase: Remove a redundant variable --- .../Core/VideoCommon/Src/TextureCacheBase.cpp | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index 9b4891b98e..6f2c9ebd0c 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -176,10 +176,8 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, const unsigned int nativeW = width; const unsigned int nativeH = height; - // TODO: Force STC enabled when using custom textures or when dumping textures. There's no need for having two different texture hashes then. u32 texID = address; - u64 hash_value = TEXHASH_INVALID; // Hash assigned to texcache entry - u64 texHash = TEXHASH_INVALID; // Accurate hash used for texture dumping, hires texture lookup. Equal to hash_value with STC. + u64 tex_hash = TEXHASH_INVALID; // Hash assigned to texcache entry (also used to generate filenames used for texture dumping and custom texture lookup) u64 tlut_hash = TEXHASH_INVALID; u32 full_format = texformat; @@ -192,7 +190,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, u8* ptr = Memory::GetPointer(address); const u32 texture_size = TexDecoder_GetTextureSizeInBytes(expandedWidth, expandedHeight, texformat); - hash_value = texHash = GetHash64(ptr, texture_size, g_ActiveConfig.iSafeTextureCache_ColorSamples); + tex_hash = GetHash64(ptr, texture_size, g_ActiveConfig.iSafeTextureCache_ColorSamples); if (isPaletteTexture) { const u32 palette_size = TexDecoder_GetPaletteSize(texformat); @@ -208,7 +206,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, // // TODO: Because texID isn't always the same as the address now, CopyRenderTargetToTexture might be broken now texID ^= ((u32)tlut_hash) ^(u32)(tlut_hash >> 32); - hash_value = texHash ^= tlut_hash; + tex_hash ^= tlut_hash; } TCacheEntryBase *entry = textures[texID]; @@ -217,17 +215,17 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, // 1. Calculate reference hash: // calculated from RAM texture data for normal textures. Hashes for paletted textures are modified by tlut_hash. 0 for virtual EFB copies. if (g_ActiveConfig.bCopyEFBToTexture && entry->IsEfbCopy()) - hash_value = TEXHASH_INVALID; + tex_hash = TEXHASH_INVALID; // 2. a) For EFB copies, only the hash and the texture address need to match - if (entry->IsEfbCopy() && hash_value == entry->hash && address == entry->addr) + if (entry->IsEfbCopy() && tex_hash == entry->hash && address == entry->addr) { // 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; } // 2. b) For normal textures, all texture parameters need to match - if (address == entry->addr && hash_value == entry->hash && full_format == entry->format && + 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; @@ -259,7 +257,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, unsigned int newWidth = width; unsigned int newHeight = height; - sprintf(texPathTemp, "%s_%08x_%i", SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str(), (u32) (texHash & 0x00000000FFFFFFFFLL), texformat); + sprintf(texPathTemp, "%s_%08x_%i", SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str(), (u32) (tex_hash & 0x00000000FFFFFFFFLL), texformat); pcfmt = HiresTextures::GetHiresTex(texPathTemp, &newWidth, &newHeight, texformat, temp); if (pcfmt != PC_TEX_FMT_NONE) @@ -300,7 +298,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, entry->SetGeneralParameters(address, texture_size, full_format, entry->num_mipmaps); entry->SetDimensions(nativeW, nativeH, width, height); - entry->hash = hash_value; + entry->hash = tex_hash; if (g_ActiveConfig.bCopyEFBToTexture) entry->efbcopy_state = EC_NO_COPY; else if (entry->IsEfbCopy()) entry->efbcopy_state = EC_VRAM_DYNAMIC; @@ -349,7 +347,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, sprintf(szTemp, "%s/%s_%08x_%i.png", szDir.c_str(), SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str(), - (u32) (texHash & 0x00000000FFFFFFFFLL), texformat); + (u32) (tex_hash & 0x00000000FFFFFFFFLL), texformat); if (false == File::Exists(szTemp)) entry->Save(szTemp); From cf899781f980ecf7dbe373a36c78a2a302e3951d Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 24 Jan 2012 16:38:27 +0100 Subject: [PATCH 290/381] TextureCacheBase: Update and improve documentation for EFB copies --- .../Core/VideoCommon/Src/TextureCacheBase.cpp | 40 +++++++++++-------- .../Core/VideoCommon/Src/TextureCacheBase.h | 6 +-- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index 6f2c9ebd0c..0a59aeefa4 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -377,30 +377,36 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat // Disadvantage: Encoding+decoding steps often are redundant because only some games read or modify EFB copies before using them as textures. // - EFB to texture: // Copies the requested EFB data to a texture object in VRAM, performing any color conversion using shaders. - // Advantage: Works for many games, since in most cases EFB copies aren't read or modified at all before being used as a texture again. + // Advantage: Works for many games, since in most cases EFB copies aren't read or modified at all before being used as a texture again. // Since we don't do any further encoding or decoding here, this method is much faster. // It also allows enhancing the visual quality by doing scaled EFB copies. // - hybrid EFB copies: - // 1) Whenever this function gets called, encode the requested EFB data to RAM (like EFB to RAM) - // 2a) If we haven't copied to the specified dstAddr yet, copy the requested EFB data to a texture object in VRAM as well (like EFB to texture) - // Create a texture cache entry for the render target (isRenderTarget = true, isDynamic = false) - // Store a hash of the encoded RAM data in the texcache entry. - // 2b) If we already have created a texcache entry for dstAddr (i.e. if we copied to dstAddr before) AND isDynamic is false: - // Do the same like above, but reuse the old texcache entry instead of creating a new one. - // 2c) If we already have created a texcache entry for dstAddr AND isDynamic is true (isRenderTarget will be false then) - // Only encode the texture to RAM (like EFB to RAM) and store a hash of the encoded data in the existing texcache entry. - // Do NOT copy the requested EFB data to a VRAM object. Reason: the texture is dynamic, i.e. the CPU is modifying it. Storing a VRAM copy is useless, because we'd end up deleting it and reloading the data from RAM again anyway. + // 1a) Whenever this function gets called, encode the requested EFB data to RAM (like EFB to RAM) + // 1b) Set efbcopy_state to EC_VRAM_DYNAMIC for all texture cache entries in the destination address range. + // If EFB copy caching is enabled, further checks will (try to) prevent redundant EFB copies. + // 2) Check if a texture cache entry for the specified dstAddr already exists (i.e. if an EFB copy was triggered to that address before): + // 2a) Entry doesn't exist: + // - Also copy the requested EFB data to a texture object in VRAM (like EFB to texture) + // - Create a texture cache entry for the target (efbcopy_state = EC_VRAM_READY) + // - Store a hash of the encoded RAM data in the texcache entry. + // 2b) Entry exists AND efbcopy_state is EC_VRAM_READY: + // - Like case 2a, but reuse the old texcache entry instead of creating a new one. + // 2c) Entry exists AND efbcopy_state is EC_VRAM_DYNAMIC: + // - Only encode the texture to RAM (like EFB to RAM) and store a hash of the encoded data in the existing texcache entry. + // - Do NOT copy the requested EFB data to a VRAM object. Reason: the texture is dynamic, i.e. the CPU is modifying it. Storing a VRAM copy is useless, because we'd always end up deleting it and reloading the data from RAM anyway. // 3) If the EFB copy gets used as a texture, compare the source RAM hash with the hash you stored when encoding the EFB data to RAM. - // 3a) If the two hashes match AND isDynamic is still false, reuse the VRAM copy you created - // 3b) If the two hashes differ AND isDynamic is still false, screw your existing VRAM copy. Set isRenderTarget to false and isDynamic to true. + // 3a) If the two hashes match AND efbcopy_state is EC_VRAM_READY, reuse the VRAM copy you created + // 3b) If the two hashes differ AND efbcopy_state is EC_VRAM_READY, screw your existing VRAM copy. Set efbcopy_state to EC_VRAM_DYNAMIC. // Redecode the source RAM data to a VRAM object. The entry basically behaves like a normal texture now. - // 3c) If isDynamic is true, treat the EFB copy like a normal texture. - // Advantage: Neither as fast as EFB to texture nor as slow as EFB to RAM, so it's a good compromise. - // Non-dynamic EFB copies can be visually enhanced like with EFB to texture. - // Compatibility ideally is as good as with EFB to RAM. - // Disadvantage: Depends on accurate texture hashing being enabled. However, with accurate hashing you end up being as slow as EFB to RAM anyway. + // 3c) If efbcopy_state is EC_VRAM_DYNAMIC, treat the EFB copy like a normal texture. + // Advantage: Non-dynamic EFB copies can be visually enhanced like with EFB to texture. + // Compatibility is as good as EFB to RAM. + // Disadvantage: Slower than EFB to texture and often even slower than EFB to RAM. + // EFB copy cache depends on accurate texture hashing being enabled. However, with accurate hashing you end up being as slow as without a copy cache anyway. // // Disadvantage of all methods: Calling this function requires the GPU to perform a pipeline flush which stalls any further CPU processing. + // + // For historical reasons, Dolphin doesn't actually implement "pure" EFB to RAM emulation, but only EFB to texture and hybrid EFB copies. float colmat[28] = {0}; float *const fConstAdd = colmat + 16; diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.h b/Source/Core/VideoCommon/Src/TextureCacheBase.h index 88a76776df..59960c7fb8 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.h +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.h @@ -16,9 +16,9 @@ class TextureCache public: enum EFBCopyState { - EC_NO_COPY, - EC_VRAM_READY, - EC_VRAM_DYNAMIC, + EC_NO_COPY, // regular texture + EC_VRAM_READY, // EFB copy sits in VRAM and is ready to use + EC_VRAM_DYNAMIC, // EFB copy sits in RAM and needs to be decoded before using it as a texture }; struct TCacheEntryBase From 1446fb33d515fc300c33afd535b22f441544b86e Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sun, 29 Jan 2012 20:24:23 +0100 Subject: [PATCH 291/381] TextureCacheBase: Replace the efbcopy_state member variable of texture cache entries with a more general "texture type" --- .../Core/VideoCommon/Src/TextureCacheBase.cpp | 32 +++++++++---------- .../Core/VideoCommon/Src/TextureCacheBase.h | 18 +++++------ .../Plugin_VideoDX11/Src/TextureCache.cpp | 2 +- .../Plugin_VideoDX9/Src/TextureCache.cpp | 2 +- .../Plugin_VideoOGL/Src/TextureCache.cpp | 2 +- 5 files changed, 27 insertions(+), 29 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index 0a59aeefa4..885116ae18 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -157,7 +157,7 @@ void TextureCache::ClearRenderTargets() iter = textures.begin(), tcend = textures.end(); for (; iter!=tcend; ++iter) - iter->second->efbcopy_state = EC_NO_COPY; + iter->second->type = TCET_AUTOFETCH; } TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, @@ -236,8 +236,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->efbcopy_state == EC_NO_COPY && width == entry->native_width && height == entry->native_height && full_format == entry->format && entry->num_mipmaps == maxlevel) - || (entry->efbcopy_state == EC_VRAM_DYNAMIC && entry->native_width == width && entry->native_height == height)) + if ((entry->type == TCET_AUTOFETCH && 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 } @@ -291,7 +291,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, // // 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... - entry->efbcopy_state = EC_NO_COPY; + entry->type = TCET_AUTOFETCH; GFX_DEBUGGER_PAUSE_AT(NEXT_NEW_TEXTURE, true); } @@ -299,8 +299,8 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, entry->SetGeneralParameters(address, texture_size, full_format, entry->num_mipmaps); entry->SetDimensions(nativeW, nativeH, width, height); entry->hash = tex_hash; - if (g_ActiveConfig.bCopyEFBToTexture) entry->efbcopy_state = EC_NO_COPY; - else if (entry->IsEfbCopy()) entry->efbcopy_state = EC_VRAM_DYNAMIC; + if (g_ActiveConfig.bCopyEFBToTexture) entry->type = TCET_AUTOFETCH; + else if (entry->IsEfbCopy()) entry->type = TCET_EC_DYNAMIC; // load texture entry->Load(width, height, expandedWidth, 0, (texLevels == 0)); @@ -382,23 +382,23 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat // It also allows enhancing the visual quality by doing scaled EFB copies. // - hybrid EFB copies: // 1a) Whenever this function gets called, encode the requested EFB data to RAM (like EFB to RAM) - // 1b) Set efbcopy_state to EC_VRAM_DYNAMIC for all texture cache entries in the destination address range. + // 1b) Set type to TCET_EC_DYNAMIC for all texture cache entries in the destination address range. // If EFB copy caching is enabled, further checks will (try to) prevent redundant EFB copies. // 2) Check if a texture cache entry for the specified dstAddr already exists (i.e. if an EFB copy was triggered to that address before): // 2a) Entry doesn't exist: // - Also copy the requested EFB data to a texture object in VRAM (like EFB to texture) - // - Create a texture cache entry for the target (efbcopy_state = EC_VRAM_READY) + // - Create a texture cache entry for the target (type = TCET_EC_VRAM) // - Store a hash of the encoded RAM data in the texcache entry. - // 2b) Entry exists AND efbcopy_state is EC_VRAM_READY: + // 2b) Entry exists AND type is TCET_EC_VRAM: // - Like case 2a, but reuse the old texcache entry instead of creating a new one. - // 2c) Entry exists AND efbcopy_state is EC_VRAM_DYNAMIC: + // 2c) Entry exists AND type is TCET_EC_DYNAMIC: // - Only encode the texture to RAM (like EFB to RAM) and store a hash of the encoded data in the existing texcache entry. // - Do NOT copy the requested EFB data to a VRAM object. Reason: the texture is dynamic, i.e. the CPU is modifying it. Storing a VRAM copy is useless, because we'd always end up deleting it and reloading the data from RAM anyway. // 3) If the EFB copy gets used as a texture, compare the source RAM hash with the hash you stored when encoding the EFB data to RAM. - // 3a) If the two hashes match AND efbcopy_state is EC_VRAM_READY, reuse the VRAM copy you created - // 3b) If the two hashes differ AND efbcopy_state is EC_VRAM_READY, screw your existing VRAM copy. Set efbcopy_state to EC_VRAM_DYNAMIC. + // 3a) If the two hashes match AND type is TCET_EC_VRAM, reuse the VRAM copy you created + // 3b) If the two hashes differ AND type is TCET_EC_VRAM, screw your existing VRAM copy. Set type to TCET_EC_DYNAMIC. // Redecode the source RAM data to a VRAM object. The entry basically behaves like a normal texture now. - // 3c) If efbcopy_state is EC_VRAM_DYNAMIC, treat the EFB copy like a normal texture. + // 3c) If type is TCET_EC_DYNAMIC, treat the EFB copy like a normal texture. // Advantage: Non-dynamic EFB copies can be visually enhanced like with EFB to texture. // Compatibility is as good as EFB to RAM. // Disadvantage: Slower than EFB to texture and often even slower than EFB to RAM. @@ -614,8 +614,8 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat TCacheEntryBase *entry = textures[dstAddr]; if (entry) { - if ((entry->efbcopy_state == EC_VRAM_READY && entry->virtual_width == scaled_tex_w && entry->virtual_height == scaled_tex_h) - || (entry->efbcopy_state == EC_VRAM_DYNAMIC && entry->native_width == tex_w && entry->native_height == tex_h)) + if ((entry->type == TCET_EC_VRAM && entry->virtual_width == scaled_tex_w && entry->virtual_height == scaled_tex_h) + || (entry->type == TCET_EC_DYNAMIC && entry->native_width == tex_w && entry->native_height == tex_h)) { scaled_tex_w = tex_w; scaled_tex_h = tex_h; @@ -637,7 +637,7 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat entry->SetGeneralParameters(dstAddr, 0, dstFormat, 0); entry->SetDimensions(tex_w, tex_h, scaled_tex_w, scaled_tex_h); entry->SetHashes(TEXHASH_INVALID); - entry->efbcopy_state = EC_VRAM_READY; + entry->type = TCET_EC_VRAM; } entry->frameCount = frameCount; diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.h b/Source/Core/VideoCommon/Src/TextureCacheBase.h index 59960c7fb8..b27663dd81 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.h +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.h @@ -14,11 +14,12 @@ class TextureCache { public: - enum EFBCopyState + enum TexCacheEntryType { - EC_NO_COPY, // regular texture - EC_VRAM_READY, // EFB copy sits in VRAM and is ready to use - EC_VRAM_DYNAMIC, // EFB copy sits in RAM and needs to be decoded before using it as a texture + TCET_AUTOFETCH, // Most textures, automatically fetched whenever they change +// TCET_PRELOADED, // Textures which reside in TMEM areas which are manually managed by the game + TCET_EC_VRAM, // EFB copy which sits in VRAM and is ready to be used + TCET_EC_DYNAMIC, // EFB copy which sits in RAM and needs to be decoded before being used }; struct TCacheEntryBase @@ -32,17 +33,12 @@ public: //u32 pal_hash; u32 format; - //bool is_preloaded; + enum TexCacheEntryType type; unsigned int num_mipmaps; unsigned int native_width, native_height; // Texture dimensions from the GameCube's point of view unsigned int virtual_width, virtual_height; // Texture dimensions from OUR point of view - for hires textures or scaled EFB copies - // EFB copies - enum EFBCopyState efbcopy_state; - - bool IsEfbCopy() { return efbcopy_state != EC_NO_COPY; } - // used to delete textures which haven't been used for TEXTURE_KILL_THRESHOLD frames int frameCount; @@ -83,6 +79,8 @@ public: const float *colmat) = 0; int IntersectsMemoryRange(u32 range_address, u32 range_size) const; + + bool IsEfbCopy() { return (type == TCET_EC_VRAM || type == TCET_EC_DYNAMIC); } }; virtual ~TextureCache(); // needs virtual for DX11 dtor diff --git a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp index ce9bee771e..e59fbd496e 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp @@ -102,7 +102,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo bool isIntensity, bool scaleByHalf, unsigned int cbufid, const float *colmat) { - if (efbcopy_state != EC_VRAM_DYNAMIC || g_ActiveConfig.bCopyEFBToTexture) + if (type != TCET_EC_DYNAMIC || g_ActiveConfig.bCopyEFBToTexture) { g_renderer->ResetAPIState(); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp index bc84857795..2a3f12ddcf 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp @@ -79,7 +79,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo FramebufferManager::GetEFBDepthTexture() : FramebufferManager::GetEFBColorTexture(); - if (efbcopy_state != EC_VRAM_DYNAMIC || g_ActiveConfig.bCopyEFBToTexture) + if (type != TCET_EC_DYNAMIC || g_ActiveConfig.bCopyEFBToTexture) { LPDIRECT3DSURFACE9 Rendersurf = NULL; texture->GetSurfaceLevel(0, &Rendersurf); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp index a1a7691907..f78eb11905 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp @@ -279,7 +279,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo GL_REPORT_ERRORD(); - if (efbcopy_state != EC_VRAM_DYNAMIC || g_ActiveConfig.bCopyEFBToTexture) + if (type != TCET_EC_DYNAMIC || g_ActiveConfig.bCopyEFBToTexture) { if (s_TempFramebuffer == 0) glGenFramebuffersEXT(1, (GLuint*)&s_TempFramebuffer); From d1605abfa98c39de0e9b9e57944f9dc864c03b42 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sun, 29 Jan 2012 21:55:07 +0100 Subject: [PATCH 292/381] Add license header for TextureCacheBase files --- Source/Core/VideoCommon/Src/TextureCacheBase.cpp | 16 ++++++++++++++++ Source/Core/VideoCommon/Src/TextureCacheBase.h | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index 885116ae18..f37e4b2dd5 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -1,3 +1,19 @@ +// 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 "MemoryUtil.h" diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.h b/Source/Core/VideoCommon/Src/TextureCacheBase.h index b27663dd81..7ae650a927 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.h +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.h @@ -1,3 +1,19 @@ +// 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 _TEXTURECACHEBASE_H #define _TEXTURECACHEBASE_H From 1f83078b5f1b00beff173510838b64be5b0434fa Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Sun, 21 Aug 2011 17:36:02 -0700 Subject: [PATCH 293/381] add some new game inis --- Data/User/GameConfig/G3LE8P.ini | 15 +++++++++++++++ Data/User/GameConfig/GP8EAF.ini | 15 +++++++++++++++ Data/User/GameConfig/JAEE01.ini | 9 +++++++++ Data/User/GameConfig/JBKP01.ini | 15 +++++++++++++++ Data/User/GameConfig/R8XE52.ini | 15 +++++++++++++++ Data/User/GameConfig/R9IE01.ini | 15 +++++++++++++++ Data/User/GameConfig/RBME5G.ini | 15 +++++++++++++++ Data/User/GameConfig/RGHE52.ini | 16 ++++++++++++++++ Data/User/GameConfig/RLBEWR.ini | 15 +++++++++++++++ Data/User/GameConfig/RS8J8N.ini | 15 +++++++++++++++ Data/User/GameConfig/SDFE4Q.ini | 15 +++++++++++++++ Data/User/GameConfig/SS3EWR.ini | 15 +++++++++++++++ Data/User/GameConfig/STEETR.ini | 15 +++++++++++++++ Data/User/GameConfig/WBME01.ini | 15 +++++++++++++++ Data/User/GameConfig/WPPJJF.ini | 15 +++++++++++++++ 15 files changed, 220 insertions(+) create mode 100644 Data/User/GameConfig/G3LE8P.ini create mode 100644 Data/User/GameConfig/GP8EAF.ini create mode 100644 Data/User/GameConfig/JAEE01.ini create mode 100644 Data/User/GameConfig/JBKP01.ini create mode 100644 Data/User/GameConfig/R8XE52.ini create mode 100644 Data/User/GameConfig/R9IE01.ini create mode 100644 Data/User/GameConfig/RBME5G.ini create mode 100644 Data/User/GameConfig/RGHE52.ini create mode 100644 Data/User/GameConfig/RLBEWR.ini create mode 100644 Data/User/GameConfig/RS8J8N.ini create mode 100644 Data/User/GameConfig/SDFE4Q.ini create mode 100644 Data/User/GameConfig/SS3EWR.ini create mode 100644 Data/User/GameConfig/STEETR.ini create mode 100644 Data/User/GameConfig/WBME01.ini create mode 100644 Data/User/GameConfig/WPPJJF.ini diff --git a/Data/User/GameConfig/G3LE8P.ini b/Data/User/GameConfig/G3LE8P.ini new file mode 100644 index 0000000000..88222a8531 --- /dev/null +++ b/Data/User/GameConfig/G3LE8P.ini @@ -0,0 +1,15 @@ +# G3LE8P - Super Monkey Ball Adventures (TM) +[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 = 0 +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/GP8EAF.ini b/Data/User/GameConfig/GP8EAF.ini new file mode 100644 index 0000000000..3a93ca340c --- /dev/null +++ b/Data/User/GameConfig/GP8EAF.ini @@ -0,0 +1,15 @@ +# GP8EAF - Pac-Man World 3 +[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 = 0 +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/JAEE01.ini b/Data/User/GameConfig/JAEE01.ini new file mode 100644 index 0000000000..136ba5f4b8 --- /dev/null +++ b/Data/User/GameConfig/JAEE01.ini @@ -0,0 +1,9 @@ +# JAEE01 - Donkey Kong Country +[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 = 0 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +[Gecko] diff --git a/Data/User/GameConfig/JBKP01.ini b/Data/User/GameConfig/JBKP01.ini new file mode 100644 index 0000000000..28a848d52d --- /dev/null +++ b/Data/User/GameConfig/JBKP01.ini @@ -0,0 +1,15 @@ +# JBKP01 - +[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 = 0 +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/R8XE52.ini b/Data/User/GameConfig/R8XE52.ini new file mode 100644 index 0000000000..d5bddaa3fb --- /dev/null +++ b/Data/User/GameConfig/R8XE52.ini @@ -0,0 +1,15 @@ +# R8XE52 - Jurassic: The Hunted +[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 = 0 +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/R9IE01.ini b/Data/User/GameConfig/R9IE01.ini new file mode 100644 index 0000000000..c35e5b3d74 --- /dev/null +++ b/Data/User/GameConfig/R9IE01.ini @@ -0,0 +1,15 @@ +# R9IE01 - PIKMIN1 for 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 = 0 +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/RBME5G.ini b/Data/User/GameConfig/RBME5G.ini new file mode 100644 index 0000000000..d19e1189ba --- /dev/null +++ b/Data/User/GameConfig/RBME5G.ini @@ -0,0 +1,15 @@ +# RBME5G - Bust-a-Move BASH! +[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 = 0 +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/RGHE52.ini b/Data/User/GameConfig/RGHE52.ini new file mode 100644 index 0000000000..19739a552b --- /dev/null +++ b/Data/User/GameConfig/RGHE52.ini @@ -0,0 +1,16 @@ +# RGHE52 - Sample Game Name +[Core] Values set here will override the main dolphin settings. +FastDiscSpeed = 0 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 0 +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/RLBEWR.ini b/Data/User/GameConfig/RLBEWR.ini new file mode 100644 index 0000000000..b935a961b3 --- /dev/null +++ b/Data/User/GameConfig/RLBEWR.ini @@ -0,0 +1,15 @@ +# RLBEWR - LEGO Batman +[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 = 0 +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/RS8J8N.ini b/Data/User/GameConfig/RS8J8N.ini new file mode 100644 index 0000000000..156babedd9 --- /dev/null +++ b/Data/User/GameConfig/RS8J8N.ini @@ -0,0 +1,15 @@ +# RS8J8N - SHANGHAI +[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 = 0 +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/SDFE4Q.ini b/Data/User/GameConfig/SDFE4Q.ini new file mode 100644 index 0000000000..70292b9974 --- /dev/null +++ b/Data/User/GameConfig/SDFE4Q.ini @@ -0,0 +1,15 @@ +# SDFE4Q - Disney Sing It: Family Hits +[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 = 0 +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/SS3EWR.ini b/Data/User/GameConfig/SS3EWR.ini new file mode 100644 index 0000000000..185bc0b34d --- /dev/null +++ b/Data/User/GameConfig/SS3EWR.ini @@ -0,0 +1,15 @@ +# SS3EWR - Elmo's A to Zoo Adventure +[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] diff --git a/Data/User/GameConfig/STEETR.ini b/Data/User/GameConfig/STEETR.ini new file mode 100644 index 0000000000..e83497c5d9 --- /dev/null +++ b/Data/User/GameConfig/STEETR.ini @@ -0,0 +1,15 @@ +# STEETR - Tetris Party Deluxe +[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 = 0 +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/WBME01.ini b/Data/User/GameConfig/WBME01.ini new file mode 100644 index 0000000000..770a1b6b9e --- /dev/null +++ b/Data/User/GameConfig/WBME01.ini @@ -0,0 +1,15 @@ +# WBME01 - My Pokémon Ranch +[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 = 0 +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/WPPJJF.ini b/Data/User/GameConfig/WPPJJF.ini new file mode 100644 index 0000000000..4ecb121356 --- /dev/null +++ b/Data/User/GameConfig/WPPJJF.ini @@ -0,0 +1,15 @@ +# WPPJJF - JM‰OÔóÝó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 = 0 +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] From 3fb42f6bb618aa70c5879806885d838e920611cf Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Sun, 21 Aug 2011 18:20:22 -0700 Subject: [PATCH 294/381] split adding the ticket to its own function (installing a wad) --- Source/Core/DiscIO/Src/NANDContentLoader.cpp | 28 ++++++++++++-------- Source/Core/DiscIO/Src/NANDContentLoader.h | 2 +- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.cpp b/Source/Core/DiscIO/Src/NANDContentLoader.cpp index c8e409636b..3e799ffd8b 100644 --- a/Source/Core/DiscIO/Src/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/Src/NANDContentLoader.cpp @@ -536,20 +536,14 @@ u64 CNANDContentManager::Install_WiiWAD(std::string &fileName) pTMDFile.Close(); + + + //Extract and copy WAD's ticket to ticket directory - std::string TicketFileName = Common::GetTicketFileName(TitleID); - - File::CreateFullPath(TicketFileName); - File::IOFile pTicketFile(TicketFileName, "wb"); - if (!pTicketFile) + if (!Add_Ticket(TitleID, ContentLoader.GetTIK(), ContentLoader.GetTIKSize())) { - PanicAlertT("WAD installation failed: error creating %s", TicketFileName.c_str()); + PanicAlertT("WAD installation failed: error creating ticket"); return 0; - } - - if (ContentLoader.GetTIK()) - { - pTicketFile.WriteBytes(ContentLoader.GetTIK(), ContentLoader.GetTIKSize()); } cUIDsys::AccessInstance().AddTitle(TitleID); @@ -558,6 +552,18 @@ u64 CNANDContentManager::Install_WiiWAD(std::string &fileName) return TitleID; } +bool Add_Ticket(u64 TitleID, const u8 *p_tik, u32 tikSize) +{ + std::string TicketFileName = Common::GetTicketFileName(TitleID); + File::CreateFullPath(TicketFileName); + File::IOFile pTicketFile(TicketFileName, "wb"); + if (!pTicketFile || !p_tik) + { + //PanicAlertT("WAD installation failed: error creating %s", TicketFileName.c_str()); + return false; + } + return pTicketFile.WriteBytes(p_tik, tikSize); +} } // namespace end diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.h b/Source/Core/DiscIO/Src/NANDContentLoader.h index 14a2062641..63135df693 100644 --- a/Source/Core/DiscIO/Src/NANDContentLoader.h +++ b/Source/Core/DiscIO/Src/NANDContentLoader.h @@ -29,7 +29,7 @@ namespace DiscIO { - + bool Add_Ticket(u64 TitleID, const u8 *p_tik, u32 tikSize); struct SNANDContent { u32 m_ContentID; From 303d1b83eb09472a3f9a635d8c3b794a6c9b0286 Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Sun, 21 Aug 2011 18:25:01 -0700 Subject: [PATCH 295/381] minor cleanup to /dev/es, fix for grabbing titleid from the disc, and es_gettitledir --- .../Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 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 83c7544734..2a33d01ed9 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 @@ -93,7 +93,7 @@ bool CWII_IPC_HLE_Device_es::Open(u32 _CommandAddress, u32 _Mode) { // blindly grab the titleID from the disc - it's unencrypted at: // offset 0x0F8001DC and 0x0F80044C - VolumeHandler::RAWReadToPtr((u8*)&m_TitleID, (u64)0x0F8001DC, 8); + VolumeHandler::GetVolume()->GetTitleID((u8*)&m_TitleID); m_TitleID = Common::swap64(m_TitleID); } else @@ -177,11 +177,11 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) u64 TitleID = Memory::Read_U64(Buffer.InBuffer[0].m_Address); - const DiscIO::INANDContentLoader& rNANDCOntent = AccessContentDevice(TitleID); + const DiscIO::INANDContentLoader& rNANDContent = AccessContentDevice(TitleID); u16 NumberOfPrivateContent = 0; - if (rNANDCOntent.IsValid()) // Not sure if dolphin will ever fail this check + if (rNANDContent.IsValid()) // Not sure if dolphin will ever fail this check { - NumberOfPrivateContent = rNANDCOntent.GetNumEntries(); + NumberOfPrivateContent = rNANDContent.GetNumEntries(); if ((u32)(TitleID>>32) == 0x00010000) Memory::Write_U32(0, Buffer.PayloadBuffer[0].m_Address); @@ -191,10 +191,10 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) Memory::Write_U32(0, _CommandAddress + 0x4); } else - Memory::Write_U32((u32)rNANDCOntent.GetContentSize(), _CommandAddress + 0x4); + Memory::Write_U32((u32)rNANDContent.GetContentSize(), _CommandAddress + 0x4); INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETTITLECONTENTSCNT: TitleID: %08x/%08x content count %i", - (u32)(TitleID>>32), (u32)TitleID, rNANDCOntent.IsValid() ? NumberOfPrivateContent : (u32)rNANDCOntent.GetContentSize()); + (u32)(TitleID>>32), (u32)TitleID, rNANDContent.IsValid() ? NumberOfPrivateContent : (u32)rNANDContent.GetContentSize()); return true; } @@ -371,7 +371,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) u64 TitleID = Memory::Read_U64(Buffer.InBuffer[0].m_Address); char* Path = (char*)Memory::GetPointer(Buffer.PayloadBuffer[0].m_Address); - sprintf(Path, "/%08x/%08x/data", (u32)(TitleID >> 32), (u32)TitleID); + sprintf(Path, "/title/%08x/%08x/data", (u32)(TitleID >> 32), (u32)TitleID); INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETTITLEDIR: %s", Path); } @@ -539,11 +539,6 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) const DiscIO::INANDContentLoader& Loader = AccessContentDevice(TitleID); - // Assert if title is not a disc title and the loader is not valid - _dbg_assert_msg_(WII_IPC_ES, ((u32)(TitleID >> 32) == 0x00010000) || - ((u32)(TitleID >> 32) == 0x00010004) || Loader.IsValid(), - "Loader not valid for TitleID %08x/%08x", (u32)(TitleID >> 32), (u32)TitleID); - u32 TMDViewCnt = 0; if (Loader.IsValid()) { @@ -675,7 +670,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) // TODO: actually use this param in when writing to the outbuffer :/ MaxCount = Memory::Read_U32(Buffer.InBuffer[1].m_Address); } - const DiscIO::INANDContentLoader& Loader = DiscIO::CNANDContentManager::Access().GetNANDLoader(TitleID); + const DiscIO::INANDContentLoader& Loader = AccessContentDevice(TitleID); INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETSTOREDTMD: title: %08x/%08x buffersize: %i", (u32)(TitleID >> 32), (u32)TitleID, MaxCount); @@ -856,7 +851,7 @@ const DiscIO::INANDContentLoader& CWII_IPC_HLE_Device_es::AccessContentDevice(u6 m_NANDContent[_TitleID] = &DiscIO::CNANDContentManager::Access().GetNANDLoader(_TitleID); - _dbg_assert_msg_(WII_IPC_ES, m_NANDContent[_TitleID]->IsValid(), "NandContent not valid for TitleID %08x/%08x", (u32)(_TitleID >> 32), (u32)_TitleID); + _dbg_assert_msg_(WII_IPC_ES, ((u32)(_TitleID >> 32) == 0x00010000) || m_NANDContent[_TitleID]->IsValid(), "NandContent not valid for TitleID %08x/%08x", (u32)(_TitleID >> 32), (u32)_TitleID); return *m_NANDContent[_TitleID]; } @@ -878,11 +873,10 @@ u32 CWII_IPC_HLE_Device_es::ES_DIVerify(u8* _pTMD, u32 _sz) { return -1; } - std::string tmdPath = Common::GetTMDFileName(tmdTitleID), - dataPath = Common::GetTitleDataPath(tmdTitleID); + std::string tmdPath = Common::GetTMDFileName(tmdTitleID); File::CreateFullPath(tmdPath); - File::CreateFullPath(dataPath); + File::CreateFullPath(Common::GetTitleDataPath(tmdTitleID)); if(!File::Exists(tmdPath)) { File::IOFile _pTMDFile(tmdPath, "wb"); From 60594c079d2412e928aff6308cfce34cd6bec07d Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Sun, 21 Aug 2011 18:27:48 -0700 Subject: [PATCH 296/381] allow just ejecting the disc by canceling the file dialog --- Source/Core/DolphinWX/Src/FrameTools.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 2ca28ce4dd..607c920906 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -678,11 +678,8 @@ void CFrame::DoOpen(bool Boot) File::SetCurrentDir(currentDir); } - if (path.IsEmpty()) - return; - // Should we boot a new game or just change the disc? - if (Boot) + if (Boot && !path.IsEmpty()) BootGame(std::string(path.mb_str())); else { From c3e46d5b454738e96d2d62ed783573fe701b5c0b Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Sun, 21 Aug 2011 18:33:21 -0700 Subject: [PATCH 297/381] partial fix for issue 4742 --- .../Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 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 c02ada362f..126f3daeb4 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 @@ -211,7 +211,9 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32 // Don't do anything if the log is unselected if (LogManager::GetInstance()->IsEnabled(LogTypes::FILEMON)) { - const char *pFilename = m_pFileSystem->GetFileName(DVDAddress); + const char *pFilename = NULL; + if (m_pFileSystem) + pFilename = m_pFileSystem->GetFileName(DVDAddress); if (pFilename != NULL) { INFO_LOG(WII_IPC_DVD, "DVDLowRead: %s (0x%llx) - (DVDAddr: 0x%llx, Size: 0x%x)", @@ -233,7 +235,7 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32 if (!VolumeHandler::ReadToPtr(Memory::GetPointer(_BufferOut), DVDAddress, Size)) { - PanicAlertT("Cant read from DVD_Plugin - DVD-Interface: Fatal Error"); + PanicAlertT("DVDLowRead - Fatal Error: failed to read from volume"); } } break; @@ -325,10 +327,9 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32 PanicAlertT("Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp."); Size = _BufferOutSize; } - - if (!VolumeHandler::RAWReadToPtr(Memory::GetPointer(_BufferOut), DVDAddress, Size)) + if(!VolumeHandler::RAWReadToPtr(Memory::GetPointer(_BufferOut), DVDAddress, Size)) { - PanicAlertT("Cant read from DVD_Plugin - DVD-Interface: Fatal Error"); + PanicAlertT("DVDLowUnencryptedRead - Fatal Error: failed to read from volume"); } } break; @@ -348,7 +349,9 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32 case DVDLowSeek: { u64 DVDAddress = Memory::Read_U32(_BufferIn + 0x4) << 2; - const char *pFilename = m_pFileSystem->GetFileName(DVDAddress); + const char *pFilename = NULL; + if (m_pFileSystem) + pFilename = m_pFileSystem->GetFileName(DVDAddress); if (pFilename != NULL) { INFO_LOG(WII_IPC_DVD, "DVDLowSeek: %s (0x%llx) - (DVDAddr: 0x%llx)", From 8e332948bff6355daaac33da013a05f8919ad084 Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Sun, 21 Aug 2011 21:09:18 -0700 Subject: [PATCH 298/381] less log noise from CNandContentLoader --- Source/Core/DiscIO/Src/NANDContentLoader.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.cpp b/Source/Core/DiscIO/Src/NANDContentLoader.cpp index 3e799ffd8b..f010b7ed98 100644 --- a/Source/Core/DiscIO/Src/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/Src/NANDContentLoader.cpp @@ -191,6 +191,8 @@ const SNANDContent* CNANDContentLoader::GetContentByIndex(int _Index) const bool CNANDContentLoader::Initialize(const std::string& _rName) { + if (_rName.empty()) + return false; m_Path = _rName; WiiWAD Wad(_rName); u8* pDataApp = NULL; @@ -221,7 +223,7 @@ bool CNANDContentLoader::Initialize(const std::string& _rName) File::IOFile pTMDFile(TMDFileName, "rb"); if (!pTMDFile) { - ERROR_LOG(DISCIO, "CreateFromDirectory: error opening %s", + DEBUG_LOG(DISCIO, "CreateFromDirectory: error opening %s", TMDFileName.c_str()); return false; } From a0d6d682434852068fca1f6411dd130ebca366bb Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Sun, 21 Aug 2011 21:10:58 -0700 Subject: [PATCH 299/381] sysconf SetArayData use the minimum of the buffersize or the dataLength --- Source/Core/Common/Src/SysConf.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Source/Core/Common/Src/SysConf.h b/Source/Core/Common/Src/SysConf.h index 119cc3c45a..fb9c775828 100644 --- a/Source/Core/Common/Src/SysConf.h +++ b/Source/Core/Common/Src/SysConf.h @@ -66,10 +66,9 @@ struct SSysConfEntry } bool SetArrayData(u8* buffer, u16 bufferSize) { - - if (buffer && bufferSize <= dataLength) + if (buffer) { - memcpy(data, buffer, bufferSize); + memcpy(data, buffer, min(bufferSize, dataLength)); return true; } return false; From a78c5f984feaac4fce6d77e9329ef3dbb17d3b22 Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Tue, 31 Jan 2012 20:31:30 -0800 Subject: [PATCH 300/381] download codes for virtualconsole titles --- Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp b/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp index e9089c6006..dccc697942 100644 --- a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp +++ b/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp @@ -151,9 +151,18 @@ void CodeConfigPanel::DownloadCodes(wxCommandEvent&) std::string gameid = m_gameid; - // WiiWare are identified by their first four characters - if (m_gameid[0] == 'W') + + switch (m_gameid[0]) + { + case 'R': + case 'S': + case 'G': + break; + default: + // All channels (WiiWare, VirtualConsole, etc) are identified by their first four characters gameid = m_gameid.substr(0, 4); + break; + } sf::Http::Request req; req.SetURI("/txt.php?txt=" + gameid); From d6de53f235a269c484f5f12f8adcc8ab9f62ef10 Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Tue, 31 Jan 2012 23:49:47 -0800 Subject: [PATCH 301/381] convert name, notes and creator to wxstring using *wxConvCurrent instead of FromAscii. fix issue 5069 --- Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp b/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp index dccc697942..cffeb25e7f 100644 --- a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp +++ b/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp @@ -78,7 +78,7 @@ void CodeConfigPanel::UpdateCodeList() gcodes_end = m_gcodes.end(); for (; gcodes_iter!=gcodes_end; ++gcodes_iter) { - m_listbox_gcodes->Append(wxString::FromAscii(gcodes_iter->name.c_str())); + m_listbox_gcodes->Append(wxString(gcodes_iter->name.c_str(), *wxConvCurrent)); if (gcodes_iter->enabled) m_listbox_gcodes->Check(m_listbox_gcodes->GetCount()-1, true); } @@ -111,7 +111,7 @@ void CodeConfigPanel::UpdateInfoBox(wxCommandEvent&) if (sel > -1) { - m_infobox.label_name->SetLabel(wxGetTranslation(wxstr_name) + wxString::FromAscii(m_gcodes[sel].name.c_str())); + m_infobox.label_name->SetLabel(wxGetTranslation(wxstr_name) + wxString(m_gcodes[sel].name.c_str(), *wxConvCurrent)); // notes textctrl m_infobox.textctrl_notes->Clear(); @@ -119,10 +119,10 @@ void CodeConfigPanel::UpdateInfoBox(wxCommandEvent&) notes_iter = m_gcodes[sel].notes.begin(), notes_end = m_gcodes[sel].notes.end(); for (; notes_iter!=notes_end; ++notes_iter) - m_infobox.textctrl_notes->AppendText(wxString::FromAscii(notes_iter->c_str())); + m_infobox.textctrl_notes->AppendText(wxString(notes_iter->c_str(), *wxConvCurrent)); m_infobox.textctrl_notes->ScrollLines(-99); // silly - m_infobox.label_creator->SetLabel(wxGetTranslation(wxstr_creator) + wxString::FromAscii(m_gcodes[sel].creator.c_str())); + m_infobox.label_creator->SetLabel(wxGetTranslation(wxstr_creator) + wxString(m_gcodes[sel].creator.c_str(), *wxConvCurrent)); // add codes to info listbox std::vector::const_iterator From 20a4735b4da47b13ee56954bb09ae5b02f944165 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Thu, 2 Feb 2012 14:02:39 +0100 Subject: [PATCH 302/381] Update some license headers. --- Source/Core/Core/Src/DSP/DSPCore.cpp | 2 +- Source/Core/Core/Src/DSP/DSPCore.h | 2 +- Source/Core/Core/Src/DSP/DSPHWInterface.cpp | 2 +- Source/Core/Core/Src/DSP/DSPHWInterface.h | 2 +- Source/Core/Core/Src/DSP/DSPIntExtOps.h | 2 +- Source/Core/Core/Src/DSP/DSPIntUtil.h | 2 +- Source/Core/Core/Src/DSP/DSPInterpreter.cpp | 2 +- Source/Core/Core/Src/DSP/DSPMemoryMap.cpp | 2 +- Source/Core/Core/Src/DSP/DSPMemoryMap.h | 2 +- Source/Core/Core/Src/DSP/DSPStacks.cpp | 2 +- Source/Core/Core/Src/DSP/DSPStacks.h | 2 +- Source/Core/Core/Src/DSP/disassemble.cpp | 2 +- Source/Core/Core/Src/DSP/disassemble.h | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Source/Core/Core/Src/DSP/DSPCore.cpp b/Source/Core/Core/Src/DSP/DSPCore.cpp index bd2b3aa8e6..972eb53858 100644 --- a/Source/Core/Core/Src/DSP/DSPCore.cpp +++ b/Source/Core/Core/Src/DSP/DSPCore.cpp @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ====================================================================*/ diff --git a/Source/Core/Core/Src/DSP/DSPCore.h b/Source/Core/Core/Src/DSP/DSPCore.h index f6a3b4e51f..34466ea4ad 100644 --- a/Source/Core/Core/Src/DSP/DSPCore.h +++ b/Source/Core/Core/Src/DSP/DSPCore.h @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ====================================================================*/ diff --git a/Source/Core/Core/Src/DSP/DSPHWInterface.cpp b/Source/Core/Core/Src/DSP/DSPHWInterface.cpp index 63cff1651f..f2cbbc2b9f 100644 --- a/Source/Core/Core/Src/DSP/DSPHWInterface.cpp +++ b/Source/Core/Core/Src/DSP/DSPHWInterface.cpp @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ====================================================================*/ diff --git a/Source/Core/Core/Src/DSP/DSPHWInterface.h b/Source/Core/Core/Src/DSP/DSPHWInterface.h index d44bc70ea7..13ea8cf7a1 100644 --- a/Source/Core/Core/Src/DSP/DSPHWInterface.h +++ b/Source/Core/Core/Src/DSP/DSPHWInterface.h @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ====================================================================*/ diff --git a/Source/Core/Core/Src/DSP/DSPIntExtOps.h b/Source/Core/Core/Src/DSP/DSPIntExtOps.h index 33420a5b76..fa6d22edba 100644 --- a/Source/Core/Core/Src/DSP/DSPIntExtOps.h +++ b/Source/Core/Core/Src/DSP/DSPIntExtOps.h @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ====================================================================*/ diff --git a/Source/Core/Core/Src/DSP/DSPIntUtil.h b/Source/Core/Core/Src/DSP/DSPIntUtil.h index 1da1c4eb21..49f8c209c2 100644 --- a/Source/Core/Core/Src/DSP/DSPIntUtil.h +++ b/Source/Core/Core/Src/DSP/DSPIntUtil.h @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ====================================================================*/ diff --git a/Source/Core/Core/Src/DSP/DSPInterpreter.cpp b/Source/Core/Core/Src/DSP/DSPInterpreter.cpp index 8c3a59dbd9..4a841b41e5 100644 --- a/Source/Core/Core/Src/DSP/DSPInterpreter.cpp +++ b/Source/Core/Core/Src/DSP/DSPInterpreter.cpp @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ====================================================================*/ diff --git a/Source/Core/Core/Src/DSP/DSPMemoryMap.cpp b/Source/Core/Core/Src/DSP/DSPMemoryMap.cpp index 408cb48465..1cbced0713 100644 --- a/Source/Core/Core/Src/DSP/DSPMemoryMap.cpp +++ b/Source/Core/Core/Src/DSP/DSPMemoryMap.cpp @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ====================================================================*/ diff --git a/Source/Core/Core/Src/DSP/DSPMemoryMap.h b/Source/Core/Core/Src/DSP/DSPMemoryMap.h index 8aa0d77647..c271537130 100644 --- a/Source/Core/Core/Src/DSP/DSPMemoryMap.h +++ b/Source/Core/Core/Src/DSP/DSPMemoryMap.h @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ====================================================================*/ diff --git a/Source/Core/Core/Src/DSP/DSPStacks.cpp b/Source/Core/Core/Src/DSP/DSPStacks.cpp index 511dd623ae..d1e70a616a 100644 --- a/Source/Core/Core/Src/DSP/DSPStacks.cpp +++ b/Source/Core/Core/Src/DSP/DSPStacks.cpp @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ====================================================================*/ diff --git a/Source/Core/Core/Src/DSP/DSPStacks.h b/Source/Core/Core/Src/DSP/DSPStacks.h index 1a5b9e872c..cb808ee8a7 100644 --- a/Source/Core/Core/Src/DSP/DSPStacks.h +++ b/Source/Core/Core/Src/DSP/DSPStacks.h @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ====================================================================*/ diff --git a/Source/Core/Core/Src/DSP/disassemble.cpp b/Source/Core/Core/Src/DSP/disassemble.cpp index 3547e7d766..99bd2811b3 100644 --- a/Source/Core/Core/Src/DSP/disassemble.cpp +++ b/Source/Core/Core/Src/DSP/disassemble.cpp @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ====================================================================*/ diff --git a/Source/Core/Core/Src/DSP/disassemble.h b/Source/Core/Core/Src/DSP/disassemble.h index dba9f36287..c9c0a304c1 100644 --- a/Source/Core/Core/Src/DSP/disassemble.h +++ b/Source/Core/Core/Src/DSP/disassemble.h @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ====================================================================*/ From dabb35afce2539b312935d2fcfe264018d24dbec Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sun, 29 Jan 2012 21:17:22 +0100 Subject: [PATCH 303/381] Prepare texture preloading support --- .../Core/Core/Src/FifoPlayer/FifoAnalyzer.cpp | 8 ++-- Source/Core/VideoCommon/Src/BPMemory.h | 41 +++++++++++++------ Source/Core/VideoCommon/Src/BPStructs.cpp | 27 ++++++++---- Source/Core/VideoCommon/Src/TextureDecoder.h | 4 +- .../Plugin_VideoSoftware/Src/BPMemLoader.cpp | 6 +-- 5 files changed, 56 insertions(+), 30 deletions(-) diff --git a/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.cpp b/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.cpp index 4b22e8f851..58ad9eded3 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.cpp +++ b/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.cpp @@ -85,14 +85,14 @@ void LoadBPReg(const BPCmd &bp, BPMemory &bpMem) void GetTlutLoadData(u32 &tlutAddr, u32 &memAddr, u32 &tlutXferCount, BPMemory &bpMem) { - tlutAddr = (bpMem.tlutXferDest & 0x3FF) << 9; - tlutXferCount = (bpMem.tlutXferDest & 0x1FFC00) >> 5; + tlutAddr = (bpMem.tmem_config.tlut_dest & 0x3FF) << 9; + tlutXferCount = (bpMem.tmem_config.tlut_dest & 0x1FFC00) >> 5; // TODO - figure out a cleaner way. if (Core::g_CoreStartupParameter.bWii) - memAddr = bpmem.tlutXferSrc << 5; + memAddr = bpmem.tmem_config.tlut_src << 5; else - memAddr = (bpmem.tlutXferSrc & 0xFFFFF) << 5; + memAddr = (bpmem.tmem_config.tlut_src & 0xFFFFF) << 5; } void LoadCPReg(u32 subCmd, u32 value, CPMemory &cpMem) diff --git a/Source/Core/VideoCommon/Src/BPMemory.h b/Source/Core/VideoCommon/Src/BPMemory.h index 1f6f453a77..0bb2bf9013 100644 --- a/Source/Core/VideoCommon/Src/BPMemory.h +++ b/Source/Core/VideoCommon/Src/BPMemory.h @@ -65,10 +65,10 @@ #define BPMEM_UNKOWN_57 0x57 #define BPMEM_REVBITS 0x58 #define BPMEM_SCISSOROFFSET 0x59 -#define BPMEM_UNKNOWN_60 0x60 -#define BPMEM_UNKNOWN_61 0x61 -#define BPMEM_UNKNOWN_62 0x62 -#define BPMEM_TEXMODESYNC 0x63 +#define BPMEM_PRELOAD_ADDR 0x60 +#define BPMEM_PRELOAD_TMEMEVEN 0x61 +#define BPMEM_PRELOAD_TMEMODD 0x62 +#define BPMEM_PRELOAD_MODE 0x63 #define BPMEM_LOADTLUT0 0x64 #define BPMEM_LOADTLUT1 0x65 #define BPMEM_TEXINVALIDATE 0x66 @@ -487,10 +487,10 @@ union TexImage1 { struct { - u32 tmem_offset : 15; // we ignore texture caching for now, we do it ourselves - u32 cache_width : 3; + u32 tmem_even : 15; // tmem line index for even LODs + u32 cache_width : 3; u32 cache_height : 3; - u32 image_type : 1; + u32 image_type : 1; // 1 if this texture is managed manually (0 means we'll autofetch the texture data whenever it changes) }; u32 hex; }; @@ -499,7 +499,7 @@ union TexImage2 { struct { - u32 tmem_offset : 15; // we ignore texture caching for now, we do it ourselves + u32 tmem_odd : 15; // tmem line index for odd LODs u32 cache_width : 3; u32 cache_height : 3; }; @@ -893,6 +893,25 @@ union UPE_Copy } }; +union BPU_PreloadTileInfo +{ + u32 hex; + struct { + u32 count : 15; + u32 type : 2; + }; +}; + +struct BPS_TmemConfig +{ + u32 preload_addr; + u32 preload_tmem_even; + u32 preload_tmem_odd; + BPU_PreloadTileInfo preload_tile_info; + u32 tlut_src; + u32 tlut_dest; + u32 texinvalidate; +}; // All of BP memory @@ -951,10 +970,8 @@ struct BPMemory u32 boundbox1;//56 u32 unknown7[2];//57,58 X10Y10 scissorOffset; //59 - u32 unknown8[10]; //5a,5b,5c,5d, 5e,5f,60,61, 62, 63 (GXTexModeSync), 0x60-0x63 have to do with preloaded textures? - u32 tlutXferSrc; //64 - u32 tlutXferDest; //65 - u32 texinvalidate;//66 + u32 unknown8[6]; //5a,5b,5c,5d, 5e,5f + BPS_TmemConfig tmem_config; // 60-66 u32 metric; //67 FieldMode fieldmode;//68 u32 unknown10[7];//69-6F diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp index d06f1de8b9..6cb102555b 100644 --- a/Source/Core/VideoCommon/Src/BPStructs.cpp +++ b/Source/Core/VideoCommon/Src/BPStructs.cpp @@ -30,6 +30,7 @@ #include "VertexLoader.h" #include "VertexShaderManager.h" #include "Thread.h" +#include "HW/Memmap.h" using namespace BPFunctions; @@ -301,14 +302,14 @@ void BPWritten(const BPCmd& bp) // TODO - figure out a cleaner way. if (GetConfig(CONFIG_ISWII)) - ptr = GetPointer(bpmem.tlutXferSrc << 5); + ptr = GetPointer(bpmem.tmem_config.tlut_src << 5); else - ptr = GetPointer((bpmem.tlutXferSrc & 0xFFFFF) << 5); + ptr = GetPointer((bpmem.tmem_config.tlut_src & 0xFFFFF) << 5); if (ptr) memcpy_gc(texMem + tlutTMemAddr, ptr, tlutXferCount); else - PanicAlert("Invalid palette pointer %08x %08x %08x", bpmem.tlutXferSrc, bpmem.tlutXferSrc << 5, (bpmem.tlutXferSrc & 0xFFFFF)<< 5); + 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); // TODO(ector) : kill all textures that use this palette // Not sure if it's a good idea, though. For now, we hash texture palettes @@ -466,14 +467,22 @@ void BPWritten(const BPCmd& bp) DEBUG_LOG(VIDEO, "Uknown BP Reg 0x57: %08x", bp.newvalue); break; - case BPMEM_UNKNOWN_60: - case BPMEM_UNKNOWN_61: - case BPMEM_UNKNOWN_62: - // Cases added due to: http://code.google.com/p/dolphin-emu/issues/detail?id=360#c90 - // Are these related to BBox? + case BPMEM_PRELOAD_ADDR: + case BPMEM_PRELOAD_TMEMEVEN: + case BPMEM_PRELOAD_TMEMODD: // Used when PRELOAD_MODE is set break; - case BPMEM_TEXMODESYNC: // Always set to 0 when GX_TexModeSync() is called. + case BPMEM_PRELOAD_MODE: // Set to 0 when GX_TexModeSync() is called. + // if this is different from 0, manual TMEM management is used. + 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) + 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; + memcpy(texMem + tmem_addr, ram_ptr, size); + } break; // ------------------------------------------------ diff --git a/Source/Core/VideoCommon/Src/TextureDecoder.h b/Source/Core/VideoCommon/Src/TextureDecoder.h index d990d21545..1901c86d27 100644 --- a/Source/Core/VideoCommon/Src/TextureDecoder.h +++ b/Source/Core/VideoCommon/Src/TextureDecoder.h @@ -20,8 +20,8 @@ #include "Hash.h" enum { - TMEM_SIZE = 1024*1024, - HALFTMEM_SIZE = 512*1024 + TMEM_SIZE = 1024*1024, + TMEM_LINE_SIZE = 32, }; extern GC_ALIGNED16(u8 texMem[TMEM_SIZE]); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp index 404424f634..95ec555181 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp @@ -101,14 +101,14 @@ void SWBPWritten(int address, int newvalue) // TODO - figure out a cleaner way. if (Core::g_CoreStartupParameter.bWii) - ptr = Memory::GetPointer(bpmem.tlutXferSrc << 5); + ptr = Memory::GetPointer(bpmem.tmem_config.tlut_src << 5); else - ptr = Memory::GetPointer((bpmem.tlutXferSrc & 0xFFFFF) << 5); + ptr = Memory::GetPointer((bpmem.tmem_config.tlut_src & 0xFFFFF) << 5); if (ptr) memcpy_gc(texMem + tlutTMemAddr, ptr, tlutXferCount); else - PanicAlert("Invalid palette pointer %08x %08x %08x", bpmem.tlutXferSrc, bpmem.tlutXferSrc << 5, (bpmem.tlutXferSrc & 0xFFFFF)<< 5); + 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; } From eb01a110c9573ae0e822eefd3cc8c58d92774588 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sun, 29 Jan 2012 21:49:50 +0100 Subject: [PATCH 304/381] Implement texture preloading --- .../Core/VideoCommon/Src/TextureCacheBase.cpp | 42 ++++++++++++------- .../Core/VideoCommon/Src/TextureCacheBase.h | 5 +-- .../Plugin_VideoDX11/Src/VertexManager.cpp | 3 +- .../Plugin_VideoDX9/Src/VertexManager.cpp | 3 +- .../Plugin_VideoOGL/Src/VertexManager.cpp | 3 +- 5 files changed, 36 insertions(+), 20 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index f37e4b2dd5..7873d1474e 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -173,12 +173,12 @@ void TextureCache::ClearRenderTargets() iter = textures.begin(), tcend = textures.end(); for (; iter!=tcend; ++iter) - iter->second->type = TCET_AUTOFETCH; + iter->second->type = TCET_NORMAL; } 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) + unsigned int tlutaddr, int tlutfmt, bool UseNativeMips, unsigned int maxlevel, bool from_tmem) { if (0 == address) return NULL; @@ -203,10 +203,12 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, if (isPaletteTexture) full_format = texformat | (tlutfmt << 16); - u8* ptr = Memory::GetPointer(address); 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); - tex_hash = GetHash64(ptr, texture_size, g_ActiveConfig.iSafeTextureCache_ColorSamples); + tex_hash = GetHash64(src_data, texture_size, g_ActiveConfig.iSafeTextureCache_ColorSamples); if (isPaletteTexture) { const u32 palette_size = TexDecoder_GetPaletteSize(texformat); @@ -225,7 +227,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, tex_hash ^= tlut_hash; } - TCacheEntryBase *entry = textures[texID]; + TCacheEntryBase *entry = textures[texID]; // TODO: Should use a different texID for preloaded textures! if (entry) { // 1. Calculate reference hash: @@ -252,7 +254,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_AUTOFETCH && 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 @@ -283,8 +285,9 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, } } + // TODO: RGBA8 textures are stored non-continuously in tmem, that might cause problems when preloading is enabled if (pcfmt == PC_TEX_FMT_NONE) - pcfmt = TexDecoder_Decode(temp, ptr, expandedWidth, + pcfmt = TexDecoder_Decode(temp, src_data, expandedWidth, expandedHeight, texformat, tlutaddr, tlutfmt, g_ActiveConfig.backend_info.bUseRGBATextures); bool isPow2; @@ -301,13 +304,13 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, 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 gets changes + // 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... - entry->type = TCET_AUTOFETCH; + entry->type = TCET_NORMAL; GFX_DEBUGGER_PAUSE_AT(NEXT_NEW_TEXTURE, true); } @@ -315,13 +318,13 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, entry->SetGeneralParameters(address, texture_size, full_format, entry->num_mipmaps); entry->SetDimensions(nativeW, nativeH, width, height); entry->hash = tex_hash; - if (g_ActiveConfig.bCopyEFBToTexture) entry->type = TCET_AUTOFETCH; + if (g_ActiveConfig.bCopyEFBToTexture) entry->type = TCET_NORMAL; else if (entry->IsEfbCopy()) entry->type = TCET_EC_DYNAMIC; // load texture entry->Load(width, height, expandedWidth, 0, (texLevels == 0)); - // load mips + // load mips - TODO: Loading mipmaps from tmem is untested! if (texLevels > 1 && pcfmt != PC_TEX_FMT_NONE) { const unsigned int bsdepth = TexDecoder_GetTexelSizeInNibbles(texformat); @@ -329,20 +332,31 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, unsigned int level = 1; unsigned int mipWidth = (width + 1) >> 1; unsigned int mipHeight = (height + 1) >> 1; - ptr += texture_size; + + u8* ptr_even = NULL, *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]; + } + src_data += texture_size; while ((mipHeight || mipWidth) && (level < texLevels)) { + u8** ptr; + if (from_tmem) ptr = (level % 2) ? &ptr_odd : &ptr_even; + else ptr = &src_data; + 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); + TexDecoder_Decode(temp, *ptr, expandedWidth, expandedHeight, texformat, tlutaddr, tlutfmt, g_ActiveConfig.backend_info.bUseRGBATextures); entry->Load(currentWidth, currentHeight, expandedWidth, level, false); - ptr += ((std::max(mipWidth, bsw) * std::max(mipHeight, bsh) * bsdepth) >> 1); + *ptr += ((std::max(mipWidth, bsw) * std::max(mipHeight, bsh) * bsdepth) >> 1); mipWidth >>= 1; mipHeight >>= 1; ++level; diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.h b/Source/Core/VideoCommon/Src/TextureCacheBase.h index 7ae650a927..2924c5871f 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.h +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.h @@ -32,8 +32,7 @@ class TextureCache public: enum TexCacheEntryType { - TCET_AUTOFETCH, // Most textures, automatically fetched whenever they change -// TCET_PRELOADED, // Textures which reside in TMEM areas which are manually managed by the game + TCET_NORMAL, TCET_EC_VRAM, // EFB copy which sits in VRAM and is ready to be used TCET_EC_DYNAMIC, // EFB copy which sits in RAM and needs to be decoded before being used }; @@ -115,7 +114,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); + int format, unsigned int tlutaddr, int tlutfmt, bool UseNativeMips, unsigned int maxlevel, bool from_tmem); static void CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat, unsigned int srcFormat, const EFBRectangle& srcRect, bool isIntensity, bool scaleByHalf); diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp index 9087b6dac1..d0f5a1c338 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp @@ -228,7 +228,8 @@ 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) && (tex.texMode0[i&3].min_filter != 8) && g_ActiveConfig.bUseNativeMips, - (tex.texMode1[i&3].max_lod >> 4)); + tex.texMode1[i&3].max_lod >> 4, + 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 c6bddb7468..c4e8225db1 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp @@ -137,7 +137,8 @@ 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) && (tex.texMode0[i&3].min_filter != 8) && g_ActiveConfig.bUseNativeMips, - (tex.texMode1[i&3].max_lod >> 4)); + tex.texMode1[i&3].max_lod >> 4, + 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 e3b55987ec..dff7f8299e 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp @@ -155,7 +155,8 @@ 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) && (tex.texMode0[i&3].min_filter != 8) && g_ActiveConfig.bUseNativeMips, - (tex.texMode1[i&3].max_lod >> 4)); + tex.texMode1[i&3].max_lod >> 4, + tex.texImage1[i&3].image_type); if (tentry) { From ea2e0e90633535112c95e999634b1bb1111a98bd Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 4 Feb 2012 13:25:04 +1100 Subject: [PATCH 305/381] Added the HID2.WPE condition to dcbz. Fixes issue 5114. --- .../Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp index b2a51b3e6f..a7955c0982 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp @@ -401,7 +401,7 @@ void Interpreter::dcbtst(UGeckoInstruction _inst) void Interpreter::dcbz(UGeckoInstruction _inst) { // HACK but works... we think - if (!HID0.DCFA) + if (HID2.WPE || !HID0.DCFA) Memory::Memset(Helper_Get_EA_X(_inst) & (~31), 0, 32); } From 439613b83352d59ebaff25d35151e25f616804b4 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 4 Feb 2012 13:01:52 +0100 Subject: [PATCH 306/381] TextureCacheBase: Remove a superfluous TODO (texture hashing takes care of that stuff) --- 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 7873d1474e..cc14499330 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -227,7 +227,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, tex_hash ^= tlut_hash; } - TCacheEntryBase *entry = textures[texID]; // TODO: Should use a different texID for preloaded textures! + TCacheEntryBase *entry = textures[texID]; if (entry) { // 1. Calculate reference hash: From c53283185da77405d893e2c302319564423214dc Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 5 Feb 2012 16:16:33 +1100 Subject: [PATCH 307/381] Added an error check for invalid contents in ES_OPENCONTENT. Fixes Jungle Speed and Doc's Punch Out. Fixes issue 3035. --- .../Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 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 2a33d01ed9..3bfeb847aa 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 @@ -254,24 +254,27 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) } break; - case IOCTL_ES_OPENCONTENT: - { - _dbg_assert_(WII_IPC_ES, Buffer.NumberInBuffer == 1); - _dbg_assert_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 0); + case IOCTL_ES_OPENCONTENT: + { + _dbg_assert_(WII_IPC_ES, Buffer.NumberInBuffer == 1); + _dbg_assert_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 0); - u32 CFD = AccessIdentID++; - u32 Index = Memory::Read_U32(Buffer.InBuffer[0].m_Address); + u32 CFD = AccessIdentID++; + u32 Index = Memory::Read_U32(Buffer.InBuffer[0].m_Address); - m_ContentAccessMap[CFD].m_Position = 0; - m_ContentAccessMap[CFD].m_pContent = AccessContentDevice(m_TitleID).GetContentByIndex(Index); - _dbg_assert_(WII_IPC_ES, m_ContentAccessMap[CFD].m_pContent != NULL); + m_ContentAccessMap[CFD].m_Position = 0; + m_ContentAccessMap[CFD].m_pContent = AccessContentDevice(m_TitleID).GetContentByIndex(Index); + _dbg_assert_(WII_IPC_ES, m_ContentAccessMap[CFD].m_pContent != NULL); - Memory::Write_U32(CFD, _CommandAddress + 0x4); + if (m_ContentAccessMap[CFD].m_pContent == NULL) + CFD = 0xffffffff; //TODO: what is the correct error value here? - INFO_LOG(WII_IPC_ES, "IOCTL_ES_OPENCONTENT: Index %i -> got CFD %x", Index, CFD); - return true; - } - break; + Memory::Write_U32(CFD, _CommandAddress + 0x4); + + INFO_LOG(WII_IPC_ES, "IOCTL_ES_OPENCONTENT: Index %i -> got CFD %x", Index, CFD); + return true; + } + break; case IOCTL_ES_READCONTENT: { From 8f83a89416c6e13f23af19c5b329acbd271ef596 Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 5 Feb 2012 17:18:11 +1100 Subject: [PATCH 308/381] Removed the busy-wait from DSP LLE on thread. Reduces the CPU usage in this scenario by around a third. --- Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp index 7ee5f68001..a795b4966d 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp @@ -49,6 +49,9 @@ DSPLLE::DSPLLE() { m_cycle_count = 0; } +Common::Event dspEvent; +Common::Event ppcEvent; + void DSPLLE::DoState(PointerWrap &p) { p.Do(g_dsp.r); @@ -96,7 +99,10 @@ void DSPLLE::dsp_thread(DSPLLE *dsp_lle) Common::AtomicStore(dsp_lle->m_cycle_count, 0); } else - Common::YieldCPU(); + { + ppcEvent.Set(); + dspEvent.Wait(); + } } } @@ -138,6 +144,8 @@ void DSPLLE::DSP_StopSoundStream() m_bIsRunning = false; if (m_bDSPThread) { + ppcEvent.Set(); + dspEvent.Set(); m_hDSPThread.join(); } } @@ -274,9 +282,10 @@ void DSPLLE::DSP_Update(int cycles) else { // Wait for dsp thread to complete its cycle. Note: this logic should be thought through. - while (m_cycle_count != 0) - ; + ppcEvent.Wait(); Common::AtomicStore(m_cycle_count, dsp_cycles); + dspEvent.Set(); + } } From 25eae39b7c6af2bfdbec1c64310b56affa7b923e Mon Sep 17 00:00:00 2001 From: skidau Date: Mon, 6 Feb 2012 20:51:24 +1100 Subject: [PATCH 309/381] Rearranged the SSE detection. Patch by lordlyhobo. Fixes issue 5172. --- Source/Core/Common/Src/Common.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h index f08a4d1bfe..db889f7ddf 100644 --- a/Source/Core/Common/Src/Common.h +++ b/Source/Core/Common/Src/Common.h @@ -139,14 +139,18 @@ private: // wxWidgets does not have a true dummy macro for this. #define _trans(a) a -#if defined __APPLE__ && defined __i386__ -#define _M_SSE 0x300 -#elif defined __APPLE__ && defined __x86_64__ -#define _M_SSE 0x301 -#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) -#define _M_SSE 0x301 +#if defined __GNUC__ +# if defined __SSE4_2__ +# define _M_SSE 0x402 +# elif defined __SSE4_1__ +# define _M_SSE 0x401 +# elif defined __SSSE3__ +# define _M_SSE 0x301 +# elif defined __SSE3__ +# 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. From c9dfcf8cf7d500d58cd8f2b375be123f5b99bb52 Mon Sep 17 00:00:00 2001 From: Andrew de los Reyes Date: Fri, 3 Feb 2012 21:46:10 -0800 Subject: [PATCH 310/381] Add Support for Wii Motion Plus INSIDE Wii Remotes on Mac OS X. This patch makes a few changes necessary for support for the new Wii Remotes: - For all OSes: - Adds a new bool member variable m_motion_plus_inside to identify the new Wii Remotes. - If we have a new Wii Remote, use a head byte of 0xa2. We could just change this behavior for all Wii Remotes, but an existing comment suggests that would break 3rd party Wii Remotes. - On Mac OS X: - Expand the search criteria for the bluetooth scan. This is necessary because the new Wii Remote identifies with minor class kBluetoothDeviceClassMinorPeripheral2Gamepad, but the old Wii Remotes use minor class kBluetoothDeviceClassMinorPeripheral2Joystick (1). - Send commands on the interrupt channel, not the control channel. The new Wii Remotes require this; old ones are compatible with this. Note: 3rd party Wii Remots are untested with this change; the hope is they are still functional. - Get the name of the bluetooth device and see if it ends in "-TR". If so, set a member variable so we know it's the new kind of Wii Remote. This should fix issue 5011 for Mac OS X: http://code.google.com/p/dolphin-emu/issues/detail?id=5011 --- Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm | 8 ++++++-- Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 10 ++++++---- Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h | 1 + 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm index 0c2f742987..a899dac201 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm @@ -129,7 +129,7 @@ int FindWiimotes(Wiimote **wm, int max_wiimotes) [bti setInquiryLength: 5]; [bti setSearchCriteria: kBluetoothServiceClassMajorAny majorDeviceClass: kBluetoothDeviceClassMajorPeripheral - minorDeviceClass: kBluetoothDeviceClassMinorPeripheral2Joystick + minorDeviceClass: kBluetoothDeviceClassMinorAny ]; [bti setUpdateNewDeviceNames: NO]; @@ -177,6 +177,10 @@ bool Wiimote::Connect() if (IsConnected()) return false; + if ([btd remoteNameRequest:nil] == kIOReturnSuccess) + m_motion_plus_inside = + static_cast([[btd getName] hasSuffix:@"-TR"]); + [btd openL2CAPChannelSync: &cchan withPSM: kBluetoothL2CAPPSMHIDControl delegate: cbt]; [btd openL2CAPChannelSync: &ichan @@ -244,7 +248,7 @@ int Wiimote::IOWrite(unsigned char *buf, int len) if (!IsConnected()) return 0; - ret = [cchan writeAsync: buf length: len refcon: nil]; + ret = [ichan writeAsync: buf length: len refcon: nil]; if (ret == kIOReturnSuccess) return len; diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index f5ded4125d..1ac0823ebb 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -50,6 +50,7 @@ Wiimote::Wiimote(const unsigned int _index) #endif , leds(0), m_last_data_report(Report((u8 *)NULL, 0)) , m_channel(0), m_connected(false) + , m_motion_plus_inside(false) { #if defined(__linux__) && HAVE_BLUEZ bdaddr = (bdaddr_t){{0, 0, 0, 0, 0, 0}}; @@ -142,15 +143,16 @@ void Wiimote::InterruptChannel(const u16 channel, const void* const data, const rpt.second = (u8)size; memcpy(rpt.first, (u8*)data, size); - // Convert output DATA packets to SET_REPORT packets. - // Nintendo Wiimotes work without this translation, but 3rd + // Convert output DATA packets to SET_REPORT packets for non-TR + // Wiimotes. Nintendo Wiimotes work without this translation, but 3rd // party ones don't. + u8 head = m_motion_plus_inside ? 0xa2 : 0x52; if (rpt.first[0] == 0xa2) { - rpt.first[0] = 0x52; + rpt.first[0] = head; } - if (rpt.first[0] == 0x52 && rpt.first[1] == 0x18 && rpt.second == 23) + if (rpt.first[0] == head && rpt.first[1] == 0x18 && rpt.second == 23) { m_audio_reports.Push(rpt); return; diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h index f3c5b884f8..8229abee52 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h @@ -95,6 +95,7 @@ private: void ThreadFunc(); bool m_connected; + bool m_motion_plus_inside; std::thread m_wiimote_thread; Common::FifoQueue m_read_reports; Common::FifoQueue m_write_reports; From fc3eb7c6a7e2ea6d636889f49d72ba0d2ac45bcd Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Thu, 9 Feb 2012 17:18:46 +1300 Subject: [PATCH 311/381] Fixed a few warnings. --- Source/Plugins/Plugin_VideoDX11/Src/Render.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index 9328969abf..69f0d0215a 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -695,15 +695,18 @@ void Renderer::UpdateViewport(Matrix44& vpCorrection) int Ht = intendedHt; if (Y + Ht > GetTargetHeight()) Ht = GetTargetHeight() - Y; - + // 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); // Some games set invalids values for z min and z max so fix them to the max an min alowed and let the shaders do this work - D3D11_VIEWPORT vp = CD3D11_VIEWPORT(X, Y, Wd, Ht, + D3D11_VIEWPORT vp = CD3D11_VIEWPORT((float)X, (float)Y, + (float)Wd, (float)Ht, 0.f, // (xfregs.viewport.farZ - xfregs.viewport.zRange) / 16777216.0f; 1.f); // xfregs.viewport.farZ / 16777216.0f; D3D::context->RSSetViewports(1, &vp); From cbab8329076320f27e7286b436fef9f4a3296f57 Mon Sep 17 00:00:00 2001 From: parlane Date: Wed, 15 Feb 2012 20:52:03 +0000 Subject: [PATCH 312/381] Updated English translation, fixes issue 5214. --- Languages/po/en.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Languages/po/en.po b/Languages/po/en.po index f08b1e1cdf..cf04ba0512 100644 --- a/Languages/po/en.po +++ b/Languages/po/en.po @@ -4588,7 +4588,7 @@ msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 From bea635d1d5690c96030e576d70375fb01315b45d Mon Sep 17 00:00:00 2001 From: parlane Date: Wed, 15 Feb 2012 20:56:50 +0000 Subject: [PATCH 313/381] Fixes issue 5214 for real! --- 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 8e1d221c39..75252cdc67 100644 --- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp @@ -95,7 +95,7 @@ wxString efb_emulate_format_changes_desc = wxTRANSLATE("Ignore any changes to th wxString efb_copy_desc = wxTRANSLATE("Disable emulation of EFB copies.\nThese 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\nIf unsure, leave this unchecked."); wxString efb_copy_texture_desc = wxTRANSLATE("Store EFB copies in GPU texture objects.\nThis is not so accurate, but it works well enough for most games and gives a great speedup over EFB to RAM.\n\nIf unsure, leave this checked."); wxString efb_copy_ram_desc = wxTRANSLATE("Accurately emulate EFB copies.\nSome games depend on this for certain graphical effects or gameplay functionality.\n\nIf unsure, check EFB to Texture instead."); -wxString stc_desc = wxTRANSLATE("The safer you adjust this, the less likely the emulator will be missing any texture updates from RAM.\n\nIf unsure, use the second-fastest value from the right."); +wxString stc_desc = wxTRANSLATE("The safer you adjust this, the less likely the emulator will be missing any texture updates from RAM.\n\nIf unsure, use the rightmost value."); wxString wireframe_desc = wxTRANSLATE("Render the scene as a wireframe.\n\nIf unsure, leave this unchecked."); wxString disable_lighting_desc = wxTRANSLATE("Improves performance but causes lighting to disappear in most games.\n\nIf unsure, leave this unchecked."); wxString disable_textures_desc = wxTRANSLATE("Disable texturing.\n\nIf unsure, leave this unchecked."); From e58692653afda21f7593d340025c9d4328689244 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 17 Feb 2012 17:09:17 +0100 Subject: [PATCH 314/381] PixelShaderGen: Use correct texel to pixel mapping when sampling textures (D3D9 only) Fixes issue 2068. Fixes issue 5158. --- Source/Core/Common/Src/LinearDiskCache.h | 2 +- Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Source/Core/Common/Src/LinearDiskCache.h b/Source/Core/Common/Src/LinearDiskCache.h index ac10b5ef20..edc851c9ac 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 = 6969 + LINEAR_DISKCACHE_VER = 6970 }; // On disk format: diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 1726855d54..5e54b01129 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -1099,9 +1099,15 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType) void SampleTexture(char *&p, const char *destination, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType) { if (ApiType == API_D3D11) - WRITE(p, "%s=Tex%d.Sample(samp%d,%s.xy * "I_TEXDIMS"[%d].xy).%s;\n", destination, texmap,texmap, texcoords, texmap, texswap); + WRITE(p, "%s=Tex%d.Sample(samp%d, %s.xy * "I_TEXDIMS"[%d].xy).%s;\n", destination, texmap,texmap, texcoords, texmap, texswap); + else if (ApiType & API_D3D9) + { + // D3D9 uses different pixel to texel mapping, so we need to offset our base address by half a pixel. + // Read the MSDN article "Directly Mapping Texels to Pixels (Direct3D 9)" for further info. + WRITE(p, "%s=tex2D(samp%d, (%s.xy + float2(0.5f,0.5f)) * "I_TEXDIMS"[%d].xy).%s;\n", destination, texmap, texcoords, texmap, texswap); + } else - WRITE(p, "%s=tex2D(samp%d,%s.xy * "I_TEXDIMS"[%d].xy).%s;\n", destination, texmap, texcoords, texmap, texswap); + WRITE(p, "%s=tex2D(samp%d, %s.xy * "I_TEXDIMS"[%d].xy).%s;\n", destination, texmap, texcoords, texmap, texswap); } static const char *tevAlphaFuncsTable[] = From d068686a7f32b9d771baafb4d25601afe31f78dd Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 20 Feb 2012 11:51:40 +0100 Subject: [PATCH 315/381] Revert revision f7d757b46eaa271e7f58e1c61df4fb34b5ff47f9. --- .../Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp | 24 ++++++++----------- Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h | 4 ++-- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 6 ++--- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp index cfb74df225..3a4b5d0699 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp @@ -434,15 +434,13 @@ void drawShadedTexSubQuad(IDirect3DTexture9 *texture, // Fills a certain area of the current render target with the specified color // Z buffer disabled; destination coordinates normalized to (-1;1) -void drawColorQuad(int DestWidth, int DestHeight, u32 Color, float x1, float y1, float x2, float y2) +void drawColorQuad(u32 Color, float x1, float y1, float x2, float y2) { - float dw = 1.f / (float)DestWidth; - float dh = 1.f / (float)DestHeight; struct CQVertex { float x, y, z, rhw; u32 col; } coords[4] = { - { x1-dw, y2+dh, 0.f, 1.f, Color }, - { x2-dw, y2+dh, 0.f, 1.f, Color }, - { x1-dw, y1+dh, 0.f, 1.f, Color }, - { x2-dw, y1+dh, 0.f, 1.f, Color }, + { x1, y2, 0.f, 1.f, Color }, + { x2, y2, 0.f, 1.f, Color }, + { x1, y1, 0.f, 1.f, Color }, + { x2, y1, 0.f, 1.f, Color }, }; dev->SetVertexShader(VertexShaderCache::GetClearVertexShader()); dev->SetPixelShader(PixelShaderCache::GetClearProgram()); @@ -451,15 +449,13 @@ void drawColorQuad(int DestWidth, int DestHeight, u32 Color, float x1, float y1, RestoreShaders(); } -void drawClearQuad(int DestWidth, int DestHeight, u32 Color, float z, IDirect3DPixelShader9 *PShader, IDirect3DVertexShader9 *Vshader) +void drawClearQuad(u32 Color,float z,IDirect3DPixelShader9 *PShader,IDirect3DVertexShader9 *Vshader) { - float dw = 1.f / (float)DestWidth; - float dh = 1.f / (float)DestHeight; struct Q2DVertex { float x,y,z,rhw;u32 color;} coords[4] = { - {-1.0f-dw, 1.0f+dh, z, 1.0f, Color}, - { 1.0f-dw, 1.0f+dh, z, 1.0f, Color}, - { 1.0f-dw, -1.0f+dh, z, 1.0f, Color}, - {-1.0f-dw, -1.0f+dh, z, 1.0f, Color} + {-1.0f, 1.0f, z, 1.0f, Color}, + { 1.0f, 1.0f, z, 1.0f, Color}, + { 1.0f, -1.0f, z, 1.0f, Color}, + {-1.0f, -1.0f, z, 1.0f, Color} }; dev->SetVertexShader(Vshader); dev->SetPixelShader(PShader); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h index 93e60f938b..882f112ece 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h +++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h @@ -82,8 +82,8 @@ namespace D3D IDirect3DPixelShader9 *PShader, IDirect3DVertexShader9 *Vshader, float Gamma = 1.0f); - void drawClearQuad(int DestWidth, int DestHeight, u32 Color, float z, IDirect3DPixelShader9 *PShader, IDirect3DVertexShader9 *Vshader); - void drawColorQuad(int DestWidth, int DestHeight, u32 Color, float x1, float y1, float x2, float y2); + void drawClearQuad(u32 Color, float z, IDirect3DPixelShader9 *PShader, IDirect3DVertexShader9 *Vshader); + void drawColorQuad(u32 Color, float x1, float y1, float x2, float y2); void SaveRenderStates(); void RestoreRenderStates(); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index f649323b73..a5aaa6485b 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -622,7 +622,7 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) { // TODO: Speed this up by batching pokes? ResetAPIState(); - D3D::drawColorQuad(GetTargetWidth(), GetTargetHeight(), poke_data, + D3D::drawColorQuad(poke_data, (float)RectToLock.left * 2.f / (float)Renderer::GetTargetWidth() - 1.f, - (float)RectToLock.top * 2.f / (float)Renderer::GetTargetHeight() + 1.f, (float)RectToLock.right * 2.f / (float)Renderer::GetTargetWidth() - 1.f, @@ -747,7 +747,7 @@ void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaE vp.MinZ = 0.0; vp.MaxZ = 1.0; D3D::dev->SetViewport(&vp); - D3D::drawClearQuad(GetTargetWidth(), GetTargetHeight(), color, (z & 0xFFFFFF) / float(0xFFFFFF), PixelShaderCache::GetClearProgram(), VertexShaderCache::GetClearVertexShader()); + D3D::drawClearQuad(color, (z & 0xFFFFFF) / float(0xFFFFFF), PixelShaderCache::GetClearProgram(), VertexShaderCache::GetClearVertexShader()); RestoreAPIState(); } @@ -896,7 +896,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons vp.MinZ = 0.0f; vp.MaxZ = 1.0f; D3D::dev->SetViewport(&vp); - D3D::drawClearQuad(GetTargetWidth(), GetTargetHeight(), 0, 1.0, PixelShaderCache::GetClearProgram(), VertexShaderCache::GetClearVertexShader()); + D3D::drawClearQuad(0, 1.0, PixelShaderCache::GetClearProgram(), VertexShaderCache::GetClearVertexShader()); } else { From 9adc119e3c2f845c0172b012badbbc86addad4a5 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 20 Feb 2012 17:55:18 +0100 Subject: [PATCH 316/381] PixelShaderGen: For custom textures and scaled EFB copies, use correct texel to pixel mapping when sampling textures (D3D9 only) This is basically the same as revision e58692653afd, just for scaled textures and with a LOT more work... --- Source/Core/Common/Src/LinearDiskCache.h | 2 +- .../Core/VideoCommon/Src/PixelShaderGen.cpp | 5 ++- Source/Core/VideoCommon/Src/PixelShaderGen.h | 19 +++++---- .../VideoCommon/Src/PixelShaderManager.cpp | 42 ++++++++++++++++--- .../Core/VideoCommon/Src/PixelShaderManager.h | 6 ++- .../Plugin_VideoDX11/Src/VertexManager.cpp | 4 +- .../Plugin_VideoDX9/Src/VertexManager.cpp | 4 +- .../Plugin_VideoOGL/Src/VertexManager.cpp | 4 +- 8 files changed, 61 insertions(+), 25 deletions(-) diff --git a/Source/Core/Common/Src/LinearDiskCache.h b/Source/Core/Common/Src/LinearDiskCache.h index edc851c9ac..e4cb0cbd17 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 = 6970 + LINEAR_DISKCACHE_VER = 6971 }; // On disk format: diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 5e54b01129..ed504f1c82 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -560,6 +560,7 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType WRITE(p, "uniform float4 "I_KCOLORS"[4] : register(c%d);\n", C_KCOLORS); WRITE(p, "uniform float4 "I_ALPHA"[1] : register(c%d);\n", C_ALPHA); WRITE(p, "uniform float4 "I_TEXDIMS"[8] : register(c%d);\n", C_TEXDIMS); + WRITE(p, "uniform float4 "I_VTEXSCALE"[8] : register(c%d);\n", C_VTEXSCALE); WRITE(p, "uniform float4 "I_ZBIAS"[2] : register(c%d);\n", C_ZBIAS); WRITE(p, "uniform float4 "I_INDTEXSCALE"[2] : register(c%d);\n", C_INDTEXSCALE); WRITE(p, "uniform float4 "I_INDTEXMTX"[6] : register(c%d);\n", C_INDTEXMTX); @@ -1102,9 +1103,9 @@ void SampleTexture(char *&p, const char *destination, const char *texcoords, con WRITE(p, "%s=Tex%d.Sample(samp%d, %s.xy * "I_TEXDIMS"[%d].xy).%s;\n", destination, texmap,texmap, texcoords, texmap, texswap); else if (ApiType & API_D3D9) { - // D3D9 uses different pixel to texel mapping, so we need to offset our base address by half a pixel. + // D3D9 uses different pixel to texel mapping, so we need to offset our sampling address by half a pixel (assuming native and virtual texture dimensions match each other, otherwise some math is involved). // Read the MSDN article "Directly Mapping Texels to Pixels (Direct3D 9)" for further info. - WRITE(p, "%s=tex2D(samp%d, (%s.xy + float2(0.5f,0.5f)) * "I_TEXDIMS"[%d].xy).%s;\n", destination, texmap, texcoords, texmap, texswap); + WRITE(p, "%s=tex2D(samp%d, (%s.xy + 0.5f*"I_VTEXSCALE"[%d].%s) * "I_TEXDIMS"[%d].xy).%s;\n", destination, texmap, texcoords, texmap/2, (texmap&1)?"zw":"xy", texmap, texswap); } else WRITE(p, "%s=tex2D(samp%d, %s.xy * "I_TEXDIMS"[%d].xy).%s;\n", destination, texmap, texcoords, texmap, texswap); diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h index 31242a916e..7374251c96 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.h +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h @@ -24,26 +24,27 @@ #define I_KCOLORS "k" #define I_ALPHA "alphaRef" #define I_TEXDIMS "texdim" +#define I_VTEXSCALE "vtexscale" #define I_ZBIAS "czbias" #define I_INDTEXSCALE "cindscale" #define I_INDTEXMTX "cindmtx" #define I_FOG "cfog" #define I_PLIGHTS "cLights" -#define I_PMATERIALS "cmtrl" +#define I_PMATERIALS "cmtrl" #define C_COLORMATRIX 0 // 0 #define C_COLORS 0 // 0 #define C_KCOLORS (C_COLORS + 4) // 4 #define C_ALPHA (C_KCOLORS + 4) // 8 #define C_TEXDIMS (C_ALPHA + 1) // 9 -#define C_ZBIAS (C_TEXDIMS + 8) //17 -#define C_INDTEXSCALE (C_ZBIAS + 2) //19 -#define C_INDTEXMTX (C_INDTEXSCALE + 2) //21 -#define C_FOG (C_INDTEXMTX + 6) //27 - -#define C_PLIGHTS (C_FOG + 3) -#define C_PMATERIALS (C_PLIGHTS + 40) -#define C_PENVCONST_END (C_PMATERIALS + 4) +#define C_VTEXSCALE (C_TEXDIMS + 8) //17 - virtual texture scaling factor (e.g. custom textures, scaled EFB copies) +#define C_ZBIAS (C_VTEXSCALE + 4) //21 +#define C_INDTEXSCALE (C_ZBIAS + 2) //23 +#define C_INDTEXMTX (C_INDTEXSCALE + 2) //25 +#define C_FOG (C_INDTEXMTX + 6) //31 +#define C_PLIGHTS (C_FOG + 3) //34 +#define C_PMATERIALS (C_PLIGHTS + 40) //74 +#define C_PENVCONST_END (C_PMATERIALS + 4) //78 #define PIXELSHADERUID_MAX_VALUES 70 #define PIXELSHADERUID_MAX_VALUES_SAFE 120 diff --git a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp index 2521f80500..3e0f6d73c4 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp @@ -36,9 +36,11 @@ static bool s_bFogRangeAdjustChanged; static int nLightsChanged[2]; // min,max static float lastRGBAfull[2][4][4]; static u8 s_nTexDimsChanged; +static u8 s_nVirtualTexScalesChanged; static u8 s_nIndTexScaleChanged; static u32 lastAlpha; static u32 lastTexDims[8]; // width | height << 16 | wrap_s << 28 | wrap_t << 30 +static float lastVirtualTexScales[16]; // even fields: width ratio; odd fields: height ratio static u32 lastZBias; static int nMaterialsChanged; @@ -61,6 +63,7 @@ void PixelShaderManager::Init() { lastAlpha = 0; memset(lastTexDims, 0, sizeof(lastTexDims)); + memset(lastVirtualTexScales, 0, sizeof(lastVirtualTexScales)); lastZBias = 0; memset(lastRGBAfull, 0, sizeof(lastRGBAfull)); Dirty(); @@ -70,6 +73,7 @@ void PixelShaderManager::Dirty() { s_nColorsChanged[0] = s_nColorsChanged[1] = 15; s_nTexDimsChanged = 0xFF; + s_nVirtualTexScalesChanged = 0xFF; s_nIndTexScaleChanged = 0xFF; s_nIndTexMtxChanged = 15; s_bAlphaChanged = s_bZBiasChanged = s_bZTextureTypeChanged = s_bDepthRangeChanged = true; @@ -83,7 +87,7 @@ void PixelShaderManager::Shutdown() } -void PixelShaderManager::SetConstants() +void PixelShaderManager::SetConstants(API_TYPE api_type) { for (int i = 0; i < 2; ++i) { @@ -109,6 +113,16 @@ void PixelShaderManager::SetConstants() s_nTexDimsChanged = 0; } + if ((api_type & API_D3D9) && s_nVirtualTexScalesChanged) + { + for (int i = 0; i < 8; i += 2) + { + if (s_nVirtualTexScalesChanged & (3<>8)&0xff)/255.0f, 0, ((lastAlpha>>16)&0xff)/255.0f); @@ -338,6 +352,13 @@ void PixelShaderManager::SetPSTextureDims(int texid) SetPSConstant4fv(C_TEXDIMS + texid, fdims); } +void PixelShaderManager::SetPSVirtualTexScalePair(int texpairid) +{ + PRIM_LOG("vtexscale%d: %f %f %f %f\n", texpairid, lastVirtualTexScales[texpairid*4], lastVirtualTexScales[texpairid*4+1], + lastVirtualTexScales[texpairid*4+2], lastVirtualTexScales[texpairid*4+3]); + SetPSConstant4fv(C_VTEXSCALE + texpairid, &lastVirtualTexScales[texpairid*4]); +} + // This one is high in profiles (0.5%). TODO: Move conversion out, only store the raw color value // and update it when the shader constant is set, only. void PixelShaderManager::SetColorChanged(int type, int num, bool high) @@ -376,14 +397,25 @@ void PixelShaderManager::SetDestAlpha(const ConstantAlpha& alpha) } } -void PixelShaderManager::SetTexDims(int texmapid, u32 width, u32 height, u32 wraps, u32 wrapt) +void PixelShaderManager::SetTexDims(int texmapid, u32 width, u32 height, u32 virtual_width, u32 virtual_height, u32 wraps, u32 wrapt, API_TYPE api_type) { u32 wh = width | (height << 16) | (wraps << 28) | (wrapt << 30); - if (lastTexDims[texmapid] != wh) + + bool refresh = lastTexDims[texmapid] != wh; + if (api_type & API_D3D9) { - lastTexDims[texmapid] = wh; + refresh |= (lastVirtualTexScales[texmapid*2] != (float)width / (float)virtual_width); + refresh |= (lastVirtualTexScales[texmapid*2+1] != (float)height / (float)virtual_height); + } + + if (refresh) + { + lastTexDims[texmapid] = wh; + lastVirtualTexScales[texmapid*2] = (float)width / (float)virtual_width; + lastVirtualTexScales[texmapid*2+1] = (float)height / (float)virtual_height; s_nTexDimsChanged |= 1 << texmapid; - } + s_nVirtualTexScalesChanged |= 1 << texmapid; + } } void PixelShaderManager::SetZTextureBias(u32 bias) diff --git a/Source/Core/VideoCommon/Src/PixelShaderManager.h b/Source/Core/VideoCommon/Src/PixelShaderManager.h index 2d1c01cad6..5cbe86cae4 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderManager.h +++ b/Source/Core/VideoCommon/Src/PixelShaderManager.h @@ -26,18 +26,20 @@ class PixelShaderManager { static void SetPSTextureDims(int texid); + static void SetPSVirtualTexScalePair(int texpairid); + public: static void Init(); static void Dirty(); static void Shutdown(); - static void SetConstants(); // sets pixel shader constants + static void SetConstants(API_TYPE api_type); // sets pixel shader constants // 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 SetDestAlpha(const ConstantAlpha& alpha); - static void SetTexDims(int texmapid, u32 width, u32 height, u32 wraps, u32 wrapt); + static void SetTexDims(int texmapid, u32 width, u32 height, u32 virtual_width, u32 virtual_height, u32 wraps, u32 wrapt, API_TYPE api_type); static void SetZTextureBias(u32 bias); static void SetViewportChanged(); static void SetIndMatrixChanged(int matrixidx); diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp index d0f5a1c338..1079863347 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp @@ -234,7 +234,7 @@ void VertexManager::vFlush() if (tentry) { // 0s are probably for no manual wrapping needed. - PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height, 0, 0); + PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height, tentry->virtual_width, tentry->virtual_height, 0, 0, API_D3D11); } else ERROR_LOG(VIDEO, "error loading texture"); @@ -243,7 +243,7 @@ void VertexManager::vFlush() // set global constants VertexShaderManager::SetConstants(); - PixelShaderManager::SetConstants(); + PixelShaderManager::SetConstants(API_D3D11); bool useDstAlpha = !g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate && bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24; diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp index c4e8225db1..2083d4f1d8 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp @@ -143,7 +143,7 @@ void VertexManager::vFlush() if (tentry) { // 0s are probably for no manual wrapping needed. - PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height, 0, 0); + PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height, tentry->virtual_width, tentry->virtual_height, 0, 0, API_D3D9); } else ERROR_LOG(VIDEO, "error loading texture"); @@ -152,7 +152,7 @@ void VertexManager::vFlush() // set global constants VertexShaderManager::SetConstants(); - PixelShaderManager::SetConstants(); + PixelShaderManager::SetConstants(API_D3D9); if (!PixelShaderCache::SetShader(DSTALPHA_NONE,g_nativeVertexFmt->m_components)) { diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp index dff7f8299e..5117f6ddb6 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp @@ -161,7 +161,7 @@ void VertexManager::vFlush() if (tentry) { // 0s are probably for no manual wrapping needed. - PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height, 0, 0); + PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height, tentry->virtual_width, tentry->virtual_height, 0, 0, API_OPENGL); if (g_ActiveConfig.iLog & CONF_SAVETEXTURES) { @@ -179,7 +179,7 @@ void VertexManager::vFlush() // set global constants VertexShaderManager::SetConstants(); - PixelShaderManager::SetConstants(); + PixelShaderManager::SetConstants(API_OPENGL); bool useDstAlpha = !g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate && bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24; From 3a9fed0ba285b3c2bb80de408ac1a9da9ca774b6 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 21 Feb 2012 12:51:41 +0100 Subject: [PATCH 317/381] PixelShaderGen: Fix a bug introduced in revision 9adc119e3c2f. D3D11: Fix shader constant mapping. --- Source/Core/Common/Src/LinearDiskCache.h | 2 +- .../Core/VideoCommon/Src/PixelShaderGen.cpp | 5 +++- .../Plugin_VideoDX11/Src/PixelShaderCache.cpp | 28 ++++++++++--------- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/Source/Core/Common/Src/LinearDiskCache.h b/Source/Core/Common/Src/LinearDiskCache.h index e4cb0cbd17..f6e0d95f8c 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 = 6971 + LINEAR_DISKCACHE_VER = 6972 }; // On disk format: diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index ed504f1c82..fe5827de05 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -560,7 +560,10 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType WRITE(p, "uniform float4 "I_KCOLORS"[4] : register(c%d);\n", C_KCOLORS); WRITE(p, "uniform float4 "I_ALPHA"[1] : register(c%d);\n", C_ALPHA); WRITE(p, "uniform float4 "I_TEXDIMS"[8] : register(c%d);\n", C_TEXDIMS); - WRITE(p, "uniform float4 "I_VTEXSCALE"[8] : register(c%d);\n", C_VTEXSCALE); + if (ApiType & API_D3D9) + { + WRITE(p, "uniform float4 "I_VTEXSCALE"[4] : register(c%d);\n", C_VTEXSCALE); + } WRITE(p, "uniform float4 "I_ZBIAS"[2] : register(c%d);\n", C_ZBIAS); WRITE(p, "uniform float4 "I_INDTEXSCALE"[2] : register(c%d);\n", C_INDTEXSCALE); WRITE(p, "uniform float4 "I_INDTEXMTX"[6] : register(c%d);\n", C_INDTEXMTX); diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp index 56f3719057..fe33c4db80 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp @@ -552,20 +552,22 @@ static const unsigned int ps_constant_offset_table[] = { 16, 20, 24, 28, // C_KCOLORS, 16 32, // C_ALPHA, 4 36, 40, 44, 48, 52, 56, 60, 64, // C_TEXDIMS, 32 - 68, 72, // C_ZBIAS, 8 - 76, 80, // C_INDTEXSCALE, 8 - 84, 88, 92, 96, 100, 104, // C_INDTEXMTX, 24 - 108, 112, 116, // C_FOG, 12 - 120, 124, 128, 132, 136, // C_PLIGHTS0, 20 - 140, 144, 148, 152, 156, // C_PLIGHTS1, 20 - 160, 164, 168, 172, 176, // C_PLIGHTS2, 20 - 180, 184, 188, 192, 196, // C_PLIGHTS3, 20 - 200, 204, 208, 212, 216, // C_PLIGHTS4, 20 - 220, 224, 228, 232, 236, // C_PLIGHTS5, 20 - 240, 244, 248, 252, 256, // C_PLIGHTS6, 20 - 260, 264, 268, 272, 276, // C_PLIGHTS7, 20 - 280, 284, 288, 292 // C_PMATERIALS, 16 + 68, 72, 76, 80, // C_VTEXSCALE, 16 (unused) + 84, 88, // C_ZBIAS, 8 + 92, 96, // C_INDTEXSCALE, 8 + 100, 104, 108, 112, 116, 120, // C_INDTEXMTX, 24 + 124, 128, 132, // C_FOG, 12 + 136, 140, 144, 148, 152, // C_PLIGHTS0, 20 + 156, 160, 164, 168, 172, // C_PLIGHTS1, 20 + 176, 180, 184, 188, 192, // C_PLIGHTS2, 20 + 196, 200, 204, 208, 212, // C_PLIGHTS3, 20 + 216, 220, 224, 228, 232, // C_PLIGHTS4, 20 + 236, 240, 244, 248, 252, // C_PLIGHTS5, 20 + 256, 260, 264, 268, 272, // C_PLIGHTS6, 20 + 276, 280, 284, 288, 292, // C_PLIGHTS7, 20 + 296, 300, 304, 308, // C_PMATERIALS, 16 }; + void Renderer::SetPSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4) { psconstants[ps_constant_offset_table[const_number] ] = f1; From b251880d8b3887e6d4119559c5efa1fd39a075b2 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 24 Feb 2012 17:31:17 +0100 Subject: [PATCH 318/381] GameConfig: Remove an empty file --- Data/User/GameConfig/WBEEJV.ini | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Data/User/GameConfig/WBEEJV.ini diff --git a/Data/User/GameConfig/WBEEJV.ini b/Data/User/GameConfig/WBEEJV.ini deleted file mode 100644 index e69de29bb2..0000000000 From f15aeb26b37d88c451887709ead523e5aeb49390 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 24 Feb 2012 19:20:17 -0600 Subject: [PATCH 319/381] Use an auto typed variable in IniFile.cpp --- Source/Core/Common/Src/IniFile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Common/Src/IniFile.cpp b/Source/Core/Common/Src/IniFile.cpp index c81c060f1d..f51e8850d3 100644 --- a/Source/Core/Common/Src/IniFile.cpp +++ b/Source/Core/Common/Src/IniFile.cpp @@ -459,7 +459,7 @@ bool IniFile::Save(const char* filename) return false; } - for (std::vector

::const_iterator iter = sections.begin(); iter != sections.end(); ++iter) + for (auto iter = sections.begin(); iter != sections.end(); ++iter) { const Section& section = *iter; From 8a8dc77ef19446f97d210f0602aaa218144adf0e Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 24 Feb 2012 14:19:24 -0600 Subject: [PATCH 320/381] enable c++11 compilation in cmakelists --- CMakeLists.txt | 1 + Source/Core/Common/Src/StdThread.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 80584b2555..c59e3f7c07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -552,6 +552,7 @@ option(UNITTESTS "Build unitests" OFF) ######################################## # Start compiling our code # +add_definitions(-std=c++0x) add_subdirectory(Source) diff --git a/Source/Core/Common/Src/StdThread.h b/Source/Core/Common/Src/StdThread.h index 6e9e903561..b64dbf2c4e 100644 --- a/Source/Core/Common/Src/StdThread.h +++ b/Source/Core/Common/Src/StdThread.h @@ -7,7 +7,9 @@ #if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ // GCC 4.4 provides +#ifndef _GLIBCXX_USE_SCHED_YIELD #define _GLIBCXX_USE_SCHED_YIELD +#endif #include #else From f92d1e1e931db66d10db4cb2377bcb794dc898ee Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 24 Feb 2012 14:25:02 -0600 Subject: [PATCH 321/381] fix some clang compilation errors --- Source/Core/VideoCommon/Src/AVIDump.cpp | 2 +- Source/Core/VideoCommon/Src/BPMemory.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/VideoCommon/Src/AVIDump.cpp b/Source/Core/VideoCommon/Src/AVIDump.cpp index 469e00d9f5..670693690b 100644 --- a/Source/Core/VideoCommon/Src/AVIDump.cpp +++ b/Source/Core/VideoCommon/Src/AVIDump.cpp @@ -263,7 +263,7 @@ bool AVIDump::CreateFile() s_Stream->codec->bit_rate = 400000; s_Stream->codec->width = s_width; s_Stream->codec->height = s_height; - s_Stream->codec->time_base = (AVRational){1, VideoInterface::TargetRefreshRate}; + s_Stream->codec->time_base = (AVRational){1, static_cast(VideoInterface::TargetRefreshRate)}; s_Stream->codec->gop_size = 12; s_Stream->codec->pix_fmt = g_Config.bUseFFV1 ? PIX_FMT_BGRA : PIX_FMT_YUV420P; diff --git a/Source/Core/VideoCommon/Src/BPMemory.cpp b/Source/Core/VideoCommon/Src/BPMemory.cpp index da09893f35..5c4ed457e3 100644 --- a/Source/Core/VideoCommon/Src/BPMemory.cpp +++ b/Source/Core/VideoCommon/Src/BPMemory.cpp @@ -61,7 +61,7 @@ void BPReload() // Cases in which we DON'T want to reload the BP continue; default: - BPCmd bp = {i, 0xFFFFFF, ((u32*)&bpmem)[i]}; + BPCmd bp = {i, 0xFFFFFF, static_cast(((u32*)&bpmem)[i])}; BPWritten(bp); } } From b8bef29bcc5a8cd18625efb7e6ce37f0f263c393 Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 25 Feb 2012 20:36:49 +1100 Subject: [PATCH 322/381] Fixed a divide by zero error in the hash functions --- Source/Core/Common/Src/Hash.cpp | 48 ++++++++++++++++++++++++++++----- 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/Source/Core/Common/Src/Hash.cpp b/Source/Core/Common/Src/Hash.cpp index 62ea25519e..46747ce157 100644 --- a/Source/Core/Common/Src/Hash.cpp +++ b/Source/Core/Common/Src/Hash.cpp @@ -167,7 +167,13 @@ u64 GetMurmurHash3(const u8 *src, int len, u32 samples) const u8 * data = (const u8*)src; const int nblocks = len / 16; u32 Step = (len / 8); - if(samples == 0) samples = Step; + if(samples == 0) + { + if (Step == 0) + samples = 1; + else + samples = Step; + } Step = Step / samples; if(Step < 1) Step = 1; @@ -245,7 +251,13 @@ u64 GetCRC32(const u8 *src, int len, u32 samples) u32 Step = (len / 8); const u64 *data = (const u64 *)src; const u64 *end = data + Step; - if(samples == 0) samples = Step; + if(samples == 0) + { + if (Step == 0) + samples = 1; + else + samples = Step; + } Step = Step / samples; if(Step < 1) Step = 1; while(data < end) @@ -275,7 +287,13 @@ u64 GetHashHiresTexture(const u8 *src, int len, u32 samples) u32 Step = (len / 8); const u64 *data = (const u64 *)src; const u64 *end = data + Step; - if(samples == 0) samples = Step; + if(samples == 0) + { + if (Step == 0) + samples = 1; + else + samples = Step; + } Step = Step / samples; if(Step < 1) Step = 1; while(data < end) @@ -318,7 +336,13 @@ u64 GetCRC32(const u8 *src, int len, u32 samples) u32 Step = (len/4); const u32 *data = (const u32 *)src; const u32 *end = data + Step; - if(samples == 0) samples = Step; + if(samples == 0) + { + if (Step == 0) + samples = 1; + else + samples = Step; + } Step = Step / samples; if(Step < 1) Step = 1; while(data < end) @@ -390,7 +414,13 @@ u64 GetMurmurHash3(const u8* src, int len, u32 samples) u32 out[2]; const int nblocks = len / 8; u32 Step = (len / 4); - if(samples == 0) samples = Step; + if(samples == 0) + { + if (Step == 0) + samples = 1; + else + samples = Step; + } Step = Step / samples; if(Step < 1) Step = 1; @@ -464,7 +494,13 @@ u64 GetHashHiresTexture(const u8 *src, int len, u32 samples) u32 Step = (len / 8); const u64 *data = (const u64 *)src; const u64 *end = data + Step; - if(samples == 0) samples = Step; + if(samples == 0) + { + if (Step == 0) + samples = 1; + else + samples = Step; + } Step = Step / samples; if(Step < 1) Step = 1; while(data < end) From c3293b1a1cea3cdd9858b00c2a34d783347e72c3 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 25 Feb 2012 10:49:04 +0100 Subject: [PATCH 323/381] Improvement to revision b8bef29bcc5a .. :P --- Source/Core/Common/Src/Hash.cpp | 48 +++++---------------------------- 1 file changed, 6 insertions(+), 42 deletions(-) diff --git a/Source/Core/Common/Src/Hash.cpp b/Source/Core/Common/Src/Hash.cpp index 46747ce157..8e8d6f85bd 100644 --- a/Source/Core/Common/Src/Hash.cpp +++ b/Source/Core/Common/Src/Hash.cpp @@ -167,13 +167,7 @@ u64 GetMurmurHash3(const u8 *src, int len, u32 samples) const u8 * data = (const u8*)src; const int nblocks = len / 16; u32 Step = (len / 8); - if(samples == 0) - { - if (Step == 0) - samples = 1; - else - samples = Step; - } + if(samples == 0) samples = max(Step, 1u); Step = Step / samples; if(Step < 1) Step = 1; @@ -251,13 +245,7 @@ u64 GetCRC32(const u8 *src, int len, u32 samples) u32 Step = (len / 8); const u64 *data = (const u64 *)src; const u64 *end = data + Step; - if(samples == 0) - { - if (Step == 0) - samples = 1; - else - samples = Step; - } + if(samples == 0) samples = max(Step, 1u); Step = Step / samples; if(Step < 1) Step = 1; while(data < end) @@ -287,13 +275,7 @@ u64 GetHashHiresTexture(const u8 *src, int len, u32 samples) u32 Step = (len / 8); const u64 *data = (const u64 *)src; const u64 *end = data + Step; - if(samples == 0) - { - if (Step == 0) - samples = 1; - else - samples = Step; - } + if(samples == 0) samples = max(Step, 1u); Step = Step / samples; if(Step < 1) Step = 1; while(data < end) @@ -336,13 +318,7 @@ u64 GetCRC32(const u8 *src, int len, u32 samples) u32 Step = (len/4); const u32 *data = (const u32 *)src; const u32 *end = data + Step; - if(samples == 0) - { - if (Step == 0) - samples = 1; - else - samples = Step; - } + if(samples == 0) samples = max(Step, 1u); Step = Step / samples; if(Step < 1) Step = 1; while(data < end) @@ -414,13 +390,7 @@ u64 GetMurmurHash3(const u8* src, int len, u32 samples) u32 out[2]; const int nblocks = len / 8; u32 Step = (len / 4); - if(samples == 0) - { - if (Step == 0) - samples = 1; - else - samples = Step; - } + if(samples == 0) samples = max(Step, 1u); Step = Step / samples; if(Step < 1) Step = 1; @@ -494,13 +464,7 @@ u64 GetHashHiresTexture(const u8 *src, int len, u32 samples) u32 Step = (len / 8); const u64 *data = (const u64 *)src; const u64 *end = data + Step; - if(samples == 0) - { - if (Step == 0) - samples = 1; - else - samples = Step; - } + if(samples == 0) samples = max(Step, 1u); Step = Step / samples; if(Step < 1) Step = 1; while(data < end) From 38823b63716b46ec00337f20127de43661deac8b Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 28 Feb 2012 00:27:16 -0600 Subject: [PATCH 324/381] Add comment here so people know what's up. --- Source/Core/Common/Src/IniFile.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/Core/Common/Src/IniFile.cpp b/Source/Core/Common/Src/IniFile.cpp index f51e8850d3..acad498106 100644 --- a/Source/Core/Common/Src/IniFile.cpp +++ b/Source/Core/Common/Src/IniFile.cpp @@ -459,6 +459,10 @@ bool IniFile::Save(const char* filename) return false; } + // Currently testing if dolphin community can handle the requirements of C++11 compilation + // If you get a compiler error on this line, your compiler is probably old. + // Update to g++ 4.4 or a recent version of clang (XCode 4.2 on OS X). + // If you don't want to update, complain in a google code issue, the dolphin forums or #dolphin-emu. for (auto iter = sections.begin(); iter != sections.end(); ++iter) { const Section& section = *iter; From 9e398fd418027e4932a1539f7d382b70e8acc408 Mon Sep 17 00:00:00 2001 From: skidau Date: Fri, 2 Mar 2012 18:53:41 +1100 Subject: [PATCH 325/381] Added an external exception check when the CPU writes to the FIFO. This allows the CPU time to service FIFO overflows. Fixes random hangs caused by FIFO overflows and desyncs like in "The Last Story" and "Battalion Wars 2". Thanks to marcosvitali for the research. Fixes issue 5209. Fixes issue 5150. Fixes issue 5055. Fixes issue 4889. Fixes issue 4061. Fixes issue 4010. Fixes issue 3902. --- Source/Core/Core/Src/HW/GPFifo.cpp | 14 ++++++++++-- .../Interpreter/Interpreter_LoadStore.cpp | 4 ++-- Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 19 ++++++++++++++++ Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp | 6 ++--- Source/Core/Core/Src/PowerPC/Jit64IL/IR.h | 7 ++++-- .../Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp | 17 ++++++++++++++ .../Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp | 5 +++++ .../Core/Core/Src/PowerPC/JitCommon/JitBase.h | 4 ++++ .../Core/Src/PowerPC/JitCommon/JitCache.cpp | 11 +++++----- .../Core/Src/PowerPC/JitCommon/JitCache.h | 2 +- Source/Core/Core/Src/PowerPC/PPCCache.cpp | 2 +- .../Core/VideoCommon/Src/CommandProcessor.cpp | 22 ------------------- .../Core/VideoCommon/Src/CommandProcessor.h | 1 - Source/Core/VideoCommon/Src/Fifo.cpp | 3 +-- 14 files changed, 75 insertions(+), 42 deletions(-) diff --git a/Source/Core/Core/Src/HW/GPFifo.cpp b/Source/Core/Core/Src/HW/GPFifo.cpp index 4d72317e0d..35d678a411 100644 --- a/Source/Core/Core/Src/HW/GPFifo.cpp +++ b/Source/Core/Core/Src/HW/GPFifo.cpp @@ -19,9 +19,9 @@ #include "ChunkFile.h" #include "ProcessorInterface.h" #include "Memmap.h" -#include "../PowerPC/PowerPC.h" - #include "VideoBackendBase.h" +#include "../PowerPC/JitCommon/JitBase.h" +#include "../PowerPC/PowerPC.h" #include "GPFifo.h" @@ -96,6 +96,16 @@ void STACKALIGN CheckGatherPipe() // move back the spill bytes memmove(m_gatherPipe, m_gatherPipe + cnt, m_gatherPipeCount); + + // Profile where the FIFO writes are occurring. + const u32 addr = PC - 4; + if (jit && (jit->js.fifoWriteAddresses.find(addr)) == (jit->js.fifoWriteAddresses.end())) + { + jit->js.fifoWriteAddresses.insert(addr); + + // Invalidate the JIT block so that it gets recompiled with the external exception check included. + jit->GetBlockCache()->InvalidateICache(addr, 8); + } } } diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp index a7955c0982..cad4761e55 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp @@ -367,7 +367,7 @@ void Interpreter::dcbf(UGeckoInstruction _inst) if (jit) { u32 address = Helper_Get_EA_X(_inst); - jit->GetBlockCache()->InvalidateICache(address & ~0x1f); + jit->GetBlockCache()->InvalidateICache(address & ~0x1f, 32); } } @@ -378,7 +378,7 @@ void Interpreter::dcbi(UGeckoInstruction _inst) if (jit) { u32 address = Helper_Get_EA_X(_inst); - jit->GetBlockCache()->InvalidateICache(address & ~0x1f); + jit->GetBlockCache()->InvalidateICache(address & ~0x1f, 32); } } diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index 0d31893b53..a98df95fc3 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -41,6 +41,7 @@ #include "JitAsm.h" #include "JitRegCache.h" #include "Jit64_Tables.h" +#include "HW/ProcessorInterface.h" using namespace Gen; using namespace PowerPC; @@ -569,6 +570,24 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc SetJumpTarget(b1); } + // Add an external exception check if the instruction writes to the FIFO. + if (jit->js.fifoWriteAddresses.find(js.compilerPC) != jit->js.fifoWriteAddresses.end()) + { + gpr.Flush(FLUSH_ALL); + fpr.Flush(FLUSH_ALL); + + TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_EXTERNAL_INT)); + FixupBranch noExtException = J_CC(CC_Z); + TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); + FixupBranch noCPInt = J_CC(CC_Z); + + MOV(32, M(&PC), Imm32(js.compilerPC)); + WriteExceptionExit(); + + SetJumpTarget(noCPInt); + SetJumpTarget(noExtException); + } + Jit64Tables::CompileInstruction(ops[i]); if (js.memcheck && (opinfo->flags & FL_LOADSTORE)) diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp index 3a60a0ae11..afab21b30e 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp @@ -1260,8 +1260,8 @@ static const std::string opcodeNames[] = { "FResult_End", "StorePaired", "StoreSingle", "StoreDouble", "StoreFReg", "FDCmpCR", "CInt16", "CInt32", "SystemCall", "RFIExit", "InterpreterBranch", "IdleBranch", "ShortIdleLoop", - "FPExceptionCheckStart", "FPExceptionCheckEnd", "ISIException", "Tramp", - "BlockStart", "BlockEnd", "Int3", + "FPExceptionCheckStart", "FPExceptionCheckEnd", "ISIException", "ExtExceptionCheck", + "Tramp", "BlockStart", "BlockEnd", "Int3", }; static const unsigned alwaysUsedList[] = { InterpreterFallback, StoreGReg, StoreCR, StoreLink, StoreCTR, StoreMSR, @@ -1269,7 +1269,7 @@ static const unsigned alwaysUsedList[] = { Store16, Store32, StoreSingle, StoreDouble, StorePaired, StoreFReg, FDCmpCR, BlockStart, BlockEnd, IdleBranch, BranchCond, BranchUncond, ShortIdleLoop, SystemCall, InterpreterBranch, RFIExit, FPExceptionCheckStart, - FPExceptionCheckEnd, ISIException, Int3, Tramp, Nop + FPExceptionCheckEnd, ISIException, ExtExceptionCheck, Int3, Tramp, Nop }; static const unsigned extra8RegList[] = { LoadGReg, LoadCR, LoadGQR, LoadFReg, LoadFRegDENToZero, diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h index aca3dd0e37..284cbe6538 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h @@ -165,10 +165,10 @@ enum Opcode { ShortIdleLoop, // Idle loop seen in homebrew like wii mahjong, // just a branch - // used for MMU, at least until someone + // used for exception checking, at least until someone // has a better idea of integrating it FPExceptionCheckStart, FPExceptionCheckEnd, - ISIException, + ISIException,ExtExceptionCheck, // "Opcode" representing a register too far away to // reference directly; this is a size optimization Tramp, @@ -411,6 +411,9 @@ public: InstLoc EmitISIException(InstLoc dest) { return EmitUOp(ISIException, dest); } + InstLoc EmitExtExceptionCheck(InstLoc pc) { + return EmitUOp(ExtExceptionCheck, pc); + } InstLoc EmitRFIExit() { return FoldZeroOp(RFIExit, 0); } diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp index e1807cfbb4..6648189809 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp @@ -50,6 +50,7 @@ The register allocation is linear scan allocation. #include "../../../../Common/Src/CPUDetect.h" #include "MathUtil.h" #include "../../Core.h" +#include "HW/ProcessorInterface.h" static ThunkManager thunks; @@ -761,6 +762,7 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, bool UseProfile, bool Mak case FPExceptionCheckStart: case FPExceptionCheckEnd: case ISIException: + case ExtExceptionCheck: case Int3: case Tramp: // No liveness effects @@ -1920,6 +1922,21 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, bool UseProfile, bool Mak Jit->WriteExceptionExit(); break; } + case ExtExceptionCheck: { + unsigned InstLoc = ibuild->GetImmValue(getOp1(I)); + + Jit->TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_EXTERNAL_INT)); + FixupBranch noExtException = Jit->J_CC(CC_Z); + Jit->TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); + FixupBranch noCPInt = Jit->J_CC(CC_Z); + + Jit->MOV(32, M(&PC), Imm32(InstLoc)); + Jit->WriteExceptionExit(); + + Jit->SetJumpTarget(noCPInt); + Jit->SetJumpTarget(noExtException); + break; + } case Int3: { Jit->INT3(); break; diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp index 75755de5cb..96afff1613 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp @@ -648,6 +648,11 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc { ibuild.EmitFPExceptionCheckStart(ibuild.EmitIntConst(ops[i].address)); } + + if (jit->js.fifoWriteAddresses.find(js.compilerPC) != jit->js.fifoWriteAddresses.end()) + { + ibuild.EmitExtExceptionCheck(ibuild.EmitIntConst(ops[i].address)); + } JitILTables::CompileInstruction(ops[i]); diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h index b832e96e1f..be80754bdc 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h @@ -31,6 +31,8 @@ #include "PowerPCDisasm.h" #include "disasm.h" +#include + #define JIT_OPCODE 0 class JitBase : public CPUCoreBase, public EmuCodeBlock @@ -75,6 +77,8 @@ protected: u8* rewriteStart; JitBlock *curBlock; + + std::set fifoWriteAddresses; }; public: diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp index 422369d307..8f5ff5d820 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp @@ -390,13 +390,12 @@ bool JitBlock::ContainsAddress(u32 em_address) } - void JitBlockCache::InvalidateICache(u32 address) + void JitBlockCache::InvalidateICache(u32 address, const u32 length) { - address &= ~0x1f; // 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(address, 0)), it2 = it1, it; - while (it2 != block_map.end() && it2->first.second < address + 0x20) + while (it2 != block_map.end() && it2->first.second < address + length) { DestroyBlock(it2->second, true); it2++; @@ -418,17 +417,17 @@ bool JitBlock::ContainsAddress(u32 em_address) if (address & JIT_ICACHE_VMEM_BIT) { u32 cacheaddr = address & JIT_ICACHE_MASK; - memset(iCacheVMEM + cacheaddr, JIT_ICACHE_INVALID_BYTE, 32); + memset(iCacheVMEM + cacheaddr, JIT_ICACHE_INVALID_BYTE, length); } else if (address & JIT_ICACHE_EXRAM_BIT) { u32 cacheaddr = address & JIT_ICACHEEX_MASK; - memset(iCacheEx + cacheaddr, JIT_ICACHE_INVALID_BYTE, 32); + memset(iCacheEx + cacheaddr, JIT_ICACHE_INVALID_BYTE, length); } else { u32 cacheaddr = address & JIT_ICACHE_MASK; - memset(iCache + cacheaddr, JIT_ICACHE_INVALID_BYTE, 32); + memset(iCache + cacheaddr, JIT_ICACHE_INVALID_BYTE, length); } #endif } diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h index 91d47a3d0e..7c19310e02 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h @@ -129,7 +129,7 @@ public: CompiledCode GetCompiledCodeFromBlock(int block_num); // DOES NOT WORK CORRECTLY WITH INLINING - void InvalidateICache(u32 em_address); + void InvalidateICache(u32 address, const u32 length); void DestroyBlock(int block_num, bool invalidate); // Not currently used diff --git a/Source/Core/Core/Src/PowerPC/PPCCache.cpp b/Source/Core/Core/Src/PowerPC/PPCCache.cpp index 704caa4a2c..6956e9db1c 100644 --- a/Source/Core/Core/Src/PowerPC/PPCCache.cpp +++ b/Source/Core/Core/Src/PowerPC/PPCCache.cpp @@ -110,7 +110,7 @@ namespace PowerPC #endif valid[set] = 0; if (jit) - jit->GetBlockCache()->InvalidateICache(addr); + jit->GetBlockCache()->InvalidateICache(addr & ~0x1f, 32); } u32 InstructionCache::ReadInstruction(u32 addr) diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp index fc85b8e39d..dbe09aaa0e 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp @@ -60,7 +60,6 @@ volatile bool interruptSet= false; volatile bool interruptWaiting= false; volatile bool interruptTokenWaiting = false; volatile bool interruptFinishWaiting = false; -volatile bool OnOverflow = false; bool IsOnThread() { @@ -92,7 +91,6 @@ void DoState(PointerWrap &p) p.Do(interruptWaiting); p.Do(interruptTokenWaiting); p.Do(interruptFinishWaiting); - p.Do(OnOverflow); } inline void WriteLow (volatile u32& _reg, u16 lowbits) {Common::AtomicStore(_reg,(_reg & 0xFFFF0000) | lowbits);} @@ -135,7 +133,6 @@ void Init() bProcessFifoToLoWatermark = false; bProcessFifoAllDistance = false; isPossibleWaitingSetDrawDone = false; - OnOverflow = false; et_UpdateInterrupts = CoreTiming::RegisterEvent("UpdateInterrupts", UpdateInterrupts_Wrapper); } @@ -449,26 +446,7 @@ void STACKALIGN GatherPipeBursted() Common::AtomicAdd(fifo.CPReadWriteDistance, GATHER_PIPE_SIZE); if (!IsOnThread()) - { RunGpu(); - } - else - { - if(fifo.CPReadWriteDistance == fifo.CPEnd - fifo.CPBase - 32) - { - if(!OnOverflow) - NOTICE_LOG(COMMANDPROCESSOR,"FIFO is almost in overflown, BreakPoint: %i", fifo.bFF_Breakpoint); - OnOverflow = true; - while (!CommandProcessor::interruptWaiting && fifo.bFF_GPReadEnable && - fifo.CPReadWriteDistance > fifo.CPEnd - fifo.CPBase - 64) - Common::YieldCPU(); - } - else - { - OnOverflow = false; - } - } - _assert_msg_(COMMANDPROCESSOR, fifo.CPReadWriteDistance <= fifo.CPEnd - fifo.CPBase, "FIFO is overflown by GatherPipe !\nCPU thread is too fast!"); diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.h b/Source/Core/VideoCommon/Src/CommandProcessor.h index db6772d66d..bb969fcb95 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.h +++ b/Source/Core/VideoCommon/Src/CommandProcessor.h @@ -35,7 +35,6 @@ extern volatile bool interruptSet; extern volatile bool interruptWaiting; extern volatile bool interruptTokenWaiting; extern volatile bool interruptFinishWaiting; -extern volatile bool OnOverflow; // internal hardware addresses enum diff --git a/Source/Core/VideoCommon/Src/Fifo.cpp b/Source/Core/VideoCommon/Src/Fifo.cpp index 842ff49e78..5cb3252816 100644 --- a/Source/Core/VideoCommon/Src/Fifo.cpp +++ b/Source/Core/VideoCommon/Src/Fifo.cpp @@ -137,8 +137,7 @@ void RunGpuLoop() CommandProcessor::SetCpStatus(); // check if we are able to run this buffer - while (!CommandProcessor::interruptWaiting && fifo.bFF_GPReadEnable && - fifo.CPReadWriteDistance && (!AtBreakpoint() || CommandProcessor::OnOverflow)) + while (!CommandProcessor::interruptWaiting && fifo.bFF_GPReadEnable && fifo.CPReadWriteDistance && !AtBreakpoint()) { if (!GpuRunningState) break; From 9e649ce79850f6c39fa16ea5a207659bb2e5b052 Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 3 Mar 2012 14:26:39 +1100 Subject: [PATCH 326/381] Added additional checks to ensure that only a FIFO breakpoint exception is handled. This fixes the hangs in games like de Blob, Xenoblade and Super Mario Galaxy introduced by r9e398fd41802. --- Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index a98df95fc3..07eb36d263 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -571,7 +571,7 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc } // Add an external exception check if the instruction writes to the FIFO. - if (jit->js.fifoWriteAddresses.find(js.compilerPC) != jit->js.fifoWriteAddresses.end()) + if (jit->js.fifoWriteAddresses.find(ops[i].address) != jit->js.fifoWriteAddresses.end()) { gpr.Flush(FLUSH_ALL); fpr.Flush(FLUSH_ALL); @@ -580,10 +580,16 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc FixupBranch noExtException = J_CC(CC_Z); TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); FixupBranch noCPInt = J_CC(CC_Z); + TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), + Imm32(ProcessorInterface::INT_CAUSE_PE_TOKEN | + ProcessorInterface::INT_CAUSE_PE_FINISH | + ProcessorInterface::INT_CAUSE_DSP)); + FixupBranch ClearInt = J_CC(CC_NZ); - MOV(32, M(&PC), Imm32(js.compilerPC)); + MOV(32, M(&PC), Imm32(ops[i].address)); WriteExceptionExit(); + SetJumpTarget(ClearInt); SetJumpTarget(noCPInt); SetJumpTarget(noExtException); } From 874e17e504c6c6b19f5a1eb9ef16c82bde179032 Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 3 Mar 2012 15:41:55 +1100 Subject: [PATCH 327/381] Added the corresponding change from r9e649ce79850 to JITIL. --- Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 9 +++------ Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp | 3 +++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index 07eb36d263..44ce9325b6 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -580,16 +580,13 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc FixupBranch noExtException = J_CC(CC_Z); TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); FixupBranch noCPInt = J_CC(CC_Z); - TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), - Imm32(ProcessorInterface::INT_CAUSE_PE_TOKEN | - ProcessorInterface::INT_CAUSE_PE_FINISH | - ProcessorInterface::INT_CAUSE_DSP)); - FixupBranch ClearInt = J_CC(CC_NZ); + TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_DSP)); + FixupBranch clearInt = J_CC(CC_NZ); MOV(32, M(&PC), Imm32(ops[i].address)); WriteExceptionExit(); - SetJumpTarget(ClearInt); + SetJumpTarget(clearInt); SetJumpTarget(noCPInt); SetJumpTarget(noExtException); } diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp index 6648189809..0152d0d96e 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp @@ -1929,10 +1929,13 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, bool UseProfile, bool Mak FixupBranch noExtException = Jit->J_CC(CC_Z); Jit->TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); FixupBranch noCPInt = Jit->J_CC(CC_Z); + Jit->TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_DSP)); + FixupBranch clearInt = Jit->J_CC(CC_NZ); Jit->MOV(32, M(&PC), Imm32(InstLoc)); Jit->WriteExceptionExit(); + Jit->SetJumpTarget(clearInt); Jit->SetJumpTarget(noCPInt); Jit->SetJumpTarget(noExtException); break; From f5d4fe0bfe13937fa3736aa6b78974ceb6e190ad Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Sat, 3 Mar 2012 20:07:20 +0100 Subject: [PATCH 328/381] Fix some minor bugs pointed out by PVS Studio (thanks!) --- Source/Core/Common/Src/SysConf.cpp | 2 +- Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp | 2 +- Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp | 2 +- Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp | 2 +- Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 2 +- Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.cpp | 2 +- Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/Core/Common/Src/SysConf.cpp b/Source/Core/Common/Src/SysConf.cpp index ed8a4953e5..97170e5ff1 100644 --- a/Source/Core/Common/Src/SysConf.cpp +++ b/Source/Core/Common/Src/SysConf.cpp @@ -387,7 +387,7 @@ bool SysConf::SaveToFile(const char *filename) } else if (i->type == Type_SmallArray) { - const u8 len = i->dataLength; + const u8 len = (u8)(i->dataLength); f.WriteArray(&len, 1); } diff --git a/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp b/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp index 144270e798..4aefb6dbdb 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp @@ -109,7 +109,7 @@ CEXIIPL::CEXIIPL() : if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHLE_BS2) { // Copy header - memcpy(m_pIPL, m_bNTSC ? iplverNTSC : iplverPAL, sizeof(m_bNTSC ? iplverNTSC : iplverPAL)); + memcpy(m_pIPL, m_bNTSC ? iplverNTSC : iplverPAL, m_bNTSC ? sizeof(iplverNTSC) : sizeof(iplverPAL)); // Load fonts LoadFileToIPL((File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + FONT_SJIS), 0x1aff00); diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp index 3a60a0ae11..8ca83e7208 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp @@ -1212,7 +1212,7 @@ void IRBuilder::simplifyCommutative(unsigned Opcode, InstLoc& Op1, InstLoc& Op2) } bool IRBuilder::maskedValueIsZero(InstLoc Op1, InstLoc Op2) const { - return (~ComputeKnownZeroBits(Op1) & ~ComputeKnownZeroBits(Op1)) == 0; + return (~ComputeKnownZeroBits(Op1) & ~ComputeKnownZeroBits(Op2)) == 0; } // Returns I' if I == (0 - I') diff --git a/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp b/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp index f354ea4291..c3aa56acd0 100644 --- a/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp +++ b/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp @@ -299,7 +299,7 @@ u32 Flatten(u32 address, int *realsize, BlockStats *st, BlockRegStats *gpa, merged_addresses[0] = address; size_of_merged_addresses = 1; - memset(st, 0, sizeof(st)); + memset(st, 0, sizeof(*st)); // Disabled the following optimization in preference of FAST_ICACHE //UGeckoInstruction previnst = Memory::Read_Opcode_JIT_LC(address - 4); diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index fe5827de05..3ef923dc3e 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -158,7 +158,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] diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.cpp b/Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.cpp index 81a4cf96a6..8ee8081b2c 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.cpp @@ -595,7 +595,7 @@ void drawShadedTexSubQuad(ID3D11ShaderResourceView* texture, // only upload the data to VRAM if it changed if (stsq_observer || - memcmp(rDest, &tex_sub_quad_data.rdest, sizeof(rDest)) != 0 || + memcmp(rDest, &tex_sub_quad_data.rdest, sizeof(*rDest)) != 0 || tex_sub_quad_data.u1 != u1 || tex_sub_quad_data.v1 != v1 || tex_sub_quad_data.u2 != u2 || tex_sub_quad_data.v2 != v2 || tex_sub_quad_data.G != G) { diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp index 3a4b5d0699..9510ad444c 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp @@ -383,7 +383,7 @@ void drawShadedTexQuad(IDirect3DTexture9 *texture, float v2=((float)rSource->bottom) * sh; float g = 1.0f/Gamma; - struct Q2DVertex { float x,y,z,rhw,u,v,w,h,G; } coords[4] = { + const struct Q2DVertex { float x,y,z,rhw,u,v,w,h,G; } coords[4] = { {-1.0f - dw,-1.0f + dh, 0.0f,1.0f, u1, v2, sw, sh, g}, {-1.0f - dw, 1.0f + dh, 0.0f,1.0f, u1, v1, sw, sh, g}, { 1.0f - dw,-1.0f + dh, 0.0f,1.0f, u2, v2, sw, sh, g}, From 5de8366db2ec084e95420b0853abb4d11a431ac0 Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 4 Mar 2012 08:10:46 +1100 Subject: [PATCH 329/381] Made the invalidation of the FIFO write JIT blocks more selective (efficient). Fixes the slowdown in the House of the Dead: Overkill cutscenes. --- Source/Core/Core/Src/HW/GPFifo.cpp | 7 +++---- Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 2 +- Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/HW/GPFifo.cpp b/Source/Core/Core/Src/HW/GPFifo.cpp index 35d678a411..725db3011c 100644 --- a/Source/Core/Core/Src/HW/GPFifo.cpp +++ b/Source/Core/Core/Src/HW/GPFifo.cpp @@ -98,13 +98,12 @@ void STACKALIGN CheckGatherPipe() memmove(m_gatherPipe, m_gatherPipe + cnt, m_gatherPipeCount); // Profile where the FIFO writes are occurring. - const u32 addr = PC - 4; - if (jit && (jit->js.fifoWriteAddresses.find(addr)) == (jit->js.fifoWriteAddresses.end())) + if (jit && (jit->js.fifoWriteAddresses.find(PC)) == (jit->js.fifoWriteAddresses.end())) { - jit->js.fifoWriteAddresses.insert(addr); + jit->js.fifoWriteAddresses.insert(PC); // Invalidate the JIT block so that it gets recompiled with the external exception check included. - jit->GetBlockCache()->InvalidateICache(addr, 8); + jit->GetBlockCache()->InvalidateICache(PC, 4); } } } diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index 44ce9325b6..71718c6085 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -580,7 +580,7 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc FixupBranch noExtException = J_CC(CC_Z); TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); FixupBranch noCPInt = J_CC(CC_Z); - TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_DSP)); + TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_VI | ProcessorInterface::INT_CAUSE_PE_TOKEN | ProcessorInterface::INT_CAUSE_PE_FINISH)); FixupBranch clearInt = J_CC(CC_NZ); MOV(32, M(&PC), Imm32(ops[i].address)); diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp index 0152d0d96e..cffc3b5feb 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp @@ -1929,7 +1929,7 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, bool UseProfile, bool Mak FixupBranch noExtException = Jit->J_CC(CC_Z); Jit->TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); FixupBranch noCPInt = Jit->J_CC(CC_Z); - Jit->TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_DSP)); + Jit->TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_VI | ProcessorInterface::INT_CAUSE_PE_TOKEN | ProcessorInterface::INT_CAUSE_PE_FINISH)); FixupBranch clearInt = Jit->J_CC(CC_NZ); Jit->MOV(32, M(&PC), Imm32(InstLoc)); From a53916ff5d7d2840ef8612bc16511554d259e848 Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 4 Mar 2012 23:42:33 +1100 Subject: [PATCH 330/381] Changed the detection of FIFO write addresses to writes at the gather pipe boundary. This speeds up games which frequently write to the gather pipe like the pre-rendered movies in The Last Story. Added some code to unlink invalidated blocks so that the recompiled block can be linked (speed-up). --- Source/Core/Core/Src/HW/GPFifo.cpp | 2 +- .../Core/Src/PowerPC/JitCommon/JitCache.cpp | 22 ++++++++++++++++++- .../Core/Src/PowerPC/JitCommon/JitCache.h | 1 + 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/GPFifo.cpp b/Source/Core/Core/Src/HW/GPFifo.cpp index 725db3011c..fd81f099e9 100644 --- a/Source/Core/Core/Src/HW/GPFifo.cpp +++ b/Source/Core/Core/Src/HW/GPFifo.cpp @@ -98,7 +98,7 @@ void STACKALIGN CheckGatherPipe() memmove(m_gatherPipe, m_gatherPipe + cnt, m_gatherPipeCount); // Profile where the FIFO writes are occurring. - if (jit && (jit->js.fifoWriteAddresses.find(PC)) == (jit->js.fifoWriteAddresses.end())) + if (m_gatherPipeCount == 0 && jit && (jit->js.fifoWriteAddresses.find(PC)) == (jit->js.fifoWriteAddresses.end())) { jit->js.fifoWriteAddresses.insert(PC); diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp index 8f5ff5d820..bccb218fd9 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp @@ -353,6 +353,24 @@ bool JitBlock::ContainsAddress(u32 em_address) } } + 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 (int e = 0; e < 2; e++) + { + if (sourceBlock.exitAddress[e] == b.originalAddress) + sourceBlock.linkStatus[e] = false; + } + } + } + void JitBlockCache::DestroyBlock(int block_num, bool invalidate) { if (block_num < 0 || block_num >= num_blocks) @@ -375,7 +393,9 @@ bool JitBlock::ContainsAddress(u32 em_address) Memory::WriteUnchecked_U32(b.originalFirstOpcode, b.originalAddress); #endif - // We don't unlink blocks, we just send anyone who tries to run them back to the dispatcher. + UnlinkBlock(block_num); + + // 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); diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h index 7c19310e02..16f16d6d14 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h @@ -87,6 +87,7 @@ class JitBlockCache bool RangeIntersect(int s1, int e1, int s2, int e2) const; void LinkBlockExits(int i); void LinkBlock(int i); + void UnlinkBlock(int i); public: JitBlockCache() : From b0f75f17ae19484735675fea348f7e95740f597f Mon Sep 17 00:00:00 2001 From: marcosvitali Date: Mon, 5 Mar 2012 02:40:10 -0300 Subject: [PATCH 331/381] This release still fixed the hangs produced by fifo overflow without sacrifice performance. For example you can test Tutorial moves at the beginning of The last history now is fluid 30/60. Shuffle2: I've delete the hacky line, I think is not necessary anymore. Additional some clean in CommandProcessor. Please test The Last Story and others games affected in the previous commits and give me a feedback. --- Source/Core/Common/Src/VideoBackendBase.h | 2 + Source/Core/Core/Src/HW/GPFifo.cpp | 5 ++- Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 3 -- .../Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp | 4 +- .../Core/VideoCommon/Src/CommandProcessor.cpp | 39 +++++++++++-------- .../Core/VideoCommon/Src/CommandProcessor.h | 1 + Source/Core/VideoCommon/Src/MainBase.cpp | 5 +++ Source/Core/VideoCommon/Src/PixelEngine.cpp | 2 - .../Plugin_VideoSoftware/Src/SWmain.cpp | 6 +++ .../Plugin_VideoSoftware/Src/VideoBackend.h | 2 +- 10 files changed, 41 insertions(+), 28 deletions(-) diff --git a/Source/Core/Common/Src/VideoBackendBase.h b/Source/Core/Common/Src/VideoBackendBase.h index 28c8f23246..96f639832b 100644 --- a/Source/Core/Common/Src/VideoBackendBase.h +++ b/Source/Core/Common/Src/VideoBackendBase.h @@ -119,6 +119,7 @@ public: virtual void Video_GatherPipeBursted() = 0; virtual bool Video_IsPossibleWaitingSetDrawDone() = 0; + virtual bool Video_IsHiWatermarkActive() = 0; virtual void Video_AbortFrame() = 0; virtual readFn16 Video_CPRead16() = 0; @@ -159,6 +160,7 @@ class VideoBackendHardware : public VideoBackend void Video_GatherPipeBursted(); bool Video_IsPossibleWaitingSetDrawDone(); + bool Video_IsHiWatermarkActive(); void Video_AbortFrame(); readFn16 Video_CPRead16(); diff --git a/Source/Core/Core/Src/HW/GPFifo.cpp b/Source/Core/Core/Src/HW/GPFifo.cpp index fd81f099e9..9bae7bb621 100644 --- a/Source/Core/Core/Src/HW/GPFifo.cpp +++ b/Source/Core/Core/Src/HW/GPFifo.cpp @@ -96,9 +96,10 @@ void STACKALIGN CheckGatherPipe() // move back the spill bytes memmove(m_gatherPipe, m_gatherPipe + cnt, m_gatherPipeCount); - + // Profile where the FIFO writes are occurring. - if (m_gatherPipeCount == 0 && jit && (jit->js.fifoWriteAddresses.find(PC)) == (jit->js.fifoWriteAddresses.end())) + + if (g_video_backend->Video_IsHiWatermarkActive() && jit && (jit->js.fifoWriteAddresses.find(PC)) == (jit->js.fifoWriteAddresses.end())) { jit->js.fifoWriteAddresses.insert(PC); diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index 71718c6085..417d1159da 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -580,13 +580,10 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc FixupBranch noExtException = J_CC(CC_Z); TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); FixupBranch noCPInt = J_CC(CC_Z); - TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_VI | ProcessorInterface::INT_CAUSE_PE_TOKEN | ProcessorInterface::INT_CAUSE_PE_FINISH)); - FixupBranch clearInt = J_CC(CC_NZ); MOV(32, M(&PC), Imm32(ops[i].address)); WriteExceptionExit(); - SetJumpTarget(clearInt); SetJumpTarget(noCPInt); SetJumpTarget(noExtException); } diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp index cffc3b5feb..811440d098 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp @@ -1929,13 +1929,11 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, bool UseProfile, bool Mak FixupBranch noExtException = Jit->J_CC(CC_Z); Jit->TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); FixupBranch noCPInt = Jit->J_CC(CC_Z); - Jit->TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_VI | ProcessorInterface::INT_CAUSE_PE_TOKEN | ProcessorInterface::INT_CAUSE_PE_FINISH)); - FixupBranch clearInt = Jit->J_CC(CC_NZ); Jit->MOV(32, M(&PC), Imm32(InstLoc)); Jit->WriteExceptionExit(); - Jit->SetJumpTarget(clearInt); + Jit->SetJumpTarget(noCPInt); Jit->SetJumpTarget(noExtException); break; diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp index dbe09aaa0e..38b342b76c 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp @@ -56,6 +56,7 @@ static bool bProcessFifoToLoWatermark = false; static bool bProcessFifoAllDistance = false; volatile bool isPossibleWaitingSetDrawDone = false; +volatile bool isHiWatermarkActive = false; volatile bool interruptSet= false; volatile bool interruptWaiting= false; volatile bool interruptTokenWaiting = false; @@ -85,7 +86,7 @@ void DoState(PointerWrap &p) p.Do(bProcessFifoToLoWatermark); p.Do(bProcessFifoAllDistance); - + p.Do(isHiWatermarkActive); p.Do(isPossibleWaitingSetDrawDone); p.Do(interruptSet); p.Do(interruptWaiting); @@ -133,6 +134,7 @@ void Init() bProcessFifoToLoWatermark = false; bProcessFifoAllDistance = false; isPossibleWaitingSetDrawDone = false; + isHiWatermarkActive = false; et_UpdateInterrupts = CoreTiming::RegisterEvent("UpdateInterrupts", UpdateInterrupts_Wrapper); } @@ -141,7 +143,6 @@ void Read16(u16& _rReturnValue, const u32 _Address) { INFO_LOG(COMMANDPROCESSOR, "(r): 0x%08x", _Address); - ProcessFifoEvents(); switch (_Address & 0xFFF) { case STATUS_REGISTER: @@ -409,7 +410,6 @@ void Write16(const u16 _Value, const u32 _Address) if (!IsOnThread()) RunGpu(); - ProcessFifoEvents(); } void Read32(u32& _rReturnValue, const u32 _Address) @@ -425,7 +425,6 @@ void Write32(const u32 _Data, const u32 _Address) void STACKALIGN GatherPipeBursted() { - ProcessFifoEvents(); // if we aren't linked, we don't care about gather pipe data if (!m_CPCtrlReg.GPLinkEnable) { @@ -487,17 +486,18 @@ void AbortFrame() void SetOverflowStatusFromGatherPipe() { - if (!fifo.bFF_HiWatermarkInt) return; + fifo.bFF_HiWatermark = (fifo.CPReadWriteDistance > fifo.CPHiWatermark); - fifo.bFF_LoWatermark = (fifo.CPReadWriteDistance < fifo.CPLoWatermark); + isHiWatermarkActive = fifo.bFF_HiWatermark && fifo.bFF_HiWatermarkInt && m_CPCtrlReg.GPReadEnable; - bool interrupt = fifo.bFF_HiWatermark && fifo.bFF_HiWatermarkInt && - m_CPCtrlReg.GPLinkEnable && m_CPCtrlReg.GPReadEnable; - - if (interrupt != interruptSet && interrupt) - CommandProcessor::UpdateInterrupts(true); - + if (isHiWatermarkActive) + { + interruptSet = true; + INFO_LOG(COMMANDPROCESSOR,"Interrupt set"); + ProcessorInterface::SetInterrupt(INT_CAUSE_CP, true); + } + } void SetCpStatus() @@ -505,7 +505,7 @@ void SetCpStatus() // overflow & underflow check fifo.bFF_HiWatermark = (fifo.CPReadWriteDistance > fifo.CPHiWatermark); fifo.bFF_LoWatermark = (fifo.CPReadWriteDistance < fifo.CPLoWatermark); - + // breakpoint if (fifo.bFF_BPEnable) @@ -540,13 +540,18 @@ void SetCpStatus() bool interrupt = (bpInt || ovfInt || undfInt) && m_CPCtrlReg.GPReadEnable; + isHiWatermarkActive = ovfInt && m_CPCtrlReg.GPReadEnable; + if (interrupt != interruptSet && !interruptWaiting) { u64 userdata = interrupt?1:0; if (IsOnThread()) { - interruptWaiting = true; - CommandProcessor::UpdateInterruptsFromVideoBackend(userdata); + if(!interrupt || bpInt || undfInt) + { + interruptWaiting = true; + CommandProcessor::UpdateInterruptsFromVideoBackend(userdata); + } } else CommandProcessor::UpdateInterrupts(userdata); @@ -631,8 +636,8 @@ void SetCpControlRegister() ProcessorInterface::Fifo_CPUEnd = fifo.CPEnd; } // If overflown happens process the fifo to LoWatemark - if (bProcessFifoToLoWatermark) - ProcessFifoToLoWatermark(); + //if (bProcessFifoToLoWatermark) + // ProcessFifoToLoWatermark(); if(fifo.bFF_GPReadEnable && !m_CPCtrlReg.GPReadEnable) { diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.h b/Source/Core/VideoCommon/Src/CommandProcessor.h index bb969fcb95..2bf965a3ba 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.h +++ b/Source/Core/VideoCommon/Src/CommandProcessor.h @@ -31,6 +31,7 @@ namespace CommandProcessor extern SCPFifoStruct fifo; //This one is shared between gfx thread and emulator thread. extern volatile bool isPossibleWaitingSetDrawDone; //This one is used for sync gfx thread and emulator thread. +extern volatile bool isHiWatermarkActive; extern volatile bool interruptSet; extern volatile bool interruptWaiting; extern volatile bool interruptTokenWaiting; diff --git a/Source/Core/VideoCommon/Src/MainBase.cpp b/Source/Core/VideoCommon/Src/MainBase.cpp index af21ebbb94..0b1258a662 100644 --- a/Source/Core/VideoCommon/Src/MainBase.cpp +++ b/Source/Core/VideoCommon/Src/MainBase.cpp @@ -250,6 +250,11 @@ bool VideoBackendHardware::Video_IsPossibleWaitingSetDrawDone() return CommandProcessor::isPossibleWaitingSetDrawDone; } +bool VideoBackendHardware::Video_IsHiWatermarkActive() +{ + return CommandProcessor::isHiWatermarkActive; +} + void VideoBackendHardware::Video_AbortFrame() { CommandProcessor::AbortFrame(); diff --git a/Source/Core/VideoCommon/Src/PixelEngine.cpp b/Source/Core/VideoCommon/Src/PixelEngine.cpp index 456e0fb535..ec0683742f 100644 --- a/Source/Core/VideoCommon/Src/PixelEngine.cpp +++ b/Source/Core/VideoCommon/Src/PixelEngine.cpp @@ -180,7 +180,6 @@ void Init() void Read16(u16& _uReturnValue, const u32 _iAddress) { DEBUG_LOG(PIXELENGINE, "(r16) 0x%08x", _iAddress); - CommandProcessor::ProcessFifoEvents(); switch (_iAddress & 0xFFF) { // CPU Direct Access EFB Raster State Config @@ -334,7 +333,6 @@ void Write16(const u16 _iValue, const u32 _iAddress) break; } - CommandProcessor::ProcessFifoEvents(); } void Write32(const u32 _iValue, const u32 _iAddress) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp index abfd9155f5..c591bd0957 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp @@ -215,6 +215,12 @@ bool VideoSoftware::Video_IsPossibleWaitingSetDrawDone(void) return false; } +bool VideoSoftware::Video_IsHiWatermarkActive(void) +{ + return false; +} + + void VideoSoftware::Video_AbortFrame(void) { } diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h b/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h index 08b4c155ad..7c52e34291 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h @@ -36,7 +36,7 @@ class VideoSoftware : public VideoBackend void Video_SetRendering(bool bEnabled); void Video_GatherPipeBursted(); - + bool Video_IsHiWatermarkActive(); bool Video_IsPossibleWaitingSetDrawDone(); void Video_AbortFrame(); From 614c43029f1ec06cee2014e0cfaa76c0d6ce6889 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Tue, 31 Jan 2012 19:12:21 +1300 Subject: [PATCH 332/381] fixed files so they can have more than one handle opened at a time. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 2 +- .../Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp | 4 ++-- .../Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp | 11 +++++------ Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h | 8 +++++--- 4 files changed, 13 insertions(+), 12 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 921d704a69..fb16c38661 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -285,7 +285,7 @@ void ExecuteCommand(u32 _Address) DeviceID = GetDeviceIDByName(DeviceName); // check if a device with this name has been created already - if (DeviceID == -1) + if (DeviceName.find("/dev/") == std::string::npos || DeviceID == -1) { if (DeviceName.find("/dev/") != std::string::npos) { 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 d17e50e0cd..c0aece3407 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 @@ -168,7 +168,7 @@ bool CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode) else if (ReturnValue == 0) { ERROR_LOG(WII_IPC_FILEIO, " FileIO failed open: %s (%s) - I/O Error", m_Filename.c_str(), Modes[_Mode]); - ReturnValue = FS_INVALID_ARGUMENT; + ReturnValue = FS_RESULT_FATAL; } if (_CommandAddress) @@ -179,7 +179,7 @@ bool CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode) bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) { - u32 ReturnValue = FS_INVALID_ARGUMENT; + u32 ReturnValue = FS_RESULT_FATAL; const s32 SeekPosition = Memory::Read_U32(_CommandAddress + 0xC); const s32 Mode = Memory::Read_U32(_CommandAddress + 0x10); 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 c2ed0fac36..1b32410ef0 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 @@ -109,17 +109,16 @@ bool CWII_IPC_HLE_Device_fs::IOCtlV(u32 _CommandAddress) if (!File::Exists(DirName)) { WARN_LOG(WII_IPC_FILEIO, "FS: Search not found: %s", DirName.c_str()); - ReturnValue = FS_DIRFILE_NOT_FOUND; + ReturnValue = FS_FILE_NOT_EXIST; break; } - - // AyuanX: what if we return "found one successfully" if it is a file? else if (!File::IsDirectory(DirName)) { // It's not a directory, so error. - // Games don't usually seem to care WHICH error they get, as long as it's <0 - WARN_LOG(WII_IPC_FILEIO, "\tNot a directory - return FS_INVALID_ARGUMENT"); - ReturnValue = FS_INVALID_ARGUMENT; + // Games don't usually seem to care WHICH error they get, as long as it's < + // Well the system menu CARES! + WARN_LOG(WII_IPC_FILEIO, "\tNot a directory - return FS_RESULT_FATAL"); + ReturnValue = FS_RESULT_FATAL; break; } 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 be78de7e39..1afb01cf8d 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,12 +31,14 @@ struct NANDStat }; enum { - FS_RESULT_OK = 0, + FS_RESULT_OK = 0, + FS_INVALID = -4, FS_DIRFILE_NOT_FOUND = -6, - FS_INVALID_ARGUMENT = -101, + FS_RESULT_FATAL = -101, + FS_NO_ACCESS = -102, FS_FILE_EXIST = -105, FS_FILE_NOT_EXIST = -106, - FS_RESULT_FATAL = -128, + FS_NO_HANDLE = -106, }; class CWII_IPC_HLE_Device_fs : public IWII_IPC_HLE_Device From e8e2c241d75728ea404a207e1d323233a353fcab Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Tue, 31 Jan 2012 19:28:17 +1300 Subject: [PATCH 333/381] delroth pointed out that it should be "starts with" not "contains". Unlikely this has ever affected anyone.... --- 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 fb16c38661..38baf7f43e 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -287,7 +287,7 @@ void ExecuteCommand(u32 _Address) // check if a device with this name has been created already if (DeviceName.find("/dev/") == std::string::npos || DeviceID == -1) { - if (DeviceName.find("/dev/") != std::string::npos) + if (DeviceName.find("/dev/") == 0) { WARN_LOG(WII_IPC_HLE, "Unimplemented device: %s", DeviceName.c_str()); From 53d2d9718fe3c436b1f2f39133181ef44036aa23 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Tue, 6 Mar 2012 23:10:04 +1300 Subject: [PATCH 334/381] Fixes issue 2917 and possibly others like 5232 --- .../Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp | 199 +++++++++++------- .../Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h | 5 + 2 files changed, 125 insertions(+), 79 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 c0aece3407..7b38639ade 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 @@ -87,6 +87,7 @@ CWII_IPC_HLE_Device_FileIO::CWII_IPC_HLE_Device_FileIO(u32 _DeviceID, const std: , m_pFileHandle(NULL) , m_FileLength(0) , m_Mode(0) + , m_SeekPos(0) { Common::ReadReplacements(replacements); } @@ -99,7 +100,7 @@ bool CWII_IPC_HLE_Device_FileIO::Close(u32 _CommandAddress, bool _bForce) { INFO_LOG(WII_IPC_FILEIO, "FileIO: Close %s (DeviceID=%08x)", m_Name.c_str(), m_DeviceID); - m_pFileHandle.Close(); + //m_pFileHandle.Close(); m_FileLength = 0; m_Mode = 0; @@ -117,7 +118,7 @@ bool CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode) u32 ReturnValue = 0; // close the file handle if we get a reopen - m_pFileHandle.Close(); + //m_pFileHandle.Close(); static const char* const Modes[] = { @@ -128,31 +129,14 @@ bool CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode) }; 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)) { - INFO_LOG(WII_IPC_FILEIO, "FileIO: Open %s (%s)", m_Name.c_str(), Modes[_Mode]); - switch(_Mode) - { - case ISFS_OPEN_READ: - m_pFileHandle.Open(m_Filename, "rb"); - break; - - // "r+b" is technically wrong, but OPEN_WRITE should not truncate the file as "wb" does. - case ISFS_OPEN_WRITE: - m_pFileHandle.Open(m_Filename, "r+b"); - break; - - case ISFS_OPEN_RW: - m_pFileHandle.Open(m_Filename, "r+b"); - break; - - default: - PanicAlertT("FileIO: Unknown open mode : 0x%02x", _Mode); - break; - } + INFO_LOG(WII_IPC_FILEIO, "FileIO: Open %s (%s == %08X)", m_Name.c_str(), Modes[_Mode], _Mode); + ReturnValue = m_DeviceID; } else { @@ -160,70 +144,99 @@ bool CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode) ReturnValue = FS_FILE_NOT_EXIST; } - if (m_pFileHandle != NULL) - { - m_FileLength = (u32)m_pFileHandle.GetSize(); - ReturnValue = m_DeviceID; - } - else if (ReturnValue == 0) - { - ERROR_LOG(WII_IPC_FILEIO, " FileIO failed open: %s (%s) - I/O Error", m_Filename.c_str(), Modes[_Mode]); - ReturnValue = FS_RESULT_FATAL; - } - if (_CommandAddress) Memory::Write_U32(ReturnValue, _CommandAddress+4); m_Active = true; return true; } + + +bool CWII_IPC_HLE_Device_FileIO::OpenFile() +{ + switch(m_Mode) + { + case ISFS_OPEN_READ: + m_pFileHandle.Open(m_Filename, "rb"); + break; + + // "r+b" is technically wrong, but OPEN_WRITE should not truncate the file as "wb" does. + case ISFS_OPEN_WRITE: + m_pFileHandle.Open(m_Filename, "r+b"); + break; + + case ISFS_OPEN_RW: + m_pFileHandle.Open(m_Filename, "r+b"); + break; + + default: + PanicAlertT("FileIO: Unknown open mode : 0x%02x", m_Mode); + break; + } + return m_pFileHandle.IsOpen(); +} + +void CWII_IPC_HLE_Device_FileIO::CloseFile() +{ + m_pFileHandle.Close(); +} + 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); - if (m_pFileHandle == NULL) - { - ERROR_LOG(WII_IPC_FILEIO, "FILEIO: Seek failed because of null file handle - %s", m_Name.c_str()); - ReturnValue = FS_FILE_NOT_EXIST; - } - else if (Mode >= 0 && Mode <= 2) + + if(OpenFile()) { + ReturnValue = FS_RESULT_FATAL; + const u64 fileSize = m_pFileHandle.GetSize(); - INFO_LOG(WII_IPC_FILEIO, "FileIO: Seek Pos: 0x%08x, Mode: %i (%s, Length=0x%08llx)", SeekPosition, Mode, m_Name.c_str(), fileSize); - - // Set seek mode - int seek_mode[3] = {SEEK_SET, SEEK_CUR, SEEK_END}; - - // POSIX allows seek past EOF, the Wii does not. - // TODO: Can we check this without tell'ing/seek'ing twice? - const u64 curPos = m_pFileHandle.Tell(); - if (m_pFileHandle.Seek(SeekPosition, seek_mode[Mode])) - { - const u64 newPos = m_pFileHandle.Tell(); - if (newPos > fileSize) + switch(Mode){ + case 0: { - ERROR_LOG(WII_IPC_FILEIO, "FILEIO: Seek past EOF - %s", m_Name.c_str()); - m_pFileHandle.Seek(curPos, SEEK_SET); + if(SeekPosition >=0 && SeekPosition <= fileSize) + { + m_SeekPos = SeekPosition; + ReturnValue = m_SeekPos; + } + break; + } + case 1: + { + s32 wantedPos = SeekPosition+m_SeekPos; + if(wantedPos >=0 && wantedPos <= fileSize) + { + m_SeekPos = wantedPos; + ReturnValue = m_SeekPos; + } + break; + } + case 2: + { + s32 wantedPos = fileSize+m_SeekPos; + if(wantedPos >=0 && wantedPos <= fileSize) + { + m_SeekPos = wantedPos; + ReturnValue = m_SeekPos; + } + break; + } + default: + { + PanicAlert("CWII_IPC_HLE_Device_FileIO Unsupported seek mode %i", Mode); + ReturnValue = FS_RESULT_FATAL; + break; } - else - ReturnValue = (u32)newPos; - } - else - { - // Must clear the failbits, since subsequent seeks don't care about - // past failure on Wii - m_pFileHandle.Clear(); - ERROR_LOG(WII_IPC_FILEIO, "FILEIO: Seek failed - %s", m_Name.c_str()); } + CloseFile(); } else { - PanicAlert("CWII_IPC_HLE_Device_FileIO Unsupported seek mode %i", Mode); + ReturnValue = FS_FILE_NOT_EXIST; } - Memory::Write_U32(ReturnValue, _CommandAddress + 0x4); return true; @@ -235,7 +248,8 @@ bool CWII_IPC_HLE_Device_FileIO::Read(u32 _CommandAddress) const u32 Address = Memory::Read_U32(_CommandAddress + 0xC); // Read to this memory address const u32 Size = Memory::Read_U32(_CommandAddress + 0x10); - if (m_pFileHandle != NULL) + + if(OpenFile()) { if (m_Mode == ISFS_OPEN_WRITE) { @@ -244,15 +258,24 @@ bool CWII_IPC_HLE_Device_FileIO::Read(u32 _CommandAddress) 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())) + { ReturnValue = FS_EACCESS; + } + else + { + m_SeekPos += Size; + } + } + CloseFile(); } else { - ERROR_LOG(WII_IPC_FILEIO, "FileIO: Failed to read from %s (Addr=0x%08x Size=0x%x) - file not open", m_Name.c_str(), Address, Size); + ERROR_LOG(WII_IPC_FILEIO, "FileIO: Failed to read from %s (Addr=0x%08x Size=0x%x) - file could not be opened or does not exist", m_Name.c_str(), Address, Size); + ReturnValue = FS_FILE_NOT_EXIST; } Memory::Write_U32(ReturnValue, _CommandAddress + 0x4); @@ -265,9 +288,8 @@ bool CWII_IPC_HLE_Device_FileIO::Write(u32 _CommandAddress) const u32 Address = Memory::Read_U32(_CommandAddress + 0xC); // Write data from this memory address const u32 Size = Memory::Read_U32(_CommandAddress + 0x10); - INFO_LOG(WII_IPC_FILEIO, "FileIO: Write 0x%04x bytes from 0x%08x to %s", Size, Address, m_Name.c_str()); - if (m_pFileHandle) + if(OpenFile()) { if (m_Mode == ISFS_OPEN_READ) { @@ -275,9 +297,20 @@ bool CWII_IPC_HLE_Device_FileIO::Write(u32 _CommandAddress) } 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)) + { ReturnValue = Size; + m_SeekPos += Size; + } } + CloseFile(); + } + else + { + ERROR_LOG(WII_IPC_FILEIO, "FileIO: Failed to read from %s (Addr=0x%08x Size=0x%x) - file could not be opened or does not exist", m_Name.c_str(), Address, Size); + ReturnValue = FS_FILE_NOT_EXIST; } Memory::Write_U32(ReturnValue, _CommandAddress + 0x4); @@ -296,20 +329,30 @@ bool CWII_IPC_HLE_Device_FileIO::IOCtl(u32 _CommandAddress) //u32 BufferInSize = Memory::Read_U32(_CommandAddress + 0x14); //u32 BufferOut = Memory::Read_U32(_CommandAddress + 0x18); //u32 BufferOutSize = Memory::Read_U32(_CommandAddress + 0x1C); + + // Return Value + u32 ReturnValue = 0; // no error switch(Parameter) { case ISFS_IOCTL_GETFILESTATS: { - m_FileLength = (u32)m_pFileHandle.GetSize(); - const u32 Position = (u32)m_pFileHandle.Tell(); + if(OpenFile()) + { + m_FileLength = (u32)m_pFileHandle.GetSize(); - const u32 BufferOut = Memory::Read_U32(_CommandAddress + 0x18); - INFO_LOG(WII_IPC_FILEIO, "FileIO: ISFS_IOCTL_GETFILESTATS"); - INFO_LOG(WII_IPC_FILEIO, " File: %s, Length: %i, Pos: %i", m_Name.c_str(), m_FileLength, Position); + const u32 BufferOut = Memory::Read_U32(_CommandAddress + 0x18); + INFO_LOG(WII_IPC_FILEIO, "FileIO: ISFS_IOCTL_GETFILESTATS"); + INFO_LOG(WII_IPC_FILEIO, " File: %s, Length: %i, Pos: %i", m_Name.c_str(), m_FileLength, m_SeekPos); - Memory::Write_U32(m_FileLength, BufferOut); - Memory::Write_U32(Position, BufferOut+4); + Memory::Write_U32(m_FileLength, BufferOut); + Memory::Write_U32(m_SeekPos, BufferOut+4); + CloseFile(); + } + else + { + ReturnValue = FS_FILE_NOT_EXIST; + } } break; @@ -321,8 +364,6 @@ bool CWII_IPC_HLE_Device_FileIO::IOCtl(u32 _CommandAddress) } - // Return Value - const u32 ReturnValue = 0; // no error Memory::Write_U32(ReturnValue, _CommandAddress + 0x4); return true; 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 d1f51b7dfc..b7f3de3d62 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 @@ -39,6 +39,9 @@ public: bool IOCtl(u32 _CommandAddress); void DoState(PointerWrap &p); + bool OpenFile(); + void CloseFile(); + private: enum { @@ -77,6 +80,8 @@ private: u32 m_FileLength; u32 m_Mode; + u32 m_SeekPos; + std::string m_Filename; }; From 880992b10ff2d93e69a740ed82a04e6ee271b2f4 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Wed, 7 Mar 2012 00:21:31 +1300 Subject: [PATCH 335/381] Fixed DoState and removed unneeded class variable. --- .../Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp | 29 ++----------------- .../Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h | 1 - 2 files changed, 3 insertions(+), 27 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 7b38639ade..98a85d25ca 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 @@ -85,7 +85,6 @@ void HLE_IPC_CreateVirtualFATFilesystem() 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_FileLength(0) , m_Mode(0) , m_SeekPos(0) { @@ -99,10 +98,6 @@ CWII_IPC_HLE_Device_FileIO::~CWII_IPC_HLE_Device_FileIO() bool CWII_IPC_HLE_Device_FileIO::Close(u32 _CommandAddress, bool _bForce) { INFO_LOG(WII_IPC_FILEIO, "FileIO: Close %s (DeviceID=%08x)", m_Name.c_str(), m_DeviceID); - - //m_pFileHandle.Close(); - - m_FileLength = 0; m_Mode = 0; // Close always return 0 for success @@ -339,7 +334,7 @@ bool CWII_IPC_HLE_Device_FileIO::IOCtl(u32 _CommandAddress) { if(OpenFile()) { - m_FileLength = (u32)m_pFileHandle.GetSize(); + u32 m_FileLength = (u32)m_pFileHandle.GetSize(); const u32 BufferOut = Memory::Read_U32(_CommandAddress + 0x18); INFO_LOG(WII_IPC_FILEIO, "FileIO: ISFS_IOCTL_GETFILESTATS"); @@ -371,25 +366,7 @@ bool CWII_IPC_HLE_Device_FileIO::IOCtl(u32 _CommandAddress) void CWII_IPC_HLE_Device_FileIO::DoState(PointerWrap &p) { - bool have_file_handle = m_pFileHandle; - s32 seek = (have_file_handle) ? (s32)m_pFileHandle.Tell() : 0; - - p.Do(have_file_handle); p.Do(m_Mode); - p.Do(seek); - - if (p.GetMode() == PointerWrap::MODE_READ) - { - if (have_file_handle) - { - // TODO: isn't it naive and error-prone to assume that the file hasn't changed since we created the savestate? - Open(0, m_Mode); - _dbg_assert_msg_(WII_IPC_HLE, m_pFileHandle, "bad filehandle"); - } - else - Close(0, true); - } - - if (have_file_handle) - m_pFileHandle.Seek(seek, SEEK_SET); + p.Do(m_SeekPos); + p.Do(m_Filename); } 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 b7f3de3d62..ff34a43a20 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,7 +77,6 @@ private: }; File::IOFile m_pFileHandle; - u32 m_FileLength; u32 m_Mode; u32 m_SeekPos; From 09217a6c47968d3d411c664514fbc9a50e03d970 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 6 Mar 2012 21:38:33 +0100 Subject: [PATCH 336/381] Update PokePark Wii game ini. Needs to have texture cache accuracy set to mid setting. --- Data/User/GameConfig/R8AJ01.ini | 6 ++++-- Data/User/GameConfig/R8AP01.ini | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Data/User/GameConfig/R8AJ01.ini b/Data/User/GameConfig/R8AJ01.ini index 546d2f51ca..594e651a76 100644 --- a/Data/User/GameConfig/R8AJ01.ini +++ b/Data/User/GameConfig/R8AJ01.ini @@ -1,7 +1,9 @@ # R8AJ01 - 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 = 2 -EmulationIssues = Stuck on loading screen after movie (see issue 2917). +EmulationStateId = 4 +EmulationIssues = NPCs sporadically disappear. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video_Settings] +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/R8AP01.ini b/Data/User/GameConfig/R8AP01.ini index a1863578f0..1c06c00d3d 100644 --- a/Data/User/GameConfig/R8AP01.ini +++ b/Data/User/GameConfig/R8AP01.ini @@ -1,8 +1,8 @@ # R8AP01 - 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 = 2 -EmulationIssues = Stuck on loading screen after movie (see issue 2917). +EmulationStateId = 4 +EmulationIssues = NPCs sporadically disappear. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -13,3 +13,5 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Gecko] +[Video_Settings] +SafeTextureCacheColorSamples = 512 From 6fc8cdf12d41ea9f9be2d345face72ddf1fe045d Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Wed, 7 Mar 2012 20:08:14 -0800 Subject: [PATCH 337/381] revert r90a2096a24f4 behavior changes in PixelEngine.cpp. Thanks to Autoran1 for finding the responsible commit. Fixes Scrubbing Serena Beach Countdown in both SC and DC. Fixes issue 1498. --- Source/Core/VideoCommon/Src/PixelEngine.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/Core/VideoCommon/Src/PixelEngine.cpp b/Source/Core/VideoCommon/Src/PixelEngine.cpp index 456e0fb535..8164bc41da 100644 --- a/Source/Core/VideoCommon/Src/PixelEngine.cpp +++ b/Source/Core/VideoCommon/Src/PixelEngine.cpp @@ -269,6 +269,10 @@ void Read16(u16& _uReturnValue, const u32 _iAddress) case PE_PERF_5L: case PE_PERF_5H: INFO_LOG(PIXELENGINE, "(r16) perf counter @ %08x", _iAddress); + // git r90a2096a24f4 (svn r3663) added the PE_PERF cases, without setting + // _uReturnValue to anything, this reverts to the previous behaviour which allows + // The timer in SMS:Scrubbing Serena Beach to countdown correctly + _uReturnValue = 1; break; default: From c2e6fdf09f33f7765526fac680d13af9ba744125 Mon Sep 17 00:00:00 2001 From: marcosvitali Date: Thu, 8 Mar 2012 02:47:55 -0300 Subject: [PATCH 338/381] - I've fixed possibles random hangs in DC mode. - I've fixed hangs in DC mode in (Simpsons, Monkey Island, Pokemon XD, etc) - I've implemented accurate manage of Pixel Engine Interrupts, now the GPU loop is stopped when a PE Interrupt needs to be managed and resume when Pixel Engine finish, I think now, the Fifo in DC mode is more accurate than SC mode. :) Time to close the big fifo Issue 3694 (snif), please if you have a possible fifo issue report this like a game issue. I was working with Skid_AU together, especially thanks for him. Test a lot all games, and compare the performance with the master maybe this accuracy has a cost (not a lot). I think now the fifo is very stable, overflow fixed, random hang fixed, if you have a game with a hang with this rev and not in master please report this. --- Source/Core/VideoCommon/Src/CommandProcessor.cpp | 5 +++-- Source/Core/VideoCommon/Src/Fifo.cpp | 3 ++- Source/Core/VideoCommon/Src/PixelEngine.cpp | 5 +++++ Source/Core/VideoCommon/Src/PixelEngine.h | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp index 38b342b76c..4fd7e88f5e 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp @@ -596,8 +596,8 @@ void SetCpStatusRegister() // Here always there is one fifo attached to the GPU m_CPStatusReg.Breakpoint = fifo.bFF_Breakpoint; - m_CPStatusReg.ReadIdle = (fifo.CPReadPointer == fifo.CPWritePointer) || (fifo.CPReadPointer == fifo.CPBreakpoint); - m_CPStatusReg.CommandIdle = !fifo.CPReadWriteDistance; + m_CPStatusReg.ReadIdle = (fifo.CPReadPointer == fifo.CPWritePointer) || (fifo.CPReadPointer == fifo.CPBreakpoint) ; + m_CPStatusReg.CommandIdle = !fifo.CPReadWriteDistance || (IsOnThread() && PixelEngine::WaitingForPEInterrupt()); m_CPStatusReg.UnderflowLoWatermark = fifo.bFF_LoWatermark; m_CPStatusReg.OverflowHiWatermark = fifo.bFF_HiWatermark; @@ -620,6 +620,7 @@ void SetCpControlRegister() if (!fifo.bFF_GPReadEnable && m_CPCtrlReg.GPReadEnable && !m_CPCtrlReg.BPEnable) { + ProcessFifoEvents(); PixelEngine::ResetSetFinish(); } diff --git a/Source/Core/VideoCommon/Src/Fifo.cpp b/Source/Core/VideoCommon/Src/Fifo.cpp index 5cb3252816..2e60055c97 100644 --- a/Source/Core/VideoCommon/Src/Fifo.cpp +++ b/Source/Core/VideoCommon/Src/Fifo.cpp @@ -22,6 +22,7 @@ #include "Atomic.h" #include "OpcodeDecoding.h" #include "CommandProcessor.h" +#include "PixelEngine.h" #include "ChunkFile.h" #include "Fifo.h" #include "HW/Memmap.h" @@ -137,7 +138,7 @@ void RunGpuLoop() CommandProcessor::SetCpStatus(); // check if we are able to run this buffer - while (!CommandProcessor::interruptWaiting && fifo.bFF_GPReadEnable && fifo.CPReadWriteDistance && !AtBreakpoint()) + while (GpuRunningState && !CommandProcessor::interruptWaiting && fifo.bFF_GPReadEnable && fifo.CPReadWriteDistance && !AtBreakpoint() && !PixelEngine::WaitingForPEInterrupt()) { if (!GpuRunningState) break; diff --git a/Source/Core/VideoCommon/Src/PixelEngine.cpp b/Source/Core/VideoCommon/Src/PixelEngine.cpp index ec0683742f..09cb9b8a5c 100644 --- a/Source/Core/VideoCommon/Src/PixelEngine.cpp +++ b/Source/Core/VideoCommon/Src/PixelEngine.cpp @@ -468,4 +468,9 @@ void ResetSetToken() } CommandProcessor::interruptTokenWaiting = false; } + +bool WaitingForPEInterrupt() +{ + return CommandProcessor::interruptFinishWaiting || CommandProcessor::interruptTokenWaiting || interruptSetFinish || interruptSetToken; +} } // end of namespace PixelEngine diff --git a/Source/Core/VideoCommon/Src/PixelEngine.h b/Source/Core/VideoCommon/Src/PixelEngine.h index dd0304fbe1..5e64300ef3 100644 --- a/Source/Core/VideoCommon/Src/PixelEngine.h +++ b/Source/Core/VideoCommon/Src/PixelEngine.h @@ -80,7 +80,7 @@ void SetToken(const u16 _token, const int _bSetTokenAcknowledge); void SetFinish(void); void ResetSetFinish(void); void ResetSetToken(void); -bool AllowIdleSkipping(); +bool WaitingForPEInterrupt(); // Bounding box functionality. Paper Mario (both) are a couple of the few games that use it. extern u16 bbox[4]; From 63176ba38d55b2489291e56ef1fa6c34a7f7a9d4 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Thu, 8 Mar 2012 10:00:40 +0100 Subject: [PATCH 339/381] Revert "Updated English translation, fixes issue 5214." This reverts commit cbab8329076320f27e7286b436fef9f4a3296f57. As glennricster said in the comments, the modification should not be done in that way. --- Languages/po/en.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Languages/po/en.po b/Languages/po/en.po index cf04ba0512..f08b1e1cdf 100644 --- a/Languages/po/en.po +++ b/Languages/po/en.po @@ -4588,7 +4588,7 @@ msgid "" "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." +"If unsure, use the second-fastest value from the right." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 From b69a1d225a0736a1fabbb6b03bcdb5815f681de0 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Thu, 8 Mar 2012 10:01:40 +0100 Subject: [PATCH 340/381] Use -std=gnu++0x instead of -std=c++0x Bluez uses the non standard "typeof" instead of "__typeof__" in bluetooth.h. Both GCC and Clang reject that with std=c++0x but accept it with gnu++0x. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c59e3f7c07..b64c5b6f61 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -552,7 +552,7 @@ option(UNITTESTS "Build unitests" OFF) ######################################## # Start compiling our code # -add_definitions(-std=c++0x) +add_definitions(-std=gnu++0x) add_subdirectory(Source) From 41652d6b1f391fdcd0f599463f689c0299cdc007 Mon Sep 17 00:00:00 2001 From: marcosvitali Date: Fri, 9 Mar 2012 01:33:29 -0300 Subject: [PATCH 341/381] I've fixed Metroid Prime 3 and 2 desync. And other games with desync because of FIFO Reset. That happens because FIFO_RW_DISTANCE_HI must be written first, for checking fifo.CPReadWriteDistance == 0, so some fifo resets was not managed in the right way. I didn't test Metroid 2 desync reported in Issue 4336 but I think is the same. About the flickering in MP2, I don't know for my is not related or yes, but you can test anyway. Fixed Issue 3902 Well now the FIFO is 99.99% finished :) --- Source/Core/VideoCommon/Src/CommandProcessor.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp index 4fd7e88f5e..a6e68f6298 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp @@ -388,10 +388,6 @@ void Write16(const u16 _Value, const u32 _Address) case FIFO_RW_DISTANCE_HI: WriteHigh((u32 &)fifo.CPReadWriteDistance, _Value); - DEBUG_LOG(COMMANDPROCESSOR,"try to write to FIFO_RW_DISTANCE_HI : %04x", _Value); - break; - case FIFO_RW_DISTANCE_LO: - WriteLow((u32 &)fifo.CPReadWriteDistance, _Value & 0xFFE0); if (fifo.CPReadWriteDistance == 0) { GPFifo::ResetGatherPipe(); @@ -401,6 +397,10 @@ void Write16(const u16 _Value, const u32 _Address) ResetVideoBuffer(); } IncrementCheckContextId(); + DEBUG_LOG(COMMANDPROCESSOR,"try to write to FIFO_RW_DISTANCE_HI : %04x", _Value); + break; + case FIFO_RW_DISTANCE_LO: + WriteLow((u32 &)fifo.CPReadWriteDistance, _Value & 0xFFE0); DEBUG_LOG(COMMANDPROCESSOR,"try to write to FIFO_RW_DISTANCE_LO : %04x", _Value); break; From 104603467be6cc15e63dfb5cadec8044edd1da46 Mon Sep 17 00:00:00 2001 From: marcosvitali Date: Fri, 9 Mar 2012 18:58:23 -0300 Subject: [PATCH 342/381] This commit fix games hanging because of my prior Revision c2e6fdf09f33 The external exceptions in dolphin are checking frequently but is different to real HW, so sometime the game is in a loop checking GPU STATUS, the exceptions doesn't checked, and the game hang.\ For solve this I need a trick: still waiting for the exception handler be linked but if CommandProcecsor is reading the GPStatus, resume this. This fixed "TimeSplitters: Future Perfect" broken in the Revision c2e6fdf09f33 and surely others games. --- Source/Core/VideoCommon/Src/CommandProcessor.cpp | 10 +++++++--- Source/Core/VideoCommon/Src/PixelEngine.cpp | 14 ++++++++------ Source/Core/VideoCommon/Src/PixelEngine.h | 1 + 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp index a6e68f6298..77c02d1692 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp @@ -574,7 +574,7 @@ void ProcessFifoAllDistance() if (IsOnThread()) { while (!CommandProcessor::interruptWaiting && fifo.bFF_GPReadEnable && - fifo.CPReadWriteDistance && !AtBreakpoint()) + fifo.CPReadWriteDistance && !AtBreakpoint() && !PixelEngine::WaitingForPEInterrupt()) Common::YieldCPU(); } bProcessFifoAllDistance = false; @@ -597,10 +597,12 @@ void SetCpStatusRegister() m_CPStatusReg.Breakpoint = fifo.bFF_Breakpoint; m_CPStatusReg.ReadIdle = (fifo.CPReadPointer == fifo.CPWritePointer) || (fifo.CPReadPointer == fifo.CPBreakpoint) ; - m_CPStatusReg.CommandIdle = !fifo.CPReadWriteDistance || (IsOnThread() && PixelEngine::WaitingForPEInterrupt()); + m_CPStatusReg.CommandIdle = !fifo.CPReadWriteDistance; m_CPStatusReg.UnderflowLoWatermark = fifo.bFF_LoWatermark; m_CPStatusReg.OverflowHiWatermark = fifo.bFF_HiWatermark; - + + PixelEngine::ResumeWaitingForPEInterrupt(); + INFO_LOG(COMMANDPROCESSOR,"\t Read from STATUS_REGISTER : %04x", m_CPStatusReg.Hex); DEBUG_LOG(COMMANDPROCESSOR, "(r) status: iBP %s | fReadIdle %s | fCmdIdle %s | iOvF %s | iUndF %s" , m_CPStatusReg.Breakpoint ? "ON" : "OFF" @@ -609,6 +611,8 @@ void SetCpStatusRegister() , m_CPStatusReg.OverflowHiWatermark ? "ON" : "OFF" , m_CPStatusReg.UnderflowLoWatermark ? "ON" : "OFF" ); + + } void SetCpControlRegister() diff --git a/Source/Core/VideoCommon/Src/PixelEngine.cpp b/Source/Core/VideoCommon/Src/PixelEngine.cpp index 09cb9b8a5c..750e8fbb40 100644 --- a/Source/Core/VideoCommon/Src/PixelEngine.cpp +++ b/Source/Core/VideoCommon/Src/PixelEngine.cpp @@ -356,22 +356,16 @@ void UpdateInterrupts() void UpdateTokenInterrupt(bool active) { - if(interruptSetToken != active) - { ProcessorInterface::SetInterrupt(INT_CAUSE_PE_TOKEN, active); interruptSetToken = active; - } } void UpdateFinishInterrupt(bool active) { - if(interruptSetFinish != active) - { ProcessorInterface::SetInterrupt(INT_CAUSE_PE_FINISH, active); interruptSetFinish = active; if (active) State::ProcessRequestedStates(0); - } } // TODO(mb2): Refactor SetTokenINT_OnMainThread(u64 userdata, int cyclesLate). @@ -473,4 +467,12 @@ bool WaitingForPEInterrupt() { return CommandProcessor::interruptFinishWaiting || CommandProcessor::interruptTokenWaiting || interruptSetFinish || interruptSetToken; } + +void ResumeWaitingForPEInterrupt() +{ + interruptSetFinish = false; + interruptSetToken = false; + CommandProcessor::interruptFinishWaiting = false; + CommandProcessor::interruptTokenWaiting = false; +} } // end of namespace PixelEngine diff --git a/Source/Core/VideoCommon/Src/PixelEngine.h b/Source/Core/VideoCommon/Src/PixelEngine.h index 5e64300ef3..64f959009f 100644 --- a/Source/Core/VideoCommon/Src/PixelEngine.h +++ b/Source/Core/VideoCommon/Src/PixelEngine.h @@ -81,6 +81,7 @@ void SetFinish(void); void ResetSetFinish(void); void ResetSetToken(void); bool WaitingForPEInterrupt(); +void ResumeWaitingForPEInterrupt(); // Bounding box functionality. Paper Mario (both) are a couple of the few games that use it. extern u16 bbox[4]; From 61d5624c2d4c64e34184dc2ade69a8bdeae711c7 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 11 Oct 2011 23:25:14 -0500 Subject: [PATCH 343/381] Update translation files for recent changes in the code. --- Languages/po/ar.po | 295 +++++++++++++++++++++++++++++ Languages/po/ca.po | 248 ++++++++++++++++++++++++ Languages/po/cs.po | 263 ++++++++++++++++++++++++++ Languages/po/de.po | 245 ++++++++++++++++++++++++ Languages/po/dolphin-emu.pot | 243 ++++++++++++++++++++++++ Languages/po/el.po | 353 +++++++++++++++++++++++++++++++++++ Languages/po/en.po | 243 ++++++++++++++++++++++++ Languages/po/es.po | 319 +++++++++++++++++++++++++++++++ Languages/po/fr.po | 312 +++++++++++++++++++++++++++++++ Languages/po/he.po | 243 ++++++++++++++++++++++++ Languages/po/hu.po | 272 +++++++++++++++++++++++++++ Languages/po/it.po | 245 ++++++++++++++++++++++++ Languages/po/ja.po | 263 ++++++++++++++++++++++++++ Languages/po/ko.po | 245 ++++++++++++++++++++++++ Languages/po/nb.po | 245 ++++++++++++++++++++++++ Languages/po/nl.po | 245 ++++++++++++++++++++++++ Languages/po/pl.po | 276 +++++++++++++++++++++++++++ Languages/po/pt.po | 248 ++++++++++++++++++++++++ Languages/po/pt_BR.po | 276 +++++++++++++++++++++++++++ Languages/po/ru.po | 245 ++++++++++++++++++++++++ Languages/po/sr.po | 243 ++++++++++++++++++++++++ Languages/po/tr.po | 245 ++++++++++++++++++++++++ Languages/po/zh_CN.po | 245 ++++++++++++++++++++++++ Languages/po/zh_TW.po | 245 ++++++++++++++++++++++++ 24 files changed, 6302 insertions(+) diff --git a/Languages/po/ar.po b/Languages/po/ar.po index 845b571a9a..322a2c504f 100644 --- a/Languages/po/ar.po +++ b/Languages/po/ar.po @@ -7,9 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-16 11:25-0500\n" "Last-Translator: mansoor\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-07-20 13:33+0300\n" +"Last-Translator: \n" +>>>>>>> Update translation files for recent changes in the code. "Language-Team: \n" "Language: \n" "MIME-Version: 1.0\n" @@ -418,6 +424,10 @@ msgid "Accurate VBeam emulation" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -529,9 +539,15 @@ msgstr "أض٠باتش" msgid "Add new pane" msgstr "إضاÙØ© جزء جديد" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "أضÙ" @@ -585,8 +601,13 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "جميع ملÙات الجيم كيوب (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Ø­Ùظ جميع الحالات (sav, s##)" @@ -615,8 +636,14 @@ msgstr "" "إذا لم تكن متأكدا اترك هذا غير محددة." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "بديل ويموت" +======= +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "محاكاة ويموت" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -671,7 +698,11 @@ msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙØŸ " msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙات؟" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "نسبة العرض :" @@ -692,7 +723,11 @@ msgstr "صوت الخلÙية :" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "تلقائي" @@ -807,7 +842,11 @@ msgid "Blue Right" msgstr "اليمين أزرق" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "أسÙÙ„" @@ -840,7 +879,11 @@ msgstr "لاستعراض الدليل الإخراج" msgid "Buffer:" msgstr "العازلة :" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1082,7 +1125,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "إغلاق" @@ -1191,7 +1238,11 @@ msgstr "توصيل ويموت 3" msgid "Connect Wiimote 4" msgstr "توصيل ويموت 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "توصيل" @@ -1384,7 +1435,11 @@ msgid "DSP Emulator Engine" msgstr "محرك محاكي الصوت" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulation (سريع)" @@ -1613,7 +1668,11 @@ msgstr "" msgid "Divide" msgstr "انقسام" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "هل تريد اغلق اللعبة الحالية؟" @@ -1642,12 +1701,21 @@ msgstr "إعدادات تحكم الوي" msgid "Dolphin FIFO" msgstr "دولÙين" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "إعدادات تحكم الجيم كيوب" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "إعدادات تحكم الجيم كيوب" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1741,9 +1809,15 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Dutch" @@ -1879,15 +1953,22 @@ msgstr "BAT تمكين" msgid "Enable Block Merging" msgstr "تمكين منع الدمج" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "تمكين التخزين المؤقت" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "تمكين الاسرار " @@ -2035,9 +2116,15 @@ msgstr "" msgid "End" msgstr "نهاية" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "English" @@ -2066,6 +2153,7 @@ msgstr "المساواة" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "خطأ" @@ -2077,6 +2165,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "خطأ" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "خطأ ÙÙŠ تحميل اللغة المختارة. يتراجع إلى النظام الاÙتراضية." @@ -2511,9 +2605,15 @@ msgstr "إطارات لتسجيل" msgid "Free Look" msgstr "تحكم بكاميرا اللعبة" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "French" @@ -2580,7 +2680,11 @@ msgid "Gamecube &Pad Settings" msgstr "إعدادات تحكم جيم كيوب" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "بطاقه ذاكره الجيم كيوب (*.raw,*.gcp) " @@ -2603,8 +2707,12 @@ msgstr "" "(إما غير رمز سيئة أو نوع رمز غير مدعومة حتى الآن.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "عام" @@ -2613,9 +2721,15 @@ msgstr "عام" msgid "General Settings" msgstr "الإعدادات العامة" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "German" @@ -2637,6 +2751,10 @@ msgid "Greater Than" msgstr "أكبر من" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2745,8 +2863,12 @@ msgid "Hotkey Configuration" msgstr "إعدادات الاختصارات" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "الاختصارات" @@ -2955,7 +3077,11 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "wad تثبيت" @@ -3034,9 +3160,15 @@ msgstr "تسجيل المل٠غير صالح" msgid "Invalid state" msgstr "غير صالح حالة" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italian" @@ -3189,11 +3321,19 @@ msgstr "8 تحميل حالة" msgid "Load State..." msgstr "تحميل حالة" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "تحميل قائمة نظام الوي" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "تحميل قائمة نظام الوي" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "تحميل قائمة نظام الوي %d%c" @@ -3273,7 +3413,11 @@ msgstr "MMU سرعة هاك" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "العصا الأيسر" @@ -3304,7 +3448,11 @@ msgid "Memory Byte" msgstr "ذاكرة بايت" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "بطاقة الذاكرة" @@ -3500,7 +3648,11 @@ msgstr "التبويب" msgid "NP Up" msgstr "Ùوق" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3587,7 +3739,11 @@ msgstr "لا يساوي" msgid "Not Set" msgstr "غير مجموعة" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "غير متصل" @@ -3648,7 +3804,10 @@ msgstr "Ùقط %d كتل متاحة" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Ùتح" @@ -3779,8 +3938,13 @@ msgstr "باتش" msgid "Paths" msgstr "مسارات" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "وقÙØ©" @@ -3800,8 +3964,13 @@ msgstr "مشهد %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "بدأ اللعبه" @@ -3827,7 +3996,11 @@ msgstr "خيارات التشغيل" msgid "Players" msgstr "لاعبين" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "يرجى تأكيد" @@ -4038,10 +4211,17 @@ msgstr "تحديث قائمة" msgid "Refresh game list" msgstr "تحديث القائمة" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "إزالة" @@ -4060,7 +4240,10 @@ msgid "Render to Main Window" msgstr "تقدم إلى الشاشة الرئيسية" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "إعادة ضبط" @@ -4103,7 +4286,11 @@ msgstr "Ø­Ùظ الحالة" msgid "Safe" msgstr "آمنة" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "معدل العينة :" @@ -4185,9 +4372,15 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" +<<<<<<< HEAD msgstr "EFB Copia a escala" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +msgstr "" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Ùحص %s" @@ -4227,12 +4420,21 @@ msgstr "" msgid "Select" msgstr "حدد" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "اختر مل٠تسجيل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "اختر مل٠تسجيل" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "لتثبيت wad حدد ملÙ" @@ -4258,6 +4460,7 @@ msgstr "اختر النواÙØ° العائمة" msgid "Select the file to load" msgstr "حدد المل٠لتحميل" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "حدد Ø­Ùظ الملÙ" @@ -4267,6 +4470,17 @@ msgid "Select the state to load" msgstr "حدد حالة التحميل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "حدد Ø­Ùظ الملÙ" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "حدد حالة التحميل" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "حدد حالة الحÙظ" @@ -4640,9 +4854,15 @@ msgstr "Ùشل إنشاء المخزن المؤقت الصوت : %s" msgid "Space" msgstr "مجال" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Spanish" @@ -4686,7 +4906,11 @@ msgstr "" msgid "Standard Controller" msgstr "وحدة تحكم القياسية" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4721,7 +4945,10 @@ msgstr "عصا" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "اغلق اللعبه" @@ -4798,7 +5025,10 @@ msgstr "الجدول الأيمن" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "اخذ لقطه من الشاشه" @@ -4811,12 +5041,23 @@ msgid "Test" msgstr "اختبار" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +<<<<<<< HEAD msgid "Texture" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 msgid "Texture Cache" msgstr "" +======= +#, fuzzy +msgid "Texture" +msgstr "Texturesتعطيل " + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +#, fuzzy +msgid "Texture Cache" +msgstr "إزالة التخزين المؤقت" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" @@ -5031,12 +5272,19 @@ msgstr "تبديل جميع أنواع السجل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "اللعب بالشاشة كاملة" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "أعلى" @@ -5143,6 +5391,18 @@ msgstr "تلقى رسالة مجهولة مع معر٠: %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"مؤشر غير معرو٠%#08x\n" +"مواصلة?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5365,7 +5625,11 @@ msgstr "" msgid "Wii Save Import" msgstr "استيراد Ø­Ùظ الوي" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "ملÙات Ø­Ùظ الوي (*.bin)|*.bin" @@ -5396,7 +5660,11 @@ msgstr "" "أو ربما هو بسبب الخمول وقت مستقطع أو لسبب آخر.\n" "هل تريد إعادة الاتصال على الÙور?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "ويموت متصل" @@ -5428,9 +5696,15 @@ msgstr "نواÙØ° اليمين" msgid "Word Wrap" msgstr "كلمة ختامية" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "العمل" @@ -5661,10 +5935,13 @@ msgstr "أو" #~ msgid "< as Default Profile >" #~ msgstr "< الوضع الاÙتراضي >" +<<<<<<< HEAD #, fuzzy #~ msgid "AOSound" #~ msgstr "&الصوت" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Accurate Texture Cache" #~ msgstr "دقة المظهر السطحي المؤقت" @@ -5702,6 +5979,7 @@ msgstr "أو" #~ "the EFB scale.\n" #~ "ومن الأÙضل Ù„ تعيين نسبة العرض إلى الارتÙاع لتمتد عند استخدامه." +<<<<<<< HEAD #~ msgid "Bad gameini filename" #~ msgstr "Nombre de archivo gameini incorrecto" @@ -5736,6 +6014,8 @@ msgstr "أو" #~ msgid "Config..." #~ msgstr "إعدادات" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Configuration profile" #~ msgstr "التكوين الشخصي" @@ -5836,6 +6116,7 @@ msgstr "أو" #~ msgid "Enable CPU Access" #~ msgstr "CPU Access تمكين" +<<<<<<< HEAD #~ msgid "Enable Copy to EFB" #~ msgstr "Habilitar Copiado al EFB" @@ -5851,12 +6132,15 @@ msgstr "أو" #~ msgid "Enable JIT Dynarec" #~ msgstr "تمكين صÙحات" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Enable OpenCL" #~ msgstr "OpenCL تمكين " #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "تمكين شاشة التوقÙ" +<<<<<<< HEAD #, fuzzy #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" @@ -5930,6 +6214,8 @@ msgstr "أو" #~ msgid "Force Bi/Trilinear Filtering" #~ msgstr "Forzar Filtro Bi/Tri-linear" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Fractional" #~ msgstr "جزئي" @@ -6072,6 +6358,7 @@ msgstr "أو" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "اللازمة لاستعمال الخط القرص اليابانية." +<<<<<<< HEAD #, fuzzy #~ msgid "Run" #~ msgstr "Enter" @@ -6079,6 +6366,8 @@ msgstr "أو" #~ msgid "Running script...\n" #~ msgstr "Ejecutando script...\n" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Scale:" #~ msgstr "النطاق :" @@ -6136,6 +6425,7 @@ msgstr "أو" #~ "عرض إحصاءات مختلÙØ©.\n" #~ "وهذا Ù…Ùيد Ùقط لأغراض التصحيح." +<<<<<<< HEAD #~ msgid "Skies of Arcadia" #~ msgstr "Skies of Arcadia" @@ -6175,12 +6465,15 @@ msgstr "أو" #~ msgid "Specify an audio plugin" #~ msgstr "حدد الخلÙية مل٠Ùيديو" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Start Renderer in Fullscreen" #~ msgstr "بدء ÙÙŠ كمال ملء الشاشة" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "بدء التقديم ÙÙŠ إطار وضع ملء الشاشة." +<<<<<<< HEAD #~ msgid "The file " #~ msgstr "El archivo " @@ -6201,6 +6494,8 @@ msgstr "أو" #~ "مؤشر غير معرو٠%#08x\n" #~ "مواصلة?" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Use FPS For Limiting" #~ msgstr "لحد عدد الاطارات" diff --git a/Languages/po/ca.po b/Languages/po/ca.po index f78b52303b..bb6dd4f690 100644 --- a/Languages/po/ca.po +++ b/Languages/po/ca.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-08-19 08:36-0500\n" "Last-Translator: Jordi Coma \n" "Language-Team: Catalan \n" @@ -564,9 +568,15 @@ msgstr "Afegeix Pegat" msgid "Add new pane" msgstr "Afegeix un nou panell" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Afegir ..." @@ -634,8 +644,13 @@ msgstr "Totes les imatges GC / Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tots els fitxers GameCube GCM (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tots els Estats (savi, s##\")" @@ -724,7 +739,11 @@ 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!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relació d'aspecte:" @@ -745,7 +764,11 @@ msgstr "Suport d'àudio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error en obrir el dispositiu AO \n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -861,7 +884,11 @@ msgid "Blue Right" msgstr "Blau dret" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Abaix" @@ -894,7 +921,11 @@ msgstr "Examineu el directori de sortida" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1151,7 +1182,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Tancar" @@ -1260,7 +1295,11 @@ msgstr "Connectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Connectar Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Connectant ..." @@ -1451,7 +1490,11 @@ msgid "DSP Emulator Engine" msgstr "Motor d'emulació DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulació DSP HLE (ràpid)" @@ -1682,7 +1725,11 @@ msgstr "" msgid "Divide" msgstr "Divideix" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Voleu aturar l'emulació actual?" @@ -1711,12 +1758,21 @@ msgstr "Configuració de Wiimote emulat" msgid "Dolphin FIFO" msgstr "FIFO Dolphin" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Configuració del control GC Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Configuració del control GC Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin Pel·lícules TAS (*.dtm)" @@ -1813,9 +1869,15 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Holandès" @@ -1960,15 +2022,22 @@ msgstr "Habilitar les millors tècniques disponibles" msgid "Enable Block Merging" msgstr "Habilitar fusió de Bloc" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Habilitar memòria cau" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Activar Trucs" @@ -2121,9 +2190,15 @@ msgstr "" msgid "End" msgstr "Fi" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Anglès" @@ -2152,6 +2227,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -2163,6 +2239,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Error" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2621,9 +2703,15 @@ msgstr "Imatges a Enregistrar" msgid "Free Look" msgstr "Visió lliure" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Francès" @@ -2690,7 +2778,11 @@ msgid "Gamecube &Pad Settings" msgstr "Configuració control «&Gamecube»" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Targetes de memòria per GameCube (*.raw, *.gcp)" @@ -2713,8 +2805,12 @@ msgstr "" "(Pot ser un codi incorrecte o el tipus de codi encara no està suportat.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -2723,9 +2819,15 @@ msgstr "General" msgid "General Settings" msgstr "Configuració General" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Alemany" @@ -2859,8 +2961,12 @@ msgid "Hotkey Configuration" msgstr "Tecla d'accés de configuració" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "Tecles d'accés" @@ -3085,7 +3191,11 @@ msgstr "" "InstallExceptionHandler cridat, però aquesta plataforma no està suportada " "encara." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Instal·lant WAD ..." @@ -3167,9 +3277,15 @@ msgstr "Enregistrament de fitxer invàlid" msgid "Invalid state" msgstr "Estat invàlid" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italià" @@ -3327,11 +3443,19 @@ msgstr "Carregar ranura d'estat 8" msgid "Load State..." msgstr "Carregar Estat..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Carregar el menú del sistema Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Carregar el menú del sistema Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar menú del sistema Wii %d%c" @@ -3413,7 +3537,11 @@ msgstr "Modificació de velocitat MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Arxius MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Palanca principal" @@ -3444,7 +3572,11 @@ msgid "Memory Byte" msgstr "Byte de memòria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Targeta de memòria" @@ -3644,7 +3776,11 @@ msgstr "NP Tabulador" msgid "NP Up" msgstr "NP Amunt" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3731,7 +3867,11 @@ msgstr "No igual" msgid "Not Set" msgstr "Sense establir" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "No està connectat" @@ -3792,7 +3932,10 @@ msgstr "Només queden %d blocs disponibles" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Obrir" @@ -3923,8 +4066,13 @@ msgstr "Pegats" msgid "Paths" msgstr "Camins" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -3944,8 +4092,13 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Executar" @@ -3971,7 +4124,11 @@ msgstr "Opcions de reproducció" msgid "Players" msgstr "Jugadors" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Confirmeu ..." @@ -4183,10 +4340,17 @@ msgstr "Actualitzar llista" msgid "Refresh game list" msgstr "Actualitza la llista de jocs" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Treure" @@ -4205,7 +4369,10 @@ msgid "Render to Main Window" msgstr "Renderitzar a la finestra principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -4248,7 +4415,11 @@ msgstr "&Desa l'estat" msgid "Safe" msgstr "Segur" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Freqüència de mostreig:" @@ -4332,7 +4503,11 @@ msgstr "La pal·lícula guardada %s és corrupta, s'atura la gravació..." msgid "Scaled EFB Copy" msgstr "Copia EFB escalada" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Escanejant %s" @@ -4372,12 +4547,21 @@ msgstr "La secció %s no trobada a SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Seleccionar el fitxer de gravació" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Seleccionar el fitxer de gravació" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleccionar un fitxer WAD de Wii per instal·lar" @@ -4402,6 +4586,7 @@ msgstr "Seleccioneu finestres flotants" msgid "Select the file to load" msgstr "Seleccioneu el fitxer a carregar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Seleccioneu el fitxer de partida desada" @@ -4411,6 +4596,17 @@ msgid "Select the state to load" msgstr "Seleccioneu l'estat a carregar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Seleccioneu el fitxer de partida desada" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Seleccioneu l'estat a carregar" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Seleccioneu l'estat a desar" @@ -4793,9 +4989,15 @@ msgstr "Ha fallat la creació del buffer de so: %s" msgid "Space" msgstr "Espai" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Espanyol" @@ -4840,7 +5042,11 @@ msgstr "Palanca quadrada" msgid "Standard Controller" msgstr "Control estàndard" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4875,7 +5081,10 @@ msgstr "Palanca" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Aturar" @@ -4952,7 +5161,10 @@ msgstr "Taula dreta" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Capturar pantalla" @@ -5198,12 +5410,19 @@ msgstr "Activar tots els tipus de registre de Log" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Activar pantalla completa" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Dalt" @@ -5313,6 +5532,18 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "Missatge desconegut amb id: %d rebut des del jugador: Expulsant jugador %d!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Punter desconegud %#08x\n" +"Voleu continuar?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5538,7 +5769,11 @@ msgstr "Arrel de la NAND:" msgid "Wii Save Import" msgstr "Importar partida guardada Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Arxius de partida guardada Wii (*.bin)|*.bin" @@ -5569,7 +5804,11 @@ msgstr "" "o potser és perquè l'esteu fent servir fora de temps o una altra raó. \n" "Vols tornar a connectar-lo immediatament?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote connectat" @@ -5601,9 +5840,15 @@ msgstr "Finestra dreta" msgid "Word Wrap" msgstr "Envoltant de paraula" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Treballant ..." @@ -6175,6 +6420,7 @@ msgstr "| O" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Iniciar la finestra de renderitzat a pantalla completa." +<<<<<<< HEAD #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -6182,6 +6428,8 @@ msgstr "| O" #~ "Punter desconegud %#08x\n" #~ "Voleu continuar?" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Use FPS For Limiting" #~ msgstr "Limitar imatges/s (FPS)" diff --git a/Languages/po/cs.po b/Languages/po/cs.po index 1937128a37..b441cc4434 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-15 14:50+0100\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-08-10 20:37+0100\n" +>>>>>>> Update translation files for recent changes in the code. "Last-Translator: ZbynÄ›k Schwarz \n" "Language-Team: \n" "Language: Czech\n" @@ -427,6 +432,10 @@ msgid "Accurate VBeam emulation" msgstr "Precizní emulace VBeam" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -552,9 +561,15 @@ msgstr "PÅ™idat Záplatu" msgid "Add new pane" msgstr "PÅ™idat nový panel" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "PÅ™idat..." @@ -622,8 +637,13 @@ msgstr "VÅ¡echny obrazy GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "VÅ¡echny Uložené Stavy (sav, s##)" @@ -652,8 +672,14 @@ msgstr "" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Střídat Äasování Wiimote" +======= +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Emulovaný Wiimote" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -710,7 +736,11 @@ msgstr "" 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!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "PomÄ›r Stran:" @@ -731,7 +761,11 @@ 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" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -846,7 +880,11 @@ msgid "Blue Right" msgstr "Modrá vpravo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Dole" @@ -879,7 +917,11 @@ msgstr "Procházet pro výstupní adresář" msgid "Buffer:" msgstr "Vyrovnávací paměť:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1122,7 +1164,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Zavřít" @@ -1231,7 +1277,11 @@ msgstr "PÅ™ipojit Wiimote 3" msgid "Connect Wiimote 4" msgstr "PÅ™ipojit Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "PÅ™ipojuji..." @@ -1421,7 +1471,11 @@ msgid "DSP Emulator Engine" msgstr "Jádro Emulátoru DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulace (rychlé)" @@ -1652,7 +1706,11 @@ msgstr "" msgid "Divide" msgstr "RozdÄ›lit" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Chcete souÄasnou emulaci zastavit?" @@ -1681,12 +1739,21 @@ msgstr "Nastavení Emulovaného Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Nastavení" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad Nastavení" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" @@ -1782,9 +1849,15 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "NizozemÅ¡tina" @@ -1927,15 +2000,22 @@ msgstr "Zapnout BAT" msgid "Enable Block Merging" msgstr "Zapnout SluÄování Bloků" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Povolit vyrovnávací paměť" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Povolit Cheaty" @@ -2091,9 +2171,15 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "AngliÄtina" @@ -2122,6 +2208,7 @@ msgstr "Rovná se" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Chyba" @@ -2133,6 +2220,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Chyba" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2589,9 +2682,15 @@ msgstr "Snímky k Nahrání" msgid "Free Look" msgstr "Rozhlížení pomocí myÅ¡i" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "FrancouzÅ¡tina" @@ -2658,7 +2757,11 @@ msgid "Gamecube &Pad Settings" msgstr "Nastavení Gamecube &Pad" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" @@ -2681,8 +2784,12 @@ msgstr "" "(buÄ Å¡patný kód, nebo typ kódu není jeÅ¡tÄ› podporován.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Obecné" @@ -2691,9 +2798,15 @@ msgstr "Obecné" msgid "General Settings" msgstr "Obecná Nastavení" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "NÄ›mÄina" @@ -2715,6 +2828,10 @@ msgid "Greater Than" msgstr "VÄ›tší než" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2823,8 +2940,12 @@ msgid "Hotkey Configuration" msgstr "Nastavení klávesových zkratek" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "Klávesové zkratky" @@ -3045,7 +3166,11 @@ msgstr "" "Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› " "nepodporuje." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Instaluji WAD..." @@ -3127,9 +3252,15 @@ msgstr "Neplatný soubor s nahrávkou" msgid "Invalid state" msgstr "Neplatný stav" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "ItalÅ¡tina" @@ -3287,11 +3418,19 @@ msgstr "Nahrát Slot Stavu 8" msgid "Load State..." msgstr "Nahrát Stav..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Nahrát Systémové Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Nahrát Systémové Menu Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Nahrát Systémové Menu Wii %d%c" @@ -3373,7 +3512,11 @@ msgstr "MMU Hack Rychlosti" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Soubory MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Hlavní Stick" @@ -3404,7 +3547,11 @@ msgid "Memory Byte" msgstr "Bajt PamÄ›ti" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Paměťová karta" @@ -3602,7 +3749,11 @@ msgstr "NK Tab" msgid "NP Up" msgstr "NK Nahoru" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3689,7 +3840,11 @@ msgstr "Nerovná se" msgid "Not Set" msgstr "Nenastaven" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "NepÅ™ipojen" @@ -3750,7 +3905,10 @@ msgstr "Pouze bloky %d jsou dostupné" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Otevřít" @@ -3880,8 +4038,13 @@ msgstr "Záplaty" msgid "Paths" msgstr "Cesty" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pozastavit" @@ -3901,8 +4064,13 @@ msgstr "Perspektiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Spustit" @@ -3928,7 +4096,11 @@ msgstr "Možnosti PÅ™ehrávání" msgid "Players" msgstr "HráÄi" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Prosím potvrÄte..." @@ -4139,10 +4311,17 @@ msgstr "Obnovit Seznam" msgid "Refresh game list" msgstr "Obnovit seznam her" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Odstranit" @@ -4161,7 +4340,10 @@ msgid "Render to Main Window" msgstr "Vykreslit do Hlavního okna" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Resetovat" @@ -4204,7 +4386,11 @@ msgstr "Uložit Sta&v" msgid "Safe" msgstr "BezpeÄná" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Vzorkovací frekvence:" @@ -4288,7 +4474,11 @@ 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" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Skenuji %s" @@ -4328,12 +4518,21 @@ msgstr "Sekce %s nebyla v SYSCONF nalezena" msgid "Select" msgstr "Vybrat" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Vyberte Soubor s Nahrávkou" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Vyberte Soubor s Nahrávkou" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" @@ -4359,6 +4558,7 @@ msgstr "Vybrat plovoucí okna" msgid "Select the file to load" msgstr "Vyberte soubor k nahrání" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" @@ -4368,6 +4568,17 @@ msgid "Select the state to load" msgstr "Vyberte stav k nahrání" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Vyberte soubor s uloženou hrou" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Vyberte stav k nahrání" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Vyberte stav k uložení" @@ -4746,9 +4957,15 @@ msgstr "VytvoÅ™ení vyrovnávací pamÄ›ti zvuku selhalo: %s" msgid "Space" msgstr "Mezerník" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Å panÄ›lÅ¡tina" @@ -4792,7 +5009,11 @@ msgstr "ÄŒtvercový Stick" msgid "Standard Controller" msgstr "Standardní OvladaÄ" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4827,7 +5048,10 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Zastavit" @@ -4904,7 +5128,10 @@ msgstr "Deska vpravo" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "VytvoÅ™it Snímek Obrazovky" @@ -5148,12 +5375,19 @@ msgstr "Zapnout VÅ¡echny Typy Záznamů" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "PÅ™epnout na Celou Obrazovku" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "NahoÅ™e" @@ -5262,6 +5496,18 @@ msgstr "PÅ™ijata neznámá zpráva s id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Neznámá zpráva s id:%d pÅ™ijata od hráÄe:%d Vyhazuji hráÄe!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Neznámý ukazatel %#08x\n" +"PokraÄovat?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5484,7 +5730,11 @@ msgstr "Wii KoÅ™en NAND:" msgid "Wii Save Import" msgstr "Import uložených pozic Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -5515,7 +5765,11 @@ msgstr "" "nebo je to vyprÅ¡ení limitu neaktivity, nebo z jiného důvodu.\n" "Chcete ho hned znovu pÅ™ipojit?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote PÅ™ipojen" @@ -5547,9 +5801,15 @@ msgstr "Klávesa Windows Vpravo" msgid "Word Wrap" msgstr "Zalamování textu" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Pracuji..." @@ -6163,6 +6423,7 @@ msgstr "| NEBO" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Spustí vykreslovací okno v režimu celé obrazovky." +<<<<<<< HEAD #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -6170,6 +6431,8 @@ msgstr "| NEBO" #~ "Neznámý ukazatel %#08x\n" #~ "PokraÄovat?" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Use FPS For Limiting" #~ msgstr "Použít SzS pro Omezení" diff --git a/Languages/po/de.po b/Languages/po/de.po index e33919c10f..8772af3d05 100644 --- a/Languages/po/de.po +++ b/Languages/po/de.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-02-17 01:23+0100\n" "Last-Translator: LucasX \n" "Language-Team: \n" @@ -551,9 +555,15 @@ msgstr "Patch hinzufügen" msgid "Add new pane" msgstr "Neue Palette hinzufügen" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Hinzufügen..." @@ -622,8 +632,13 @@ msgstr "Alle GC/Wii Images (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM Dateien (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Speicherstände (sav, s##)" @@ -706,7 +721,11 @@ 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." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Seitenverhältnis:" @@ -727,7 +746,11 @@ msgstr "Audio Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisch" @@ -841,7 +864,11 @@ msgid "Blue Right" msgstr "Blau rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Unten" @@ -874,7 +901,11 @@ msgstr "Ausgabeverzeichnis auswählen" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1113,7 +1144,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Schließen" @@ -1223,7 +1258,11 @@ msgstr "Wiimote 3 verbinden" msgid "Connect Wiimote 4" msgstr "Wiimote 4 verbinden" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Verbinden..." @@ -1415,7 +1454,11 @@ msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emulation (schnell)" @@ -1632,7 +1675,11 @@ msgstr "" msgid "Divide" msgstr "Dividieren" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Laufende Emulation stoppen?" @@ -1662,12 +1709,21 @@ msgstr "Dolphin Emulierte-Wiimote Einstellungen" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Konfiguration" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad Konfiguration" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filme (*.dtm)" @@ -1755,9 +1811,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Holländisch" @@ -1885,16 +1947,23 @@ msgstr "BAT aktivieren" msgid "Enable Block Merging" msgstr "Blockvereinigung aktivieren" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Cache verwenden" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Cheats aktivieren" @@ -2033,9 +2102,15 @@ msgstr "" msgid "End" msgstr "Ende" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Englisch" @@ -2064,6 +2139,7 @@ msgstr "Gleich" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Fehler" @@ -2075,6 +2151,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Fehler" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2535,9 +2617,15 @@ msgstr "" msgid "Free Look" msgstr "Frei Umsehen" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Französisch" @@ -2606,7 +2694,11 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube-&Pad Einstellungen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Cards (*.raw,*.gcp)" @@ -2630,8 +2722,12 @@ msgstr "" "unterstützt.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Allgemein" @@ -2641,9 +2737,15 @@ msgstr "Allgemein" msgid "General Settings" msgstr "Interface Einstellungen" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Deutsch" @@ -2768,8 +2870,12 @@ msgid "Hotkey Configuration" msgstr "Tastenkürzel Einstellungen" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "Tastenkürzel" @@ -2984,7 +3090,11 @@ msgstr "" "InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesn " "noch nicht." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "WAD ins Wii-Menü installieren..." @@ -3070,9 +3180,15 @@ msgstr "Ungültige Aufnahmedatei" msgid "Invalid state" msgstr "Ungültiger Status" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italienisch" @@ -3231,12 +3347,20 @@ msgstr "Status aus Slot 8 laden" msgid "Load State..." msgstr "Status laden..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Wii-Menü laden (%d %c)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii-Menü laden (%d %c)" @@ -3321,7 +3445,11 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark Dateien(*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Main Stick" @@ -3353,7 +3481,11 @@ msgid "Memory Byte" msgstr "Speicher" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Memory Card" @@ -3540,7 +3672,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Hoch" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3628,7 +3764,11 @@ msgstr "Ungleich" msgid "Not Set" msgstr "Nicht Festgelegt" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Nicht Verbunden" @@ -3689,7 +3829,10 @@ msgstr "Nur %d Blöcke verfügbar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Öffnen" @@ -3821,8 +3964,13 @@ msgstr "Patches" msgid "Paths" msgstr "Pfade" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -3843,8 +3991,13 @@ msgstr "Perspektive %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Start" @@ -3871,7 +4024,11 @@ msgstr "Optionen" msgid "Players" msgstr "Spieler" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Bitte Bestätigen..." @@ -4087,10 +4244,17 @@ msgstr "Liste aktualisieren" msgid "Refresh game list" msgstr "Spieleliste aktualisieren" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Entfernen" @@ -4109,7 +4273,10 @@ msgid "Render to Main Window" msgstr "Im Hauptfenster Rendern" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Zurücksetzen" @@ -4152,7 +4319,11 @@ msgstr "S&tatus speichern" msgid "Safe" msgstr "Sicher" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Abtastrate:" @@ -4237,7 +4408,11 @@ msgstr "Film-Status %s ist fehlerhaft, breche die Filmaufnahme ab..." msgid "Scaled EFB Copy" msgstr "EFB Scaled Copy" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Suche..." @@ -4277,12 +4452,21 @@ msgstr "Ausgewähltes %s nicht gefunden in SYSCONF" msgid "Select" msgstr "Auswählen" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Aufnahmedatei auswählen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Aufnahmedatei auswählen" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Speicherdatei zum Importieren auswählen" @@ -4309,6 +4493,7 @@ msgstr "Wähle unverankerte Fenster" msgid "Select the file to load" msgstr "Datei zum Laden auswählen" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Wii-Spielstand auswählen" @@ -4318,6 +4503,17 @@ msgid "Select the state to load" msgstr "Status zum Laden auswählen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Wii-Spielstand auswählen" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Status zum Laden auswählen" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Status zum Speichern auswählen" @@ -4673,9 +4869,15 @@ msgstr "Erstellen des Sound-Buffer fehlgeschlagen: %s" msgid "Space" msgstr "Leertaste" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Spanisch" @@ -4711,7 +4913,11 @@ msgstr "" msgid "Standard Controller" msgstr "Standard-Controller" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4746,7 +4952,10 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stopp" @@ -4819,7 +5028,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Screenshot erstellen" @@ -5065,12 +5277,19 @@ msgstr "Alle umschalten" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Vollbildmodus wechseln" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Oben" @@ -5175,6 +5394,18 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "Unbekannte Meldung mit ID %d erhalten von Spieler %d, Spieler herausgeworfen!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Unbekanter Pointer %#08x\n" +"Fortfahren?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5385,7 +5616,11 @@ msgstr "DVD Laufwerk:" msgid "Wii Save Import" msgstr "Wii Spielstand importieren" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii Speicherdateien (*.bin)|*.bin" @@ -5416,7 +5651,11 @@ msgstr "" "oder die Wiimote war zulange inaktiv oder andere Ursachen.\n" "Soll die Wiimote jetzt wieder verbunden werden?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote Verbunden" @@ -5449,9 +5688,15 @@ msgstr "Windows Rechts" msgid "Word Wrap" msgstr "Zeilenumbruch" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Arbeite..." diff --git a/Languages/po/dolphin-emu.pot b/Languages/po/dolphin-emu.pot index ea882faa37..dd44453140 100644 --- a/Languages/po/dolphin-emu.pot +++ b/Languages/po/dolphin-emu.pot @@ -8,7 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -506,9 +510,15 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "" @@ -562,8 +572,13 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" @@ -641,7 +656,11 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -662,7 +681,11 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -770,7 +793,11 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "" @@ -803,7 +830,11 @@ msgstr "" msgid "Buffer:" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1025,7 +1056,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "" @@ -1134,7 +1169,11 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "" @@ -1309,7 +1348,11 @@ msgid "DSP Emulator Engine" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1519,7 +1562,11 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1548,12 +1595,21 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1636,9 +1692,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "" @@ -1761,15 +1823,22 @@ msgstr "" msgid "Enable Block Merging" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "" @@ -1895,9 +1964,15 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "" @@ -1926,6 +2001,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -1937,6 +2013,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2351,9 +2433,15 @@ msgstr "" msgid "Free Look" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "" @@ -2419,7 +2507,11 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2440,8 +2532,12 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2450,9 +2546,15 @@ msgstr "" msgid "General Settings" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "" @@ -2567,8 +2669,12 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "" @@ -2758,7 +2864,11 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "" @@ -2835,9 +2945,15 @@ msgstr "" msgid "Invalid state" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "" @@ -2988,11 +3104,19 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3069,7 +3193,11 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3100,7 +3228,11 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "" @@ -3277,7 +3409,11 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3364,7 +3500,11 @@ msgstr "" msgid "Not Set" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "" @@ -3425,7 +3565,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "" @@ -3551,8 +3694,13 @@ msgstr "" msgid "Paths" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3572,8 +3720,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "" @@ -3599,7 +3752,11 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "" @@ -3805,10 +3962,17 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "" @@ -3824,7 +3988,10 @@ msgid "Render to Main Window" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -3867,7 +4034,11 @@ msgstr "" msgid "Safe" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -3951,7 +4122,11 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" @@ -3991,12 +4166,21 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4019,6 +4203,7 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "" @@ -4028,6 +4213,17 @@ msgid "Select the state to load" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4361,9 +4557,15 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "" @@ -4399,7 +4601,11 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4434,7 +4640,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -4506,7 +4715,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "" @@ -4718,12 +4930,19 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "" @@ -4825,6 +5044,16 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5026,7 +5255,11 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5053,7 +5286,11 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "" @@ -5085,9 +5322,15 @@ msgstr "" msgid "Word Wrap" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "" diff --git a/Languages/po/el.po b/Languages/po/el.po index 81814c796e..30b56b762f 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-09-13 17:28+0200\n" +>>>>>>> Update translation files for recent changes in the code. "Last-Translator: Linktothepast \n" "Language-Team: Gpower2 \n" "Language: Greek\n" @@ -426,13 +431,21 @@ msgstr "Επιτάχυνση" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Accuracy:" +<<<<<<< HEAD msgstr "ΑκÏίβεια:" +======= +msgstr "" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "ΑκÏιβής VBeam εξομοίωση" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -560,9 +573,15 @@ msgstr "ΠÏοσθήκη Patch" msgid "Add new pane" msgstr "ΠÏοσθήκη νέου pane" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "ΠÏοσθήκη..." @@ -618,8 +637,13 @@ msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" @@ -648,8 +672,14 @@ msgstr "" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Εναλλακτικός ΧÏονισμός Wiimote" +======= +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Εξομοιωμένο Wiimote" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -708,7 +738,11 @@ msgstr "" "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για " "πάντα!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Αναλογία Οθόνης:" @@ -729,7 +763,11 @@ msgstr "Backend Ήχου:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Αυτόματα" @@ -764,11 +802,14 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +<<<<<<< HEAD "ΔημιουÏγεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" "Αυξάνει λίγο τις επιδόσεις, αλλά μποÏεί να Ï€Ïοκαλέσει μικÏά ελαττώματα στις " "υφές.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" @@ -846,7 +887,11 @@ msgid "Blue Right" msgstr "Δεξί Μπλε" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Βάση" @@ -879,7 +924,11 @@ msgstr "ΕÏÏεση φακέλου Ï€ÏοοÏισμοÏ" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1082,7 +1131,11 @@ msgstr "Επιλέξτε ένα αÏχείο για άνοιγμα" msgid "Choose a memory card:" msgstr "Επιλέξτε μια κάÏτα μνήμης:" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1124,7 +1177,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Κλείσιμο" @@ -1233,7 +1290,11 @@ msgstr "ΣÏνδεση Wiimote 3" msgid "Connect Wiimote 4" msgstr "ΣÏνδεση Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Γίνεται ΣÏνδεση..." @@ -1352,7 +1413,11 @@ msgstr "ΔημιουÏγία νέας οπτικής" msgid "Created by KDE-Look.org" msgstr "ΔημιουÏγήθηκε από KDE-Look.org" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1429,7 +1494,11 @@ msgid "DSP Emulator Engine" msgstr "Μηχανή Εξομοίωσης DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE εξομοίωση (γÏήγοÏη)" @@ -1660,7 +1729,11 @@ msgstr "" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξομοίωση;" @@ -1689,12 +1762,21 @@ msgstr "Ρυθμίσεις Εξοιμοιωμένου Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Ρυθμίσεις Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Ρυθμίσεις Dolphin GCPad" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" @@ -1706,7 +1788,11 @@ msgstr "Ρυθμίσεις Dolphin Wiimote" msgid "Dolphin at &Google Code" msgstr "Dolphin στο &Google Code" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1714,7 +1800,11 @@ msgstr "" "Το Dolphin δεν μπόÏεσε να βÏει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εÏÏεση " "αÏχείων..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1792,9 +1882,15 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Ολλανδικά" @@ -1939,6 +2035,7 @@ msgstr "ΕνεÏγοποίηση BAT" msgid "Enable Block Merging" msgstr "ΕνεÏγοποίηση Block Merging" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" @@ -1948,6 +2045,14 @@ msgid "Enable Cache" msgstr "ΕνεÏγοποίηση Cache" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#, fuzzy +msgid "Enable Cache" +msgstr "ΕνεÏγοποίηση Cheat" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "ΕνεÏγοποίηση Cheat" @@ -2048,7 +2153,11 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2104,9 +2213,15 @@ msgstr "" msgid "End" msgstr "Τέλος" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Αγγλικά" @@ -2135,6 +2250,7 @@ msgstr "Ίσο" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Σφάλμα" @@ -2146,11 +2262,18 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Σφάλμα" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή " "συστήματος." +<<<<<<< HEAD #: Source/Core/Common/Src/ChunkFile.h:180 #, c-format @@ -2158,6 +2281,8 @@ msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format @@ -2431,11 +2556,19 @@ msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 msgid "Fast" +<<<<<<< HEAD msgstr "ΓÏήγοÏη" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Fast Mipmaps" msgstr "ΓÏήγοÏα Mipmaps" +======= +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." @@ -2605,9 +2738,15 @@ msgstr "ΚαÏέ ΠÏος ΕγγÏαφή" msgid "Free Look" msgstr "ΕλεÏθεÏη Ματιά" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Γαλλικά" @@ -2674,7 +2813,11 @@ msgid "Gamecube &Pad Settings" msgstr "Ρυθμίσεις Gamecube &Pad" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "ΚάÏτες Μνήμης Gamecube (*.raw,*.gcp)" @@ -2697,8 +2840,12 @@ msgstr "" "(ή είναι ένας κακός κωδικός ή ο Ï„Ïπος του ÎºÏ‰Î´Î¹ÎºÎ¿Ï Î´ÎµÎ½ υποστηÏίζεται.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Γενικά" @@ -2707,9 +2854,15 @@ msgstr "Γενικά" msgid "General Settings" msgstr "Γενικές Ρυθμίσεις" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "ΓεÏμανικά" @@ -2733,6 +2886,10 @@ msgid "Greater Than" msgstr "ΜεγαλÏτεÏο από" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2843,8 +3000,12 @@ msgid "Hotkey Configuration" msgstr "Ρυθμίσεις ΠλήκτÏων Συντόμευσης" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "ΠλήκτÏα Συντόμευσης" @@ -2925,7 +3086,11 @@ msgstr "" "Αν τα FPS διακυμαίνονται, αυτή η επιλογή μποÏείο να βοηθήσει. (ΕνεÏγό = " "Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +>>>>>>> Update translation files for recent changes in the code. msgid "" "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." @@ -3071,7 +3236,11 @@ msgstr "" "InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόÏμα δεν το υποστηÏίζει " "ακόμα." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." @@ -3153,9 +3322,15 @@ msgstr "Μη έγκυÏο αÏχείο εγγÏαφής" msgid "Invalid state" msgstr "Μη έγκυÏο κατάσταση" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Ιταλικά" @@ -3313,11 +3488,19 @@ msgstr "ΦόÏτωση Σημείου Αποθήκευσης 8" msgid "Load State..." msgstr "ΦόÏτωση Σημείου Αποθήκευσης..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii %d%c" @@ -3399,7 +3582,11 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "ΑÏχεία MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "ΚÏÏιο Stick" @@ -3430,7 +3617,11 @@ msgid "Memory Byte" msgstr "Memory Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "ΚάÏτα Μνήμης" @@ -3630,7 +3821,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3717,7 +3912,11 @@ msgstr "Όχι ίσο" msgid "Not Set" msgstr "Μη ΟÏισμένο" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Μη Συνδεδεμένο" @@ -3778,7 +3977,10 @@ msgstr "Διαθέσιμα μόνο %d μπλοκ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Άνοιγμα" @@ -3910,8 +4112,13 @@ msgstr "Patches" msgid "Paths" msgstr "Φάκελοι" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "ΠαÏση" @@ -3931,8 +4138,13 @@ msgstr "Οπτική %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "ΑναπαÏαγωγή" @@ -3958,7 +4170,11 @@ msgstr "Ρυθμίσεις ΑναπαÏαγωγής" msgid "Players" msgstr "Παίχτες" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "ΠαÏακαλώ επιβεβαιώστε..." @@ -4169,10 +4385,17 @@ msgstr "Ανανέωση Λίστας" msgid "Refresh game list" msgstr "Ανανέωση λίστας παιχνιδιών" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "ΑφαίÏεση" @@ -4191,7 +4414,10 @@ msgid "Render to Main Window" msgstr "ΑναπαÏαγωγή στο ΚεντÏικό ΠαÏάθυÏο" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Επανεκκίνηση" @@ -4232,9 +4458,15 @@ msgstr "Απ&οθήκευση Σημείου Αποθήκευσης" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 msgid "Safe" +<<<<<<< HEAD msgstr "Ασφαλής" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Ρυθμός Δειγματοληψίας:" @@ -4318,7 +4550,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" +<<<<<<< HEAD msgstr "ΚλιμακοÏμενα EFB ΑντίγÏαφα" +======= +msgstr "" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, c-format @@ -4360,12 +4596,21 @@ msgstr "Η ενότητα %s δε βÏέθηκε στο SYSCONF" msgid "Select" msgstr "Επιλογή" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αÏχείο για εγκατάσταση" @@ -4391,6 +4636,7 @@ msgstr "Επιλέξτε αιωÏοÏμενα παÏάθυÏα" msgid "Select the file to load" msgstr "Επιλέξτε το αÏχείο για φόÏτωση" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Επιλέξτε αÏχείο αποθήκευσης" @@ -4400,6 +4646,17 @@ msgid "Select the state to load" msgstr "Επιλέξτε το σημείο φόÏτωσης" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Επιλέξτε αÏχείο αποθήκευσης" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Επιλέξτε το σημείο φόÏτωσης" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" @@ -4475,7 +4732,11 @@ msgstr "ΔιαχωÏιστής" msgid "Serbian" msgstr "ΣεÏβικά" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4704,6 +4965,7 @@ msgid "Skip EFB Access from CPU" msgstr "ΠαÏάλειψη EFB ΠÏόσβασης από τη CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +<<<<<<< HEAD msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4729,9 +4991,29 @@ msgstr "" "ΜεÏικές φοÏές μποÏεί να βελτιώσει την οπτική ποιότητα.\n" "Αν αντιμετωπίζετε Ï€Ïοβλήματα, δοκιμάστε να αυξήσετε την ακÏίβεια της cache " "υφών ή απενεÏγοποιήστε αυτήν την επιλογή.\n" +======= +msgid "" +"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" +>>>>>>> Update translation files for recent changes in the code. "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4785,9 +5067,15 @@ msgstr "Αποτυχία δημιουÏγίας buffer ήχου: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Ισπανικά" @@ -4832,7 +5120,11 @@ msgstr "ΤετÏάγωνο Stick" msgid "Standard Controller" msgstr "Τυπικός Controller" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4867,7 +5159,10 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Διακοπή" @@ -4880,11 +5175,14 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +<<<<<<< HEAD "Αποθήκευση των EFB αντιγÏάφων σε GPU αντικείμενα υφών.\n" "Αυτό δεν είναι τόσο ακÏιβές, αλλά δουλεÏει αÏκετά καλά για τα πεÏισσότεÏα " "παιχνίδια και Ï€ÏοσφέÏει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" @@ -4944,7 +5242,10 @@ msgstr "Δεξί Table" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "ΔημιουÏγία Στιγμιότυπου" @@ -4957,12 +5258,23 @@ msgid "Test" msgstr "Τέστ" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +<<<<<<< HEAD msgid "Texture" msgstr "Υφή" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 msgid "Texture Cache" msgstr "Cache Υφών" +======= +#, fuzzy +msgid "Texture" +msgstr "Εξαγωγή Υφών" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +#, fuzzy +msgid "Texture Cache" +msgstr "ΚαθαÏισμός Cache" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" @@ -5034,10 +5346,13 @@ msgid "" "\n" "If unsure, use the second-fastest value from the right." msgstr "" +<<<<<<< HEAD "Όσο πιο ασφαλής είναι αυτή η ÏÏθμιση, τόσο λιγότεÏο πιθανό ο εξομοιωτής να " "χάσει ανανεώσεις των υφών από την RAM.\n" "\n" "Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την δεÏτεÏη γÏηγοÏότεÏη τιμή από δεξιά." +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" @@ -5199,12 +5514,19 @@ msgstr "Εναλλαγή Όλων ΤÏπων ΚαταγÏαφής " #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Εναλλαγή ΠλήÏους Οθόνης" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "ΚοÏυφή" @@ -5314,6 +5636,18 @@ msgstr "Ελήφθη άγνωστο μήνυμα με id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Ελήφθη άγνωστο μήνυμα με:%d από τον παίκτη:%d ΑποσÏνδεση παίκτη!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Άγνωστος δείκτης %#08x\n" +"Συνέχεια;" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5540,7 +5874,11 @@ msgstr "Wii NAND Ρίζα:" msgid "Wii Save Import" msgstr "Εισαγωγή Αποθήκευσης Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -5571,7 +5909,11 @@ msgstr "" "ή πιθανόν να οφείλεται σε χÏόνο αδÏάνειας ή κάποιον άλλο λόγο.\n" "Θέλετε να γίνει άμεση επανασÏνδεση;" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Συνδεδεμένο Wiimote" @@ -5603,9 +5945,15 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Αναδίπλωση Λέξεων" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Σε εÏγασία..." @@ -5817,6 +6165,7 @@ msgstr "zNear ΔιόÏθωση: " msgid "| OR" msgstr "| OR" +<<<<<<< HEAD #~ msgid "Cannot record movies in read-only mode." #~ msgstr "" #~ "Δεν μποÏεί να γίνει εγγÏαφή ταινιών σε λειτουÏγία μόνο για ανάγνωση." @@ -5827,3 +6176,7 @@ msgstr "| OR" #~ msgstr "" #~ "Άγνωστος δείκτης %#08x\n" #~ "Συνέχεια;" +======= +#~ msgid "Disable Wiimote Speaker" +#~ msgstr "ΑπενεÏγοποίηση Ηχείου Wiimote" +>>>>>>> Update translation files for recent changes in the code. diff --git a/Languages/po/en.po b/Languages/po/en.po index f08b1e1cdf..2563333e4e 100644 --- a/Languages/po/en.po +++ b/Languages/po/en.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-01-06 14:53+0100\n" "Last-Translator: BhaaL \n" "Language-Team: \n" @@ -505,9 +509,15 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "" @@ -561,8 +571,13 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" @@ -640,7 +655,11 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -661,7 +680,11 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -769,7 +792,11 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "" @@ -802,7 +829,11 @@ msgstr "" msgid "Buffer:" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1024,7 +1055,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "" @@ -1133,7 +1168,11 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "" @@ -1308,7 +1347,11 @@ msgid "DSP Emulator Engine" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1518,7 +1561,11 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1547,12 +1594,21 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1635,9 +1691,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "" @@ -1760,15 +1822,22 @@ msgstr "" msgid "Enable Block Merging" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "" @@ -1894,9 +1963,15 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "" @@ -1925,6 +2000,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -1936,6 +2012,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2350,9 +2432,15 @@ msgstr "" msgid "Free Look" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "" @@ -2418,7 +2506,11 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2439,8 +2531,12 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2449,9 +2545,15 @@ msgstr "" msgid "General Settings" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "" @@ -2566,8 +2668,12 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "" @@ -2757,7 +2863,11 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "" @@ -2834,9 +2944,15 @@ msgstr "" msgid "Invalid state" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "" @@ -2987,11 +3103,19 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3068,7 +3192,11 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3099,7 +3227,11 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "" @@ -3276,7 +3408,11 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3363,7 +3499,11 @@ msgstr "" msgid "Not Set" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "" @@ -3424,7 +3564,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "" @@ -3550,8 +3693,13 @@ msgstr "" msgid "Paths" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3571,8 +3719,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "" @@ -3598,7 +3751,11 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "" @@ -3804,10 +3961,17 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "" @@ -3823,7 +3987,10 @@ msgid "Render to Main Window" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -3866,7 +4033,11 @@ msgstr "" msgid "Safe" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -3950,7 +4121,11 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" @@ -3990,12 +4165,21 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4018,6 +4202,7 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "" @@ -4027,6 +4212,17 @@ msgid "Select the state to load" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4360,9 +4556,15 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "" @@ -4398,7 +4600,11 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4433,7 +4639,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -4505,7 +4714,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "" @@ -4717,12 +4929,19 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "" @@ -4824,6 +5043,16 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5025,7 +5254,11 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5052,7 +5285,11 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "" @@ -5084,9 +5321,15 @@ msgstr "" msgid "Word Wrap" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "" diff --git a/Languages/po/es.po b/Languages/po/es.po index f989ce37bf..10b8c05209 100644 --- a/Languages/po/es.po +++ b/Languages/po/es.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-09 00:28+0100\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-08-11 15:30+0100\n" +>>>>>>> Update translation files for recent changes in the code. "Last-Translator: Petiso Carambanal \n" "Language-Team: DARIO_FF \n" "Language: Spanish\n" @@ -431,6 +436,10 @@ msgid "Accurate VBeam emulation" msgstr "Emulación de VBeam Precisa" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -559,9 +568,15 @@ msgstr "Añadir Parche" msgid "Add new pane" msgstr "Añadir nueva ventana" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Añadir..." @@ -630,8 +645,13 @@ msgstr "Todas las imágenes GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Todos los archivos Gamecube GCM (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos los estados guardados (sav, s##)" @@ -660,8 +680,14 @@ msgstr "" "Si está inseguro, déjelo sin marcar." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Sincronización alternativa del Wiimote" +======= +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Wiimote emulado" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -718,7 +744,11 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "¿Seguro que quiere borrar este archivo? ¡Desaparecerá para siempre!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relación de aspecto:" @@ -739,7 +769,11 @@ msgstr "Motor de Audio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error al abrir dispositivo AO.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -855,7 +889,11 @@ msgid "Blue Right" msgstr "Azul derecha" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Inferior" @@ -888,7 +926,11 @@ msgstr "Busca un directorio de salida" msgid "Buffer:" msgstr "Búfer" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1095,7 +1137,11 @@ msgstr "Escoge un archivo a abrir" msgid "Choose a memory card:" msgstr "Escoge una tarjeta de memoria:" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1137,7 +1183,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Cerrar" @@ -1246,7 +1296,11 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Conectando..." @@ -1364,7 +1418,11 @@ msgstr "Crear nueva perspectiva" msgid "Created by KDE-Look.org" msgstr "Creado por KDE-Look.org" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1438,7 +1496,11 @@ msgid "DSP Emulator Engine" msgstr "Motor de emulación DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulación DSP HLE (rápido)" @@ -1669,7 +1731,11 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "¿Quieres detener la emulación actual?" @@ -1698,12 +1764,21 @@ msgstr "Configuración de wiimote emulado de Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Configuración de GCPad Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Configuración de GCPad Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Películas TAS de Dolphin (*.dtm)" @@ -1715,7 +1790,11 @@ msgstr "Configuración de wiimote de Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin en &Google Code" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1723,7 +1802,11 @@ msgstr "" "Dolphin no pudo encontrar ninguna ISO de GC/Wii. Haz doble clic aquí para " "buscar..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1799,9 +1882,15 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Holandés" @@ -1940,15 +2029,22 @@ msgstr "Habilitar BAT" msgid "Enable Block Merging" msgstr "Habilitar asociación de bloques" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Habilitar caché" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Habilitar trucos" @@ -2048,7 +2144,11 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2103,9 +2203,15 @@ msgstr "" msgid "End" msgstr "Fin" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Inglés" @@ -2134,6 +2240,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -2145,6 +2252,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Error" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2153,6 +2266,7 @@ msgstr "" #: Source/Core/Common/Src/ChunkFile.h:180 #, c-format msgid "" +<<<<<<< HEAD "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" @@ -2160,6 +2274,8 @@ msgstr "" #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" +======= +>>>>>>> Update translation files for recent changes in the code. "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" @@ -2603,9 +2719,15 @@ msgstr "Frames a grabar" msgid "Free Look" msgstr "Cámara libre" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Francés" @@ -2672,7 +2794,11 @@ msgid "Gamecube &Pad Settings" msgstr "&Configuración del mando Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Tarjetas de memoria de Gamecube (*.raw,*.gcp)" @@ -2695,8 +2821,12 @@ msgstr "" "(puede ser un código incorrecto o su tipo no es soportado todavía.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -2705,9 +2835,15 @@ msgstr "General" msgid "General Settings" msgstr "Ajustes generales" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Alemán" @@ -2730,6 +2866,10 @@ msgid "Greater Than" msgstr "Mayor que" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2739,10 +2879,17 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +<<<<<<< HEAD "Mejora bastante la calidad de las texturas generadas usando los efectos de " "renderización para la textura.\n" "Aumentar la resolución interna va a mejorar el efecto de este ajuste.\n" "Reduce ligeramente el desempeño y posiblemente cause fallos (altamente " +======= +"Aumenta bastante la calidad de las texturas generadas utilizando los efectos " +"de renderización para la textura.\n" +"Aumentar la resolución interna va a mejorar el efecto de esta definición.\n" +"Diminuye ligeramente el desempenño y probablemente provoca fallos (aunque es " +>>>>>>> Update translation files for recent changes in the code. "improbable).\n" "\n" "Si está inseguro, déjelo marcado." @@ -2840,8 +2987,12 @@ msgid "Hotkey Configuration" msgstr "Configuración de atajos" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "Atajos" @@ -2922,7 +3073,11 @@ msgstr "" "Si los FPS son erróneos, esta opción puede ayudar. (ON = Compatible, OFF = " "Rápido)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +>>>>>>> Update translation files for recent changes in the code. msgid "" "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." @@ -3066,7 +3221,11 @@ msgstr "" "Se ha llamado InstallExceptionHandler, pero esta plataforma no lo soporta " "todavía." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Instalando WAD..." @@ -3148,9 +3307,15 @@ msgstr "Archivo de grabación no válido" msgid "Invalid state" msgstr "Estado no válido" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italiano" @@ -3308,11 +3473,19 @@ msgstr "&Cargar estado 8" msgid "Load State..." msgstr "Cargar estado..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Cargar Menú de sistema Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Cargar Menú de sistema Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Cargar Menú de sistema Wii %d %c" @@ -3394,7 +3567,11 @@ msgstr "Hack de velocidad MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Archivos MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick principal" @@ -3425,7 +3602,11 @@ msgid "Memory Byte" msgstr "Byte de memoria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Tarjeta de memoria" @@ -3523,9 +3704,12 @@ msgid "" msgstr "" "Mueva el puntero del ratón sobre una opción para obtener una descripción " "detallada.\n" +<<<<<<< HEAD "\n" "\n" "\n" +======= +>>>>>>> Update translation files for recent changes in the code. "\n" "\n" "\n" @@ -3626,7 +3810,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Arriba" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3713,7 +3901,11 @@ msgstr "No Igual" msgid "Not Set" msgstr "No Definido" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Sin conectar" @@ -3774,7 +3966,10 @@ msgstr "Solo %d bloques disponibles" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Abrir" @@ -3906,8 +4101,13 @@ msgstr "Parches" msgid "Paths" msgstr "Directorios" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -3927,8 +4127,13 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Reproducir" @@ -3954,7 +4159,11 @@ msgstr "Opciones de reproducción" msgid "Players" msgstr "Jugadores" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Confirme, por favor..." @@ -4165,10 +4374,17 @@ msgstr "Actualizar lista" msgid "Refresh game list" msgstr "Actualizar lista de juegos" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Eliminar" @@ -4187,7 +4403,10 @@ msgid "Render to Main Window" msgstr "Renderizar a ventana principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -4230,7 +4449,11 @@ msgstr "Guardar estado" msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Frecuencia del sonido:" @@ -4356,12 +4579,21 @@ msgstr "No se ha encontrado la sección %s en SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Seleccionar archivo de grabación" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Seleccionar archivo de grabación" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Elige un WAD de Wii para instalar" @@ -4387,6 +4619,7 @@ msgstr "Selecciona las ventanas flotantes" msgid "Select the file to load" msgstr "Selecciona el archivo para cargar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Selecciona el archivo de guardado" @@ -4396,6 +4629,17 @@ msgid "Select the state to load" msgstr "Selecciona el estado para cargar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Selecciona el archivo de guardado" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Selecciona el estado para cargar" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Selecciona el estado para guardar" @@ -4470,7 +4714,11 @@ msgstr "Separador" msgid "Serbian" msgstr "Serbio" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4699,6 +4947,7 @@ msgid "Skip EFB Access from CPU" msgstr "Saltar el acceso al EFB desde la CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +<<<<<<< HEAD msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4719,6 +4968,28 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +======= +msgid "" +"Skip the destination alpha pass used in many games for various graphical " +"effects.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Salta el destino del pase alfa usado en muchos juegos para varios efectos " +"gráficos.\n" +"\n" +"Si está inseguro, déjelo sin marcar." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" +>>>>>>> Update translation files for recent changes in the code. "Aumenta ligeramente las copias de EFB a la RAM al sacrificar exactitud de " "emulación.\n" "A veces también aumenta la calidad visual.\n" @@ -4779,9 +5050,15 @@ msgstr "Falló la creación del búfer de sonido: %s" msgid "Space" msgstr "Espacio" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Español" @@ -4825,7 +5102,11 @@ msgstr "Stick cuadrado" msgid "Standard Controller" msgstr "Control estándar" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4860,7 +5141,10 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Detener" @@ -4940,7 +5224,10 @@ msgstr "Tabla derecha" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Captura de pantalla" @@ -5191,12 +5478,19 @@ msgstr "Alternar todos los tipos de registro" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Cambiar a pantalla completa" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Superior" @@ -5303,6 +5597,17 @@ msgstr "Se recibió un mensaje desconocido de id: %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" +<<<<<<< HEAD +======= +msgstr "" +"Mensaje desconocido con id:%d recibido del jugador:%d ¡Echando al jugador!" + +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +>>>>>>> Update translation files for recent changes in the code. msgstr "" "Mensaje desconocido con id:%d recibido del jugador:%d ¡Echando al jugador!" @@ -5532,7 +5837,11 @@ msgstr "Raíz de la NAND de Wii:" msgid "Wii Save Import" msgstr "Importar guardado de Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Archivos de guardado Wii (*.bin)|*.bin" @@ -5563,7 +5872,11 @@ msgstr "" "o mucho tiempo de espera, o alguna otra razón.\n" "¿Desea reconectarlo inmediatamente?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote conectado" @@ -5595,9 +5908,15 @@ msgstr "Windows Derecha" msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Trabajando..." diff --git a/Languages/po/fr.po b/Languages/po/fr.po index fcd5a4244f..56cb368da8 100644 --- a/Languages/po/fr.po +++ b/Languages/po/fr.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-28 23:40+0100\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-08-10 17:42+0100\n" +>>>>>>> Update translation files for recent changes in the code. "Last-Translator: Pascal\n" "Language-Team: \n" "Language: French\n" @@ -429,6 +434,10 @@ msgid "Accurate VBeam emulation" msgstr "Emulation fidèle VBeam" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -556,9 +565,15 @@ msgstr "Ajouter un patch" msgid "Add new pane" msgstr "Ajouter un nouveau panneau" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Ajouter..." @@ -627,8 +642,13 @@ msgstr "Toutes les images GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tous les fichiers GameCube GCM (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tous les états sauvegardés (sav, s##)" @@ -657,8 +677,14 @@ msgstr "" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Délai alternatif de communication avec la Wiimote" +======= +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Wiimote émulée" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -718,7 +744,11 @@ msgstr "" "Êtes-vous sûr de vouloir supprimer ce fichier ? Il sera supprimé " "définitivement !" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Format d'écran :" @@ -739,7 +769,11 @@ msgstr "Moteur audio :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -858,7 +892,11 @@ msgid "Blue Right" msgstr "Bleu Droite" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Bas" @@ -891,7 +929,11 @@ msgstr "Parcourir un dossier de destination" msgid "Buffer:" msgstr "Buffer :" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1099,7 +1141,11 @@ msgstr "Choisir un fichier à ouvrir" msgid "Choose a memory card:" msgstr "Choisir une carte mémoire :" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1141,7 +1187,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fermer" @@ -1250,7 +1300,11 @@ msgstr "Connecter la 3è Wiimote" msgid "Connect Wiimote 4" msgstr "Connecter la 4è Wiimote" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Connexion..." @@ -1369,7 +1423,11 @@ msgstr "Créer une nouvelle perspective" msgid "Created by KDE-Look.org" msgstr "Créé par KDE-Look.org" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1443,7 +1501,11 @@ msgid "DSP Emulator Engine" msgstr "Moteur d'émulation du DSP (Audio)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulation du DSP en HLE (rapide)" @@ -1674,7 +1736,11 @@ msgstr "" msgid "Divide" msgstr "Diviser" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Voulez-vous arrêter l'émulation en cours ?" @@ -1703,12 +1769,21 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Configuration de la manette GC pour Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Configuration de la manette GC pour Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Films TAS Dolphin (*.dtm)" @@ -1720,7 +1795,11 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin dans &Google Code" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1728,7 +1807,11 @@ msgstr "" "Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher des " "fichiers..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1805,9 +1888,15 @@ msgstr "" "\n" "Dans le doute, décochez cette case." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Néerlandais" @@ -1951,15 +2040,22 @@ msgstr "Activer BAT" msgid "Enable Block Merging" msgstr "Activer l'assemblage de blocs" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Activer le cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Activer les Cheats" @@ -2060,7 +2156,11 @@ msgstr "" "\n" "Dans le doute, décochez cette case." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2116,9 +2216,15 @@ msgstr "" msgid "End" msgstr "Fin" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Anglais" @@ -2147,6 +2253,7 @@ msgstr "Egal" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erreur" @@ -2158,6 +2265,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Erreur" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2167,6 +2280,7 @@ msgstr "" #: Source/Core/Common/Src/ChunkFile.h:180 #, c-format msgid "" +<<<<<<< HEAD "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" @@ -2174,6 +2288,8 @@ msgstr "" #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" +======= +>>>>>>> Update translation files for recent changes in the code. "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" @@ -2619,9 +2735,15 @@ msgstr "Images à enregistrer :" msgid "Free Look" msgstr "Vue libre" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Français" @@ -2688,7 +2810,11 @@ msgid "Gamecube &Pad Settings" msgstr "Paramètres de la &manette GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Carte mémoires de GameCube (*.raw,*.gcp)" @@ -2711,8 +2837,12 @@ msgstr "" "(ou c'est un mauvais code, ou il n'est pas encore pris en charge.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Général" @@ -2721,9 +2851,15 @@ msgstr "Général" msgid "General Settings" msgstr "Paramètres généraux" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Allemand" @@ -2746,6 +2882,10 @@ msgid "Greater Than" msgstr "Plus grand que" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2759,8 +2899,11 @@ msgstr "" "effets de rendu vers texture.\n" "Le fait d'augmenter la résolution interne améliore l'impact de cette " "option.\n" +<<<<<<< HEAD "Baisse légèrement les performances et peut provoquer quelques pépins (mais " "peu probable).\n" +======= +>>>>>>> Update translation files for recent changes in the code. "\n" "Dans le doute, cochez cette case." @@ -2859,8 +3002,12 @@ msgid "Hotkey Configuration" msgstr "Configuration des raccourcis clavier" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "Raccourcis clavier" @@ -2941,7 +3088,11 @@ msgstr "" "Si les FPS ne sont pas corrects, cette option peut résoudre le souci. (ON = " "Compatible, OFF = Vitesse)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +>>>>>>> Update translation files for recent changes in the code. msgid "" "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." @@ -3085,7 +3236,11 @@ msgstr "" "InstallExceptionHandler a été appelé, mais cette plateforme ne le prend pas " "encore en charge." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Installation du WAD..." @@ -3167,9 +3322,15 @@ msgstr "Fichier d'enregitrement non valide" msgid "Invalid state" msgstr "Etat non valide" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italien" @@ -3327,11 +3488,19 @@ msgstr "Charger l'état du Slot 8" msgid "Load State..." msgstr "Charger un état..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Charger le Menu Système Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Charger le Menu Système Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Charger le Menu Système Wii %d%c" @@ -3415,7 +3584,11 @@ msgstr "Hack de vitesse pour le MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Fichiers MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick principal" @@ -3446,7 +3619,11 @@ msgid "Memory Byte" msgstr "Octet mémoire" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Carte mémoire" @@ -3647,7 +3824,11 @@ msgstr "NP Tabulation" msgid "NP Up" msgstr "NP Haut" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3734,7 +3915,11 @@ msgstr "Différent" msgid "Not Set" msgstr "Non défini" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Non connectée" @@ -3795,7 +3980,10 @@ msgstr "%d blocs disponibles seulement" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Ouvrir" @@ -3927,8 +4115,13 @@ msgstr "Patchs" msgid "Paths" msgstr "Chemins" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -3948,8 +4141,13 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Démarrer" @@ -3975,7 +4173,11 @@ msgstr "Options de lecture" msgid "Players" msgstr "Joueurs" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Veuillez confirmer..." @@ -4187,10 +4389,17 @@ msgstr "Rafraîchir la liste" msgid "Refresh game list" msgstr "Rafraîchir la liste des jeux" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Retirer" @@ -4209,7 +4418,10 @@ msgid "Render to Main Window" msgstr "Rendu dans la fenêtre principale" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -4252,7 +4464,11 @@ msgstr "Sau&vegarder l'état" msgid "Safe" msgstr "Sûr " +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Echantillonnage :" @@ -4378,12 +4594,21 @@ msgstr "La section %s n'a pas été trouvée dans SYSCONF" msgid "Select" msgstr "Select" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Sélectionner le fichier d'enregistrement" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Sélectionner le fichier d'enregistrement" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Sélectionner un fichier WAD de Wii à installer" @@ -4409,6 +4634,7 @@ msgstr "Sélectionner les fenêtres flottantes" msgid "Select the file to load" msgstr "Sélectionner le fichier à charger" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Sélectionner le fichier à enregistrer" @@ -4418,6 +4644,17 @@ msgid "Select the state to load" msgstr "Sélectionner l'état à charger" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Sélectionner le fichier à enregistrer" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Sélectionner l'état à charger" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Sélectionner l'état à enregistrer" @@ -4493,7 +4730,11 @@ msgstr "Séparateur" msgid "Serbian" msgstr "Serbe" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4722,6 +4963,7 @@ msgid "Skip EFB Access from CPU" msgstr "Ignorer l'accès à l'EFB depuis le CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +<<<<<<< HEAD msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4742,6 +4984,28 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +======= +msgid "" +"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" +"\n" +"Dans le doute, décochez cette case." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" +>>>>>>> Update translation files for recent changes in the code. "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" @@ -4803,9 +5067,15 @@ msgstr "Echec de la création du buffer audio : %s" msgid "Space" msgstr "Espace" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Espagnol" @@ -4849,7 +5119,11 @@ msgstr "Stick carré" msgid "Standard Controller" msgstr "Contrôleur standard" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4884,7 +5158,10 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Arrêter" @@ -4961,7 +5238,10 @@ msgstr "Table Droite" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Capture d'écran" @@ -5211,12 +5491,19 @@ msgstr "Activer tous les types de journaux" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Activer le plein écran" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Haut" @@ -5323,6 +5610,17 @@ 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!" +<<<<<<< HEAD +======= +msgstr "" +"Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" + +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +>>>>>>> Update translation files for recent changes in the code. msgstr "" "Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" @@ -5551,7 +5849,11 @@ msgstr "Racine de la NAND (Wii) :" msgid "Wii Save Import" msgstr "Importer une sauvegarde Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin" @@ -5582,7 +5884,11 @@ msgstr "" "ou bien c'est dû à un temps d'attente trop long, ou encore autre chose.\n" "Voulez-vous la reconnecter tout de suite ?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote connectée" @@ -5614,9 +5920,15 @@ msgstr "Windows Droit" msgid "Word Wrap" msgstr "Casse" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Travail..." diff --git a/Languages/po/he.po b/Languages/po/he.po index 498fb36d91..857ec27567 100644 --- a/Languages/po/he.po +++ b/Languages/po/he.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-01-08 20:50+0200\n" "Last-Translator: Ely \n" "Language-Team: \n" @@ -506,9 +510,15 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "" @@ -562,8 +572,13 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" @@ -641,7 +656,11 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -662,7 +681,11 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -771,7 +794,11 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "" @@ -804,7 +831,11 @@ msgstr "" msgid "Buffer:" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1026,7 +1057,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "" @@ -1135,7 +1170,11 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "" @@ -1310,7 +1349,11 @@ msgid "DSP Emulator Engine" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1520,7 +1563,11 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1549,13 +1596,22 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Dolphin GCPad Configuration" msgstr "הגדרות גרפיקה" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1638,9 +1694,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "" @@ -1763,15 +1825,22 @@ msgstr "" msgid "Enable Block Merging" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "" @@ -1897,9 +1966,15 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "" @@ -1928,6 +2003,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -1939,6 +2015,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2353,9 +2435,15 @@ msgstr "" msgid "Free Look" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "" @@ -2424,7 +2512,11 @@ msgid "Gamecube &Pad Settings" msgstr "הגדרות קול" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2445,8 +2537,12 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2456,9 +2552,15 @@ msgstr "" msgid "General Settings" msgstr "הגדרות קול" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "" @@ -2573,8 +2675,12 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "" @@ -2764,7 +2870,11 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "" @@ -2841,9 +2951,15 @@ msgstr "" msgid "Invalid state" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "" @@ -2994,11 +3110,19 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3076,7 +3200,11 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3107,7 +3235,11 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "" @@ -3284,7 +3416,11 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3371,7 +3507,11 @@ msgstr "" msgid "Not Set" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "" @@ -3432,7 +3572,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "" @@ -3558,8 +3701,13 @@ msgstr "" msgid "Paths" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3579,8 +3727,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "" @@ -3606,7 +3759,11 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "" @@ -3812,10 +3969,17 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "" @@ -3831,7 +3995,10 @@ msgid "Render to Main Window" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -3874,7 +4041,11 @@ msgstr "" msgid "Safe" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -3958,7 +4129,11 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" @@ -3998,12 +4173,21 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4026,6 +4210,7 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "" @@ -4035,6 +4220,17 @@ msgid "Select the state to load" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4370,9 +4566,15 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "" @@ -4408,7 +4610,11 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4443,7 +4649,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -4515,7 +4724,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "" @@ -4727,12 +4939,19 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "" @@ -4834,6 +5053,16 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5036,7 +5265,11 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5063,7 +5296,11 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "" @@ -5095,9 +5332,15 @@ msgstr "" msgid "Word Wrap" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "" diff --git a/Languages/po/hu.po b/Languages/po/hu.po index d39eec28db..2a61a06212 100644 --- a/Languages/po/hu.po +++ b/Languages/po/hu.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-18 13:41-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-06-04 14:29+0100\n" +>>>>>>> Update translation files for recent changes in the code. "Last-Translator: Delirious \n" "Language-Team: Delirious \n" "Language: Hungarian\n" @@ -74,7 +79,11 @@ msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s tisztítása sikertelen. Valószínűleg a képfájl sérült." #: Source/Core/Core/Src/HW/GCMemcard.cpp:97 +<<<<<<< HEAD #, c-format +======= +#, fuzzy, c-format +>>>>>>> Update translation files for recent changes in the code. msgid "" "%s failed to load as a memorycard \n" " Card file size is invalid (0x%x bytes)" @@ -83,7 +92,11 @@ msgstr "" " A kártya fájlmérete nem megfelelÅ‘ (0x%x bájt)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:112 +<<<<<<< HEAD #, c-format +======= +#, fuzzy, c-format +>>>>>>> Update translation files for recent changes in the code. msgid "" "%s failed to load as a memorycard \n" " Card size is invalid (0x%x bytes)" @@ -429,6 +442,10 @@ msgid "Accurate VBeam emulation" msgstr "Pontos VBeam emuláció" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -554,9 +571,15 @@ msgstr "Patch hozzáadása" msgid "Add new pane" msgstr "Új mezÅ‘ hozzáadása" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Hozzáadás..." @@ -626,8 +649,13 @@ msgstr "Minden GC/Wii képfájl (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Minden Gamecube GCM fájl (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Minden állásmentés (sav, s##)" @@ -656,8 +684,14 @@ msgstr "" "Ha bizonytalan vagy, hagyd kijelöletlenül." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Változtatható Wiimote idÅ‘zítés" +======= +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Emulált Wiimote" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -715,7 +749,11 @@ msgstr "" 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!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Képarány:" @@ -736,7 +774,11 @@ msgstr "Hang feldolgozó:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Hiba az AO eszköz megnyitásakor.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatikus" @@ -853,7 +895,11 @@ msgid "Blue Right" msgstr "Kék jobbra" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Lent" @@ -886,7 +932,11 @@ msgstr "Kimeneti könyvtár tallózása" msgid "Buffer:" msgstr "Puffer:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1132,7 +1182,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Bezárás" @@ -1241,7 +1295,11 @@ msgstr "Wiimote 3 csatlakoztatása" msgid "Connect Wiimote 4" msgstr "Wiimote 4 csatlakoztatása" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Csatlakozás..." @@ -1431,7 +1489,11 @@ msgid "DSP Emulator Engine" msgstr "DSP emulátor motor" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emuláció (gyors)" @@ -1664,7 +1726,11 @@ msgstr "" msgid "Divide" msgstr "Megosztás" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Le akarod állítani az éppen működÅ‘ emulációt?" @@ -1693,12 +1759,21 @@ msgstr "Dolphin emulált Wiimote beállítások" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad beállítások" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad beállítások" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS videók (*.dtm)" @@ -1795,9 +1870,15 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Holland" @@ -1941,15 +2022,22 @@ msgstr "BAT használata" msgid "Enable Block Merging" msgstr "Blokk csatlakozás használata" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Gyorsítótár használata" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Csalások használata" @@ -2105,9 +2193,15 @@ msgstr "" msgid "End" msgstr "Vége" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Angol" @@ -2136,6 +2230,7 @@ msgstr "EgyenlÅ‘" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Hiba" @@ -2147,6 +2242,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Hiba" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2606,9 +2707,15 @@ msgstr "RögzítendÅ‘ képkockák" msgid "Free Look" msgstr "Szabad nézet" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Francia" @@ -2675,7 +2782,11 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube &irányító beállítások" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube memóriakártyák (*.raw,*.gcp)" @@ -2698,8 +2809,12 @@ msgstr "" "(vagy rossz a kód vagy a kód típus még nem támogatott.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Ãltalános" @@ -2708,9 +2823,15 @@ msgstr "Ãltalános" msgid "General Settings" msgstr "Ãltalános beállítások" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Német" @@ -2732,6 +2853,10 @@ msgid "Greater Than" msgstr "Nagyobb mint" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2842,8 +2967,12 @@ msgid "Hotkey Configuration" msgstr "Gyorsbillentyű beállítások" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "Gyorsbill." @@ -3068,7 +3197,11 @@ msgid "" msgstr "" "InstallExceptionHandler elÅ‘idézve, de ez a platform még nem támogatja azt." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "WAD telepítése..." @@ -3150,9 +3283,15 @@ msgstr "Nem megfelelÅ‘ rögzített fájl" msgid "Invalid state" msgstr "Nem megfelelÅ‘ mentés" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Olasz" @@ -3310,11 +3449,19 @@ msgstr "Ãllás betöltése a 8. helyrÅ‘l" msgid "Load State..." msgstr "Ãllás betöltése..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Wii rendszer menü betöltése" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Wii rendszer menü betöltése" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii rendszer menü betöltése %d%c" @@ -3396,7 +3543,11 @@ msgstr "MMU sebesség növelÅ‘ hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark fájlok (*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "FÅ‘kar" @@ -3427,7 +3578,11 @@ msgid "Memory Byte" msgstr "Memória bájt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Memóriakártya" @@ -3625,7 +3780,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3712,7 +3871,11 @@ msgstr "Nem egyenlÅ‘" msgid "Not Set" msgstr "Nincs beállítva" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Nincs csatlakoztatva" @@ -3773,7 +3936,10 @@ msgstr "Csak %d blokk szabad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Megnyitás" @@ -3904,8 +4070,13 @@ msgstr "Javítások" msgid "Paths" msgstr "Mappák" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Szünet" @@ -3925,8 +4096,13 @@ msgstr "%d perspektíva" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Indítás" @@ -3952,7 +4128,11 @@ msgstr "Visszajátszási lehetÅ‘ségek" msgid "Players" msgstr "Játékosok" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Változtatás jóváhagyása..." @@ -4163,10 +4343,17 @@ msgstr "A lista frissítése" msgid "Refresh game list" msgstr "Játéklista frissítése" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Törlés" @@ -4185,7 +4372,10 @@ msgid "Render to Main Window" msgstr "Megjelenítés a fÅ‘ablakban" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Alapra állítás" @@ -4228,7 +4418,11 @@ msgstr "Ãl&lás mentése" msgid "Safe" msgstr "Biztonságos" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Mintavételezési frekvencia:" @@ -4312,7 +4506,11 @@ 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" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Keresés %s" @@ -4352,12 +4550,21 @@ msgstr "%s rész nem található a SYSCONF fájlban" msgid "Select" msgstr "Választás" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Válassz rögzítendÅ‘ fájlt" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Válassz rögzítendÅ‘ fájlt" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Válassz telepítendÅ‘ Wii WAD fájlt" @@ -4383,6 +4590,7 @@ msgstr "Válassz lebegÅ‘ ablakokat" msgid "Select the file to load" msgstr "BetöltendÅ‘ fájl kiválasztása" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Válassz mentési fájlt" @@ -4392,6 +4600,17 @@ msgid "Select the state to load" msgstr "Válassz betöltendÅ‘ állásmentést" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Válassz mentési fájlt" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Válassz betöltendÅ‘ állásmentést" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Válassz mentendÅ‘ állást" @@ -4773,9 +4992,15 @@ msgstr "Hang puffer létrehozása sikertelen: %s" msgid "Space" msgstr "Szóköz" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Spanyol" @@ -4819,7 +5044,11 @@ msgstr "Negyzetes kar" msgid "Standard Controller" msgstr "Normál irányító" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4854,7 +5083,10 @@ msgstr "Kar" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Leállítás" @@ -4910,6 +5142,10 @@ msgstr "TAJVAN" #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "TAS Input" msgstr "TAS bemenet" @@ -4932,7 +5168,10 @@ msgstr "Tábla jobbra" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Pillanatkép készítése" @@ -5178,12 +5417,19 @@ msgstr "Minden napló típus kijelölése" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Váltás teljes nézetre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Fent" @@ -5294,6 +5540,18 @@ msgstr "" "Ismeretlen üzenet érkezett ezzel az azonosítóval:%d ettÅ‘l a játékostól:%d " "Játékos kirúgása!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Ismeretlen mutató %#08x\n" +"Folytatod?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5517,7 +5775,11 @@ msgstr "Wii NAND gyökér könyvtár:" msgid "Wii Save Import" msgstr "Wii mentés importálása" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii mentés fájlok (*.bin)|*.bin" @@ -5548,7 +5810,11 @@ msgstr "" "esetleg az üresjárati idÅ‘korlát letelt vagy egyéb ok miatt történt.\n" "Újra akarod csatlakoztatni most?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote csatlakoztatva" @@ -5580,9 +5846,15 @@ msgstr "Jobb Windows" msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Folyamatban..." diff --git a/Languages/po/it.po b/Languages/po/it.po index 6be9fd979c..c27de2da97 100644 --- a/Languages/po/it.po +++ b/Languages/po/it.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-04-08 20:40+0100\n" "Last-Translator: RebuMan, Dolphin Team\n" "Language-Team: \n" @@ -552,9 +556,15 @@ msgstr "Aggiungi Patch" msgid "Add new pane" msgstr "Aggiungi nuovo riquadro" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Aggiungi..." @@ -626,8 +636,13 @@ msgstr "Tutti i file di immagine GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tutti i file GCM GameCube (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tutti gli Stati di Gioco Salvati (sav, s##)" @@ -711,7 +726,11 @@ 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!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspetto:" @@ -732,7 +751,11 @@ msgstr "Interfaccia Audio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "Audiocommon: Errore nell'apertura della periferica AO.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -845,7 +868,11 @@ msgid "Blue Right" msgstr "Blu Destro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Sotto" @@ -878,7 +905,11 @@ msgstr "Cerca una directory di destinazione" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1116,7 +1147,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Chiudi" @@ -1226,7 +1261,11 @@ msgstr "Collega Wiimote 3" msgid "Connect Wiimote 4" msgstr "Collega Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Connessione in corso..." @@ -1415,7 +1454,11 @@ msgid "DSP Emulator Engine" msgstr "Motore di Emulazione DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulazione DSP HLE (veloce)" @@ -1635,7 +1678,11 @@ msgstr "Visualizza i tasti di input letti dall'emulatore." msgid "Divide" msgstr "/" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Vuoi interrompere l'emulazione in corso?" @@ -1664,12 +1711,21 @@ msgstr "Dolphin - Configurazione Wiimote Emulato" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin - Configurazione Controlli GC" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin - Configurazione Controlli GC" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmati TAS Dolphin (*.dtm)" @@ -1758,9 +1814,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Olandese" @@ -1889,16 +1951,23 @@ msgstr "Attiva BAT" msgid "Enable Block Merging" msgstr "Attiva Unione Blocchi" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Attiva Cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Abilita Trucchi" @@ -2039,9 +2108,15 @@ msgstr "" msgid "End" msgstr "Fine" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Inglese" @@ -2070,6 +2145,7 @@ msgstr "Uguale" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Errore/i" @@ -2081,6 +2157,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Errore/i" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2545,9 +2627,15 @@ msgstr "Fotogrammi da Registrare:" msgid "Free Look" msgstr "Visuale Libera" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Francese" @@ -2615,7 +2703,11 @@ msgid "Gamecube &Pad Settings" msgstr "Impostazioni &Controlli GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Schede di Memoria GameCube (*.raw,*.gcp)" @@ -2638,8 +2730,12 @@ msgstr "" "(codice corrotto oppure tipo di codice non ancora supportato.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generale" @@ -2649,9 +2745,15 @@ msgstr "Generale" msgid "General Settings" msgstr "Impostazioni Interfaccia" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Tedesco" @@ -2776,8 +2878,12 @@ msgid "Hotkey Configuration" msgstr "Configurazione Tasti di Scelta Rapida" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "Tasti di Scelta Rapida" @@ -2991,7 +3097,11 @@ msgstr "" "E' stata sollevata un'Eccezione all'Installazione, tuttavia questa " "piattaforma non la supporta ancora." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Installazione WAD..." @@ -3075,9 +3185,15 @@ msgstr "File di registrazione non valido" msgid "Invalid state" msgstr "Stato non valido" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italiano" @@ -3236,12 +3352,20 @@ msgstr "Carica Stato di Gioco dall'Ingresso 8" msgid "Load State..." msgstr "Carica Stato di Gioco..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Carica il Menu di Sistema Wii %d%c" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carica il Menu di Sistema Wii %d%c" @@ -3324,7 +3448,11 @@ msgstr "Hack Velocità MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "File MadCatz Gameshark(*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Levetta Principale" @@ -3355,7 +3483,11 @@ msgid "Memory Byte" msgstr "Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Scheda di Memoria" @@ -3541,7 +3673,11 @@ msgstr "TN Tab" msgid "NP Up" msgstr "TN Su" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3628,7 +3764,11 @@ msgstr "Diverso" msgid "Not Set" msgstr "Non Impostato" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Non collegato" @@ -3689,7 +3829,10 @@ msgstr "Solo %d blocchi disponibili" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Apri" @@ -3823,8 +3966,13 @@ msgstr "Patches" msgid "Paths" msgstr "Percorsi" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -3845,8 +3993,13 @@ msgstr "Prospettiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Gioca" @@ -3872,7 +4025,11 @@ msgstr "Opzioni di Riproduzione" msgid "Players" msgstr "Giocatori" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Per favore confermare..." @@ -4086,10 +4243,17 @@ msgstr "Aggiorna Elenco" msgid "Refresh game list" msgstr "Aggiorna elenco giochi" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Rimuovi" @@ -4108,7 +4272,10 @@ msgid "Render to Main Window" msgstr "Rendering nella finestra Principale" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Resetta" @@ -4151,7 +4318,11 @@ msgstr "Sa&lva Stato di Gioco" msgid "Safe" msgstr "Accurata" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Frequenza di Campionamento:" @@ -4236,7 +4407,11 @@ msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..." msgid "Scaled EFB Copy" msgstr "Scala Copie EFB" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Ricerca..." @@ -4276,12 +4451,21 @@ msgstr "Sezione %s non trovata in SYSCONF" msgid "Select" msgstr "Seleziona" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Seleziona il File di Registrazione" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Seleziona il File di Registrazione" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleziona un file WAD Wii da installare" @@ -4307,6 +4491,7 @@ msgstr "Seleziona finestre libere/mobili" msgid "Select the file to load" msgstr "Seleziona il file da caricare" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Seleziona il file di salvataggio" @@ -4316,6 +4501,17 @@ msgid "Select the state to load" msgstr "Seleziona lo stato di gioco da caricare" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Seleziona il file di salvataggio" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Seleziona lo stato di gioco da caricare" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Seleziona lo stato di gioco da salvare" @@ -4670,9 +4866,15 @@ msgstr "Creazione buffer audio non riuscita: %s" msgid "Space" msgstr "Spazio" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Spagnolo" @@ -4708,7 +4910,11 @@ msgstr "Levetta Quadrata" msgid "Standard Controller" msgstr "Controller Standard" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4743,7 +4949,10 @@ msgstr "Levetta" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Arresta" @@ -4816,7 +5025,10 @@ msgstr "Semipiano destro" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Genera un'Istantanea di Gioco" @@ -5061,12 +5273,19 @@ msgstr "Seleziona/Deseleziona tutti i Tipi di Log" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Commuta a Schermo Intero" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Sopra" @@ -5172,6 +5391,18 @@ msgstr "" "Messaggio sconosciuto avente id:%d ricevuto dal giocatore:%d Giocatore " "espluso!!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Puntatore %#08x sconosciuto\n" +"Continuare?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5384,7 +5615,11 @@ msgstr "Origine DVD:" msgid "Wii Save Import" msgstr "Importa Salvataggi Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Salva i file Wii (*.bin)|*.bin" @@ -5415,7 +5650,11 @@ msgstr "" " o forse è dovuto ad altri motivi. \n" "Vuoi riconnettersi immediatamente?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote Collegato" @@ -5448,9 +5687,15 @@ msgstr "Windows Destro" msgid "Word Wrap" msgstr "Adatta Testo" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Attività in corso..." diff --git a/Languages/po/ja.po b/Languages/po/ja.po index d0e94ebb39..dc9751b1b1 100644 --- a/Languages/po/ja.po +++ b/Languages/po/ja.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-12 20:45+0900\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-08-19 08:37-0500\n" +>>>>>>> Update translation files for recent changes in the code. "Last-Translator: DanbSky\n" "Language-Team: \n" "Language: Japanese\n" @@ -426,6 +431,10 @@ msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulation" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -550,9 +559,15 @@ msgstr "パッãƒã‚’追加" msgid "Add new pane" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "追加" @@ -618,8 +633,13 @@ msgstr "å…¨ã¦ã® GC/Wii イメージ (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "GC GCMファイル (gcm)|*.gcm" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "å…¨ã¦ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイル (sav, s##)" @@ -648,8 +668,14 @@ msgstr "" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Wii リモコンã®åŒæœŸèª¿æ•´" +======= +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Wii リモコンをエミュレート" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -707,7 +733,11 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ファイルを削除ã—ã¾ã™ã‹ï¼Ÿå…ƒã«æˆ»ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“ï¼" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "アスペクト比：" @@ -728,7 +758,11 @@ msgstr "出力API (Audio Backend)" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error opening AO device.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" @@ -843,7 +877,11 @@ msgid "Blue Right" msgstr "é’ - å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "下部" @@ -876,7 +914,11 @@ msgstr "出力先をé¸æŠž" msgid "Buffer:" msgstr "ãƒãƒƒãƒ•ã‚¡ï¼š" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1123,7 +1165,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "é–‰ã˜ã‚‹" @@ -1232,7 +1278,11 @@ msgstr "3Pã®Wii リモコンを接続ï¼åˆ‡æ–­" msgid "Connect Wiimote 4" msgstr "4Pã®Wii リモコンを接続ï¼åˆ‡æ–­" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "接続中..." @@ -1423,7 +1473,11 @@ msgid "DSP Emulator Engine" msgstr "DSPエミュレーション方å¼" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP-HLE エミュレーション (高速)" @@ -1654,7 +1708,11 @@ msgstr "" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "動作中ã®ã‚²ãƒ¼ãƒ ã‚’åœæ­¢ã—ã¾ã™ã‹ï¼Ÿ" @@ -1683,12 +1741,21 @@ msgstr "Wii リモコンã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³è¨­å®š" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "GCコントローラ設定" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "GCコントローラ設定" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS ムービー (*.dtm)" @@ -1785,9 +1852,15 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "オランダ語" @@ -1931,15 +2004,22 @@ msgstr "Enable BAT" msgid "Enable Block Merging" msgstr "Enable Block Merging" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Enable Cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ã‚’有効化" @@ -2093,9 +2173,15 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "英語" @@ -2124,6 +2210,7 @@ msgstr "ã«ä¸€è‡´ã™ã‚‹" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "エラー" @@ -2135,6 +2222,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "エラー" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2593,9 +2686,15 @@ msgstr "録画フレーム数設定" msgid "Free Look" msgstr "フリールック" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "フランス語" @@ -2662,7 +2761,11 @@ msgid "Gamecube &Pad Settings" msgstr "ゲームキューブ入力設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "メモリーカードファイル (*.raw,*.gcp)|*.raw;*.gcp" @@ -2685,8 +2788,12 @@ msgstr "" "(コードã«å•é¡ŒãŒã‚ã‚‹ã‹ã€ã¾ã ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„タイプã®ã‚³ãƒ¼ãƒ‰ã§ã™)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -2695,9 +2802,15 @@ msgstr "一般" msgid "General Settings" msgstr "一般" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "ドイツ語" @@ -2720,6 +2833,10 @@ msgid "Greater Than" msgstr "より大ãã„" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2829,8 +2946,12 @@ msgid "Hotkey Configuration" msgstr "ホットキーã®è¨­å®š" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "ホットキー" @@ -3053,7 +3174,11 @@ msgstr "" "InstallExceptionHandler ãŒå‘¼ã³å‡ºã•ã‚Œã¾ã—ãŸãŒã€ã“ã®ãƒ—ラットフォームã¯ã¾ã ã‚µ" "ãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "WADファイルを追加ã—ã¦ã„ã¾ã™..." @@ -3135,9 +3260,15 @@ msgstr "ä¸æ­£ãªéŒ²ç”»ãƒ•ã‚¡ã‚¤ãƒ«" msgid "Invalid state" msgstr "ä¸æ­£ãªã‚»ãƒ¼ãƒ–ï¼ãƒ­ãƒ¼ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "イタリア語" @@ -3295,11 +3426,19 @@ msgstr "ステートロード - スロット 8" msgid "Load State..." msgstr "ファイルã‹ã‚‰ãƒ­ãƒ¼ãƒ‰" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Wiiメニューを起動" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Wiiメニューを起動" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wiiメニューを起動 ( ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š%d %c )" @@ -3382,7 +3521,11 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark セーブファイル(*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "コントロールスティック" @@ -3413,7 +3556,11 @@ msgid "Memory Byte" msgstr "メモリãƒã‚¤ãƒˆ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "メモリーカード" @@ -3609,7 +3756,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3696,7 +3847,11 @@ msgstr "ã«ä¸€è‡´ã—ãªã„" msgid "Not Set" msgstr "未確èª" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "未接続" @@ -3757,7 +3912,10 @@ msgstr "残り %d ブロックã—ã‹ã‚ã‚Šã¾ã›ã‚“ï¼" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "é–‹ã" @@ -3888,8 +4046,13 @@ msgstr "パッãƒ" msgid "Paths" msgstr "フォルダ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "一時åœæ­¢" @@ -3909,8 +4072,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "開始" @@ -3936,7 +4104,11 @@ msgstr "å†ç”Ÿã‚ªãƒ—ション" msgid "Players" msgstr "プレイヤー一覧" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "確èª" @@ -4148,10 +4320,17 @@ msgstr "ゲームリストをå†æ›´æ–°" msgid "Refresh game list" msgstr "ゲームリストをå†æ›´æ–°ã—ã¾ã™" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "削除" @@ -4170,7 +4349,10 @@ msgid "Render to Main Window" msgstr "メインウィンドウ部分ã«æç”»" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "åˆæœŸåŒ–" @@ -4213,7 +4395,11 @@ msgstr "ステートセーブ(&V)" msgid "Safe" msgstr "Safe" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "サンプルレート" @@ -4297,7 +4483,11 @@ msgstr "Savestate movie %s ã®ç ´æを確èªã—ã¾ã—ãŸã€‚録画を中止㗠msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "確èªä¸­... .%s" @@ -4337,12 +4527,21 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "é¸æŠž" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "録画ファイルをé¸æŠž" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "録画ファイルをé¸æŠž" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "追加ã™ã‚‹WADファイルをé¸æŠž" @@ -4368,6 +4567,7 @@ msgstr "" msgid "Select the file to load" msgstr "ロードã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "セーブファイルをé¸æŠž" @@ -4377,6 +4577,17 @@ msgid "Select the state to load" msgstr "ロードã™ã‚‹ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイルをé¸æŠž" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "セーブファイルをé¸æŠž" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "ロードã™ã‚‹ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイルをé¸æŠž" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "ステートセーブã®ä¿å­˜å…ˆã‚’é¸æŠž" @@ -4755,9 +4966,15 @@ msgstr "Sound buffer creation failed: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "スペイン語" @@ -4801,7 +5018,11 @@ msgstr "丸ã¿" msgid "Standard Controller" msgstr "標準コントローラ" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4836,7 +5057,10 @@ msgstr "スティック" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "åœæ­¢" @@ -4913,7 +5137,10 @@ msgstr "å³ãƒ†ãƒ¼ãƒ–ル" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "スクリーンショット" @@ -5164,12 +5391,19 @@ msgstr "å…¨ã¦ã®ãƒ­ã‚°æƒ…報をé¸æŠžï¼è§£é™¤" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "フルスクリーン表示切り替ãˆ" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "上部" @@ -5278,6 +5512,18 @@ msgstr "次ã®IDã‹ã‚‰ä¸æ˜Žãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’å—ä¿¡ : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Unknown message with id:%d received from player:%d Kicking player!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"ä¸æ˜Žãªãƒã‚¤ãƒ³ã‚¿ %#08x\n" +"続ã‘ã¾ã™ã‹ï¼Ÿ" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5501,7 +5747,11 @@ msgstr "Wii NANDルート" msgid "Wii Save Import" msgstr "Wiiã®ã‚»ãƒ¼ãƒ–データをインãƒãƒ¼ãƒˆ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wiiセーブデータ (*.bin)|*.bin" @@ -5532,7 +5782,11 @@ msgstr "" "ã¾ãŸã¯ã—ã°ã‚‰ã入力ãŒãªã‹ã£ãŸãŸã‚çœé›»åŠ›ãƒ¢ãƒ¼ãƒ‰ã«å…¥ã£ãŸã®ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“\n" "å†æŽ¥ç¶šã—ã¾ã™ã‹ï¼Ÿ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wii リモコン接続中" @@ -5564,9 +5818,15 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ワードラップ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "動作中..." @@ -6263,6 +6523,7 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "音声や効果音ã®å†ç”Ÿã«ã‚ˆã使用ã•ã‚Œã¾ã™" +<<<<<<< HEAD #~ msgid "" #~ "Unknown pointer %#08x\n" @@ -6270,6 +6531,8 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgstr "" #~ "Unknown pointer %#08x\n" #~ "Continue?" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Use FPS For Limiting" #~ msgstr "有効化" diff --git a/Languages/po/ko.po b/Languages/po/ko.po index 3f8323714e..6378880eee 100644 --- a/Languages/po/ko.po +++ b/Languages/po/ko.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-07-07 10:24+0900\n" "Last-Translator: \n" "Language-Team: \n" @@ -549,9 +553,15 @@ msgstr "패치 추가" msgid "Add new pane" msgstr "새로운 ì°½ 추가" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "추가..." @@ -619,8 +629,13 @@ msgstr "모든 GC/Wii ì´ë¯¸ì§€ë“¤ (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "모든 게임í브 GCM 파ì¼ë“¤ (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "모든 ìƒíƒœë“¤ 저장 (sav, s##)" @@ -708,7 +723,11 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ì´ íŒŒì¼ì„ ì •ë§ë¡œ 지우고 싶습니까? ê·¸ê²ƒì€ ì˜ì›ížˆ 사ë¼ì§‘니다!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "종횡비:" @@ -729,7 +748,11 @@ msgstr "오디오 백엔드:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO 장치를 열기 ì—러.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "ìžë™" @@ -844,7 +867,11 @@ msgid "Blue Right" msgstr "파랑 오른쪽" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "아래" @@ -877,7 +904,11 @@ msgstr "출력 디렉토리 둘러보기" msgid "Buffer:" msgstr "버í¼:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1118,7 +1149,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "닫기" @@ -1227,7 +1262,11 @@ msgstr "위모트 3 ì—°ê²°" msgid "Connect Wiimote 4" msgstr "위모트 4 ì—°ê²°" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "연결중..." @@ -1418,7 +1457,11 @@ msgid "DSP Emulator Engine" msgstr "DSP ì—뮬레ì´í„° 엔진" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE ì—뮬레ì´ì…˜ (빠름)" @@ -1647,7 +1690,11 @@ msgstr "" msgid "Divide" msgstr "나누기" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "현재 ì—뮬레ì´ì…˜ì„ 중단하고 싶습니까?" @@ -1676,12 +1723,21 @@ msgstr "ëŒí•€ ì—ë®¬ëœ ìœ„ëª¨íŠ¸ 환경설정" msgid "Dolphin FIFO" msgstr "ëŒí•€ FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "ëŒí•€ GC패드 환경설정" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "ëŒí•€ GC패드 환경설정" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "ëŒí•€ TAS ë™ì˜ìƒ (*.dtm)" @@ -1777,9 +1833,15 @@ msgstr "" "\n" "확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "네ëœëž€ë“œì–´" @@ -1922,15 +1984,22 @@ msgstr "BAT 활성" msgid "Enable Block Merging" msgstr "ë¸”ë¡ í•©ì¹˜ê¸° 활성" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "ìºì‰¬ 활성" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "치트 활성" @@ -2081,9 +2150,15 @@ msgstr "" msgid "End" msgstr "ë" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "ì˜ì–´" @@ -2112,6 +2187,7 @@ msgstr "ê°™ìŒ" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "ì—러" @@ -2123,6 +2199,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "ì—러" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "ì„ íƒëœ 언어 로딩 ì—러. 시스템 기본으로 ëŒì•„갑니다." @@ -2577,9 +2659,15 @@ msgstr "녹화할 프레임" msgid "Free Look" msgstr "ìžìœ ë¡œìš´ 보기" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "프랑스어" @@ -2646,7 +2734,11 @@ msgid "Gamecube &Pad Settings" msgstr "게임í브 패드 설정(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "게임í브 메모리 카드들 (*.raw,*.gcp)" @@ -2669,8 +2761,12 @@ msgstr "" "(ìž˜ëª»ëœ ì½”ë“œì´ê±°ë‚˜ 코드 íƒ€ìž…ì´ ì•„ì§ ì§€ì›ì•Šëœë‹¤.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "ì¼ë°˜" @@ -2679,9 +2775,15 @@ msgstr "ì¼ë°˜" msgid "General Settings" msgstr "ì¼ë°˜ 설정" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "ë…ì¼ì–´" @@ -2811,8 +2913,12 @@ msgid "Hotkey Configuration" msgstr "단축키 설정" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "단축키들" @@ -3034,7 +3140,11 @@ msgstr "" "InstallExceptionHandler 호출ë¨, 하지만 ì´ í”Œëž«í¼ì€ ì•„ì§ ê·¸ê²ƒì„ ì§€ì›í•˜ì§€ 않습" "니다." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "WAD 설치하기..." @@ -3116,9 +3226,15 @@ msgstr "비ì í•© ê¸°ë¡ íŒŒì¼" msgid "Invalid state" msgstr "비ì í•© ìƒíƒœ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "ì´íƒˆë¦¬ì•„ì–´" @@ -3276,11 +3392,19 @@ msgstr "슬롯8 ìƒíƒœ 로드" msgid "Load State..." msgstr "ìƒíƒœ 로드..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Wii 시스템 메뉴 로드" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Wii 시스템 메뉴 로드" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii 시스템 메뉴 %d %c 로드" @@ -3362,7 +3486,11 @@ msgstr "MMU 스피드 핵" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz ê²Œìž„ìƒ¤í¬ íŒŒì¼ë“¤(*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "ë©”ì¸ ìŠ¤í‹±" @@ -3393,7 +3521,11 @@ msgid "Memory Byte" msgstr "메모리 ë°”ì´íŠ¸" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "메모리 ì¹´ë“œ" @@ -3591,7 +3723,11 @@ msgstr "NP 탭" msgid "NP Up" msgstr "NP 위" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3678,7 +3814,11 @@ msgstr "같지 ì•ŠìŒ" msgid "Not Set" msgstr "설정 안함" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "ì—°ê²°ë˜ì§€ ì•ŠìŒ" @@ -3739,7 +3879,10 @@ msgstr "%d 블럭들만 유용한" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "열기" @@ -3867,8 +4010,13 @@ msgstr "패치" msgid "Paths" msgstr "경로" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "ì¼ì‹œì •ì§€" @@ -3888,8 +4036,13 @@ msgstr "ê´€ì  %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr " 실행 " @@ -3915,7 +4068,11 @@ msgstr "ìž¬ìƒ ì˜µì…˜" msgid "Players" msgstr "플레ì´ì–´" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "확ì¸í•´ì£¼ì„¸ìš”..." @@ -4127,10 +4284,17 @@ msgstr "ëª©ë¡ ìƒˆë¡œ 고침" msgid "Refresh game list" msgstr "게임 ëª©ë¡ ìƒˆë¡œ 고침" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "제거" @@ -4149,7 +4313,10 @@ msgid "Render to Main Window" msgstr "ë©”ì¸ ìœˆë„ìš°ì— ë Œë”" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "리셋" @@ -4192,7 +4359,11 @@ msgstr "ìƒíƒœ 저장(&v) " msgid "Safe" msgstr "안전" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "샘플율:" @@ -4276,7 +4447,11 @@ msgstr "%s ì˜ìƒ ìƒíƒœì €ìž¥ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤, ì˜ìƒ ê¸°ë¡ ì¤‘ì§€... msgid "Scaled EFB Copy" msgstr "스케ì¼ëœ EFB 복사" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "스ìºë‹ %s" @@ -4316,12 +4491,21 @@ msgstr "섹션 %s를 SYSCONFì—ì„œ ì°¾ì„ ìˆ˜ ì—†ìŒ" msgid "Select" msgstr "ì„ íƒ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "ê¸°ë¡ íŒŒì¼ ì„ íƒ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "ê¸°ë¡ íŒŒì¼ ì„ íƒ" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "설치할 Wii WAD íŒŒì¼ ì„ íƒ" @@ -4347,6 +4531,7 @@ msgstr "유ë™ì ì¸ 윈ë„우즈 ì„ íƒ" msgid "Select the file to load" msgstr "로드할 íŒŒì¼ ì„ íƒ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "저장 파ì¼ì„ ì„ íƒ" @@ -4356,6 +4541,17 @@ msgid "Select the state to load" msgstr "로드할 ìƒíƒœ ì„ íƒ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "저장 파ì¼ì„ ì„ íƒ" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "로드할 ìƒíƒœ ì„ íƒ" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "저장할 ìƒíƒœ ì„ íƒ" @@ -4730,9 +4926,15 @@ msgstr "사운드 ë²„í¼ ìƒì„± 실패했습니다: %s" msgid "Space" msgstr "스페ì´ìŠ¤" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "스페ì¸ì–´" @@ -4776,7 +4978,11 @@ msgstr "스퀘어 스틱" msgid "Standard Controller" msgstr "표준 컨트롤러" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4811,7 +5017,10 @@ msgstr "스틱" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "중지" @@ -4887,7 +5096,10 @@ msgstr "í…Œì´ë¸” 오른쪽" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "스í¬ë¦°ìƒ· ì°ê¸°" @@ -5129,12 +5341,19 @@ msgstr "모든 로그 타입 토글" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "전체화면 토글" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "위" @@ -5242,6 +5461,18 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "id:%dì˜ ì•Œë ¤ì§€ì§€ ì•Šì€ ë©”ì‹œì§€, 플레ì´ì–´:%d 플레ì´ì–´ 킥킹으로 부터 전달ëœ!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"알려지지 ì•Šì€ í¬ì¸í„° %#08x\n" +"계ì†í•©ë‹ˆê¹Œ?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5463,7 +5694,11 @@ msgstr "Wii NAND 루트:" msgid "Wii Save Import" msgstr "Wii 저장 가져오기" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 저장 파ì¼ë“¤ (*.bin)|*.bin" @@ -5494,7 +5729,11 @@ msgstr "" "í˜¹ì€ ì•„ë§ˆë„ ì•„ì´ë“¤ 타임 아웃ì´ê±°ë‚˜ 다른 ì›ì¸ ë•Œë¬¸ì¸ ê²ƒ 같습니다.\n" "ë‹¹ì‹ ì€ ì¦‰ì‹œ 재연결 하고 싶습니까?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "위모트가 ì—°ê²°ë¨" @@ -5527,9 +5766,15 @@ msgstr "윈ë„우즈 오른쪽" msgid "Word Wrap" msgstr "ìžë™ 줄바꿈" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "ìž‘ë™ì¤‘..." diff --git a/Languages/po/nb.po b/Languages/po/nb.po index d922644cbf..f916e21416 100644 --- a/Languages/po/nb.po +++ b/Languages/po/nb.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-06-06 20:15+0100\n" "Last-Translator: Knut \n" "Language-Team: Norwegian \n" @@ -555,9 +559,15 @@ msgstr "Legg til Patch" msgid "Add new pane" msgstr "Legg til ny rute" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Legg til..." @@ -625,8 +635,13 @@ msgstr "Alle GC/Wii-bildefiler (gcm, iso, ciso, wad)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle GameCube GCM-filer (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Save States (sav, s##)" @@ -718,7 +733,11 @@ msgstr "" "Er du sikker pÃ¥ at du vil slette denne filen?\n" "Den vil bli borte for alltid!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspektforhold:" @@ -739,7 +758,11 @@ msgstr "Audio Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Feil ved Ã¥pning av AO-device.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisk" @@ -854,7 +877,11 @@ msgid "Blue Right" msgstr "BlÃ¥ Høyre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Bunn" @@ -887,7 +914,11 @@ msgstr "Bla etter lagringssted" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1130,7 +1161,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Lukk" @@ -1239,7 +1274,11 @@ msgstr "Koble til Wiimote 3" msgid "Connect Wiimote 4" msgstr "Koble til Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Kobler til..." @@ -1429,7 +1468,11 @@ msgid "DSP Emulator Engine" msgstr "CPU Emulatormotor" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE-emulering (raskt)" @@ -1660,7 +1703,11 @@ msgstr "" msgid "Divide" msgstr "Del" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Vil du stoppe pÃ¥gÃ¥ende emulering?" @@ -1689,12 +1736,21 @@ msgstr "Dolphin Emulert Wiimote Konfigurasjon" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC-kontroll konfigurasjon" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC-kontroll konfigurasjon" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS-Filmer (*.dtm)" @@ -1790,9 +1846,15 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Nederlansk" @@ -1935,15 +1997,22 @@ msgstr "Aktiver BAT" msgid "Enable Block Merging" msgstr "Aktiver Block Merging" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Aktiver cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Aktiver Juksekoder" @@ -2098,9 +2167,15 @@ msgstr "" msgid "End" msgstr "Slutt" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Engelsk" @@ -2129,6 +2204,7 @@ msgstr "Lik" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Feil" @@ -2140,6 +2216,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Feil" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Feil ved lasting av valgt sprÃ¥k. Faller tilbake til systemstandarden." @@ -2595,9 +2677,15 @@ msgstr "Bilder Til Opptak" msgid "Free Look" msgstr "Fri Utkikk" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Fransk" @@ -2664,7 +2752,11 @@ msgid "Gamecube &Pad Settings" msgstr "Innstillinger for &GameCube-kontroll" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube-minnekort (*.raw,*.gcp)" @@ -2687,8 +2779,12 @@ msgstr "" "(Enten en dÃ¥rlig kode, eller sÃ¥ støttes ikke kodeformatet.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generelt" @@ -2697,9 +2793,15 @@ msgstr "Generelt" msgid "General Settings" msgstr "Generelle Innstillinger" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Tysk" @@ -2830,8 +2932,12 @@ msgid "Hotkey Configuration" msgstr "Konfigurer Snarveistaster" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "Snarveistaster" @@ -3050,7 +3156,11 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "InstallExceptionHandler kalt, men denne plattformen støtter den ikke." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Installer WAD..." @@ -3132,9 +3242,15 @@ msgstr "Ugyldig opptaksfil" msgid "Invalid state" msgstr "Ugyldig save state" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italiensk" @@ -3292,11 +3408,19 @@ msgstr "Last Inn Save State Slot 8" msgid "Load State..." msgstr "Last Inn Save State..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Last inn Wii System Meny" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Last inn Wii System Meny" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Last inn Wii System Meny %d %c" @@ -3378,7 +3502,11 @@ msgstr "Ytelses-hack for MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark-filer(*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Hoved-joystick" @@ -3409,7 +3537,11 @@ msgid "Memory Byte" msgstr "Memory Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Minnekort" @@ -3607,7 +3739,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Opp" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3694,7 +3830,11 @@ msgstr "Ikke Lik" msgid "Not Set" msgstr "Ikke Satt" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Ikke tilkoblet" @@ -3755,7 +3895,10 @@ msgstr "Kun %d blokker tilgjengelig" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Ã…pne" @@ -3886,8 +4029,13 @@ msgstr "Patcher" msgid "Paths" msgstr "Mappestier" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -3907,8 +4055,13 @@ msgstr "Perspektiv %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Spill" @@ -3934,7 +4087,11 @@ msgstr "Avspillingsalterntiver" msgid "Players" msgstr "Spillere" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Vennligst bekreft..." @@ -4147,10 +4304,17 @@ msgstr "Oppdater liste" msgid "Refresh game list" msgstr "Oppdater spilliste" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Fjern" @@ -4169,7 +4333,10 @@ msgid "Render to Main Window" msgstr "Render til Hovedvindu" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Restart" @@ -4212,7 +4379,11 @@ msgstr "Lagre Sa&ve State" msgid "Safe" msgstr "Sikker" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Samplingsratio:" @@ -4296,7 +4467,11 @@ msgstr "Save State-film %s er korrupt, opptak avsluttes..." msgid "Scaled EFB Copy" msgstr "Skalert EFB-kopi" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Søker i %s" @@ -4336,12 +4511,21 @@ msgstr "Seksjon %s ikke funnet i SYSCONF" msgid "Select" msgstr "Velg" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Velg Opptaksfil" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Velg Opptaksfil" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Velg en Wii WAD-fil Ã¥ innstallere" @@ -4367,6 +4551,7 @@ msgstr "Velg flytvindu" msgid "Select the file to load" msgstr "Velg fil Ã¥ laste" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Velg lagringsfil" @@ -4376,6 +4561,17 @@ msgid "Select the state to load" msgstr "Velg en save state Ã¥ laste" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Velg lagringsfil" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Velg en save state Ã¥ laste" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Velg en save state Ã¥ lagre" @@ -4752,9 +4948,15 @@ msgstr "Laging av lydbuffer mislyktes: %s" msgid "Space" msgstr "Mellomrom" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Spansk" @@ -4797,7 +4999,11 @@ msgstr "Kvadrat-joystick" msgid "Standard Controller" msgstr "Standardkontroller" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4832,7 +5038,10 @@ msgstr "Joystick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stopp" @@ -4910,7 +5119,10 @@ msgstr "Tabell Høyre" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Ta Skjermbilde" @@ -5153,12 +5365,19 @@ msgstr "Vipp Alle Loggtyper" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Vipp Mellom Vindu/Fullskjerm" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Topp" @@ -5265,6 +5484,18 @@ msgstr "Ukjent melding mottatt med ID: %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Ukjent melding mottatt med ID: %d fra spiller: %d Sparker spiller!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Ukjent peker %#08x\n" +"Fortsett?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5487,7 +5718,11 @@ msgstr "Wii NAND-rot:" msgid "Wii Save Import" msgstr "Importer Wii-lagringsfil" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii-lagringsfiler (*.bin)|*.bin" @@ -5518,7 +5753,11 @@ msgstr "" "eller kanskje den koblet seg fra pga. inaktivitet.\n" "Vil du koble til igjen øyeblikkelig?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote Tilkoblet" @@ -5551,9 +5790,15 @@ msgstr "Windows Høyre" msgid "Word Wrap" msgstr "Ordkrumning" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Arbeider..." diff --git a/Languages/po/nl.po b/Languages/po/nl.po index e77719aeb3..76e2b607fc 100644 --- a/Languages/po/nl.po +++ b/Languages/po/nl.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-08-07 16:43+0100\n" "Last-Translator: Goost \n" "Language-Team: DevPro Team. \n" @@ -556,9 +560,15 @@ msgstr "Voeg Patch toe" msgid "Add new pane" msgstr "Voeg een nieuwe paneel toe" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Voeg toe..." @@ -626,8 +636,13 @@ msgstr "Alle GC/Wii images (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM bestanden (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Opgeslagen Staten (sav, s##)" @@ -718,7 +733,11 @@ msgstr "" "Weet je zeker dat je dit bestand wilt verwijderen? Deze gegevens zijn niet " "terug te halen!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Beeldverhouding:" @@ -739,7 +758,11 @@ msgstr "Geluid Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -850,7 +873,11 @@ msgid "Blue Right" msgstr "Blauw Rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Onder" @@ -883,7 +910,11 @@ msgstr "Zoek een uitvoer folder" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1128,7 +1159,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Sluit" @@ -1238,7 +1273,11 @@ msgstr "Verbind Wiimote 3" msgid "Connect Wiimote 4" msgstr "Verbind Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Verbinden..." @@ -1429,7 +1468,11 @@ msgid "DSP Emulator Engine" msgstr "DSP Emulator Motor" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulatie (snel)" @@ -1662,7 +1705,11 @@ msgstr "" msgid "Divide" msgstr "Verdelen" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Wil je de emulatie stoppen?" @@ -1691,12 +1738,21 @@ msgstr "Dolphin Geëmuleerde Wiimote configuratie" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Configuratie" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad Configuratie" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Film (*.dtm)" @@ -1791,9 +1847,15 @@ msgstr "" "\n" "In geval van twijfel leeg laten." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Nederlands" @@ -1936,16 +1998,23 @@ msgstr "Activeer BAT" msgid "Enable Block Merging" msgstr "Activeer Block Merging" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Activeer Cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Activeer Cheats" @@ -2101,9 +2170,15 @@ msgstr "" msgid "End" msgstr "Einde" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Engels" @@ -2132,6 +2207,7 @@ msgstr "Gelijk" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error (Fout)" @@ -2143,6 +2219,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Error (Fout)" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2605,9 +2687,15 @@ msgstr "Frames om op te nemen" msgid "Free Look" msgstr "Vrije kijk" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Frans" @@ -2675,7 +2763,11 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube &Pad Instellingen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Kaarten (*.raw,*.gcp)" @@ -2698,8 +2790,12 @@ msgstr "" "(ofwel een onjuiste code of het type code is nog niet ondersteund.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Algemeen" @@ -2708,9 +2804,15 @@ msgstr "Algemeen" msgid "General Settings" msgstr "Algemene Instellingen" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Duits" @@ -2841,8 +2943,12 @@ msgid "Hotkey Configuration" msgstr "Sneltoets Configuratie" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "Hotkeys" @@ -3067,7 +3173,11 @@ msgstr "" "InstallExceptionHandler opgeroepen, maar dit platform ondersteund dit nog " "niet." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "WAD aan het installeren..." @@ -3150,9 +3260,15 @@ msgstr "Onjuist opname bestand" msgid "Invalid state" msgstr "Onjuiste staat" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italië" @@ -3310,12 +3426,20 @@ msgstr "Laad staat 8" msgid "Load State..." msgstr "Laad staat..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Laad Wii System Menu(%d %c)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Laad Wii System Menu(%d %c)" @@ -3397,7 +3521,11 @@ msgstr "MMU Snelheids Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark bestanden(*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3428,7 +3556,11 @@ msgid "Memory Byte" msgstr "Geheugen Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Geheugen Kaart" @@ -3627,7 +3759,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Omhoog" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3714,7 +3850,11 @@ msgstr "Niet gelijk" msgid "Not Set" msgstr "Niet ingesteld" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Niet verbonden" @@ -3775,7 +3915,10 @@ msgstr "Er zijn maar %d blocks beschikaarr" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Open" @@ -3907,8 +4050,13 @@ msgstr "Patches" msgid "Paths" msgstr "Pad" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pauze" @@ -3928,8 +4076,13 @@ msgstr "Perspectief %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Speel" @@ -3955,7 +4108,11 @@ msgstr "Terugspeel Opties" msgid "Players" msgstr "Spelers" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Bevestig alsjeblieft..." @@ -4168,10 +4325,17 @@ msgstr "Lijst Verversen" msgid "Refresh game list" msgstr "Ververs de speellijst" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Verwijder" @@ -4191,7 +4355,10 @@ msgid "Render to Main Window" msgstr "Geef weer op hoofdscherm" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Opnieuw" @@ -4234,7 +4401,11 @@ msgstr "S&la Staat Op" msgid "Safe" msgstr "Opslaan" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Sample Rate:" @@ -4319,7 +4490,11 @@ msgstr "Save staat film %s is corrupt, het opnemen van de film is gestopt..." msgid "Scaled EFB Copy" msgstr "EFB Verkleinde Kopie" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Scannen van %s" @@ -4359,12 +4534,21 @@ msgstr "Sectie %s niet gevonden in SYSCONF" msgid "Select" msgstr "Selecteer" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Selecteer de opname Bestand" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Selecteer de opname Bestand" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Selecteer een Wii WAD bestand om te installeren" @@ -4390,6 +4574,7 @@ msgstr "Selecteer zwevende vensters" msgid "Select the file to load" msgstr "Selecteer het bestand om het te laden" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Selecteer het save - bestand" @@ -4399,6 +4584,17 @@ msgid "Select the state to load" msgstr "Selecteer de Staat om te laden" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Selecteer het save - bestand" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Selecteer de Staat om te laden" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Selecteer de Staat om op te slaan" @@ -4771,9 +4967,15 @@ msgstr "Het aanmaken van de geluids buffer is mislukt: %s" msgid "Space" msgstr "Ruimte" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Spaans" @@ -4817,7 +5019,11 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4852,7 +5058,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stop" @@ -4924,7 +5133,10 @@ msgstr "Rechter Tabel" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Neem een Schermafdruk" @@ -5170,12 +5382,19 @@ msgstr "Zet Alle Log Types Aan" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Volledig Scherm Inschakelen" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Boven" @@ -5285,6 +5504,18 @@ msgstr "" "Onbekend bericht ontvagen met id : %d ontvangen van speler: %d Speler " "eruitgeschopt!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Onbekende pointer %#08x\n" +"Doorgaan?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5508,7 +5739,11 @@ msgstr "Wii NAND basismap:" msgid "Wii Save Import" msgstr "Wii Save Importeren" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii save bestanden (*.bin)|*.bin" @@ -5539,7 +5774,11 @@ msgstr "" "of misschien is het te wijten aan een time-out of een andere reden.\n" "Wilt u meteen opnieuw verbinden?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote Connected" @@ -5572,9 +5811,15 @@ msgstr "Venster Rechts" msgid "Word Wrap" msgstr "Regelafbreking" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Werken..." diff --git a/Languages/po/pl.po b/Languages/po/pl.po index 6aab51aec9..39aa254b51 100644 --- a/Languages/po/pl.po +++ b/Languages/po/pl.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-08-12 17:04+0100\n" "Last-Translator: Krzysztof Baszczok \n" "Language-Team: Polish \n" @@ -554,9 +558,15 @@ msgstr "Dodaj Å‚atkÄ™" msgid "Add new pane" msgstr "Dodaj nowy panel" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Dodaj..." @@ -624,8 +634,13 @@ msgstr "Wszystkie obrazy GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Pliki GCM" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Stany zapisu (sav, s##)" @@ -713,7 +728,11 @@ msgstr "" 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!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporcje ekranu:" @@ -734,7 +753,11 @@ msgstr "Audio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: BÅ‚Ä…d otwarcia urzÄ…dzenia AO.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -849,7 +872,11 @@ msgid "Blue Right" msgstr "Niebieski prawo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Dół" @@ -882,7 +909,11 @@ msgstr "Szukaj folderu wyjÅ›ciowego" msgid "Buffer:" msgstr "Bufor:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1083,7 +1114,11 @@ msgstr "Wybierz plik do otwarcia" msgid "Choose a memory card:" msgstr "Wybierz kartÄ™ pamiÄ™ci:" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1125,7 +1160,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Zamknij" @@ -1234,7 +1273,11 @@ msgstr "PoÅ‚Ä…cz Wiilot 3" msgid "Connect Wiimote 4" msgstr "PoÅ‚Ä…cz Wiilot 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "ÅÄ…czÄ™..." @@ -1350,7 +1393,11 @@ msgstr "Utwórz nowÄ… perspektywÄ™" msgid "Created by KDE-Look.org" msgstr "Utworzone przez KDE-Look.org" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1426,7 +1473,11 @@ msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulacja (szybkie)" @@ -1657,7 +1708,11 @@ msgstr "" msgid "Divide" msgstr "Podziel" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Zatrzymać aktualnÄ… emulacjÄ™?" @@ -1686,12 +1741,21 @@ msgstr "Konfiguracja emulowanego Wiilota" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Konfiguracja GCPad'a" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Konfiguracja GCPad'a" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmy TAS (*.dtm)" @@ -1703,7 +1767,11 @@ msgstr "Konfiguracja Wiilot'a" msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1711,7 +1779,11 @@ msgstr "" "Program nie mógÅ‚ znaleść żadnych obrazów GC/Wii ISO. Kliknij tutaj by " "przeglÄ…dać pliki..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1787,9 +1859,15 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Holenderski" @@ -1933,15 +2011,22 @@ msgstr "WÅ‚Ä…cz BAT" msgid "Enable Block Merging" msgstr "WÅ‚Ä…cz Å‚Ä…czenie bloków" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "WÅ‚Ä…cz cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "WÅ‚Ä…cz kody" @@ -2040,7 +2125,11 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2096,9 +2185,15 @@ msgstr "" msgid "End" msgstr "Koniec" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Angielski" @@ -2127,6 +2222,7 @@ msgstr "Równy" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "BÅ‚Ä…d" @@ -2138,6 +2234,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "BÅ‚Ä…d" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "BÅ‚Ä…d wczytywania wybranego jÄ™zyka. Ustawienia domyÅ›lne." @@ -2145,6 +2247,7 @@ msgstr "BÅ‚Ä…d wczytywania wybranego jÄ™zyka. Ustawienia domyÅ›lne." #: Source/Core/Common/Src/ChunkFile.h:180 #, c-format msgid "" +<<<<<<< HEAD "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" @@ -2152,6 +2255,8 @@ msgstr "" #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" +======= +>>>>>>> Update translation files for recent changes in the code. "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" @@ -2592,9 +2697,15 @@ msgstr "Ramki do nagrania" msgid "Free Look" msgstr "Free Look" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Francuski" @@ -2661,7 +2772,11 @@ msgid "Gamecube &Pad Settings" msgstr "Ustawienia &pada GC" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Karty pamiÄ™ci GC (*.raw,*.gcp)" @@ -2684,8 +2799,12 @@ msgstr "" "(zÅ‚y kod albo typ kodu nie jest jeszcze wspierany)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Główne" @@ -2694,9 +2813,15 @@ msgstr "Główne" msgid "General Settings" msgstr "Ustawienia ogólne" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Niemiecki" @@ -2825,8 +2950,12 @@ msgid "Hotkey Configuration" msgstr "Konfiguracja skrótów klawiszowych" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "Skróty klawiszowe" @@ -2906,7 +3035,11 @@ msgstr "" "JeÅ›li FPS jest niezrównoważony, ta opcja może pomóc. (ON = kompatybilny, OFF " "= szybko)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +>>>>>>> Update translation files for recent changes in the code. msgid "" "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." @@ -3047,7 +3180,11 @@ msgid "" msgstr "" "InstallExceptionHandler wywoÅ‚any, ale ta platforma nie wspiera go jeszcze." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Instalacja WAD..." @@ -3129,9 +3266,15 @@ msgstr "NewÅ‚aÅ›ciwy plik nagrania" msgid "Invalid state" msgstr "NiewÅ‚aÅ›ciwy stan" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "WÅ‚oski" @@ -3289,11 +3432,19 @@ msgstr "Wczytaj stan Slot 8" msgid "Load State..." msgstr "Wczytaj stan..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Wczytaj Wii System Menu" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Wczytaj Wii System Menu" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wczytaj Wii System Menu %d %c" @@ -3375,7 +3526,11 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Pliki MadCatz Gameshark(*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Główna gaÅ‚ka" @@ -3406,7 +3561,11 @@ msgid "Memory Byte" msgstr "Bajt pamiÄ™ci" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Karta pamiÄ™ci" @@ -3604,7 +3763,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3691,7 +3854,11 @@ msgstr "Nie równe" msgid "Not Set" msgstr "Nie ustawiono" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Nie poÅ‚Ä…czono" @@ -3752,7 +3919,10 @@ msgstr "DostÄ™pnych tylko %d bloków" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Otwórz" @@ -3883,8 +4053,13 @@ msgstr "Patche" msgid "Paths" msgstr "Åšcieżki" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -3904,8 +4079,13 @@ msgstr "Perspekrtywa %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Play" @@ -3931,7 +4111,11 @@ msgstr "Opcje playback'u" msgid "Players" msgstr "Gracze" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Potwierdź..." @@ -4142,10 +4326,17 @@ msgstr "OdÅ›wież listÄ™" msgid "Refresh game list" msgstr "OdÅ›wież listÄ™ gier" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "UsuÅ„" @@ -4164,7 +4355,10 @@ msgid "Render to Main Window" msgstr "Generuj w oknie głównym" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -4207,7 +4401,11 @@ msgstr "Zapisz &stan" msgid "Safe" msgstr "Bezpieczny" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Wskaźnik próbkowania:" @@ -4291,7 +4489,11 @@ msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..." msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "SknaujÄ™ %s" @@ -4331,12 +4533,21 @@ msgstr "Nie odnaleziono sekcji %s w SYSCONF" msgid "Select" msgstr "Select" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Wybierz plik nagrania" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Wybierz plik nagrania" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Wybierz plik Wii WAD do zainstalowania" @@ -4362,6 +4573,7 @@ msgstr "Select floating windows" msgid "Select the file to load" msgstr "Wybierz plik do wczytania" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Wybierz plik do zapisu" @@ -4371,6 +4583,17 @@ msgid "Select the state to load" msgstr "Wybierz stan do wczytania" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Wybierz plik do zapisu" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Wybierz stan do wczytania" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Wybierz stan do zapisu" @@ -4443,7 +4666,11 @@ msgstr "Separator" msgid "Serbian" msgstr "Serbski" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +>>>>>>> Update translation files for recent changes in the code. 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" @@ -4745,9 +4972,15 @@ msgstr "Utworzenie bufora dźwiÄ™ku nie powiodÅ‚o siÄ™: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "HiszpaÅ„ski" @@ -4791,7 +5024,11 @@ msgstr "Square Stick" msgid "Standard Controller" msgstr "Standard Controller" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4826,7 +5063,10 @@ msgstr "GaÅ‚ka" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stop" @@ -4903,7 +5143,10 @@ msgstr "Talerz prawo" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Zrób zdjÄ™cie" @@ -5148,12 +5391,19 @@ msgstr "PrzeÅ‚Ä…cz wszystkie typy logów" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "PrzeÅ‚Ä…cz na peÅ‚ny ekran" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Góra" @@ -5262,6 +5512,18 @@ msgstr "Nieznana wiadomość o ID: %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Nieznana wiadomość o ID: %d od gracza: %d Gracz wylatuje!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Nieznany wskaźnik %#08x\n" +"Kontynuować?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5484,7 +5746,11 @@ msgstr "ŹródÅ‚o Wii NAND:" msgid "Wii Save Import" msgstr "Import zapisów Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Pliki zapisu Wii (*.bin)|*.bin" @@ -5515,7 +5781,11 @@ msgstr "" "lub zbyt dÅ‚ugi czas nieobecnoÅ›ci lub coÅ› innego.\n" "PoÅ‚Ä…czyć ponownie?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiilot poÅ‚Ä…czony" @@ -5547,9 +5817,15 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Zawijanie wierszy" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "PracujÄ™..." diff --git a/Languages/po/pt.po b/Languages/po/pt.po index 84a31dafc3..62025d0da8 100644 --- a/Languages/po/pt.po +++ b/Languages/po/pt.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-07-23 15:53-0000\n" "Last-Translator: Zilaan \n" "Language-Team: Zilaan \n" @@ -556,9 +560,15 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painel" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Adicionar..." @@ -627,8 +637,13 @@ msgstr "Todas as imagens GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Todos os ficheiros Gamecube GCM (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos os Estados Guardados (sav, s##)" @@ -718,7 +733,11 @@ msgstr "" "Tem a certeza que quer eliminar este ficheiro? Será eliminado " "permanentemente!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção de ecrã:" @@ -739,7 +758,11 @@ msgstr "Ãudio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -855,7 +878,11 @@ msgid "Blue Right" msgstr "Azul Direita" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Inferior" @@ -888,7 +915,11 @@ msgstr "Procurar por pasta de destino" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1136,7 +1167,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fechar" @@ -1245,7 +1280,11 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "A conectar..." @@ -1436,7 +1475,11 @@ msgid "DSP Emulator Engine" msgstr "Motor de Emulador DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulação de DSP HLE (rápido)" @@ -1667,7 +1710,11 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Deseja parar a emulação actual?" @@ -1696,12 +1743,21 @@ msgstr "Configuração da emulação de Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Configuração de GCPad " #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Configuração de GCPad " + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS filmes (*.dtm)" @@ -1798,9 +1854,15 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Holandês" @@ -1944,15 +2006,22 @@ msgstr "Activar BAT" msgid "Enable Block Merging" msgstr "Activar Fusão de blocos" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Activar Cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Activar Cheats" @@ -2108,9 +2177,15 @@ msgstr "" msgid "End" msgstr "Fim" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Inglês" @@ -2139,6 +2214,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erro" @@ -2150,6 +2226,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Erro" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2610,9 +2692,15 @@ msgstr "Quadros para Gravar" msgid "Free Look" msgstr "Vista Livre" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Francês" @@ -2679,7 +2767,11 @@ msgid "Gamecube &Pad Settings" msgstr "Definições de Comando &Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Cartões de memória Gamecube (*.raw,*.gcp)" @@ -2702,8 +2794,12 @@ msgstr "" "(Ou é um código com erros ou o tipo de código não é suportado.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -2712,9 +2808,15 @@ msgstr "Geral" msgid "General Settings" msgstr "Definições Gerais" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Alemão" @@ -2844,8 +2946,12 @@ msgid "Hotkey Configuration" msgstr "Configuração de Teclas de atalho" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "Teclas de Atalho" @@ -3069,7 +3175,11 @@ msgid "" msgstr "" "InstallExceptionHandler chamado, mas esta plataforma ainda não a suporta." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "A Instalar WAD..." @@ -3151,9 +3261,15 @@ msgstr "Ficheiro de Gravação inválido" msgid "Invalid state" msgstr "Estado Inválido" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italiano" @@ -3311,11 +3427,19 @@ msgstr "Carregar Estado Slot 8" msgid "Load State..." msgstr "Carregar Estado..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Carregar Sistema de Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Carregar Sistema de Menu Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Sistema de Menu Wii %d%c" @@ -3397,7 +3521,11 @@ msgstr "MMU Hack de velocidade" msgid "MadCatz Gameshark files(*.gcs)" msgstr "ficheiros MadCatz Gameshark(*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick Principal" @@ -3428,7 +3556,11 @@ msgid "Memory Byte" msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Cartão de memória" @@ -3627,7 +3759,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3714,7 +3850,11 @@ msgstr "Não igual" msgid "Not Set" msgstr "Não definido" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Não conectado" @@ -3775,7 +3915,10 @@ msgstr "Apenas %d blocos disponíveis" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Abrir" @@ -3906,8 +4049,13 @@ msgstr "Patches" msgid "Paths" msgstr "Caminhos" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -3927,8 +4075,13 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Começar" @@ -3954,7 +4107,11 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Por favor confirme..." @@ -4167,10 +4324,17 @@ msgstr "Actualizar Lista" msgid "Refresh game list" msgstr "Actualizar lista de Jogos" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Remover" @@ -4189,7 +4353,10 @@ msgid "Render to Main Window" msgstr "Renderizar para a Janela Principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -4232,7 +4399,11 @@ msgstr "Gua&rdar Estado" msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Taxa de Amostragem:" @@ -4316,7 +4487,11 @@ msgstr "O filme de Savestate %s está corrupto, gravação de filme a parar..." msgid "Scaled EFB Copy" msgstr "Cópia EFB Escalada" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "A procurar %s" @@ -4356,12 +4531,21 @@ msgstr "Selecção %s não encontrada em SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Seleccione o Ficheiro de Gravação" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Seleccione o Ficheiro de Gravação" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleccione um ficheiro Wii WAD para instalar" @@ -4387,6 +4571,7 @@ msgstr "Seleccionar janelas flutuantes" msgid "Select the file to load" msgstr "Seleccione o ficheiro para carregar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Seleccione o ficheiro de jogo guardado" @@ -4396,6 +4581,17 @@ msgid "Select the state to load" msgstr "Seleccione o estado para carregar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Seleccione o ficheiro de jogo guardado" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Seleccione o estado para carregar" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Seleccione o estado para gravar" @@ -4776,9 +4972,15 @@ msgstr "Criação do buffer de som falhou: %s" msgid "Space" msgstr "Espaço" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Espanhol" @@ -4822,7 +5024,11 @@ msgstr "Stick quadrado" msgid "Standard Controller" msgstr "Comando padrão" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4857,7 +5063,10 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Parar" @@ -4934,7 +5143,10 @@ msgstr "Table Direita" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Tirar Screenshot" @@ -5185,12 +5397,19 @@ msgstr "Alternar Todos os Tipos de Relatório" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Alternar Ecrã Inteiro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Topo" @@ -5299,6 +5518,18 @@ msgstr "" "Mensagem desconhecida com a id:%d recebida pelo jogador:%d Excluindo o " "jogador!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Apontador desconhecido %#08x\n" +"Continuar?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5524,7 +5755,11 @@ msgstr "Raiz de NAND Wii:" msgid "Wii Save Import" msgstr "Importação de Jogo Guardado Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin" @@ -5556,7 +5791,11 @@ msgstr "" "razão.\n" "Quer reconectar imediatamente?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote Conectado" @@ -5589,9 +5828,15 @@ msgstr "Janelas Direita" msgid "Word Wrap" msgstr "Moldar o texto" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "A trabalhar..." @@ -6204,6 +6449,7 @@ msgstr "| OU" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Começar a janela renderizada em ecrã inteiro" +<<<<<<< HEAD #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -6211,6 +6457,8 @@ msgstr "| OU" #~ "Apontador desconhecido %#08x\n" #~ "Continuar?" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Use FPS For Limiting" #~ msgstr "Usar FPS como limitador" diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index 81320cdc3f..8f2c968751 100644 --- a/Languages/po/pt_BR.po +++ b/Languages/po/pt_BR.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-18 13:38-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-09-11 23:35-0300\n" +>>>>>>> Update translation files for recent changes in the code. "Last-Translator: Runo \n" "Language-Team: Portuguese (BR) \n" "Language: \n" @@ -558,9 +563,15 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painél" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Adicionar..." @@ -628,8 +639,13 @@ msgstr "Todas as imagens CG/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Todos os arquivos Gamecube CGM (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos os Pontos de Jogo Salvos (sav, s##)" @@ -719,7 +735,11 @@ msgstr "" "Você tem certeza que quer deletar este arquivo? Ele ficará perdido para " "sempre!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção:" @@ -740,7 +760,11 @@ msgstr "Backend de Audio" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -856,7 +880,11 @@ msgid "Blue Right" msgstr "Azul Direito" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Embaixo" @@ -889,7 +917,11 @@ msgstr "Procurar por um diretório de saída" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1094,7 +1126,11 @@ msgstr "Escolher um arquivo para abrir" msgid "Choose a memory card:" msgstr "Escolher um cartão de memória:" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1136,7 +1172,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fechar" @@ -1245,7 +1285,11 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Conectando..." @@ -1362,7 +1406,11 @@ msgstr "Criar nova perspectiva" msgid "Created by KDE-Look.org" msgstr "Criado por KDE-Look.org" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1436,7 +1484,11 @@ msgid "DSP Emulator Engine" msgstr "Engine de Emulação do DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulação HLE do DSP (rápido)" @@ -1667,7 +1719,11 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Você quer parar a emulação atual?" @@ -1696,12 +1752,21 @@ msgstr "Configuração de Wiimote Emulado do Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Configuração do GCPad do Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Configuração do GCPad do Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmes TAS Dolphin (*.dtm)" @@ -1713,7 +1778,11 @@ msgstr "Configuração de Wiimote Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin no &Google Code" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1721,7 +1790,11 @@ msgstr "" "Dolphin não pôde encontrar ISOs GC/Wii. Duplo-clique aqui para procurar por " "arquivos..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1797,9 +1870,15 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Holandês" @@ -1943,15 +2022,22 @@ msgstr "Ativar BAT" msgid "Enable Block Merging" msgstr "Ativar Block Merging" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Ativar Cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Ativar Cheats" @@ -2051,7 +2137,11 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2107,9 +2197,15 @@ msgstr "" msgid "End" msgstr "Fim" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Inglês" @@ -2138,6 +2234,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erro" @@ -2149,6 +2246,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Erro" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema." @@ -2156,6 +2259,7 @@ msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema." #: Source/Core/Common/Src/ChunkFile.h:180 #, c-format msgid "" +<<<<<<< HEAD "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" @@ -2163,6 +2267,8 @@ msgstr "" #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" +======= +>>>>>>> Update translation files for recent changes in the code. "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" @@ -2605,9 +2711,15 @@ msgstr "QUadros para Capturar" msgid "Free Look" msgstr "Olhar Livre" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Francês" @@ -2674,7 +2786,11 @@ msgid "Gamecube &Pad Settings" msgstr "Configurações de &Controle de Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Memory Cards do Gamecube (*.raw,*.gcp)" @@ -2697,8 +2813,12 @@ msgstr "" "(É um código ruim ou um tipo de código não suportado.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -2707,9 +2827,15 @@ msgstr "Geral" msgid "General Settings" msgstr "Configurações Gerais" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Alemão" @@ -2840,8 +2966,12 @@ msgid "Hotkey Configuration" msgstr "Configuração de hotkey" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "Hotkeys" @@ -2921,7 +3051,11 @@ msgstr "" "Se a taxa de FPS estiver instável, esta opção pode ajudar. (ON = Compatível, " "OFF = Rápido)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +>>>>>>> Update translation files for recent changes in the code. msgid "" "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." @@ -3065,7 +3199,11 @@ msgstr "" "InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem " "suporte a ele." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Instalando WAD..." @@ -3147,9 +3285,15 @@ msgstr "Arquivo de gravação inválido" msgid "Invalid state" msgstr "Estado Salvo Inválido" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italiano" @@ -3307,11 +3451,19 @@ msgstr "Carregar Estado do Slot 8" msgid "Load State..." msgstr "Carregar State..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Carregar Menu de Sistema do Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Carregar Menu de Sistema do Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Menu de Sistema do Wii %d %c" @@ -3394,7 +3546,11 @@ msgstr "Hack de velocidade MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Arquivos de Gameshark MadCatz(*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Analógico Principal" @@ -3425,7 +3581,11 @@ msgid "Memory Byte" msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Cartão de memoria" @@ -3624,7 +3784,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3711,7 +3875,11 @@ msgstr "Não igual" msgid "Not Set" msgstr "Indefinido" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Não conectado" @@ -3772,7 +3940,10 @@ msgstr "Apenas %d blocos disponíveis" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Abrir" @@ -3903,8 +4074,13 @@ msgstr "Patches" msgid "Paths" msgstr "Diretórios" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausar" @@ -3924,8 +4100,13 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Executar" @@ -3951,7 +4132,11 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Favor confirmar..." @@ -4162,10 +4347,17 @@ msgstr "Atualizar Lista" msgid "Refresh game list" msgstr "Atualizar a lista de jogos" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Remover" @@ -4184,7 +4376,10 @@ msgid "Render to Main Window" msgstr "Renderizar na Janela Principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -4227,7 +4422,11 @@ msgstr "Sal&var estado atual" msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Taxa de Amostragem:" @@ -4311,7 +4510,11 @@ msgstr "O Estado Salvo capturado %s está corrompido, parando captura..." msgid "Scaled EFB Copy" msgstr "Cópia Escalada do EFB" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Escaneando %s" @@ -4351,12 +4554,21 @@ msgstr "A seção %s não foi encontrada no SYSCONF" msgid "Select" msgstr "Selecionar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Selecione o arquivo de Gravação" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Selecione o arquivo de Gravação" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Selecione um arquivo WAD de Wii para instalar" @@ -4381,6 +4593,7 @@ msgstr "Selecionar Janelas flutuantes" msgid "Select the file to load" msgstr "Selecione um arquivo para carregar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Selecione o arquivo de salva" @@ -4390,6 +4603,17 @@ msgid "Select the state to load" msgstr "Selecione um estado para carregar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Selecione o arquivo de salva" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Selecione um estado para carregar" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Selecione um estado para salvar" @@ -4463,7 +4687,11 @@ msgstr "Separador" msgid "Serbian" msgstr "Sérvio" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4770,9 +4998,15 @@ msgstr "Falha na criação do buffer de som: %s" msgid "Space" msgstr "Barra de Espaço" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Espanhol" @@ -4816,7 +5050,11 @@ msgstr "Analógico Quadrado" msgid "Standard Controller" msgstr "Controle Padrão" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4851,7 +5089,10 @@ msgstr "Analógico" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Parar" @@ -4928,7 +5169,10 @@ msgstr "Direita da Mesa" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Capturar Tela" @@ -5176,12 +5420,19 @@ msgstr "Ligar/Desligar Todos os Logs" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Ir para Tela Cheia" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Topo" @@ -5289,6 +5540,17 @@ msgstr "Menssagem desconhecida recebida com identificação: %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" +<<<<<<< HEAD +======= +msgstr "" +"Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!" + +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +>>>>>>> Update translation files for recent changes in the code. msgstr "" "Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!" @@ -5517,7 +5779,11 @@ msgstr "Raiz do Wii NAND" msgid "Wii Save Import" msgstr "Importar Save de Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Arquivos de Salva do Wii (*.bin)|*.bin" @@ -5548,7 +5814,11 @@ msgstr "" "ou talvez tenha sido pelo tempo parado ou por outra razão.\n" "Você quer reconectar imediatamente?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote Conectado" @@ -5580,9 +5850,15 @@ msgstr "Janelas da Direita" msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Funcionando..." diff --git a/Languages/po/ru.po b/Languages/po/ru.po index be14918713..02636c4777 100644 --- a/Languages/po/ru.po +++ b/Languages/po/ru.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-01-20 14:40+0300\n" "Last-Translator: firnis \n" "Language-Team: Russian <>\n" @@ -539,9 +543,15 @@ msgstr "Добавление патча" msgid "Add new pane" msgstr "Добавить панель" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Добавить..." @@ -596,8 +606,13 @@ msgstr "Ð’Ñе образа от GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Ð’Ñе GCM-файлы Gamecube (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Файлы быÑтрых Ñохранений (sav, s##)" @@ -678,7 +693,11 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Ð’Ñ‹ уверены, что хотите удалить Ñтот файл? Он иÑчезнет навÑегда!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Соотношение Ñторон:" @@ -700,7 +719,11 @@ msgstr "СиÑтема вывода" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ ÑƒÑтройÑтва вывода звука.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Ðвто" @@ -815,7 +838,11 @@ msgid "Blue Right" msgstr "СинÑÑ Ñправа" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Ñнизу" @@ -848,7 +875,11 @@ msgstr "Укажите папку Ð´Ð»Ñ ÑохранениÑ" msgid "Buffer:" msgstr "Буфер:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1082,7 +1113,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Закрыть" @@ -1192,7 +1227,11 @@ msgstr "Подключить Wiimote 3" msgid "Connect Wiimote 4" msgstr "Подключить Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Подключение..." @@ -1378,7 +1417,11 @@ msgid "DSP Emulator Engine" msgstr "Режим ÑмулÑции CPU" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1594,7 +1637,11 @@ msgstr "" msgid "Divide" msgstr "/" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Ð’Ñ‹ хотите оÑтановить ÑмулÑцию?" @@ -1624,12 +1671,21 @@ msgstr "ÐаÑтройки Ñмулируемого Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "ÐаÑтройки Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "ÐаÑтройки Dolphin GCPad" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1717,9 +1773,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Dutch" msgstr "Dutch" @@ -1847,16 +1909,23 @@ msgstr "Включить BAT" msgid "Enable Block Merging" msgstr "Включить Ñовмещение блоков" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "кÑшировать" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Включить чит-коды" @@ -1997,9 +2066,15 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "English" msgstr "English" @@ -2029,6 +2104,7 @@ msgstr "Равно" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Ошибки" @@ -2040,6 +2116,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Ошибки" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Ошибка загрузки выбранного Ñзыка. ВозвращаемÑÑ Ðº Ñтандартному." @@ -2474,9 +2556,15 @@ msgstr "" msgid "Free Look" msgstr "Свободный обзор" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "French" msgstr "French" @@ -2546,7 +2634,11 @@ msgid "Gamecube &Pad Settings" msgstr "Опции &контроллера Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Файлы карт памÑти Gamecube (*.raw,*.gcp)" @@ -2567,8 +2659,12 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Общие" @@ -2578,9 +2674,15 @@ msgstr "Общие" msgid "General Settings" msgstr "ÐаÑтройки интерфейÑа" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "German" msgstr "German" @@ -2708,8 +2810,12 @@ msgid "Hotkey Configuration" msgstr "ÐаÑтройка \"горÑчих\" клавиш" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "Клавиши" @@ -2926,7 +3032,11 @@ msgid "" msgstr "" "Вызван InstallExceptionHandler, но ваша платформа его еще не поддерживает." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "УÑтанавливаетÑÑ WAD в меню Wii..." @@ -3011,9 +3121,15 @@ msgstr "Ðеверный файл запиÑи" msgid "Invalid state" msgstr "Ðеверное Ñохранение" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Italian" msgstr "Italian" @@ -3179,12 +3295,20 @@ msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" msgid "Load State..." msgstr "Загрузить игру..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Загрузить Wii System Menu (%d %c)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Загрузить Wii System Menu (%d %c)" @@ -3268,7 +3392,11 @@ msgstr "УÑкорить MMU (Ñпидхак)" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Файлы Gameshark MadCatz (*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3300,7 +3428,11 @@ msgid "Memory Byte" msgstr "Па&мÑÑ‚ÑŒ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Карта памÑти" @@ -3478,7 +3610,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Вверх" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3567,7 +3703,11 @@ msgstr "Ðе равно" msgid "Not Set" msgstr "ÐеизвеÑтно" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Ðе подключено" @@ -3628,7 +3768,10 @@ msgstr "ДоÑтупно только %d блоков" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Открыть" @@ -3754,8 +3897,13 @@ msgstr "Патчи" msgid "Paths" msgstr "Папки" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Пауза" @@ -3776,8 +3924,13 @@ msgstr "Точка %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "ЗапуÑк" @@ -3805,7 +3958,11 @@ msgstr "Опции" msgid "Players" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "" @@ -4030,10 +4187,17 @@ msgstr "&Обновить ÑпиÑок игр" msgid "Refresh game list" msgstr "Обновление ÑпиÑка игр" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Удалить" @@ -4052,7 +4216,10 @@ msgid "Render to Main Window" msgstr "Выводить изображение в главное окно" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð½Ð°Ñтроек" @@ -4095,7 +4262,11 @@ msgstr "БыÑтрое &Ñохранение" msgid "Safe" msgstr "безопаÑное" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Sample Rate:" msgstr "ЧаÑтота" @@ -4188,7 +4359,11 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "ПоиÑк..." @@ -4228,12 +4403,21 @@ msgstr "Ð¡ÐµÐºÑ†Ð¸Ñ %s не найдена в SYSCONF" msgid "Select" msgstr "Выбрать" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи игрового процеÑÑа" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи игрового процеÑÑа" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð°" @@ -4260,6 +4444,7 @@ msgstr "" msgid "Select the file to load" msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Выберите файл Ñохранений Wii" @@ -4269,6 +4454,17 @@ msgid "Select the state to load" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Выберите файл Ñохранений Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Выберите или укажите файл Ð´Ð»Ñ Ð±Ñ‹Ñтрого ÑохранениÑ" @@ -4629,9 +4825,15 @@ msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð°ÑƒÐ´Ð¸Ð¾-буфера %s." msgid "Space" msgstr "Пробел" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Spanish" msgstr "Spanish" @@ -4669,7 +4871,11 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4706,7 +4912,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Стоп" @@ -4778,7 +4987,10 @@ msgstr "ÐŸÑ€Ð°Ð²Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Сделать Ñкриншот" @@ -5023,12 +5235,19 @@ msgstr "Включить вÑе" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Включение полноÑкранного режима" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Ñверху" @@ -5132,6 +5351,18 @@ msgstr "Получено неизвеÑтное Ñообщение Ñ id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Получено неизвеÑтное Ñообщение Ñ id : %d от игрока:%d Игрок выкинут!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"ÐеизвеÑтный указатель %#08x\n" +"Продолжить?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5342,7 +5573,11 @@ msgstr "DVD-диÑк:" msgid "Wii Save Import" msgstr "Импорт Ñохранений Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Файлы Ñохранений Wii (*.bin)|*.bin" @@ -5369,7 +5604,11 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote подключен" @@ -5405,9 +5644,15 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ñтрок" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Подождите..." diff --git a/Languages/po/sr.po b/Languages/po/sr.po index 7f9c8580a6..098435044b 100644 --- a/Languages/po/sr.po +++ b/Languages/po/sr.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-03-02 21:58+0100\n" "Last-Translator: nikolassj\n" "Language-Team: \n" @@ -508,9 +512,15 @@ msgstr "Dodaj Patch " msgid "Add new pane" msgstr "Dodaj nova okna" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Dodaj..." @@ -564,8 +574,13 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" @@ -645,7 +660,11 @@ msgstr "" 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!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -666,7 +685,11 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -777,7 +800,11 @@ msgid "Blue Right" msgstr "Blue right " #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Donji deo/dno" @@ -810,7 +837,11 @@ msgstr "" msgid "Buffer:" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1037,7 +1068,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Zatvori" @@ -1146,7 +1181,11 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Povezivanje..." @@ -1321,7 +1360,11 @@ msgid "DSP Emulator Engine" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1533,7 +1576,11 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1563,12 +1610,21 @@ msgstr "" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1651,9 +1707,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "" @@ -1776,15 +1838,22 @@ msgstr "" msgid "Enable Block Merging" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "" @@ -1910,9 +1979,15 @@ msgstr "" msgid "End" msgstr "Kraj" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "" @@ -1941,6 +2016,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -1952,6 +2028,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Error" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2368,9 +2450,15 @@ msgstr "" msgid "Free Look" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "" @@ -2438,7 +2526,11 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2459,8 +2551,12 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2470,9 +2566,15 @@ msgstr "" msgid "General Settings" msgstr "Opcije Uredjaja " +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Nemacki " @@ -2589,8 +2691,12 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "" @@ -2786,7 +2892,11 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "" @@ -2864,9 +2974,15 @@ msgstr "" msgid "Invalid state" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italianski " @@ -3018,12 +3134,20 @@ msgstr "Ucitaj State Slot 8" msgid "Load State..." msgstr "Ucitaj State" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Ucitaj Wii Sistem Meni (%d %c)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Ucitaj Wii Sistem Meni (%d %c)" @@ -3100,7 +3224,11 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3132,7 +3260,11 @@ msgid "Memory Byte" msgstr "&Memorija" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "" @@ -3309,7 +3441,11 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3396,7 +3532,11 @@ msgstr "" msgid "Not Set" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "" @@ -3457,7 +3597,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Otvori " @@ -3583,8 +3726,13 @@ msgstr "" msgid "Paths" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pauza " @@ -3605,8 +3753,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Pokreni " @@ -3633,7 +3786,11 @@ msgstr "Opcije " msgid "Players" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "" @@ -3841,10 +3998,17 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "" @@ -3860,7 +4024,10 @@ msgid "Render to Main Window" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset/Restart " @@ -3903,7 +4070,11 @@ msgstr "" msgid "Safe" msgstr "Siguran " +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -3987,7 +4158,11 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Skeniranje..." @@ -4027,12 +4202,21 @@ msgstr "" msgid "Select" msgstr "Izaberi " +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Izaberi Snimani fajl" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Izaberi Snimani fajl" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje " @@ -4059,6 +4243,7 @@ msgstr "" msgid "Select the file to load" msgstr "Izaberi fajl za ucitavanje " +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Izaberi \"snimani fajl/the save state\"" @@ -4068,6 +4253,17 @@ msgid "Select the state to load" msgstr "Izaberi state za ucitavanje " #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Izaberi \"snimani fajl/the save state\"" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Izaberi state za ucitavanje " + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Izaberi state za snimanje/save" @@ -4403,9 +4599,15 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "" @@ -4441,7 +4643,11 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4476,7 +4682,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr " Zaustavi" @@ -4548,7 +4757,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "" @@ -4762,12 +4974,19 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "" @@ -4869,6 +5088,16 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5076,7 +5305,11 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5103,7 +5336,11 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "" @@ -5136,9 +5373,15 @@ msgstr "" msgid "Word Wrap" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Radi..." diff --git a/Languages/po/tr.po b/Languages/po/tr.po index 31ca12822d..fe7e7a4688 100644 --- a/Languages/po/tr.po +++ b/Languages/po/tr.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-08-19 08:38-0500\n" "Last-Translator: nlgzrgn \n" "Language-Team: nlgzrgn \n" @@ -555,9 +559,15 @@ msgstr "Yama Ekle" msgid "Add new pane" msgstr "Bölme ekle" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Ekle..." @@ -627,8 +637,13 @@ msgstr "Tüm GC/Wii kalıpları (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tüm GameCube GCM Dosyaları (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tüm Kayıtlı Oyunlar (sav,s##)" @@ -717,7 +732,11 @@ msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Bu dosyayı gerçekten silmek istiyor musunuz? Ama geri döndürülemeyecektir!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "En-boy Oranı:" @@ -738,7 +757,11 @@ msgstr "Ses Arka Ucu:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO sürücüyü açarken hata.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Otomatik" @@ -853,7 +876,11 @@ msgid "Blue Right" msgstr "Mavi SaÄŸ" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Alt" @@ -886,7 +913,11 @@ msgstr "Çıkış klasörü için gözat" msgid "Buffer:" msgstr "Tampon:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1131,7 +1162,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Kapat" @@ -1240,7 +1275,11 @@ msgstr "Wiimote 3'ü BaÄŸla" msgid "Connect Wiimote 4" msgstr "Wiimote 4'ü BaÄŸla" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "BaÄŸlanıyor..." @@ -1434,7 +1473,11 @@ msgid "DSP Emulator Engine" msgstr "Ses Emülatörü Motoru" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emülasyonu (Hızlı)" @@ -1665,7 +1708,11 @@ msgstr "" msgid "Divide" msgstr "Böl" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Emülasyonu durdurmak istiyor musunuz?" @@ -1694,12 +1741,21 @@ msgstr "Dolphin Taklit Wiimote Yapılandırması" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC Kolu Yapılandırması" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC Kolu Yapılandırması" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filmleri (*.dtm)" @@ -1796,9 +1852,15 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Flemenkçe" @@ -1942,15 +2004,22 @@ msgstr "BAT'a Ä°zin Ver" msgid "Enable Block Merging" msgstr "Blok BirleÅŸimine Ä°zin Ver" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "ÖnbelleÄŸe izin ver" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Hilelere Ä°zin Ver" @@ -2106,9 +2175,15 @@ msgstr "" msgid "End" msgstr "Son" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Ä°ngilizce" @@ -2137,6 +2212,7 @@ msgstr "EÅŸit" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Hata" @@ -2148,6 +2224,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Hata" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 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." @@ -2602,9 +2684,15 @@ msgstr "Çekilecek Kareler" msgid "Free Look" msgstr "Serbest Bakış" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Fransızca" @@ -2671,7 +2759,11 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube Kolu Ayarları (&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube Hafıza Kartları (*.raw,*.gcp)" @@ -2694,8 +2786,12 @@ msgstr "" "(kötü bir kod veya türü henüz desteklenmiyor.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Genel" @@ -2704,9 +2800,15 @@ msgstr "Genel" msgid "General Settings" msgstr "Genel Ayarlar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Almanca" @@ -2835,8 +2937,12 @@ msgid "Hotkey Configuration" msgstr "Kısayol TuÅŸu Yapılandırması" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "TuÅŸlar" @@ -3059,7 +3165,11 @@ msgstr "" "Kurulum Özel Durum Ä°ÅŸleyici çaÄŸrıldı, ama bu platform henüz bunu " "desteklemiyor." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "WAD kuruluyor..." @@ -3141,9 +3251,15 @@ msgstr "Hatalı çekim dosyası" msgid "Invalid state" msgstr "Hatalı durum" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Ä°talyanca" @@ -3301,11 +3417,19 @@ msgstr "Durumu Yükle : 8" msgid "Load State..." msgstr "Durumu Yükle..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Wii Sistem Menüsünü Yükle" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Wii Sistem Menüsünü Yükle" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii Sistem Menüsünü Yükle %d%c" @@ -3387,7 +3511,11 @@ msgstr "MMU Hız Hilesi" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark dosyaları(*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Ana Çubuk" @@ -3418,7 +3546,11 @@ msgid "Memory Byte" msgstr "Hafıza Baytı" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Hafıza Kartı" @@ -3616,7 +3748,11 @@ msgstr "NP Sekme" msgid "NP Up" msgstr "NP Yukarı" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3703,7 +3839,11 @@ msgstr "EÅŸit DeÄŸil" msgid "Not Set" msgstr "Ayarlanmamış" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "BaÄŸlı deÄŸil" @@ -3764,7 +3904,10 @@ msgstr "Sadece %d blok kullanılabilir" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Aç" @@ -3895,8 +4038,13 @@ msgstr "Yamalar" msgid "Paths" msgstr "Yollar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Duraklat" @@ -3916,8 +4064,13 @@ msgstr "Perspektif %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "Oynat" @@ -3943,7 +4096,11 @@ msgstr "Oynatma Seçenekleri" msgid "Players" msgstr "Oyuncular" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Lütfen onaylayın..." @@ -4154,10 +4311,17 @@ msgstr "Listeyi Yenile" msgid "Refresh game list" msgstr "Oyun Listesini Yenile" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Kaldır" @@ -4176,7 +4340,10 @@ msgid "Render to Main Window" msgstr "Ana pencerede yorumla" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Sıfırla" @@ -4219,7 +4386,11 @@ msgstr "Durumu Kaydet (&V)" msgid "Safe" msgstr "Güvenli" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Örnek Oran:" @@ -4303,7 +4474,11 @@ msgstr "Kayıtlı durum filmi %s bozuk, film çekimi duruyor..." msgid "Scaled EFB Copy" msgstr "Boyutlandırılmış EFB Kopyası" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Taranıyor %s" @@ -4343,12 +4518,21 @@ msgstr "SYSCONF içinde %s bölümü bulunamadı" msgid "Select" msgstr "Seç" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Çekim Dosyasını Seç" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Çekim Dosyasını Seç" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Kurmak için bir Wii WAD dosyası seçin" @@ -4374,6 +4558,7 @@ msgstr "Sabit olmayan pencereyi seçin" msgid "Select the file to load" msgstr "Yüklemek için dosyayı seçin" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Kayıt dosyasını seçin" @@ -4383,6 +4568,17 @@ msgid "Select the state to load" msgstr "Yüklemek için durum seçin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Kayıt dosyasını seçin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Yüklemek için durum seçin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Kaydetmek için durum seçin" @@ -4759,9 +4955,15 @@ msgstr "Ses tamponu oluÅŸturulamadı: %s" msgid "Space" msgstr "BoÅŸluk" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Ä°spanyolca" @@ -4805,7 +5007,11 @@ msgstr "Kare Çubuk" msgid "Standard Controller" msgstr "Varsayılan Denetim Aygıtı" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4840,7 +5046,10 @@ msgstr "Çubuk" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Durdur" @@ -4917,7 +5126,10 @@ msgstr "Tablo SaÄŸ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Ekran Görüntüsü Al" @@ -5160,12 +5372,19 @@ msgstr "Tüm GeçmiÅŸ Türlerini Seç" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Tam Ekran Moduna Geç" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Ãœst" @@ -5274,6 +5493,18 @@ msgstr "Åžu ID ile bilinmeyen mesaj alındı : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "ID %d ile %d oyuncusundan bilinmeyen mesaj alındı. Oyuncu atılıyor!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Bilinmeyen iÅŸaretleyici %#08x\n" +"Devam?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5496,7 +5727,11 @@ msgstr "Wii NAND Kök Dizini:" msgid "Wii Save Import" msgstr "Wii Kaydı Al" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii kayıt dosyaları (*.bin)|*.bin" @@ -5527,7 +5762,11 @@ msgstr "" "bir zaman aşımı olabilir veya baÅŸka bir ÅŸey olabilir. \n" "Tekrar baÄŸlamak istiyor musunuz?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote BaÄŸlandı" @@ -5559,9 +5798,15 @@ msgstr "Pencereleri SaÄŸa Döşe" msgid "Word Wrap" msgstr "Heceleme" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Çalışıyor..." diff --git a/Languages/po/zh_CN.po b/Languages/po/zh_CN.po index 10e394fc88..331fbb422d 100644 --- a/Languages/po/zh_CN.po +++ b/Languages/po/zh_CN.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-01-09 13:55-0800\n" "Last-Translator: thegfw \n" "Language-Team: \n" @@ -536,9 +540,15 @@ msgstr "添加补ä¸" msgid "Add new pane" msgstr "添加新é¢æ¿" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "添加..." @@ -592,8 +602,13 @@ msgstr "所有 GC/Wii é•œåƒ (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 文件 (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "æ‰€æœ‰å­˜æ¡£çŠ¶æ€ (sav, s##)" @@ -674,7 +689,11 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "请确认真的è¦åˆ é™¤è¿™äº›æ–‡ä»¶?这将是永久性的删除!" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "高宽比:" @@ -695,7 +714,11 @@ msgstr "音频åŽç«¯:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: 打开 AO 设备错误.\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自动" @@ -807,7 +830,11 @@ msgid "Blue Right" msgstr "è“ å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "底部" @@ -840,7 +867,11 @@ msgstr "æµè§ˆè¾“出目录" msgid "Buffer:" msgstr "缓冲区:" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1075,7 +1106,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "关闭" @@ -1185,7 +1220,11 @@ msgstr "连接 Wiimote 3" msgid "Connect Wiimote 4" msgstr "连接 Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "连接中..." @@ -1371,7 +1410,11 @@ msgid "DSP Emulator Engine" msgstr "音频模拟引擎" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "音频 HLE 模拟(很快)" @@ -1591,7 +1634,11 @@ msgstr "按模拟器显示输入读å–" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "您确定是å¦åœæ­¢å½“å‰æ¨¡æ‹Ÿ?" @@ -1621,12 +1668,21 @@ msgstr "Dolphin 模拟 Wiimote 设置" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC 手柄设置" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC 手柄设置" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 电影 (*.dtm)" @@ -1710,9 +1766,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "è·å…°è¯­" @@ -1840,16 +1902,23 @@ msgstr "å¯ç”¨ BAT" msgid "Enable Block Merging" msgstr "å¯ç”¨åŒºå—åˆå¹¶" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "å¯ç”¨ç¼“å­˜" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "å¯ç”¨ä½œå¼Š" @@ -1984,9 +2053,15 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "英语" @@ -2015,6 +2090,7 @@ msgstr "等于" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "错误" @@ -2026,6 +2102,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "错误" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Error loading selected language. Falling back to system default." @@ -2480,9 +2562,15 @@ msgstr "" msgid "Free Look" msgstr "自由视点" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "法语" @@ -2550,7 +2638,11 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube 手柄设置(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube å†…å­˜å¡ (*.raw,*.gcp)" @@ -2573,8 +2665,12 @@ msgstr "" "(either a bad code or the code type is not yet supported.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "常规" @@ -2584,9 +2680,15 @@ msgstr "常规" msgid "General Settings" msgstr "ç•Œé¢è®¾ç½®" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "德语" @@ -2708,8 +2810,12 @@ msgid "Hotkey Configuration" msgstr "热键设置" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "热键" @@ -2919,7 +3025,11 @@ msgid "" msgstr "" "InstallExceptionHandler called, but this platform does not yet support it." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "安装 WAD 到 Wii èœå•ä¸­..." @@ -3004,9 +3114,15 @@ msgstr "无效录制文件" msgid "Invalid state" msgstr "Invalid state" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "æ„大利语" @@ -3165,12 +3281,20 @@ msgstr "载入存档æ’槽 8" msgid "Load State..." msgstr "载入状æ€..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "载入 Wii 系统èœå•(%d %c)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "载入 Wii 系统èœå•(%d %c)" @@ -3251,7 +3375,11 @@ msgstr "MMU 速度破解" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark 文件(*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "主摇æ†" @@ -3283,7 +3411,11 @@ msgid "Memory Byte" msgstr "内存(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "内存å¡" @@ -3467,7 +3599,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3555,7 +3691,11 @@ msgstr "ä¸ç­‰äºŽ" msgid "Not Set" msgstr "未设置" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "未连接" @@ -3616,7 +3756,10 @@ msgstr "åªæœ‰ %d 区å—有效" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "打开" @@ -3747,8 +3890,13 @@ msgstr "è¡¥ä¸" msgid "Paths" msgstr "路径" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "æš‚åœ" @@ -3769,8 +3917,13 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "开始" @@ -3797,7 +3950,11 @@ msgstr "选项" msgid "Players" msgstr "玩家" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "请确认..." @@ -4012,10 +4169,17 @@ msgstr "刷新列表" msgid "Refresh game list" msgstr "刷新游æˆåˆ—表" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "移除" @@ -4034,7 +4198,10 @@ msgid "Render to Main Window" msgstr "附加到主窗å£" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "é‡ç½®" @@ -4077,7 +4244,11 @@ msgstr "ä¿å­˜çŠ¶æ€(&V)" msgid "Safe" msgstr "安全" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "采样率:" @@ -4162,7 +4333,11 @@ msgstr "Savestate movie %s is corrupted, movie recording stopping..." msgid "Scaled EFB Copy" msgstr "EFB 比例å¤åˆ¶" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "扫æ中..." @@ -4202,12 +4377,21 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "选择" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "选择录制文件" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "选择录制文件" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "选择è¦å¯¼å…¥çš„存档" @@ -4234,6 +4418,7 @@ msgstr "选择浮动窗å£" msgid "Select the file to load" msgstr "选择è¦è½½å…¥çš„文件" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "选择一个存档文件" @@ -4243,6 +4428,17 @@ msgid "Select the state to load" msgstr "选择è¦è½½å…¥çš„状æ€" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "选择一个存档文件" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "选择è¦è½½å…¥çš„状æ€" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "选择è¦ä¿å­˜çš„状æ€" @@ -4591,9 +4787,15 @@ msgstr "声音缓冲区创建失败: %s" msgid "Space" msgstr "空格" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "西ç­ç‰™è¯­" @@ -4629,7 +4831,11 @@ msgstr "æ–¹å—é”®" msgid "Standard Controller" msgstr "标准控制器" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4664,7 +4870,10 @@ msgstr "摇æ†" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "åœæ­¢" @@ -4737,7 +4946,10 @@ msgstr "Table Right" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "å±å¹•æˆªå›¾(&T)" @@ -4973,12 +5185,19 @@ msgstr "切æ¢æ‰€æœ‰æ—¥å¿—类型" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "切æ¢å…¨å±" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "顶部" @@ -5082,6 +5301,18 @@ msgstr "Unknown message received with id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Unknown message with id:%d received from player:%d Kicking player!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"未知指针 %#08x\n" +"继续?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5292,7 +5523,11 @@ msgstr "DVD 根目录:" msgid "Wii Save Import" msgstr "导入 Wii 存档" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存档文件 (*.bin)|*.bin" @@ -5323,7 +5558,11 @@ msgstr "" "or maybe it is due to idle time out or other reason.\n" "Do you want to reconnect immediately?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote 已连接" @@ -5356,9 +5595,15 @@ msgstr "窗å£å³ä¾§" msgid "Word Wrap" msgstr "自动æ¢è¡Œ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "工作中..." diff --git a/Languages/po/zh_TW.po b/Languages/po/zh_TW.po index 9c59bbbd6d..ab270c846f 100644 --- a/Languages/po/zh_TW.po +++ b/Languages/po/zh_TW.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-03-15 02:51+0800\n" "Last-Translator: khiav \n" "Language-Team: khiav&yrbn \n" @@ -536,9 +540,15 @@ msgstr "新增修正" msgid "Add new pane" msgstr "新增é¢ç‰ˆ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "新增..." @@ -605,8 +615,13 @@ msgstr "所有 GC/Wii 映åƒæª” (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 檔案 (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "所有å³æ™‚存檔 (sav, s##)" @@ -687,7 +702,11 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "是å¦çœŸçš„è¦åˆªé™¤é€™äº›æª”案？刪了之後就回ä¸ä¾†äº†å“¦ï¼" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "ç•«é¢æ¯”例：" @@ -708,7 +727,11 @@ msgstr "è²éŸ³è£ç½®ï¼š" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon：開啟 AO è£ç½®å‡ºéŒ¯ã€‚\n" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" @@ -820,7 +843,11 @@ msgid "Blue Right" msgstr "è— å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "下方" @@ -853,7 +880,11 @@ msgstr "ç€è¦½è¼¸å‡ºçš„資料夾" msgid "Buffer:" msgstr "ç·©è¡ï¼š" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1084,7 +1115,11 @@ msgstr "在éŠæˆ²åŸ·è¡Œæ™‚客戶端斷開連接ï¼ï¼ç¶²è·¯å°æˆ°å·²ç¶“被關閉 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "關閉" @@ -1194,7 +1229,11 @@ msgstr "連接 Wiimote 3" msgid "Connect Wiimote 4" msgstr "連接 Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "正在連接..." @@ -1379,7 +1418,11 @@ msgid "DSP Emulator Engine" msgstr "DSP 模擬引擎" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE 模擬器 (å¿«)" @@ -1599,7 +1642,11 @@ msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "您è¦åœæ­¢ç›®å‰çš„模擬嗎？" @@ -1629,12 +1676,21 @@ msgstr "Dolphin 模擬 Wiimote 設定" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC 控制器設定" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC 控制器設定" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 影片 (*.dtm)" @@ -1718,9 +1774,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Dutch" @@ -1846,16 +1908,23 @@ msgstr "é–‹å•Ÿ BAT" msgid "Enable Block Merging" msgstr "é–‹å•Ÿå¡Šåˆä½µ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "é–‹å•Ÿå¿«å–" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "開啟作弊" @@ -1987,9 +2056,15 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "English" @@ -2018,6 +2093,7 @@ msgstr "等於" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "錯誤" @@ -2029,6 +2105,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "錯誤" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "讀å–é¸æ“‡çš„語系出錯。返回使用系統é è¨­å€¼ã€‚" @@ -2481,9 +2563,15 @@ msgstr "" msgid "Free Look" msgstr "自由視點" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "French" @@ -2551,7 +2639,11 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube 控制器設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube è¨˜æ†¶å¡ (*.raw,*.gcp)" @@ -2574,8 +2666,12 @@ msgstr "" "(一個æ毀的代碼或ä¸æ”¯æ´çš„代碼類型。)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -2585,9 +2681,15 @@ msgstr "一般" msgid "General Settings" msgstr "ç•Œé¢è¨­å®š" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "German" @@ -2709,8 +2811,12 @@ msgid "Hotkey Configuration" msgstr "å¿«æ·éµè¨­å®š" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update translation files for recent changes in the code. msgid "Hotkeys" msgstr "å¿«æ·éµ" @@ -2912,7 +3018,11 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "調用 InstallExceptionHandler，但是這個平å°å°šæœªæ”¯æ´æ­¤åŠŸèƒ½ã€‚" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "æ­£åœ¨å®‰è£ WAD 至 Wii é¸å–®..." @@ -2996,9 +3106,15 @@ msgstr "無效的錄åƒæª”" msgid "Invalid state" msgstr "無效的狀態" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italian" @@ -3157,12 +3273,20 @@ msgstr "讀å–儲存格 8" msgid "Load State..." msgstr "讀å–進度檔..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" @@ -3243,7 +3367,11 @@ msgstr "MMU 速度修正" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark 檔案(*.gcs)" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "主æ–æ¡¿" @@ -3275,7 +3403,11 @@ msgid "Memory Byte" msgstr "記憶å¡(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "記憶å¡" @@ -3459,7 +3591,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3547,7 +3683,11 @@ msgstr "ä¸ç›¸ç­‰" msgid "Not Set" msgstr "未設定" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "未連接" @@ -3608,7 +3748,10 @@ msgstr "僅 %d 個å€å¡Šå¯ç”¨" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "é–‹å•Ÿ" @@ -3737,8 +3880,13 @@ msgstr "修正" msgid "Paths" msgstr "路徑" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "æš«åœ" @@ -3759,8 +3907,13 @@ msgstr "ç‰ˆå¼ %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update translation files for recent changes in the code. msgid "Play" msgstr "執行" @@ -3787,7 +3940,11 @@ msgstr "é¸é …" msgid "Players" msgstr "玩家" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "請確èª..." @@ -4001,10 +4158,17 @@ msgstr "更新列表" msgid "Refresh game list" msgstr "æ›´æ–°éŠæˆ²åˆ—表" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "移除" @@ -4023,7 +4187,10 @@ msgid "Render to Main Window" msgstr "渲染至主視窗" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "é‡ç½®" @@ -4066,7 +4233,11 @@ msgstr "儲存進度(&V)" msgid "Safe" msgstr "安全" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "å–樣率：" @@ -4151,7 +4322,11 @@ msgstr "儲存的影片 %s 是æ毀的，影片錄製åœæ­¢..." msgid "Scaled EFB Copy" msgstr "EFB 縮放複製" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "正在掃瞄..." @@ -4191,12 +4366,21 @@ msgstr "é …ç›® %s 在 SYSCONF 中找ä¸åˆ°" msgid "Select" msgstr "é¸æ“‡" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "é¸æ“‡å·²éŒ„製的檔案" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "é¸æ“‡å·²éŒ„製的檔案" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "é¸æ“‡è¦å®‰è£çš„ Wii WAD" @@ -4222,6 +4406,7 @@ msgstr "é¸æ“‡æµ®å‹•è¦–窗" msgid "Select the file to load" msgstr "é¸æ“‡è¦è®€å–的檔案" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "é¸æ“‡å­˜æª”" @@ -4231,6 +4416,17 @@ msgid "Select the state to load" msgstr "é¸æ“‡è¦è®€å–的進度" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "é¸æ“‡å­˜æª”" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "é¸æ“‡è¦è®€å–的進度" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "é¸æ“‡è¦å„²å­˜çš„進度" @@ -4578,9 +4774,15 @@ msgstr "è²éŸ³ç·©è¡å»ºç«‹å¤±æ•—：%s" msgid "Space" msgstr "Space" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Spanish" @@ -4616,7 +4818,11 @@ msgstr "Square Stick" msgid "Standard Controller" msgstr "標準控制器" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4651,7 +4857,10 @@ msgstr "æ–æ¡¿" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "åœæ­¢" @@ -4724,7 +4933,10 @@ msgstr "Table å³" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "截å–ç•«é¢" @@ -4950,12 +5162,19 @@ msgstr "å…¨é¸/全部å–消" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "切æ›å…¨èž¢å¹•" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "上方" @@ -5059,6 +5278,18 @@ msgstr "接收到帶有未知 id 的錯誤訊æ¯ï¼š%d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "知訊æ¯å¸¶æœ‰ id:%d 接收於玩家:%d 正在æ出玩家ï¼" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"未知的指示器 %#08x\n" +"是å¦ç¹¼çºŒï¼Ÿ" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5269,7 +5500,11 @@ msgstr "DVD 根：" msgid "Wii Save Import" msgstr "匯入 Wii 存檔" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存檔 (*.bin)|*.bin" @@ -5300,7 +5535,11 @@ msgstr "" "或閒置的時間太久。\n" "是å¦è¦é‡æ–°é€£æŽ¥ï¼Ÿ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote 已連接" @@ -5333,9 +5572,15 @@ msgstr "視窗 å³" msgid "Word Wrap" msgstr "自動æ›è¡Œ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "執行中..." From 828205df22f7a4006c396c51ea1b09270f7e455d Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sat, 15 Oct 2011 09:08:15 -0500 Subject: [PATCH 344/381] Update Greek and Czech translations --- Languages/po/cs.po | 733 ++++++++++++++++++++++++++++++--------------- Languages/po/el.po | 680 +++++++++++++++++++++++++++++++---------- 2 files changed, 1011 insertions(+), 402 deletions(-) diff --git a/Languages/po/cs.po b/Languages/po/cs.po index b441cc4434..5de197a7a6 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -8,12 +8,17 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-15 14:50+0100\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-08-10 20:37+0100\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-08-10 08:30-0500\n" +"PO-Revision-Date: 2011-10-15 14:50+0100\n" +>>>>>>> Update Greek and Czech translations "Last-Translator: ZbynÄ›k Schwarz \n" "Language-Team: \n" "Language: Czech\n" @@ -35,7 +40,7 @@ msgstr " Hra : " msgid "! NOT" msgstr "! NE" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -77,7 +82,7 @@ msgstr "%s už existuje, pÅ™epsat?" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s nelze vyÄistit. Obraz je pravdÄ›podobnÄ› poÅ¡kozen." -#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -86,7 +91,7 @@ msgstr "" "%s nelze naÄíst jako paměťovou kartu\n" "Soubor karty je neplatný (0x%x bajtů)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -95,7 +100,7 @@ msgstr "" "%s nelze naÄíst jako paměťovou kartu\n" "Velikost karty je neplatná (0x%x bajtů)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -312,7 +317,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(NEZNÃMÃ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(vypnuto)" @@ -324,7 +329,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "3D Vision" msgstr "3D Vision" @@ -336,7 +341,7 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 msgid "" msgstr "<Žádné rozliÅ¡ení nenalezeno>" @@ -423,17 +428,17 @@ msgstr "O Dolphinu" msgid "Acceleration" msgstr "Zrychlení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 -msgid "Accuracy:" -msgstr "PÅ™esnost:" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "Precizní emulace VBeam" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD ======= +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +>>>>>>> Update Greek and Czech translations #, fuzzy >>>>>>> Update translation files for recent changes in the code. msgid "" @@ -441,7 +446,7 @@ msgid "" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, check EFB to Texture instead." +"If unsure, leave this checked." msgstr "" "PÅ™esnÄ› emulovat EFB kopie.\n" "NÄ›které hry na tomto závisí pro urÄité grafické efekty nebo herní funkce.\n" @@ -540,12 +545,12 @@ msgstr "Action Replay: Normální Kód %i: Neplatný podtyp %08x (%s)" 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:249 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:245 msgid "Adapter:" msgstr "Adaptér:" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 msgid "Add" msgstr "PÅ™idat" @@ -561,6 +566,7 @@ msgstr "PÅ™idat Záplatu" msgid "Add new pane" msgstr "PÅ™idat nový panel" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -570,6 +576,11 @@ msgstr "PÅ™idat nový panel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +>>>>>>> Update Greek and Czech translations msgid "Add..." msgstr "PÅ™idat..." @@ -617,7 +628,7 @@ 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:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486 msgid "Advanced" msgstr "PokroÄilé" @@ -637,6 +648,7 @@ msgstr "VÅ¡echny obrazy GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -644,6 +656,10 @@ msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update Greek and Czech translations msgid "All Save States (sav, s##)" msgstr "VÅ¡echny Uložené Stavy (sav, s##)" @@ -659,7 +675,7 @@ msgstr "VÅ¡echny komprimované soubory GC/WII ISO (gcz)" msgid "All files (*.*)|*.*" msgstr "VÅ¡echny soubory (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -671,6 +687,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD msgid "Alternate Wiimote Timing" @@ -682,10 +699,13 @@ msgstr "Emulovaný Wiimote" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +>>>>>>> Update Greek and Czech translations msgid "Anisotropic Filtering:" msgstr "Anizotropní Filtrování:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Vyhlazení okrajů" @@ -705,7 +725,7 @@ msgstr "ZavadÄ›Ä aplikace:" msgid "Apply" msgstr "Použít" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -740,8 +760,12 @@ msgstr "Opravdu chcete smazat tento soubor? Bude navždy ztracen!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +>>>>>>> Update Greek and Czech translations msgid "Aspect Ratio:" msgstr "PomÄ›r Stran:" @@ -765,20 +789,24 @@ 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/ConfigMain.cpp:238 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +>>>>>>> Update Greek and Czech translations msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Násobek 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Auto (Velikost Okna)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Auto adjust Window Size" msgstr "Automaticky upravovat Velikost Okna" @@ -792,18 +820,6 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 -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/WXInputBase.cpp:27 msgid "Back" msgstr "ZpÄ›t" @@ -812,8 +828,8 @@ msgstr "ZpÄ›t" msgid "Backend Settings" msgstr "Nastavení Backendu" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Backend:" @@ -847,7 +863,7 @@ msgstr "Plakát:" msgid "Bar" msgstr "Vibráto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Základní" @@ -859,7 +875,7 @@ msgstr "Základní nastavení" msgid "Bass" msgstr "Basy" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Kontrolní souÄet AlokaÄní Tabulky Bloku selhal" @@ -879,12 +895,17 @@ msgstr "Modrá vlevo" msgid "Blue Right" msgstr "Modrá vpravo" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +>>>>>>> Update Greek and Czech translations msgid "Bottom" msgstr "Dole" @@ -917,13 +938,18 @@ msgstr "Procházet pro výstupní adresář" msgid "Buffer:" msgstr "Vyrovnávací paměť:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 msgid "Buttons" msgstr "TlaÄítka" @@ -939,11 +965,11 @@ msgstr "Kr-Stick" msgid "CPU Emulator Engine" msgstr "Jádro Emulátoru Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 msgid "Cache Display Lists" msgstr "Ukládat pÅ™edvyt. obj. do vyr. pam." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: 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 +984,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: 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,8 +999,8 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 msgid "Cancel" msgstr "ZruÅ¡it" @@ -1018,10 +1044,10 @@ msgstr "Nelze najít Wiimote podle bz: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Nelze najít Wiimote pomocí obslužné rutiny spojení %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 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" @@ -1144,10 +1170,10 @@ msgstr "Kruhový Stick" msgid "Classic" msgstr "Klasické" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 -#: 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/WXInputBase.cpp:43 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "VyÄistit" @@ -1162,14 +1188,18 @@ 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:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +>>>>>>> Update Greek and Czech translations msgid "Close" msgstr "Zavřít" @@ -1277,11 +1307,15 @@ msgstr "PÅ™ipojit Wiimote 3" msgid "Connect Wiimote 4" msgstr "PÅ™ipojit Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:608 +>>>>>>> Update Greek and Czech translations msgid "Connecting..." msgstr "PÅ™ipojuji..." @@ -1349,7 +1383,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:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1419,11 +1453,11 @@ msgstr "Tvůrce:" msgid "Critical" msgstr "Kritické" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Crop" msgstr "Oříznout" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: 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" @@ -1470,12 +1504,17 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Jádro Emulátoru DSP" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +>>>>>>> Update Greek and Czech translations msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulace (rychlé)" @@ -1524,7 +1563,7 @@ msgstr "Mrtvá Zóna" msgid "Debug" msgstr "LadÄ›ní" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Debugging" msgstr "LadÄ›ní" @@ -1557,8 +1596,8 @@ msgstr "Výchozí ISO:" 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/WXInputBase.cpp:32 msgid "Delete" msgstr "Smazat" @@ -1566,12 +1605,12 @@ msgstr "Smazat" msgid "Delete Save" msgstr "Smazat Uloženou Hru" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 #, c-format msgid "Delete the existing file '%s'?" msgstr "Vymazat existující soubor '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 msgid "Description" msgstr "Popis" @@ -1602,15 +1641,15 @@ msgstr "Nastavení Zařízení" msgid "Dial" msgstr "Kruhová stupnice" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1618,28 +1657,32 @@ msgstr "" "Kontrolní souÄet adresáře\n" "i záložní kontrolní souÄet Adresáře selhal" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 msgid "Disable" msgstr "Zakázat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Disable Fog" msgstr "Zakázat Mlhu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Disable Lighting" msgstr "Zakázat OsvÄ›tlení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Disable Per-Pixel Depth" msgstr "Zakázat Hloubku Podle Pixelu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Textures" msgstr "Zakázat Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +msgid "Disable Wiimote Speaker" +msgstr "Zakázat Reproduktor Wiimote" + +#: 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 " @@ -1653,7 +1696,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: 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 " @@ -1669,7 +1712,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Disable texturing.\n" "\n" @@ -1688,11 +1731,11 @@ msgstr "Disk" msgid "Disc Read Error" msgstr "Chyba Ätení disku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1706,11 +1749,15 @@ msgstr "" msgid "Divide" msgstr "RozdÄ›lit" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +>>>>>>> Update Greek and Czech translations msgid "Do you want to stop the current emulation?" msgstr "Chcete souÄasnou emulaci zastavit?" @@ -1718,7 +1765,7 @@ msgstr "Chcete souÄasnou emulaci zastavit?" msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafická Nastavení" @@ -1739,6 +1786,7 @@ msgstr "Nastavení Emulovaného Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1748,12 +1796,19 @@ msgstr "Dolphin GCPad Nastavení" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +>>>>>>> Update Greek and Czech translations msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Nastavení" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +>>>>>>> Update Greek and Czech translations msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" @@ -1781,8 +1836,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/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 msgid "Down" msgstr "Dolů" @@ -1807,19 +1862,19 @@ msgstr "Atrapa" msgid "Dump Audio" msgstr "Vypsat Zvuk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Dump EFB Target" msgstr "Vypsat Cíl EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 msgid "Dump Frames" msgstr "Vypsat Snímky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 msgid "Dump Textures" msgstr "Vypsat Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1829,7 +1884,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1839,7 +1894,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1849,6 +1904,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1858,6 +1914,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +>>>>>>> Update Greek and Czech translations msgid "Dutch" msgstr "NizozemÅ¡tina" @@ -1865,7 +1926,7 @@ msgstr "NizozemÅ¡tina" msgid "E&xit" msgstr "O&dejít" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 msgid "EFB Copies" msgstr "EFB Kopie" @@ -1918,7 +1979,7 @@ msgstr "Upravit" msgid "Effect" msgstr "Efekt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Embedded Frame Buffer" msgstr "VnoÅ™ená Vyr. PamÄ›t Snímků" @@ -1926,7 +1987,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:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1940,7 +2001,7 @@ msgstr "" "\n" "Pokud si nejste jisti, zaÅ¡krtnÄ›te místo tohoto virtuální emulaci XFB." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: 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 " @@ -1968,7 +2029,7 @@ msgstr "Stav Emulace:" msgid "Enable" msgstr "Povolit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: 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" @@ -2000,6 +2061,7 @@ msgstr "Zapnout BAT" msgid "Enable Block Merging" msgstr "Zapnout SluÄování Bloků" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" @@ -2014,6 +2076,8 @@ msgstr "Povolit vyrovnávací paměť" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" @@ -2031,7 +2095,7 @@ msgstr "Povolit dvojité jádro" msgid "Enable Dual Core (speedup)" msgstr "Zapnout dvojité jádro (zrychlení)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Enable Hotkeys" msgstr "Povolit klávesové zkratky" @@ -2047,8 +2111,8 @@ msgstr "Povolit PÅ™eskakování NeÄinných Příkazů (zrychlení)" msgid "Enable MMU" msgstr "Zapnout MMU" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "Povolit Progresivní Skenování" @@ -2060,7 +2124,7 @@ msgstr "Povolit SpoÅ™iÄ Obrazovky" msgid "Enable WideScreen" msgstr "Povolit Å irokoúhlou obrazovku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Enable Wireframe" msgstr "Povolit DrátÄ›ný Model" @@ -2157,7 +2221,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:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2171,6 +2235,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2180,11 +2245,16 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +>>>>>>> Update Greek and Czech translations msgid "English" msgstr "AngliÄtina" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "Enhancements" msgstr "VylepÅ¡ení" @@ -2206,6 +2276,7 @@ msgstr "Záznam 1/%d" msgid "Equal" msgstr "Rovná se" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD @@ -2221,12 +2292,20 @@ msgid "" msgstr "" ======= +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Error" msgstr "Chyba" +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:356 +>>>>>>> Update Greek and Czech translations 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." @@ -2309,7 +2388,7 @@ msgstr "Exportovat Uloženou hru jako..." msgid "Extension" msgstr "Rozšíření" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "External Frame Buffer" msgstr "VnÄ›jší Vyr. Paměť Snímků" @@ -2431,7 +2510,7 @@ msgstr "Nelze nahrát hid.dll" msgid "Failed to read banner.bin" msgstr "Nelze Äíst z banner.bin" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2439,7 +2518,7 @@ msgstr "" "Nelze správnÄ› Äíst zálohu alokaÄní tabulky bloku\n" "(0x8000-0x9FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2452,7 +2531,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Nelze Äíst data ze souboru %d" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2460,7 +2539,7 @@ msgstr "" "Nelze správnÄ› Äíst zálohu adresáře\n" "(0x4000-0x5FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2468,7 +2547,7 @@ msgstr "" "Nelze správnÄ› Äíst adresář\n" "(0x2000-0x3FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2476,7 +2555,7 @@ msgstr "" "Nelze správnÄ› Äíst hlaviÄku\n" "(0x0000-0x1FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2508,14 +2587,6 @@ 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/VideoConfigDiag.cpp:475 -msgid "Fast" -msgstr "Rychlá" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Fast Mipmaps" -msgstr "Rychlé Mipmapy" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rychlá verze MMU. Nefunguje v každé hÅ™e." @@ -2544,7 +2615,7 @@ msgstr "" "Soubor nelze otevřít\n" "nebo nemá platnou příponu" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2582,11 +2653,11 @@ msgstr "První blok" msgid "Fix Checksums" msgstr "Spravit Kontrolní SouÄty" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Force 16:9" msgstr "Vynutit 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Force 4:3" msgstr "Vynutit 4:3" @@ -2594,11 +2665,11 @@ msgstr "Vynutit 4:3" msgid "Force Console as NTSC-J" msgstr "Donutit konzoli být jako NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Force Texture Filtering" msgstr "Vynutit Filtrování Textur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: 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" @@ -2632,7 +2703,7 @@ msgstr "" "Pokud není zaÅ¡krtnuto, Dolphin standardnÄ› pÅ™ejde na NTSC-U a automaticky " "zapne toto nastavení pÅ™i hraní Japonských her." -#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2658,7 +2729,7 @@ msgstr "Snímek" msgid "Frame Advance" msgstr "Postup Snímkem" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 msgid "Frame Dumps use FFV1" msgstr "Uložení snímků použije FFV1" @@ -2678,10 +2749,11 @@ msgstr "Limit Snímků:" msgid "Frames To Record" msgstr "Snímky k Nahrání" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 msgid "Free Look" msgstr "Rozhlížení pomocí myÅ¡i" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2691,6 +2763,11 @@ msgstr "Rozhlížení pomocí myÅ¡i" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +>>>>>>> Update Greek and Czech translations msgid "French" msgstr "FrancouzÅ¡tina" @@ -2707,7 +2784,7 @@ msgstr "Z" msgid "FullScr" msgstr "CelObr" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "Fullscreen resolution:" msgstr "RozliÅ¡ení celé obrazovky:" @@ -2756,12 +2833,17 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Nastavení Gamecube &Pad" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +>>>>>>> Update Greek and Czech translations msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" @@ -2783,6 +2865,7 @@ msgstr "" "Nelze spustit GeckoKód (CT%i CST%i) (%s)\n" "(buÄ Å¡patný kód, nebo typ kódu není jeÅ¡tÄ› podporován.)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 @@ -2791,6 +2874,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +>>>>>>> Update Greek and Czech translations msgid "General" msgstr "Obecné" @@ -2798,6 +2886,7 @@ msgstr "Obecné" msgid "General Settings" msgstr "Obecná Nastavení" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2807,6 +2896,11 @@ msgstr "Obecná Nastavení" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +>>>>>>> Update Greek and Czech translations msgid "German" msgstr "NÄ›mÄina" @@ -2827,17 +2921,19 @@ msgstr "Grafická nastavení" msgid "Greater Than" msgstr "VÄ›tší než" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD ======= +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +>>>>>>> Update Greek and Czech translations #, fuzzy >>>>>>> Update translation files for recent changes in the code. msgid "" -"Greatly increases quality of textures generated using render to texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2872,11 +2968,11 @@ msgstr "Kytara" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Byl zavolán HCI_CMD_INQUIRY, prosím ohlaste!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 msgid "Hacks" msgstr "Hacky" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Kontrolní souÄet hlaviÄky selhal" @@ -2912,7 +3008,7 @@ msgstr "" msgid "Hide" msgstr "Skrýt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Skrýt kurzor myÅ¡i" @@ -2939,6 +3035,7 @@ msgstr "Hostovat" msgid "Hotkey Configuration" msgstr "Nastavení klávesových zkratek" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 @@ -2946,6 +3043,10 @@ msgstr "Nastavení klávesových zkratek" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +>>>>>>> Update Greek and Czech translations msgid "Hotkeys" msgstr "Klávesové zkratky" @@ -3032,11 +3133,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:432 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 msgid "Ignore Format Changes" msgstr "Ignorovat ZmÄ›ny Formátu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: 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 +3151,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: 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 " @@ -3092,7 +3193,7 @@ msgstr "" "\"Importovaný soubor má příponu sav\n" "ale nemá správnou hlaviÄku\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3104,7 +3205,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -3122,8 +3223,8 @@ msgstr "Ve HÅ™e" msgid "In-Game" msgstr "Ve HÅ™e" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 msgid "Info" msgstr "Info" @@ -3166,11 +3267,15 @@ msgstr "" "Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› " "nepodporuje." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +>>>>>>> Update Greek and Czech translations msgid "Installing WAD..." msgstr "Instaluji WAD..." @@ -3199,7 +3304,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "VnitÅ™ní chyba LZO - lzo_init() selhalo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "VnitÅ™ní RozliÅ¡ení:" @@ -3252,6 +3357,7 @@ msgstr "Neplatný soubor s nahrávkou" msgid "Invalid state" msgstr "Neplatný stav" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3261,6 +3367,11 @@ msgstr "Neplatný stav" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +>>>>>>> Update Greek and Czech translations msgid "Italian" msgstr "ItalÅ¡tina" @@ -3322,8 +3433,8 @@ msgstr "Poslední PÅ™epsaný Stav" msgid "Last Saved State" msgstr "Poslední Uložený Stav" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 msgid "Left" msgstr "Vlevo" @@ -3370,7 +3481,7 @@ msgstr "Limitovat podle SzS" msgid "Load" msgstr "Nahrát" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 msgid "Load Custom Textures" msgstr "Nahrát Vlastní Textury" @@ -3418,6 +3529,7 @@ msgstr "Nahrát Slot Stavu 8" msgid "Load State..." msgstr "Nahrát Stav..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3431,11 +3543,18 @@ msgstr "Nahrát Systémové Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +msgid "Load Wii System Menu" +msgstr "Nahrát Systémové Menu Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +>>>>>>> Update Greek and Czech translations #, c-format msgid "Load Wii System Menu %d%c" msgstr "Nahrát Systémové Menu Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3477,8 +3596,8 @@ msgstr "Typy Záznamu" 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:132 msgid "Logging" msgstr "Protokolování" @@ -3512,12 +3631,16 @@ msgstr "MMU Hack Rychlosti" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Soubory MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 msgid "Main Stick" msgstr "Hlavní Stick" @@ -3546,12 +3669,17 @@ msgstr "Pam. karta již otevÅ™ena" msgid "Memory Byte" msgstr "Bajt PamÄ›ti" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +>>>>>>> Update Greek and Czech translations msgid "Memory Card" msgstr "Paměťová karta" @@ -3580,7 +3708,7 @@ msgstr "" "%s\n" "ChtÄ›li byste starý soubor zkopírovat do nového umístÄ›ní?\n" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "Velikost paměťové karty se neshoduje s velikosti hlaviÄky" @@ -3597,7 +3725,7 @@ msgstr "Mikrofon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Misc" msgstr "Ostatní" @@ -3610,7 +3738,7 @@ msgstr "Ostatní Nastavení" msgid "Modifier" msgstr "Modifikátor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: 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 +3763,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3749,13 +3877,17 @@ msgstr "NK Tab" msgid "NP Up" msgstr "NK Nahoru" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Jméno:" @@ -3840,11 +3972,15 @@ msgstr "Nerovná se" msgid "Not Set" msgstr "Nenastaven" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:607 +>>>>>>> Update Greek and Czech translations msgid "Not connected" msgstr "NepÅ™ipojen" @@ -3873,8 +4009,8 @@ msgstr "Num Lock" 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/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 msgid "Nunchuk" msgstr "NunÄak" @@ -3903,12 +4039,15 @@ msgstr "Logická Adresa:" msgid "Only %d blocks available" msgstr "Pouze bloky %d jsou dostupné" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +>>>>>>> Update Greek and Czech translations msgid "Open" msgstr "Otevřít" @@ -3938,11 +4077,11 @@ 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:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "OpenCL Texture Decoder" msgstr "OpenCL Dekodér Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "OpenMP Texture Decoder" msgstr "OpenMP Dekodér Textury" @@ -3973,8 +4112,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:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 msgid "Other" msgstr "Jiné" @@ -4038,6 +4177,7 @@ msgstr "Záplaty" msgid "Paths" msgstr "Cesty" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4045,11 +4185,15 @@ msgstr "Cesty" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "Pozastavit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Per-Pixel Lighting" msgstr "OsvÄ›tlení Podle Pixelu" @@ -4062,15 +4206,20 @@ msgstr "Dokonalá" msgid "Perspective %d" msgstr "Perspektiva %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +>>>>>>> Update Greek and Czech translations msgid "Play" msgstr "Spustit" @@ -4096,11 +4245,15 @@ msgstr "Možnosti PÅ™ehrávání" msgid "Players" msgstr "HráÄi" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update Greek and Czech translations msgid "Please confirm..." msgstr "Prosím potvrÄte..." @@ -4145,7 +4298,7 @@ msgstr "PortugalÅ¡tina" msgid "Portuguese (Brazilian)" msgstr "PortugalÅ¡tina (Brazilská)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Efekt Následného Zpracování:" @@ -4219,7 +4372,7 @@ msgstr "TlaÄítko R" msgid "R-Analog" msgstr "Pravý Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "RAM" msgstr "RAM" @@ -4236,7 +4389,7 @@ msgstr "Rozsah" msgid "Read-only mode" msgstr "Režim pouze pro Ätení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Real" msgstr "Opravdová" @@ -4296,9 +4449,9 @@ msgstr "" "\n" "Pokud si nejste jisti, vyberte Žádný." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 msgid "Refresh" msgstr "Obnovit" @@ -4311,6 +4464,7 @@ msgstr "Obnovit Seznam" msgid "Refresh game list" msgstr "Obnovit seznam her" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4322,10 +4476,16 @@ msgstr "Obnovit seznam her" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +>>>>>>> Update Greek and Czech translations msgid "Remove" msgstr "Odstranit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4335,16 +4495,20 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Vykreslit do Hlavního okna" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 msgid "Reset" msgstr "Resetovat" @@ -4356,8 +4520,8 @@ msgstr "Výsledky" msgid "Return" msgstr "Enter" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 msgid "Right" msgstr "Vpravo" @@ -4382,6 +4546,7 @@ msgstr "RuÅ¡tina" msgid "Sa&ve State" msgstr "Uložit Sta&v" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 msgid "Safe" msgstr "BezpeÄná" @@ -4389,14 +4554,16 @@ msgstr "BezpeÄná" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Vzorkovací frekvence:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 msgid "Save" msgstr "Uložit" @@ -4470,6 +4637,7 @@ msgstr "Uložit dekomprimované GCM/ISO" msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Uložený stav filmu %s je poÅ¡kozen, nahrávání filmu je zastaveno..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" @@ -4477,6 +4645,8 @@ msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. #, c-format @@ -4513,8 +4683,8 @@ msgstr "Hledat Podadresáře" msgid "Section %s not found in SYSCONF" msgstr "Sekce %s nebyla v SYSCONF nalezena" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 msgid "Select" msgstr "Vybrat" @@ -4527,12 +4697,16 @@ msgstr "Vyberte Soubor s Nahrávkou" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Select The Recording File" msgstr "Vyberte Soubor s Nahrávkou" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +>>>>>>> Update Greek and Czech translations msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" @@ -4558,6 +4732,7 @@ msgstr "Vybrat plovoucí okna" msgid "Select the file to load" msgstr "Vyberte soubor k nahrání" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4570,15 +4745,22 @@ msgstr "Vyberte stav k nahrání" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +>>>>>>> Update Greek and Czech translations msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 msgid "Select the state to load" msgstr "Vyberte stav k nahrání" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +>>>>>>> Update Greek and Czech translations msgid "Select the state to save" msgstr "Vyberte stav k uložení" @@ -4716,11 +4898,11 @@ msgstr "Zobrazit Panel Nás&trojů" msgid "Show Drives" msgstr "Zobrazit Disky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Show EFB Copy Regions" msgstr "Zobrazit EFB Regiony Kopie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Show FPS" msgstr "Zobrazit Snímky za Sekundu" @@ -4732,7 +4914,7 @@ msgstr "Zobrazit Francii" msgid "Show GameCube" msgstr "Zobrazit GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Show Input Display" msgstr "Zobrazit Obrazovku Vstupu" @@ -4768,7 +4950,7 @@ msgstr "Zobrazit Platformy" msgid "Show Regions" msgstr "Zobrazit Regiony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Show Statistics" msgstr "Zobrazit Statistiky" @@ -4822,7 +5004,7 @@ msgstr "Zobrazit ikonu uložení" msgid "Show save title" msgstr "Zobrazit název uložení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4842,7 +5024,7 @@ msgstr "Zobrazit tuto zprávu nápovÄ›dy" msgid "Show unknown" msgstr "Zobrazit neznámé" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4868,15 +5050,15 @@ msgstr "Velikost" msgid "Skip BIOS" msgstr "PÅ™eskoÄit BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Skip Dest. Alpha Pass" msgstr "Vypnout Průchod Cíl. Průhl." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 msgid "Skip EFB Access from CPU" msgstr "PÅ™eskoÄit EFB Přístup z Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4888,22 +5070,6 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 -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" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Lehce zrychlí kopie EFB do RAM obÄ›továním pÅ™esnosti emulace.\n" -"NÄ›kdy také zvýší kvalitu obrazu.\n" -"Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit pÅ™esnost textury, " -"nebo tuto možnost vypnout.\n" -"\n" -"Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." - #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4957,6 +5123,7 @@ msgstr "VytvoÅ™ení vyrovnávací pamÄ›ti zvuku selhalo: %s" msgid "Space" msgstr "Mezerník" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4966,6 +5133,11 @@ msgstr "Mezerník" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +>>>>>>> Update Greek and Czech translations msgid "Spanish" msgstr "Å panÄ›lÅ¡tina" @@ -4973,7 +5145,7 @@ msgstr "Å panÄ›lÅ¡tina" msgid "Speaker Volume:" msgstr "Hlasitost Reproduktoru:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: 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 " @@ -5009,13 +5181,17 @@ msgstr "ÄŒtvercový Stick" msgid "Standard Controller" msgstr "Standardní OvladaÄ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Start" @@ -5045,32 +5221,21 @@ msgstr "Ukládání stavu" msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Zastavit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 -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" -"\n" -"If unsure, leave this checked." -msgstr "" -"Ukládat EFB kopie do objektů textury grafického procesoru.\n" -"Toto není pÅ™esné, ale pro vÄ›tÅ¡inu her funguje dostateÄnÄ› dobÅ™e a dává vÄ›tší " -"zrychlení než EFB do RAM.\n" -"\n" -"Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Stretch to Window" msgstr "Roztáhnout do Okna" @@ -5104,8 +5269,8 @@ msgstr "Jazyk Systému:" msgid "TAIWAN" msgstr "TCHAJ-WAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 msgid "TAS Input" msgstr "TAS Vstup" @@ -5125,13 +5290,17 @@ msgstr "Deska vlevo" msgid "Table Right" msgstr "Deska vpravo" +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations msgid "Take Screenshot" msgstr "VytvoÅ™it Snímek Obrazovky" @@ -5143,15 +5312,7 @@ msgstr "" msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 -msgid "Texture" -msgstr "Textura" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 -msgid "Texture Cache" -msgstr "Vyrovnávací Paměť Textur" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Texture Format Overlay" msgstr "PÅ™ekryv Formátu Textury" @@ -5196,7 +5357,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:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:281 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Zadaný soubor (%s) neexistuje" @@ -5213,23 +5374,11 @@ 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:98 -msgid "" -"The safer you adjust this, the less likely the emulator will be missing any " -"texture updates from RAM.\n" -"\n" -"If unsure, use the second-fastest value from the right." -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." - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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:363 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5298,7 +5447,7 @@ msgstr "" 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:119 +#: 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. " @@ -5373,9 +5522,9 @@ 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/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. @@ -5388,6 +5537,14 @@ msgstr "PÅ™epnout na Celou Obrazovku" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +msgid "Toggle Fullscreen" +msgstr "PÅ™epnout na Celou Obrazovku" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +>>>>>>> Update Greek and Czech translations msgid "Top" msgstr "NahoÅ™e" @@ -5395,7 +5552,7 @@ msgstr "NahoÅ™e" msgid "Traditional Chinese" msgstr "TradiÄní ČínÅ¡tina" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:375 msgid "Tried to load an unknown file type." msgstr "Pokus o naÄtení souboru neznámého typu." @@ -5431,8 +5588,8 @@ msgstr "Typ" msgid "UDP Port:" msgstr "UDP Port:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5507,9 +5664,13 @@ msgstr "" "Neznámý ukazatel %#08x\n" "PokraÄovat?" +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 msgid "Up" msgstr "Nahoru" @@ -5526,7 +5687,7 @@ msgstr "Svislý Wiimote" msgid "Use EuRGB60 Mode (PAL60)" msgstr "Použít režim EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "Use Fullscreen" msgstr "Použít Celou Obrazovku" @@ -5538,7 +5699,7 @@ msgstr "Použít Å estnáctkovou soustavu" msgid "Use Panic Handlers" msgstr "Použít Obslužné Rutiny Paniky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: 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" @@ -5551,7 +5712,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 "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5565,11 +5726,11 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Utility" msgstr "Pomůcky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 msgid "V-Sync" msgstr "V-Synch" @@ -5593,7 +5754,8 @@ msgstr "Úroveň" msgid "Video" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 msgid "Virtual" msgstr "Virtuální" @@ -5620,21 +5782,21 @@ msgstr "" "\n" "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/VideoConfigDiag.h:84 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/Common/Src/MsgHandler.cpp:67 msgid "Warning" msgstr "Varování" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:240 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:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:290 msgid "Warning - starting ELF in wrong console mode!" msgstr "Varování - ELF se spouÅ¡tí ve Å¡patném režimu konzole!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:185 msgid "Warning - starting ISO in wrong console mode!" msgstr "Varování - ISO se spouÅ¡tí ve Å¡patném režimu konzole!" @@ -5706,7 +5868,7 @@ msgstr "WaveFileWriter - soubor není otevÅ™en." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Widescreen Hack" msgstr "Hack Å irokoúhlého obrazu" @@ -5730,11 +5892,15 @@ msgstr "Wii KoÅ™en NAND:" msgid "Wii Save Import" msgstr "Import uložených pozic Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +>>>>>>> Update Greek and Czech translations msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -5742,8 +5908,8 @@ 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:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:16 msgid "Wiimote" msgstr "Wiimote" @@ -5765,11 +5931,15 @@ msgstr "" "nebo je to vyprÅ¡ení limitu neaktivity, nebo z jiného důvodu.\n" "Chcete ho hned znovu pÅ™ipojit?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:609 +>>>>>>> Update Greek and Czech translations msgid "Wiimote Connected" msgstr "Wiimote PÅ™ipojen" @@ -5801,12 +5971,16 @@ msgstr "Klávesa Windows Vpravo" msgid "Word Wrap" msgstr "Zalamování textu" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. @@ -5915,7 +6089,7 @@ msgstr "Nulový kód, který dolphin nezná: %08x" msgid "[ waiting ]" msgstr "[ Äekám ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5931,7 +6105,7 @@ msgstr "" msgid "[Custom]" msgstr "[Vlastní]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5950,7 +6124,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -6057,6 +6231,9 @@ msgstr "| NEBO" #~ msgid "< as Default Profile >" #~ msgstr "< jako Výchozí Profil >" +#~ msgid "Accuracy:" +#~ msgstr "PÅ™esnost:" + #~ msgid "Accurate Texture Cache" #~ msgstr "Precizní Vyrovnávací Paměť Textur" @@ -6076,6 +6253,9 @@ msgstr "| NEBO" #~ "ale zapnutí této možnosti může mít také velký negativní dopad na výkon " #~ "pokud hra tuto funkci hodnÄ› využívá." +#~ msgid "Alternate Wiimote Timing" +#~ msgstr "Střídat Äasování Wiimote" + #~ msgid "Auto [recommended]" #~ msgstr "Auto [doporuÄeno]" @@ -6088,6 +6268,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" @@ -6124,9 +6315,6 @@ msgstr "| NEBO" #~ msgid "Danish" #~ msgstr "DánÅ¡tina" -#~ msgid "Disable Wiimote Speaker" -#~ msgstr "Zakázat Reproduktor Wiimote" - #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6172,6 +6360,9 @@ msgstr "| NEBO" #~ msgid "Enable CPU Access" #~ msgstr "Povolit Přístup k Procesoru" +#~ msgid "Enable Cache" +#~ msgstr "Povolit vyrovnávací paměť" + #~ msgid "Enable Copy to EFB" #~ msgstr "Povolit Kopírování do EFB" @@ -6230,6 +6421,12 @@ msgstr "| NEBO" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Nelze nahrát DSP ROM : %s" +#~ msgid "Fast" +#~ msgstr "Rychlá" + +#~ msgid "Fast Mipmaps" +#~ msgstr "Rychlé Mipmapy" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6343,9 +6540,15 @@ msgstr "| NEBO" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "Nutné pro použití Japonského písma ROM" +#~ msgid "Safe" +#~ msgstr "BezpeÄná" + #~ msgid "Scale:" #~ msgstr "ZmÄ›na Velikosti:" +#~ msgid "Scaled EFB Copy" +#~ msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" + #~ msgid "Select resolution for fullscreen mode" #~ msgstr "Vyberte rozliÅ¡ení v režimu celé obrazovky" @@ -6390,6 +6593,21 @@ msgstr "| NEBO" #~ "Zobrazí různé statistiky.\n" #~ "Jsou užiteÄné pouze pro úÄely ladÄ›ní." +#~ 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" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Lehce zrychlí kopie EFB do RAM obÄ›továním pÅ™esnosti emulace.\n" +#~ "NÄ›kdy také zvýší kvalitu obrazu.\n" +#~ "Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit pÅ™esnost " +#~ "textury, nebo tuto možnost vypnout.\n" +#~ "\n" +#~ "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." + #~ msgid "Slot" #~ msgstr "Slot" @@ -6423,6 +6641,7 @@ msgstr "| NEBO" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Spustí vykreslovací okno v režimu celé obrazovky." +<<<<<<< HEAD <<<<<<< HEAD #~ msgid "" #~ "Unknown pointer %#08x\n" @@ -6433,6 +6652,38 @@ msgstr "| NEBO" ======= >>>>>>> Update translation files for recent changes in the code. +======= +#~ 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" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Ukládat EFB kopie do objektů textury grafického procesoru.\n" +#~ "Toto není pÅ™esné, ale pro vÄ›tÅ¡inu her funguje dostateÄnÄ› dobÅ™e a dává " +#~ "vÄ›tší zrychlení než EFB do RAM.\n" +#~ "\n" +#~ "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." + +#~ msgid "Texture" +#~ msgstr "Textura" + +#~ msgid "Texture Cache" +#~ msgstr "Vyrovnávací Paměť Textur" + +#~ msgid "" +#~ "The safer you adjust this, the less likely the emulator will be missing " +#~ "any texture updates from RAM.\n" +#~ "\n" +#~ "If unsure, use the second-fastest value from the right." +#~ 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." + +>>>>>>> Update Greek and Czech translations #~ msgid "Use FPS For Limiting" #~ msgstr "Použít SzS pro Omezení" diff --git a/Languages/po/el.po b/Languages/po/el.po index 30b56b762f..c9e9dda7d7 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -8,12 +8,17 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-09-13 17:28+0200\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-08-10 08:30-0500\n" +"PO-Revision-Date: 2011-10-15 11:16+0200\n" +>>>>>>> Update Greek and Czech translations "Last-Translator: Linktothepast \n" "Language-Team: Gpower2 \n" "Language: Greek\n" @@ -37,7 +42,7 @@ msgstr "Παιχνίδι : " msgid "! NOT" msgstr "! NOT" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -81,7 +86,7 @@ msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "" "%s απέτυχε να γίνει scrubbed. Πιθανότατα το αÏχείο εικόνας είναι φθαÏμένο." -#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -90,7 +95,7 @@ msgstr "" "%s απέτυχε να φοÏτώσει ως κάÏτα μνήμης\n" " Το μέγεθος του αÏχείου της κάÏτας δεν είναι έγκυÏο (0x%x bytes)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -99,7 +104,7 @@ msgstr "" "%s απέτυχε να φοÏτώσει ως κάÏτα μνήμης\n" " Το μέγεθος της κάÏτας δεν είναι έγκυÏο (0x%x bytes)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -318,7 +323,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(ΑΓÎΩΣΤΟ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(ανενεÏγό)" @@ -330,7 +335,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "3D Vision" msgstr "3D Vision" @@ -342,7 +347,7 @@ msgstr "8 bit" msgid "" msgstr "<Εισάγετε όνομα εδώ>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 msgid "" msgstr "<Δε βÏέθηκαν αναλÏσεις>" @@ -429,6 +434,7 @@ msgstr "Σχετικά με το Dolphin" msgid "Acceleration" msgstr "Επιτάχυνση" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Accuracy:" <<<<<<< HEAD @@ -437,13 +443,19 @@ msgstr "ΑκÏίβεια:" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "ΑκÏιβής VBeam εξομοίωση" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD ======= +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +>>>>>>> Update Greek and Czech translations #, fuzzy >>>>>>> Update translation files for recent changes in the code. msgid "" @@ -451,7 +463,7 @@ msgid "" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, check EFB to Texture instead." +"If unsure, leave this checked." msgstr "" "Εξομοιώνει με ακÏίβεια τα EFB αντίγÏαφα.\n" "Κάποια παιχνίδια βασίζονται σε αυτό για οÏισμένα εφέ γÏαφικών ή λειτουÏγίες " @@ -552,12 +564,12 @@ msgstr "Action Replay: Normal Code %i: Μη έγκυÏο subtype %08x (%s)" 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:249 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:245 msgid "Adapter:" msgstr "ΠÏοσαÏμογέας:" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 msgid "Add" msgstr "ΠÏοσθήκη" @@ -573,6 +585,7 @@ msgstr "ΠÏοσθήκη Patch" msgid "Add new pane" msgstr "ΠÏοσθήκη νέου pane" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -582,6 +595,11 @@ msgstr "ΠÏοσθήκη νέου pane" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +>>>>>>> Update Greek and Czech translations msgid "Add..." msgstr "ΠÏοσθήκη..." @@ -617,7 +635,7 @@ msgstr "" "ΡÏθμιση της απαιτοÏμενης πίεσης του Î±Î½Î±Î»Î¿Î³Î¹ÎºÎ¿Ï Ï‡ÎµÎ¹ÏιστηÏίου για την " "ενεÏγοποίηση των κουμπιών." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486 msgid "Advanced" msgstr "Για Ï€ÏοχωÏημένους" @@ -637,6 +655,7 @@ msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -644,6 +663,10 @@ msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update Greek and Czech translations msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" @@ -659,7 +682,7 @@ msgstr "Όλα τα συμπιεσμένα αÏχεία GC/Wii ISO (gcz)" msgid "All files (*.*)|*.*" msgstr "Όλα τα αÏχεία (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -671,6 +694,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD msgid "Alternate Wiimote Timing" @@ -682,10 +706,13 @@ msgstr "Εξομοιωμένο Wiimote" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +>>>>>>> Update Greek and Czech translations msgid "Anisotropic Filtering:" msgstr "ΑνισοτÏοπικό ΦιλτÏάÏισμα:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Εξομάλυνση ΟÏίων:" @@ -705,7 +732,7 @@ msgstr "Apploader:" msgid "Apply" msgstr "ΕφαÏμογή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -742,8 +769,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +>>>>>>> Update Greek and Czech translations msgid "Aspect Ratio:" msgstr "Αναλογία Οθόνης:" @@ -767,20 +798,24 @@ msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +>>>>>>> Update Greek and Czech translations msgid "Auto" msgstr "Αυτόματα" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Αυτόματα (Πολλαπλάσιο του 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Αυτόματα (Μέγεθος ΠαÏαθÏÏου)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Auto adjust Window Size" msgstr "Αυτόματη ΠÏοσαÏμογή Μεγέθους ΠαÏαθÏÏου" @@ -795,6 +830,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Automatically generate mipmaps rather than decoding them from memory.\n" @@ -811,6 +847,8 @@ msgstr "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" msgstr "Πίσω" @@ -819,8 +857,8 @@ msgstr "Πίσω" msgid "Backend Settings" msgstr "Backend Ρυθμίσεις" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Backend:" @@ -854,7 +892,7 @@ msgstr "Εικονίδιο:" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Βασικές" @@ -866,7 +904,7 @@ msgstr "Βασικές Ρυθμίσεις" msgid "Bass" msgstr "Μπάσο" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Αποτυχία ελέγχου checksum για τον BAT" @@ -886,12 +924,17 @@ msgstr "ΑÏιστεÏÏŒ Μπλε" msgid "Blue Right" msgstr "Δεξί Μπλε" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +>>>>>>> Update Greek and Czech translations msgid "Bottom" msgstr "Βάση" @@ -924,13 +967,18 @@ msgstr "ΕÏÏεση φακέλου Ï€ÏοοÏισμοÏ" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 msgid "Buttons" msgstr "Κουμπιά" @@ -946,11 +994,11 @@ msgstr "Stick ΚάμεÏας" msgid "CPU Emulator Engine" msgstr "Μηχανή Εξομοίωσης CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 msgid "Cache Display Lists" msgstr "Cache Display Lists" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: 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 +1014,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: 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,8 +1029,8 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 msgid "Cancel" msgstr "ΆκυÏο" @@ -1026,10 +1074,10 @@ msgstr "Αποτυχία εÏÏεσης WiiMote με bd: %02x:%02x:%02x:%02x:%02 msgid "Cant find WiiMote by connection handle %02x" msgstr "Αδυναμία εÏÏεσης του WiiMote με handle σÏνδεσης %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Αδυναμία ανάγνωσης από το DVD_Plugin - DVD-Interface: ΚÏίσιμο Σφάλμα" @@ -1156,10 +1204,10 @@ msgstr "Κυκλικό Stick" msgid "Classic" msgstr "Κλασικό ΧειÏιστήÏιο" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 -#: 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/WXInputBase.cpp:43 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "ΚαθάÏισ." @@ -1175,14 +1223,18 @@ msgstr "" "Ο Client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει " "απενεÏγοποιηθεί. Θα Ï€Ïέπει να σταματήσετε χειÏοκίνητα το παιχνίδι." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +>>>>>>> Update Greek and Czech translations msgid "Close" msgstr "Κλείσιμο" @@ -1290,11 +1342,15 @@ msgstr "ΣÏνδεση Wiimote 3" msgid "Connect Wiimote 4" msgstr "ΣÏνδεση Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:608 +>>>>>>> Update Greek and Czech translations msgid "Connecting..." msgstr "Γίνεται ΣÏνδεση..." @@ -1365,7 +1421,7 @@ msgstr "" "(ο καθοÏισμός των χειÏιστηÏίων ενώ το παιχνίδι Ï„Ïέχει δεν υποστηÏίζεται Ï€Ïος " "το παÏόν)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1442,11 +1498,11 @@ msgstr "ΔημιουÏγός: " msgid "Critical" msgstr "ΚÏίσιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Crop" msgstr "Κόψιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: 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" @@ -1493,12 +1549,17 @@ msgstr "Ήχος (DSP)" msgid "DSP Emulator Engine" msgstr "Μηχανή Εξομοίωσης DSP" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +>>>>>>> Update Greek and Czech translations msgid "DSP HLE emulation (fast)" msgstr "DSP HLE εξομοίωση (γÏήγοÏη)" @@ -1547,7 +1608,7 @@ msgstr "ÎεκÏή Ζώνη" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Debugging" msgstr "Debugging" @@ -1580,8 +1641,8 @@ msgstr "ΠÏοεπιλεγμένο ISO:" msgid "Default font" msgstr "ΠÏοεπιλεγμένη γÏαμματοσειÏά" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 msgid "Delete" msgstr "ΔιαγÏαφή" @@ -1589,12 +1650,12 @@ msgstr "ΔιαγÏαφή" msgid "Delete Save" msgstr "ΔιαγÏαφή Αποθήκευσης" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 #, c-format msgid "Delete the existing file '%s'?" msgstr "ΔιαγÏαφή του υπάÏχοντος αÏχείου '%s';" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 msgid "Description" msgstr "ΠεÏιγÏαφή" @@ -1625,15 +1686,15 @@ msgstr "Ρυθμίσεις Συσκευής" msgid "Dial" msgstr "Dial" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1641,28 +1702,32 @@ msgstr "" "Το checksum του Καταλόγου απέτυχε\n" " καθώς και το checksum του εφεδÏÎ¹ÎºÎ¿Ï ÎšÎ±Ï„Î±Î»ÏŒÎ³Î¿Ï… απέτυχε" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 msgid "Disable" msgstr "ΑπενεÏγοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Disable Fog" msgstr "ΑπενεÏγοποίηση Ομίχλης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Disable Lighting" msgstr "ΑπενεÏγοποίηση ΦωτισμοÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Disable Per-Pixel Depth" msgstr "ΑπενεÏγοποίηση Βάθους ανά Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Textures" msgstr "ΑπενεÏγοποίηση Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +msgid "Disable Wiimote Speaker" +msgstr "" + +#: 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 " @@ -1676,7 +1741,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: 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 " @@ -1692,7 +1757,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Disable texturing.\n" "\n" @@ -1711,11 +1776,11 @@ msgstr "Δίσκος" msgid "Disc Read Error" msgstr "Σφάλμα Ανάγνωσης Δίσκου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Οθόνη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1729,11 +1794,15 @@ msgstr "" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 +>>>>>>> Update Greek and Czech translations msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξομοίωση;" @@ -1741,7 +1810,7 @@ msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξο msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Ρυθμίσεις ΓÏαφικών Dolphin %s" @@ -1762,6 +1831,7 @@ msgstr "Ρυθμίσεις Εξοιμοιωμένου Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1771,12 +1841,19 @@ msgstr "Ρυθμίσεις Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +>>>>>>> Update Greek and Czech translations msgid "Dolphin GCPad Configuration" msgstr "Ρυθμίσεις Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +>>>>>>> Update Greek and Czech translations msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" @@ -1812,8 +1889,8 @@ msgstr "" "Το Dolphin είναι Ïυθμισμένο να αποκÏÏπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ " "εδώ για να εμφανιστοÏν όλα τα παιχνίδια..." -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 msgid "Down" msgstr "Κάτω" @@ -1838,19 +1915,19 @@ msgstr "Dummy" msgid "Dump Audio" msgstr "Εξαγωγή Ήχου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Dump EFB Target" msgstr "Εξαγωγή EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 msgid "Dump Frames" msgstr "Εξαγωγή ΚαÏέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 msgid "Dump Textures" msgstr "Εξαγωγή Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1861,7 +1938,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1872,7 +1949,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1882,6 +1959,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1891,6 +1969,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +>>>>>>> Update Greek and Czech translations msgid "Dutch" msgstr "Ολλανδικά" @@ -1898,7 +1981,7 @@ msgstr "Ολλανδικά" msgid "E&xit" msgstr "Έ&ξοδος" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 msgid "EFB Copies" msgstr "EFB ΑντίγÏαφα" @@ -1952,7 +2035,7 @@ msgstr "ΕπεξεÏγασία..." msgid "Effect" msgstr "Εφέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer" @@ -1960,7 +2043,7 @@ msgstr "Embedded Frame Buffer" msgid "Emu Thread already running" msgstr "Το νήμα εξομοίωσης εκτελείται ήδη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1975,7 +2058,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε εικονική XFB εξομοίωση." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: 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 " @@ -2003,7 +2086,7 @@ msgstr "Κατάσταση ΛειτουÏγίας:" msgid "Enable" msgstr "ΕνεÏγοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: 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" @@ -2035,6 +2118,7 @@ msgstr "ΕνεÏγοποίηση BAT" msgid "Enable Block Merging" msgstr "ΕνεÏγοποίηση Block Merging" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" @@ -2051,6 +2135,8 @@ msgstr "ΕνεÏγοποίηση Cache" msgid "Enable Cache" msgstr "ΕνεÏγοποίηση Cheat" +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" @@ -2068,7 +2154,7 @@ msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα" msgid "Enable Dual Core (speedup)" msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα (επιτάχυνση)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Enable Hotkeys" msgstr "ΕνεÏγοποίηση ΣυντομεÏσεων" @@ -2084,8 +2170,8 @@ msgstr "ΕνεÏγοποίηση Idle Skipping (επιτάχυνση)" msgid "Enable MMU" msgstr "ΕνεÏγοποίηση MMU" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "ΕνεÏγοποίηση ΠÏοοδευτικής ΣάÏωσης" @@ -2097,7 +2183,7 @@ msgstr "ΕνεÏγοποίηση ΠÏοφÏλαξης Οθόνης" msgid "Enable WideScreen" msgstr "ΕνεÏγοποίηση ΕυÏείας Οθόνης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Enable Wireframe" msgstr "ΕνεÏγοποίηση Wireframe" @@ -2199,7 +2285,7 @@ msgstr "" "ΕνεÏγοποιεί τη Μονάδα ΔιαχείÏισης Μνήμης, απαÏαίτητο για μεÏικά παιχνίδια. " "(ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2213,6 +2299,7 @@ msgstr "" msgid "End" msgstr "Τέλος" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2222,11 +2309,16 @@ msgstr "Τέλος" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +>>>>>>> Update Greek and Czech translations msgid "English" msgstr "Αγγλικά" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "Enhancements" msgstr "Βελτιώσεις" @@ -2248,6 +2340,7 @@ msgstr "ΕγγÏαφή 1/%d" msgid "Equal" msgstr "Ίσο" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD @@ -2263,12 +2356,20 @@ msgid "" msgstr "" ======= +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Error" msgstr "Σφάλμα" +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:356 +>>>>>>> Update Greek and Czech translations msgid "Error loading selected language. Falling back to system default." msgstr "" "Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή " @@ -2357,7 +2458,7 @@ msgstr "Εξαγωγή αποθήκευσης ως..." msgid "Extension" msgstr "Επέκταση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "External Frame Buffer" msgstr "ΕξωτεÏικό Frame Buffer" @@ -2480,7 +2581,7 @@ msgstr "Αποτυχία φόÏτωσης hid.dll" msgid "Failed to read banner.bin" msgstr "Αποτυχία ανάγνωσης banner.bin" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2488,7 +2589,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης του αντιγÏάφου ασφαλείας του BAT\n" "(0x8000-0x9FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2501,7 +2602,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Αποτυχία ανάγνωσης δεδομένων από το αÏχείο %d" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2509,7 +2610,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης του αντιγÏάφου ασφαλείας των φακέλων\n" "(0x4000-0x5FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2517,7 +2618,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης των φακέλων\n" "(0x2000-0x3FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2525,7 +2626,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης της κεφαλίδας\n" "(0x0000-0x1FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2554,6 +2655,7 @@ msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το msgid "Failed to write header for file %d" msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το αÏχείο %d" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 msgid "Fast" <<<<<<< HEAD @@ -2570,6 +2672,8 @@ msgid "Fast Mipmaps" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "ΓÏήγοÏη έκδοση του MMU. Δε δουλεÏει για όλα τα παιχνίδια." @@ -2598,7 +2702,7 @@ msgstr "" "Το αÏχείο απέτυχε στο άνοιγμα\n" "ή δεν έχει έγκυÏη επέκταση" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2636,11 +2740,11 @@ msgstr "ΠÏώτο Μπλοκ" msgid "Fix Checksums" msgstr "ΕπιδιόÏθωση Checksum" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Force 16:9" msgstr "Επιβολή 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Force 4:3" msgstr "Επιβολή 4:3" @@ -2648,11 +2752,11 @@ msgstr "Επιβολή 4:3" msgid "Force Console as NTSC-J" msgstr "Επιβολή της Κονσόλας ως NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Force Texture Filtering" msgstr "Επιβολή ΦιλτÏαÏίσματος Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: 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" @@ -2688,7 +2792,7 @@ msgstr "" "Άμα αφεθεί αποεπιλεγμένο, το dolphin Ï€Ïοεπιλέγει τη NTSC-U και ενεÏγοποιεί " "αυτόματα αυτήν την ÏÏθμιση όταν παίζονται Ιαπωνικά παιχνίδια." -#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2714,7 +2818,7 @@ msgstr "ΚαÏέ" msgid "Frame Advance" msgstr "ΠÏοώθηση ανά ΚαÏέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 msgid "Frame Dumps use FFV1" msgstr "FFV1 Για Τα Εξαγώμενα ΚαÏέ" @@ -2734,10 +2838,11 @@ msgstr "ΠεÏιοÏισμός ΚαÏέ:" msgid "Frames To Record" msgstr "ΚαÏέ ΠÏος ΕγγÏαφή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 msgid "Free Look" msgstr "ΕλεÏθεÏη Ματιά" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2747,6 +2852,11 @@ msgstr "ΕλεÏθεÏη Ματιά" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +>>>>>>> Update Greek and Czech translations msgid "French" msgstr "Γαλλικά" @@ -2763,7 +2873,7 @@ msgstr "Από" msgid "FullScr" msgstr "ΠλήÏης Οθόνη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "Fullscreen resolution:" msgstr "Ανάλυση ΠλήÏους Οθόνης:" @@ -2812,12 +2922,17 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Ρυθμίσεις Gamecube &Pad" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +>>>>>>> Update Greek and Czech translations msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "ΚάÏτες Μνήμης Gamecube (*.raw,*.gcp)" @@ -2839,6 +2954,7 @@ msgstr "" "Ο Κωδικός Gecko απέτυχε να εκτελεστεί (CT%i CST%i) (%s)\n" "(ή είναι ένας κακός κωδικός ή ο Ï„Ïπος του ÎºÏ‰Î´Î¹ÎºÎ¿Ï Î´ÎµÎ½ υποστηÏίζεται.)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 @@ -2847,6 +2963,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +>>>>>>> Update Greek and Czech translations msgid "General" msgstr "Γενικά" @@ -2854,6 +2975,7 @@ msgstr "Γενικά" msgid "General Settings" msgstr "Γενικές Ρυθμίσεις" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2863,6 +2985,11 @@ msgstr "Γενικές Ρυθμίσεις" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +>>>>>>> Update Greek and Czech translations msgid "German" msgstr "ΓεÏμανικά" @@ -2885,17 +3012,19 @@ msgstr "Ρυθμίσεις ΓÏαφικών" msgid "Greater Than" msgstr "ΜεγαλÏτεÏο από" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD ======= +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +>>>>>>> Update Greek and Czech translations #, fuzzy >>>>>>> Update translation files for recent changes in the code. msgid "" -"Greatly increases quality of textures generated using render to texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2931,11 +3060,11 @@ msgstr "ΚιθάÏα" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Γίνεται κλήση του HCI_CMD_INQUIRY, παÏακαλώ αναφέÏετε!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 msgid "Hacks" msgstr "Hacks" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Αποτυχία ελέγχου κεφαλίδας" @@ -2971,7 +3100,7 @@ msgstr "" msgid "Hide" msgstr "ΑπόκÏυψη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "ΑπόκÏυψη Δείκτη ΠοντικιοÏ" @@ -2999,6 +3128,7 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Ρυθμίσεις ΠλήκτÏων Συντόμευσης" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 @@ -3006,6 +3136,10 @@ msgstr "Ρυθμίσεις ΠλήκτÏων Συντόμευσης" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +>>>>>>> Update Greek and Czech translations msgid "Hotkeys" msgstr "ΠλήκτÏα Συντόμευσης" @@ -3100,11 +3234,11 @@ msgstr "" "θα Ï€Ïέπει επίσης να απενεÏγοποιήσετε το Throttle Ήχου στο DSP για να έχει " "αποτέλεσμα. " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 msgid "Ignore Format Changes" msgstr "Αγνόηση Αλλαγών Format" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: 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 " @@ -3118,7 +3252,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: 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 " @@ -3161,7 +3295,7 @@ msgstr "" "Το εισαγώμενο αÏχείο έχει sav επέκταση\n" "άλλα δεν έχει σωστή κεφαλίδα." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3173,7 +3307,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -3192,8 +3326,8 @@ msgstr "Εντός ΠαιχνιδιοÏ" msgid "In-Game" msgstr "Εντός ΠαιχνιδιοÏ" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 msgid "Info" msgstr "ΠληÏοφοÏίες" @@ -3236,11 +3370,15 @@ msgstr "" "InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόÏμα δεν το υποστηÏίζει " "ακόμα." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 +>>>>>>> Update Greek and Czech translations msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." @@ -3269,7 +3407,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "ΕσωτεÏικό Σφάλμα LZO - αποτυχία lzo_init()" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "ΕσωτεÏική Ανάλυση:" @@ -3322,6 +3460,7 @@ msgstr "Μη έγκυÏο αÏχείο εγγÏαφής" msgid "Invalid state" msgstr "Μη έγκυÏο κατάσταση" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3331,6 +3470,11 @@ msgstr "Μη έγκυÏο κατάσταση" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +>>>>>>> Update Greek and Czech translations msgid "Italian" msgstr "Ιταλικά" @@ -3392,8 +3536,8 @@ msgstr "Τελευταίο ΕπαναγÏαμμένο Σημείο Αποθ." msgid "Last Saved State" msgstr "Τελευταίο Αποθηκευμένο Σημείο Αποθ." -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 msgid "Left" msgstr "ΑÏιστεÏά" @@ -3440,7 +3584,7 @@ msgstr "ΠεÏιοÏισμός με βάση τα ΚαÏέ" msgid "Load" msgstr "ΦόÏτωσ." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 msgid "Load Custom Textures" msgstr "ΦόÏτωση ΤÏοποποιημένων Υφών" @@ -3488,6 +3632,7 @@ msgstr "ΦόÏτωση Σημείου Αποθήκευσης 8" msgid "Load State..." msgstr "ΦόÏτωση Σημείου Αποθήκευσης..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3501,11 +3646,18 @@ msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +msgid "Load Wii System Menu" +msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +>>>>>>> Update Greek and Czech translations #, c-format msgid "Load Wii System Menu %d%c" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3547,8 +3699,8 @@ msgstr "ΤÏποι ΚαταγÏαφής" msgid "Logger Outputs" msgstr "Έξοδοι ΚαταγÏαφής" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 #: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Logging" msgstr "ΚαταγÏαφή" @@ -3582,12 +3734,16 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "ΑÏχεία MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 msgid "Main Stick" msgstr "ΚÏÏιο Stick" @@ -3616,12 +3772,17 @@ msgstr "Η κάÏτα μνήμης είναι ήδη ανοιχτή" msgid "Memory Byte" msgstr "Memory Byte" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +>>>>>>> Update Greek and Czech translations msgid "Memory Card" msgstr "ΚάÏτα Μνήμης" @@ -3650,7 +3811,7 @@ msgstr "" "%s\n" "Θέλετε να αντιγÏάψετε το παλιό αÏχείο σε αυτή την νέα τοποθεσία;\n" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "" "Το μέγεθος του αÏχείου της κάÏτας μνήμης δεν ταιÏιάζει με το μέγεθος της " @@ -3669,7 +3830,7 @@ msgstr "ΜικÏόφωνο" msgid "Min" msgstr "Ελάχιστη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Misc" msgstr "ΔιάφοÏα" @@ -3682,7 +3843,7 @@ msgstr "ΔιάφοÏες Ρυθμίσεις" msgid "Modifier" msgstr "Modifier" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: 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" @@ -3708,7 +3869,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "ΜοτέÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3821,13 +3982,17 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Όνομα:" @@ -3912,11 +4077,15 @@ msgstr "Όχι ίσο" msgid "Not Set" msgstr "Μη ΟÏισμένο" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:607 +>>>>>>> Update Greek and Czech translations msgid "Not connected" msgstr "Μη Συνδεδεμένο" @@ -3945,8 +4114,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "ΑÏιθμός Κωδικών: " -#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 msgid "Nunchuk" msgstr "Nunchuk" @@ -3975,12 +4144,15 @@ msgstr "Offset:" msgid "Only %d blocks available" msgstr "Διαθέσιμα μόνο %d μπλοκ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +>>>>>>> Update Greek and Czech translations msgid "Open" msgstr "Άνοιγμα" @@ -4010,11 +4182,11 @@ msgstr "OpenAL: αδυναμία εÏÏεσης συσκευών ήχου" msgid "OpenAL: can't open device %s" msgstr "OpenAL: αδυναμία ανοίγματος της συσκευής %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "OpenCL Texture Decoder" msgstr "OpenCL Αποκωδικοποιητής Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "OpenMP Texture Decoder" msgstr "OpenMP Αποκωδικοποιητής Υφών" @@ -4046,8 +4218,8 @@ msgstr "" "Κάντε δεξί κλίκ, εξάγετε όλα τα αÏχεία αποθήκευσης\n" "και εισάγετέ τα σε μία νέα κάÏτα μνήμης.\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 msgid "Other" msgstr "Άλλα" @@ -4112,6 +4284,7 @@ msgstr "Patches" msgid "Paths" msgstr "Φάκελοι" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4119,11 +4292,15 @@ msgstr "Φάκελοι" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "ΠαÏση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Per-Pixel Lighting" msgstr "Φωτισμός ανά Pixel" @@ -4136,15 +4313,20 @@ msgstr "Τέλειο" msgid "Perspective %d" msgstr "Οπτική %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +>>>>>>> Update Greek and Czech translations msgid "Play" msgstr "ΑναπαÏαγωγή" @@ -4170,11 +4352,15 @@ msgstr "Ρυθμίσεις ΑναπαÏαγωγής" msgid "Players" msgstr "Παίχτες" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update Greek and Czech translations msgid "Please confirm..." msgstr "ΠαÏακαλώ επιβεβαιώστε..." @@ -4219,7 +4405,7 @@ msgstr "ΠοÏτογαλικά" msgid "Portuguese (Brazilian)" msgstr "ΠοÏτογαλικά (Î’Ïαζιλιάνικα)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Post-Processing Εφέ:" @@ -4293,7 +4479,7 @@ msgstr "R Button" msgid "R-Analog" msgstr "R-Αναλογική" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "RAM" msgstr "RAM" @@ -4310,7 +4496,7 @@ msgstr "ΕÏÏος" msgid "Read-only mode" msgstr "Μόνο Για Ανάγνωση (ΕγγÏαφής)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Real" msgstr "ΠÏαγματικό" @@ -4370,9 +4556,9 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε Καμία." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 msgid "Refresh" msgstr "Ανανέωση" @@ -4385,6 +4571,7 @@ msgstr "Ανανέωση Λίστας" msgid "Refresh game list" msgstr "Ανανέωση λίστας παιχνιδιών" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4396,10 +4583,16 @@ msgstr "Ανανέωση λίστας παιχνιδιών" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +>>>>>>> Update Greek and Czech translations msgid "Remove" msgstr "ΑφαίÏεση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4409,16 +4602,20 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "ΑναπαÏαγωγή στο ΚεντÏικό ΠαÏάθυÏο" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 msgid "Reset" msgstr "Επανεκκίνηση" @@ -4430,8 +4627,8 @@ msgstr "Αποτελέσματα" msgid "Return" msgstr "Return" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 msgid "Right" msgstr "Δεξιά" @@ -4456,6 +4653,7 @@ msgstr "Ρώσικα" msgid "Sa&ve State" msgstr "Απ&οθήκευση Σημείου Αποθήκευσης" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 msgid "Safe" <<<<<<< HEAD @@ -4465,14 +4663,16 @@ msgstr "Ασφαλής" ======= msgstr "" +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Ρυθμός Δειγματοληψίας:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 msgid "Save" msgstr "Αποθήκ." @@ -4548,6 +4748,7 @@ msgstr "" "Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της " "εγγÏαφής της ταινίας..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" <<<<<<< HEAD @@ -4557,6 +4758,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update Greek and Czech translations #, c-format msgid "Scanning %s" msgstr "Ανίχνευση %s" @@ -4591,8 +4795,8 @@ msgstr "Αναζήτηση σε Υποφακέλους" msgid "Section %s not found in SYSCONF" msgstr "Η ενότητα %s δε βÏέθηκε στο SYSCONF" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 msgid "Select" msgstr "Επιλογή" @@ -4605,12 +4809,16 @@ msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Select The Recording File" msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +>>>>>>> Update Greek and Czech translations msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αÏχείο για εγκατάσταση" @@ -4636,6 +4844,7 @@ msgstr "Επιλέξτε αιωÏοÏμενα παÏάθυÏα" msgid "Select the file to load" msgstr "Επιλέξτε το αÏχείο για φόÏτωση" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4648,15 +4857,22 @@ msgstr "Επιλέξτε το σημείο φόÏτωσης" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +>>>>>>> Update Greek and Czech translations msgid "Select the save file" msgstr "Επιλέξτε αÏχείο αποθήκευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 msgid "Select the state to load" msgstr "Επιλέξτε το σημείο φόÏτωσης" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +>>>>>>> Update Greek and Czech translations msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" @@ -4803,11 +5019,11 @@ msgstr "Εμφάνιση ΓÏαμμής &ΕÏγαλείων" msgid "Show Drives" msgstr "Εμφάνιση Οδηγών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Show EFB Copy Regions" msgstr "Εμφάνιση ΠεÏιοχών EFB ΑντιγÏαφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Show FPS" msgstr "Εμφάνιση FPS" @@ -4819,7 +5035,7 @@ msgstr "Εμφάνιση Γαλλίας" msgid "Show GameCube" msgstr "Εμφάνιση GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Show Input Display" msgstr "Εμφάνιση ΠÏοβολής ΧειÏισμών" @@ -4855,7 +5071,7 @@ msgstr "Εμφάνιση ΠλατφόÏμας" msgid "Show Regions" msgstr "Εμφάνιση ΠεÏιοχών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Show Statistics" msgstr "Εμφάνιση Στατιστικών" @@ -4910,7 +5126,7 @@ msgstr "Εμφάνιση αποθηκευμένου εικονιδίου" msgid "Show save title" msgstr "Εμφάνιση αποθηκευμένου τίτλου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4930,7 +5146,7 @@ msgstr "Εμφάνιση Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος βοήθειας" msgid "Show unknown" msgstr "Εμφάνιση Αγνώστων" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4956,16 +5172,20 @@ msgstr "Μέγεθος" msgid "Skip BIOS" msgstr "ΠαÏάλειψη BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Skip Dest. Alpha Pass" msgstr "ΠαÏάλειψη Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 msgid "Skip EFB Access from CPU" msgstr "ΠαÏάλειψη EFB ΠÏόσβασης από τη CPU" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 <<<<<<< HEAD +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +>>>>>>> Update Greek and Czech translations msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4977,6 +5197,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" @@ -5014,6 +5235,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -5067,6 +5290,7 @@ msgstr "Αποτυχία δημιουÏγίας buffer ήχου: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -5076,6 +5300,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +>>>>>>> Update Greek and Czech translations msgid "Spanish" msgstr "Ισπανικά" @@ -5083,7 +5312,7 @@ msgstr "Ισπανικά" msgid "Speaker Volume:" msgstr "Ένταση ηχείου:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: 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 " @@ -5120,13 +5349,17 @@ msgstr "ΤετÏάγωνο Stick" msgid "Standard Controller" msgstr "Τυπικός Controller" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Εκκίνηση" @@ -5156,17 +5389,21 @@ msgstr "Σημεία Αποθήκευσης" msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Διακοπή" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Store EFB copies in GPU texture objects.\n" @@ -5185,6 +5422,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +>>>>>>> Update Greek and Czech translations msgid "Stretch to Window" msgstr "ΠÏοσαÏμογή στο ΠαÏάθυÏο" @@ -5218,8 +5458,8 @@ msgstr "Γλώσσα Συστήματος:" msgid "TAIWAN" msgstr "ΤΑΪΒΑÎ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 msgid "TAS Input" msgstr "TAS Είσοδος" @@ -5239,13 +5479,17 @@ msgstr "ΑÏιστεÏÏŒ Table" msgid "Table Right" msgstr "Δεξί Table" +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations msgid "Take Screenshot" msgstr "ΔημιουÏγία Στιγμιότυπου" @@ -5257,6 +5501,7 @@ msgstr "" msgid "Test" msgstr "Τέστ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 <<<<<<< HEAD msgid "Texture" @@ -5277,6 +5522,9 @@ msgstr "ΚαθαÏισμός Cache" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +>>>>>>> Update Greek and Czech translations msgid "Texture Format Overlay" msgstr "Επικάλυψη Του Format Υφών" @@ -5321,7 +5569,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:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:281 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Το αÏχείο που επιλέξατε (%s) δεν υπάÏχει" @@ -5339,6 +5587,7 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" "Το αποτέλεσμα αποκÏυπτογÏάφησης του ÎºÏ‰Î´Î¹ÎºÎ¿Ï AR δεν πεÏιέχει καθόλου γÏαμμές." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " @@ -5354,12 +5603,14 @@ msgstr "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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:363 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5431,7 +5682,7 @@ msgstr "" "Αυτό μποÏεί να Ï€Ïοκαλέσει καθυστεÏήσεις στο ÎœÎµÎ½Î¿Ï Wii και σε μεÏικά " "παιχνίδια." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: 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. " @@ -5512,9 +5763,9 @@ msgstr "Εώς" msgid "Toggle All Log Types" msgstr "Εναλλαγή Όλων ΤÏπων ΚαταγÏαφής " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. @@ -5527,6 +5778,14 @@ msgstr "Εναλλαγή ΠλήÏους Οθόνης" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +msgid "Toggle Fullscreen" +msgstr "Εναλλαγή ΠλήÏους Οθόνης" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +>>>>>>> Update Greek and Czech translations msgid "Top" msgstr "ΚοÏυφή" @@ -5534,7 +5793,7 @@ msgstr "ΚοÏυφή" msgid "Traditional Chinese" msgstr "Κινέζικα ΠαÏαδοσιακά " -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:375 msgid "Tried to load an unknown file type." msgstr "ΠÏοσπάθεια φόÏτωσης ενός άγνωστου Ï„Ïπου αÏχείο." @@ -5570,8 +5829,8 @@ msgstr "ΤÏπος" msgid "UDP Port:" msgstr "ΠόÏτα UDP:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5647,9 +5906,13 @@ msgstr "" "Άγνωστος δείκτης %#08x\n" "Συνέχεια;" +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 msgid "Up" msgstr "Πάνω" @@ -5666,7 +5929,7 @@ msgstr "Κάθετη Θέση Wiimote" msgid "Use EuRGB60 Mode (PAL60)" msgstr "ΧÏήση ΛειτουÏγίας EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "Use Fullscreen" msgstr "ΧÏήση ΠλήÏους Οθόνης" @@ -5678,7 +5941,7 @@ msgstr "ΧÏήση Hex" msgid "Use Panic Handlers" msgstr "ΧÏήση Οθονών ΠανικοÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: 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" @@ -5691,7 +5954,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5706,11 +5969,11 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Utility" msgstr "ΕÏγαλεία" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 msgid "V-Sync" msgstr "Κάθετος ΣυγχÏονισμός" @@ -5734,7 +5997,8 @@ msgstr "Αναλυτικότητα" msgid "Video" msgstr "Βίντεο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 msgid "Virtual" msgstr "Εικονικό" @@ -5762,21 +6026,21 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/Common/Src/MsgHandler.cpp:67 msgid "Warning" msgstr "ΠÏοειδοποίηση" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:240 msgid "Warning - starting DOL in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση DOL σε λάθος λειτουÏγία κονσόλας!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:290 msgid "Warning - starting ELF in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση ELF σε λάθος λειτουÏγία κονσόλας!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:185 msgid "Warning - starting ISO in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση ISO σε λάθος λειτουÏγία κονσόλας!" @@ -5850,7 +6114,7 @@ msgstr "WaveFileWriter - το αÏχείο δεν είναι ανοιχτό." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Widescreen Hack" msgstr "Hack ΕυÏείας Οθόνης" @@ -5874,11 +6138,15 @@ msgstr "Wii NAND Ρίζα:" msgid "Wii Save Import" msgstr "Εισαγωγή Αποθήκευσης Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +>>>>>>> Update Greek and Czech translations msgid "Wii save files (*.bin)|*.bin" msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -5886,8 +6154,8 @@ 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:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:16 msgid "Wiimote" msgstr "Wiimote" @@ -5909,11 +6177,15 @@ msgstr "" "ή πιθανόν να οφείλεται σε χÏόνο αδÏάνειας ή κάποιον άλλο λόγο.\n" "Θέλετε να γίνει άμεση επανασÏνδεση;" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:609 +>>>>>>> Update Greek and Czech translations msgid "Wiimote Connected" msgstr "Συνδεδεμένο Wiimote" @@ -5945,12 +6217,16 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Αναδίπλωση Λέξεων" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. @@ -6058,7 +6334,7 @@ msgstr "Άγνωστος Zero code: %08x" msgid "[ waiting ]" msgstr "[ σε αναμονή ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -6074,7 +6350,7 @@ msgstr "" msgid "[Custom]" msgstr "[ΠÏοσαÏμοζόμενο]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -6093,7 +6369,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -6165,6 +6441,7 @@ msgstr "zNear ΔιόÏθωση: " msgid "| OR" msgstr "| OR" +<<<<<<< HEAD <<<<<<< HEAD #~ msgid "Cannot record movies in read-only mode." #~ msgstr "" @@ -6180,3 +6457,84 @@ msgstr "| OR" #~ msgid "Disable Wiimote Speaker" #~ msgstr "ΑπενεÏγοποίηση Ηχείου Wiimote" >>>>>>> Update translation files for recent changes in the code. +======= +#~ msgid "Accuracy:" +#~ msgstr "ΑκÏίβεια:" + +#~ msgid "Alternate Wiimote Timing" +#~ msgstr "Εναλλακτικός ΧÏονισμός Wiimote" + +#~ 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 "Enable Cache" +#~ msgstr "ΕνεÏγοποίηση Cache" + +#~ msgid "Fast" +#~ msgstr "ΓÏήγοÏη" + +#~ msgid "Fast Mipmaps" +#~ msgstr "ΓÏήγοÏα Mipmaps" + +#~ msgid "Safe" +#~ msgstr "Ασφαλής" + +#~ msgid "Scaled EFB Copy" +#~ msgstr "ΚλιμακοÏμενα EFB ΑντίγÏαφα" + +#~ 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" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "ΕπιταχÏνει ελαφÏÏŽÏ‚ τα EFB σε RAM αντίγÏαφα θυσιάζοντας την ακÏίβεια της " +#~ "εξομοίωσης.\n" +#~ "ΜεÏικές φοÏές μποÏεί να βελτιώσει την οπτική ποιότητα.\n" +#~ "Αν αντιμετωπίζετε Ï€Ïοβλήματα, δοκιμάστε να αυξήσετε την ακÏίβεια της " +#~ "cache υφών ή απενεÏγοποιήστε αυτήν την επιλογή.\n" +#~ "\n" +#~ "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." + +#~ 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" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Αποθήκευση των EFB αντιγÏάφων σε GPU αντικείμενα υφών.\n" +#~ "Αυτό δεν είναι τόσο ακÏιβές, αλλά δουλεÏει αÏκετά καλά για τα πεÏισσότεÏα " +#~ "παιχνίδια και Ï€ÏοσφέÏει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n" +#~ "\n" +#~ "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." + +#~ msgid "Texture" +#~ msgstr "Υφή" + +#~ msgid "Texture Cache" +#~ msgstr "Cache Υφών" + +#~ msgid "" +#~ "The safer you adjust this, the less likely the emulator will be missing " +#~ "any texture updates from RAM.\n" +#~ "\n" +#~ "If unsure, use the second-fastest value from the right." +#~ msgstr "" +#~ "Όσο πιο ασφαλής είναι αυτή η ÏÏθμιση, τόσο λιγότεÏο πιθανό ο εξομοιωτής " +#~ "να χάσει ανανεώσεις των υφών από την RAM.\n" +#~ "\n" +#~ "Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την δεÏτεÏη γÏηγοÏότεÏη τιμή από " +#~ "δεξιά." +>>>>>>> Update Greek and Czech translations From 5f21e0150b5bcea2660d81a79b736e7921f2461a Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sat, 15 Oct 2011 11:26:41 -0500 Subject: [PATCH 345/381] The actual update of the Greek and Czech translations. The last commit was a partial reversion by accident. --- Languages/po/cs.po | 718 +++++++++++++++++-------- Languages/po/el.po | 1284 ++++++++++++++++++++++++-------------------- 2 files changed, 1210 insertions(+), 792 deletions(-) diff --git a/Languages/po/cs.po b/Languages/po/cs.po index 5de197a7a6..00f3a3c290 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-15 14:50+0100\n" ======= @@ -17,6 +18,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= "POT-Creation-Date: 2011-08-10 08:30-0500\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> The actual update of the Greek and Czech translations. The last commit "PO-Revision-Date: 2011-10-15 14:50+0100\n" >>>>>>> Update Greek and Czech translations "Last-Translator: ZbynÄ›k Schwarz \n" @@ -40,7 +44,7 @@ msgstr " Hra : " msgid "! NOT" msgstr "! NE" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -82,7 +86,7 @@ msgstr "%s už existuje, pÅ™epsat?" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s nelze vyÄistit. Obraz je pravdÄ›podobnÄ› poÅ¡kozen." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -91,7 +95,7 @@ msgstr "" "%s nelze naÄíst jako paměťovou kartu\n" "Soubor karty je neplatný (0x%x bajtů)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -100,7 +104,7 @@ msgstr "" "%s nelze naÄíst jako paměťovou kartu\n" "Velikost karty je neplatná (0x%x bajtů)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -317,7 +321,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(NEZNÃMÃ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(vypnuto)" @@ -329,7 +333,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "3D Vision" @@ -341,7 +345,7 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "<Žádné rozliÅ¡ení nenalezeno>" @@ -428,10 +432,15 @@ msgstr "O Dolphinu" msgid "Acceleration" msgstr "Zrychlení" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "PÅ™esnost:" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "Precizní emulace VBeam" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD @@ -441,12 +450,15 @@ msgstr "Precizní emulace VBeam" >>>>>>> Update Greek and Czech translations #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" "PÅ™esnÄ› emulovat EFB kopie.\n" "NÄ›které hry na tomto závisí pro urÄité grafické efekty nebo herní funkce.\n" @@ -545,12 +557,12 @@ msgstr "Action Replay: Normální Kód %i: Neplatný podtyp %08x (%s)" 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:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "Adaptér:" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "PÅ™idat" @@ -566,6 +578,7 @@ msgstr "PÅ™idat Záplatu" msgid "Add new pane" msgstr "PÅ™idat nový panel" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -581,6 +594,11 @@ msgstr "PÅ™idat nový panel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Add..." msgstr "PÅ™idat..." @@ -628,7 +646,7 @@ 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:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "PokroÄilé" @@ -648,6 +666,7 @@ msgstr "VÅ¡echny obrazy GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -660,6 +679,10 @@ msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "All Save States (sav, s##)" msgstr "VÅ¡echny Uložené Stavy (sav, s##)" @@ -675,7 +698,7 @@ msgstr "VÅ¡echny komprimované soubory GC/WII ISO (gcz)" msgid "All files (*.*)|*.*" msgstr "VÅ¡echny soubory (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -687,6 +710,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD @@ -702,10 +726,17 @@ msgstr "Emulovaný Wiimote" ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +msgid "Alternate Wiimote Timing" +msgstr "Střídat Äasování Wiimote" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Anisotropic Filtering:" msgstr "Anizotropní Filtrování:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "Vyhlazení okrajů" @@ -725,7 +756,7 @@ msgstr "ZavadÄ›Ä aplikace:" msgid "Apply" msgstr "Použít" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -761,11 +792,15 @@ msgstr "Opravdu chcete smazat tento soubor? Bude navždy ztracen!" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Aspect Ratio:" msgstr "PomÄ›r Stran:" @@ -790,23 +825,27 @@ msgstr "AudioCommon: Chyba pÅ™i otevírání zařízení zvukového výstupu.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Násobek 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "Auto (Velikost Okna)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "Automaticky upravovat Velikost Okna" @@ -820,6 +859,18 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +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/WXInputBase.cpp:27 msgid "Back" msgstr "ZpÄ›t" @@ -828,8 +879,8 @@ msgstr "ZpÄ›t" msgid "Backend Settings" msgstr "Nastavení Backendu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Backend:" @@ -863,7 +914,7 @@ msgstr "Plakát:" msgid "Bar" msgstr "Vibráto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "Základní" @@ -875,7 +926,7 @@ msgstr "Základní nastavení" msgid "Bass" msgstr "Basy" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Kontrolní souÄet AlokaÄní Tabulky Bloku selhal" @@ -895,6 +946,7 @@ msgstr "Modrá vlevo" msgid "Blue Right" msgstr "Modrá vpravo" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD @@ -906,6 +958,10 @@ msgstr "Modrá vpravo" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Bottom" msgstr "Dole" @@ -938,6 +994,7 @@ msgstr "Procházet pro výstupní adresář" msgid "Buffer:" msgstr "Vyrovnávací paměť:" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 @@ -949,7 +1006,11 @@ msgstr "Vyrovnávací paměť:" >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "TlaÄítka" @@ -965,11 +1026,11 @@ msgstr "Kr-Stick" msgid "CPU Emulator Engine" msgstr "Jádro Emulátoru Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "Ukládat pÅ™edvyt. obj. do vyr. pam." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 " @@ -984,7 +1045,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -999,8 +1060,8 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "ZruÅ¡it" @@ -1044,10 +1105,10 @@ msgstr "Nelze najít Wiimote podle bz: %02x:%02x:%02x:%02x:%02x:%02x" 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:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 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" @@ -1170,10 +1231,10 @@ msgstr "Kruhový Stick" msgid "Classic" msgstr "Klasické" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "VyÄistit" @@ -1188,18 +1249,22 @@ msgid "" msgstr "" "Klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru musíte ukonÄit ruÄnÄ›." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 ======= #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Close" msgstr "Zavřít" @@ -1307,6 +1372,7 @@ msgstr "PÅ™ipojit Wiimote 3" msgid "Connect Wiimote 4" msgstr "PÅ™ipojit Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 @@ -1316,6 +1382,9 @@ msgstr "PÅ™ipojit Wiimote 4" ======= #: Source/Core/DolphinWX/Src/Main.cpp:608 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Connecting..." msgstr "PÅ™ipojuji..." @@ -1383,7 +1452,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:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1453,11 +1522,11 @@ msgstr "Tvůrce:" msgid "Critical" msgstr "Kritické" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "Oříznout" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1504,6 +1573,7 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Jádro Emulátoru DSP" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD @@ -1515,6 +1585,10 @@ msgstr "Jádro Emulátoru DSP" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulace (rychlé)" @@ -1563,7 +1637,7 @@ msgstr "Mrtvá Zóna" msgid "Debug" msgstr "LadÄ›ní" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Debugging" msgstr "LadÄ›ní" @@ -1596,8 +1670,8 @@ msgstr "Výchozí ISO:" msgid "Default font" msgstr "Výchozí typ písma" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "Smazat" @@ -1605,12 +1679,12 @@ msgstr "Smazat" msgid "Delete Save" msgstr "Smazat Uloženou Hru" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "Vymazat existující soubor '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 msgid "Description" msgstr "Popis" @@ -1641,15 +1715,15 @@ msgstr "Nastavení Zařízení" msgid "Dial" msgstr "Kruhová stupnice" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1657,32 +1731,28 @@ msgstr "" "Kontrolní souÄet adresáře\n" "i záložní kontrolní souÄet Adresáře selhal" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 msgid "Disable" msgstr "Zakázat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "Zakázat Mlhu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "Zakázat OsvÄ›tlení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "Zakázat Hloubku Podle Pixelu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "Zakázat Textury" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "Zakázat Reproduktor Wiimote" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1696,7 +1766,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1712,7 +1782,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1731,11 +1801,11 @@ msgstr "Disk" msgid "Disc Read Error" msgstr "Chyba Ätení disku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1749,6 +1819,7 @@ msgstr "" msgid "Divide" msgstr "RozdÄ›lit" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1758,6 +1829,9 @@ msgstr "RozdÄ›lit" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Do you want to stop the current emulation?" msgstr "Chcete souÄasnou emulaci zastavit?" @@ -1765,7 +1839,7 @@ msgstr "Chcete souÄasnou emulaci zastavit?" msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafická Nastavení" @@ -1786,6 +1860,7 @@ msgstr "Nastavení Emulovaného Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1799,16 +1874,23 @@ msgstr "Dolphin GCPad Nastavení" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Nastavení" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" @@ -1836,8 +1918,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/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Dolů" @@ -1862,19 +1944,19 @@ msgstr "Atrapa" msgid "Dump Audio" msgstr "Vypsat Zvuk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "Vypsat Cíl EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "Vypsat Snímky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "Vypsat Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1884,7 +1966,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1894,7 +1976,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1904,6 +1986,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1919,6 +2002,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Dutch" msgstr "NizozemÅ¡tina" @@ -1926,7 +2014,7 @@ msgstr "NizozemÅ¡tina" msgid "E&xit" msgstr "O&dejít" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" msgstr "EFB Kopie" @@ -1979,7 +2067,7 @@ msgstr "Upravit" msgid "Effect" msgstr "Efekt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "VnoÅ™ená Vyr. PamÄ›t Snímků" @@ -1987,7 +2075,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:111 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -2001,7 +2089,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:110 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -2029,7 +2117,7 @@ msgstr "Stav Emulace:" msgid "Enable" msgstr "Povolit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -2061,6 +2149,7 @@ msgstr "Zapnout BAT" msgid "Enable Block Merging" msgstr "Zapnout SluÄování Bloků" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 @@ -2069,15 +2158,20 @@ msgstr "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Povolit vyrovnávací paměť" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= ======= >>>>>>> Update Greek and Czech translations +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" @@ -2095,7 +2189,7 @@ msgstr "Povolit dvojité jádro" msgid "Enable Dual Core (speedup)" msgstr "Zapnout dvojité jádro (zrychlení)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "Povolit klávesové zkratky" @@ -2111,8 +2205,8 @@ msgstr "Povolit PÅ™eskakování NeÄinných Příkazů (zrychlení)" msgid "Enable MMU" msgstr "Zapnout MMU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "Povolit Progresivní Skenování" @@ -2124,7 +2218,7 @@ msgstr "Povolit SpoÅ™iÄ Obrazovky" msgid "Enable WideScreen" msgstr "Povolit Å irokoúhlou obrazovku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "Povolit DrátÄ›ný Model" @@ -2221,7 +2315,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:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2235,6 +2329,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2250,11 +2345,16 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "English" msgstr "AngliÄtina" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "VylepÅ¡ení" @@ -2276,6 +2376,7 @@ msgstr "Záznam 1/%d" msgid "Equal" msgstr "Rovná se" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 @@ -2296,16 +2397,24 @@ msgstr "" >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "Chyba" +<<<<<<< HEAD <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 ======= #: Source/Core/DolphinWX/Src/Main.cpp:356 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/Main.cpp:346 +>>>>>>> The actual update of the Greek and Czech translations. The last commit 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." @@ -2388,7 +2497,7 @@ msgstr "Exportovat Uloženou hru jako..." msgid "Extension" msgstr "Rozšíření" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "VnÄ›jší Vyr. Paměť Snímků" @@ -2510,7 +2619,7 @@ msgstr "Nelze nahrát hid.dll" msgid "Failed to read banner.bin" msgstr "Nelze Äíst z banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2518,7 +2627,7 @@ msgstr "" "Nelze správnÄ› Äíst zálohu alokaÄní tabulky bloku\n" "(0x8000-0x9FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2531,7 +2640,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Nelze Äíst data ze souboru %d" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2539,7 +2648,7 @@ msgstr "" "Nelze správnÄ› Äíst zálohu adresáře\n" "(0x4000-0x5FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2547,7 +2656,7 @@ msgstr "" "Nelze správnÄ› Äíst adresář\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2555,7 +2664,7 @@ msgstr "" "Nelze správnÄ› Äíst hlaviÄku\n" "(0x0000-0x1FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2587,6 +2696,14 @@ 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/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "Rychlá" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "Rychlé Mipmapy" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rychlá verze MMU. Nefunguje v každé hÅ™e." @@ -2615,7 +2732,7 @@ msgstr "" "Soubor nelze otevřít\n" "nebo nemá platnou příponu" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2653,11 +2770,11 @@ msgstr "První blok" msgid "Fix Checksums" msgstr "Spravit Kontrolní SouÄty" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "Vynutit 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "Vynutit 4:3" @@ -2665,11 +2782,11 @@ msgstr "Vynutit 4:3" msgid "Force Console as NTSC-J" msgstr "Donutit konzoli být jako NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" msgstr "Vynutit Filtrování Textur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2703,7 +2820,7 @@ msgstr "" "Pokud není zaÅ¡krtnuto, Dolphin standardnÄ› pÅ™ejde na NTSC-U a automaticky " "zapne toto nastavení pÅ™i hraní Japonských her." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2729,7 +2846,7 @@ msgstr "Snímek" msgid "Frame Advance" msgstr "Postup Snímkem" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "Uložení snímků použije FFV1" @@ -2749,10 +2866,11 @@ msgstr "Limit Snímků:" msgid "Frames To Record" msgstr "Snímky k Nahrání" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "Rozhlížení pomocí myÅ¡i" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2768,6 +2886,11 @@ msgstr "Rozhlížení pomocí myÅ¡i" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "French" msgstr "FrancouzÅ¡tina" @@ -2784,7 +2907,7 @@ msgstr "Z" msgid "FullScr" msgstr "CelObr" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 msgid "Fullscreen resolution:" msgstr "RozliÅ¡ení celé obrazovky:" @@ -2833,6 +2956,7 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Nastavení Gamecube &Pad" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD @@ -2844,6 +2968,10 @@ msgstr "Nastavení Gamecube &Pad" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" @@ -2865,6 +2993,7 @@ msgstr "" "Nelze spustit GeckoKód (CT%i CST%i) (%s)\n" "(buÄ Å¡patný kód, nebo typ kódu není jeÅ¡tÄ› podporován.)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD @@ -2879,6 +3008,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "General" msgstr "Obecné" @@ -2886,6 +3020,7 @@ msgstr "Obecné" msgid "General Settings" msgstr "Obecná Nastavení" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2901,6 +3036,11 @@ msgstr "Obecná Nastavení" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "German" msgstr "NÄ›mÄina" @@ -2921,6 +3061,7 @@ msgstr "Grafická nastavení" msgid "Greater Than" msgstr "VÄ›tší než" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD @@ -2930,10 +3071,15 @@ msgstr "VÄ›tší než" >>>>>>> Update Greek and Czech translations #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" -"Greatly increases quality of textures generated using render-to-texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2968,11 +3114,11 @@ msgstr "Kytara" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Byl zavolán HCI_CMD_INQUIRY, prosím ohlaste!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "Hacky" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Kontrolní souÄet hlaviÄky selhal" @@ -3008,7 +3154,7 @@ msgstr "" msgid "Hide" msgstr "Skrýt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "Skrýt kurzor myÅ¡i" @@ -3035,6 +3181,7 @@ msgstr "Hostovat" msgid "Hotkey Configuration" msgstr "Nastavení klávesových zkratek" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD @@ -3047,6 +3194,10 @@ msgstr "Nastavení klávesových zkratek" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Hotkeys" msgstr "Klávesové zkratky" @@ -3133,11 +3284,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:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" msgstr "Ignorovat ZmÄ›ny Formátu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3151,7 +3302,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 " @@ -3193,7 +3344,7 @@ msgstr "" "\"Importovaný soubor má příponu sav\n" "ale nemá správnou hlaviÄku\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3205,7 +3356,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -3223,8 +3374,8 @@ msgstr "Ve HÅ™e" msgid "In-Game" msgstr "Ve HÅ™e" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "Info" @@ -3267,6 +3418,7 @@ msgstr "" "Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› " "nepodporuje." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3276,6 +3428,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Installing WAD..." msgstr "Instaluji WAD..." @@ -3304,7 +3459,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "VnitÅ™ní chyba LZO - lzo_init() selhalo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 msgid "Internal Resolution:" msgstr "VnitÅ™ní RozliÅ¡ení:" @@ -3357,6 +3512,7 @@ msgstr "Neplatný soubor s nahrávkou" msgid "Invalid state" msgstr "Neplatný stav" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3372,6 +3528,11 @@ msgstr "Neplatný stav" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Italian" msgstr "ItalÅ¡tina" @@ -3433,8 +3594,8 @@ msgstr "Poslední PÅ™epsaný Stav" msgid "Last Saved State" msgstr "Poslední Uložený Stav" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "Vlevo" @@ -3481,7 +3642,7 @@ msgstr "Limitovat podle SzS" msgid "Load" msgstr "Nahrát" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Load Custom Textures" msgstr "Nahrát Vlastní Textury" @@ -3529,6 +3690,7 @@ msgstr "Nahrát Slot Stavu 8" msgid "Load State..." msgstr "Nahrát Stav..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3550,11 +3712,18 @@ msgstr "Nahrát Systémové Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Nahrát Systémové Menu Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #, 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:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3596,8 +3765,8 @@ msgstr "Typy Záznamu" msgid "Logger Outputs" msgstr "Výstup ZapisovaÄe" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "Protokolování" @@ -3631,6 +3800,7 @@ msgstr "MMU Hack Rychlosti" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Soubory MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 @@ -3640,7 +3810,10 @@ msgstr "Soubory MadCatz Gameshark (*.gcs)" ======= >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Hlavní Stick" @@ -3669,6 +3842,7 @@ msgstr "Pam. karta již otevÅ™ena" msgid "Memory Byte" msgstr "Bajt PamÄ›ti" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD @@ -3680,6 +3854,10 @@ msgstr "Bajt PamÄ›ti" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Memory Card" msgstr "Paměťová karta" @@ -3708,7 +3886,7 @@ msgstr "" "%s\n" "ChtÄ›li byste starý soubor zkopírovat do nového umístÄ›ní?\n" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "Velikost paměťové karty se neshoduje s velikosti hlaviÄky" @@ -3725,7 +3903,7 @@ msgstr "Mikrofon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "Ostatní" @@ -3738,7 +3916,7 @@ msgstr "Ostatní Nastavení" msgid "Modifier" msgstr "Modifikátor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3763,7 +3941,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3877,6 +4055,7 @@ msgstr "NK Tab" msgid "NP Up" msgstr "NK Nahoru" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3885,9 +4064,11 @@ msgstr "NK Nahoru" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Jméno:" @@ -3972,6 +4153,7 @@ msgstr "Nerovná se" msgid "Not Set" msgstr "Nenastaven" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 @@ -3981,6 +4163,9 @@ msgstr "Nenastaven" ======= #: Source/Core/DolphinWX/Src/Main.cpp:607 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Not connected" msgstr "NepÅ™ipojen" @@ -4009,8 +4194,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "PoÄet Kódů:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "NunÄak" @@ -4039,6 +4224,7 @@ msgstr "Logická Adresa:" msgid "Only %d blocks available" msgstr "Pouze bloky %d jsou dostupné" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD <<<<<<< HEAD @@ -4048,6 +4234,10 @@ msgstr "Pouze bloky %d jsou dostupné" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Open" msgstr "Otevřít" @@ -4077,11 +4267,11 @@ 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:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "OpenCL Dekodér Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "OpenMP Dekodér Textury" @@ -4112,8 +4302,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:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "Jiné" @@ -4177,6 +4367,7 @@ msgstr "Záplaty" msgid "Paths" msgstr "Cesty" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4187,13 +4378,15 @@ msgstr "Cesty" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "Pozastavit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Per-Pixel Lighting" msgstr "OsvÄ›tlení Podle Pixelu" @@ -4206,6 +4399,7 @@ msgstr "Dokonalá" msgid "Perspective %d" msgstr "Perspektiva %d" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD @@ -4220,6 +4414,12 @@ msgstr "Perspektiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Play" msgstr "Spustit" @@ -4245,6 +4445,7 @@ msgstr "Možnosti PÅ™ehrávání" msgid "Players" msgstr "HráÄi" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4254,6 +4455,9 @@ msgstr "HráÄi" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Please confirm..." msgstr "Prosím potvrÄte..." @@ -4298,7 +4502,7 @@ msgstr "PortugalÅ¡tina" msgid "Portuguese (Brazilian)" msgstr "PortugalÅ¡tina (Brazilská)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "Efekt Následného Zpracování:" @@ -4372,7 +4576,7 @@ msgstr "TlaÄítko R" msgid "R-Analog" msgstr "Pravý Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "RAM" @@ -4389,7 +4593,7 @@ msgstr "Rozsah" msgid "Read-only mode" msgstr "Režim pouze pro Ätení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "Opravdová" @@ -4449,9 +4653,9 @@ msgstr "" "\n" "Pokud si nejste jisti, vyberte Žádný." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Obnovit" @@ -4464,6 +4668,7 @@ msgstr "Obnovit Seznam" msgid "Refresh game list" msgstr "Obnovit seznam her" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4482,10 +4687,16 @@ msgstr "Obnovit seznam her" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Remove" msgstr "Odstranit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4495,10 +4706,11 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "Vykreslit do Hlavního okna" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD @@ -4508,7 +4720,10 @@ msgstr "Vykreslit do Hlavního okna" ======= >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Resetovat" @@ -4520,8 +4735,8 @@ msgstr "Výsledky" msgid "Return" msgstr "Enter" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "Vpravo" @@ -4547,23 +4762,29 @@ msgid "Sa&ve State" msgstr "Uložit Sta&v" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 msgid "Safe" msgstr "BezpeÄná" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= ======= >>>>>>> Update Greek and Czech translations +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Vzorkovací frekvence:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Uložit" @@ -4638,15 +4859,21 @@ msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Uložený stav filmu %s je poÅ¡kozen, nahrávání filmu je zastaveno..." <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= ======= >>>>>>> Update Greek and Czech translations +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. #, c-format @@ -4683,8 +4910,8 @@ msgstr "Hledat Podadresáře" msgid "Section %s not found in SYSCONF" msgstr "Sekce %s nebyla v SYSCONF nalezena" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "Vybrat" @@ -4697,16 +4924,20 @@ msgstr "Vyberte Soubor s Nahrávkou" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "Vyberte Soubor s Nahrávkou" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" @@ -4732,6 +4963,7 @@ msgstr "Vybrat plovoucí okna" msgid "Select the file to load" msgstr "Vyberte soubor k nahrání" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4748,19 +4980,26 @@ msgstr "Vyberte stav k nahrání" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Vyberte stav k nahrání" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Select the state to save" msgstr "Vyberte stav k uložení" @@ -4898,11 +5137,11 @@ msgstr "Zobrazit Panel Nás&trojů" msgid "Show Drives" msgstr "Zobrazit Disky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "Zobrazit EFB Regiony Kopie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "Zobrazit Snímky za Sekundu" @@ -4914,7 +5153,7 @@ msgstr "Zobrazit Francii" msgid "Show GameCube" msgstr "Zobrazit GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "Zobrazit Obrazovku Vstupu" @@ -4950,7 +5189,7 @@ msgstr "Zobrazit Platformy" msgid "Show Regions" msgstr "Zobrazit Regiony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "Zobrazit Statistiky" @@ -5004,7 +5243,7 @@ msgstr "Zobrazit ikonu uložení" msgid "Show save title" msgstr "Zobrazit název uložení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -5024,7 +5263,7 @@ msgstr "Zobrazit tuto zprávu nápovÄ›dy" msgid "Show unknown" msgstr "Zobrazit neznámé" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -5050,15 +5289,15 @@ msgstr "Velikost" msgid "Skip BIOS" msgstr "PÅ™eskoÄit BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "Vypnout Průchod Cíl. Průhl." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "PÅ™eskoÄit EFB Přístup z Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -5070,6 +5309,22 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Lehce zrychlí kopie EFB do RAM obÄ›továním pÅ™esnosti emulace.\n" +"NÄ›kdy také zvýší kvalitu obrazu.\n" +"Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit pÅ™esnost textury, " +"nebo tuto možnost vypnout.\n" +"\n" +"Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -5123,6 +5378,7 @@ msgstr "VytvoÅ™ení vyrovnávací pamÄ›ti zvuku selhalo: %s" msgid "Space" msgstr "Mezerník" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5138,6 +5394,11 @@ msgstr "Mezerník" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Spanish" msgstr "Å panÄ›lÅ¡tina" @@ -5145,7 +5406,7 @@ msgstr "Å panÄ›lÅ¡tina" msgid "Speaker Volume:" msgstr "Hlasitost Reproduktoru:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 " @@ -5181,6 +5442,7 @@ msgstr "ÄŒtvercový Stick" msgid "Standard Controller" msgstr "Standardní OvladaÄ" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 @@ -5189,9 +5451,11 @@ msgstr "Standardní OvladaÄ" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Start" @@ -5221,6 +5485,7 @@ msgstr "Ukládání stavu" msgid "Stick" msgstr "Stick" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD <<<<<<< HEAD @@ -5231,11 +5496,30 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Zastavit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" +"Ukládat EFB kopie do objektů textury grafického procesoru.\n" +"Toto není pÅ™esné, ale pro vÄ›tÅ¡inu her funguje dostateÄnÄ› dobÅ™e a dává vÄ›tší " +"zrychlení než EFB do RAM.\n" +"\n" +"Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "Roztáhnout do Okna" @@ -5269,8 +5553,8 @@ msgstr "Jazyk Systému:" msgid "TAIWAN" msgstr "TCHAJ-WAN" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS Vstup" @@ -5290,10 +5574,10 @@ msgstr "Deska vlevo" msgid "Table Right" msgstr "Deska vpravo" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 @@ -5301,6 +5585,9 @@ msgstr "Deska vpravo" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Take Screenshot" msgstr "VytvoÅ™it Snímek Obrazovky" @@ -5312,7 +5599,15 @@ msgstr "" msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "Textura" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +msgid "Texture Cache" +msgstr "Vyrovnávací Paměť Textur" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" msgstr "PÅ™ekryv Formátu Textury" @@ -5357,7 +5652,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:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Zadaný soubor (%s) neexistuje" @@ -5374,11 +5669,23 @@ 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:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." +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." + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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:363 +#: Source/Core/DolphinWX/Src/Main.cpp:353 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5447,7 +5754,7 @@ msgstr "" 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:119 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. " @@ -5522,6 +5829,7 @@ msgstr "Do" msgid "Toggle All Log Types" msgstr "Zapnout VÅ¡echny Typy Záznamů" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD <<<<<<< HEAD @@ -5538,13 +5846,19 @@ msgstr "PÅ™epnout na Celou Obrazovku" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. ======= +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "PÅ™epnout na Celou Obrazovku" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Top" msgstr "NahoÅ™e" @@ -5552,7 +5866,7 @@ msgstr "NahoÅ™e" msgid "Traditional Chinese" msgstr "TradiÄní ČínÅ¡tina" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "Pokus o naÄtení souboru neznámého typu." @@ -5588,8 +5902,8 @@ msgstr "Typ" msgid "UDP Port:" msgstr "UDP Port:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5664,13 +5978,17 @@ msgstr "" "Neznámý ukazatel %#08x\n" "PokraÄovat?" +<<<<<<< HEAD <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 ======= >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "Nahoru" @@ -5687,7 +6005,7 @@ msgstr "Svislý Wiimote" msgid "Use EuRGB60 Mode (PAL60)" msgstr "Použít režim EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 msgid "Use Fullscreen" msgstr "Použít Celou Obrazovku" @@ -5699,7 +6017,7 @@ msgstr "Použít Å estnáctkovou soustavu" msgid "Use Panic Handlers" msgstr "Použít Obslužné Rutiny Paniky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5712,7 +6030,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5726,11 +6044,11 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "Pomůcky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "V-Synch" @@ -5754,8 +6072,7 @@ msgstr "Úroveň" msgid "Video" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "Virtuální" @@ -5782,21 +6099,21 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Varování" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 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:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "Varování - ELF se spouÅ¡tí ve Å¡patném režimu konzole!" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "Varování - ISO se spouÅ¡tí ve Å¡patném režimu konzole!" @@ -5868,7 +6185,7 @@ msgstr "WaveFileWriter - soubor není otevÅ™en." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "Hack Å irokoúhlého obrazu" @@ -5892,6 +6209,7 @@ msgstr "Wii KoÅ™en NAND:" msgid "Wii Save Import" msgstr "Import uložených pozic Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5901,6 +6219,9 @@ msgstr "Import uložených pozic Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -5908,8 +6229,8 @@ msgstr "Wii soubory s uložením (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD Nelze Äíst ze souboru" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "Wiimote" @@ -5931,6 +6252,7 @@ msgstr "" "nebo je to vyprÅ¡ení limitu neaktivity, nebo z jiného důvodu.\n" "Chcete ho hned znovu pÅ™ipojit?" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 @@ -5940,6 +6262,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/Main.cpp:609 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Wiimote Connected" msgstr "Wiimote PÅ™ipojen" @@ -5971,6 +6296,7 @@ msgstr "Klávesa Windows Vpravo" msgid "Word Wrap" msgstr "Zalamování textu" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5981,6 +6307,9 @@ msgstr "Zalamování textu" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. @@ -6089,7 +6418,7 @@ msgstr "Nulový kód, který dolphin nezná: %08x" msgid "[ waiting ]" msgstr "[ Äekám ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -6105,7 +6434,7 @@ msgstr "" msgid "[Custom]" msgstr "[Vlastní]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -6124,7 +6453,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -6231,9 +6560,6 @@ msgstr "| NEBO" #~ msgid "< as Default Profile >" #~ msgstr "< jako Výchozí Profil >" -#~ msgid "Accuracy:" -#~ msgstr "PÅ™esnost:" - #~ msgid "Accurate Texture Cache" #~ msgstr "Precizní Vyrovnávací Paměť Textur" @@ -6253,9 +6579,6 @@ msgstr "| NEBO" #~ "ale zapnutí této možnosti může mít také velký negativní dopad na výkon " #~ "pokud hra tuto funkci hodnÄ› využívá." -#~ msgid "Alternate Wiimote Timing" -#~ msgstr "Střídat Äasování Wiimote" - #~ msgid "Auto [recommended]" #~ msgstr "Auto [doporuÄeno]" @@ -6268,17 +6591,6 @@ 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" @@ -6315,6 +6627,9 @@ msgstr "| NEBO" #~ msgid "Danish" #~ msgstr "DánÅ¡tina" +#~ msgid "Disable Wiimote Speaker" +#~ msgstr "Zakázat Reproduktor Wiimote" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6360,9 +6675,6 @@ msgstr "| NEBO" #~ msgid "Enable CPU Access" #~ msgstr "Povolit Přístup k Procesoru" -#~ msgid "Enable Cache" -#~ msgstr "Povolit vyrovnávací paměť" - #~ msgid "Enable Copy to EFB" #~ msgstr "Povolit Kopírování do EFB" @@ -6421,12 +6733,6 @@ msgstr "| NEBO" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Nelze nahrát DSP ROM : %s" -#~ msgid "Fast" -#~ msgstr "Rychlá" - -#~ msgid "Fast Mipmaps" -#~ msgstr "Rychlé Mipmapy" - #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6540,15 +6846,9 @@ msgstr "| NEBO" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "Nutné pro použití Japonského písma ROM" -#~ msgid "Safe" -#~ msgstr "BezpeÄná" - #~ msgid "Scale:" #~ msgstr "ZmÄ›na Velikosti:" -#~ msgid "Scaled EFB Copy" -#~ msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" - #~ msgid "Select resolution for fullscreen mode" #~ msgstr "Vyberte rozliÅ¡ení v režimu celé obrazovky" @@ -6593,21 +6893,6 @@ msgstr "| NEBO" #~ "Zobrazí různé statistiky.\n" #~ "Jsou užiteÄné pouze pro úÄely ladÄ›ní." -#~ 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" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Lehce zrychlí kopie EFB do RAM obÄ›továním pÅ™esnosti emulace.\n" -#~ "NÄ›kdy také zvýší kvalitu obrazu.\n" -#~ "Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit pÅ™esnost " -#~ "textury, nebo tuto možnost vypnout.\n" -#~ "\n" -#~ "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." - #~ msgid "Slot" #~ msgstr "Slot" @@ -6641,6 +6926,7 @@ msgstr "| NEBO" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Spustí vykreslovací okno v režimu celé obrazovky." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #~ msgid "" @@ -6684,6 +6970,8 @@ msgstr "| NEBO" #~ "Pokud si nejste jisti, použijte druhou nejrychlejší hodnotu zprava." >>>>>>> Update Greek and Czech translations +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #~ msgid "Use FPS For Limiting" #~ msgstr "Použít SzS pro Omezení" diff --git a/Languages/po/el.po b/Languages/po/el.po index c9e9dda7d7..7a97de70b5 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-18 13:39-0600\n" ======= @@ -17,6 +18,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= "POT-Creation-Date: 2011-08-10 08:30-0500\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> The actual update of the Greek and Czech translations. The last commit "PO-Revision-Date: 2011-10-15 11:16+0200\n" >>>>>>> Update Greek and Czech translations "Last-Translator: Linktothepast \n" @@ -42,7 +46,7 @@ msgstr "Παιχνίδι : " msgid "! NOT" msgstr "! NOT" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -54,8 +58,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\" είναι ένα μη έγκυÏο αÏχείο GCM/ISO, ή δεν είναι ένα ISO GC/Wii." +msgstr "Το \"%s\" είναι ένα μη έγκυÏο αÏχείο GCM/ISO, ή δεν είναι ένα ISO GC/Wii." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:193 #, c-format @@ -83,10 +86,9 @@ 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/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -95,7 +97,7 @@ msgstr "" "%s απέτυχε να φοÏτώσει ως κάÏτα μνήμης\n" " Το μέγεθος του αÏχείου της κάÏτας δεν είναι έγκυÏο (0x%x bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -104,15 +106,14 @@ msgstr "" "%s απέτυχε να φοÏτώσει ως κάÏτα μνήμης\n" " Το μέγεθος της κάÏτας δεν είναι έγκυÏο (0x%x bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format 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 bytes)" +"το αÏχείο δεν είναι αÏκετά μεγάλο ώστε να αποτελεί έγκυÏο αÏχείο κάÏτας μνήμης (0x%x bytes)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -143,9 +144,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:199 #, c-format @@ -323,7 +322,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(ΑΓÎΩΣΤΟ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(ανενεÏγό)" @@ -335,7 +334,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "3D Vision" @@ -347,7 +346,7 @@ msgstr "8 bit" msgid "" msgstr "<Εισάγετε όνομα εδώ>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "<Δε βÏέθηκαν αναλÏσεις>" @@ -386,13 +385,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" @@ -406,12 +403,10 @@ msgstr "" " - ΔÏο ΠυÏήνες [ΑÎΕÎΕΡΓΟ]\n" " - Throttle Ήχου [ΑÎΕÎΕΡΓΟ]\n" " - DSP-HLE με \"Null Audio\" ή DSP-LLE\n" -" - ΧειÏοκίνητη εισαγωγή του ακÏιβοÏÏ‚ αÏÎ¹Î¸Î¼Î¿Ï Ï„Ï‰Î½ ελεγκτών που θα " -"χÏησιμοποιηθοÏν σαν [Τυπικός Ελεγκτής]\n" +" - ΧειÏοκίνητη εισαγωγή του ακÏιβοÏÏ‚ αÏÎ¹Î¸Î¼Î¿Ï Ï„Ï‰Î½ ελεγκτών που θα χÏησιμοποιηθοÏν σαν [Τυπικός Ελεγκτής]\n" "\n" "Όλοι οι παίκτες Ï€Ïέπει να έχουν την ίδια έκδοση και Ïυθμίσεις του Dolphin.\n" -"ΑπενεÏγοποιήστε όλες τις κάÏτες μνήμης ή στείλτε τες σε όλους τους παίκτες " -"Ï€Ïιν την εκκίνηση.\n" +"ΑπενεÏγοποιήστε όλες τις κάÏτες μνήμης ή στείλτε τες σε όλους τους παίκτες Ï€Ïιν την εκκίνηση.\n" "Η υποστήÏιξη Wiimote δεν έχει ακόμα υλοποιηθεί.\n" "\n" "Θα Ï€Ïέπει να έχετε κάνει Ï€Ïοώθηση της πόÏτας TCP στον host!!" @@ -434,6 +429,7 @@ msgstr "Σχετικά με το Dolphin" msgid "Acceleration" msgstr "Επιτάχυνση" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Accuracy:" @@ -445,10 +441,17 @@ msgstr "" ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "ΑκÏίβεια:" + +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "ΑκÏιβής VBeam εξομοίωση" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD @@ -458,16 +461,17 @@ msgstr "ΑκÏιβής VBeam εξομοίωση" >>>>>>> Update Greek and Czech translations #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +>>>>>>> The actual update of the Greek and Czech translations. The last commit 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, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" "Εξομοιώνει με ακÏίβεια τα EFB αντίγÏαφα.\n" -"Κάποια παιχνίδια βασίζονται σε αυτό για οÏισμένα εφέ γÏαφικών ή λειτουÏγίες " -"του gameplay.\n" +"Κάποια παιχνίδια βασίζονται σε αυτό για οÏισμένα εφέ γÏαφικών ή λειτουÏγίες του gameplay.\n" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε EFB ΑντίγÏαφα σε Υφή." @@ -493,38 +497,23 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, 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:756 #, 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:549 #, 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:609 #, 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:803 #, c-format @@ -533,11 +522,8 @@ msgstr "Σφάλμα Action Replay: Μη έγκυÏη τιμή (%08x) σε Memor #: Source/Core/Core/Src/ActionReplay.cpp:684 #, 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 @@ -564,12 +550,12 @@ msgstr "Action Replay: Normal Code %i: Μη έγκυÏο subtype %08x (%s)" 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:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "ΠÏοσαÏμογέας:" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "ΠÏοσθήκη" @@ -585,6 +571,7 @@ msgstr "ΠÏοσθήκη Patch" msgid "Add new pane" msgstr "ΠÏοσθήκη νέου pane" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -600,6 +587,11 @@ msgstr "ΠÏοσθήκη νέου pane" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Add..." msgstr "ΠÏοσθήκη..." @@ -611,8 +603,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." @@ -622,8 +613,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." @@ -631,11 +621,9 @@ 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:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "Για Ï€ÏοχωÏημένους" @@ -655,6 +643,7 @@ msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -667,6 +656,10 @@ msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" @@ -682,18 +675,17 @@ msgstr "Όλα τα συμπιεσμένα αÏχεία GC/Wii ISO (gcz)" msgid "All files (*.*)|*.*" msgstr "Όλα τα αÏχεία (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕπιτÏέπει την εναλλαγή οÏισμένων επιλογών με τα πλήκτÏα συντόμευσης 3, 4, 5, " -"6 και 7 μέσα από το παÏάθυÏο εξομοίωσης.\n" +"ΕπιτÏέπει την εναλλαγή οÏισμένων επιλογών με τα πλήκτÏα συντόμευσης 3, 4, 5, 6 και 7 μέσα από το παÏάθυÏο εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD @@ -709,10 +701,17 @@ msgstr "Εξομοιωμένο Wiimote" ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +msgid "Alternate Wiimote Timing" +msgstr "Εναλλακτικός ΧÏονισμός Wiimote" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Anisotropic Filtering:" msgstr "ΑνισοτÏοπικό ΦιλτÏάÏισμα:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "Εξομάλυνση ΟÏίων:" @@ -732,7 +731,7 @@ msgstr "Apploader:" msgid "Apply" msgstr "ΕφαÏμογή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -761,20 +760,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 msgid "Are you sure you want to delete this file? It will be gone forever!" -msgstr "" -"Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για " -"πάντα!" +msgstr "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για πάντα!" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Aspect Ratio:" msgstr "Αναλογία Οθόνης:" @@ -799,23 +800,27 @@ msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Auto" msgstr "Αυτόματα" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "Αυτόματα (Πολλαπλάσιο του 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "Αυτόματα (Μέγεθος ΠαÏαθÏÏου)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "Αυτόματη ΠÏοσαÏμογή Μεγέθους ΠαÏαθÏÏου" @@ -825,12 +830,14 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΠÏοσαÏμόζει αυτόματα το μέγεθος του παÏαθÏÏου σÏμφωνα με την εσωτεÏική " -"ανάλυση.\n" +"ΠÏοσαÏμόζει αυτόματα το μέγεθος του παÏαθÏÏου σÏμφωνα με την εσωτεÏική ανάλυση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Automatically generate mipmaps rather than decoding them from memory.\n" @@ -839,6 +846,7 @@ msgid "" "If unsure, leave this checked." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD "ΔημιουÏγεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" "Αυξάνει λίγο τις επιδόσεις, αλλά μποÏεί να Ï€Ïοκαλέσει μικÏά ελαττώματα στις " "υφές.\n" @@ -849,6 +857,13 @@ msgstr "" ======= >>>>>>> Update Greek and Czech translations +======= +"ΔημιουÏγεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" +"Αυξάνει λίγο τις επιδόσεις, αλλά μποÏεί να Ï€Ïοκαλέσει μικÏά ελαττώματα στις υφές.\n" +"\n" +"Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." + +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" msgstr "Πίσω" @@ -857,8 +872,8 @@ msgstr "Πίσω" msgid "Backend Settings" msgstr "Backend Ρυθμίσεις" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Backend:" @@ -892,7 +907,7 @@ msgstr "Εικονίδιο:" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "Βασικές" @@ -904,7 +919,7 @@ msgstr "Βασικές Ρυθμίσεις" msgid "Bass" msgstr "Μπάσο" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Αποτυχία ελέγχου checksum για τον BAT" @@ -924,6 +939,7 @@ msgstr "ΑÏιστεÏÏŒ Μπλε" msgid "Blue Right" msgstr "Δεξί Μπλε" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD @@ -935,6 +951,10 @@ msgstr "Δεξί Μπλε" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Bottom" msgstr "Βάση" @@ -967,6 +987,7 @@ msgstr "ΕÏÏεση φακέλου Ï€ÏοοÏισμοÏ" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 @@ -978,7 +999,11 @@ msgstr "Buffer:" >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "Κουμπιά" @@ -994,27 +1019,23 @@ msgstr "Stick ΚάμεÏας" msgid "CPU Emulator Engine" msgstr "Μηχανή Εξομοίωσης CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "Cache Display Lists" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -1024,13 +1045,12 @@ msgid "" msgstr "" "Υπολογίζει τον φωτισμό των 3D γÏαφικών ανά pixel αντί ανά vertex.\n" "Μειώνει την ταχÏτητα εξομοίωσης κατά κάποιο ποσοστό (ανάλογα με την GPU).\n" -"Αυτή συνήθως είναι μια ασφαλής βελτίωση, αλλά μποÏεί να Ï€Ïοκαλέσει οÏισμένες " -"φοÏές Ï€Ïοβλήματα.\n" +"Αυτή συνήθως είναι μια ασφαλής βελτίωση, αλλά μποÏεί να Ï€Ïοκαλέσει οÏισμένες φοÏές Ï€Ïοβλήματα.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "ΆκυÏο" @@ -1074,10 +1094,10 @@ msgstr "Αποτυχία εÏÏεσης WiiMote με bd: %02x:%02x:%02x:%02x:%02 msgid "Cant find WiiMote by connection handle %02x" msgstr "Αδυναμία εÏÏεσης του WiiMote με handle σÏνδεσης %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Αδυναμία ανάγνωσης από το DVD_Plugin - DVD-Interface: ΚÏίσιμο Σφάλμα" @@ -1183,6 +1203,7 @@ msgstr "Επιλέξτε μια κάÏτα μνήμης:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " @@ -1190,6 +1211,10 @@ msgid "" msgstr "" "Επιλέξτε ένα αÏχείο για χÏήση ως apploader: (έχει εφαÏμογή σε δίσκους που " "απαÏτίζονται μόνο από φακέλους)" +======= +msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" +msgstr "Επιλέξτε ένα αÏχείο για χÏήση ως apploader: (έχει εφαÏμογή σε δίσκους που απαÏτίζονται μόνο από φακέλους)" +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 @@ -1204,10 +1229,10 @@ msgstr "Κυκλικό Stick" msgid "Classic" msgstr "Κλασικό ΧειÏιστήÏιο" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: 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/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "ΚαθάÏισ." @@ -1216,25 +1241,25 @@ msgid "Clear failed." 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/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 ======= #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Close" msgstr "Κλείσιμο" @@ -1342,6 +1367,7 @@ msgstr "ΣÏνδεση Wiimote 3" msgid "Connect Wiimote 4" msgstr "ΣÏνδεση Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 @@ -1351,6 +1377,9 @@ msgstr "ΣÏνδεση Wiimote 4" ======= #: Source/Core/DolphinWX/Src/Main.cpp:608 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Connecting..." msgstr "Γίνεται ΣÏνδεση..." @@ -1391,15 +1420,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 @@ -1416,23 +1440,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:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, 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:1059 msgid "Couldn't find open command for extension 'ini'!" @@ -1473,12 +1493,17 @@ msgstr "ΔημιουÏγήθηκε από KDE-Look.org" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. 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]" +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" @@ -1486,9 +1511,7 @@ msgstr "ΔημιουÏγήθηκε από VistaIcons.com" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 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:15 msgid "Creator: " @@ -1498,11 +1521,11 @@ msgstr "ΔημιουÏγός: " msgid "Critical" msgstr "ΚÏίσιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "Κόψιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1549,6 +1572,7 @@ msgstr "Ήχος (DSP)" msgid "DSP Emulator Engine" msgstr "Μηχανή Εξομοίωσης DSP" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD @@ -1560,6 +1584,10 @@ msgstr "Μηχανή Εξομοίωσης DSP" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "DSP HLE emulation (fast)" msgstr "DSP HLE εξομοίωση (γÏήγοÏη)" @@ -1608,7 +1636,7 @@ msgstr "ÎεκÏή Ζώνη" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Debugging" msgstr "Debugging" @@ -1641,8 +1669,8 @@ msgstr "ΠÏοεπιλεγμένο ISO:" msgid "Default font" msgstr "ΠÏοεπιλεγμένη γÏαμματοσειÏά" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "ΔιαγÏαφή" @@ -1650,12 +1678,12 @@ msgstr "ΔιαγÏαφή" msgid "Delete Save" msgstr "ΔιαγÏαφή Αποθήκευσης" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "ΔιαγÏαφή του υπάÏχοντος αÏχείου '%s';" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 msgid "Description" msgstr "ΠεÏιγÏαφή" @@ -1665,12 +1693,8 @@ msgstr "Ανίχνευση" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -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 @@ -1686,15 +1710,15 @@ msgstr "Ρυθμίσεις Συσκευής" msgid "Dial" msgstr "Dial" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1702,62 +1726,52 @@ msgstr "" "Το checksum του Καταλόγου απέτυχε\n" " καθώς και το checksum του εφεδÏÎ¹ÎºÎ¿Ï ÎšÎ±Ï„Î±Î»ÏŒÎ³Î¿Ï… απέτυχε" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 msgid "Disable" msgstr "ΑπενεÏγοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "ΑπενεÏγοποίηση Ομίχλης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "ΑπενεÏγοποίηση ΦωτισμοÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "ΑπενεÏγοποίηση Βάθους ανά Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "ΑπενεÏγοποίηση Υφών" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 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:95 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/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1776,11 +1790,11 @@ msgstr "Δίσκος" msgid "Disc Read Error" msgstr "Σφάλμα Ανάγνωσης Δίσκου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "Οθόνη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1794,6 +1808,7 @@ msgstr "" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1803,6 +1818,9 @@ msgstr "Divide" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξομοίωση;" @@ -1810,7 +1828,7 @@ msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξο msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Ρυθμίσεις ΓÏαφικών Dolphin %s" @@ -1831,6 +1849,7 @@ msgstr "Ρυθμίσεις Εξοιμοιωμένου Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1844,16 +1863,23 @@ msgstr "Ρυθμίσεις Dolphin GCPad" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Dolphin GCPad Configuration" msgstr "Ρυθμίσεις Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" @@ -1869,6 +1895,7 @@ msgstr "Dolphin στο &Google Code" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " @@ -1876,11 +1903,16 @@ msgid "" 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. Κάντε διπλό κλίκ εδώ για εÏÏεση αÏχείων..." +>>>>>>> The actual update of the Greek and Czech translations. The last commit <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " @@ -1888,9 +1920,13 @@ msgid "" msgstr "" "Το Dolphin είναι Ïυθμισμένο να αποκÏÏπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ " "εδώ για να εμφανιστοÏν όλα τα παιχνίδια..." +======= +msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." +msgstr "Το Dolphin είναι Ïυθμισμένο να αποκÏÏπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ εδώ για να εμφανιστοÏν όλα τα παιχνίδια..." +>>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Κάτω" @@ -1915,41 +1951,39 @@ msgstr "Dummy" msgid "Dump Audio" msgstr "Εξαγωγή Ήχου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "Εξαγωγή EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "Εξαγωγή ΚαÏέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "Εξαγωγή Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 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:112 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:114 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1959,6 +1993,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1974,6 +2009,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Dutch" msgstr "Ολλανδικά" @@ -1981,22 +2021,14 @@ msgstr "Ολλανδικά" msgid "E&xit" msgstr "Έ&ξοδος" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" msgstr "EFB ΑντίγÏαφα" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, 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:162 msgid "EUROPE" @@ -2035,7 +2067,7 @@ msgstr "ΕπεξεÏγασία..." msgid "Effect" msgstr "Εφέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer" @@ -2043,34 +2075,27 @@ msgstr "Embedded Frame Buffer" msgid "Emu Thread already running" msgstr "Το νήμα εξομοίωσης εκτελείται ήδη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 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:110 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" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -2086,17 +2111,15 @@ msgstr "Κατάσταση ΛειτουÏγίας:" msgid "Enable" msgstr "ΕνεÏγοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 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" @@ -2118,16 +2141,20 @@ msgstr "ΕνεÏγοποίηση BAT" msgid "Enable Block Merging" msgstr "ΕνεÏγοποίηση Block Merging" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "ΕνεÏγοποίηση Cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 @@ -2137,6 +2164,8 @@ msgstr "ΕνεÏγοποίηση Cheat" ======= >>>>>>> Update Greek and Czech translations +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" @@ -2154,7 +2183,7 @@ msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα" msgid "Enable Dual Core (speedup)" msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα (επιτάχυνση)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "ΕνεÏγοποίηση ΣυντομεÏσεων" @@ -2170,8 +2199,8 @@ msgstr "ΕνεÏγοποίηση Idle Skipping (επιτάχυνση)" msgid "Enable MMU" msgstr "ΕνεÏγοποίηση MMU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "ΕνεÏγοποίηση ΠÏοοδευτικής ΣάÏωσης" @@ -2183,7 +2212,7 @@ msgstr "ΕνεÏγοποίηση ΠÏοφÏλαξης Οθόνης" msgid "Enable WideScreen" msgstr "ΕνεÏγοποίηση ΕυÏείας Οθόνης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "ΕνεÏγοποίηση Wireframe" @@ -2196,19 +2225,14 @@ msgid "" "If unsure, select 1x." msgstr "" "ΕνεÏγοποιεί το ανισοτÏοπικό φιλτÏάÏισμα.\n" -"Βελτιώνει την ποιότητα απεικόνισης των υφών που βÏίσκονται σε οξείες οπτικές " -"γωνίες.\n" +"Βελτιώνει την ποιότητα απεικόνισης των υφών που βÏίσκονται σε οξείες οπτικές γωνίες.\n" "ΜποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα σε έναν μικÏÏŒ αÏιθμό παιχνιδιών.\n" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -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:799 msgid "Enable pages" @@ -2221,21 +2245,18 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιήστε το αν θέλετε ολόκληÏη η οθόνη να χÏησιμοποιηθεί για την " -"απεικόνιση.\n" +"ΕνεÏγοποιήστε το αν θέλετε ολόκληÏη η οθόνη να χÏησιμοποιηθεί για την απεικόνιση.\n" "Αν αυτό είναι απενεÏγοποιημένο, θα δημιουÏγηθεί ένα παÏάθυÏο απεικόνισης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -2243,6 +2264,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " @@ -2250,16 +2272,14 @@ msgid "" 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. ΑπενεÏγοποιήστε το για τα υπόλοιπα παιχνίδια." +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 -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:337 msgid "Enables Custom Projection Hack" @@ -2272,20 +2292,15 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιεί την Ï€Ïοοδευτική σάÏωση αν υποστηÏίζεται από το εξομοιωμένο " -"λογισμικό. Τα πεÏισσότεÏα παιχνίδια δεν την χÏειάζονται αυτήν την ÏÏθμιση.\n" +"ΕνεÏγοποιεί την Ï€Ïοοδευτική σάÏωση αν υποστηÏίζεται από το εξομοιωμένο λογισμικό. Τα πεÏισσότεÏα παιχνίδια δεν την χÏειάζονται αυτήν την ÏÏθμιση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -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 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2299,6 +2314,7 @@ msgstr "" msgid "End" msgstr "Τέλος" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2314,11 +2330,16 @@ msgstr "Τέλος" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "English" msgstr "Αγγλικά" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "Βελτιώσεις" @@ -2340,6 +2361,7 @@ msgstr "ΕγγÏαφή 1/%d" msgid "Equal" msgstr "Ίσο" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 @@ -2360,10 +2382,15 @@ msgstr "" >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Error" msgstr "Σφάλμα" +<<<<<<< HEAD <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 @@ -2375,6 +2402,11 @@ msgstr "" "Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή " "συστήματος." <<<<<<< HEAD +======= +#: Source/Core/DolphinWX/Src/Main.cpp:346 +msgid "Error loading selected language. Falling back to system default." +msgstr "Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή συστήματος." +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Common/Src/ChunkFile.h:180 #, c-format @@ -2387,13 +2419,8 @@ msgstr "" #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, 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" @@ -2406,8 +2433,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:58 msgid "Execute" @@ -2458,7 +2484,7 @@ msgstr "Εξαγωγή αποθήκευσης ως..." msgid "Extension" msgstr "Επέκταση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "ΕξωτεÏικό Frame Buffer" @@ -2559,12 +2585,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 @@ -2581,7 +2605,7 @@ msgstr "Αποτυχία φόÏτωσης hid.dll" msgid "Failed to read banner.bin" msgstr "Αποτυχία ανάγνωσης banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2589,7 +2613,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης του αντιγÏάφου ασφαλείας του BAT\n" "(0x8000-0x9FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2602,7 +2626,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Αποτυχία ανάγνωσης δεδομένων από το αÏχείο %d" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2610,7 +2634,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης του αντιγÏάφου ασφαλείας των φακέλων\n" "(0x4000-0x5FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2618,7 +2642,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης των φακέλων\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2626,7 +2650,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης της κεφαλίδας\n" "(0x0000-0x1FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2655,15 +2679,21 @@ msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το msgid "Failed to write header for file %d" msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το αÏχείο %d" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 msgid "Fast" <<<<<<< HEAD +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +msgid "Fast" +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgstr "ΓÏήγοÏη" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Fast Mipmaps" msgstr "ΓÏήγοÏα Mipmaps" +<<<<<<< HEAD ======= msgstr "" @@ -2674,6 +2704,9 @@ msgstr "" ======= >>>>>>> Update Greek and Czech translations +======= + +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "ΓÏήγοÏη έκδοση του MMU. Δε δουλεÏει για όλα τα παιχνίδια." @@ -2702,7 +2735,7 @@ msgstr "" "Το αÏχείο απέτυχε στο άνοιγμα\n" "ή δεν έχει έγκυÏη επέκταση" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2740,11 +2773,11 @@ msgstr "ΠÏώτο Μπλοκ" msgid "Fix Checksums" msgstr "ΕπιδιόÏθωση Checksum" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "Επιβολή 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "Επιβολή 4:3" @@ -2752,11 +2785,11 @@ msgstr "Επιβολή 4:3" msgid "Force Console as NTSC-J" msgstr "Επιβολή της Κονσόλας ως NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" msgstr "Επιβολή ΦιλτÏαÏίσματος Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2764,8 +2797,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Επιβάλλει φιλτÏάÏισμα υφών ακόμα κι αν το παιχνίδι το έχει απενεÏγοποιήσει.\n" -"Βελτιώνει ελαφÏÏŽÏ‚ την ποιότητα των υφών αλλά μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα " -"σε οÏισμένα παιχνίδια.\n" +"Βελτιώνει ελαφÏÏŽÏ‚ την ποιότητα των υφών αλλά μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα σε οÏισμένα παιχνίδια.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -2784,15 +2816,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 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/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2818,7 +2847,7 @@ msgstr "ΚαÏέ" msgid "Frame Advance" msgstr "ΠÏοώθηση ανά ΚαÏέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "FFV1 Για Τα Εξαγώμενα ΚαÏέ" @@ -2838,10 +2867,11 @@ msgstr "ΠεÏιοÏισμός ΚαÏέ:" msgid "Frames To Record" msgstr "ΚαÏέ ΠÏος ΕγγÏαφή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "ΕλεÏθεÏη Ματιά" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2857,6 +2887,11 @@ msgstr "ΕλεÏθεÏη Ματιά" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "French" msgstr "Γαλλικά" @@ -2873,7 +2908,7 @@ msgstr "Από" msgid "FullScr" msgstr "ΠλήÏης Οθόνη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 msgid "Fullscreen resolution:" msgstr "Ανάλυση ΠλήÏους Οθόνης:" @@ -2922,6 +2957,7 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Ρυθμίσεις Gamecube &Pad" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD @@ -2933,6 +2969,10 @@ msgstr "Ρυθμίσεις Gamecube &Pad" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "ΚάÏτες Μνήμης Gamecube (*.raw,*.gcp)" @@ -2954,6 +2994,7 @@ msgstr "" "Ο Κωδικός Gecko απέτυχε να εκτελεστεί (CT%i CST%i) (%s)\n" "(ή είναι ένας κακός κωδικός ή ο Ï„Ïπος του ÎºÏ‰Î´Î¹ÎºÎ¿Ï Î´ÎµÎ½ υποστηÏίζεται.)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD @@ -2968,6 +3009,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "General" msgstr "Γενικά" @@ -2975,6 +3021,7 @@ msgstr "Γενικά" msgid "General Settings" msgstr "Γενικές Ρυθμίσεις" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2990,15 +3037,18 @@ msgstr "Γενικές Ρυθμίσεις" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "German" msgstr "ΓεÏμανικά" #: Source/Core/Core/Src/ActionReplay.cpp:451 #, 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:443 msgid "Graphics" @@ -3012,6 +3062,7 @@ msgstr "Ρυθμίσεις ΓÏαφικών" msgid "Greater Than" msgstr "ΜεγαλÏτεÏο από" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD @@ -3021,18 +3072,19 @@ msgstr "ΜεγαλÏτεÏο από" >>>>>>> Update Greek and Czech translations #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +>>>>>>> The actual update of the Greek and Czech translations. The last commit 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" "\n" "If unsure, leave this checked." msgstr "" -"Βελτιώνει Ï€Î¿Î»Ï Ï„Î·Î½ ποιότητα των υφών που παÏάγονται χÏησιμοποιώντας render " -"to texture εφέ.\n" +"Βελτιώνει Ï€Î¿Î»Ï Ï„Î·Î½ ποιότητα των υφών που παÏάγονται χÏησιμοποιώντας render to texture εφέ.\n" "Μία αÏξηση της εσωτεÏικής ανάλυσης θα βελτιώσει το εφέ αυτής της ÏÏθμισης.\n" -"Μειώνει ελαφÏÏŽÏ‚ την επίδοση και είναι πιθανό να Ï€Ïοκαλέσει Ï€Ïοβλήματα (αν " -"και σπάνια).\n" +"Μειώνει ελαφÏÏŽÏ‚ την επίδοση και είναι πιθανό να Ï€Ïοκαλέσει Ï€Ïοβλήματα (αν και σπάνια).\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -3060,11 +3112,11 @@ msgstr "ΚιθάÏα" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Γίνεται κλήση του HCI_CMD_INQUIRY, παÏακαλώ αναφέÏετε!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "Hacks" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Αποτυχία ελέγχου κεφαλίδας" @@ -3100,7 +3152,7 @@ msgstr "" msgid "Hide" msgstr "ΑπόκÏυψη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "ΑπόκÏυψη Δείκτη ΠοντικιοÏ" @@ -3110,8 +3162,7 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"ΑποκÏÏπτει τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î±Î½ βÏίσκεται πάνω από το παÏάθυÏο " -"εξομοίωσης.\n" +"ΑποκÏÏπτει τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î±Î½ βÏίσκεται πάνω από το παÏάθυÏο εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -3128,6 +3179,7 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Ρυθμίσεις ΠλήκτÏων Συντόμευσης" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD @@ -3140,6 +3192,10 @@ msgstr "Ρυθμίσεις ΠλήκτÏων Συντόμευσης" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Hotkeys" msgstr "ΠλήκτÏα Συντόμευσης" @@ -3154,20 +3210,16 @@ msgstr "ΥβÏιδικό Wiimote" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 #, 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:795 #, 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 πιθανότατα θα κολλήσει Ï„ÏŽÏα." @@ -3214,56 +3266,50 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -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 διακυμαίνονται, αυτή η επιλογή μποÏείο να βοηθήσει. (ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "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." +======= +msgid "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." +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgstr "" -"Αν θέσετε τιμή υψηλότεÏη από την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, " -"PAL:50),\n" -"θα Ï€Ïέπει επίσης να απενεÏγοποιήσετε το Throttle Ήχου στο DSP για να έχει " -"αποτέλεσμα. " +"Αν θέσετε τιμή υψηλότεÏη από την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, PAL:50),\n" +"θα Ï€Ïέπει επίσης να απενεÏγοποιήσετε το Throttle Ήχου στο DSP για να έχει αποτέλεσμα. " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" msgstr "Αγνόηση Αλλαγών Format" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 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:93 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -3295,26 +3341,23 @@ msgstr "" "Το εισαγώμενο αÏχείο έχει sav επέκταση\n" "άλλα δεν έχει σωστή κεφαλίδα." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 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/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί την εξαφάνιση του Ï†Ï‰Ï„Î¹ÏƒÎ¼Î¿Ï ÏƒÏ„Î± " -"πεÏισσότεÏα παιχνίδια.\n" +"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί την εξαφάνιση του Ï†Ï‰Ï„Î¹ÏƒÎ¼Î¿Ï ÏƒÏ„Î± πεÏισσότεÏα παιχνίδια.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -3326,8 +3369,8 @@ msgstr "Εντός ΠαιχνιδιοÏ" msgid "In-Game" msgstr "Εντός ΠαιχνιδιοÏ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "ΠληÏοφοÏίες" @@ -3364,12 +3407,10 @@ 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 καλέστηκε, αλλά αυτή η πλατφόÏμα δεν το υποστηÏίζει ακόμα." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3379,6 +3420,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." @@ -3407,7 +3451,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "ΕσωτεÏικό Σφάλμα LZO - αποτυχία lzo_init()" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 msgid "Internal Resolution:" msgstr "ΕσωτεÏική Ανάλυση:" @@ -3460,6 +3504,7 @@ msgstr "Μη έγκυÏο αÏχείο εγγÏαφής" msgid "Invalid state" msgstr "Μη έγκυÏο κατάσταση" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3475,6 +3520,11 @@ msgstr "Μη έγκυÏο κατάσταση" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Italian" msgstr "Ιταλικά" @@ -3536,8 +3586,8 @@ msgstr "Τελευταίο ΕπαναγÏαμμένο Σημείο Αποθ." msgid "Last Saved State" msgstr "Τελευταίο Αποθηκευμένο Σημείο Αποθ." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "ΑÏιστεÏά" @@ -3584,7 +3634,7 @@ msgstr "ΠεÏιοÏισμός με βάση τα ΚαÏέ" msgid "Load" msgstr "ΦόÏτωσ." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Load Custom Textures" msgstr "ΦόÏτωση ΤÏοποποιημένων Υφών" @@ -3632,6 +3682,7 @@ msgstr "ΦόÏτωση Σημείου Αποθήκευσης 8" msgid "Load State..." msgstr "ΦόÏτωση Σημείου Αποθήκευσης..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3653,11 +3704,18 @@ msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #, 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:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3699,8 +3757,8 @@ msgstr "ΤÏποι ΚαταγÏαφής" msgid "Logger Outputs" msgstr "Έξοδοι ΚαταγÏαφής" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "ΚαταγÏαφή" @@ -3734,6 +3792,7 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "ΑÏχεία MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 @@ -3743,7 +3802,10 @@ msgstr "ΑÏχεία MadCatz Gameshark (*.gcs)" ======= >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "ΚÏÏιο Stick" @@ -3772,6 +3834,7 @@ msgstr "Η κάÏτα μνήμης είναι ήδη ανοιχτή" msgid "Memory Byte" msgstr "Memory Byte" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD @@ -3783,16 +3846,16 @@ msgstr "Memory Byte" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> The actual update of the Greek and Czech translations. The last commit 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 @@ -3811,11 +3874,9 @@ msgstr "" "%s\n" "Θέλετε να αντιγÏάψετε το παλιό αÏχείο σε αυτή την νέα τοποθεσία;\n" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" -msgstr "" -"Το μέγεθος του αÏχείου της κάÏτας μνήμης δεν ταιÏιάζει με το μέγεθος της " -"κεφαλίδας." +msgstr "Το μέγεθος του αÏχείου της κάÏτας μνήμης δεν ταιÏιάζει με το μέγεθος της κεφαλίδας." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:47 msgid "Menu" @@ -3830,7 +3891,7 @@ msgstr "ΜικÏόφωνο" msgid "Min" msgstr "Ελάχιστη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "ΔιάφοÏα" @@ -3843,15 +3904,13 @@ msgstr "ΔιάφοÏες Ρυθμίσεις" msgid "Modifier" msgstr "Modifier" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -3869,7 +3928,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "ΜοτέÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3879,8 +3938,7 @@ msgid "" "\n" "\n" msgstr "" -"Μετακινήστε τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Ï€Î¬Î½Ï‰ από μία επιλογή για να εμφανιστεί " -"μία λεπτομεÏής πεÏιγÏαφή.\n" +"Μετακινήστε τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Ï€Î¬Î½Ï‰ από μία επιλογή για να εμφανιστεί μία λεπτομεÏής πεÏιγÏαφή.\n" "\n" "\n" "\n" @@ -3891,12 +3949,8 @@ msgid "Multiply" msgstr "Multiply" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -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/WXInputBase.cpp:126 msgid "NP Add" @@ -3982,6 +4036,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3990,9 +4045,11 @@ msgstr "NP Up" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Όνομα:" @@ -4077,6 +4134,7 @@ msgstr "Όχι ίσο" msgid "Not Set" msgstr "Μη ΟÏισμένο" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 @@ -4086,6 +4144,9 @@ msgstr "Μη ΟÏισμένο" ======= #: Source/Core/DolphinWX/Src/Main.cpp:607 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Not connected" msgstr "Μη Συνδεδεμένο" @@ -4114,8 +4175,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "ΑÏιθμός Κωδικών: " -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "Nunchuk" @@ -4144,6 +4205,7 @@ msgstr "Offset:" msgid "Only %d blocks available" msgstr "Διαθέσιμα μόνο %d μπλοκ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD <<<<<<< HEAD @@ -4153,6 +4215,10 @@ msgstr "Διαθέσιμα μόνο %d μπλοκ" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Open" msgstr "Άνοιγμα" @@ -4182,11 +4248,11 @@ msgstr "OpenAL: αδυναμία εÏÏεσης συσκευών ήχου" msgid "OpenAL: can't open device %s" msgstr "OpenAL: αδυναμία ανοίγματος της συσκευής %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "OpenCL Αποκωδικοποιητής Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "OpenMP Αποκωδικοποιητής Υφών" @@ -4213,23 +4279,18 @@ 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" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 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" @@ -4284,6 +4345,7 @@ msgstr "Patches" msgid "Paths" msgstr "Φάκελοι" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4294,13 +4356,15 @@ msgstr "Φάκελοι" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "ΠαÏση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Per-Pixel Lighting" msgstr "Φωτισμός ανά Pixel" @@ -4313,6 +4377,7 @@ msgstr "Τέλειο" msgid "Perspective %d" msgstr "Οπτική %d" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD @@ -4327,6 +4392,12 @@ msgstr "Οπτική %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Play" msgstr "ΑναπαÏαγωγή" @@ -4352,6 +4423,7 @@ msgstr "Ρυθμίσεις ΑναπαÏαγωγής" msgid "Players" msgstr "Παίχτες" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4361,6 +4433,9 @@ msgstr "Παίχτες" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Please confirm..." msgstr "ΠαÏακαλώ επιβεβαιώστε..." @@ -4405,7 +4480,7 @@ msgstr "ΠοÏτογαλικά" msgid "Portuguese (Brazilian)" msgstr "ΠοÏτογαλικά (Î’Ïαζιλιάνικα)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "Post-Processing Εφέ:" @@ -4479,7 +4554,7 @@ msgstr "R Button" msgid "R-Analog" msgstr "R-Αναλογική" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "RAM" @@ -4496,7 +4571,7 @@ msgstr "ΕÏÏος" msgid "Read-only mode" msgstr "Μόνο Για Ανάγνωση (ΕγγÏαφής)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "ΠÏαγματικό" @@ -4556,9 +4631,9 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε Καμία." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Ανανέωση" @@ -4571,6 +4646,7 @@ msgstr "Ανανέωση Λίστας" msgid "Refresh game list" msgstr "Ανανέωση λίστας παιχνιδιών" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4589,10 +4665,16 @@ msgstr "Ανανέωση λίστας παιχνιδιών" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Remove" msgstr "ΑφαίÏεση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4602,10 +4684,11 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "ΑναπαÏαγωγή στο ΚεντÏικό ΠαÏάθυÏο" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD @@ -4615,7 +4698,10 @@ msgstr "ΑναπαÏαγωγή στο ΚεντÏικό ΠαÏάθυÏο" ======= >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Επανεκκίνηση" @@ -4627,8 +4713,8 @@ msgstr "Αποτελέσματα" msgid "Return" msgstr "Return" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "Δεξιά" @@ -4653,6 +4739,7 @@ msgstr "Ρώσικα" msgid "Sa&ve State" msgstr "Απ&οθήκευση Σημείου Αποθήκευσης" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 msgid "Safe" @@ -4665,14 +4752,20 @@ msgstr "" ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +msgstr "Ασφαλής" + +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Ρυθμός Δειγματοληψίας:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Αποθήκ." @@ -4744,9 +4837,11 @@ msgstr "Αποθήκευση αποσυμπιεσμένου GCM/ISO" #: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." -msgstr "" -"Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της " -"εγγÏαφής της ταινίας..." +msgstr "Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της εγγÏαφής της ταινίας..." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +msgid "Scaled EFB Copy" +msgstr "ΚλιμακοÏμενα EFB ΑντίγÏαφα" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 @@ -4789,14 +4884,16 @@ msgstr "ΦίλτÏο Αναζήτησης" msgid "Search Subfolders" msgstr "Αναζήτηση σε Υποφακέλους" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:104 +#: Source/Core/Common/Src/SysConf.h:127 +#: Source/Core/Common/Src/SysConf.h:147 +#: Source/Core/Common/Src/SysConf.h:168 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Η ενότητα %s δε βÏέθηκε στο SYSCONF" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "Επιλογή" @@ -4809,16 +4906,20 @@ msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αÏχείο για εγκατάσταση" @@ -4844,6 +4945,7 @@ msgstr "Επιλέξτε αιωÏοÏμενα παÏάθυÏα" msgid "Select the file to load" msgstr "Επιλέξτε το αÏχείο για φόÏτωση" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4860,19 +4962,26 @@ msgstr "Επιλέξτε το σημείο φόÏτωσης" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Select the save file" msgstr "Επιλέξτε αÏχείο αποθήκευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Επιλέξτε το σημείο φόÏτωσης" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" @@ -4890,8 +4999,7 @@ msgstr "" "Αυτόματα: ΧÏήση της τοπικής αναλογίας οθόνης (4:3)\n" "Επιβολή 16:9: ΠÏοσαÏμόζει την εικόνα σε αναλογία οθόνης 16:9.\n" "Επιβολή 4:3: ΠÏοσαÏμόζει την εικόνα σε αναλογία οθόνης 4:3.\n" -"ΠÏοσαÏμογή στο παÏάθυÏο: ΠÏοσαÏμόζει την εικόνα στην αναλογία του " -"παÏαθÏÏου.\n" +"ΠÏοσαÏμογή στο παÏάθυÏο: ΠÏοσαÏμόζει την εικόνα στην αναλογία του παÏαθÏÏου.\n" "\n" "Αν δεν είστε σίγουÏοι επιλέξτε Αυτόματα." @@ -4902,32 +5010,26 @@ msgstr "Επιλεγμένη γÏαμματοσειÏά" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 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:73 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." @@ -4952,12 +5054,17 @@ msgstr "ΣεÏβικά" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. 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 - Αυτή είναι η θÏÏα που χÏησιμοποιοÏν οι συσκευές όπως ο Ï€ÏοσαÏμογέας δικτÏου" +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" @@ -4975,9 +5082,7 @@ msgstr "ΟÏισμός ως Ï€Ïοεπιλεγμένη ΚάÏτα Μνήμης % #: Source/Core/Core/Src/ActionReplay.cpp:462 #, 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:338 msgid "Settings..." @@ -5019,11 +5124,11 @@ msgstr "Εμφάνιση ΓÏαμμής &ΕÏγαλείων" msgid "Show Drives" msgstr "Εμφάνιση Οδηγών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "Εμφάνιση ΠεÏιοχών EFB ΑντιγÏαφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "Εμφάνιση FPS" @@ -5035,7 +5140,7 @@ msgstr "Εμφάνιση Γαλλίας" msgid "Show GameCube" msgstr "Εμφάνιση GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "Εμφάνιση ΠÏοβολής ΧειÏισμών" @@ -5071,7 +5176,7 @@ msgstr "Εμφάνιση ΠλατφόÏμας" msgid "Show Regions" msgstr "Εμφάνιση ΠεÏιοχών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "Εμφάνιση Στατιστικών" @@ -5098,12 +5203,10 @@ msgstr "Εμφάνιση επιβεβαίωσης Ï€Ïιν τη διακοπή #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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:812 @@ -5126,15 +5229,13 @@ msgstr "Εμφάνιση αποθηκευμένου εικονιδίου" msgid "Show save title" msgstr "Εμφάνιση αποθηκευμένου τίτλου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -5146,7 +5247,7 @@ msgstr "Εμφάνιση Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος βοήθειας" msgid "Show unknown" msgstr "Εμφάνιση Αγνώστων" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -5172,28 +5273,44 @@ msgstr "Μέγεθος" msgid "Skip BIOS" msgstr "ΠαÏάλειψη BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "ΠαÏάλειψη Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "ΠαÏάλειψη EFB ΠÏόσβασης από τη CPU" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 <<<<<<< HEAD ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +>>>>>>> The actual update of the Greek and Czech translations. The last commit 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:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"ΕπιταχÏνει ελαφÏÏŽÏ‚ τα EFB σε RAM αντίγÏαφα θυσιάζοντας την ακÏίβεια της εξομοίωσης.\n" +"ΜεÏικές φοÏές μποÏεί να βελτιώσει την οπτική ποιότητα.\n" +"Αν αντιμετωπίζετε Ï€Ïοβλήματα, δοκιμάστε να αυξήσετε την ακÏίβεια της cache υφών ή απενεÏγοποιήστε αυτήν την επιλογή.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -5261,16 +5378,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" @@ -5290,6 +5404,7 @@ msgstr "Αποτυχία δημιουÏγίας buffer ήχου: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5305,6 +5420,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Spanish" msgstr "Ισπανικά" @@ -5312,24 +5432,15 @@ msgstr "Ισπανικά" msgid "Speaker Volume:" msgstr "Ένταση ηχείου:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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." @@ -5349,6 +5460,7 @@ msgstr "ΤετÏάγωνο Stick" msgid "Standard Controller" msgstr "Τυπικός Controller" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 @@ -5357,9 +5469,11 @@ msgstr "Τυπικός Controller" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Εκκίνηση" @@ -5389,6 +5503,7 @@ msgstr "Σημεία Αποθήκευσης" msgid "Stick" msgstr "Stick" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD <<<<<<< HEAD @@ -5399,10 +5514,16 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Διακοπή" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" @@ -5425,6 +5546,21 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +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" +"\n" +"If unsure, leave this checked." +msgstr "" +"Αποθήκευση των EFB αντιγÏάφων σε GPU αντικείμενα υφών.\n" +"Αυτό δεν είναι τόσο ακÏιβές, αλλά δουλεÏει αÏκετά καλά για τα πεÏισσότεÏα παιχνίδια και Ï€ÏοσφέÏει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n" +"\n" +"Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Stretch to Window" msgstr "ΠÏοσαÏμογή στο ΠαÏάθυÏο" @@ -5458,8 +5594,8 @@ msgstr "Γλώσσα Συστήματος:" msgid "TAIWAN" msgstr "ΤΑΪΒΑÎ" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS Είσοδος" @@ -5479,10 +5615,10 @@ msgstr "ΑÏιστεÏÏŒ Table" msgid "Table Right" msgstr "Δεξί Table" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 @@ -5490,6 +5626,9 @@ msgstr "Δεξί Table" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Take Screenshot" msgstr "ΔημιουÏγία Στιγμιότυπου" @@ -5501,15 +5640,20 @@ msgstr "" msgid "Test" msgstr "Τέστ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 <<<<<<< HEAD +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Texture" msgstr "Υφή" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 msgid "Texture Cache" msgstr "Cache Υφών" +<<<<<<< HEAD ======= #, fuzzy msgid "Texture" @@ -5525,6 +5669,10 @@ msgstr "ΚαθαÏισμός Cache" ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 >>>>>>> Update Greek and Czech translations +======= + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Texture Format Overlay" msgstr "Επικάλυψη Του Format Υφών" @@ -5557,19 +5705,15 @@ 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:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Το αÏχείο που επιλέξατε (%s) δεν υπάÏχει" @@ -5584,8 +5728,17 @@ msgstr "Το όνομα δεν μποÏεί να πεÏιέχει τον Ï‡Î±Ï #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:141 msgid "The resulting decrypted AR code doesn't contain any lines." +msgstr "Το αποτέλεσμα αποκÏυπτογÏάφησης του ÎºÏ‰Î´Î¹ÎºÎ¿Ï AR δεν πεÏιέχει καθόλου γÏαμμές." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +msgid "" +"The safer you adjust this, the less likely the emulator will be missing any texture updates from RAM.\n" +"\n" +"If unsure, use the second-fastest value from the right." msgstr "" -"Το αποτέλεσμα αποκÏυπτογÏάφησης του ÎºÏ‰Î´Î¹ÎºÎ¿Ï AR δεν πεÏιέχει καθόλου γÏαμμές." +"Όσο πιο ασφαλής είναι αυτή η ÏÏθμιση, τόσο λιγότεÏο πιθανό ο εξομοιωτής να χάσει ανανεώσεις των υφών από την RAM.\n" +"\n" +"Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την δεÏτεÏη γÏηγοÏότεÏη τιμή από δεξιά." <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 @@ -5607,16 +5760,11 @@ msgstr "" >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" -msgstr "" -"Το σημείο αποθήκευσης που Ï€Ïοσπαθείτε να αντιγÏάψετε έχει μη έγκυÏο μέγεθος" +msgstr "Το σημείο αποθήκευσης που Ï€Ïοσπαθείτε να αντιγÏάψετε έχει μη έγκυÏο μέγεθος" -#: Source/Core/DolphinWX/Src/Main.cpp:363 -msgid "" -"The selected language is not supported by your system. Falling back to " -"system default." -msgstr "" -"Η επιλεγμένη γλώσσα δεν υποστηÏίζεται από το σÏστημά σας. ΕπαναφοÏά στην " -"Ï€Ïοεπιλογή συστήματος." +#: Source/Core/DolphinWX/Src/Main.cpp:353 +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!" @@ -5652,12 +5800,8 @@ msgid "Theme selection went wrong" msgstr "Η επιλογή θέματος απέτυχε" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 -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:304 msgid "" @@ -5665,40 +5809,25 @@ msgid "" "Undetermined means the game uses Dolphin's setting." msgstr "" "Αυτές οι Ïυθμίσεις υπεÏισχÏουν των γενικών Ïυθμίσεων του Dolphin.\n" -"Αν είναι ακαθόÏιστη η επιλογή το παιχνίδι χÏησιμοποιεί τις γενικές Ïυθμίσεις " -"του Dolphin. " +"Αν είναι ακαθόÏιστη η επιλογή το παιχνίδι χÏησιμοποιεί τις γενικές Ïυθμίσεις του Dolphin. " #: Source/Core/Core/Src/ActionReplay.cpp:356 -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:513 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:119 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -5710,14 +5839,11 @@ msgid "" "\n" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" -"ΧÏησιμοποιείται για τον έλεγχο της ταχÏτητας του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î¼Îµ throttle " -"ήχου.\n" -"ΑπενεÏγοποιώντας το μποÏεί να Ï€Ïοκλήθει αφÏσικη ταχÏτητα σε παιχνίδια, Ï€.χ. " -"Ï€Î¿Î»Ï Î³ÏήγοÏη.\n" +"ΧÏησιμοποιείται για τον έλεγχο της ταχÏτητας του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î¼Îµ throttle ήχου.\n" +"ΑπενεÏγοποιώντας το μποÏεί να Ï€Ïοκλήθει αφÏσικη ταχÏτητα σε παιχνίδια, Ï€.χ. Ï€Î¿Î»Ï Î³ÏήγοÏη.\n" "Όμως οÏισμένες φοÏές η ενεÏγοποίησή της μποÏεί να Ï€Ïοκαλέσει μόνιμο θόÏυβο.\n" "\n" -"Συντόμευση πληκτÏολογίου : ΚÏατήστε το πατημένο για να απενεÏγοποιηθεί " -"η λειτουÏγία Throttle." +"Συντόμευση πληκτÏολογίου : ΚÏατήστε το πατημένο για να απενεÏγοποιηθεί η λειτουÏγία Throttle." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." @@ -5725,20 +5851,16 @@ msgstr "ΧÏησιμοποιείται για την αναπαÏαγωγή μο #: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 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:283 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 @@ -5763,6 +5885,7 @@ msgstr "Εώς" msgid "Toggle All Log Types" msgstr "Εναλλαγή Όλων ΤÏπων ΚαταγÏαφής " +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD <<<<<<< HEAD @@ -5779,13 +5902,19 @@ msgstr "Εναλλαγή ΠλήÏους Οθόνης" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. ======= +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Εναλλαγή ΠλήÏους Οθόνης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Top" msgstr "ΚοÏυφή" @@ -5793,7 +5922,7 @@ msgstr "ΚοÏυφή" msgid "Traditional Chinese" msgstr "Κινέζικα ΠαÏαδοσιακά " -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "ΠÏοσπάθεια φόÏτωσης ενός άγνωστου Ï„Ïπου αÏχείο." @@ -5801,7 +5930,8 @@ msgstr "ΠÏοσπάθεια φόÏτωσης ενός άγνωστου Ï„Ïπο msgid "Triggers" msgstr "Σκανδάλες" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:92 +#: Source/Core/Common/Src/SysConf.h:115 msgid "Trying to read from invalid SYSCONF" msgstr "ΠÏοσπάθεια ανάγνωσης από ένα μη έγκυÏο SYSCONF" @@ -5829,8 +5959,8 @@ msgstr "ΤÏπος" msgid "UDP Port:" msgstr "ΠόÏτα UDP:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5853,13 +5983,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:404 @@ -5906,13 +6033,17 @@ msgstr "" "Άγνωστος δείκτης %#08x\n" "Συνέχεια;" +<<<<<<< HEAD <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 ======= >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "Πάνω" @@ -5929,7 +6060,7 @@ msgstr "Κάθετη Θέση Wiimote" msgid "Use EuRGB60 Mode (PAL60)" msgstr "ΧÏήση ΛειτουÏγίας EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 msgid "Use Fullscreen" msgstr "ΧÏήση ΠλήÏους Οθόνης" @@ -5941,7 +6072,7 @@ msgstr "ΧÏήση Hex" msgid "Use Panic Handlers" msgstr "ΧÏήση Οθονών ΠανικοÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5949,31 +6080,27 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "ΧÏησιμοποίηση πολλαπλών νημάτων για την αποκωδικοποίηση υφών.\n" -"ΜποÏεί να βελτιώσει την ταχÏτητα (ειδικά σε CPUs με πεÏισσότεÏους από δÏο " -"πυÏήνες).\n" +"ΜποÏεί να βελτιώσει την ταχÏτητα (ειδικά σε CPUs με πεÏισσότεÏους από δÏο πυÏήνες).\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 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:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "ΕÏγαλεία" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "Κάθετος ΣυγχÏονισμός" @@ -5997,8 +6124,7 @@ msgstr "Αναλυτικότητα" msgid "Video" msgstr "Βίντεο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "Εικονικό" @@ -6020,27 +6146,26 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Αναμονή για την κάθετη ανανέωση της οθόνης ώστε να μειωθεί το σπάσιμο της " -"εικόνας.\n" +"Αναμονή για την κάθετη ανανέωση της οθόνης ώστε να μειωθεί το σπάσιμο της εικόνας.\n" "Μειώνει τις επιδόσεις αν η ταχÏτητα εξομοίωσης είναι μικÏότεÏη από 100%.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "ΠÏοειδοποίηση" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 msgid "Warning - starting DOL in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση DOL σε λάθος λειτουÏγία κονσόλας!" -#: Source/Core/Core/Src/Boot/Boot.cpp:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση ELF σε λάθος λειτουÏγία κονσόλας!" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση ISO σε λάθος λειτουÏγία κονσόλας!" @@ -6051,8 +6176,7 @@ msgid "" "%s\n" "Do you wish to continue?" msgstr "" -"ΠÏοειδοποίηση! Συστήνεται η δημιουÏγία αντιγÏάφου ασφαλείας όλων των αÏχείων " -"στον φάκελο:\n" +"ΠÏοειδοποίηση! Συστήνεται η δημιουÏγία αντιγÏάφου ασφαλείας όλων των αÏχείων στον φάκελο:\n" "%s\n" "Θέλετε να συνεχίσετε;" @@ -6064,8 +6188,7 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" -"ΠÏοειδοποίηση: Αυτό θα αντικαταστήσει όλα τα υπάÏχοντα σημεία αποθήκευσης " -"που υπάÏχουν στον φάκελο:\n" +"ΠÏοειδοποίηση: Αυτό θα αντικαταστήσει όλα τα υπάÏχοντα σημεία αποθήκευσης που υπάÏχουν στον φάκελο:\n" "%s\n" "και έχουν το ίδιο όνομα με αÏχεία στη memcard\n" "Συνέχεια;" @@ -6114,7 +6237,7 @@ msgstr "WaveFileWriter - το αÏχείο δεν είναι ανοιχτό." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "Hack ΕυÏείας Οθόνης" @@ -6138,6 +6261,7 @@ msgstr "Wii NAND Ρίζα:" msgid "Wii Save Import" msgstr "Εισαγωγή Αποθήκευσης Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -6147,6 +6271,9 @@ msgstr "Εισαγωγή Αποθήκευσης Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Wii save files (*.bin)|*.bin" msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -6154,8 +6281,8 @@ msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Αδυναμία ανάγνωσης από αÏχείο" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "Wiimote" @@ -6177,6 +6304,7 @@ msgstr "" "ή πιθανόν να οφείλεται σε χÏόνο αδÏάνειας ή κάποιον άλλο λόγο.\n" "Θέλετε να γίνει άμεση επανασÏνδεση;" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 @@ -6186,6 +6314,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/Main.cpp:609 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Wiimote Connected" msgstr "Συνδεδεμένο Wiimote" @@ -6217,6 +6348,7 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Αναδίπλωση Λέξεων" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6227,6 +6359,9 @@ msgstr "Αναδίπλωση Λέξεων" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. @@ -6294,8 +6429,7 @@ msgstr "ΠÏέπει να εισάγετε ένα έγκυÏο όνομα Ï€Ïο #: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 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 "" @@ -6334,7 +6468,7 @@ msgstr "Άγνωστος Zero code: %08x" msgid "[ waiting ]" msgstr "[ σε αναμονή ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -6350,26 +6484,21 @@ msgstr "" msgid "[Custom]" msgstr "[ΠÏοσαÏμοζόμενο]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 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:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -6412,9 +6541,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:461 msgid "s" @@ -6441,6 +6568,7 @@ msgstr "zNear ΔιόÏθωση: " msgid "| OR" msgstr "| OR" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #~ msgid "Cannot record movies in read-only mode." @@ -6538,3 +6666,5 @@ msgstr "| OR" #~ "Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την δεÏτεÏη γÏηγοÏότεÏη τιμή από " #~ "δεξιά." >>>>>>> Update Greek and Czech translations +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit From 6fef0b9a8ff56dec390307a243eb549a9411d667 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sat, 15 Oct 2011 17:01:51 -0500 Subject: [PATCH 346/381] Updated Spanish translation --- Languages/po/es.po | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Languages/po/es.po b/Languages/po/es.po index 10b8c05209..b16d557823 100644 --- a/Languages/po/es.po +++ b/Languages/po/es.po @@ -12,8 +12,12 @@ msgstr "" "PO-Revision-Date: 2011-12-09 00:28+0100\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" +<<<<<<< HEAD "PO-Revision-Date: 2011-08-11 15:30+0100\n" >>>>>>> Update translation files for recent changes in the code. +======= +"PO-Revision-Date: 2011-10-15 23:23+0100\n" +>>>>>>> Updated Spanish translation "Last-Translator: Petiso Carambanal \n" "Language-Team: DARIO_FF \n" "Language: Spanish\n" @@ -437,9 +441,12 @@ msgstr "Emulación de VBeam Precisa" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Updated Spanish translation msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -681,6 +688,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Sincronización alternativa del Wiimote" ======= @@ -688,6 +696,10 @@ msgstr "Sincronización alternativa del Wiimote" msgid "Alternate Wiimote Timing" msgstr "Wiimote emulado" >>>>>>> Update translation files for recent changes in the code. +======= +msgid "Alternate Wiimote Timing" +msgstr "Sincronización alternativa del Wiimote" +>>>>>>> Updated Spanish translation #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -2867,9 +2879,12 @@ msgstr "Mayor que" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Updated Spanish translation msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2887,9 +2902,14 @@ msgstr "" ======= "Aumenta bastante la calidad de las texturas generadas utilizando los efectos " "de renderización para la textura.\n" +<<<<<<< HEAD "Aumentar la resolución interna va a mejorar el efecto de esta definición.\n" "Diminuye ligeramente el desempenño y probablemente provoca fallos (aunque es " >>>>>>> Update translation files for recent changes in the code. +======= +"Aumentar la resolución interna va a mejorar el efecto de este ajuste.\n" +"Diminuye ligeramente el desempeño y probablemente provoca fallos (aunque es " +>>>>>>> Updated Spanish translation "improbable).\n" "\n" "Si está inseguro, déjelo marcado." From 510450999d74218ad8052387888ca7c39d3957d0 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Mon, 17 Oct 2011 16:36:56 -0500 Subject: [PATCH 347/381] Update Arabic and Japanese translations. --- Languages/po/ar.po | 89 ++++++++++++++++++++++++++++++++++++++++++++-- Languages/po/ja.po | 19 ++++++++-- 2 files changed, 104 insertions(+), 4 deletions(-) diff --git a/Languages/po/ar.po b/Languages/po/ar.po index 322a2c504f..59bf9c9782 100644 --- a/Languages/po/ar.po +++ b/Languages/po/ar.po @@ -13,9 +13,14 @@ msgstr "" "Last-Translator: mansoor\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" +<<<<<<< HEAD "PO-Revision-Date: 2011-07-20 13:33+0300\n" "Last-Translator: \n" >>>>>>> Update translation files for recent changes in the code. +======= +"PO-Revision-Date: 2011-10-16 11:25-0500\n" +"Last-Translator: mansoor\n" +>>>>>>> Update Arabic and Japanese translations. "Language-Team: \n" "Language: \n" "MIME-Version: 1.0\n" @@ -425,9 +430,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -637,6 +645,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "بديل ويموت" ======= @@ -644,6 +653,10 @@ msgstr "بديل ويموت" msgid "Alternate Wiimote Timing" msgstr "محاكاة ويموت" >>>>>>> Update translation files for recent changes in the code. +======= +msgid "Alternate Wiimote Timing" +msgstr "بديل ويموت" +>>>>>>> Update Arabic and Japanese translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -947,11 +960,22 @@ msgstr "إلغاء" msgid "Cannot open %s" msgstr "لا يمكن Ùتح %s" +<<<<<<< HEAD +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 +msgid "Cannot record movies in read-only mode." +msgstr "لا يمكن تسجيل الأÙلام ÙÙŠ وضع للقراءة Ùقط." + +>>>>>>> Update Arabic and Japanese translations. #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "لا يمكن إلغاء تسجيل الأحداث مع الأحداث المعلقة" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +>>>>>>> Update Arabic and Japanese translations. #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -2752,9 +2776,12 @@ msgstr "أكبر من" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -4373,11 +4400,15 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" <<<<<<< HEAD +<<<<<<< HEAD msgstr "EFB Copia a escala" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= msgstr "" +======= +msgstr "EFB Copia a escala" +>>>>>>> Update Arabic and Japanese translations. #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. @@ -5042,6 +5073,7 @@ msgstr "اختبار" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 <<<<<<< HEAD +<<<<<<< HEAD msgid "Texture" msgstr "" @@ -5050,14 +5082,19 @@ msgid "Texture Cache" msgstr "" ======= #, fuzzy +======= +>>>>>>> Update Arabic and Japanese translations. msgid "Texture" -msgstr "Texturesتعطيل " +msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 -#, fuzzy msgid "Texture Cache" +<<<<<<< HEAD msgstr "إزالة التخزين المؤقت" >>>>>>> Update translation files for recent changes in the code. +======= +msgstr "" +>>>>>>> Update Arabic and Japanese translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" @@ -5556,6 +5593,7 @@ msgstr "" "%s\n" "ولها Ù†Ùس اسم المل٠على بطاقة ذاكرة الخاصة بك\n" "تستمر?" +<<<<<<< HEAD #: Source/Core/Core/Src/Movie.cpp:629 #, c-format @@ -5591,6 +5629,8 @@ 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 "" +======= +>>>>>>> Update Arabic and Japanese translations. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -5936,12 +5976,18 @@ msgstr "أو" #~ msgstr "< الوضع الاÙتراضي >" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update Arabic and Japanese translations. #, fuzzy #~ msgid "AOSound" #~ msgstr "&الصوت" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Accurate Texture Cache" #~ msgstr "دقة المظهر السطحي المؤقت" @@ -5980,6 +6026,9 @@ msgstr "أو" #~ "ومن الأÙضل Ù„ تعيين نسبة العرض إلى الارتÙاع لتمتد عند استخدامه." <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Bad gameini filename" #~ msgstr "Nombre de archivo gameini incorrecto" @@ -6007,15 +6056,21 @@ msgstr "أو" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "No se puede abrir %s, no tiene una función" +<<<<<<< HEAD #~ msgid "Cannot record movies in read-only mode." #~ msgstr "لا يمكن تسجيل الأÙلام ÙÙŠ وضع للقراءة Ùقط." +======= +>>>>>>> Update Arabic and Japanese translations. #, fuzzy #~ msgid "Config..." #~ msgstr "إعدادات" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Configuration profile" #~ msgstr "التكوين الشخصي" @@ -6117,6 +6172,9 @@ msgstr "أو" #~ msgstr "CPU Access تمكين" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Enable Copy to EFB" #~ msgstr "Habilitar Copiado al EFB" @@ -6132,8 +6190,11 @@ msgstr "أو" #~ msgid "Enable JIT Dynarec" #~ msgstr "تمكين صÙحات" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Enable OpenCL" #~ msgstr "OpenCL تمكين " @@ -6141,6 +6202,9 @@ msgstr "أو" #~ msgstr "تمكين شاشة التوقÙ" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update Arabic and Japanese translations. #, fuzzy #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" @@ -6214,8 +6278,11 @@ msgstr "أو" #~ msgid "Force Bi/Trilinear Filtering" #~ msgstr "Forzar Filtro Bi/Tri-linear" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Fractional" #~ msgstr "جزئي" @@ -6359,6 +6426,9 @@ msgstr "أو" #~ msgstr "اللازمة لاستعمال الخط القرص اليابانية." <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update Arabic and Japanese translations. #, fuzzy #~ msgid "Run" #~ msgstr "Enter" @@ -6366,8 +6436,11 @@ msgstr "أو" #~ msgid "Running script...\n" #~ msgstr "Ejecutando script...\n" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Scale:" #~ msgstr "النطاق :" @@ -6426,6 +6499,9 @@ msgstr "أو" #~ "وهذا Ù…Ùيد Ùقط لأغراض التصحيح." <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Skies of Arcadia" #~ msgstr "Skies of Arcadia" @@ -6465,8 +6541,11 @@ msgstr "أو" #~ msgid "Specify an audio plugin" #~ msgstr "حدد الخلÙية مل٠Ùيديو" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Start Renderer in Fullscreen" #~ msgstr "بدء ÙÙŠ كمال ملء الشاشة" @@ -6474,6 +6553,9 @@ msgstr "أو" #~ msgstr "بدء التقديم ÙÙŠ إطار وضع ملء الشاشة." <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "The file " #~ msgstr "El archivo " @@ -6487,6 +6569,7 @@ msgstr "أو" #~ msgid "Type %d config not supported in plugin %s" #~ msgstr "Configuración de tipo %d no soportado en el plugin %s" +<<<<<<< HEAD #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -6496,6 +6579,8 @@ msgstr "أو" ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Use FPS For Limiting" #~ msgstr "لحد عدد الاطارات" diff --git a/Languages/po/ja.po b/Languages/po/ja.po index dc9751b1b1..1392815cb3 100644 --- a/Languages/po/ja.po +++ b/Languages/po/ja.po @@ -12,8 +12,12 @@ msgstr "" "PO-Revision-Date: 2011-10-12 20:45+0900\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" +<<<<<<< HEAD "PO-Revision-Date: 2011-08-19 08:37-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"PO-Revision-Date: 2011-10-12 20:45+0900\n" +>>>>>>> Update Arabic and Japanese translations. "Last-Translator: DanbSky\n" "Language-Team: \n" "Language: Japanese\n" @@ -432,9 +436,12 @@ msgstr "Accurate VBeam emulation" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -669,6 +676,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Wii リモコンã®åŒæœŸèª¿æ•´" ======= @@ -676,6 +684,10 @@ msgstr "Wii リモコンã®åŒæœŸèª¿æ•´" msgid "Alternate Wiimote Timing" msgstr "Wii リモコンをエミュレート" >>>>>>> Update translation files for recent changes in the code. +======= +msgid "Alternate Wiimote Timing" +msgstr "Wii リモコンã®åŒæœŸèª¿æ•´" +>>>>>>> Update Arabic and Japanese translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -2834,9 +2846,12 @@ msgstr "より大ãã„" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -5520,8 +5535,8 @@ msgid "" "Unknown pointer %#08x\n" "Continue?" msgstr "" -"ä¸æ˜Žãªãƒã‚¤ãƒ³ã‚¿ %#08x\n" -"続ã‘ã¾ã™ã‹ï¼Ÿ" +"Unknown pointer %#08x\n" +"Continue?" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 From 3e8ca14e967578e15105f712a5bad1cb77b0adc2 Mon Sep 17 00:00:00 2001 From: Pascal Jouy Date: Fri, 28 Oct 2011 23:42:40 +0200 Subject: [PATCH 348/381] Update french translation. --- Languages/po/fr.po | 669 +++++++++++++++++---------------------------- 1 file changed, 247 insertions(+), 422 deletions(-) diff --git a/Languages/po/fr.po b/Languages/po/fr.po index 56cb368da8..891787bfb0 100644 --- a/Languages/po/fr.po +++ b/Languages/po/fr.po @@ -12,8 +12,12 @@ msgstr "" "PO-Revision-Date: 2011-10-28 23:40+0100\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" +<<<<<<< HEAD "PO-Revision-Date: 2011-08-10 17:42+0100\n" >>>>>>> Update translation files for recent changes in the code. +======= +"PO-Revision-Date: 2011-10-28 23:40+0100\n" +>>>>>>> Update french translation. "Last-Translator: Pascal\n" "Language-Team: \n" "Language: French\n" @@ -47,8 +51,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/MemcardManager.cpp:193 #, c-format @@ -103,8 +106,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 @@ -376,13 +378,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" @@ -396,13 +396,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 !!" @@ -435,19 +432,20 @@ msgstr "Emulation fidèle VBeam" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update french translation. 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." @@ -473,51 +471,33 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, 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:756 #, 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:549 #, 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:609 #, 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:803 #, 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:684 #, c-format -msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "" -"Erreur Action Replay : Master Code et Write To CCXXXXXX non implémentés (%s)" +msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgstr "Erreur Action Replay : Master Code et Write To CCXXXXXX non implémentés (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -585,16 +565,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." @@ -603,24 +581,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:759 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:520 msgid "Advanced" @@ -666,18 +641,17 @@ msgstr "Tous les fichiers (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 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, 6 et 7 dans la fenêtre d'émulation.\n" "\n" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Délai alternatif de communication avec la Wiimote" ======= @@ -685,6 +659,10 @@ msgstr "Délai alternatif de communication avec la Wiimote" msgid "Alternate Wiimote Timing" msgstr "Wiimote émulée" >>>>>>> Update translation files for recent changes in the code. +======= +msgid "Alternate Wiimote Timing" +msgstr "Délai alternatif de communication avec la Wiimote" +>>>>>>> Update french translation. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -716,8 +694,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)." @@ -740,9 +717,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 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 !" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -807,10 +782,8 @@ msgid "" "\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" +"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." @@ -871,9 +844,7 @@ msgstr "Basse" #: Source/Core/Core/Src/HW/GCMemcard.cpp:188 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:628 msgid "Blocks" @@ -958,17 +929,12 @@ msgstr "Cache des listes d'affichage" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 "" -"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" +"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." @@ -981,10 +947,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." @@ -1002,8 +966,7 @@ msgstr "Impossible d'ouvrir %s" #: Source/Core/Core/Src/CoreTiming.cpp:122 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:1020 #, c-format @@ -1027,8 +990,7 @@ msgstr "" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858 #, 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:1872 #, c-format @@ -1040,8 +1002,7 @@ msgstr "Impossible de trouver la Wiimote par le gestionnaire de connexion %02x" #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 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:49 msgid "Caps Lock" @@ -1145,6 +1106,7 @@ msgstr "Choisir une carte mémoire :" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " @@ -1152,6 +1114,10 @@ msgid "" 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)" +>>>>>>> Update french translation. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 @@ -1178,12 +1144,8 @@ msgid "Clear failed." msgstr "Echec de l'éffacement" #: 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:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 @@ -1345,15 +1307,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 @@ -1370,23 +1325,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:119 #, 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:1059 msgid "Couldn't find open command for extension 'ini'!" @@ -1427,11 +1378,16 @@ msgstr "Créé par KDE-Look.org" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. 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 Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +msgstr "Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +>>>>>>> Update french translation. #: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" @@ -1611,12 +1567,8 @@ msgstr "Détecter" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -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:131 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 @@ -1672,30 +1624,24 @@ msgstr "Désactiver les textures" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 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:95 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." @@ -1799,6 +1745,7 @@ msgstr "Dolphin dans &Google Code" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " @@ -1806,11 +1753,16 @@ msgid "" 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..." +>>>>>>> Update french translation. <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " @@ -1818,6 +1770,10 @@ msgid "" 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..." +>>>>>>> Update french translation. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -1863,8 +1819,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." @@ -1910,16 +1865,8 @@ msgstr "Copies de l'EFB" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, 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:162 msgid "EUROPE" @@ -1969,31 +1916,24 @@ msgstr "Thread d'émulation déjà en cours d'exécution" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 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:110 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:33 @@ -2010,15 +1950,13 @@ msgstr "Activer" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 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" @@ -2113,19 +2051,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:317 -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:799 msgid "Enable pages" @@ -2138,21 +2071,18 @@ 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:79 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." @@ -2160,6 +2090,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " @@ -2167,16 +2098,14 @@ msgid "" 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." +>>>>>>> Update french translation. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 -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:337 msgid "Enables Custom Projection Hack" @@ -2195,12 +2124,8 @@ msgstr "" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -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:117 msgid "" @@ -2273,9 +2198,7 @@ msgstr "Erreur" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 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:180 #, c-format @@ -2287,6 +2210,7 @@ msgstr "" #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format +<<<<<<< HEAD msgid "" ======= >>>>>>> Update translation files for recent changes in the code. @@ -2295,6 +2219,10 @@ msgid "" 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." +>>>>>>> Update french translation. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2307,8 +2235,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:58 msgid "Execute" @@ -2463,8 +2390,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 @@ -2486,8 +2412,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:144 @@ -2657,8 +2582,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." @@ -2669,8 +2593,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." @@ -2678,12 +2601,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 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:76 msgid "" @@ -2866,8 +2787,7 @@ msgstr "Allemand" #: Source/Core/Core/Src/ActionReplay.cpp:451 #, 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:443 msgid "Graphics" @@ -2883,18 +2803,20 @@ msgstr "Plus grand que" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update french translation. 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 "" +<<<<<<< HEAD "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 " @@ -2904,6 +2826,11 @@ msgstr "" "peu probable).\n" ======= >>>>>>> Update translation files for recent changes in the code. +======= +"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" +>>>>>>> Update french translation. "\n" "Dans le doute, cochez cette case." @@ -2962,10 +2889,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" @@ -2983,8 +2908,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." @@ -3022,20 +2946,16 @@ msgstr "Wiimote hybride" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 #, 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:795 #, 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" @@ -3082,16 +3002,14 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -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)" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " @@ -3100,6 +3018,10 @@ 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), vous devez aussi désactiver " "le contrôle audio dans le DSP pour que cela fonctionne." +======= +msgid "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." +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), vous devez aussi désactiver le contrôle audio dans le DSP pour que cela fonctionne." +>>>>>>> Update french translation. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" @@ -3108,28 +3030,24 @@ msgstr "Ignorer les changements de formats" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 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:93 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." @@ -3163,13 +3081,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 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." @@ -3179,8 +3095,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Améliore les performances, mais peut faire disparaître l'éclairage dans la " -"plupart des jeux.\n" +"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." @@ -3230,11 +3145,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." <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3517,9 +3429,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/Main.cpp:134 msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" @@ -3628,12 +3538,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 @@ -3654,9 +3560,7 @@ msgstr "" #: Source/Core/Core/Src/HW/GCMemcard.cpp:126 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:47 msgid "Menu" @@ -3686,14 +3590,11 @@ msgstr "Modif." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 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." @@ -3733,12 +3634,8 @@ msgid "Multiply" msgstr "Multiplier" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -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/WXInputBase.cpp:126 msgid "NP Add" @@ -4044,8 +3941,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" @@ -4055,12 +3951,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:485 msgid "Output" @@ -4369,8 +4261,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." @@ -4546,9 +4437,7 @@ msgstr "Sauvegarder le fichier GCM/ISO décompressé" #: Source/Core/Core/Src/Movie.cpp:585 #, 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:401 msgid "Scaled EFB Copy" @@ -4583,8 +4472,10 @@ msgstr "Fitre de recherche" msgid "Search Subfolders" msgstr "Chercher dans sous-dossiers" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:104 +#: Source/Core/Common/Src/SysConf.h:127 +#: Source/Core/Common/Src/SysConf.h:147 +#: Source/Core/Common/Src/SysConf.h:168 #, c-format msgid "Section %s not found in SYSCONF" msgstr "La section %s n'a pas été trouvée dans SYSCONF" @@ -4671,8 +4562,7 @@ 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." @@ -4684,32 +4574,27 @@ msgstr "Police sélectionnée" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 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:73 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." @@ -4734,12 +4619,17 @@ msgstr "Serbe" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. 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" +>>>>>>> Update french translation. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" @@ -4757,9 +4647,7 @@ msgstr "Définir comme carte mémoire par défaut : %c" #: Source/Core/Core/Src/ActionReplay.cpp:462 #, 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/ISOProperties.cpp:338 msgid "Settings..." @@ -4880,13 +4768,10 @@ msgstr "Demande confirmation avant d'arrêter le jeu." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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 "" "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:812 msgid "Show first block" @@ -4910,13 +4795,11 @@ msgstr "Afficher le titre de sauvegarde" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 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." @@ -4986,13 +4869,11 @@ msgid "" msgstr "" ======= 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." @@ -5000,17 +4881,19 @@ 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 "" +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. "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" +>>>>>>> Update french translation. "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." @@ -5038,16 +4921,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:622 msgid "Sound Settings" @@ -5085,21 +4965,13 @@ msgstr "Volume du haut-parleur :" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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." @@ -5169,14 +5041,12 @@ msgstr "Arrêter" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 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." @@ -5294,12 +5164,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 @@ -5325,28 +5191,21 @@ msgstr "Le code AR décrypté ne contient aucune ligne." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 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 second-fastest value from the right." 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 deuxième position depuis la droite." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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:353 -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!" @@ -5382,12 +5241,8 @@ 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:467 -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:304 msgid "" @@ -5398,12 +5253,8 @@ msgstr "" "Indéterminé signifie que les paramètres de Dolphin sont appliqués." #: Source/Core/Core/Src/ActionReplay.cpp:356 -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:513 msgid "This could cause slow down in Wii Menu and some games." @@ -5412,19 +5263,12 @@ msgstr "Ceci peut ralentir le Menu Wii et quelques jeux." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 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." @@ -5437,12 +5281,10 @@ msgid "" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" "Ceci est utiliser pour contrôler la vitesse du jeu par la constance du son.\n" -"Désactiver cette option peut causer une vitesse anormale du jeu, par exemple " -"trop rapide.\n" +"Désactiver cette option peut causer une vitesse anormale du jeu, par exemple trop rapide.\n" "Mais il se peut parfois qu'activer cette option produise un bruit constant.\n" "\n" -"Raccourci clavier : Appuyer pour instantanément désactiver cette " -"option." +"Raccourci clavier : Appuyer pour instantanément désactiver cette option." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." @@ -5450,21 +5292,15 @@ msgstr "Ceci est utilisé pour lire les pistes de musique, comme les BGM." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 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:283 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 @@ -5519,7 +5355,8 @@ msgstr "Echec de chargement d'un type de fichier inconnu." msgid "Triggers" msgstr "Déclencheurs" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:92 +#: Source/Core/Common/Src/SysConf.h:115 msgid "Trying to read from invalid SYSCONF" msgstr "Essai de lecture d'un fichier SYSCONF non valide" @@ -5571,12 +5408,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:404 @@ -5611,9 +5446,13 @@ msgstr "Reception d'un message inconnu avec l'ID : %d" #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" <<<<<<< HEAD +<<<<<<< HEAD ======= 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 !" +>>>>>>> Update french translation. #: Source/Core/Core/Src/HW/Memmap.cpp:633 #, c-format @@ -5662,23 +5501,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:127 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." @@ -5762,8 +5597,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 ?" @@ -5775,8 +5609,7 @@ 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 ?" @@ -5969,8 +5802,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." @@ -6052,19 +5884,14 @@ msgstr "[Personnalisé]" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 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." @@ -6111,9 +5938,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:461 msgid "s" From 1880eb8e9f31771dc1f5465ae0ee47fe510de4e8 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Mon, 19 Dec 2011 09:10:17 -0600 Subject: [PATCH 349/381] Update Czeck translation. --- Languages/po/cs.po | 583 ++++++++++++++------------------------------- 1 file changed, 184 insertions(+), 399 deletions(-) diff --git a/Languages/po/cs.po b/Languages/po/cs.po index 00f3a3c290..728e2493b1 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -11,6 +11,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +<<<<<<< HEAD "PO-Revision-Date: 2011-10-15 14:50+0100\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -23,6 +24,9 @@ msgstr "" >>>>>>> The actual update of the Greek and Czech translations. The last commit "PO-Revision-Date: 2011-10-15 14:50+0100\n" >>>>>>> Update Greek and Czech translations +======= +"PO-Revision-Date: 2011-12-19 07:39+0100\n" +>>>>>>> Update Czeck translation. "Last-Translator: ZbynÄ›k Schwarz \n" "Language-Team: \n" "Language: Czech\n" @@ -111,8 +115,7 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" "%s nelze naÄíst jako paměťovou kartu\n" -"soubor není dostateÄnÄ› velký, aby byl platným souborem paměťové karty (0x%x " -"bajtů)" +"soubor není dostateÄnÄ› velký, aby byl platným souborem paměťové karty (0x%x bajtů)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -384,13 +387,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" @@ -400,13 +401,11 @@ msgid "" msgstr "" "POZOR:\n" "\n" -"Netplay bude v souÄasnosti správnÄ› fungovat pouze pÅ™i použití následujících " -"nastavení:\n" +"Netplay bude v souÄasnosti správnÄ› fungovat pouze pÅ™i použití následujících nastavení:\n" " - Dvojité Jádro [VYPNUTO]\n" " - PÅ™iÅ¡krcení Zvuku [VYPNUTO]\n" " - DSP-HLE s \"Nulovým Zvukem\" nebo DSP-LLE\n" -" - RuÄnÄ› nastavit pÅ™esné Äíslo ovladaÄů, které budou použity na [Standardní " -"OvladaÄ]\n" +" - RuÄnÄ› nastavit pÅ™esné Äíslo ovladaÄů, které budou použity na [Standardní OvladaÄ]\n" "\n" "VÅ¡ichni hráÄi by mÄ›li používat stejné nastavení i verzi Dolphina.\n" "Zakázat vÅ¡echny paměťové karty nebo je poslat hráÄům pÅ™ed spuÅ¡tÄ›ním.\n" @@ -455,8 +454,7 @@ msgstr "Precizní emulace VBeam" >>>>>>> The actual update of the Greek and Czech translations. The last commit 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 "" @@ -487,38 +485,23 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" -msgstr "" -"Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Kódu PÅ™idat " -"(%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +msgstr "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Kódu PÅ™idat (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:756 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " -"(%s)" -msgstr "" -"Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Naplnit a " -"Sesunout (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)" +msgstr "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Naplnit a Sesunout (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:549 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " -"Fill (%s)" -msgstr "" -"Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Ram Zápisu A " -"NaplnÄ›ní (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)" +msgstr "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Ram Zápisu A NaplnÄ›ní (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:609 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Write To " -"Pointer (%s)" -msgstr "" -"Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Zápisu Do " -"Ukazatele (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Write To Pointer (%s)" +msgstr "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Zápisu Do Ukazatele (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:803 #, c-format @@ -527,10 +510,8 @@ msgstr "Chyba Action Replay: Neplatná hodnota (%08x) v Kopii PamÄ›ti (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:684 #, c-format -msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "" -"Chyba Action Replay: Hlavní Kód a Zápis do CCXXXXXX nejsou zavedeny (%s)" +msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgstr "Chyba Action Replay: Hlavní Kód a Zápis do CCXXXXXX nejsou zavedeny (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -610,16 +591,14 @@ msgstr "Adresa :" 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 "" "PÅ™idá zadanou hodnotu do Parametru ZFar.\n" "Dva způsoby jak vyjádÅ™it hodnoty v plovoucí desetinné Äárce.\n" -"Příklad: přímé zadání \"200\" nebo \"0.0002\" má stejný úÄinek, získaná " -"hodnota bude \"0.0002\".\n" +"Příklad: přímé zadání \"200\" nebo \"0.0002\" má stejný úÄinek, získaná hodnota bude \"0.0002\".\n" "Hodnoty: (0->+/-Celé Äíslo) nebo (0->+/-PDÄŒ[6 desetinných míst])\n" "\n" "Poznámka: Zkontrolujte Konzoli/Okno protokolu pro získané hodnoty" @@ -628,16 +607,14 @@ 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 "" "PÅ™idá zadanou hodnotu do Parametru zNear.\n" "Dva způsoby jak vyjádÅ™it hodnoty v plovoucí desetinné Äárce.\n" -"Příklad: přímé zadání \"200\" nebo \"0.0002\" má stejný úÄinek, získaná " -"hodnota bude \"0.0002\".\n" +"Příklad: přímé zadání \"200\" nebo \"0.0002\" má stejný úÄinek, získaná hodnota bude \"0.0002\".\n" "Hodnoty: (0->+/-Celé Äíslo) nebo (0->+/-PDÄŒ[6 desetinných míst])\n" "\n" "Poznámka: Zkontrolujte Konzoli/Okno protokolu pro získané hodnoty\"" @@ -700,13 +677,11 @@ msgstr "VÅ¡echny soubory (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 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 " -"uvnitÅ™ okna emulace.\n" +"Umožní pÅ™epínání jistých možností pomocí horkých kláves 3, 4, 5, 6 a 7 uvnitÅ™ okna emulace.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -1033,15 +1008,12 @@ msgstr "Ukládat pÅ™edvyt. obj. do vyr. pam." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 "" "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" +"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é." @@ -1054,8 +1026,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "VypoÄítat osvÄ›tlení 3D grafiky podle pixelu, radÄ›ji než podle bodu.\n" -"Sníží rychlost emulace o nÄ›jaké procento (záleží na VaÅ¡em grafikém " -"procesoru).\n" +"Sníží rychlost emulace o nÄ›jaké procento (záleží na VaÅ¡em grafikém procesoru).\n" "Toto je vÄ›tÅ¡inou bezpeÄné vylepÅ¡ení, ale může nÄ›kdy způsobit problémy.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -1211,12 +1182,8 @@ msgid "Choose a memory card:" msgstr "Zvolte paměťovou kartu:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 -msgid "" -"Choose file to use as apploader: (applies to discs constructed from " -"directories only)" -msgstr "" -"Zvolte soubor, který má být použit jako zavadÄ›Ä aplikace: (platí pouze pro " -"disky sestavené z adresářů)" +msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" +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:768 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 @@ -1243,11 +1210,8 @@ msgid "Clear failed." msgstr "VyÄiÅ¡tÄ›ní selhalo" #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "" -"Client disconnect while game is running!! NetPlay is disabled. You must " -"manually stop the game." -msgstr "" -"Klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru musíte ukonÄit ruÄnÄ›." +msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." +msgstr "Klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru musíte ukonÄit ruÄnÄ›." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 @@ -1425,14 +1389,8 @@ msgstr "Nezle spustit 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." -msgstr "" -"\"%s\" nelze Äíst. BuÄ není v mechanice žádný disk, nebo toto není záloha GC/" -"Wii. Nezapomeňte, že původní disky GameCube a Wii nepÅ™eÄte vÄ›tÅ¡ina PC DVD " -"mechanik." +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\" nelze Äíst. BuÄ není v mechanice žádný disk, nebo toto není záloha GC/Wii. Nezapomeňte, že původní disky GameCube a Wii nepÅ™eÄte vÄ›tÅ¡ina PC DVD mechanik." #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format @@ -1457,13 +1415,11 @@ msgstr "" 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 "" "Nelze zapsat soubor paměťové karty %s.\n" "\n" -"SpouÅ¡títe Dolphina z CD/DVD, nebo je snad soubor s uložením chránÄ›ný proti " -"zápisu?" +"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:1059 msgid "Couldn't find open command for extension 'ini'!" @@ -1501,10 +1457,8 @@ msgid "Created by KDE-Look.org" msgstr "VytvoÅ™il KDE-look.org" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 -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 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 msgid "Created by VistaIcons.com" @@ -1694,12 +1648,8 @@ msgstr "Zjistit" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -msgid "" -"Detected attempt to read more data from the DVD than fit inside the out " -"buffer. Clamp." -msgstr "" -"ZjiÅ¡tÄ›n pokus o pÅ™eÄtení více dat z DVD, než se vejde do výstupní pamÄ›ti. " -"Zásek." +msgid "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp." +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 @@ -1755,30 +1705,24 @@ msgstr "Zakázat Textury" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 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 "" "Zakázat jakoukoli emulaci XFB.\n" -"Velmi zrychluje emulaci, ale způsobuje hodnÄ› chyb v mnoha hrách, které na " -"nich závisejí (zvláštÄ› po domácku vyrobené aplikace).\n" +"Velmi zrychluje emulaci, ale způsobuje hodnÄ› chyb v mnoha hrách, které na nich závisejí (zvláštÄ› po domácku vyrobené aplikace).\n" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 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 "" "Zakázat emulaci EFB kopií.\n" -"Tyto jsou Äasto používány pro efekty následného zpracování nebo vykreslení " -"do textur, takže když toto zaÅ¡krtnete, dostanete velké zrychlení, ale toto " -"také skoro vždy způsobuje problémy.\n" +"Tyto jsou Äasto používány pro efekty následného zpracování nebo vykreslení do textur, takže když toto zaÅ¡krtnete, dostanete velké zrychlení, ale toto také skoro vždy způsobuje problémy.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -1903,20 +1847,12 @@ msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 -msgid "" -"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " -"files..." -msgstr "" -"Dolphin nemohl nalézt žádná GX/Wii ISO. KliknÄ›te zde dvakrát k prohledání " -"souborů..." +msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." +msgstr "Dolphin nemohl nalézt žádná GX/Wii ISO. KliknÄ›te zde dvakrát k prohledání souborů..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 -msgid "" -"Dolphin is currently set to hide all games. Doubleclick here to show all " -"games..." -msgstr "" -"Dolphin je v souÄasnosti nastaven na skrytí vÅ¡ech her. KliknÄ›te zde dvakrát " -"pro zobrazení vÅ¡ech her..." +msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." +msgstr "Dolphin je v souÄasnosti nastaven na skrytí vÅ¡ech her. KliknÄ›te zde dvakrát pro zobrazení vÅ¡ech her..." #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -2020,15 +1956,8 @@ msgstr "EFB Kopie" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, 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 "" -"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Ä." +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 "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Ä." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 msgid "EUROPE" @@ -2078,30 +2007,24 @@ msgstr "Vlákno Emulace již běží" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 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 "" "PÅ™esnÄ› Emulovat XFB.\n" -"Velmi zpomaluje emulaci a brání vykreslování ve vysokém rozliÅ¡ení, ale je " -"nutná k řádné emulaci jistého poÄtu her.\n" +"Velmi zpomaluje emulaci a brání vykreslování ve vysokém rozliÅ¡ení, ale je nutná k řádné emulaci jistého poÄtu her.\n" "\n" "Pokud si nejste jisti, zaÅ¡krtnÄ›te místo tohoto virtuální emulaci XFB." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 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 "" "Emulovat XFB pomocí objektů textury grafického procesoru.\n" -"Spraví mnoho her, které nefungují bez emulace EFB, aniž by byla tak pomalá " -"jako opravdová emulace EFB. NicménÄ› stále může selhat v mnoha jiných hrách " -"(zvláštÄ› po domácku vyrobené aplikace).\n" +"Spraví mnoho her, které nefungují bez emulace EFB, aniž by byla tak pomalá jako opravdová emulace EFB. NicménÄ› stále může selhat v mnoha jiných hrách (zvláštÄ› po domácku vyrobené aplikace).\n" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." @@ -2119,15 +2042,13 @@ msgstr "Povolit" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 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 "" -"Zapnout 3D efekty pomocí stereoskopie použitím technologie Nvidia 3D Vision, " -"pokud je podporována Vaším grafickým procesorem.\n" +"Zapnout 3D efekty pomocí stereoskopie použitím technologie Nvidia 3D Vision, pokud je podporována Vaším grafickým procesorem.\n" "Může způsobovat problémy.\n" "Pro fungování vyžaduje režim celé obrazovky.\n" "\n" @@ -2154,7 +2075,7 @@ msgstr "Zapnout SluÄování Bloků" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" -msgstr "" +msgstr "Povolit výpoÄet ohraniÄujícího rámeÄku" ======= >>>>>>> Update translation files for recent changes in the code. @@ -2237,12 +2158,8 @@ msgstr "" "Pokud si nejste jisti, zvolte 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -msgid "" -"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " -"Compatible)" -msgstr "" -"Zapnout rychlý přístup k disku. NÄ›které hry to potÅ™ebují. (ZAPNUTO = rychlé, " -"VYPNUTO = Kompatibilní)" +msgid "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)" +msgstr "Zapnout rychlý přístup k disku. NÄ›které hry to potÅ™ebují. (ZAPNUTO = rychlé, VYPNUTO = Kompatibilní)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Enable pages" @@ -2255,41 +2172,28 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Toto povolte, pokud chcete, aby celá obrazovka byla použita pro " -"vykreslování.\n" +"Toto povolte, pokud chcete, aby celá obrazovka byla použita pro vykreslování.\n" "Pokud je toto zakázáno, bude místo toho vytvoÅ™eno vykreslovací okno.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 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 "" -"Toto zapnÄ›te, pokud chcete použít hlavní okno Dolphin pro vykreslování " -"radÄ›ji, než oddÄ›lené vykreslovací okno.\n" +"Toto zapnÄ›te, pokud chcete použít hlavní okno Dolphin pro vykreslování radÄ›ji, než oddÄ›lené vykreslovací okno.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 -msgid "" -"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " -"ANY other game." -msgstr "" -"Povolte toto pro zrychlení The Legend of Zelda: Twilight Princess. Zakažte " -"pro VÅ ECHNY ostatní hry." +msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." +msgstr "Povolte toto pro zrychlení The Legend of Zelda: Twilight Princess. Zakažte pro VÅ ECHNY ostatní hry." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 -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 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:337 msgid "Enables Custom Projection Hack" @@ -2308,12 +2212,8 @@ msgstr "" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -msgid "" -"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " -"OFF = Fast)" -msgstr "" -"Povolí Jednotku Správy PamÄ›ti, potÅ™ebnou v nÄ›jakých hrách. (ZAPNUTO = " -"Kompatibilní, VYPNUTO = Rychlé)" +msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" +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:117 msgid "" @@ -2391,6 +2291,8 @@ msgid "" "Error in PlayWiimote. %u != %u, byte %d.\n" "Sorry, Wii recording is temporarily broken." msgstr "" +"Chyba v PlayWiimote. %u != %u, bajt %d.\n" +"Je nám líto, nahrávání Wii je doÄasnÄ› nefunkÄní." ======= ======= @@ -2416,24 +2318,17 @@ msgstr "Chyba" #: Source/Core/DolphinWX/Src/Main.cpp:346 >>>>>>> The actual update of the Greek and Czech translations. The last commit 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." +msgstr "Chyba pÅ™i nahrávání zvoleného jazyka. Vracím se na výchozí jazyk systému." #: Source/Core/Common/Src/ChunkFile.h:180 #, c-format -msgid "" -"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " -"Aborting savestate load..." -msgstr "" +msgid "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). Aborting savestate load..." +msgstr "Chyba: Po \"%s\", nalezeno %d (0x%X) místo znaÄky uložení %d (0x%X). UkonÄuji naÄtení uloženého stavu..." #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format -msgid "" -"Error: Trying to access %s fonts but they are not loaded. Games may not show " -"fonts correctly, or crash." -msgstr "" -"Chyba: Pokus o přístup k písmům %s, ale ty nejsou naÄtena. Hry nemusí " -"zobrazit písma správnÄ›, nebo se můžou zhroutit" +msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." +msgstr "Chyba: Pokus o přístup k písmům %s, ale ty nejsou naÄtena. Hry nemusí zobrazit písma správnÄ›, nebo se můžou zhroutit" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2598,8 +2493,7 @@ msgstr "" "Nelze naÄíst ROM DSP:\t%s\n" "\n" "Tento soubor je vyžadován pÅ™i použití DSP LLE.\n" -"Není distribuován s Dolphinem, protože obsahuje data chránÄ›ná autorským " -"právem.\n" +"Není distribuován s Dolphinem, protože obsahuje data chránÄ›ná autorským právem.\n" "Použijte DSPSpy k výpisu soubor z Vaší skuteÄné konzole.\n" "\n" "Můžete použít jádro DSP HLE, které nevyžaduje výpisy ROM.\n" @@ -2813,12 +2707,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 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 "" "Donutí použít režim NTSC-J pro použití Japonského písma ROMu.\n" -"Pokud není zaÅ¡krtnuto, Dolphin standardnÄ› pÅ™ejde na NTSC-U a automaticky " -"zapne toto nastavení pÅ™i hraní Japonských her." +"Pokud není zaÅ¡krtnuto, Dolphin standardnÄ› pÅ™ejde na NTSC-U a automaticky zapne toto nastavení pÅ™i hraní Japonských her." #: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" @@ -2916,9 +2808,8 @@ msgid "GCI File(*.gci)" msgstr "Soubor GCI(*.gci)" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 -#, fuzzy msgid "GCMic Configuration" -msgstr "Nastavení Záznamu" +msgstr "Nastavení GCMic" #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" @@ -3075,16 +2966,13 @@ msgstr "VÄ›tší než" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 >>>>>>> The actual update of the Greek and Czech translations. The last commit 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 "" -"Velmi zvýší kvalitu vytvářených textur použitím efektů vykreslení do " -"textury.\n" +"Velmi zvýší kvalitu vytvářených textur použitím efektů vykreslení do textury.\n" "Zvýšení vnitÅ™ního rozliÅ¡ení zlepší úÄinnek tohoto nastavení.\n" "TroÅ¡ku sníží výkon a možná způsobí problémy (i když to je nepravdÄ›podobné).\n" "\n" @@ -3217,13 +3105,11 @@ msgstr "IOCTL_ES_GETVIEWS: Pokus o získání dat z neznámého lístku: %08x/%0 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 #, 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: Hra se pokusila znovu naÄíst ios nebo název, který není " -"dostupný ve VaÅ¡em nand výpisu\n" +"IOCTL_ES_LAUNCH: Hra se pokusila znovu naÄíst ios nebo název, který není dostupný ve VaÅ¡em nand výpisu\n" "IDNázvu %016llx.\n" "Dolphin se teÄ pravdÄ›podobnÄ› zasekne" @@ -3264,25 +3150,16 @@ msgid "Icon" msgstr "Ikona" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 -msgid "" -"If checked, the bounding box registers will be updated. Used by the Paper " -"Mario games." -msgstr "" +msgid "If checked, the bounding box registers will be updated. Used by the Paper Mario games." +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:315 -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é)" +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:485 -msgid "" -"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." -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é." +msgid "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." +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:432 msgid "Ignore Format Changes" @@ -3291,28 +3168,24 @@ msgstr "Ignorovat ZmÄ›ny Formátu" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 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 "" "Ignorovat vÅ¡echny zmÄ›ny formátu EFB.\n" -"Zlepší výkon v mnoha hrách, bez žádného negativního efektu. PÅ™esto způsobuje " -"grafické chyby v malém poÄtu jiných her.\n" +"Zlepší výkon v mnoha hrách, bez žádného negativního efektu. PÅ™esto způsobuje grafické chyby v malém poÄtu jiných her.\n" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 "" "Ignorovat vÅ¡echny požadavky procesoru pro Ätení a zápis do EFB.\n" -"Zvýší výkon v nÄ›kterých hrách, ale může vypnout nÄ›které funkce související s " -"hraním a grafické efekty.\n" +"Zvýší výkon v nÄ›kterých hrách, ale může vypnout nÄ›které funkce související s hraním a grafické efekty.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -3346,13 +3219,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 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 "" -"Zlepší výkon, ale způsobuje chyby ve vÄ›tÅ¡inÄ› her, které závisejí na správné " -"emulaci mlhy.\n" +"Zlepší výkon, ale způsobuje chyby ve vÄ›tÅ¡inÄ› her, které závisejí na správné emulaci mlhy.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -3412,11 +3283,8 @@ msgid "Install to Wii Menu" msgstr "Instalovat do Wii Menu" #: Source/Core/Core/Src/MemTools.cpp:248 -msgid "" -"InstallExceptionHandler called, but this platform does not yet support it." -msgstr "" -"Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› " -"nepodporuje." +msgid "InstallExceptionHandler called, but this platform does not yet support it." +msgstr "Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› nepodporuje." <<<<<<< HEAD <<<<<<< HEAD @@ -3862,12 +3730,8 @@ msgid "Memory Card" msgstr "Paměťová karta" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "" -"Memory Card Manager WARNING-Make backups before using, should be fixed but " -"could mangle stuff!" -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!" +msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" +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 #, c-format @@ -3918,13 +3782,11 @@ msgstr "Modifikátor" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 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 "" -"ZmÄ›nit textury, aby zobrazovali formát, v kterém jsou zakódovány. Ve vÄ›tÅ¡inÄ› " -"případů vyžaduje resetovaní emulace.\n" +"ZmÄ›nit textury, aby zobrazovali formát, v kterém jsou zakódovány. Ve vÄ›tÅ¡inÄ› případů vyžaduje resetovaní emulace.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -3964,12 +3826,8 @@ msgid "Multiply" msgstr "Násobit" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -msgid "" -"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " -"effect on emulated wiimotes." -msgstr "" -"Ztlumí reproduktor Wiimote. Spravuje náhodná odpojování u opravdových " -"Wiimote. Žádný efekt na emulovaná Wiimote." +msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." +msgstr "Ztlumí reproduktor Wiimote. Spravuje náhodná odpojování u opravdových Wiimote. Žádný efekt na emulovaná Wiimote." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:126 msgid "NP Add" @@ -4308,11 +4166,8 @@ msgid "Other" msgstr "Jiné" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "" -"Other client disconnected while game is running!! NetPlay is disabled. You " -"manually stop the game." -msgstr "" -"Jiný klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru ukonÄete ruÄnÄ›." +msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." +msgstr "Jiný klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru ukonÄete ruÄnÄ›." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 msgid "Output" @@ -4509,17 +4364,17 @@ msgstr "Efekt Následného Zpracování:" #: Source/Core/Core/Src/Movie.cpp:735 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" -msgstr "" +msgstr "PÅ™edÄasný konec filmu v PlayController. %u + 8 > %u" #: Source/Core/Core/Src/Movie.cpp:829 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" -msgstr "" +msgstr "PÅ™edÄasný konec filmu v PlayWiimote. %u + %d > %u" #: Source/Core/Core/Src/Movie.cpp:806 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" -msgstr "" +msgstr "PÅ™edÄasný konec filmu v PlayWiimote. %u > %u" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " @@ -4904,8 +4759,10 @@ msgstr "Hledat Filtr" msgid "Search Subfolders" msgstr "Hledat Podadresáře" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:104 +#: Source/Core/Common/Src/SysConf.h:127 +#: Source/Core/Common/Src/SysConf.h:147 +#: Source/Core/Common/Src/SysConf.h:168 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Sekce %s nebyla v SYSCONF nalezena" @@ -5026,32 +4883,27 @@ msgstr "Vybraný typ písma" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 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 "" "Vybere rozliÅ¡ení obrazovky použité v režimu celé obrazovky.\n" -"To by mÄ›lo být vždycky vÄ›tší než nebo rovno vnitÅ™nímu rozliÅ¡ení. Dopad na " -"výkon je zanedbatelný.\n" +"To by mÄ›lo být vždycky vÄ›tší než nebo rovno vnitÅ™nímu rozliÅ¡ení. Dopad na výkon je zanedbatelný.\n" "\n" "Pokud si nejste jisti, použijte VaÅ¡e rozliÅ¡ení obrazovky.\n" -"Pokud si stále nejste jisti, použijte takové nejvyšší rozliÅ¡ení, které Vám " -"funguje." +"Pokud si stále nejste jisti, použijte takové nejvyšší rozliÅ¡ení, které Vám funguje." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 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 "" "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" +"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" "\n" "Pokud si nejste jisti, použijte Direct3D 9" @@ -5073,11 +4925,8 @@ msgid "Serbian" msgstr "SrbÅ¡tina" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 -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" +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 msgid "Set" @@ -5216,12 +5065,10 @@ msgstr "Zobrazí rámeÄek s potvrzením pÅ™ed zastavením hry." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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 "" "Zobrazit rámeÄek se zprávou, pÅ™i zjiÅ¡tÄ›ní potenciálnÄ› závažné chyby.\n" -"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í." +"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:812 msgid "Show first block" @@ -5245,13 +5092,11 @@ msgstr "Zobrazit název uložení" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 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 "" -"Zobrazí poÄet snímků vykreslených za sekundu jako měřítko rychlosti " -"emulace.\n" +"Zobrazí poÄet snímků vykreslených za sekundu jako měřítko rychlosti emulace.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -5299,13 +5144,11 @@ msgstr "PÅ™eskoÄit EFB Přístup z Procesoru" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 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 "" -"PÅ™eskoÄit průchod cílové průhlednosti používaný ve vÄ›tÅ¡inÄ› her pro různé " -"grafické efekty.\n" +"PÅ™eskoÄit průchod cílové průhlednosti používaný ve vÄ›tÅ¡inÄ› her pro různé grafické efekty.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -5313,15 +5156,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 "" "Lehce zrychlí kopie EFB do RAM obÄ›továním pÅ™esnosti emulace.\n" "NÄ›kdy také zvýší kvalitu obrazu.\n" -"Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit pÅ™esnost textury, " -"nebo tuto možnost vypnout.\n" +"Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit pÅ™esnost textury, nebo tuto možnost vypnout.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -5349,16 +5190,13 @@ msgstr "Softwarový VykreslovaÄ" #: 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 "" -"Softwarové vykreslování je řádovÄ› pomalejší, než pÅ™i použití ostatních " -"backendů.\n" +"Softwarové vykreslování je řádovÄ› pomalejší, než pÅ™i použití ostatních backendů.\n" "Je užiteÄné pouze pro úÄely ladÄ›ní.\n" -"Opravdu chcete zapnout softwarové vykreslování? Pokud si nejste jisti, " -"zvolte 'Ne'." +"Opravdu chcete zapnout softwarové vykreslování? Pokud si nejste jisti, zvolte 'Ne'." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" @@ -5408,21 +5246,13 @@ msgstr "Hlasitost Reproduktoru:" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 "" -"UrÄuje rozliÅ¡ení, v kterém bude vykresleno. Vysoké rozliÅ¡ení vlemi zvýší " -"kvalitu obrazu, ale je také o dost nároÄnÄ›jší na výkon a může způsobovat v " -"nÄ›kterých hrách chyby.\n" -"\"Násobek 640x528\" je o trochu pomalejší než \"Velikost Okna\", ale také " -"nezpůsobuje tolik problémů. ObecnÄ› Å™eÄeno, Äím nižší je vnitÅ™ní rozliÅ¡ení, " -"tím lepší výkon bude.\n" +"UrÄuje rozliÅ¡ení, v kterém bude vykresleno. Vysoké rozliÅ¡ení vlemi zvýší kvalitu obrazu, ale je také o dost nároÄnÄ›jší na výkon a může způsobovat v nÄ›kterých hrách chyby.\n" +"\"Násobek 640x528\" je o trochu pomalejší než \"Velikost Okna\", ale také nezpůsobuje tolik problémů. ObecnÄ› Å™eÄeno, Äím nižší je vnitÅ™ní rozliÅ¡ení, tím lepší výkon bude.\n" "\n" "Pokud si nejste jisti, zvolte 640x528." @@ -5508,14 +5338,12 @@ msgstr "Zastavit" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 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 "" "Ukládat EFB kopie do objektů textury grafického procesoru.\n" -"Toto není pÅ™esné, ale pro vÄ›tÅ¡inu her funguje dostateÄnÄ› dobÅ™e a dává vÄ›tší " -"zrychlení než EFB do RAM.\n" +"Toto není pÅ™esné, ale pro vÄ›tÅ¡inu her funguje dostateÄnÄ› dobÅ™e a dává vÄ›tší zrychlení než EFB do RAM.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -5593,7 +5421,7 @@ msgstr "VytvoÅ™it Snímek Obrazovky" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "TaruKonga (Bongos)" -msgstr "" +msgstr "TaruKonga (Bonga)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -5640,12 +5468,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 "" -"Soubor %s nemohl být otevÅ™en pro zápis. Zkontrolujte, prosím, je-li už " -"otevÅ™en jiným programem." +msgid "The file %s could not be opened for writing. Please check if it's already opened by another program." +msgstr "Soubor %s nemohl být otevÅ™en pro zápis. Zkontrolujte, prosím, je-li už otevÅ™en jiným programem." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format @@ -5671,13 +5495,11 @@ msgstr "Výsledný rozÅ¡ifrovaný kód AR neobsahuje žádné řádky." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 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 second-fastest value from the right." 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" +"Čí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." @@ -5686,12 +5508,8 @@ 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 -msgid "" -"The selected language is not supported by your system. Falling back to " -"system default." -msgstr "" -"Zvolený jazyk není VaÅ¡im systémem podporován. Vracím se na výchozí jazyk " -"systému." +msgid "The selected language is not supported by your system. Falling back to system default." +msgstr "Zvolený jazyk není VaÅ¡im systémem podporován. Vracím se na výchozí jazyk systému." #: Source/Core/Core/Src/NetPlayClient.cpp:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -5727,12 +5545,8 @@ msgid "Theme selection went wrong" msgstr "VýbÄ›r vzhledu se zvrtl" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 -msgid "" -"There must be a ticket for 00000001/00000002. Your NAND dump is probably " -"incomplete." -msgstr "" -"Musí existovat lístek pro 00000001/00000002. VaÅ¡e NAND vypsání je " -"pravdÄ›podobnÄ› neúplné" +msgid "There must be a ticket for 00000001/00000002. Your NAND dump is probably incomplete." +msgstr "Musí existovat lístek pro 00000001/00000002. VaÅ¡e NAND vypsání je pravdÄ›podobnÄ› neúplné" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "" @@ -5743,12 +5557,8 @@ msgstr "" "NeurÄený znamená, že hra použije nastavení Dolphin." #: Source/Core/Core/Src/ActionReplay.cpp:356 -msgid "" -"This action replay simulator does not support codes that modify Action " -"Replay itself." -msgstr "" -"Tento simulátor action replay nepodporuje kód, který mÄ›ní samotný Action " -"Replay." +msgid "This action replay simulator does not support codes that modify Action Replay itself." +msgstr "Tento simulátor action replay nepodporuje kód, který mÄ›ní samotný Action Replay." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." @@ -5757,18 +5567,12 @@ msgstr "Toto může způsobit zpomalení ve Wii Menu a v nÄ›kterých hrách." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 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 "" "Tato funkce Vám umožňuje si pohrát s herní kamerou.\n" -"Podržte pravé tlaÄítko myÅ¡i a pohybujte s ní pro zmÄ›nu pohledu kamery. " -"Podržte SHIFT a zmáÄknÄ›te jednu z kláves WASD, abyste kamerou pohnuli v " -"urÄité vzdálenosti kroku (SHIFT+0 pro rychlejší pohyb a SHIFT+9 pro " -"pomalejší). StisknÄ›te SHIFT+R k resetu kamery.\n" +"Podržte pravé tlaÄítko myÅ¡i a pohybujte s ní pro zmÄ›nu pohledu kamery. Podržte SHIFT a zmáÄknÄ›te jednu z kláves WASD, abyste kamerou pohnuli v urÄité vzdálenosti kroku (SHIFT+0 pro rychlejší pohyb a SHIFT+9 pro pomalejší). StisknÄ›te SHIFT+R k resetu kamery.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -5788,19 +5592,15 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." -msgstr "" -"Toto se používá pro pÅ™ehrávání hudebních stop, jako napÅ™. hudba v pozadí." +msgstr "Toto se používá pro pÅ™ehrávání hudebních stop, jako napÅ™. hudba v pozadí." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 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 "" "Toto rozdÄ›lí vlákna Obrazu a Procesoru, takže běží na oddÄ›lených jádrech.\n" -"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." +"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:283 msgid "This will let you Manually Edit the INI config file" @@ -5874,7 +5674,8 @@ msgstr "Pokus o naÄtení souboru neznámého typu." msgid "Triggers" msgstr "SpínaÄe" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:92 +#: Source/Core/Common/Src/SysConf.h:115 msgid "Trying to read from invalid SYSCONF" msgstr "Pokus o Ätení z neplatného SYSCONF" @@ -5926,12 +5727,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 "" -"Nelze analyzovat řádek %lu zadaného kódu AR jako platný zaÅ¡ifrovaný nebo " -"rozÅ¡ifrovaný kód. UjistÄ›te se, že jste ho správnÄ› zadali.\n" +"Nelze analyzovat řádek %lu zadaného kódu AR jako platný zaÅ¡ifrovaný nebo 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 @@ -6025,22 +5824,19 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Použít více vláken k dekódování textur.\n" -"Může vést ke zrychlení (zvláštÄ› u procesorů, která mají více než dvÄ› " -"jádra).\n" +"Může vést ke zrychlení (zvláštÄ› u procesorů, která mají více než dvÄ› jádra).\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 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 "" "NormálnÄ› pokud kompilace shadera selže, je zobrazena chybová zpráva.\n" -"NicménÄ›, zaÅ¡krtnutím této možnosti tyto vyskakovací okna pÅ™eskoÄíte, což Vám " -"umožní nepÅ™eruÅ¡ované hraní.\n" +"NicménÄ›, zaÅ¡krtnutím této možnosti tyto vyskakovací okna pÅ™eskoÄíte, což Vám umožní nepÅ™eruÅ¡ované hraní.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -6143,38 +5939,35 @@ msgstr "" #: Source/Core/Core/Src/Movie.cpp:629 #, 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 "" +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 "Varování: NaÄetli jste uloženou pozici, která je umístÄ›na po skonÄení souÄasného filmu. (bajt %u > %u) (snímek %u > %u). PÅ™ed pokraÄováním byste 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:646 #, 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 "" +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 "Varování: NaÄetli jste uloženou pozici, jejíž film má neshodu v bajtu %d (0x%X). PÅ™ed pokraÄováním byste mÄ›li naÄíst jinou pozici, nebo tento stav naÄíst bez zapnutého režimu pouze pro Ätení. Jinak pravdÄ›podobnÄ› dojde k desynchronizaci." #: Source/Core/Core/Src/Movie.cpp:655 #, 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 "" +"Varování: NaÄetli jste uloženou pozici, jejíž film má neshodu ve snímku %d. PÅ™ed pokraÄováním byste mÄ›li naÄíst jinou pozici, nebo tento stav naÄíst bez zapnutého režimu pouze pro Ätení. Jinak pravdÄ›podobnÄ› dojde k desynchronizaci.\n" +"\n" +"Další informace: SouÄasný film je dlouhý %d snímků a uložený stav filmu je dlouhý %d snímků.\n" +"\n" +"Ve snímku %d souÄasný film stiskává:\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" +"Na snímku %d, film uloženého stavu stiskává:\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" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -6369,9 +6162,7 @@ msgstr "Musíte zadat jméno!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 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Ä›." +msgstr "Musíte zadat platnou hodnotu v desítkové, Å¡estnáctkové nebo osmiÄkové soustavÄ›." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 msgid "You must enter a valid profile name." @@ -6437,19 +6228,14 @@ msgstr "[Vlastní]" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 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 "" "[EXPERIMENTÃLNÃ]\n" -"Usiluje o zrychlení emulace tím, že dekódování textury pÅ™enechá grafickému " -"procesoru použitím struktury OpenCL.\n" -"NicménÄ› v tuto dobu je známo, že způsobuje vady textur v různých hrách. Také " -"je ve vÄ›tÅ¡inÄ› případů pomalejší, než normální dekódování textur pÅ™es " -"procesor.\n" +"Usiluje o zrychlení emulace tím, že dekódování textury pÅ™enechá grafickému procesoru použitím struktury OpenCL.\n" +"NicménÄ› v tuto dobu je známo, že způsobuje vady textur v různých hrách. Také je ve vÄ›tÅ¡inÄ› případů pomalejší, než normální dekódování textur pÅ™es procesor.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -6462,8 +6248,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "[EXPERIMENTÃLNÃ]\n" -"Trochu zrychlí emulaci ukládáním pÅ™edvytvoÅ™ených objektů do vyrovnávací " -"pamÄ›ti\n" +"Trochu zrychlí emulaci ukládáním pÅ™edvytvoÅ™ených objektů do vyrovnávací pamÄ›ti\n" "Může ale také způsobovat problémy\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." From 6961c2e553c863bc82ae8111884cd771fae6bc51 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 20 Dec 2011 17:26:22 -0600 Subject: [PATCH 350/381] Update Hungarian and Turkish translations. --- Languages/po/fr.po | 1524 +++++++++++++++++++++++++++++++------------- Languages/po/hu.po | 130 ++++ Languages/po/tr.po | 507 +++++++++------ 3 files changed, 1530 insertions(+), 631 deletions(-) diff --git a/Languages/po/fr.po b/Languages/po/fr.po index 891787bfb0..5af84de44e 100644 --- a/Languages/po/fr.po +++ b/Languages/po/fr.po @@ -8,6 +8,7 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-28 23:40+0100\n" ======= @@ -18,6 +19,10 @@ msgstr "" ======= "PO-Revision-Date: 2011-10-28 23:40+0100\n" >>>>>>> Update french translation. +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-12-20 18:42+0100\n" +>>>>>>> Update Hungarian and Turkish translations. "Last-Translator: Pascal\n" "Language-Team: \n" "Language: French\n" @@ -51,16 +56,17 @@ 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/MemcardManager.cpp:193 #, c-format msgid "%1$sCopy%1$s" msgstr "%1$sCopie%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -106,7 +112,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 @@ -187,11 +194,11 @@ msgstr "Gestionnaire de &cheats" msgid "&DSP Settings" msgstr "Paramètres &DSP (audio)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 msgid "&Delete ISO..." msgstr "&Supprimer l'ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 msgid "&Delete selected ISOs..." msgstr "&Supprimer les ISO sélectionnés" @@ -255,7 +262,7 @@ msgstr "&Pause" msgid "&Play" msgstr "&Démarrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 msgid "&Properties" msgstr "&Propriétés" @@ -299,7 +306,7 @@ msgstr "&Affichage" msgid "&Wiimote Settings" msgstr "Paramètres de la &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 msgid "&Wiki" msgstr "&Wiki" @@ -348,11 +355,10 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "" msgstr "" @@ -378,11 +384,13 @@ 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" @@ -396,16 +404,19 @@ 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 !!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "AM-Baseboard" msgstr "AM-Baseboard" @@ -440,17 +451,18 @@ msgstr "Emulation fidèle VBeam" >>>>>>> Update french translation. 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." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 msgid "Action" msgstr "Action" @@ -471,33 +483,51 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, 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:756 #, 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:549 #, 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:609 #, 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:803 #, 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:684 #, c-format -msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "Erreur Action Replay : Master Code et Write To CCXXXXXX non implémentés (%s)" +msgid "" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgstr "" +"Erreur Action Replay : Master Code et Write To CCXXXXXX non implémentés (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -533,11 +563,11 @@ msgstr "Carte :" msgid "Add" msgstr "Ajouter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 msgid "Add ActionReplay Code" msgstr "Ajouter un code ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 msgid "Add Patch" msgstr "Ajouter un patch" @@ -545,6 +575,7 @@ msgstr "Ajouter un patch" msgid "Add new pane" msgstr "Ajouter un nouveau panneau" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -554,6 +585,11 @@ msgstr "Ajouter un nouveau panneau" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update Hungarian and Turkish translations. msgid "Add..." msgstr "Ajouter..." @@ -565,14 +601,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." @@ -581,27 +619,30 @@ 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:759 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:520 msgid "Advanced" msgstr "Avancé" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 msgid "Advanced Settings" msgstr "Paramètres avancés" @@ -609,14 +650,15 @@ msgstr "Paramètres avancés" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Tous les fichiers GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Toutes les images GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 msgid "All Gamecube GCM files (gcm)" msgstr "Tous les fichiers GameCube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -624,28 +666,34 @@ msgstr "Tous les fichiers GameCube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update Hungarian and Turkish translations. msgid "All Save States (sav, s##)" msgstr "Tous les états sauvegardés (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 msgid "All Wii ISO files (iso)" msgstr "Tous les fichiers ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tous les fichiers ISO compressés GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "All files (*.*)|*.*" msgstr "Tous les fichiers (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 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, 6 et " +"7 dans la fenêtre d'émulation.\n" "\n" "Dans le doute, décochez cette case." @@ -680,7 +728,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:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "Apploader:" msgstr "Apploader :" @@ -694,11 +742,12 @@ 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)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "Arabic" msgstr "Arabe" @@ -707,7 +756,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -715,15 +764,21 @@ msgstr "" "Êtes-vous sûr de vouloir supprimer ces fichiers ?\n" "Ils seront définitivement supprimés !" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 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 !" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Format d'écran :" @@ -732,11 +787,11 @@ 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:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Audio Backend:" msgstr "Moteur audio :" @@ -744,11 +799,15 @@ msgstr "Moteur audio :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -782,8 +841,10 @@ msgid "" "\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" +"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." @@ -791,7 +852,7 @@ msgstr "" msgid "Back" msgstr "Retour" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Backend Settings" msgstr "Paramètres de l'interface audio" @@ -801,7 +862,7 @@ msgid "Backend:" msgstr "Moteur :" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 msgid "Background Input" msgstr "Entrée en arrière-plan" @@ -814,15 +875,15 @@ msgid "Bad File Header" msgstr "Mauvaise entête de fichier" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 msgid "Banner" msgstr "Bannière" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 msgid "Banner Details" msgstr "Détails de la bannière" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Banner:" msgstr "Bannière :" @@ -834,7 +895,7 @@ msgstr "Barre" msgid "Basic" msgstr "Paramètres de base" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Basic Settings" msgstr "Paramètres de base" @@ -844,7 +905,9 @@ msgstr "Basse" #: Source/Core/Core/Src/HW/GCMemcard.cpp:188 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:628 msgid "Blocks" @@ -864,10 +927,14 @@ msgstr "Bleu Droite" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update Hungarian and Turkish translations. msgid "Bottom" msgstr "Bas" @@ -876,7 +943,7 @@ msgstr "Bas" msgid "Bound Controls: %lu" msgstr "Contrôles liés : %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "Broken" msgstr "Corrompu" @@ -884,7 +951,7 @@ msgstr "Corrompu" msgid "Browse" msgstr "Parcourir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 msgid "Browse for a directory to add" msgstr "Choisir un dossier à ajouter" @@ -892,7 +959,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:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187 msgid "Browse for output directory" msgstr "Parcourir un dossier de destination" @@ -900,11 +967,15 @@ msgstr "Parcourir un dossier de destination" msgid "Buffer:" msgstr "Buffer :" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -914,11 +985,11 @@ msgstr "Boutons" msgid "C Stick" msgstr "Stick-C" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 msgid "C-Stick" msgstr "Stick-C" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "CPU Emulator Engine" msgstr "Moteur d'émulation du CPU" @@ -929,12 +1000,17 @@ msgstr "Cache des listes d'affichage" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 "" -"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" +"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." @@ -947,8 +1023,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." @@ -964,11 +1042,16 @@ msgstr "Annuler" msgid "Cannot open %s" msgstr "Impossible d'ouvrir %s" +#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 +msgid "Cannot record movies in read-only mode." +msgstr "Impossible d'enregistrer des films en mode Lecture seule." + #: Source/Core/Core/Src/CoreTiming.cpp:122 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:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -979,7 +1062,7 @@ msgstr "" "%s\n" "n'est pas un fichier de carte mémoire GameCube valide." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -990,7 +1073,8 @@ msgstr "" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858 #, 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:1872 #, c-format @@ -1002,13 +1086,14 @@ msgstr "Impossible de trouver la Wiimote par le gestionnaire de connexion %02x" #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 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:49 msgid "Caps Lock" msgstr "Verr Maj" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Catalan" msgstr "Catalan" @@ -1025,7 +1110,6 @@ msgid "Change &Disc..." msgstr "&Changer de disque..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "Changer de disque" @@ -1033,7 +1117,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:496 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1049,8 +1133,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:506 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Changing this will have no effect while the emulator is running!" msgstr "Changer ceci n'aura aucun effet durant l'émulation !" @@ -1070,31 +1154,31 @@ msgstr "Rechercher un cheat" msgid "Cheats Manager" msgstr "Gestionnaire de Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Chinese (Simplified)" msgstr "Chinois (simplifié)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Traditional)" msgstr "Chinois (traditionnel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "Choose a DVD root directory:" msgstr "Choisir un dossier racine pour le DVD :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a NAND root directory:" msgstr "Choisir un dossier racine pour la NAND :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Choose a default ISO:" msgstr "Choisir un ISO par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 msgid "Choose a directory to add" msgstr "Choisir un dossier à ajouter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 msgid "Choose a file to open" msgstr "Choisir un fichier à ouvrir" @@ -1102,25 +1186,32 @@ msgstr "Choisir un fichier à ouvrir" msgid "Choose a memory card:" msgstr "Choisir une carte mémoire :" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +>>>>>>> Update Hungarian and Turkish translations. 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)" +<<<<<<< HEAD ======= 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)" >>>>>>> Update french translation. +======= +>>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:764 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 msgid "Choose the folder to extract to" msgstr "Choisir le dossier de destination de l'extraction" @@ -1139,21 +1230,29 @@ msgstr "Classique" msgid "Clear" msgstr "Effacer" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:173 msgid "Clear failed." msgstr "Echec de l'éffacement" #: 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:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fermer" @@ -1178,20 +1277,20 @@ msgstr "Commande" msgid "Comment" msgstr "Commentaire" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Comment:" msgstr "Commentaire :" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 msgid "Compress ISO..." msgstr "Compresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 msgid "Compress selected ISOs..." msgstr "Compresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 msgid "Compressing ISO" msgstr "Compression de l'ISO" @@ -1218,13 +1317,13 @@ msgstr "Configurer les manettes" msgid "Configure..." msgstr "Configurer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 msgid "Confirm File Overwrite" msgstr "Confirmer l'écrasement du fichier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 msgid "Confirm on Stop" msgstr "Confirmer l'arrêt de l'émulation" @@ -1233,7 +1332,7 @@ msgstr "Confirmer l'arrêt de l'émulation" msgid "Connect" msgstr "Connecter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Connect USB Keyboard" msgstr "Connecter le clavier USB" @@ -1243,30 +1342,30 @@ msgid "Connect Wiimote %i" msgstr "Connecter la Wiimote %i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "Connecter la 1ère Wiimote" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "Connecter la 2è Wiimote" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "Connecter la 3è Wiimote" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "Connecter la 4è Wiimote" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update Hungarian and Turkish translations. msgid "Connecting..." msgstr "Connexion..." @@ -1291,7 +1390,7 @@ msgstr "Echec de la copie" msgid "Copy to Memcard %c" msgstr "Copier vers la carte mémoire %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Core" msgstr "Core" @@ -1307,15 +1406,22 @@ 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 msgid "Could not recognize ISO file %s" msgstr "Impossible de reconnaître le fichier ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 #, c-format msgid "Could not save %s" msgstr "Impossible de sauvegarder %s" @@ -1325,21 +1431,25 @@ 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:119 #, 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:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 msgid "Couldn't find open command for extension 'ini'!" msgstr "Impossible de trouver la commande d'ouverture pour l'extension 'ini' !" @@ -1356,7 +1466,7 @@ msgstr "" msgid "Count:" msgstr "Nombre :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Country:" msgstr "Pays :" @@ -1370,30 +1480,37 @@ 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:494 msgid "Created by KDE-Look.org" msgstr "Créé par KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +>>>>>>> Update Hungarian and Turkish translations. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +<<<<<<< HEAD ======= msgid "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" >>>>>>> Update french translation. +======= +>>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "Created by VistaIcons.com" msgstr "Créé par VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Créé par black_rider et publié sur ForumW.org > Web Developments" @@ -1428,7 +1545,7 @@ msgstr "Crossfade" 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:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "Custom Projection Hack" msgstr "Hack de projection personnalisé" @@ -1436,15 +1553,15 @@ msgstr "Hack de projection personnalisé" msgid "Custom Projection Hack Settings" msgstr "Paramètres du hack de projection personnalisé" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Customize some Orthographic Projection parameters." msgstr "Personnalise certains paramètres de projection orthographique." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Czech" msgstr "Tchèque" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "D-Pad" msgstr "Pad numérique" @@ -1452,28 +1569,32 @@ msgstr "Pad numérique" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 msgid "DSP Emulator Engine" msgstr "Moteur d'émulation du DSP (Audio)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update Hungarian and Turkish translations. msgid "DSP HLE emulation (fast)" msgstr "Emulation du DSP en HLE (rapide)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE interpreter (slow)" msgstr "Interpréteur du DSP en LLE (lent)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP LLE on Thread" msgstr "DSP LLE sur thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP LLE recompiler" msgstr "Recompilateur du DSP en LLE" @@ -1481,7 +1602,7 @@ msgstr "Recompilateur du DSP en LLE" msgid "DSP settings" msgstr "Paramètres DSP (audio)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 msgid "DVD Root:" msgstr "Racine du DVD :" @@ -1489,7 +1610,7 @@ msgstr "Racine du DVD :" msgid "Data Size" msgstr "Taille des données" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Date:" msgstr "Date :" @@ -1518,16 +1639,16 @@ msgstr "Débug" msgid "Decimal" msgstr "Décimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 msgid "Decompress ISO..." msgstr "Décompresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "Decompress selected ISOs..." msgstr "Décompresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 msgid "Decompressing ISO" msgstr "Décompression de l'ISO" @@ -1535,7 +1656,7 @@ msgstr "Décompression de l'ISO" msgid "Default" msgstr "Par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 msgid "Default ISO:" msgstr "ISO par défaut :" @@ -1567,16 +1688,20 @@ msgstr "Détecter" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -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:131 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 msgid "Device" msgstr "Appareil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 msgid "Device Settings" msgstr "Paramètres de la console virtuelle" @@ -1624,24 +1749,30 @@ msgstr "Désactiver les textures" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 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:95 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." @@ -1655,7 +1786,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Disc" msgstr "Disque" @@ -1682,15 +1813,19 @@ msgstr "" msgid "Divide" msgstr "Diviser" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update Hungarian and Turkish translations. msgid "Do you want to stop the current emulation?" msgstr "Voulez-vous arrêter l'émulation en cours ?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 msgid "Dolphin" msgstr "Dolphin" @@ -1715,6 +1850,7 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1730,6 +1866,14 @@ msgstr "Configuration de la manette GC pour Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Configuration de la manette GC pour Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update Hungarian and Turkish translations. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Films TAS Dolphin (*.dtm)" @@ -1741,18 +1885,23 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin dans &Google Code" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +>>>>>>> Update Hungarian and Turkish translations. 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..." +<<<<<<< HEAD ======= 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..." @@ -1764,16 +1913,23 @@ msgstr "Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher d #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +>>>>>>> Update Hungarian and Turkish translations. 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..." +<<<<<<< HEAD ======= 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..." >>>>>>> Update french translation. +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -1797,7 +1953,7 @@ msgstr "Percussions" msgid "Dummy" msgstr "Factice" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Dump Audio" msgstr "Enregistrer le son" @@ -1819,7 +1975,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." @@ -1843,6 +2000,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1852,6 +2010,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update Hungarian and Turkish translations. msgid "Dutch" msgstr "Néerlandais" @@ -1865,8 +2028,16 @@ msgstr "Copies de l'EFB" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, 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:162 msgid "EUROPE" @@ -1896,8 +2067,8 @@ msgstr "Editer le patch" msgid "Edit current perspective" msgstr "Modifier la perspective actuelle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 msgid "Edit..." msgstr "Editer..." @@ -1909,38 +2080,45 @@ msgstr "Effets" msgid "Embedded Frame Buffer" msgstr "Buffer d'image embarqué" -#: Source/Core/Core/Src/Core.cpp:174 +#: Source/Core/Core/Src/Core.cpp:173 msgid "Emu Thread already running" msgstr "Thread d'émulation déjà en cours d'exécution" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 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:110 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:33 msgid "Emulated Wiimote" msgstr "Wiimote émulée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "Emulation State: " msgstr "Etat de l'émulation :" @@ -1950,13 +2128,15 @@ msgstr "Activer" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 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" @@ -1966,7 +2146,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "Activer la journalisation AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "Enable Audio Throttle" msgstr "Activer le contrôle audio" @@ -1978,6 +2158,7 @@ msgstr "Activer BAT" msgid "Enable Block Merging" msgstr "Activer l'assemblage de blocs" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" @@ -1985,19 +2166,25 @@ msgstr "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Activer le cache" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update Hungarian and Turkish translations. msgid "Enable Cheats" msgstr "Activer les Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 msgid "Enable DTK Music" msgstr "Activer la musique DTK" @@ -2005,7 +2192,7 @@ msgstr "Activer la musique DTK" msgid "Enable Dual Core" msgstr "Activer le Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Enable Dual Core (speedup)" msgstr "Activer le Dual Core (plus rapide)" @@ -2017,7 +2204,7 @@ msgstr "Activer les touches de raccourci" msgid "Enable Idle Skipping" msgstr "Activer le saut d'inactivité" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Enable Idle Skipping (speedup)" msgstr "Activer le saut d'inactivité (plus rapide)" @@ -2030,7 +2217,7 @@ msgstr "Activer le MMU" msgid "Enable Progressive Scan" msgstr "Activer le Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 msgid "Enable Screen Saver" msgstr "Activer l'économiseur d'écran" @@ -2051,14 +2238,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:317 -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:799 msgid "Enable pages" @@ -2071,43 +2263,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:79 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." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +>>>>>>> Update Hungarian and Turkish translations. 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." +<<<<<<< HEAD ======= 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." >>>>>>> Update french translation. +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 -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:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 msgid "Enables Custom Projection Hack" msgstr "Active un hack de projection personnalisé" @@ -2124,8 +2332,12 @@ msgstr "" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -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:117 msgid "" @@ -2141,6 +2353,7 @@ msgstr "" msgid "End" msgstr "Fin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2150,6 +2363,11 @@ msgstr "Fin" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update Hungarian and Turkish translations. msgid "English" msgstr "Anglais" @@ -2179,6 +2397,7 @@ msgstr "Egal" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erreur" @@ -2207,22 +2426,40 @@ msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Erreur" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/DolphinWX/Src/Main.cpp:346 +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." +>>>>>>> Update Hungarian and Turkish translations. + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 #, c-format <<<<<<< HEAD +<<<<<<< HEAD msgid "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +msgid "" +>>>>>>> Update Hungarian and Turkish translations. "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." +<<<<<<< HEAD ======= 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." >>>>>>> Update french translation. +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2235,7 +2472,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:58 msgid "Execute" @@ -2249,12 +2487,11 @@ msgstr "Quitter Dolphin avec l'émulateur" msgid "Export Failed" msgstr "Echec de l'exportation" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 msgid "Export File" msgstr "Exporter un fichier" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "Exporter l'enregistrement..." @@ -2266,7 +2503,7 @@ msgstr "Exporter l'enregistrement..." msgid "Export Save" msgstr "Exporter une sauvegarde" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 msgid "Export Wii save (Experimental)" msgstr "Exporter une sauvegarde Wii (expérimental)" @@ -2298,44 +2535,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract All Files..." msgstr "Extraire tous les fichiers..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract Apploader..." msgstr "Extraire l'Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 msgid "Extract DOL..." msgstr "Extraire le DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Directory..." msgstr "Extraire un dossier..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract File..." msgstr "Extraire un fichier..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 msgid "Extract Partition..." msgstr "Extraire une partition..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 #, c-format msgid "Extracting %s" msgstr "Extraction de %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 msgid "Extracting All Files" msgstr "Extraction de tous les fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 msgid "Extracting Directory" msgstr "Extraction du dossier" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 msgid "Extracting..." msgstr "Extraction..." @@ -2351,7 +2588,7 @@ msgstr "Lecteur FIFO" msgid "FRANCE" msgstr "France" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "FST Size:" msgstr "Taille FST :" @@ -2367,7 +2604,7 @@ msgstr "Ecoute impossible !" msgid "Failed to download codes." msgstr "Impossible de télécharger les codes." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 #, c-format msgid "Failed to extract to %s!" msgstr "Impossible d'extraire vers %s !" @@ -2390,7 +2627,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 @@ -2412,7 +2650,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:144 @@ -2542,11 +2781,11 @@ 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:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Filesystem" msgstr "Système de fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Type de fichier 'ini' est inconnu ! Ne sera pas ouvert !" @@ -2566,7 +2805,7 @@ msgstr "Forcer 16/9è" msgid "Force 4:3" msgstr "Forcer 4/3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Force Console as NTSC-J" msgstr "Forcer la console comme NTSC-J" @@ -2582,7 +2821,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." @@ -2593,18 +2833,21 @@ 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." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 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:76 msgid "" @@ -2628,7 +2871,6 @@ msgid "Frame " msgstr "Image " #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "Avancement d'image" @@ -2644,7 +2886,7 @@ msgstr "Plage d'images :" msgid "Frame S&kipping" msgstr "Saut d'&image :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Framelimit:" msgstr "Image/s max :" @@ -2656,6 +2898,7 @@ msgstr "Images à enregistrer :" msgid "Free Look" msgstr "Vue libre" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2665,6 +2908,11 @@ msgstr "Vue libre" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update Hungarian and Turkish translations. msgid "French" msgstr "Français" @@ -2689,16 +2937,19 @@ msgstr "Résolution en Plein écran :" msgid "GCI File(*.gci)" msgstr "Fichier GCI (*.gci)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 #, fuzzy msgid "GCMic Configuration" msgstr "Configuration de la journalisation" +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "Manette GC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 msgid "Game ID:" msgstr "ID du jeu :" @@ -2714,7 +2965,7 @@ msgstr "Le jeu n'est pas en cours d'émulation !" msgid "Game not found!!" msgstr "Jeu non trouvé !!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 msgid "Game-Specific Settings" msgstr "Paramètres spécifiques au jeu" @@ -2722,7 +2973,7 @@ msgstr "Paramètres spécifiques au jeu" msgid "GameConfig" msgstr "Config du Jeu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 msgid "Gamecube" msgstr "GameCube" @@ -2732,10 +2983,14 @@ msgstr "Paramètres de la &manette GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update Hungarian and Turkish translations. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Carte mémoires de GameCube (*.raw,*.gcp)" @@ -2759,11 +3014,15 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Général" @@ -2772,6 +3031,7 @@ msgstr "Général" msgid "General Settings" msgstr "Paramètres généraux" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2781,13 +3041,19 @@ msgstr "Paramètres généraux" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update Hungarian and Turkish translations. msgid "German" msgstr "Allemand" #: Source/Core/Core/Src/ActionReplay.cpp:451 #, 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:443 msgid "Graphics" @@ -2810,18 +3076,24 @@ msgstr "Plus grand que" ======= >>>>>>> Update french translation. 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 "" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update Hungarian and Turkish translations. "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" <<<<<<< HEAD +<<<<<<< HEAD "Baisse légèrement les performances et peut provoquer quelques pépins (mais " "peu probable).\n" ======= @@ -2831,10 +3103,14 @@ msgstr "" "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" >>>>>>> Update french translation. +======= +"Baisse légèrement les performances et peut provoquer quelques pépins (mais " +"peu probable).\n" +>>>>>>> Update Hungarian and Turkish translations. "\n" "Dans le doute, cochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Greek" msgstr "Grèque" @@ -2866,7 +3142,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:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Hebrew" msgstr "Hébreu" @@ -2889,8 +3165,10 @@ 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" @@ -2908,7 +3186,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." @@ -2927,15 +3206,19 @@ msgstr "Configuration des raccourcis clavier" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +>>>>>>> Update Hungarian and Turkish translations. msgid "Hotkeys" msgstr "Raccourcis clavier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hungarian" msgstr "Hongrois" @@ -2946,16 +3229,20 @@ msgstr "Wiimote hybride" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 #, 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:795 #, 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" @@ -2963,7 +3250,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - mauvaise destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 msgid "IPL Settings" msgstr "Paramètres IPL" @@ -2979,11 +3266,11 @@ msgstr "Pointeur IR" msgid "IR Sensitivity:" msgstr "Sensibilité de l'IR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 msgid "ISO Details" msgstr "Détails de l'ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "ISO Directories" msgstr "Dossiers des ISO" @@ -2995,22 +3282,32 @@ msgstr "Italie" msgid "Icon" msgstr "Icône" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -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)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +>>>>>>> Update Hungarian and Turkish translations. msgid "" "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." @@ -3018,10 +3315,13 @@ 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), vous devez aussi désactiver " "le contrôle audio dans le DSP pour que cela fonctionne." +<<<<<<< HEAD ======= msgid "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." 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), vous devez aussi désactiver le contrôle audio dans le DSP pour que cela fonctionne." >>>>>>> Update french translation. +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" @@ -3030,24 +3330,28 @@ msgstr "Ignorer les changements de formats" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 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:93 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." @@ -3081,11 +3385,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 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." @@ -3095,11 +3401,12 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Améliore les performances, mais peut faire disparaître l'éclairage dans la plupart des jeux.\n" +"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:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "In Game" msgstr "Dans le jeu" @@ -3128,7 +3435,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:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Insert SD Card" msgstr "Insérer une carte SD" @@ -3140,35 +3447,42 @@ msgstr "Indiquer un nom ici..." msgid "Install WAD" msgstr "Installer un WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 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." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update Hungarian and Turkish translations. msgid "Installing WAD..." msgstr "Installation du WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 msgid "Interface" msgstr "Interface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Interface Settings" msgstr "Paramètres de l'interface" -#: Source/Core/Core/Src/State.cpp:242 +#: Source/Core/Core/Src/State.cpp:192 msgid "Internal LZO Error - compression failed" msgstr "Erreur interne LZO - échec de la compression" -#: Source/Core/Core/Src/State.cpp:338 +#: Source/Core/Core/Src/State.cpp:292 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3177,7 +3491,7 @@ 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:461 +#: Source/Core/Core/Src/State.cpp:390 msgid "Internal LZO Error - lzo_init() failed" msgstr "Erreur interne LZO - échec de lzo_init()" @@ -3185,11 +3499,11 @@ msgstr "Erreur interne LZO - échec de lzo_init()" msgid "Internal Resolution:" msgstr "Résolution interne :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 msgid "Interpreter (VERY slow)" msgstr "Interpréteur (TRES lent)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Intro" msgstr "Intro" @@ -3206,7 +3520,7 @@ msgstr "Valeur non valide !" msgid "Invalid bat.map or dir entry" msgstr "bar.map ou entrée dir non valide" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:534 #, c-format msgid "Invalid event type %i" msgstr "Type d'évènement non valide : %i" @@ -3226,14 +3540,15 @@ msgstr "" "%s\n" "Vous devriez copier à nouveau ce jeu." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:374 msgid "Invalid recording file" msgstr "Fichier d'enregitrement non valide" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:488 msgid "Invalid state" msgstr "Etat non valide" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3243,6 +3558,11 @@ msgstr "Etat non valide" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update Hungarian and Turkish translations. msgid "Italian" msgstr "Italien" @@ -3250,16 +3570,16 @@ msgstr "Italien" msgid "JAPAN" msgstr "Japon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "JIT Recompiler (recommended)" msgstr "Recompilateur JIT (recommandé) " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JITIL experimental recompiler" msgstr "Recompilateur expérimental JIT" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Japanese" msgstr "Japonais" @@ -3268,17 +3588,16 @@ msgid "KOREA" msgstr "Corée" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "Touche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Korean" msgstr "Coréen" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 msgid "L" msgstr "L" @@ -3287,11 +3606,11 @@ msgid "L Button" msgstr "Bouton L" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "L-Analog" msgstr "L Analog." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Language:" msgstr "Langue :" @@ -3314,7 +3633,6 @@ msgid "Left Stick" msgstr "Stick Gauche" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3344,7 +3662,7 @@ msgstr "" msgid "Less Than" msgstr "Plus petit que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Limit by FPS" msgstr "Nb de FPS comme limite" @@ -3357,42 +3675,34 @@ msgid "Load Custom Textures" msgstr "Charger textures personnalisées" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 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 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 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 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 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 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 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 msgid "Load State Slot 8" msgstr "Charger l'état du Slot 8" @@ -3400,6 +3710,7 @@ msgstr "Charger l'état du Slot 8" msgid "Load State..." msgstr "Charger un état..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3413,6 +3724,13 @@ msgstr "Charger le Menu Système Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Charger le Menu Système Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update Hungarian and Turkish translations. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Charger le Menu Système Wii %d%c" @@ -3429,7 +3747,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/Main.cpp:134 msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" @@ -3439,7 +3759,7 @@ msgstr "Charge le fichier spécifié (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Lock Threads to Cores" msgstr "Verrouiller les threads aux coeurs" @@ -3494,20 +3814,24 @@ msgstr "Hack de vitesse pour le MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Fichiers MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Maker ID:" msgstr "ID concepteur :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Maker:" msgstr "Concepteur :" @@ -3530,16 +3854,24 @@ msgstr "Octet mémoire" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update Hungarian and Turkish translations. 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 @@ -3560,13 +3892,15 @@ msgstr "" #: Source/Core/Core/Src/HW/GCMemcard.cpp:126 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:47 msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 msgid "Mic" msgstr "Micro" @@ -3579,7 +3913,7 @@ msgstr "Min" msgid "Misc" msgstr "Divers" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 msgid "Misc Settings" msgstr "Paramètres divers" @@ -3590,11 +3924,14 @@ msgstr "Modif." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 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." @@ -3607,7 +3944,7 @@ msgid "Motion Plus" msgstr "Motion Plus" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 msgid "Motor" msgstr "Vibreur" @@ -3634,8 +3971,12 @@ msgid "Multiply" msgstr "Multiplier" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -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/WXInputBase.cpp:126 msgid "NP Add" @@ -3721,11 +4062,15 @@ msgstr "NP Tabulation" msgid "NP Up" msgstr "NP Haut" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3764,7 +4109,7 @@ msgstr "Pseudo :" msgid "No Country (SDK)" msgstr "Pas de pays (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 msgid "No ISOs or WADS found" msgstr "Aucun ISO ou WAD trouvé" @@ -3799,7 +4144,7 @@ msgstr "Aucun dossier de sauvegarde trouvé pour le titre %s" msgid "None" msgstr "Aucune" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Norwegian Bokmaal" msgstr "Norvégien BokmÃ¥l" @@ -3807,20 +4152,24 @@ msgstr "Norvégien BokmÃ¥l" msgid "Not Equal" msgstr "Différent" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 msgid "Not Set" msgstr "Non défini" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update Hungarian and Turkish translations. msgid "Not connected" msgstr "Non connectée" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 msgid "Notes" msgstr "Notes" @@ -3862,7 +4211,7 @@ msgstr "Objet" msgid "Object Range" msgstr "Plage d'objets :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 msgid "Off" msgstr "Arrêt" @@ -3878,17 +4227,20 @@ msgstr "%d blocs disponibles seulement" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Hungarian and Turkish translations. msgid "Open" msgstr "Ouvrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 msgid "Open &containing folder" msgstr "Ouvrir l'emplacement du fichier" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 msgid "Open Wii &save folder" msgstr "Ouvrir le dossier de &sauvegarde Wii" @@ -3927,7 +4279,7 @@ 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 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:91 msgid "Options" msgstr "Options" @@ -3941,7 +4293,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" @@ -3951,8 +4304,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:485 msgid "Output" @@ -4003,10 +4360,11 @@ msgstr "Partition %i" msgid "Patches" msgstr "Patchs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 msgid "Paths" msgstr "Chemins" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4014,6 +4372,10 @@ msgstr "Chemins" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4022,7 +4384,7 @@ msgstr "Pause" msgid "Per-Pixel Lighting" msgstr "Eclairage par pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Perfect" msgstr "Parfait" @@ -4034,26 +4396,29 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update Hungarian and Turkish translations. msgid "Play" msgstr "Démarrer" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "Jouer l'enregistrement..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "Démarrer/Arrêter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Playable" msgstr "Jouable" @@ -4065,11 +4430,15 @@ msgstr "Options de lecture" msgid "Players" msgstr "Joueurs" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update Hungarian and Turkish translations. msgid "Please confirm..." msgstr "Veuillez confirmer..." @@ -4081,23 +4450,23 @@ msgstr "Merci de créer une perspective avant de sauvegarder" msgid "Plus-Minus" msgstr "Plus-Moins" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Polish" msgstr "Polonais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 4" msgstr "Port 4" @@ -4106,11 +4475,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Portuguese" msgstr "Portugais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese (Brazilian)" msgstr "Portugais (brésilien)" @@ -4118,6 +4487,7 @@ msgstr "Portugais (brésilien)" msgid "Post-Processing Effect:" msgstr "Effet de Post-processing :" +<<<<<<< HEAD #: Source/Core/Core/Src/Movie.cpp:735 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" @@ -4133,6 +4503,8 @@ msgstr "" msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "Pré-réglages :" @@ -4175,7 +4547,7 @@ msgid "Quit" msgstr "Quitter" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "R" msgstr "R" @@ -4184,7 +4556,7 @@ msgid "R Button" msgstr "Bouton R" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "R-Analog" msgstr "R Analog." @@ -4201,7 +4573,6 @@ msgid "Range" msgstr "Etendue" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "Mode Lecture seule" @@ -4261,7 +4632,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." @@ -4272,7 +4644,6 @@ msgid "Refresh" msgstr "Rafraîchir" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "Rafraîchir la liste" @@ -4280,6 +4651,7 @@ msgstr "Rafraîchir la liste" msgid "Refresh game list" msgstr "Rafraîchir la liste des jeux" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4291,6 +4663,12 @@ msgstr "Rafraîchir la liste des jeux" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update Hungarian and Turkish translations. msgid "Remove" msgstr "Retirer" @@ -4310,9 +4688,12 @@ msgstr "Rendu dans la fenêtre principale" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -4335,15 +4716,15 @@ msgid "Right Stick" msgstr "Stick Droit" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 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:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Russian" msgstr "Russe" @@ -4355,11 +4736,15 @@ msgstr "Sau&vegarder l'état" msgid "Safe" msgstr "Sûr " +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update Hungarian and Turkish translations. msgid "Sample Rate:" msgstr "Echantillonnage :" @@ -4374,42 +4759,34 @@ msgid "Save GCI as..." msgstr "Enregistrer GCI sous..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 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 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 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 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 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 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 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 msgid "Save State Slot 8" msgstr "Sauvegarder l'état vers le Slot 8" @@ -4417,12 +4794,12 @@ msgstr "Sauvegarder l'état vers le Slot 8" msgid "Save State..." msgstr "Enregistrer l'état" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 msgid "Save as..." msgstr "Enregistrer sous..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 msgid "Save compressed GCM/ISO" msgstr "Sauver le fichier compressé GCM/ISO" @@ -4430,29 +4807,31 @@ msgstr "Sauver le fichier compressé GCM/ISO" msgid "Save current perspective" msgstr "Sauvegarder la perspective actuelle" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 msgid "Save decompressed GCM/ISO" msgstr "Sauvegarder le fichier GCM/ISO décompressé" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:428 #, 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:401 msgid "Scaled EFB Copy" msgstr "Copie à l'échelle de l'EFB" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format msgid "Scanning %s" msgstr "Analyse de %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 msgid "Scanning for ISOs" msgstr "Recherche d'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 msgid "Scanning..." msgstr "Recherche..." @@ -4468,14 +4847,12 @@ msgstr "Arrêt défil." msgid "Search Filter" msgstr "Fitre de recherche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 msgid "Search Subfolders" msgstr "Chercher dans sous-dossiers" -#: Source/Core/Common/Src/SysConf.h:104 -#: Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 -#: Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 +#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 #, c-format msgid "Section %s not found in SYSCONF" msgstr "La section %s n'a pas été trouvée dans SYSCONF" @@ -4485,6 +4862,7 @@ msgstr "La section %s n'a pas été trouvée dans SYSCONF" msgid "Select" msgstr "Select" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4500,6 +4878,14 @@ msgstr "Sélectionner le fichier d'enregistrement" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Sélectionner le fichier d'enregistrement" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update Hungarian and Turkish translations. msgid "Select a Wii WAD file to install" msgstr "Sélectionner un fichier WAD de Wii à installer" @@ -4525,15 +4911,20 @@ msgstr "Sélectionner les fenêtres flottantes" msgid "Select the file to load" msgstr "Sélectionner le fichier à charger" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +>>>>>>> Update Hungarian and Turkish translations. msgid "Select the save file" msgstr "Sélectionner le fichier à enregistrer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Sélectionner l'état à charger" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4546,6 +4937,9 @@ msgstr "Sélectionner l'état à charger" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update Hungarian and Turkish translations. msgid "Select the state to save" msgstr "Sélectionner l'état à enregistrer" @@ -4562,7 +4956,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." @@ -4574,27 +4969,32 @@ msgstr "Police sélectionnée" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 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:73 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." @@ -4611,31 +5011,38 @@ msgstr "Position de la Sensor Bar :" msgid "Separator" msgstr "Séparateur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Serbian" msgstr "Serbe" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +>>>>>>> Update Hungarian and Turkish translations. 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" +<<<<<<< HEAD ======= 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" >>>>>>> Update french translation. +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" msgstr "Paramétrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 msgid "Set as &default ISO" msgstr "Définir comme l'ISO par &défaut" @@ -4647,13 +5054,15 @@ msgstr "Définir comme carte mémoire par défaut : %c" #: Source/Core/Core/Src/ActionReplay.cpp:462 #, 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/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Settings..." msgstr "Configurer..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Impossible de trouver le fichier des paramètres" @@ -4661,7 +5070,7 @@ msgstr "SetupWiiMem: Impossible de trouver le fichier des paramètres" msgid "Shake" msgstr "Secouement" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Short Name:" msgstr "Nom court :" @@ -4721,7 +5130,7 @@ msgstr "Afficher Japon" msgid "Show Korea" msgstr "Afficher Corée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Show Language:" msgstr "Afficher la langue :" @@ -4761,17 +5170,20 @@ msgstr "Afficher WAD" msgid "Show Wii" msgstr "Afficher Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 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:488 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 "" "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:812 msgid "Show first block" @@ -4795,11 +5207,13 @@ msgstr "Afficher le titre de sauvegarde" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 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." @@ -4825,15 +5239,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote à l'horizontale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 msgid "Simplified Chinese" msgstr "Chinois simplifié" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 msgid "Size" msgstr "Taille" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 msgid "Skip BIOS" msgstr "Ne pas exécuter le BIOS" @@ -4869,11 +5283,13 @@ msgid "" msgstr "" ======= 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." @@ -4881,19 +5297,26 @@ 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 "" <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. "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" >>>>>>> Update french translation. +======= +"Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision " +"de l'émulation.\n" +>>>>>>> Update Hungarian and Turkish translations. "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." @@ -4903,11 +5326,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 msgid "Slot B" msgstr "Slot B" @@ -4921,15 +5344,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:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 msgid "Sound Settings" msgstr "Paramètres audio" @@ -4947,6 +5373,7 @@ msgstr "Echec de la création du buffer audio : %s" msgid "Space" msgstr "Espace" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4956,6 +5383,11 @@ msgstr "Espace" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update Hungarian and Turkish translations. msgid "Spanish" msgstr "Espagnol" @@ -4965,13 +5397,21 @@ msgstr "Volume du haut-parleur :" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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." @@ -4991,11 +5431,15 @@ msgstr "Stick carré" msgid "Standard Controller" msgstr "Contrôleur standard" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5010,16 +5454,14 @@ msgid "Start Re&cording" msgstr "Commencer l'enregistrement" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "Commencer l'enregistrement" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 msgid "State" msgstr "Etat" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "Etats" @@ -5031,9 +5473,12 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Arrêter" @@ -5041,12 +5486,14 @@ msgstr "Arrêter" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 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." @@ -5075,8 +5522,8 @@ msgstr "Fichiers de sauvegarde importés avec succès" msgid "Swing" msgstr "Balancement" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 msgid "System Language:" msgstr "Langue du système :" @@ -5109,6 +5556,7 @@ msgstr "Table Droite" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. @@ -5119,6 +5567,11 @@ msgstr "Capture d'écran" msgid "TaruKonga (Bongos)" msgstr "" +======= +msgid "Take Screenshot" +msgstr "Capture d'écran" + +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "Test" @@ -5147,13 +5600,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:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 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:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 #, c-format msgid "" "The file %s already exists.\n" @@ -5164,8 +5617,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 @@ -5191,21 +5648,28 @@ msgstr "Le code AR décrypté ne contient aucune ligne." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 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 second-fastest value from the right." 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 deuxième position depuis la droite." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 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:353 -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!" @@ -5232,7 +5696,7 @@ 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:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:573 msgid "Theme" msgstr "Thème" @@ -5241,8 +5705,12 @@ 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:467 -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:304 msgid "" @@ -5253,26 +5721,37 @@ msgstr "" "Indéterminé signifie que les paramètres de Dolphin sont appliqués." #: Source/Core/Core/Src/ActionReplay.cpp:356 -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:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 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:119 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:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -5281,26 +5760,34 @@ msgid "" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" "Ceci est utiliser pour contrôler la vitesse du jeu par la constance du son.\n" -"Désactiver cette option peut causer une vitesse anormale du jeu, par exemple trop rapide.\n" +"Désactiver cette option peut causer une vitesse anormale du jeu, par exemple " +"trop rapide.\n" "Mais il se peut parfois qu'activer cette option produise un bruit constant.\n" "\n" -"Raccourci clavier : Appuyer pour instantanément désactiver cette option." +"Raccourci clavier : Appuyer pour instantanément désactiver cette " +"option." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "This is used to play music tracks, like BGM." msgstr "Ceci est utilisé pour lire les pistes de musique, comme les BGM." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 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:283 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 @@ -5312,7 +5799,7 @@ msgid "Tilt" msgstr "Tilt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 msgid "Title" msgstr "Titre" @@ -5328,22 +5815,29 @@ msgstr "Activer tous les types de journaux" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Hungarian and Turkish translations. msgid "Toggle Fullscreen" msgstr "Activer le plein écran" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update Hungarian and Turkish translations. msgid "Top" msgstr "Haut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Traditional Chinese" msgstr "Chinois traditionnel" @@ -5351,12 +5845,11 @@ msgstr "Chinois traditionnel" msgid "Tried to load an unknown file type." msgstr "Echec de chargement d'un type de fichier inconnu." -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "Triggers" msgstr "Déclencheurs" -#: Source/Core/Common/Src/SysConf.h:92 -#: Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 msgid "Trying to read from invalid SYSCONF" msgstr "Essai de lecture d'un fichier SYSCONF non valide" @@ -5368,7 +5861,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:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Turkish" msgstr "Turque" @@ -5408,10 +5901,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:404 @@ -5447,21 +5942,32 @@ msgstr "Reception d'un message inconnu avec l'ID : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= 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 !" >>>>>>> Update french translation. +======= +msgstr "" +"Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/Core/Src/HW/Memmap.cpp:633 #, c-format msgid "" "Unknown pointer %#08x\n" "Continue?" +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgstr "" "Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" +======= +msgstr "" +"Pointeur inconnu %#08x\n" +"Continuer ?" +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 @@ -5477,7 +5983,7 @@ msgstr "Mettre à jour" msgid "Upright Wiimote" msgstr "Wiimote debout" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utiliser le mode EuRGB60 (PAL60)" @@ -5489,7 +5995,7 @@ msgstr "&Plein écran" msgid "Use Hex" msgstr "Utiliser Hexa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Use Panic Handlers" msgstr "Utiliser les gestionnaires de panique" @@ -5501,19 +6007,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:127 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." @@ -5541,7 +6051,7 @@ msgstr "Valeur" msgid "Verbosity" msgstr "Verbosité" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 msgid "Video" msgstr "Vidéo" @@ -5549,7 +6059,7 @@ msgstr "Vidéo" msgid "Virtual" msgstr "Virtuel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 msgid "Volume" msgstr "Volume" @@ -5597,7 +6107,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 ?" @@ -5609,11 +6120,13 @@ 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 ?" +<<<<<<< HEAD #: Source/Core/Core/Src/Movie.cpp:629 #, c-format msgid "" @@ -5649,6 +6162,8 @@ msgid "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" msgstr "" +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -5666,15 +6181,15 @@ msgstr "Hack écran large (16/9è)" msgid "Width" msgstr "Largeur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 msgid "Wii Console" msgstr "Console Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Wii NAND Root:" msgstr "Racine de la NAND (Wii) :" @@ -5682,11 +6197,15 @@ msgstr "Racine de la NAND (Wii) :" msgid "Wii Save Import" msgstr "Importer une sauvegarde Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update Hungarian and Turkish translations. msgid "Wii save files (*.bin)|*.bin" msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin" @@ -5717,11 +6236,15 @@ msgstr "" "ou bien c'est dû à un temps d'attente trop long, ou encore autre chose.\n" "Voulez-vous la reconnecter tout de suite ?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update Hungarian and Turkish translations. msgid "Wiimote Connected" msgstr "Wiimote connectée" @@ -5753,6 +6276,7 @@ msgstr "Windows Droit" msgid "Word Wrap" msgstr "Casse" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5762,6 +6286,11 @@ msgstr "Casse" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update Hungarian and Turkish translations. msgid "Working..." msgstr "Travail..." @@ -5802,7 +6331,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." @@ -5824,7 +6354,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:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:877 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." @@ -5847,7 +6377,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:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "ZTP hack" msgstr "ZTP hack" @@ -5884,14 +6414,19 @@ msgstr "[Personnalisé]" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 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." @@ -5913,7 +6448,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5930,7 +6465,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:447 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT : Lecture de l'Opcode depuis %x. Merci de nous le signaler." @@ -5938,7 +6473,9 @@ 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:461 msgid "s" @@ -5949,7 +6486,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Commande inconnue 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute a retourné -1 sur l'exécution de l'application !" @@ -6061,9 +6598,6 @@ msgstr "| OR" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "Impossible d'ouvrir %s, une fonction manque" -#~ msgid "Cannot record movies in read-only mode." -#~ msgstr "Impossible d'enregistrer des films en mode Lecture seule." - #~ msgid "Config..." #~ msgstr "Configurer..." @@ -6163,6 +6697,9 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "Paramètres graphiques de l'émulateur" +#~ msgid "Enable Bounding Box Calculation" +#~ msgstr "Activer le calcul de la boît de saut" + #~ msgid "Enable CPU Access" #~ msgstr "Activer l'accès CPU" @@ -6221,6 +6758,13 @@ msgstr "| OR" #~ msgid "Error allocating buffer" #~ msgstr "Erreur d'allocation du buffer" +#~ msgid "" +#~ "Error in PlayWiimote. %u != %u, byte %d.\n" +#~ "Sorry, Wii recording is temporarily broken." +#~ msgstr "" +#~ "Erreur dans PlayWiimote. %u != %u, octet %d.\n" +#~ "Désolé, l'enregistrement Wii est temporairement instable." + #~ msgid "Error loading %s: can't read info" #~ msgstr "Erreur lors du chargement de %s : inpossible de lire l'info" @@ -6233,6 +6777,13 @@ msgstr "| OR" #~ msgid "Error opening file %s for recording" #~ msgstr "Erreur d'ouverture du fichier %s pour l'enregistrement" +#~ msgid "" +#~ "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +#~ "Aborting savestate load..." +#~ msgstr "" +#~ "Erreur : Apres \"%s\", %d (0x%X) a été trouvé au lieu du marqueur de " +#~ "sauvegarde %d (0x%X). Abandon du chargement de la sauvegarde d'état..." + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6271,6 +6822,9 @@ msgstr "| OR" #~ "en ont besoin pour fonctionneer correctement, mais peut être aussi très " #~ "lent." +#~ msgid "GCMic Configuration" +#~ msgstr "Configuration du micro de la GC" + #~ msgid "GFX Config" #~ msgstr "Configurer..." @@ -6294,6 +6848,13 @@ msgstr "| OR" #~ "Si un jeu bloque, fonctionne seulement avec l'Interpreteur ou que Dolphin " #~ "plante, cette option peut corriger le jeu." +#~ 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 de saut seront mis à jour. Utilisé " +#~ "par les jeux Paper Mario." + #~ msgid "Input Source" #~ msgstr "Source d'entrée" @@ -6382,6 +6943,15 @@ msgstr "| OR" #~ " Exécutez-vous Dolphin à partir d'un média en lecture seule ou d'un " #~ "dossier d'où Dolphin n'est pas situé ?" +#~ msgid "Premature movie end in PlayController. %u + 8 > %u" +#~ msgstr "Fin prématurée du film dans PlayController. %u + 8 > %u" + +#~ msgid "Premature movie end in PlayWiimote. %u + %d > %u" +#~ msgstr "Fin prématurée du film dans PlayWiimote. %u + %d > %u" + +#~ msgid "Premature movie end in PlayWiimote. %u > %u" +#~ msgstr "Fin prématurée du film dans PlayWiimote. %u > %u" + #~ msgid "Projection Stats" #~ msgstr "Stats de projection" @@ -6507,6 +7077,9 @@ msgstr "| OR" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Démarrer la fenêtre de rendu en plein écran." +#~ msgid "TaruKonga (Bongos)" +#~ msgstr "TaruKonga (Bongos)" + #~ msgid "The file " #~ msgstr "Le fichier " @@ -6521,13 +7094,6 @@ msgstr "| OR" #~ msgstr "" #~ "Le type de configuration %d n'est pas pris en charge dans le plug-in %s" -#~ msgid "" -#~ "Unknown pointer %#08x\n" -#~ "Continue?" -#~ msgstr "" -#~ "Pointeur inconnu %#08x\n" -#~ "Continuer ?" - #~ msgid "Use FPS For Limiting" #~ msgstr "Utiliser les FPS pour limiter" @@ -6558,6 +7124,60 @@ msgstr "| OR" #~ "Attendre les blancs verticaux (ou synchro verticale).\n" #~ "Réduit les sauts mais peut aussi baisser les performances" +#~ 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 actuel. (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 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 ne correspond " +#~ "pas à 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. " +#~ "Autrement, vous aurez probablement une désynchronisation." + +#~ 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" +#~ "\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" +#~ "\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" +#~ msgstr "" +#~ "Attention : vous avez chargé une sauvegarde dont le film ne correspond " +#~ "pas à l'image %d. Vous devriez charger une autre sauvegarde avant de " +#~ "continuer, ou charger cet état en désactivant le mode Lecture seule. " +#~ "Autrement, vous aurez probablement une désynchronisation.\n" +#~ "\n" +#~ "Infos complémentaires : Le film actuel fait %d images et alors que le " +#~ "film de la sauvegarde d'état fait %d images.\n" +#~ "\n" +#~ "A l'image %d, le film actuel appuie sur :\n" +#~ "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DHaut=%d, DBas=%d, DGauche=%d, " +#~ "DDroit=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=" +#~ "%d\n" +#~ "\n" +#~ "A l'image %d, le film de la sauvegarde d'état appuie sur :\n" +#~ "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DHaut=%d, DBas=%d, DGauche=%d, " +#~ "DDroit=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" + #~ msgid "" #~ "When using EFB to RAM we very often need to decode RAM data to a VRAM " #~ "texture, which is a very time-consuming task.\n" diff --git a/Languages/po/hu.po b/Languages/po/hu.po index 2a61a06212..4e43ee3092 100644 --- a/Languages/po/hu.po +++ b/Languages/po/hu.po @@ -12,8 +12,12 @@ msgstr "" "PO-Revision-Date: 2011-12-18 13:41-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" +<<<<<<< HEAD "PO-Revision-Date: 2011-06-04 14:29+0100\n" >>>>>>> Update translation files for recent changes in the code. +======= +"PO-Revision-Date: 2011-12-20 17:22-0600\n" +>>>>>>> Update Hungarian and Turkish translations. "Last-Translator: Delirious \n" "Language-Team: Delirious \n" "Language: Hungarian\n" @@ -80,10 +84,14 @@ msgstr "%s tisztítása sikertelen. Valószínűleg a képfájl sérült." #: Source/Core/Core/Src/HW/GCMemcard.cpp:97 <<<<<<< HEAD +<<<<<<< HEAD #, c-format ======= #, fuzzy, c-format >>>>>>> Update translation files for recent changes in the code. +======= +#, c-format +>>>>>>> Update Hungarian and Turkish translations. msgid "" "%s failed to load as a memorycard \n" " Card file size is invalid (0x%x bytes)" @@ -93,10 +101,14 @@ msgstr "" #: Source/Core/Core/Src/HW/GCMemcard.cpp:112 <<<<<<< HEAD +<<<<<<< HEAD #, c-format ======= #, fuzzy, c-format >>>>>>> Update translation files for recent changes in the code. +======= +#, c-format +>>>>>>> Update Hungarian and Turkish translations. msgid "" "%s failed to load as a memorycard \n" " Card size is invalid (0x%x bytes)" @@ -443,9 +455,12 @@ msgstr "Pontos VBeam emuláció" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Hungarian and Turkish translations. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -685,6 +700,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Változtatható Wiimote idÅ‘zítés" ======= @@ -692,6 +708,10 @@ msgstr "Változtatható Wiimote idÅ‘zítés" msgid "Alternate Wiimote Timing" msgstr "Emulált Wiimote" >>>>>>> Update translation files for recent changes in the code. +======= +msgid "Alternate Wiimote Timing" +msgstr "Változtatható Wiimote idÅ‘zítés" +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -1002,11 +1022,22 @@ msgstr "Mégsem" msgid "Cannot open %s" msgstr "%s nem nyitható meg" +<<<<<<< HEAD +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 +msgid "Cannot record movies in read-only mode." +msgstr "A mozgások rögzítése nem lehetséges írásvédett módban." + +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "Nem lehet események bejegyzéseket törölni függÅ‘ben lévÅ‘ eseményekkel" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +>>>>>>> Update Hungarian and Turkish translations. #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -2854,9 +2885,12 @@ msgstr "Nagyobb mint" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Hungarian and Turkish translations. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -5143,9 +5177,12 @@ msgstr "TAJVAN" #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Hungarian and Turkish translations. msgid "TAS Input" msgstr "TAS bemenet" @@ -6261,6 +6298,9 @@ msgstr "| VAGY" #~ msgid "Emulator Display Settings" #~ msgstr "Emulátor kijelzÅ‘ beállítások" +#~ msgid "Enable Bounding Box Calculation" +#~ msgstr "Bounding Box kalkuláció használata" + #~ msgid "Enable CPU Access" #~ msgstr "Processzor hozzáférés engedélyezése" @@ -6318,6 +6358,13 @@ msgstr "| VAGY" #~ msgid "Error allocating buffer" #~ msgstr "Puffer kiosztási hiba" +#~ msgid "" +#~ "Error in PlayWiimote. %u != %u, byte %d.\n" +#~ "Sorry, Wii recording is temporarily broken." +#~ msgstr "" +#~ "PlayWiimote hiba. %u != %u, bájt %d.\n" +#~ "Sajnos a Wii videó rögzítés egyenlÅ‘re nem működik." + #~ msgid "Error loading %s: can't read info" #~ msgstr "Hiba a(z) %s betöltése közben: az infó nem olvasható" @@ -6330,6 +6377,13 @@ 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 "" +#~ "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +#~ "Aborting savestate load..." +#~ msgstr "" +#~ "Hiba: \"%s\" után, %d (0x%X) található a mentési jelölÅ‘ helyett %d (0x" +#~ "%X). Mentés betöltésének leállítása..." + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6367,6 +6421,9 @@ msgstr "| VAGY" #~ "Ez sokkal pontosabb mint az EFB másolás textúrába, és néhány játékhoz " #~ "szükséges a megfelelÅ‘ működéshez, ugyanakkor nagyon lassú is lehet." +#~ msgid "GCMic Configuration" +#~ msgstr "GCMic beállítások" + #~ msgid "GFX Config" #~ msgstr "GFX beállítások" @@ -6390,6 +6447,13 @@ 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 "" +#~ "If checked, the bounding box registers will be updated. Used by the Paper " +#~ "Mario games." +#~ msgstr "" +#~ "Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper " +#~ "Mario játékok használják." + #~ msgid "Input Source" #~ msgstr "Bemeneti forrás" @@ -6479,6 +6543,15 @@ msgstr "| VAGY" #~ " A Dolphin emulátort csak olvasható eszközrÅ‘l futtatod vagy egy olyan " #~ "könyvtárból amely nem tartalmazza az emulátort?" +#~ msgid "Premature movie end in PlayController. %u + 8 > %u" +#~ msgstr "Túl korai PlayController videó befejezés. %u + 8 > %u" + +#~ msgid "Premature movie end in PlayWiimote. %u + %d > %u" +#~ msgstr "Túl korai PlayWiimote videó befejezés. %u + %d > %u" + +#~ msgid "Premature movie end in PlayWiimote. %u > %u" +#~ msgstr "Túl korai PlayWiimote videó befejezés. %u > %u" + #~ msgid "Projection Stats" #~ msgstr "Kivetítési statisztikák" @@ -6598,6 +6671,9 @@ msgstr "| VAGY" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "A megjelenítési ablak teljes képernyÅ‘s módban indul." +#~ msgid "TaruKonga (Bongos)" +#~ msgstr "TaruKonga (Bongos)" + #~ msgid "The file " #~ msgstr "A fájl" @@ -6647,6 +6723,60 @@ msgstr "| VAGY" #~ "Várakozás a függÅ‘leges képkioltásra.\n" #~ "Csökkenti a képszakadást de egyben a teljesítményt is." +#~ 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 "" +#~ "Figyelem: Olyan mentést töltöttél be, ami a választott videó befejezése " +#~ "utáni. (%u > %u bájt) (%u > %u képkocka). Folytatás elÅ‘tt betölthetsz egy " +#~ "másik mentést, vagy betöltheted ezt a mentést az írásvédett mód " +#~ "kikapcsolása után." + +#~ 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 "" +#~ "Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d (0x%X) bájt " +#~ "eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy " +#~ "betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ " +#~ "esetben szinkronizációs hibák jelentkezhetnek." + +#~ 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" +#~ "\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" +#~ "\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" +#~ msgstr "" +#~ "Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d képkocka " +#~ "eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy " +#~ "betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ " +#~ "esetben szinkronizációs hibák jelentkezhetnek.\n" +#~ "\n" +#~ "BÅ‘vebb információk: A választott videó %d képkocka hosszú, a mentett " +#~ "állás videója pedig %d képkocka hosszú.\n" +#~ "\n" +#~ "%d képkockánál a videó tömörítve lesz:\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 képkockánál a mentett állás videója tömörítve lesz:\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" + #~ msgid "" #~ "When using EFB to RAM we very often need to decode RAM data to a VRAM " #~ "texture, which is a very time-consuming task.\n" diff --git a/Languages/po/tr.po b/Languages/po/tr.po index fe7e7a4688..fe4f784856 100644 --- a/Languages/po/tr.po +++ b/Languages/po/tr.po @@ -11,8 +11,12 @@ msgstr "" "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-08-19 08:38-0500\n" +======= +"PO-Revision-Date: 2011-12-20 19:22+0200\n" +>>>>>>> Update Hungarian and Turkish translations. "Last-Translator: nlgzrgn \n" "Language-Team: nlgzrgn \n" "Language: Turkish\n" @@ -363,7 +367,7 @@ msgstr "Bir NetPlay penceresi zaten açık!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 msgid "A game is not currently running." -msgstr "Bir oyun ÅŸu anda çalışmıyor." +msgstr "Bir oyun ÅŸu anda düzgün çalışmıyor." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 msgid "" @@ -410,7 +414,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" -msgstr "AM-Süpürgelik" +msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 @@ -434,7 +438,6 @@ msgid "Accurate VBeam emulation" msgstr "DoÄŸru VBeam Emülasyonu" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -#, fuzzy msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -442,11 +445,10 @@ msgid "" "\n" "If unsure, check EFB to Texture instead." msgstr "" -"EFB kopyalarını doÄŸru bir ÅŸekilde emüle eder. \n" -"Bazı oyunlar iÅŸlevsellik veya belirli görsel efektler için buna ihtiyaç " -"duyar. \n" +"EFB kopya emülasyonunun gerçekçiliÄŸini artırır. \n" +"Bazı oyunlarda belirli görsel efektler için bu ayarın açık olması gerekir. \n" "\n" -"Emin deÄŸilseniz, iÅŸaretli bırakı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 @@ -666,15 +668,14 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"3, 4, 5, 6 ve 7 tuÅŸlarıyla emülasyon penceresinde belirli seçeneklere geçiÅŸ " +"3, 4, 5, 6 ve 7 tuÅŸlarıyla emülasyon penceresinde belirli seçeneklere geçiÅŸi " "saÄŸlar. \n" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -#, fuzzy msgid "Alternate Wiimote Timing" -msgstr "Taklit Wiimote" +msgstr "Alternatif Wiimote Zamanlaması" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -686,7 +687,7 @@ msgstr "KeskinleÅŸtirme:" #: Source/Core/DiscIO/Src/VolumeDirectory.cpp:317 msgid "Apploader is the wrong size...is it really an apploader?" -msgstr "Apploader boyutu yanlış...bu gerçekten bir apploader mı?" +msgstr "Apploader boyutu yanlış. Bu gerçekten bir apploader mı?" #: Source/Core/DiscIO/Src/VolumeDirectory.cpp:311 msgid "Apploader unable to load from file" @@ -706,7 +707,7 @@ msgid "" "\n" "If unsure, select (off)." msgstr "" -"Bir kare bitiÅŸinde sonradan iÅŸleme etkisi uygula. \n" +"Çerçevelerden sonra geç iÅŸleme etkisi uygula. \n" "\n" "Emin deÄŸilseniz, kapalı seçin." @@ -725,12 +726,13 @@ msgid "" "They will be gone forever!" msgstr "" "Bu dosyaları gerçekten silmek istiyor musunuz?\n" -"Ama geri döndürülemeyecekler!" +"Silindikten sonra bu dosyaları geri döndüremezsiniz!" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -"Bu dosyayı gerçekten silmek istiyor musunuz? Ama geri döndürülemeyecektir!" +"Bu dosyayı gerçekten silmek istiyor musunuz? Silindikten sonra bu dosyaları " +"geri döndüremezsiniz!" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -743,7 +745,7 @@ msgstr "En-boy Oranı:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:69 msgid "At least one pane must remain open." -msgstr "En azından bir bölme açık kalmalıdır." +msgstr "En az bir bölme açık kalmalıdır." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" @@ -751,7 +753,7 @@ msgstr "Ses" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" -msgstr "Ses Arka Ucu:" +msgstr "Ses Çözücüsü:" #: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 msgid "AudioCommon: Error opening AO device.\n" @@ -795,8 +797,8 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Mipmapleri hafızadan dekode etmek yerine otomatik olarak yarat. \n" -"Performansı artırır ama bazı küçük doku hatalarına neden olabilir. \n" +"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." @@ -806,12 +808,12 @@ msgstr "Geri" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" -msgstr "Arka Uç Ayarları" +msgstr "Çözücü Ayarları" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" -msgstr "Arka Uç:" +msgstr "Çözücü:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 @@ -820,7 +822,7 @@ msgstr "Arkaplanda GiriÅŸ" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:279 msgid "Backward" -msgstr "Geriye doÄŸru" +msgstr "Geri" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264 msgid "Bad File Header" @@ -903,7 +905,7 @@ msgstr "Eklemek için bir klasöre gözat" #: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Browse for an ISO directory..." -msgstr "Bir kalıp konumu için gözat" +msgstr "Bir kalıp konumu için gözat..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" @@ -948,7 +950,7 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"3 Boyutlu görüntülerin derinlik deÄŸerlerini vertex yerine piksel başına " +"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" @@ -963,10 +965,10 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"3 Boyutlu görüntülerin aydınlatılmasını vertex yerine piksel başına " +"3 Boyutlu görüntülerin aydınlatılmasını vertex yerine piksel olarak " "hesaplar. \n" -"Emülasyon hızını (iÅŸlemciye baÄŸlı olarak) biraz düşürür. \n" -"Bu genelde güvenli bir donanımdır, ama bazen sorunlara neden olabilir. \n" +"Emülasyon hızını (GPU'ya baÄŸlı olarak) biraz düşürebilir. \n" +"Bu genelde güvenlidir, ama bazen sorunlara neden olabilir. \n" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." @@ -980,7 +982,7 @@ msgstr "Ä°ptal" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240 #, c-format msgid "Cannot open %s" -msgstr "%s 'yi açmayı iptal et" +msgstr "%s açılamadı." #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" @@ -1020,7 +1022,7 @@ msgstr "Sap baÄŸlantısı ile Wiimote bulunamadı: %02x" #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" -msgstr "DVD Eklentisinden okunamıyor - DVD-Arabirimi : Ölümcül Hata" +msgstr "DVD Eklentisinden okunamıyor - DVD-Arabirimi : Önemli Hata" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:49 msgid "Caps Lock" @@ -1061,16 +1063,17 @@ msgstr "" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:59 msgid "Changes sign to zFar Parameter (after correction)" -msgstr "zFar Parametresine iÅŸaret deÄŸiÅŸtirir (düzeltme sonrası)" +msgstr "zFar Parametresinin iÅŸaretini deÄŸiÅŸtirir (düzeltme sonrası)" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:54 msgid "Changes sign to zNear Parameter (after correction)" -msgstr "zNear Parametresine iÅŸaret deÄŸiÅŸtirir (düzeltme sonrası)" +msgstr "zNear Parametresinin iÅŸaretini deÄŸiÅŸtirir (düzeltme sonrası)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" -msgstr "Emülatör çalışırken deÄŸiÅŸtirirseniz etki etmeyecektir!" +msgstr "" +"Emülatör çalışırken deÄŸiÅŸtirirseniz herhangi bir etkisini göremezsiniz!" #: Source/Core/DolphinWX/Src/NetWindow.cpp:282 msgid "Chat" @@ -1316,7 +1319,7 @@ msgstr "%s oluÅŸturulamadı." #: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 #, c-format msgid "Could not initialize backend %s." -msgstr "Arkauç %s baÅŸlatılamadı." +msgstr "Çözücü %s baÅŸlatılamadı." #: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format @@ -1357,8 +1360,7 @@ msgid "" msgstr "" "Hafıza kartı dosyası %s yazılamadı. \n" "\n" -"Dolphin'i bir CD veya DVD'den çalıştırıyor olabilir misiniz veya kayıt " -"dosyası yazma korumalı olabilir mi?" +"Dolphin'i bir CD/DVD'den çalıştırıyorsunuz veya kayıt dosyası yazma korumalı." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" @@ -1446,11 +1448,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" -msgstr "Özel Projeksiyon Hilesi" +msgstr "Özel Görüntüleme Hilesi" #: Source/Core/DolphinWX/Src/PHackSettings.h:30 msgid "Custom Projection Hack Settings" -msgstr "Özel Projeksiyon Hilesi Ayarları" +msgstr "Özel Görüntüleme Hilesi Ayarları" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." @@ -1587,8 +1589,7 @@ msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." msgstr "" -"Dışarı tampon DVD içine sığacak veriden daha fazla veri almak için giriÅŸimde " -"algılandı. Kelepçe." +"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 @@ -1618,7 +1619,7 @@ msgid "" " and Directory backup checksum failed" msgstr "" "Konum doÄŸrulama baÅŸarısız \n" -"ve Konum yedeÄŸi doÄŸrulama da baÅŸarısız" +"ve konum yedeÄŸi doÄŸrulama da baÅŸarısız." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 @@ -1649,9 +1650,9 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Herhangi bir XFB emülasyonunu iptal et. \n" -"Emülasyonu bayağı hızlandırır ama onlara dayanıklı oyunlarda (özellikle " -"homebrew uygulamalarında) ağır hatalara neden olabilir.\n" +"XFB emülasyonunu iptal et. \n" +"Emülasyonu çok hızlandırır ama onlara dayanıklı oyunlarda (özellikle " +"homebrew uygulamalarında) önemli hatalara neden olabilir.\n" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." @@ -1665,9 +1666,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "EFB kopyalarının emülasyonunu iptal et. \n" -"Bunlar genelde yorumlamadan dokuya olan efektlerin sonradan iÅŸlenmesinde " -"kullanılır, bunun için de bu ayarı açmak çoÄŸu zaman hataya neden olan büyük " -"bir hızlanma saÄŸlar. \n" +"Bunlar genelde render-to-texture efektlerinin geç iÅŸlenmesinde kullanılır, " +"bu ayarı açmak büyük bir hızlanma saÄŸlar ama çoÄŸu zaman önemli hatalara " +"neden olabilir. \n" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." @@ -1772,7 +1773,7 @@ msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" -"Dolphin herhangi bir GC veya Wii kalıbı bulamadı. Buraya çift tıklatarak " +"Dolphin herhangi bir GC veya Wii kalıbı bulamadı. Buraya çift tıklatarak " "dosyalara göz atabilirsiniz..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 @@ -1781,7 +1782,7 @@ msgid "" "games..." msgstr "" "Dolphin ÅŸu anda oyunları gizlemeye ayarlıdır. Buraya çift tıklatarak tüm " -"oyunları görebilirsiniz..." +"oyunları görebilirsiniz." #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -1790,7 +1791,7 @@ msgstr "AÅŸağı" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 msgid "Download Codes (WiiRD Database)" -msgstr "WiiRD Veritabanından Kod Ä°ndir" +msgstr "Kodları Ä°ndir (WiiRD Veritabanı)" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 #, c-format @@ -1827,8 +1828,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Tüm yorumlanan kareleri User/Dump/Frames içerisine bir AVI dosyası olarak " -"dök \n" +"Yorumlanan çerçeveleri User/Dump/Frames içerisine bir AVI dosyası olarak " +"kaydet. \n" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." @@ -1838,7 +1839,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Çözülen oyun dokularını User/Dump/Textures// konumuna dök. \n" +"Çözülen oyun dokularını User/Dump/Textures// konumuna kaydet. \n" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." @@ -1848,7 +1849,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"EFB kopyalarının içeriÄŸini User/Dump/Textures içine dök \n" +"EFB kopyalarının içeriÄŸini User/Dump/Textures içine kaydet. \n" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." @@ -1881,9 +1882,8 @@ msgid "" "driver." msgstr "" "HATA: Dolphin'in bu sürümü bir TAP-Win32 sürücüsü gerektirir ve bu sürücü en " -"azından %d. %d sürümü olmalıdır. --- EÄŸer Dolphin'i sürekli " -"güncelliyorsanız, Windows'un sürücüyü görmesi için yeniden baÅŸlatma " -"gerekebilir." +"azından %d.%d sürümü olmalıdır. --- EÄŸer Dolphin'i sürekli güncelliyorsanız, " +"Windows'un sürücüyü görmesi için yeniden baÅŸlatma gerekebilir." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 msgid "EUROPE" @@ -1924,7 +1924,7 @@ msgstr "Etki" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" -msgstr "Gömülü Kare Tamponu" +msgstr "Gömülü Çerçeve Tamponu" #: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" @@ -1938,9 +1938,9 @@ msgid "" "\n" "If unsure, check virtual XFB emulation instead." msgstr "" -"XFB'lerin doÄŸruluÄŸunu emüle et. \n" -"Hızı bayağı düşürür ve yüksek çözünürlükte yorumlamayı engeller ama bazı " -"oyunları düzgün çalıştırabilmek için gereklidir. \n" +"XFB'leri daha gerçekçi bir ÅŸekilde emüle et. \n" +"Hızı çok düşürür, yüksek çözünürlükte yorumlamayı engeller, ama bazı " +"oyunların düzgün çalışması için gereklidir. \n" "\n" "Emin deÄŸilseniz, bunun yerine sanal XFB emülasyonunu seçin." @@ -1954,9 +1954,9 @@ msgid "" "If unsure, leave this checked." msgstr "" "XFB'leri GPU doku nesneleriyle emüle et. \n" -"XFB emülasyonu olmadan çalışmayan oyunların gerçek XFB emülasyonu kadar " -"kasmadan çalıştırır. Ancak, yine de diÄŸer birçok oyunda (özellikle homebrew " -"uygulamalarında) baÅŸarısız olabilir. \n" +"XFB emülasyonu olmadan çalışmayan oyunları, gerçek XFB emülasyonu gibi " +"yavaÅŸlamadan çalıştırır. Ancak, yine de diÄŸer birçok oyunda (özellikle " +"homebrew uygulamalarında) baÅŸarısız olabilir. \n" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." @@ -2013,7 +2013,7 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" -msgstr "ÖnbelleÄŸe izin ver" +msgstr "Ön BelleÄŸe Ä°zin Ver" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2078,7 +2078,7 @@ msgid "" msgstr "" "Filtrelemeyi etkinleÅŸtirir. \n" "Özellikle eÄŸik açılı dokuların görsel kalitesini artırır. \n" -"Çok az oyunda bazı hatalara neden olabilir. \n" +"Oyunların çok azında bazı hatalara neden olabilir. \n" "\n" "Emin deÄŸilseniz, 1x seçin." @@ -2134,12 +2134,13 @@ msgid "" "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " "Fast)" msgstr "" -"Blok Adresi Çevirisine izin verir. Bu bir Hafıza Yönetim Ãœnitesi iÅŸlevidir. " -"DoÄŸruluÄŸu artırır ama performansı düşürür. (Açık = Uyumlu, Kapalı = Hızlı)" +"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:337 msgid "Enables Custom Projection Hack" -msgstr "Özel Projeksiyon Hilesini EtkinleÅŸtirir" +msgstr "Özel Gösterim Hilesini EtkinleÅŸtirir" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" @@ -2148,7 +2149,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"EÄŸer emüle edilen yazılım destekliyorsa, progresif taramayı etkinleÅŸtirir.\n" +"EÄŸer yazılım desteÄŸi varsa, progresif taramayı etkinleÅŸtirir.\n" "Oyunların çoÄŸu bunu umursamaz.\n" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." @@ -2247,8 +2248,8 @@ msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" -"Hata: %s yazı tiplerine ulaÅŸmayı denedik,ama yüklenemediler. Oyunlar yazı " -"tiplerini düzgün göstermeyecek veya çakılacaklar." +"Hata: %s yazı tipleri düzgün yüklenemedi. Oyunlardaki yazılar düzgün " +"görüntülenemeyebilir, veya oyunlar çakılabilir." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2294,7 +2295,7 @@ msgstr "Kaydı Ver" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" -msgstr "Wii Kayıtlı Oyununu Ver (Deneysel)" +msgstr "Wii Kayıtlı Oyununu Ver (Deneme Amaçlı)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 msgid "Export all saves" @@ -2314,7 +2315,7 @@ msgstr "Uzantı" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" -msgstr "Harici Kare Tamponu" +msgstr "Harici Çerçeve Tamponu" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:60 msgid "Extra Parameter" @@ -2367,7 +2368,7 @@ msgstr "GeniÅŸletiliyor..." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 msgid "FIFO Byte" -msgstr "FIFO Baytı" +msgstr "FIFO Bayt'ı" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:38 msgid "FIFO Player" @@ -2490,7 +2491,7 @@ msgstr "" #: Source/Core/DiscIO/Src/VolumeGC.cpp:61 msgid "Failed to read unique ID from disc image" -msgstr "Disk kalıbından eÅŸsiz ID okunamadı." +msgstr "Disk kalıbının Unique ID'si okunamadı." #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:83 msgid "Failed to write BT.DINF to SYSCONF" @@ -2516,7 +2517,7 @@ msgstr "Hızlı" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Fast Mipmaps" -msgstr "Hızlı Mipmap'lar" +msgstr "Hızlı MipMap'ler" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." @@ -2594,7 +2595,7 @@ msgstr "4:3 'e zorla" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Force Console as NTSC-J" -msgstr "Konsolu NTSC-J Olarak Zorla" +msgstr "Konsolu NTSC-J Olmaya Zorla" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" @@ -2608,7 +2609,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Oyun kabul etmese de doku filtresini açar. \n" -"Doku kalitesini artırır ama bazı oyunlarda hatalara neden olabilir. \n" +"Doku kalitesini artırır ama bazı oyunlarda hatalara neden olur. \n" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." @@ -2620,7 +2621,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Oyunun görüntüsünü geniÅŸ ekrana uydurur. \n" -"Bazı oyunlarda görüntü hatalarına neden olabilir. \n" +"Bazı oyunlarda görüntü hatalarına neden olur. \n" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." @@ -2649,36 +2650,36 @@ msgstr "Ä°leri" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Frame" -msgstr "Kare" +msgstr "Çerçeve" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Frame " -msgstr "Kare" +msgstr "Çerçeve" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" -msgstr "GeliÅŸmiÅŸ Kareleme" +msgstr "GeliÅŸmiÅŸ Çerçeveleme" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" -msgstr "Kare dökümünde FFV1 kullan" +msgstr "Çerçeve dökümünde FFV1 kullan" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105 msgid "Frame Range" -msgstr "Kare Aralığı" +msgstr "Çerçeve Aralığı" #: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Frame S&kipping" -msgstr "&Kare Atlama" +msgstr "Çerçeve Atlama(&K)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" -msgstr "Kare Sınırı:" +msgstr "Çerçeve Sınırı:" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189 msgid "Frames To Record" -msgstr "Çekilecek Kareler" +msgstr "Çekilecek Çerçeveler" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" @@ -2830,7 +2831,6 @@ msgid "Greater Than" msgstr "Daha Büyük" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -#, fuzzy msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2840,8 +2840,9 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Dokuya yorumlama efektlerinde kullanılan doku kalitesini bayağı artırır. \n" +"Render-to-texture efektlerinde kullanılan doku kalitesini bayağı artırır. \n" "İç çözünürlüğü yükseltmek bu ayarın etkisini artırır. \n" +"Performansı düşürüp, hatalara neden olabilir. \n" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." @@ -3018,15 +3019,15 @@ msgstr "" msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -"Saniyedeki kare sayısı düzensizse, bu seçenek size yardım edebilir. (Açık = " -"Uyumlu, Kapalı = Hızlı)" +"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 msgid "" "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." msgstr "" -"EÄŸer kare sınırını oyun hızından yüksek seçerseniz (NTSC:60, PAL:50), ses " +"EÄŸer çerçeve sınırını oyun hızından yüksek seçerseniz (NTSC:60, PAL:50), ses " "ayarlarında Ses hızlandırmasını da iptal ederek bunu daha etkili " "kılabilirsiniz." @@ -3828,7 +3829,7 @@ msgstr "Hiçbiri" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" -msgstr "Norveççe" +msgstr "Norveççe (Bokmaal Lehçesi)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Not Equal" @@ -4147,7 +4148,7 @@ msgstr "Portekizce (Brezilya)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" -msgstr "Sonradan Ä°ÅŸleme Etkisi:" +msgstr "Geç Ä°ÅŸleme Etkisi:" #: Source/Core/Core/Src/Movie.cpp:735 #, c-format @@ -4291,8 +4292,8 @@ msgid "" "If unsure, select None." msgstr "" "3D Görüntü yüzünden oluÅŸan bozulmayı azaltır. \n" -"Görüntünün daha az bloklu görünmesini saÄŸlar ama performansı çok düşürür.\n" -"Emülasyon hızını çok kötü düşürür ve bazen hatalara neden olur. \n" +"Görüntünün daha kaliteli olmasını saÄŸlar ama performansı çok düşürür.\n" +"Emülasyon hızını çok düşürür ve bazen hatalara neden olur. \n" "\n" "Emin deÄŸilseniz, hiçbiri seçin." @@ -4542,7 +4543,7 @@ msgid "" "\n" "If unsure, use the first one." msgstr "" -"Kullanmak için bir donanım adaptörü seçin. \n" +"Kullanmak için bir çevirici seçin. \n" "\n" "Emin deÄŸilseniz, ilkini kullanın." @@ -4593,7 +4594,7 @@ msgid "" "If unsure, select Auto." msgstr "" "Yorumlarken kullanılacak en-boy oranını seçin:\n" -"Otomatik: DoÄŸal en-boy oranını kullanır (4:3)\n" +"Otomatik: DoÄŸal en-boy oranını kullanır\n" "16:9'a Zorla: En-boy oranını 16:9 yapar. \n" "4:3'e Zorla: En-boy oranını 4:3 yapar. \n" "Pencereye göre: Görüntüyü pencereye göre yorumlar. \n" @@ -4630,8 +4631,8 @@ msgid "" "If unsure, use Direct3D 9." msgstr "" "Hangi görüntü API'sinin kullanılacağını seçer.\n" -"DirectX 9 genelde en hızlı olanlarıdır. OpenGL doÄŸruluÄŸa önem verir. DirectX " -"11 ikisinin arasıdır.\n" +"DirectX 9 genelde en hızlı olanlarıdır. OpenGL gerçekçiliÄŸe önem verir. " +"DirectX 10/11 ikisinin arasıdır.\n" "Åžunu unutmayın, DirectX 9 sadece Windows'da kullanılabilir.\n" "\n" "Emin deÄŸilseniz, DirectX 9 seçin." @@ -4829,7 +4830,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Emülasyon hızını ölçmek için 1 saniye içerisinde yorumlanan kare sayısını " +"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." @@ -4874,7 +4875,7 @@ msgstr "Hedef Alpha GeçiÅŸini Atla" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" -msgstr "CPU'dan EFB eriÅŸimini atla" +msgstr "CPU'dan EFB'ye eriÅŸimi atla" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" @@ -4883,7 +4884,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ÇoÄŸu oyunda çeÅŸitli görsel efektler için hedef alfa geçiÅŸini atla. \n" +"ÇoÄŸu oyunda çeÅŸitli görsel efektler için hedef alpha geçiÅŸini atla. \n" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." @@ -4896,11 +4897,10 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"DoÄŸruluktan fedakarlık edip EFB'den RAM'a kopyalamayı biraz hızlandırır. \n" -"Bazen görsel kaliteyi de artırır. \n" -"EÄŸer herhangi bir sorun yaşıyorsanız, doku önbelleÄŸi doÄŸruluÄŸunu artırmayı " -"veya bu seçeneÄŸi iptal etmeyi deneyin. \n" -"\n" +"DoÄŸruluktan ödün vererek EFB'den RAM'e kopyalayı biraz hızlandırır. \n" +"Bazen bu görüntü kalitesini de artırır. \n" +"Herhangi bir sorun yaÅŸarsanız, bu seçeneÄŸi iptal etmeyi veya doku ön belleÄŸi " +"doÄŸruluÄŸunu artırmayı deneyin.\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 @@ -4932,7 +4932,7 @@ msgid "" "It's only useful for debugging purposes.\n" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -"Yazılım yorumlaması, diÄŸer arka uçlardan daha yavaÅŸtır.\n" +"Yazılım yorumlaması, diÄŸer çözücülerden daha yavaÅŸtır.\n" "Sadece hata ayıklamada kullanışlıdır.\n" "Yazılım yorumlamasını açmayı gerçekten istiyor musunuz? Emin deÄŸilseniz, " "'Hayır' seçin." @@ -5062,9 +5062,9 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"EFB kopyalarını GPU doku nesnelerinde sakla. \n" -"Pek doÄŸru deÄŸildir, ama çoÄŸu oyun için iyi çalışır ve EFB'den RAM'e " -"seçeneÄŸinden daha fazla hız verir. \n" +"EFB kopyalarını GPU doku nesnelerinde saklayın.\n" +"Bu pek doÄŸru deÄŸildir, ancak EFB'den RAM'e seçiliyken yeteri kadar iyi " +"çalışarak çoÄŸu oyunu hızlandırır.\n" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." @@ -5091,7 +5091,7 @@ msgstr "Kayıt dosyaları baÅŸarıyla alındı" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 msgid "Swing" -msgstr "Sapma" +msgstr "Hareket" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 @@ -5147,7 +5147,7 @@ msgstr "Doku" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 msgid "Texture Cache" -msgstr "Doku ÖnbelleÄŸi" +msgstr "Doku Ön BelleÄŸi" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" @@ -5218,8 +5218,8 @@ msgid "" "\n" "If unsure, use the second-fastest value from the right." msgstr "" -"Bunu ayarlamak daha güvenlidir, emülatörün RAM'den daha az doku güncellemesi " -"kaçırmasını saÄŸlar. \n" +"Bunu güvenli bir ÅŸekilde ayarlamanız, emülatörün RAM'den doku güncellemesi " +"kaybetme oranını azaltacaktır. \n" "\n" "Emin deÄŸilseniz, saÄŸdaki 2. en hızlı deÄŸeri kullanın." @@ -5322,8 +5322,9 @@ msgid "" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" "Bu seçenek oyun hızının sesle denetlenmesini saÄŸlar. \n" -"Ä°ptal ederseniz oyun hızında anormallik olabilir,mesela çok hızlı. \n" -"Ama bazen bunu iÅŸaretlemek sürekli gürültüye neden olabilir. \n" +"Ä°ptal ederseniz oyun hızında anormallik olabilir,mesela oyun çok hızlı " +"çalışabilir. \n" +"Ama bazen bunu iÅŸaretlemek gürültüye neden olabilir. \n" "\n" "Klavye Kısayolu : Hızlandırmayı anında iptal etmek için basılı tutun." @@ -5394,7 +5395,7 @@ msgstr "Geleneksel Çince" #: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." -msgstr "Bilinmeyen bir dosya türünü yüklemeye denedik." +msgstr "Bilinmeyen bir dosya türünü yüklemeyi denedi." #: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" @@ -5476,7 +5477,7 @@ msgstr "Bilinmeyen" #: Source/Core/Core/Src/HW/DVDInterface.cpp:894 #, c-format msgid "Unknown DVD command %08x - fatal error" -msgstr "Bilinmeyen DVD komutu %08x - ölümcül hata" +msgstr "Bilinmeyen DVD komutu %08x - önemli hata" #: Source/Core/Common/Src/SysConf.cpp:145 #, c-format @@ -5543,7 +5544,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Dokuları emüle etmek için birden fazla iÅŸlem birimi kullanın. \n" -"(Özellikle iki veya daha fazla çekirdeÄŸi olan iÅŸlemcilerde) hızı artırır. \n" +"Özellikle iki veya daha fazla çekirdeÄŸi olan iÅŸlemcilerde hızı artırır. \n" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." @@ -5567,7 +5568,7 @@ msgstr "Gereçler" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" -msgstr "Dikey Sync" +msgstr "Dikey EÅŸitleme" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 msgid "Value" @@ -5653,7 +5654,7 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" -"Uyarı: Bu,aÅŸağıdaki klasördeki herhangi bit kayıtlı oyunun üzerine " +"Uyarı: Bu,aÅŸağıdaki klasördeki herhangi bir kayıtlı oyunun üzerine " "yazılacak:\n" "%s\n" "ve hafıza kartınızdaki dosyayla aynı adda olacak.\n" @@ -5918,7 +5919,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "[BOZUK] \n" -"EFB'lerin kopyalandığı bölgeleri iÅŸaretle.\n" +"EFB'lerin kopyalandığı bölgeleri belirt.\n" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." @@ -5936,8 +5937,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"[DENEYSEL]\n" -"OpenCL kullanarak doku yorumlamasındaki yüklenmeyi azaltarak emülasyonu " +"[DENEME AMAÇLI]\n" +"OpenCL kullanarak doku yorumlamasındaki yüklenmeyi azaltır ve emülasyonu " "hızlandırır. \n" "Ancak, çeÅŸitli oyunlarda doku bozulmalarına neden olabilmektedir. Ayrıca " "çoÄŸu zaman CPU doku çözmesinden daha yavaÅŸtır. \n" @@ -5952,7 +5953,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"[DENEYSEL]\n" +"[DENEME AMAÇLI]\n" "Görüntü listelerini önbelleÄŸe alarak emülasyonu biraz hızlandırır. \n" "Bazı hatalara neden olabilir. \n" "\n" @@ -6017,11 +6018,13 @@ msgstr "| VEYA" #~ msgid "%d %%" #~ msgstr "%d %%" +#, fuzzy #~ msgid "&Frame Stepping" -#~ msgstr "&Kare Adımlama" +#~ msgstr "Çerçeve Atlama(&K)" +#, fuzzy #~ msgid "(Default)" -#~ msgstr "(Varsayılan)" +#~ msgstr "Varsayılan" #~ msgid "32,000 Hz" #~ msgstr "32,000 Hz" @@ -6041,14 +6044,17 @@ msgstr "| VEYA" #~ msgid "ALSA" #~ msgstr "ALSA" +#, fuzzy #~ msgid "AOSound" -#~ msgstr "AOSes" +#~ msgstr "&Ses" +#, fuzzy #~ msgid "Accurate Texture Cache" -#~ msgstr "DoÄŸru Doku ÖnbelleÄŸi" +#~ msgstr "Doku Ön BelleÄŸi" +#, fuzzy #~ msgid "Adjust window size" -#~ msgstr "Pencere boyutunu ayarlayın" +#~ msgstr "Pencere Boyutunu Otomatik Ayarla" #~ msgid "" #~ "Allows the CPU to read or write to the EFB (render buffer).\n" @@ -6106,44 +6112,57 @@ msgstr "| VEYA" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "%s açılamıyor, kayıp bir iÅŸleve sahip." +<<<<<<< HEAD #~ msgid "Cannot record movies in read-only mode." #~ msgstr "Salt-okunur modda film çekilemez." +======= +#, fuzzy +>>>>>>> Update Hungarian and Turkish translations. #~ msgid "Config..." #~ msgstr "Yapılandır..." +#, fuzzy #~ msgid "Configuration profile" -#~ msgstr "Yapılandırma Profili" +#~ msgstr "GeçmiÅŸ Yapılandırması" +#, fuzzy #~ msgid "Configuration profile:" -#~ msgstr "Yapılandırma Profili:" +#~ msgstr "GeçmiÅŸ Yapılandırması" +#, fuzzy #~ msgid "Connected" -#~ msgstr "BaÄŸlanıldı." +#~ msgstr "BaÄŸlan" +#, fuzzy #~ msgid "Connected to %i Wiimotes" -#~ msgstr "%i adet Wiimote'a baÄŸlanıldı." +#~ msgstr "Wiimote 1'i BaÄŸla" #~ msgid "Copy" #~ msgstr "Kopyala" +#, fuzzy #~ msgid "CoreAudio" -#~ msgstr "Ses ÇekirdeÄŸi" +#~ msgstr "Ses" +#, fuzzy #~ msgid "Could not copy %s to %s" -#~ msgstr "%s , %s 'e kopyalanamadı." +#~ msgstr "%s oluÅŸturulamadı." +#, fuzzy #~ msgid "Could not get info about plugin %s" -#~ msgstr "%s eklentisi hakkında bilgi alınamadı." +#~ msgstr "%s oluÅŸturulamadı." #~ msgid "DList Cache" #~ msgstr "D Listesi ÖnbelleÄŸi" +#, fuzzy #~ msgid "DSound" -#~ msgstr "DSound" +#~ msgstr "&Ses" +#, fuzzy #~ msgid "Danish" -#~ msgstr "Danca" +#~ msgstr "Ä°spanyolca" #~ msgid "Disable Wiimote Speaker" #~ msgstr "WiiMote Hoparlörünü Ä°ptal Et" @@ -6162,8 +6181,9 @@ msgstr "| VEYA" #~ "Alpha-ayar geçiÅŸini iptal eder. \n" #~ "Bazı etkiler iptal olur ama performansı artırabilir." +#, fuzzy #~ msgid "Distance Alpha Pass" -#~ msgstr "Uzaklık Alpha GeçiÅŸi" +#~ msgstr "Hedef Alpha GeçiÅŸini Atla" #~ msgid "Dolphin DSP-HLE Plugin" #~ msgstr "Dolphin DSP-HLE Eklentisi" @@ -6177,14 +6197,17 @@ msgstr "| VEYA" #~ msgid "Dolphin DSP-LLE Plugin Settings" #~ msgstr "Dolphin DSP-LLE Eklenti Ayarları" +#, fuzzy #~ msgid "Dolphin Direct3D11" -#~ msgstr "Dolphin DirectX 10/11" +#~ msgstr "DirectX 10/11" +#, fuzzy #~ msgid "Dolphin Direct3D9" -#~ msgstr "Dolphin DirectX 9" +#~ msgstr "DirectX 9" +#, fuzzy #~ msgid "Dolphin OpenGL" -#~ msgstr "Dolphin OpenGL" +#~ msgstr "Dolphin FIFO" #~ msgid "" #~ "Dolphin has not been configured with an install location,\n" @@ -6207,33 +6230,42 @@ msgstr "| VEYA" #~ msgid "Emulator Display Settings" #~ msgstr "Emülatör Görüntü Ayarları" +#~ msgid "Enable Bounding Box Calculation" +#~ msgstr "Sınırlayıcı Kutu Hesaplama'yı EtkinleÅŸtir" + +#, fuzzy #~ msgid "Enable CPU Access" -#~ msgstr "CPU EriÅŸimine Ä°zin Ver" +#~ msgstr "Ön BelleÄŸe Ä°zin Ver" #~ msgid "Enable Copy to EFB" #~ msgstr "EFB'ye Kopyalamaya Ä°zin Ver" +#, fuzzy #~ msgid "Enable EFB To Texture" -#~ msgstr "EFB'den Dokuya Ä°zin Ver" +#~ msgstr "Dokuları Ä°ptal Et" +#, fuzzy #~ msgid "Enable HLE Audio" -#~ msgstr "HLE Sesine Ä°zin Ver" +#~ msgstr "Ses Hızlandırmasına Ä°zin Ver" +#, fuzzy #~ msgid "Enable JIT Dynarec" -#~ msgstr "JIT Dynarec'e Ä°zin Ver" +#~ msgstr "Çift ÇekirdeÄŸe Ä°zin Ver" +#, fuzzy #~ msgid "Enable OpenCL" -#~ msgstr "OpenCL'ye Ä°zin Ver" +#~ msgstr "Sayfalara izin ver" +#, fuzzy #~ msgid "Enable Screen Saver (burn-in reduction)" -#~ msgstr "Ekran Koruyucuya Ä°zin Ver (Yanma redüksiyonu)" +#~ msgstr "Ekran Koruyucusuna Ä°zin Ver" +#, fuzzy #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" #~ msgstr "" -#~ "Ses kodunun dinamik yeniden derlenmesine izin verir. \n" -#~ "Emülatör çalışırken deÄŸiÅŸtirirseniz etki etmeyecektir!" +#~ "Emülatör çalışırken deÄŸiÅŸtirirseniz herhangi bir etkisini göremezsiniz!" #~ msgid "" #~ "Enables emulation of Embedded Frame Buffer copies, if the game uses " @@ -6264,6 +6296,13 @@ msgstr "| VEYA" #~ msgid "Error allocating buffer" #~ msgstr "Tampon ayırma hatası" +#~ msgid "" +#~ "Error in PlayWiimote. %u != %u, byte %d.\n" +#~ "Sorry, Wii recording is temporarily broken." +#~ msgstr "" +#~ "PlayWiimote'da hata. %u != %u, byte %d.\n" +#~ "Ãœzgünüz, Wii kaydında geçici hasar var." + #~ msgid "Error loading %s: can't read info" #~ msgstr "%s yüklenirken hata: Bilgi okunamıyor." @@ -6276,6 +6315,13 @@ msgstr "| VEYA" #~ msgid "Error opening file %s for recording" #~ msgstr "Kayıt için %s dosyasını açarken hata." +#~ msgid "" +#~ "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +#~ "Aborting savestate load..." +#~ msgstr "" +#~ "Hata: \"%s\" 'dan sonra, %d (0x%X) bulundu ( %d (0x%X) yerine). Durum " +#~ "kaydı yüklemesinden vazgeçiliyor..." + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6285,8 +6331,9 @@ msgstr "| VEYA" #~ "%s\n" #~ "DSP LLE Kullanabilmek için bu dosya gereklidir." +#, fuzzy #~ msgid "Failed to load DSP ROM: %s" -#~ msgstr "DSP ROM'u %s yükleme baÅŸarısız." +#~ msgstr "Kod indirme baÅŸarısız." #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " @@ -6296,11 +6343,13 @@ msgstr "| VEYA" #~ "Hızlı varyantlar daha az piksele bakar ve hata potansiyeli yüksektir. \n" #~ "YavaÅŸ varyantlar daha çok piksele bakar ve daha güvenlidir." +#, fuzzy #~ msgid "Force Bi/Trilinear Filtering" -#~ msgstr "Ä°ki/Üç Çizgili Filtreye Zorla" +#~ msgstr "Doku Filtrelemesine Zorla" +#, fuzzy #~ msgid "Fractional" -#~ msgstr "Kesirli" +#~ msgstr "Eylem" #~ msgid "" #~ "Fully emulate embedded frame buffer copies.\n" @@ -6311,14 +6360,20 @@ msgstr "| VEYA" #~ "Dokuya EFB Kopyalamaktan daha doÄŸrudur, ve bazı oyunlar düzgün çalışmak " #~ "için buna ihtiyaç duyar, ama çok yavaÅŸ olabilir." +#~ msgid "GCMic Configuration" +#~ msgstr "GCMic Yapılandırması" + +#, fuzzy #~ msgid "GFX Config" -#~ msgstr "Grafik Yapılandırması" +#~ msgstr "Yapılandırma" +#, fuzzy #~ msgid "Graphics Plugin" -#~ msgstr "Görüntü Eklentisi" +#~ msgstr "Görüntü" +#, fuzzy #~ msgid "Hide Shader Errors" -#~ msgstr "Gölgelendirici Hatalarını Gizle" +#~ msgstr "Disk Okuma Hatası" #~ msgid "" #~ "Hide the cursor when it is over the rendering window and the rendering " @@ -6333,24 +6388,34 @@ msgstr "| VEYA" #~ "EÄŸer bir oyun çakılırsa, sadece Interpreter'da çalışıyorsa veya Dolphin " #~ "çökerse, bu seçenek oyunu düzeltebilir." +#~ msgid "" +#~ "If checked, the bounding box registers will be updated. Used by the Paper " +#~ "Mario games." +#~ msgstr "" +#~ "EÄŸer iÅŸaretlenmiÅŸse, sınırlayıcı kutu kayıtları güncellenecektir. Paper " +#~ "Mario oyunları tarafından kullanılır." + #~ msgid "Input Source" #~ msgstr "GiriÅŸ Kaynağı" #~ msgid "Install directory could not be saved" #~ msgstr "Kurulum konumu kaydedilemedi." +#, fuzzy #~ msgid "Installing WAD to Wii Menu..." -#~ msgstr "WAD dosyası Wii Menüsüne kuruluyor..." +#~ msgstr "Wii Menüsüne kur" +#, fuzzy #~ msgid "Integral [recommended]" -#~ msgstr "Ä°ntegral [önerilen]" +#~ msgstr "JIT Yeniden Derleyici (önerilen)" +#, fuzzy #~ msgid "" #~ "Internal LZO Error - decompression failed (%d) (%ld, %ld) \n" #~ "Try verifying the state again" #~ msgstr "" -#~ "İç LZO Hatası - GeniÅŸletme baÅŸarısız (%d) (%ld, %ld) \n" -#~ "Durumu doÄŸrulamayı tekrar deneyin." +#~ "İç LZO Hatası - GeniÅŸletme baÅŸarısız (%d) (%li, %li) \n" +#~ "Durumu tekrar yüklemeyi deneyin." #~ msgid "" #~ "Keeps track of textures based on looking at the actual pixels in the " @@ -6362,8 +6427,9 @@ msgstr "| VEYA" #~ "YavaÅŸlamaya neden olabilir, ama bazı oyunlar düzgün çalışmak için buna " #~ "ihtiyaç duyar." +#, fuzzy #~ msgid "Load Script..." -#~ msgstr "Script Yükle..." +#~ msgstr "Durumu Yükle..." #~ msgid "" #~ "Loads native mipmaps instead of generating them.\n" @@ -6373,8 +6439,9 @@ msgstr "| VEYA" #~ "Mipmap'leri oluÅŸturmak yerine doÄŸal olanlarını yükler. \n" #~ "DoÄŸruluÄŸu artırır ama performansı düşürebilir." +#, fuzzy #~ msgid "Lua Script Console" -#~ msgstr "Lua Script Konsolu" +#~ msgstr "Konsola Yaz" #~ msgid "Metroid Other M" #~ msgstr "Metroid Other M" @@ -6389,8 +6456,9 @@ msgstr "| VEYA" #~ "Dokuların kullandığı biçimi görmek için onları deÄŸiÅŸtir. \n" #~ "Sadece hata ayıklama için kullanışlıdır." +#, fuzzy #~ msgid "New &Lua Console" -#~ msgstr "Yeni &Lua Konsolu" +#~ msgstr "Konsolu Göster (&C)" #~ msgid "No audio output" #~ msgstr "Ses çıkışı yok" @@ -6401,11 +6469,13 @@ msgstr "| VEYA" #~ msgid "OK" #~ msgstr "Tamam" +#, fuzzy #~ msgid "OpenAL" -#~ msgstr "OpenAL" +#~ msgstr "Aç" +#, fuzzy #~ msgid "OpenGL" -#~ msgstr "OpenGL" +#~ msgstr "Aç" #~ msgid "Plugins" #~ msgstr "Eklentiler" @@ -6419,8 +6489,18 @@ msgstr "| VEYA" #~ "Dolphin'i salt okunur bir konumdan veya kurulmadığı yerden mi " #~ "çalıştırıyorsunuz?" +#~ msgid "Premature movie end in PlayController. %u + 8 > %u" +#~ msgstr "PlayController'da erken kayıt bitiÅŸi. %u + 8 > %u" + +#~ msgid "Premature movie end in PlayWiimote. %u + %d > %u" +#~ msgstr "PlayWiimote'da erken kayıt bitiÅŸi. %u + %d > %u" + +#~ msgid "Premature movie end in PlayWiimote. %u > %u" +#~ msgstr "PlayWiimote'da erken kayıt bitiÅŸi. %u > %u" + +#, fuzzy #~ msgid "Projection Stats" -#~ msgstr "Projeksiyon Durumu" +#~ msgstr "Özel Görüntüleme Hilesi Ayarları" #~ msgid "Pulse" #~ msgstr "VuruÅŸ" @@ -6428,8 +6508,9 @@ msgstr "| VEYA" #~ msgid "Relaunch Dolphin from the install directory and save from there" #~ msgstr "Dolphin'i kurulum konumundan tekrar baÅŸlat ve buradan kaydet" +#, fuzzy #~ msgid "Render to main window." -#~ msgstr "Oyunu ana pencerede çalıştırır." +#~ msgstr "Ana pencerede yorumla" #~ msgid "Rendering" #~ msgstr "Yorumlama" @@ -6437,8 +6518,9 @@ msgstr "| VEYA" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "Japon ROM'lardaki yazıyı kullanmak için gereklidir." +#, fuzzy #~ msgid "Run" -#~ msgstr "Çalıştır" +#~ msgstr "Enter" #~ msgid "Running script...\n" #~ msgstr "Script çalıştırılıyor... \n" @@ -6455,8 +6537,9 @@ msgstr "| VEYA" #~ "Bir diskin güncelleme bölüntüsünden geniÅŸletilen Sistem Menüsü WAD'ını " #~ "seçin." +#, fuzzy #~ msgid "Select the script to load" -#~ msgstr "Yüklemek için Script seçin" +#~ msgstr "Yüklemek için durum seçin" #~ msgid "" #~ "Selects which game should be affected by the configuration changes done " @@ -6484,8 +6567,9 @@ msgstr "| VEYA" #~ "Projeksiyon durumunu göster. \n" #~ "Sadece hata ayıklamada kullanışlıdır." +#, fuzzy #~ msgid "Show save banner" -#~ msgstr "Kayıt afiÅŸini göster" +#~ msgstr "Kayıt simgesini göster" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Saniyede kaç karenin görüntülendiÄŸini göster." @@ -6500,8 +6584,9 @@ msgstr "| VEYA" #~ msgid "Skies of Arcadia" #~ msgstr "Skies of Arcadia" +#, fuzzy #~ msgid "Slot" -#~ msgstr "Slot" +#~ msgstr "Slot A" #~ msgid "Sonic and the Black Knight" #~ msgstr "Sonic and the Black Knight + NFS Nitro" @@ -6529,8 +6614,9 @@ msgstr "| VEYA" #~ "DiÄŸer seçenekler görüntü boyutundan bağımsız olarak seçilen düzeltilmiÅŸ " #~ "çözünürlüklerdir." +#, fuzzy #~ msgid "Specify an audio plugin" -#~ msgstr "Bir ses eklentisi belirtin" +#~ msgstr "Bir görüntü arka ucu belirtin" #~ msgid "Start Renderer in Fullscreen" #~ msgstr "Görüntüyü Tam Ekran baÅŸlat" @@ -6538,14 +6624,18 @@ msgstr "| VEYA" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Oyununuz tam ekran görüntüyle baÅŸlar." +#~ msgid "TaruKonga (Bongos)" +#~ msgstr "TaruKonga (Bongos)" + #~ msgid "The file " #~ msgstr "Dosya" #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Ses efektlerini oynatmak için kullanılır." +#, fuzzy #~ msgid "Trying to load unsupported type %d" -#~ msgstr "Desteklenmeyen tür %d 'yi yüklemeyi deniyor" +#~ msgstr "Bilinmeyen bir dosya türünü yüklemeyi denedi." #~ msgid "Type %d config not supported in plugin %s" #~ msgstr "%d türü yapılandırma %s eklentisinde desteklenmiyor" @@ -6577,8 +6667,9 @@ msgstr "| VEYA" #~ "EFB kopyası kullanan oyunların görsel kalitesini artırır ama bazı " #~ "oyunlarda hatalara neden olur." +#, fuzzy #~ msgid "Video Backend:" -#~ msgstr "Görüntü Arka Ucu :" +#~ msgstr "Ses Çözücüsü:" #~ msgid "" #~ "Wait for vertical blanks.\n" @@ -6587,6 +6678,61 @@ msgstr "| VEYA" #~ "Dikey boÅŸlukları bekle. \n" #~ "Yırtılmayı azaltır ama performansı da azaltır." +#~ 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 "" +#~ "Dikkat: Åžu anki kaydın bitiÅŸinden sonra yer alan bir kayıt yüklediniz. " +#~ "(Bayt %u > %u) (Çerçeve %u > %u). Devam etmeden önce baÅŸka bir kayıt " +#~ "yüklemeniz, 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." + +#~ 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 "" +#~ "Dikkat: Bayt %d (0x%X) ile eÅŸleÅŸmeyen bir kayıt yüklediniz. Devam etmeden " +#~ "önce baÅŸka bir kayıt yüklemeniz, 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." + +#~ 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" +#~ "\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" +#~ "\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" +#~ msgstr "" +#~ "Dikkat: Çerçeve %d ile eÅŸleÅŸmeyen bir kayıt yüklediniz. Devam etmeden " +#~ "önce baÅŸka bir kayıt yüklemeniz, 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.\n" +#~ "\n" +#~ "Daha fazla bilgi: Åžu anki kayıt %d çerçeve uzunluÄŸunda, ama durum kaydı " +#~ "%d çerçeve uzunluÄŸunda.\n" +#~ "\n" +#~ "Çerçeve %d 'de, ÅŸu anki kayıt bunları basıyor:\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" +#~ "Çerçeve %d 'de, durum kaydı bunları basıyor:\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" + #~ msgid "" #~ "When using EFB to RAM we very often need to decode RAM data to a VRAM " #~ "texture, which is a very time-consuming task.\n" @@ -6607,17 +6753,20 @@ msgstr "| VEYA" #~ "(NOT: Güvenli doku önbelleklemesi hız artışını azaltır; doÄŸru doku " #~ "önbelleklenmesi \"safe\" 'ye ayarlıysa daha yavaÅŸ olabilir!)" +#, fuzzy #~ msgid "Wiimote %i %s" -#~ msgstr "Wiimote %i %s" +#~ msgstr "Wiimote %i" +#, fuzzy #~ msgid "Wiimote Settings" -#~ msgstr "Wiimote Ayarları" +#~ msgstr "&Wiimote Ayarları" #~ msgid "Will enable progressive scan option if supported by software." #~ msgstr "EÄŸer yazılım desteÄŸi varsa progresif taramayı etkinleÅŸtirir." +#, fuzzy #~ msgid "Window Size:" -#~ msgstr "Pencere Boyutu:" +#~ msgstr "Otomatik (Pencere Boyutu)" #~ msgid "Window height for windowed mode" #~ msgstr "Pencere modu için yükseklik" From 7306257c0f4df9f00719e537e41c616d1550f278 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 27 Dec 2011 08:36:16 -0600 Subject: [PATCH 351/381] Update from master branch. Update Arabic, Hungarian, and Spanish translations. --- Languages/po/ar.po | 434 ++++++++++++++--- Languages/po/ca.po | 257 +++++++++- Languages/po/cs.po | 250 +++++++++- Languages/po/de.po | 251 +++++++++- Languages/po/dolphin-emu.pot | 251 +++++++++- Languages/po/el.po | 921 ++++++++++++++++++++++++++++------- Languages/po/en.po | 251 +++++++++- Languages/po/es.po | 447 +++++++++++++++-- Languages/po/fr.po | 913 +++++++++++++++++++++------------- Languages/po/he.po | 251 +++++++++- Languages/po/hu.po | 418 ++++++++++++---- Languages/po/it.po | 251 +++++++++- Languages/po/ja.po | 258 +++++++++- Languages/po/ko.po | 251 +++++++++- Languages/po/nb.po | 251 +++++++++- Languages/po/nl.po | 251 +++++++++- Languages/po/pl.po | 282 ++++++++++- Languages/po/pt.po | 257 +++++++++- Languages/po/pt_BR.po | 290 ++++++++++- Languages/po/ru.po | 251 +++++++++- Languages/po/sr.po | 251 +++++++++- Languages/po/zh_CN.po | 251 +++++++++- Languages/po/zh_TW.po | 251 +++++++++- 23 files changed, 7012 insertions(+), 727 deletions(-) diff --git a/Languages/po/ar.po b/Languages/po/ar.po index 59bf9c9782..10b8d4bb51 100644 --- a/Languages/po/ar.po +++ b/Languages/po/ar.po @@ -8,6 +8,7 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-16 11:25-0500\n" "Last-Translator: mansoor\n" @@ -19,6 +20,10 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= "PO-Revision-Date: 2011-10-16 11:25-0500\n" +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +"PO-Revision-Date: 2011-12-27 08:27-0600\n" +>>>>>>> Update from master branch. "Last-Translator: mansoor\n" >>>>>>> Update Arabic and Japanese translations. "Language-Team: \n" @@ -103,6 +108,8 @@ 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 bytes)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -221,7 +228,7 @@ msgstr "&إعدادات الاختصارات" #: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&JIT" -msgstr "" +msgstr "&JIT" #: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "&Load State" @@ -301,11 +308,11 @@ msgstr "&معلومات عن اللعبة" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:58 msgid "(-)+zFar" -msgstr "" +msgstr "(-)+zFar" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:53 msgid "(-)+zNear" -msgstr "" +msgstr "(-)+zNear" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:98 msgid "(UNKNOWN)" @@ -405,7 +412,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" -msgstr "" +msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 @@ -426,7 +433,7 @@ msgstr "ضبط:" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" -msgstr "" +msgstr "Accurate VBeam emulation" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD @@ -547,6 +554,7 @@ msgstr "أض٠باتش" msgid "Add new pane" msgstr "إضاÙØ© جزء جديد" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -556,6 +564,11 @@ msgstr "إضاÙØ© جزء جديد" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "أضÙ" @@ -599,16 +612,17 @@ msgstr "إعدادات متقدمة" #: Source/Core/DolphinWX/Src/FrameTools.cpp:666 msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" -msgstr "" +msgstr "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" -msgstr "" +msgstr "All GC/Wii images (gcm, iso, ciso, gcz)" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "جميع ملÙات الجيم كيوب (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -616,6 +630,10 @@ msgstr "جميع ملÙات الجيم كيوب (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Ø­Ùظ جميع الحالات (sav, s##)" @@ -676,7 +694,7 @@ msgstr "Apploader غير قادر على تحميل مل٠من" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" -msgstr "" +msgstr "Apploader:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 msgid "Apply" @@ -711,11 +729,15 @@ msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙØŸ " msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙات؟" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "نسبة العرض :" @@ -736,11 +758,15 @@ msgstr "صوت الخلÙية :" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "تلقائي" @@ -856,10 +882,14 @@ msgstr "اليمين أزرق" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "أسÙÙ„" @@ -870,7 +900,7 @@ msgstr "يلزم التحكم: %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" -msgstr "معطل" +msgstr "معطلة" #: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Browse" @@ -892,11 +922,15 @@ msgstr "لاستعراض الدليل الإخراج" msgid "Buffer:" msgstr "العازلة :" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -960,6 +994,7 @@ msgstr "إلغاء" msgid "Cannot open %s" msgstr "لا يمكن Ùتح %s" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:721 @@ -967,15 +1002,21 @@ msgid "Cannot record movies in read-only mode." msgstr "لا يمكن تسجيل الأÙلام ÙÙŠ وضع للقراءة Ùقط." >>>>>>> Update Arabic and Japanese translations. +======= +>>>>>>> Update from master branch. #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "لا يمكن إلغاء تسجيل الأحداث مع الأحداث المعلقة" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 >>>>>>> Update Arabic and Japanese translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +>>>>>>> Update from master branch. #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1013,7 +1054,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:49 msgid "Caps Lock" -msgstr "" +msgstr "Caps Lock" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" @@ -1091,7 +1132,7 @@ msgstr "DVD اختيار الدليل أصل :" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Choose a NAND root directory:" -msgstr "" +msgstr "Choose a NAND root directory:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" @@ -1114,6 +1155,7 @@ msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" +"اختيار مل٠لاستخدام راÙعة التطبيقات: (ينطبق على الأقراص مصنوعة من الادله Ùقط)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 @@ -1122,7 +1164,7 @@ 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" @@ -1150,10 +1192,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "إغلاق" @@ -1262,11 +1308,15 @@ msgstr "توصيل ويموت 3" msgid "Connect Wiimote 4" msgstr "توصيل ويموت 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "توصيل" @@ -1460,10 +1510,14 @@ msgstr "محرك محاكي الصوت" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulation (سريع)" @@ -1473,11 +1527,11 @@ msgstr "DSP LLE interpreter (بطيء)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP LLE on Thread" -msgstr "" +msgstr "DSP LLE on Thread" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" -msgstr "" +msgstr "DSP LLE recompiler" #: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "DSP settings" @@ -1485,7 +1539,7 @@ msgstr "إعدادات الصوت" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" -msgstr "" +msgstr "DVD Root:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" @@ -1506,7 +1560,7 @@ msgstr "" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:281 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:296 msgid "Dead Zone" -msgstr "" +msgstr "المنطقة الميتة" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Debug" @@ -1590,11 +1644,11 @@ msgstr "الاتصال الهاتÙÙŠ" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" -msgstr "" +msgstr "Direct3D11" #: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" -msgstr "" +msgstr "Direct3D9" #: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" @@ -1692,11 +1746,15 @@ msgstr "" msgid "Divide" msgstr "انقسام" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "هل تريد اغلق اللعبة الحالية؟" @@ -1725,6 +1783,7 @@ msgstr "إعدادات تحكم الوي" msgid "Dolphin FIFO" msgstr "دولÙين" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1740,6 +1799,14 @@ msgstr "إعدادات تحكم الجيم كيوب" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "إعدادات تحكم الجيم كيوب" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1789,11 +1856,11 @@ msgstr "وهمي " #: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" -msgstr "" +msgstr "Dump Audio" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" -msgstr "" +msgstr "Dump EFB Target" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" @@ -1801,7 +1868,7 @@ msgstr "تÙريغ الإطارات" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" -msgstr "" +msgstr "Dump Textures" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" @@ -1833,6 +1900,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1842,6 +1910,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Dutch" @@ -1851,7 +1924,7 @@ msgstr "خروج" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" -msgstr "" +msgstr "EFB Copies" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, c-format @@ -1977,6 +2050,7 @@ msgstr "BAT تمكين" msgid "Enable Block Merging" msgstr "تمكين منع الدمج" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" @@ -1984,25 +2058,35 @@ msgstr "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "تمكين تنظيم حساب الإطار" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "تمكين التخزين المؤقت" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "تمكين الاسرار " #: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" -msgstr "" +msgstr "Enable DTK Music" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Enable Dual Core" -msgstr "" +msgstr "Enable Dual Core" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" @@ -2014,7 +2098,7 @@ msgstr "تمكين الاختصارات" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Enable Idle Skipping" -msgstr "" +msgstr "Enable Idle Skipping" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" @@ -2140,6 +2224,7 @@ msgstr "" msgid "End" msgstr "نهاية" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2149,6 +2234,11 @@ msgstr "نهاية" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "English" @@ -2178,6 +2268,7 @@ msgstr "المساواة" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "خطأ" @@ -2195,6 +2286,19 @@ msgid "Error" msgstr "خطأ" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "خطأ" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "خطأ ÙÙŠ تحميل اللغة المختارة. يتراجع إلى النظام الاÙتراضية." @@ -2607,7 +2711,7 @@ msgstr "الإطار المسبق" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" -msgstr "" +msgstr "Frame Dumps use FFV1" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105 msgid "Frame Range" @@ -2629,6 +2733,7 @@ msgstr "إطارات لتسجيل" msgid "Free Look" msgstr "تحكم بكاميرا اللعبة" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2638,6 +2743,11 @@ msgstr "تحكم بكاميرا اللعبة" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "French" @@ -2660,7 +2770,11 @@ msgstr "دقة العرض :" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:533 msgid "GCI File(*.gci)" -msgstr "" +msgstr "GCI File(*.gci)" + +#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +msgid "GCMic Configuration" +msgstr "GCMic اعدادات" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 #, fuzzy @@ -2705,10 +2819,14 @@ msgstr "إعدادات تحكم جيم كيوب" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "بطاقه ذاكره الجيم كيوب (*.raw,*.gcp) " @@ -2732,11 +2850,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "عام" @@ -2745,6 +2868,7 @@ msgstr "عام" msgid "General Settings" msgstr "الإعدادات العامة" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2754,6 +2878,11 @@ msgstr "الإعدادات العامة" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "German" @@ -2891,11 +3020,16 @@ msgstr "إعدادات الاختصارات" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "الاختصارات" @@ -2931,7 +3065,7 @@ msgstr "IPL إعدادات" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 msgid "IR" -msgstr "" +msgstr "IR" #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "IR Pointer" @@ -2962,6 +3096,11 @@ msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +<<<<<<< HEAD +======= +"إذا كانت محددة، سيتم تحديث سجلات المربع المحيط. المستخدمة من قبل لعبه بابير " +"ماريو" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" @@ -3056,7 +3195,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" -msgstr "ÙÙŠ اللعبة" +msgstr "تتعطل ÙÙŠ اللعبة" #: Source/Core/DolphinWX/Src/NetWindow.cpp:592 msgid "In-Game" @@ -3104,11 +3243,15 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "wad تثبيت" @@ -3147,7 +3290,7 @@ msgstr "Interpreter (بطيئة جدا)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" -msgstr "مقدمة" +msgstr "تتعطل ÙÙŠ المقدمة" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194 #, c-format @@ -3187,6 +3330,7 @@ msgstr "تسجيل المل٠غير صالح" msgid "Invalid state" msgstr "غير صالح حالة" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3196,6 +3340,11 @@ msgstr "غير صالح حالة" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italian" @@ -3233,16 +3382,16 @@ msgstr "Korean" #. i18n: Left #: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" -msgstr "" +msgstr "L" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:39 msgid "L Button" -msgstr "" +msgstr "L Button" #. i18n: Left-Analog #: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" -msgstr "" +msgstr "L-Analog" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" @@ -3348,6 +3497,7 @@ msgstr "8 تحميل حالة" msgid "Load State..." msgstr "تحميل حالة" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3361,6 +3511,13 @@ msgstr "تحميل قائمة نظام الوي" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "تحميل قائمة نظام الوي" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "تحميل قائمة نظام الوي %d%c" @@ -3389,7 +3546,7 @@ msgstr "المحلية" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Lock Threads to Cores" -msgstr "" +msgstr "Lock Threads to Cores" #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" @@ -3422,7 +3579,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" -msgstr "" +msgstr "M Button" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119 #, c-format @@ -3440,11 +3597,15 @@ msgstr "MMU سرعة هاك" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "العصا الأيسر" @@ -3476,10 +3637,14 @@ msgstr "ذاكرة بايت" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "بطاقة الذاكرة" @@ -3675,11 +3840,15 @@ msgstr "التبويب" msgid "NP Up" msgstr "Ùوق" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3695,7 +3864,7 @@ msgstr "الاسم :" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 msgid "Native GCI files(*.gci)" -msgstr "" +msgstr "Native GCI files(*.gci)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 msgid "New Scan" @@ -3766,11 +3935,15 @@ msgstr "لا يساوي" msgid "Not Set" msgstr "غير مجموعة" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "غير متصل" @@ -3832,9 +4005,13 @@ msgstr "Ùقط %d كتل متاحة" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Ùتح" @@ -3965,6 +4142,7 @@ msgstr "باتش" msgid "Paths" msgstr "مسارات" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3972,6 +4150,10 @@ msgstr "مسارات" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "وقÙØ©" @@ -3982,7 +4164,7 @@ msgstr "لكل بكسل إضاءة" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" -msgstr "مثالي" +msgstr "مثالية" #: Source/Core/DolphinWX/Src/FrameAui.cpp:608 #, c-format @@ -3992,12 +4174,17 @@ msgstr "مشهد %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "بدأ اللعبه" @@ -4013,7 +4200,7 @@ msgstr "بدأ/ايقاÙ" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" -msgstr "القابلة للتشغيل" +msgstr "قابلة للتشغيل" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "Playback Options" @@ -4023,11 +4210,15 @@ msgstr "خيارات التشغيل" msgid "Players" msgstr "لاعبين" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "يرجى تأكيد" @@ -4135,20 +4326,20 @@ msgstr "خروج" #. i18n: Right #: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" -msgstr "" +msgstr "R" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:40 msgid "R Button" -msgstr "" +msgstr "R Button" #. i18n: Right-Analog #: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" -msgstr "" +msgstr "R-Analog" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" -msgstr "" +msgstr "RAM" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 msgid "RUSSIA" @@ -4238,6 +4429,7 @@ msgstr "تحديث قائمة" msgid "Refresh game list" msgstr "تحديث القائمة" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4249,6 +4441,12 @@ msgstr "تحديث القائمة" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "إزالة" @@ -4268,9 +4466,13 @@ msgstr "تقدم إلى الشاشة الرئيسية" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "إعادة ضبط" @@ -4313,11 +4515,15 @@ msgstr "Ø­Ùظ الحالة" msgid "Safe" msgstr "آمنة" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "معدل العينة :" @@ -4404,6 +4610,7 @@ msgid "Scaled EFB Copy" msgstr "EFB Copia a escala" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +<<<<<<< HEAD ======= msgstr "" ======= @@ -4412,6 +4619,8 @@ msgstr "EFB Copia a escala" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "Ùحص %s" @@ -4451,6 +4660,7 @@ msgstr "" msgid "Select" msgstr "حدد" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4466,6 +4676,14 @@ msgstr "اختر مل٠تسجيل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "اختر مل٠تسجيل" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "لتثبيت wad حدد ملÙ" @@ -4491,6 +4709,7 @@ msgstr "اختر النواÙØ° العائمة" msgid "Select the file to load" msgstr "حدد المل٠لتحميل" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4503,15 +4722,22 @@ msgstr "حدد حالة التحميل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "حدد Ø­Ùظ الملÙ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "حدد حالة التحميل" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "حدد حالة الحÙظ" @@ -4618,7 +4844,7 @@ msgstr "SetupWiiMem: الإعداد غير قادر على إيجاد ملÙ" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 msgid "Shake" -msgstr "" +msgstr "هزة" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" @@ -4854,7 +5080,7 @@ msgstr "لقطة" #: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:52 msgid "Software Renderer" -msgstr "" +msgstr "Software Renderer" #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:83 msgid "" @@ -4885,6 +5111,7 @@ msgstr "Ùشل إنشاء المخزن المؤقت الصوت : %s" msgid "Space" msgstr "مجال" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4894,6 +5121,11 @@ msgstr "مجال" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Spanish" @@ -4927,21 +5159,25 @@ msgstr "حدد الخلÙية مل٠Ùيديو" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 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:80 msgid "Standard Controller" msgstr "وحدة تحكم القياسية" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4977,9 +5213,13 @@ msgstr "عصا" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "اغلق اللعبه" @@ -5057,15 +5297,23 @@ msgstr "الجدول الأيمن" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "اخذ لقطه من الشاشه" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "TaruKonga (Bongos)" +<<<<<<< HEAD msgstr "" +======= +msgstr "TaruKonga (Bongos)" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -5079,6 +5327,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 msgid "Texture Cache" +<<<<<<< HEAD msgstr "" ======= #, fuzzy @@ -5095,6 +5344,9 @@ msgstr "إزالة التخزين المؤقت" ======= msgstr "" >>>>>>> Update Arabic and Japanese translations. +======= +msgstr "Texture Cache" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" @@ -5310,18 +5562,26 @@ msgstr "تبديل جميع أنواع السجل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "اللعب بالشاشة كاملة" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "أعلى" @@ -5366,7 +5626,7 @@ msgstr "UDP منÙØ° :" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" -msgstr "" +msgstr "UDP Wiimote" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "UNKNOWN" @@ -5428,6 +5688,7 @@ msgstr "تلقى رسالة مجهولة مع معر٠: %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5440,6 +5701,8 @@ msgstr "" "مواصلة?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5632,6 +5895,41 @@ msgstr "" ======= >>>>>>> Update Arabic and Japanese translations. +#: Source/Core/Core/Src/Movie.cpp:629 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:646 +#, 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 "" + +#: Source/Core/Core/Src/Movie.cpp:655 +#, 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" +"\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" +"\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" +msgstr "" + #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -5659,17 +5957,21 @@ msgstr "جهاز الوي" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 msgid "Wii NAND Root:" -msgstr "" +msgstr "Wii NAND Root:" #: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "Wii Save Import" msgstr "استيراد Ø­Ùظ الوي" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "ملÙات Ø­Ùظ الوي (*.bin)|*.bin" @@ -5700,11 +6002,15 @@ msgstr "" "أو ربما هو بسبب الخمول وقت مستقطع أو لسبب آخر.\n" "هل تريد إعادة الاتصال على الÙور?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "ويموت متصل" @@ -5736,6 +6042,7 @@ msgstr "نواÙØ° اليمين" msgid "Word Wrap" msgstr "كلمة ختامية" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5745,6 +6052,11 @@ msgstr "كلمة ختامية" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "العمل" @@ -5898,7 +6210,7 @@ msgstr "^أض٠" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" -msgstr "" +msgstr "apploader (.img)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185 msgid "failed to read bk header" @@ -5916,7 +6228,7 @@ 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 @@ -5925,7 +6237,7 @@ msgstr "ليس Ø­Ùظ الوي أو قراءة Ùشلة لحجم عنوان ا #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:461 msgid "s" -msgstr "" +msgstr "s" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 #, c-format @@ -5934,15 +6246,15 @@ msgstr "أمر غير معرو٠0x%08x" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" -msgstr "" +msgstr "wxExecute returned -1 on application run!" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:55 msgid "zFar Correction: " -msgstr "" +msgstr "zFar تصحيح: " #: Source/Core/DolphinWX/Src/PHackSettings.cpp:50 msgid "zNear Correction: " -msgstr "" +msgstr "zNear تصحيح: " #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 msgid "| OR" @@ -6056,12 +6368,18 @@ msgstr "أو" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "No se puede abrir %s, no tiene una función" +<<<<<<< HEAD <<<<<<< HEAD #~ msgid "Cannot record movies in read-only mode." #~ msgstr "لا يمكن تسجيل الأÙلام ÙÙŠ وضع للقراءة Ùقط." ======= >>>>>>> Update Arabic and Japanese translations. +======= +#~ msgid "Cannot record movies in read-only mode." +#~ msgstr "لا يمكن تسجيل الأÙلام ÙÙŠ وضع للقراءة Ùقط." + +>>>>>>> Update from master branch. #, fuzzy #~ msgid "Config..." #~ msgstr "إعدادات" @@ -6570,6 +6888,9 @@ msgstr "أو" #~ msgstr "Configuración de tipo %d no soportado en el plugin %s" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -6577,10 +6898,13 @@ msgstr "أو" #~ "مؤشر غير معرو٠%#08x\n" #~ "مواصلة?" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Arabic and Japanese translations. +======= +>>>>>>> Update from master branch. #~ msgid "Use FPS For Limiting" #~ msgstr "لحد عدد الاطارات" diff --git a/Languages/po/ca.po b/Languages/po/ca.po index bb6dd4f690..e7664edac1 100644 --- a/Languages/po/ca.po +++ b/Languages/po/ca.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-08-19 08:36-0500\n" "Last-Translator: Jordi Coma \n" "Language-Team: Catalan \n" @@ -568,6 +572,7 @@ msgstr "Afegeix Pegat" msgid "Add new pane" msgstr "Afegeix un nou panell" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -577,6 +582,11 @@ msgstr "Afegeix un nou panell" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Afegir ..." @@ -644,6 +654,7 @@ msgstr "Totes les imatges GC / Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tots els fitxers GameCube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -651,6 +662,10 @@ msgstr "Tots els fitxers GameCube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Tots els Estats (savi, s##\")" @@ -739,11 +754,15 @@ 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!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relació d'aspecte:" @@ -764,11 +783,15 @@ msgstr "Suport d'àudio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error en obrir el dispositiu AO \n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -885,10 +908,14 @@ msgstr "Blau dret" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Abaix" @@ -921,11 +948,15 @@ msgstr "Examineu el directori de sortida" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1183,10 +1214,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Tancar" @@ -1295,11 +1330,15 @@ msgstr "Connectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Connectar Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Connectant ..." @@ -1491,10 +1530,14 @@ msgstr "Motor d'emulació DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "Emulació DSP HLE (ràpid)" @@ -1725,11 +1768,15 @@ msgstr "" msgid "Divide" msgstr "Divideix" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Voleu aturar l'emulació actual?" @@ -1758,6 +1805,7 @@ msgstr "Configuració de Wiimote emulat" msgid "Dolphin FIFO" msgstr "FIFO Dolphin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1773,6 +1821,14 @@ msgstr "Configuració del control GC Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Configuració del control GC Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin Pel·lícules TAS (*.dtm)" @@ -1869,6 +1925,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1878,6 +1935,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Holandès" @@ -2023,21 +2085,31 @@ msgid "Enable Block Merging" msgstr "Habilitar fusió de Bloc" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Habilitar memòria cau" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Activar Trucs" @@ -2190,6 +2262,7 @@ msgstr "" msgid "End" msgstr "Fi" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2199,6 +2272,11 @@ msgstr "Fi" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Anglès" @@ -2228,6 +2306,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -2245,6 +2324,19 @@ msgid "Error" msgstr "Error" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Error" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2703,6 +2795,7 @@ msgstr "Imatges a Enregistrar" msgid "Free Look" msgstr "Visió lliure" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2712,6 +2805,11 @@ msgstr "Visió lliure" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Francès" @@ -2779,10 +2877,14 @@ msgstr "Configuració control «&Gamecube»" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Targetes de memòria per GameCube (*.raw, *.gcp)" @@ -2806,11 +2908,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -2819,6 +2926,7 @@ msgstr "General" msgid "General Settings" msgstr "Configuració General" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2828,6 +2936,11 @@ msgstr "Configuració General" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Alemany" @@ -2962,11 +3075,16 @@ msgstr "Tecla d'accés de configuració" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Tecles d'accés" @@ -3191,11 +3309,15 @@ msgstr "" "InstallExceptionHandler cridat, però aquesta plataforma no està suportada " "encara." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Instal·lant WAD ..." @@ -3277,6 +3399,7 @@ msgstr "Enregistrament de fitxer invàlid" msgid "Invalid state" msgstr "Estat invàlid" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3286,6 +3409,11 @@ msgstr "Estat invàlid" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italià" @@ -3443,6 +3571,7 @@ msgstr "Carregar ranura d'estat 8" msgid "Load State..." msgstr "Carregar Estat..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3456,6 +3585,13 @@ msgstr "Carregar el menú del sistema Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Carregar el menú del sistema Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar menú del sistema Wii %d%c" @@ -3537,11 +3673,15 @@ msgstr "Modificació de velocitat MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Arxius MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Palanca principal" @@ -3573,10 +3713,14 @@ msgstr "Byte de memòria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Targeta de memòria" @@ -3776,11 +3920,15 @@ msgstr "NP Tabulador" msgid "NP Up" msgstr "NP Amunt" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3867,11 +4015,15 @@ msgstr "No igual" msgid "Not Set" msgstr "Sense establir" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "No està connectat" @@ -3933,9 +4085,13 @@ msgstr "Només queden %d blocs disponibles" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Obrir" @@ -4066,6 +4222,7 @@ msgstr "Pegats" msgid "Paths" msgstr "Camins" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4073,6 +4230,10 @@ msgstr "Camins" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4093,12 +4254,17 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Executar" @@ -4124,11 +4290,15 @@ msgstr "Opcions de reproducció" msgid "Players" msgstr "Jugadors" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Confirmeu ..." @@ -4340,6 +4510,7 @@ msgstr "Actualitzar llista" msgid "Refresh game list" msgstr "Actualitza la llista de jocs" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4351,6 +4522,12 @@ msgstr "Actualitza la llista de jocs" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Treure" @@ -4370,9 +4547,13 @@ msgstr "Renderitzar a la finestra principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -4415,11 +4596,15 @@ msgstr "&Desa l'estat" msgid "Safe" msgstr "Segur" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Freqüència de mostreig:" @@ -4503,11 +4688,15 @@ msgstr "La pal·lícula guardada %s és corrupta, s'atura la gravació..." msgid "Scaled EFB Copy" msgstr "Copia EFB escalada" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "Escanejant %s" @@ -4547,6 +4736,7 @@ msgstr "La secció %s no trobada a SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4562,6 +4752,14 @@ msgstr "Seleccionar el fitxer de gravació" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Seleccionar el fitxer de gravació" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Seleccionar un fitxer WAD de Wii per instal·lar" @@ -4586,6 +4784,7 @@ msgstr "Seleccioneu finestres flotants" msgid "Select the file to load" msgstr "Seleccioneu el fitxer a carregar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4598,15 +4797,22 @@ msgstr "Seleccioneu l'estat a carregar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Seleccioneu el fitxer de partida desada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Seleccioneu l'estat a carregar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Seleccioneu l'estat a desar" @@ -4989,6 +5195,7 @@ msgstr "Ha fallat la creació del buffer de so: %s" msgid "Space" msgstr "Espai" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4998,6 +5205,11 @@ msgstr "Espai" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Espanyol" @@ -5042,11 +5254,15 @@ msgstr "Palanca quadrada" msgid "Standard Controller" msgstr "Control estàndard" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5082,9 +5298,13 @@ msgstr "Palanca" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Aturar" @@ -5162,9 +5382,13 @@ msgstr "Taula dreta" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Capturar pantalla" @@ -5411,18 +5635,26 @@ msgstr "Activar tots els tipus de registre de Log" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Activar pantalla completa" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Dalt" @@ -5532,6 +5764,7 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "Missatge desconegut amb id: %d rebut des del jugador: Expulsant jugador %d!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5544,6 +5777,8 @@ msgstr "" "Voleu continuar?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5769,11 +6004,15 @@ msgstr "Arrel de la NAND:" msgid "Wii Save Import" msgstr "Importar partida guardada Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Arxius de partida guardada Wii (*.bin)|*.bin" @@ -5804,11 +6043,15 @@ msgstr "" "o potser és perquè l'esteu fent servir fora de temps o una altra raó. \n" "Vols tornar a connectar-lo immediatament?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote connectat" @@ -5840,6 +6083,7 @@ msgstr "Finestra dreta" msgid "Word Wrap" msgstr "Envoltant de paraula" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5849,6 +6093,11 @@ msgstr "Envoltant de paraula" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Treballant ..." @@ -6421,6 +6670,9 @@ msgstr "| O" #~ msgstr "Iniciar la finestra de renderitzat a pantalla completa." <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -6428,8 +6680,11 @@ msgstr "| O" #~ "Punter desconegud %#08x\n" #~ "Voleu continuar?" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #~ msgid "Use FPS For Limiting" #~ msgstr "Limitar imatges/s (FPS)" diff --git a/Languages/po/cs.po b/Languages/po/cs.po index 728e2493b1..b561011572 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -10,6 +10,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" <<<<<<< HEAD "PO-Revision-Date: 2011-10-15 14:50+0100\n" @@ -27,6 +28,10 @@ msgstr "" ======= "PO-Revision-Date: 2011-12-19 07:39+0100\n" >>>>>>> Update Czeck translation. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +"PO-Revision-Date: 2011-12-19 07:39+0100\n" +>>>>>>> Update from master branch. "Last-Translator: ZbynÄ›k Schwarz \n" "Language-Team: \n" "Language: Czech\n" @@ -562,6 +567,7 @@ msgstr "PÅ™idat nový panel" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 @@ -580,6 +586,11 @@ msgstr "PÅ™idat nový panel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "PÅ™idat..." @@ -646,6 +657,7 @@ msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ======= @@ -660,6 +672,10 @@ msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "VÅ¡echny Uložené Stavy (sav, s##)" @@ -762,6 +778,7 @@ msgstr "" 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!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= @@ -774,6 +791,9 @@ msgstr "Opravdu chcete smazat tento soubor? Bude navždy ztracen!" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 >>>>>>> Update Greek and Czech translations ======= +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Aspect Ratio:" @@ -795,6 +815,7 @@ 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" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= @@ -807,6 +828,9 @@ msgstr "AudioCommon: Chyba pÅ™i otevírání zařízení zvukového výstupu.\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 >>>>>>> Update Greek and Czech translations ======= +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Auto" @@ -925,6 +949,7 @@ msgstr "Modrá vpravo" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -937,6 +962,9 @@ msgstr "Modrá vpravo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Dole" @@ -972,6 +1000,7 @@ msgstr "Vyrovnávací paměť:" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 @@ -984,6 +1013,9 @@ msgstr "Vyrovnávací paměť:" ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1216,6 +1248,7 @@ msgstr "Klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru musíte ukonÄit #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1227,6 +1260,9 @@ msgstr "Klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru musíte ukonÄit #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 >>>>>>> Update Greek and Czech translations ======= +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Close" @@ -1339,6 +1375,7 @@ msgstr "PÅ™ipojit Wiimote 4" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 @@ -1349,6 +1386,9 @@ msgstr "PÅ™ipojit Wiimote 4" ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "PÅ™ipojuji..." @@ -1541,8 +1581,12 @@ msgstr "Jádro Emulátoru DSP" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulace (rychlé)" @@ -1766,6 +1810,7 @@ msgstr "RozdÄ›lit" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 @@ -1776,6 +1821,9 @@ msgstr "RozdÄ›lit" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Chcete souÄasnou emulaci zastavit?" @@ -1807,6 +1855,7 @@ msgstr "Dolphin FIFO" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Nastavení" @@ -1835,6 +1884,14 @@ msgstr "Dolphin GCPad Nastavení" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad Nastavení" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" @@ -1925,6 +1982,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 @@ -1943,6 +2001,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "NizozemÅ¡tina" @@ -2073,18 +2136,25 @@ msgstr "Zapnout SluÄování Bloků" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "Povolit výpoÄet ohraniÄujícího rámeÄku" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Povolit vyrovnávací paměť" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2095,6 +2165,9 @@ msgstr "Povolit vyrovnávací paměť" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Povolit Cheaty" @@ -2232,6 +2305,7 @@ msgstr "End" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 @@ -2250,6 +2324,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "AngliÄtina" @@ -2303,13 +2382,25 @@ msgstr "" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Chyba" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" +"Chyba v PlayWiimote. %u != %u, bajt %d.\n" +"Je nám líto, nahrávání Wii je doÄasnÄ› nefunkÄní." + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 ======= #: Source/Core/DolphinWX/Src/Main.cpp:356 @@ -2765,6 +2856,7 @@ msgstr "Rozhlížení pomocí myÅ¡i" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 @@ -2783,6 +2875,11 @@ msgstr "Rozhlížení pomocí myÅ¡i" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "FrancouzÅ¡tina" @@ -2861,8 +2958,12 @@ msgstr "Nastavení Gamecube &Pad" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" @@ -2901,7 +3002,8 @@ msgstr "" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "General" @@ -2914,6 +3016,7 @@ msgstr "Obecná Nastavení" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 @@ -2932,6 +3035,11 @@ msgstr "Obecná Nastavení" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "NÄ›mÄina" @@ -3073,6 +3181,7 @@ msgstr "Nastavení klávesových zkratek" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= @@ -3086,6 +3195,10 @@ msgstr "Nastavení klávesových zkratek" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Klávesové zkratky" @@ -3289,6 +3402,7 @@ msgstr "Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› ne <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 @@ -3299,6 +3413,9 @@ msgstr "Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› ne ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Instaluji WAD..." @@ -3383,6 +3500,7 @@ msgstr "Neplatný stav" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 @@ -3401,6 +3519,11 @@ msgstr "Neplatný stav" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "ItalÅ¡tina" @@ -3561,6 +3684,7 @@ msgstr "Nahrát Stav..." <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Nahrát Systémové Menu Wii" @@ -3587,6 +3711,13 @@ msgstr "Nahrát Systémové Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Nahrát Systémové Menu Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Nahrát Systémové Menu Wii %d%c" @@ -3671,6 +3802,7 @@ msgstr "Soubory MadCatz Gameshark (*.gcs)" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 @@ -3681,6 +3813,9 @@ msgstr "Soubory MadCatz Gameshark (*.gcs)" ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Hlavní Stick" @@ -3714,6 +3849,7 @@ msgstr "Bajt PamÄ›ti" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3726,6 +3862,9 @@ msgstr "Bajt PamÄ›ti" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Paměťová karta" @@ -3916,6 +4055,7 @@ msgstr "NK Nahoru" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 @@ -3925,6 +4065,9 @@ msgstr "NK Nahoru" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4014,6 +4157,7 @@ msgstr "Nenastaven" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 @@ -4024,6 +4168,9 @@ msgstr "Nenastaven" ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "NepÅ™ipojen" @@ -4095,7 +4242,11 @@ msgstr "Pouze bloky %d jsou dostupné" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Otevřít" @@ -4225,6 +4376,7 @@ msgstr "Cesty" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ======= @@ -4237,6 +4389,10 @@ msgstr "Cesty" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pozastavit" @@ -4272,9 +4428,14 @@ msgstr "Perspektiva %d" ======= #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Spustit" @@ -4303,6 +4464,7 @@ msgstr "HráÄi" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 @@ -4313,6 +4475,9 @@ msgstr "HráÄi" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Prosím potvrÄte..." @@ -4526,6 +4691,7 @@ msgstr "Obnovit seznam her" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 @@ -4548,6 +4714,12 @@ msgstr "Obnovit seznam her" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Odstranit" @@ -4578,6 +4750,7 @@ msgstr "Vykreslit do Hlavního okna" ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Resetovat" @@ -4624,6 +4797,7 @@ msgstr "Uložit Sta&v" msgid "Safe" msgstr "BezpeÄná" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4634,6 +4808,9 @@ msgstr "BezpeÄná" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Vzorkovací frekvence:" @@ -4721,6 +4898,7 @@ 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" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4731,6 +4909,9 @@ msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "Skenuji %s" @@ -4772,6 +4953,7 @@ msgstr "Sekce %s nebyla v SYSCONF nalezena" msgid "Select" msgstr "Vybrat" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4795,6 +4977,14 @@ msgstr "Vyberte Soubor s Nahrávkou" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Vyberte Soubor s Nahrávkou" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" @@ -4823,6 +5013,7 @@ msgstr "Vyberte soubor k nahrání" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" @@ -4840,13 +5031,17 @@ msgstr "Vyberte stav k nahrání" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Vyberte stav k nahrání" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 @@ -4857,6 +5052,9 @@ msgstr "Vyberte stav k nahrání" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Vyberte stav k uložení" @@ -5219,6 +5417,7 @@ msgstr "Mezerník" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 @@ -5237,6 +5436,11 @@ msgstr "Mezerník" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Å panÄ›lÅ¡tina" @@ -5275,6 +5479,7 @@ msgstr "Standardní OvladaÄ" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 @@ -5284,6 +5489,9 @@ msgstr "Standardní OvladaÄ" ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5330,7 +5538,11 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Zastavit" @@ -5415,7 +5627,11 @@ msgstr "Deska vpravo" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "VytvoÅ™it Snímek Obrazovky" @@ -5650,15 +5866,20 @@ msgstr "PÅ™epnout na Celou Obrazovku" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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 <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "NahoÅ™e" @@ -5766,6 +5987,7 @@ msgstr "PÅ™ijata neznámá zpráva s id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Neznámá zpráva s id:%d pÅ™ijata od hráÄe:%d Vyhazuji hráÄe!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5786,6 +6008,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6005,6 +6229,7 @@ msgstr "Import uložených pozic Wii" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 @@ -6015,6 +6240,9 @@ msgstr "Import uložených pozic Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -6048,6 +6276,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 @@ -6058,6 +6287,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote PÅ™ipojen" @@ -6092,6 +6324,7 @@ msgstr "Zalamování textu" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 @@ -6106,6 +6339,11 @@ msgstr "Zalamování textu" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Pracuji..." @@ -6714,6 +6952,9 @@ msgstr "| NEBO" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -6721,6 +6962,7 @@ msgstr "| NEBO" #~ "Neznámý ukazatel %#08x\n" #~ "PokraÄovat?" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. ======= @@ -6757,6 +6999,8 @@ msgstr "| NEBO" >>>>>>> Update Greek and Czech translations ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #~ msgid "Use FPS For Limiting" #~ msgstr "Použít SzS pro Omezení" diff --git a/Languages/po/de.po b/Languages/po/de.po index 8772af3d05..52e4251e01 100644 --- a/Languages/po/de.po +++ b/Languages/po/de.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-02-17 01:23+0100\n" "Last-Translator: LucasX \n" "Language-Team: \n" @@ -555,6 +559,7 @@ msgstr "Patch hinzufügen" msgid "Add new pane" msgstr "Neue Palette hinzufügen" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -564,6 +569,11 @@ msgstr "Neue Palette hinzufügen" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Hinzufügen..." @@ -632,6 +642,7 @@ msgstr "Alle GC/Wii Images (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM Dateien (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -639,6 +650,10 @@ msgstr "Alle Gamecube GCM Dateien (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Alle Speicherstände (sav, s##)" @@ -721,11 +736,15 @@ 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." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Seitenverhältnis:" @@ -746,11 +765,15 @@ msgstr "Audio Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisch" @@ -865,10 +888,14 @@ msgstr "Blau rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Unten" @@ -901,11 +928,15 @@ msgstr "Ausgabeverzeichnis auswählen" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1145,10 +1176,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Schließen" @@ -1258,11 +1293,15 @@ msgstr "Wiimote 3 verbinden" msgid "Connect Wiimote 4" msgstr "Wiimote 4 verbinden" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Verbinden..." @@ -1455,10 +1494,14 @@ msgstr "DSP Emulator Engine" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emulation (schnell)" @@ -1675,11 +1718,15 @@ msgstr "" msgid "Divide" msgstr "Dividieren" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Laufende Emulation stoppen?" @@ -1709,6 +1756,7 @@ msgstr "Dolphin Emulierte-Wiimote Einstellungen" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1724,6 +1772,14 @@ msgstr "Dolphin GCPad Konfiguration" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad Konfiguration" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filme (*.dtm)" @@ -1811,6 +1867,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1820,6 +1877,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Holländisch" @@ -1948,22 +2010,32 @@ msgid "Enable Block Merging" msgstr "Blockvereinigung aktivieren" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Cache verwenden" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Cheats aktivieren" @@ -2102,6 +2174,7 @@ msgstr "" msgid "End" msgstr "Ende" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2111,6 +2184,11 @@ msgstr "Ende" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Englisch" @@ -2140,6 +2218,7 @@ msgstr "Gleich" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Fehler" @@ -2157,6 +2236,19 @@ msgid "Error" msgstr "Fehler" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Fehler" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2617,6 +2709,7 @@ msgstr "" msgid "Free Look" msgstr "Frei Umsehen" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2626,6 +2719,11 @@ msgstr "Frei Umsehen" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Französisch" @@ -2695,10 +2793,14 @@ msgstr "Gamecube-&Pad Einstellungen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Cards (*.raw,*.gcp)" @@ -2723,11 +2825,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Allgemein" @@ -2737,6 +2844,7 @@ msgstr "Allgemein" msgid "General Settings" msgstr "Interface Einstellungen" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2746,6 +2854,11 @@ msgstr "Interface Einstellungen" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Deutsch" @@ -2871,11 +2984,16 @@ msgstr "Tastenkürzel Einstellungen" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Tastenkürzel" @@ -3090,11 +3208,15 @@ msgstr "" "InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesn " "noch nicht." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. #, fuzzy msgid "Installing WAD..." msgstr "WAD ins Wii-Menü installieren..." @@ -3180,6 +3302,7 @@ msgstr "Ungültige Aufnahmedatei" msgid "Invalid state" msgstr "Ungültiger Status" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3189,6 +3312,11 @@ msgstr "Ungültiger Status" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italienisch" @@ -3347,20 +3475,28 @@ msgstr "Status aus Slot 8 laden" msgid "Load State..." msgstr "Status laden..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +>>>>>>> Update from master branch. #, fuzzy msgid "Load Wii System Menu" msgstr "Wii-Menü laden (%d %c)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii-Menü laden (%d %c)" @@ -3445,11 +3581,15 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark Dateien(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Main Stick" @@ -3482,10 +3622,14 @@ msgstr "Speicher" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Memory Card" @@ -3672,11 +3816,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Hoch" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3764,11 +3912,15 @@ msgstr "Ungleich" msgid "Not Set" msgstr "Nicht Festgelegt" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Nicht Verbunden" @@ -3830,9 +3982,13 @@ msgstr "Nur %d Blöcke verfügbar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Öffnen" @@ -3964,6 +4120,7 @@ msgstr "Patches" msgid "Paths" msgstr "Pfade" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3971,6 +4128,10 @@ msgstr "Pfade" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -3992,12 +4153,17 @@ msgstr "Perspektive %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Start" @@ -4024,11 +4190,15 @@ msgstr "Optionen" msgid "Players" msgstr "Spieler" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Bitte Bestätigen..." @@ -4244,6 +4414,7 @@ msgstr "Liste aktualisieren" msgid "Refresh game list" msgstr "Spieleliste aktualisieren" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4255,6 +4426,12 @@ msgstr "Spieleliste aktualisieren" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Entfernen" @@ -4274,9 +4451,13 @@ msgstr "Im Hauptfenster Rendern" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Zurücksetzen" @@ -4319,11 +4500,15 @@ msgstr "S&tatus speichern" msgid "Safe" msgstr "Sicher" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Abtastrate:" @@ -4408,11 +4593,15 @@ msgstr "Film-Status %s ist fehlerhaft, breche die Filmaufnahme ab..." msgid "Scaled EFB Copy" msgstr "EFB Scaled Copy" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Scanning %s" msgstr "Suche..." @@ -4452,6 +4641,7 @@ msgstr "Ausgewähltes %s nicht gefunden in SYSCONF" msgid "Select" msgstr "Auswählen" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4467,6 +4657,14 @@ msgstr "Aufnahmedatei auswählen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Aufnahmedatei auswählen" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Speicherdatei zum Importieren auswählen" @@ -4493,6 +4691,7 @@ msgstr "Wähle unverankerte Fenster" msgid "Select the file to load" msgstr "Datei zum Laden auswählen" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4505,15 +4704,22 @@ msgstr "Status zum Laden auswählen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Wii-Spielstand auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Status zum Laden auswählen" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Status zum Speichern auswählen" @@ -4869,6 +5075,7 @@ msgstr "Erstellen des Sound-Buffer fehlgeschlagen: %s" msgid "Space" msgstr "Leertaste" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4878,6 +5085,11 @@ msgstr "Leertaste" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Spanisch" @@ -4913,11 +5125,15 @@ msgstr "" msgid "Standard Controller" msgstr "Standard-Controller" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4953,9 +5169,13 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stopp" @@ -5029,9 +5249,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Screenshot erstellen" @@ -5278,18 +5502,26 @@ msgstr "Alle umschalten" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Vollbildmodus wechseln" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Oben" @@ -5394,6 +5626,7 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "Unbekannte Meldung mit ID %d erhalten von Spieler %d, Spieler herausgeworfen!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5406,6 +5639,8 @@ msgstr "" "Fortfahren?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5616,11 +5851,15 @@ msgstr "DVD Laufwerk:" msgid "Wii Save Import" msgstr "Wii Spielstand importieren" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii Speicherdateien (*.bin)|*.bin" @@ -5651,11 +5890,15 @@ msgstr "" "oder die Wiimote war zulange inaktiv oder andere Ursachen.\n" "Soll die Wiimote jetzt wieder verbunden werden?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Verbunden" @@ -5688,6 +5931,7 @@ msgstr "Windows Rechts" msgid "Word Wrap" msgstr "Zeilenumbruch" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5697,6 +5941,11 @@ msgstr "Zeilenumbruch" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Arbeite..." diff --git a/Languages/po/dolphin-emu.pot b/Languages/po/dolphin-emu.pot index dd44453140..271f6d526b 100644 --- a/Languages/po/dolphin-emu.pot +++ b/Languages/po/dolphin-emu.pot @@ -9,10 +9,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -510,6 +514,7 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -519,6 +524,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "" @@ -572,6 +582,7 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -579,6 +590,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "" @@ -656,11 +671,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -681,11 +700,15 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -794,10 +817,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "" @@ -830,11 +857,15 @@ msgstr "" msgid "Buffer:" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1057,10 +1088,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "" @@ -1169,11 +1204,15 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "" @@ -1349,10 +1388,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1562,11 +1605,15 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1595,6 +1642,7 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1610,6 +1658,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1692,6 +1748,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1701,6 +1758,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "" @@ -1824,21 +1886,31 @@ msgid "Enable Block Merging" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "" @@ -1964,6 +2036,7 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -1973,6 +2046,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "" @@ -2002,6 +2080,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -2019,6 +2098,19 @@ msgid "Error" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2433,6 +2525,7 @@ msgstr "" msgid "Free Look" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2442,6 +2535,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "" @@ -2508,10 +2606,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2533,11 +2635,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2546,6 +2653,7 @@ msgstr "" msgid "General Settings" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2555,6 +2663,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "" @@ -2670,11 +2783,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "" @@ -2864,11 +2982,15 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "" @@ -2945,6 +3067,7 @@ msgstr "" msgid "Invalid state" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -2954,6 +3077,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "" @@ -3104,6 +3232,7 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3117,6 +3246,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3193,11 +3329,15 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3229,10 +3369,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "" @@ -3409,11 +3553,15 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3500,11 +3648,15 @@ msgstr "" msgid "Not Set" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "" @@ -3566,9 +3718,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "" @@ -3694,6 +3850,7 @@ msgstr "" msgid "Paths" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3701,6 +3858,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3721,12 +3882,17 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "" @@ -3752,11 +3918,15 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "" @@ -3962,6 +4132,7 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -3973,6 +4144,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "" @@ -3989,9 +4166,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -4034,11 +4215,15 @@ msgstr "" msgid "Safe" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "" @@ -4122,11 +4307,15 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "" @@ -4166,6 +4355,7 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4181,6 +4371,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "" @@ -4203,6 +4401,7 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4215,15 +4414,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "" @@ -4557,6 +4763,7 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4566,6 +4773,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "" @@ -4601,11 +4813,15 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4641,9 +4857,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -4716,9 +4936,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "" @@ -4931,18 +5155,26 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "" @@ -5044,6 +5276,7 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5054,6 +5287,8 @@ msgid "" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5255,11 +5490,15 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5286,11 +5525,15 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "" @@ -5322,6 +5565,7 @@ msgstr "" msgid "Word Wrap" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5331,6 +5575,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "" diff --git a/Languages/po/el.po b/Languages/po/el.po index 7a97de70b5..f5da4c8403 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -10,6 +10,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-18 13:39-0600\n" ======= @@ -23,6 +24,10 @@ msgstr "" >>>>>>> The actual update of the Greek and Czech translations. The last commit "PO-Revision-Date: 2011-10-15 11:16+0200\n" >>>>>>> Update Greek and Czech translations +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +"PO-Revision-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "Last-Translator: Linktothepast \n" "Language-Team: Gpower2 \n" "Language: Greek\n" @@ -58,7 +63,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/MemcardManager.cpp:193 #, c-format @@ -86,7 +92,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:97 #, c-format @@ -113,7 +120,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 @@ -144,7 +152,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:199 #, c-format @@ -385,11 +395,13 @@ 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" @@ -403,10 +415,12 @@ msgstr "" " - ΔÏο ΠυÏήνες [ΑÎΕÎΕΡΓΟ]\n" " - Throttle Ήχου [ΑÎΕÎΕΡΓΟ]\n" " - DSP-HLE με \"Null Audio\" ή DSP-LLE\n" -" - ΧειÏοκίνητη εισαγωγή του ακÏιβοÏÏ‚ αÏÎ¹Î¸Î¼Î¿Ï Ï„Ï‰Î½ ελεγκτών που θα χÏησιμοποιηθοÏν σαν [Τυπικός Ελεγκτής]\n" +" - ΧειÏοκίνητη εισαγωγή του ακÏιβοÏÏ‚ αÏÎ¹Î¸Î¼Î¿Ï Ï„Ï‰Î½ ελεγκτών που θα " +"χÏησιμοποιηθοÏν σαν [Τυπικός Ελεγκτής]\n" "\n" "Όλοι οι παίκτες Ï€Ïέπει να έχουν την ίδια έκδοση και Ïυθμίσεις του Dolphin.\n" -"ΑπενεÏγοποιήστε όλες τις κάÏτες μνήμης ή στείλτε τες σε όλους τους παίκτες Ï€Ïιν την εκκίνηση.\n" +"ΑπενεÏγοποιήστε όλες τις κάÏτες μνήμης ή στείλτε τες σε όλους τους παίκτες " +"Ï€Ïιν την εκκίνηση.\n" "Η υποστήÏιξη Wiimote δεν έχει ακόμα υλοποιηθεί.\n" "\n" "Θα Ï€Ïέπει να έχετε κάνει Ï€Ïοώθηση της πόÏτας TCP στον host!!" @@ -466,12 +480,14 @@ msgstr "ΑκÏιβής VBeam εξομοίωση" >>>>>>> The actual update of the Greek and Czech translations. The last commit 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 ΑντίγÏαφα σε Υφή." @@ -497,23 +513,38 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, 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:756 #, 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:549 #, 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:609 #, 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:803 #, c-format @@ -522,8 +553,11 @@ msgstr "Σφάλμα Action Replay: Μη έγκυÏη τιμή (%08x) σε Memor #: Source/Core/Core/Src/ActionReplay.cpp:684 #, 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 @@ -574,6 +608,7 @@ msgstr "ΠÏοσθήκη νέου pane" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 @@ -592,6 +627,11 @@ msgstr "ΠÏοσθήκη νέου pane" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "ΠÏοσθήκη..." @@ -603,7 +643,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." @@ -613,7 +654,8 @@ 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." @@ -621,7 +663,9 @@ 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:520 msgid "Advanced" @@ -646,6 +690,7 @@ msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ======= @@ -660,6 +705,10 @@ msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" @@ -677,11 +726,13 @@ msgstr "Όλα τα αÏχεία (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕπιτÏέπει την εναλλαγή οÏισμένων επιλογών με τα πλήκτÏα συντόμευσης 3, 4, 5, 6 και 7 μέσα από το παÏάθυÏο εξομοίωσης.\n" +"ΕπιτÏέπει την εναλλαγή οÏισμένων επιλογών με τα πλήκτÏα συντόμευσης 3, 4, 5, " +"6 και 7 μέσα από το παÏάθυÏο εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -760,8 +811,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 msgid "Are you sure you want to delete this file? It will be gone forever!" -msgstr "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για πάντα!" +msgstr "" +"Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για " +"πάντα!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= @@ -774,6 +828,9 @@ msgstr "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετ #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 >>>>>>> Update Greek and Czech translations ======= +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Aspect Ratio:" @@ -795,6 +852,7 @@ msgstr "Backend Ήχου:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= @@ -807,6 +865,9 @@ msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 >>>>>>> Update Greek and Czech translations ======= +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Auto" @@ -830,7 +891,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΠÏοσαÏμόζει αυτόματα το μέγεθος του παÏαθÏÏου σÏμφωνα με την εσωτεÏική ανάλυση.\n" +"ΠÏοσαÏμόζει αυτόματα το μέγεθος του παÏαθÏÏου σÏμφωνα με την εσωτεÏική " +"ανάλυση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -859,7 +921,8 @@ msgstr "" >>>>>>> Update Greek and Czech translations ======= "ΔημιουÏγεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" -"Αυξάνει λίγο τις επιδόσεις, αλλά μποÏεί να Ï€Ïοκαλέσει μικÏά ελαττώματα στις υφές.\n" +"Αυξάνει λίγο τις επιδόσεις, αλλά μποÏεί να Ï€Ïοκαλέσει μικÏά ελαττώματα στις " +"υφές.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -953,8 +1016,12 @@ msgstr "Δεξί Μπλε" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Βάση" @@ -990,6 +1057,7 @@ msgstr "Buffer:" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 @@ -1002,6 +1070,9 @@ msgstr "Buffer:" ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1026,12 +1097,16 @@ msgstr "Cache Display Lists" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -1045,7 +1120,8 @@ msgid "" msgstr "" "Υπολογίζει τον φωτισμό των 3D γÏαφικών ανά pixel αντί ανά vertex.\n" "Μειώνει την ταχÏτητα εξομοίωσης κατά κάποιο ποσοστό (ανάλογα με την GPU).\n" -"Αυτή συνήθως είναι μια ασφαλής βελτίωση, αλλά μποÏεί να Ï€Ïοκαλέσει οÏισμένες φοÏές Ï€Ïοβλήματα.\n" +"Αυτή συνήθως είναι μια ασφαλής βελτίωση, αλλά μποÏεί να Ï€Ïοκαλέσει οÏισμένες " +"φοÏές Ï€Ïοβλήματα.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -1199,22 +1275,29 @@ msgstr "Επιλέξτε ένα αÏχείο για άνοιγμα" msgid "Choose a memory card:" msgstr "Επιλέξτε μια κάÏτα μνήμης:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +>>>>>>> Update from master branch. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" "Επιλέξτε ένα αÏχείο για χÏήση ως apploader: (έχει εφαÏμογή σε δίσκους που " "απαÏτίζονται μόνο από φακέλους)" +<<<<<<< HEAD ======= msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" msgstr "Επιλέξτε ένα αÏχείο για χÏήση ως apploader: (έχει εφαÏμογή σε δίσκους που απαÏτίζονται μόνο από φακέλους)" >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 @@ -1241,12 +1324,17 @@ msgid "Clear failed." 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:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1258,6 +1346,9 @@ msgstr "Ο Client έχει αποσυνδεθεί ενώ το παιχνίδι #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 >>>>>>> Update Greek and Czech translations ======= +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Close" @@ -1370,6 +1461,7 @@ msgstr "ΣÏνδεση Wiimote 4" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 @@ -1380,6 +1472,9 @@ msgstr "ΣÏνδεση Wiimote 4" ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Γίνεται ΣÏνδεση..." @@ -1420,10 +1515,15 @@ 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 @@ -1440,19 +1540,23 @@ 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:119 #, 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:1059 msgid "Couldn't find open command for extension 'ini'!" @@ -1489,21 +1593,28 @@ msgstr "ΔημιουÏγία νέας οπτικής" msgid "Created by KDE-Look.org" msgstr "ΔημιουÏγήθηκε από KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +>>>>>>> Update from master branch. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "ΔημιουÏγήθηκε από Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart." "com]" +<<<<<<< HEAD ======= msgid "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "ΔημιουÏγήθηκε από Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" @@ -1511,7 +1622,9 @@ msgstr "ΔημιουÏγήθηκε από VistaIcons.com" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 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:15 msgid "Creator: " @@ -1586,8 +1699,12 @@ msgstr "Μηχανή Εξομοίωσης DSP" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE εξομοίωση (γÏήγοÏη)" @@ -1693,8 +1810,12 @@ msgstr "Ανίχνευση" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -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 @@ -1750,24 +1871,30 @@ msgstr "ΑπενεÏγοποίηση Υφών" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 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:95 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -1811,6 +1938,7 @@ msgstr "Divide" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 @@ -1821,6 +1949,9 @@ msgstr "Divide" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξομοίωση;" @@ -1852,6 +1983,7 @@ msgstr "Dolphin FIFO" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Ρυθμίσεις Dolphin GCPad" @@ -1880,6 +2012,14 @@ msgstr "Ρυθμίσεις Dolphin GCPad" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Ρυθμίσεις Dolphin GCPad" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" @@ -1891,18 +2031,23 @@ msgstr "Ρυθμίσεις Dolphin Wiimote" msgid "Dolphin at &Google Code" msgstr "Dolphin στο &Google Code" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +>>>>>>> Update from master branch. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" "Το Dolphin δεν μπόÏεσε να βÏει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εÏÏεση " "αÏχείων..." +<<<<<<< HEAD ======= msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." msgstr "Το Dolphin δεν μπόÏεσε να βÏει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εÏÏεση αÏχείων..." @@ -1914,16 +2059,23 @@ msgstr "Το Dolphin δεν μπόÏεσε να βÏει GC/Wii ISO. Κάντε #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +>>>>>>> Update from master branch. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "" "Το Dolphin είναι Ïυθμισμένο να αποκÏÏπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ " "εδώ για να εμφανιστοÏν όλα τα παιχνίδια..." +<<<<<<< HEAD ======= msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." msgstr "Το Dolphin είναι Ïυθμισμένο να αποκÏÏπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ εδώ για να εμφανιστοÏν όλα τα παιχνίδια..." >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -1969,7 +2121,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Εξαγωγή όλων των απεικονισμένων καÏέ σε ένα AVI αÏχείο στο User/Dump/Frames/\n" +"Εξαγωγή όλων των απεικονισμένων καÏέ σε ένα AVI αÏχείο στο User/Dump/" +"Frames/\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -1979,7 +2132,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Εξαγωγή των αποκωδικοποιημένων υφών του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï ÏƒÏ„Î¿ User/Dump/Textures//\n" +"Εξαγωγή των αποκωδικοποιημένων υφών του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï ÏƒÏ„Î¿ User/Dump/Textures/" +"/\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -1996,6 +2150,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 @@ -2014,6 +2169,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Ολλανδικά" @@ -2027,8 +2187,16 @@ msgstr "EFB ΑντίγÏαφα" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, 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:162 msgid "EUROPE" @@ -2078,24 +2246,31 @@ msgstr "Το νήμα εξομοίωσης εκτελείται ήδη" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 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:110 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" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -2113,13 +2288,15 @@ msgstr "ΕνεÏγοποίηση" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 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" @@ -2144,16 +2321,23 @@ msgstr "ΕνεÏγοποίηση Block Merging" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "ΕνεÏγοποίηση Cache" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= @@ -2168,6 +2352,9 @@ msgstr "ΕνεÏγοποίηση Cheat" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "ΕνεÏγοποίηση Cheat" @@ -2225,14 +2412,19 @@ msgid "" "If unsure, select 1x." msgstr "" "ΕνεÏγοποιεί το ανισοτÏοπικό φιλτÏάÏισμα.\n" -"Βελτιώνει την ποιότητα απεικόνισης των υφών που βÏίσκονται σε οξείες οπτικές γωνίες.\n" +"Βελτιώνει την ποιότητα απεικόνισης των υφών που βÏίσκονται σε οξείες οπτικές " +"γωνίες.\n" "ΜποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα σε έναν μικÏÏŒ αÏιθμό παιχνιδιών.\n" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -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:799 msgid "Enable pages" @@ -2245,41 +2437,57 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιήστε το αν θέλετε ολόκληÏη η οθόνη να χÏησιμοποιηθεί για την απεικόνιση.\n" +"ΕνεÏγοποιήστε το αν θέλετε ολόκληÏη η οθόνη να χÏησιμοποιηθεί για την " +"απεικόνιση.\n" "Αν αυτό είναι απενεÏγοποιημένο, θα δημιουÏγηθεί ένα παÏάθυÏο απεικόνισης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update from master branch. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" "ΕνεÏγοποιήστε το για να επιταχÏνετε το The Legend of Zelda: Twilight " "Princess. ΑπενεÏγοποιήστε το για τα υπόλοιπα παιχνίδια." +<<<<<<< HEAD ======= msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." msgstr "ΕνεÏγοποιήστε το για να επιταχÏνετε το The Legend of Zelda: Twilight Princess. ΑπενεÏγοποιήστε το για τα υπόλοιπα παιχνίδια." >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 -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:337 msgid "Enables Custom Projection Hack" @@ -2292,13 +2500,18 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιεί την Ï€Ïοοδευτική σάÏωση αν υποστηÏίζεται από το εξομοιωμένο λογισμικό. Τα πεÏισσότεÏα παιχνίδια δεν την χÏειάζονται αυτήν την ÏÏθμιση.\n" +"ΕνεÏγοποιεί την Ï€Ïοοδευτική σάÏωση αν υποστηÏίζεται από το εξομοιωμένο " +"λογισμικό. Τα πεÏισσότεÏα παιχνίδια δεν την χÏειάζονται αυτήν την ÏÏθμιση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -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:117 msgid "" @@ -2317,6 +2530,7 @@ msgstr "Τέλος" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 @@ -2335,6 +2549,11 @@ msgstr "Τέλος" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Αγγλικά" @@ -2386,10 +2605,11 @@ msgstr "" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Σφάλμα" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. @@ -2418,9 +2638,37 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +======= +#: Source/Core/Core/Src/Movie.cpp:820 #, 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 in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +#: Source/Core/DolphinWX/Src/Main.cpp:346 +msgid "Error loading selected language. Falling back to system default." +msgstr "" +"Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή " +"συστήματος." + +#: Source/Core/Common/Src/ChunkFile.h:180 +>>>>>>> Update from master branch. +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#, c-format +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" @@ -2433,7 +2681,8 @@ 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:58 msgid "Execute" @@ -2585,10 +2834,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 @@ -2797,7 +3048,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Επιβάλλει φιλτÏάÏισμα υφών ακόμα κι αν το παιχνίδι το έχει απενεÏγοποιήσει.\n" -"Βελτιώνει ελαφÏÏŽÏ‚ την ποιότητα των υφών αλλά μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα σε οÏισμένα παιχνίδια.\n" +"Βελτιώνει ελαφÏÏŽÏ‚ την ποιότητα των υφών αλλά μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα " +"σε οÏισμένα παιχνίδια.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -2816,10 +3068,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 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:76 msgid "" @@ -2874,6 +3129,7 @@ msgstr "ΕλεÏθεÏη Ματιά" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 @@ -2892,6 +3148,11 @@ msgstr "ΕλεÏθεÏη Ματιά" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Γαλλικά" @@ -2961,6 +3222,7 @@ msgstr "Ρυθμίσεις Gamecube &Pad" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2973,6 +3235,9 @@ msgstr "Ρυθμίσεις Gamecube &Pad" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "ΚάÏτες Μνήμης Gamecube (*.raw,*.gcp)" @@ -3011,7 +3276,8 @@ msgstr "" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "General" @@ -3024,6 +3290,7 @@ msgstr "Γενικές Ρυθμίσεις" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 @@ -3042,13 +3309,20 @@ msgstr "Γενικές Ρυθμίσεις" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "ΓεÏμανικά" #: Source/Core/Core/Src/ActionReplay.cpp:451 #, 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:443 msgid "Graphics" @@ -3076,15 +3350,19 @@ msgstr "ΜεγαλÏτεÏο από" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 >>>>>>> The actual update of the Greek and Czech translations. The last commit 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" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -3162,7 +3440,8 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"ΑποκÏÏπτει τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î±Î½ βÏίσκεται πάνω από το παÏάθυÏο εξομοίωσης.\n" +"ΑποκÏÏπτει τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î±Î½ βÏίσκεται πάνω από το παÏάθυÏο " +"εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -3194,8 +3473,13 @@ msgstr "Ρυθμίσεις ΠλήκτÏων Συντόμευσης" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "ΠλήκτÏα Συντόμευσης" @@ -3210,16 +3494,20 @@ msgstr "ΥβÏιδικό Wiimote" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 #, 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:795 #, 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 πιθανότατα θα κολλήσει Ï„ÏŽÏα." @@ -3266,9 +3554,13 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -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 διακυμαίνονται, αυτή η επιλογή μποÏείο να βοηθήσει. (ΕνεÏγό = " +"Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ======= @@ -3281,9 +3573,17 @@ msgid "" ======= msgid "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." >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +msgid "" +"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." +>>>>>>> Update from master branch. msgstr "" -"Αν θέσετε τιμή υψηλότεÏη από την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, PAL:50),\n" -"θα Ï€Ïέπει επίσης να απενεÏγοποιήσετε το Throttle Ήχου στο DSP για να έχει αποτέλεσμα. " +"Αν θέσετε τιμή υψηλότεÏη από την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, " +"PAL:50),\n" +"θα Ï€Ïέπει επίσης να απενεÏγοποιήσετε το Throttle Ήχου στο DSP για να έχει " +"αποτέλεσμα. " #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" @@ -3292,24 +3592,29 @@ msgstr "Αγνόηση Αλλαγών Format" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 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:93 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -3343,11 +3648,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -3357,7 +3664,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί την εξαφάνιση του Ï†Ï‰Ï„Î¹ÏƒÎ¼Î¿Ï ÏƒÏ„Î± πεÏισσότεÏα παιχνίδια.\n" +"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί την εξαφάνιση του Ï†Ï‰Ï„Î¹ÏƒÎ¼Î¿Ï ÏƒÏ„Î± " +"πεÏισσότεÏα παιχνίδια.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -3407,12 +3715,16 @@ 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 καλέστηκε, αλλά αυτή η πλατφόÏμα δεν το υποστηÏίζει " +"ακόμα." <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 @@ -3423,6 +3735,9 @@ msgstr "InstallExceptionHandler καλέστηκε, αλλά αυτή η πλα ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." @@ -3507,6 +3822,7 @@ msgstr "Μη έγκυÏο κατάσταση" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 @@ -3525,6 +3841,11 @@ msgstr "Μη έγκυÏο κατάσταση" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Ιταλικά" @@ -3685,6 +4006,7 @@ msgstr "ΦόÏτωση Σημείου Αποθήκευσης..." <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" @@ -3711,6 +4033,13 @@ msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii %d%c" @@ -3795,6 +4124,7 @@ msgstr "ΑÏχεία MadCatz Gameshark (*.gcs)" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 @@ -3805,6 +4135,9 @@ msgstr "ΑÏχεία MadCatz Gameshark (*.gcs)" ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "ΚÏÏιο Stick" @@ -3848,14 +4181,22 @@ msgstr "Memory Byte" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. 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 @@ -3876,7 +4217,9 @@ msgstr "" #: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" -msgstr "Το μέγεθος του αÏχείου της κάÏτας μνήμης δεν ταιÏιάζει με το μέγεθος της κεφαλίδας." +msgstr "" +"Το μέγεθος του αÏχείου της κάÏτας μνήμης δεν ταιÏιάζει με το μέγεθος της " +"κεφαλίδας." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:47 msgid "Menu" @@ -3906,11 +4249,13 @@ msgstr "Modifier" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -3938,7 +4283,8 @@ msgid "" "\n" "\n" msgstr "" -"Μετακινήστε τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Ï€Î¬Î½Ï‰ από μία επιλογή για να εμφανιστεί μία λεπτομεÏής πεÏιγÏαφή.\n" +"Μετακινήστε τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Ï€Î¬Î½Ï‰ από μία επιλογή για να εμφανιστεί " +"μία λεπτομεÏής πεÏιγÏαφή.\n" "\n" "\n" "\n" @@ -3949,8 +4295,12 @@ msgid "Multiply" msgstr "Multiply" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -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/WXInputBase.cpp:126 msgid "NP Add" @@ -4039,6 +4389,7 @@ msgstr "NP Up" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 @@ -4048,6 +4399,9 @@ msgstr "NP Up" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4137,6 +4491,7 @@ msgstr "Μη ΟÏισμένο" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 @@ -4147,6 +4502,9 @@ msgstr "Μη ΟÏισμένο" ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Μη Συνδεδεμένο" @@ -4218,7 +4576,11 @@ msgstr "Διαθέσιμα μόνο %d μπλοκ" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Άνοιγμα" @@ -4279,7 +4641,8 @@ 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" @@ -4289,8 +4652,12 @@ 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" @@ -4348,6 +4715,7 @@ msgstr "Φάκελοι" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ======= @@ -4360,6 +4728,10 @@ msgstr "Φάκελοι" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "ΠαÏση" @@ -4395,9 +4767,14 @@ msgstr "Οπτική %d" ======= #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "ΑναπαÏαγωγή" @@ -4426,6 +4803,7 @@ msgstr "Παίχτες" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 @@ -4436,6 +4814,9 @@ msgstr "Παίχτες" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "ΠαÏακαλώ επιβεβαιώστε..." @@ -4649,6 +5030,7 @@ msgstr "Ανανέωση λίστας παιχνιδιών" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 @@ -4671,6 +5053,12 @@ msgstr "Ανανέωση λίστας παιχνιδιών" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "ΑφαίÏεση" @@ -4701,6 +5089,7 @@ msgstr "ΑναπαÏαγωγή στο ΚεντÏικό ΠαÏάθυÏο" ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Επανεκκίνηση" @@ -4747,6 +5136,7 @@ msgid "Safe" msgstr "Ασφαλής" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +<<<<<<< HEAD ======= msgstr "" @@ -4760,6 +5150,8 @@ msgstr "Ασφαλής" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Ρυθμός Δειγματοληψίας:" @@ -4837,12 +5229,15 @@ msgstr "Αποθήκευση αποσυμπιεσμένου GCM/ISO" #: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." -msgstr "Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της εγγÏαφής της ταινίας..." +msgstr "" +"Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της " +"εγγÏαφής της ταινίας..." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" msgstr "ΚλιμακοÏμενα EFB ΑντίγÏαφα" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" @@ -4856,6 +5251,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "Ανίχνευση %s" @@ -4884,10 +5282,8 @@ msgstr "ΦίλτÏο Αναζήτησης" msgid "Search Subfolders" msgstr "Αναζήτηση σε Υποφακέλους" -#: Source/Core/Common/Src/SysConf.h:104 -#: Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 -#: Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 +#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Η ενότητα %s δε βÏέθηκε στο SYSCONF" @@ -4897,6 +5293,7 @@ msgstr "Η ενότητα %s δε βÏέθηκε στο SYSCONF" msgid "Select" msgstr "Επιλογή" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4920,6 +5317,14 @@ msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αÏχείο για εγκατάσταση" @@ -4948,6 +5353,7 @@ msgstr "Επιλέξτε το αÏχείο για φόÏτωση" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Επιλέξτε αÏχείο αποθήκευσης" @@ -4965,13 +5371,17 @@ msgstr "Επιλέξτε το σημείο φόÏτωσης" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Επιλέξτε αÏχείο αποθήκευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Επιλέξτε το σημείο φόÏτωσης" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 @@ -4982,6 +5392,9 @@ msgstr "Επιλέξτε το σημείο φόÏτωσης" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" @@ -4999,7 +5412,8 @@ msgstr "" "Αυτόματα: ΧÏήση της τοπικής αναλογίας οθόνης (4:3)\n" "Επιβολή 16:9: ΠÏοσαÏμόζει την εικόνα σε αναλογία οθόνης 16:9.\n" "Επιβολή 4:3: ΠÏοσαÏμόζει την εικόνα σε αναλογία οθόνης 4:3.\n" -"ΠÏοσαÏμογή στο παÏάθυÏο: ΠÏοσαÏμόζει την εικόνα στην αναλογία του παÏαθÏÏου.\n" +"ΠÏοσαÏμογή στο παÏάθυÏο: ΠÏοσαÏμόζει την εικόνα στην αναλογία του " +"παÏαθÏÏου.\n" "\n" "Αν δεν είστε σίγουÏοι επιλέξτε Αυτόματα." @@ -5010,26 +5424,32 @@ msgstr "Επιλεγμένη γÏαμματοσειÏά" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 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:73 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." @@ -5050,21 +5470,28 @@ msgstr "ΔιαχωÏιστής" msgid "Serbian" msgstr "ΣεÏβικά" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +>>>>>>> Update from master branch. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "ΣειÏιακή ΘÏÏα 1 - Αυτή είναι η θÏÏα που χÏησιμοποιοÏν οι συσκευές όπως ο " "Ï€ÏοσαÏμογέας δικτÏου" +<<<<<<< HEAD ======= msgid "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "ΣειÏιακή ΘÏÏα 1 - Αυτή είναι η θÏÏα που χÏησιμοποιοÏν οι συσκευές όπως ο Ï€ÏοσαÏμογέας δικτÏου" >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" @@ -5082,7 +5509,9 @@ msgstr "ΟÏισμός ως Ï€Ïοεπιλεγμένη ΚάÏτα Μνήμης % #: Source/Core/Core/Src/ActionReplay.cpp:462 #, 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:338 msgid "Settings..." @@ -5203,10 +5632,12 @@ msgstr "Εμφάνιση επιβεβαίωσης Ï€Ïιν τη διακοπή #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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:812 @@ -5231,11 +5662,13 @@ msgstr "Εμφάνιση αποθηκευμένου τίτλου" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -5292,11 +5725,13 @@ msgstr "ΠαÏάλειψη EFB ΠÏόσβασης από τη CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 >>>>>>> The actual update of the Greek and Czech translations. The last commit 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -5304,13 +5739,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 "" -"ΕπιταχÏνει ελαφÏÏŽÏ‚ τα EFB σε RAM αντίγÏαφα θυσιάζοντας την ακÏίβεια της εξομοίωσης.\n" +"ΕπιταχÏνει ελαφÏÏŽÏ‚ τα EFB σε RAM αντίγÏαφα θυσιάζοντας την ακÏίβεια της " +"εξομοίωσης.\n" "ΜεÏικές φοÏές μποÏεί να βελτιώσει την οπτική ποιότητα.\n" -"Αν αντιμετωπίζετε Ï€Ïοβλήματα, δοκιμάστε να αυξήσετε την ακÏίβεια της cache υφών ή απενεÏγοποιήστε αυτήν την επιλογή.\n" +"Αν αντιμετωπίζετε Ï€Ïοβλήματα, δοκιμάστε να αυξήσετε την ακÏίβεια της cache " +"υφών ή απενεÏγοποιήστε αυτήν την επιλογή.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -5378,13 +5816,16 @@ 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" @@ -5407,6 +5848,7 @@ msgstr "Space" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 @@ -5425,6 +5867,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Ισπανικά" @@ -5434,13 +5881,22 @@ msgstr "Ένταση ηχείου:" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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." @@ -5463,6 +5919,7 @@ msgstr "Τυπικός Controller" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 @@ -5472,6 +5929,9 @@ msgstr "Τυπικός Controller" ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5518,7 +5978,11 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Διακοπή" @@ -5550,12 +6014,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 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" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -5621,6 +6087,7 @@ msgstr "Δεξί Table" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. @@ -5629,6 +6096,9 @@ msgstr "Δεξί Table" ======= #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "ΔημιουÏγία Στιγμιότυπου" @@ -5705,8 +6175,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 "Αδυναμία ανοίγματος του αÏχείου %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 @@ -5728,15 +6202,18 @@ 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:98 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 second-fastest value from the right." msgstr "" -"Όσο πιο ασφαλής είναι αυτή η ÏÏθμιση, τόσο λιγότεÏο πιθανό ο εξομοιωτής να χάσει ανανεώσεις των υφών από την RAM.\n" +"Όσο πιο ασφαλής είναι αυτή η ÏÏθμιση, τόσο λιγότεÏο πιθανό ο εξομοιωτής να " +"χάσει ανανεώσεις των υφών από την RAM.\n" "\n" "Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την δεÏτεÏη γÏηγοÏότεÏη τιμή από δεξιά." @@ -5760,11 +6237,16 @@ msgstr "" >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" -msgstr "Το σημείο αποθήκευσης που Ï€Ïοσπαθείτε να αντιγÏάψετε έχει μη έγκυÏο μέγεθος" +msgstr "" +"Το σημείο αποθήκευσης που Ï€Ïοσπαθείτε να αντιγÏάψετε έχει μη έγκυÏο μέγεθος" #: Source/Core/DolphinWX/Src/Main.cpp:353 -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!" @@ -5800,8 +6282,12 @@ msgid "Theme selection went wrong" msgstr "Η επιλογή θέματος απέτυχε" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 -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:304 msgid "" @@ -5809,25 +6295,40 @@ msgid "" "Undetermined means the game uses Dolphin's setting." msgstr "" "Αυτές οι Ïυθμίσεις υπεÏισχÏουν των γενικών Ïυθμίσεων του Dolphin.\n" -"Αν είναι ακαθόÏιστη η επιλογή το παιχνίδι χÏησιμοποιεί τις γενικές Ïυθμίσεις του Dolphin. " +"Αν είναι ακαθόÏιστη η επιλογή το παιχνίδι χÏησιμοποιεί τις γενικές Ïυθμίσεις " +"του Dolphin. " #: Source/Core/Core/Src/ActionReplay.cpp:356 -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:513 msgid "This could cause slow down in Wii Menu and some games." -msgstr "Αυτό μποÏεί να Ï€Ïοκαλέσει καθυστεÏήσεις στο ÎœÎµÎ½Î¿Ï Wii και σε μεÏικά παιχνίδια." +msgstr "" +"Αυτό μποÏεί να Ï€Ïοκαλέσει καθυστεÏήσεις στο ÎœÎµÎ½Î¿Ï Wii και σε μεÏικά " +"παιχνίδια." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -5839,11 +6340,14 @@ msgid "" "\n" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" -"ΧÏησιμοποιείται για τον έλεγχο της ταχÏτητας του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î¼Îµ throttle ήχου.\n" -"ΑπενεÏγοποιώντας το μποÏεί να Ï€Ïοκλήθει αφÏσικη ταχÏτητα σε παιχνίδια, Ï€.χ. Ï€Î¿Î»Ï Î³ÏήγοÏη.\n" +"ΧÏησιμοποιείται για τον έλεγχο της ταχÏτητας του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î¼Îµ throttle " +"ήχου.\n" +"ΑπενεÏγοποιώντας το μποÏεί να Ï€Ïοκλήθει αφÏσικη ταχÏτητα σε παιχνίδια, Ï€.χ. " +"Ï€Î¿Î»Ï Î³ÏήγοÏη.\n" "Όμως οÏισμένες φοÏές η ενεÏγοποίησή της μποÏεί να Ï€Ïοκαλέσει μόνιμο θόÏυβο.\n" "\n" -"Συντόμευση πληκτÏολογίου : ΚÏατήστε το πατημένο για να απενεÏγοποιηθεί η λειτουÏγία Throttle." +"Συντόμευση πληκτÏολογίου : ΚÏατήστε το πατημένο για να απενεÏγοποιηθεί " +"η λειτουÏγία Throttle." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." @@ -5851,16 +6355,20 @@ msgstr "ΧÏησιμοποιείται για την αναπαÏαγωγή μο #: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 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:283 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 @@ -5906,15 +6414,20 @@ msgstr "Εναλλαγή ΠλήÏους Οθόνης" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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 <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "ΚοÏυφή" @@ -5930,8 +6443,7 @@ msgstr "ΠÏοσπάθεια φόÏτωσης ενός άγνωστου Ï„Ïπο msgid "Triggers" msgstr "Σκανδάλες" -#: Source/Core/Common/Src/SysConf.h:92 -#: Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 msgid "Trying to read from invalid SYSCONF" msgstr "ΠÏοσπάθεια ανάγνωσης από ένα μη έγκυÏο SYSCONF" @@ -5983,10 +6495,13 @@ 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:404 @@ -6022,6 +6537,7 @@ msgstr "Ελήφθη άγνωστο μήνυμα με id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Ελήφθη άγνωστο μήνυμα με:%d από τον παίκτη:%d ΑποσÏνδεση παίκτη!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -6042,6 +6558,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6080,19 +6598,23 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "ΧÏησιμοποίηση πολλαπλών νημάτων για την αποκωδικοποίηση υφών.\n" -"ΜποÏεί να βελτιώσει την ταχÏτητα (ειδικά σε CPUs με πεÏισσότεÏους από δÏο πυÏήνες).\n" +"ΜποÏεί να βελτιώσει την ταχÏτητα (ειδικά σε CPUs με πεÏισσότεÏους από δÏο " +"πυÏήνες).\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -6146,7 +6668,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Αναμονή για την κάθετη ανανέωση της οθόνης ώστε να μειωθεί το σπάσιμο της εικόνας.\n" +"Αναμονή για την κάθετη ανανέωση της οθόνης ώστε να μειωθεί το σπάσιμο της " +"εικόνας.\n" "Μειώνει τις επιδόσεις αν η ταχÏτητα εξομοίωσης είναι μικÏότεÏη από 100%.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -6176,7 +6699,8 @@ msgid "" "%s\n" "Do you wish to continue?" msgstr "" -"ΠÏοειδοποίηση! Συστήνεται η δημιουÏγία αντιγÏάφου ασφαλείας όλων των αÏχείων στον φάκελο:\n" +"ΠÏοειδοποίηση! Συστήνεται η δημιουÏγία αντιγÏάφου ασφαλείας όλων των αÏχείων " +"στον φάκελο:\n" "%s\n" "Θέλετε να συνεχίσετε;" @@ -6188,7 +6712,8 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" -"ΠÏοειδοποίηση: Αυτό θα αντικαταστήσει όλα τα υπάÏχοντα σημεία αποθήκευσης που υπάÏχουν στον φάκελο:\n" +"ΠÏοειδοποίηση: Αυτό θα αντικαταστήσει όλα τα υπάÏχοντα σημεία αποθήκευσης " +"που υπάÏχουν στον φάκελο:\n" "%s\n" "και έχουν το ίδιο όνομα με αÏχεία στη memcard\n" "Συνέχεια;" @@ -6264,6 +6789,7 @@ msgstr "Εισαγωγή Αποθήκευσης Wii" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 @@ -6274,6 +6800,9 @@ msgstr "Εισαγωγή Αποθήκευσης Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -6307,6 +6836,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 @@ -6317,6 +6847,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Συνδεδεμένο Wiimote" @@ -6351,6 +6884,7 @@ msgstr "Αναδίπλωση Λέξεων" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 @@ -6365,6 +6899,11 @@ msgstr "Αναδίπλωση Λέξεων" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Σε εÏγασία..." @@ -6429,7 +6968,8 @@ msgstr "ΠÏέπει να εισάγετε ένα έγκυÏο όνομα Ï€Ïο #: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 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 "" @@ -6487,14 +7027,19 @@ msgstr "[ΠÏοσαÏμοζόμενο]" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 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" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -6541,7 +7086,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:461 msgid "s" @@ -6571,6 +7118,9 @@ msgstr "| OR" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #~ msgid "Cannot record movies in read-only mode." #~ msgstr "" #~ "Δεν μποÏεί να γίνει εγγÏαφή ταινιών σε λειτουÏγία μόνο για ανάγνωση." @@ -6581,6 +7131,7 @@ msgstr "| OR" #~ msgstr "" #~ "Άγνωστος δείκτης %#08x\n" #~ "Συνέχεια;" +<<<<<<< HEAD ======= #~ msgid "Disable Wiimote Speaker" #~ msgstr "ΑπενεÏγοποίηση Ηχείου Wiimote" @@ -6668,3 +7219,5 @@ msgstr "| OR" >>>>>>> Update Greek and Czech translations ======= >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +>>>>>>> Update from master branch. diff --git a/Languages/po/en.po b/Languages/po/en.po index 2563333e4e..0667cfbf71 100644 --- a/Languages/po/en.po +++ b/Languages/po/en.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-01-06 14:53+0100\n" "Last-Translator: BhaaL \n" "Language-Team: \n" @@ -509,6 +513,7 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -518,6 +523,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "" @@ -571,6 +581,7 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -578,6 +589,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "" @@ -655,11 +670,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -680,11 +699,15 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -793,10 +816,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "" @@ -829,11 +856,15 @@ msgstr "" msgid "Buffer:" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1056,10 +1087,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "" @@ -1168,11 +1203,15 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "" @@ -1348,10 +1387,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1561,11 +1604,15 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1594,6 +1641,7 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1609,6 +1657,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1691,6 +1747,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1700,6 +1757,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "" @@ -1823,21 +1885,31 @@ msgid "Enable Block Merging" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "" @@ -1963,6 +2035,7 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -1972,6 +2045,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "" @@ -2001,6 +2079,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -2018,6 +2097,19 @@ msgid "Error" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2432,6 +2524,7 @@ msgstr "" msgid "Free Look" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2441,6 +2534,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "" @@ -2507,10 +2605,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2532,11 +2634,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2545,6 +2652,7 @@ msgstr "" msgid "General Settings" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2554,6 +2662,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "" @@ -2669,11 +2782,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "" @@ -2863,11 +2981,15 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "" @@ -2944,6 +3066,7 @@ msgstr "" msgid "Invalid state" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -2953,6 +3076,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "" @@ -3103,6 +3231,7 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3116,6 +3245,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3192,11 +3328,15 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3228,10 +3368,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "" @@ -3408,11 +3552,15 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3499,11 +3647,15 @@ msgstr "" msgid "Not Set" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "" @@ -3565,9 +3717,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "" @@ -3693,6 +3849,7 @@ msgstr "" msgid "Paths" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3700,6 +3857,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3720,12 +3881,17 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "" @@ -3751,11 +3917,15 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "" @@ -3961,6 +4131,7 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -3972,6 +4143,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "" @@ -3988,9 +4165,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -4033,11 +4214,15 @@ msgstr "" msgid "Safe" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "" @@ -4121,11 +4306,15 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "" @@ -4165,6 +4354,7 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4180,6 +4370,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "" @@ -4202,6 +4400,7 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4214,15 +4413,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "" @@ -4556,6 +4762,7 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4565,6 +4772,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "" @@ -4600,11 +4812,15 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4640,9 +4856,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -4715,9 +4935,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "" @@ -4930,18 +5154,26 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "" @@ -5043,6 +5275,7 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5053,6 +5286,8 @@ msgid "" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5254,11 +5489,15 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5285,11 +5524,15 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "" @@ -5321,6 +5564,7 @@ msgstr "" msgid "Word Wrap" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5330,6 +5574,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "" diff --git a/Languages/po/es.po b/Languages/po/es.po index b16d557823..5b7d2b9a35 100644 --- a/Languages/po/es.po +++ b/Languages/po/es.po @@ -8,6 +8,7 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-09 00:28+0100\n" ======= @@ -18,6 +19,10 @@ msgstr "" ======= "PO-Revision-Date: 2011-10-15 23:23+0100\n" >>>>>>> Updated Spanish translation +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +"PO-Revision-Date: 2011-12-23 16:03+0100\n" +>>>>>>> Update from master branch. "Last-Translator: Petiso Carambanal \n" "Language-Team: DARIO_FF \n" "Language: Spanish\n" @@ -47,7 +52,7 @@ msgid "" " Create a new 16MB Memcard?" msgstr "" "\"%s\" no existe.\n" -"¿Crear una nueva tarjeta de memoria de 16 MB?" +"¿Crear una nueva tarjeta de memoria de 16 MB?" #: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format @@ -123,8 +128,8 @@ msgid "" "If you select \"No\", audio will be garbled." msgstr "" "%s tiene un hash incorrecto.\n" -"¿Desea detener ahora para reparar el problema?\n" -"Si selecciona \"No\", el audio se oirá con ruidos." +"¿Deseas detener ahora para reparar el problema?\n" +"Si seleccionas \"No\", el audio se oirá con ruidos." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360 #, c-format @@ -161,7 +166,7 @@ msgstr "%sImportar GCI%s" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" -msgstr "%u Bloques libres; %u entradas de directorio libres" +msgstr "%u Bloques libres; %u entradas de dir. libres" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "&& AND" @@ -458,7 +463,7 @@ msgstr "" "Algunos juegos dependen de esto para algunos efectos gráficos o " "funcionalidad del juego.\n" "\n" -"Si está inseguro, elija EFB a textura." +"Si está inseguro, elige EFB a textura." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 @@ -537,7 +542,7 @@ msgstr "Error de Action Replay: Línea de código AR no válida: %s" #: Source/Core/Core/Src/ActionReplay.cpp:873 #, 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)" +msgstr "Error de Action Replay: Código condicional: Tamaño no válido %08x (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:946 #, c-format @@ -575,6 +580,7 @@ msgstr "Añadir Parche" msgid "Add new pane" msgstr "Añadir nueva ventana" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -584,6 +590,11 @@ msgstr "Añadir nueva ventana" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Añadir..." @@ -630,7 +641,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -"Ajuste la presión requerida del control analógico para activar los botones." +"Ajusta la presión requerida del control analógico para activar los botones." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" @@ -652,6 +663,7 @@ msgstr "Todas las imágenes GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Todos los archivos Gamecube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -659,6 +671,10 @@ msgstr "Todos los archivos Gamecube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Todos los estados guardados (sav, s##)" @@ -742,25 +758,29 @@ msgstr "Ãrabe" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 #, c-format msgid "Are you sure you want to delete \"%s\"?" -msgstr "¿Seguro que quiere borrar \"%s\"?" +msgstr "¿Estás seguro de que quieres borrar \"%s\"?" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -"¿Seguro que quiere borrar estos archivos?\n" +"¿Seguro que quieres borrar estos archivos?\n" "¡Desaparecerán para siempre!" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 msgid "Are you sure you want to delete this file? It will be gone forever!" -msgstr "¿Seguro que quiere borrar este archivo? ¡Desaparecerá para siempre!" +msgstr "¿Seguro que quieres borrar este archivo? ¡Desaparecerá para siempre!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relación de aspecto:" @@ -781,11 +801,15 @@ msgstr "Motor de Audio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error al abrir dispositivo AO.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -808,9 +832,9 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Automáticamente ajusta el tamaño de la ventana a su resolución interna.\n" +"Ajusta automáticamente el tamaño de la ventana a su resolución interna.\n" "\n" -"Si está inseguro, déjelo sin marcar." +"Si estás inseguro, déjalo sin marcar." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" @@ -902,10 +926,14 @@ msgstr "Azul derecha" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Inferior" @@ -938,11 +966,15 @@ msgstr "Busca un directorio de salida" msgid "Buffer:" msgstr "Búfer" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1031,7 +1063,7 @@ msgid "" "Are you trying to use the same file in both slots?" msgstr "" "No se puede usar ese archivo como una tarjeta de memoria.\n" -"¿Está intentando usar el mismo archivo en ambas ranuras?" +"¿Estás intentando usar el mismo archivo en ambas ranuras?" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858 #, c-format @@ -1056,7 +1088,7 @@ msgstr "Bloq Mayús" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" -msgstr "Catalan" +msgstr "Catalán" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 msgid "Center" @@ -1139,7 +1171,7 @@ msgstr "Escoge una ISO por defecto:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" -msgstr "Escoja un directorio para añadir" +msgstr "Escoge un directorio para añadir" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" @@ -1149,16 +1181,20 @@ msgstr "Escoge un archivo a abrir" msgid "Choose a memory card:" msgstr "Escoge una tarjeta de memoria:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +>>>>>>> Update from master branch. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -"Escoja el archivo que usar como apploader (se aplica a los discos armados a " +"Escoge el archivo que usar como apploader (se aplica a los discos armados a " "partir de directorios solamente):" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 @@ -1196,10 +1232,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Cerrar" @@ -1308,11 +1348,15 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Conectando..." @@ -1430,11 +1474,15 @@ msgstr "Crear nueva perspectiva" msgid "Created by KDE-Look.org" msgstr "Creado por KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +>>>>>>> Update from master branch. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1509,10 +1557,14 @@ msgstr "Motor de emulación DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "Emulación DSP HLE (rápido)" @@ -1743,11 +1795,15 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "¿Quieres detener la emulación actual?" @@ -1776,6 +1832,7 @@ msgstr "Configuración de wiimote emulado de Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1791,6 +1848,14 @@ msgstr "Configuración de GCPad Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Configuración de GCPad Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Películas TAS de Dolphin (*.dtm)" @@ -1802,11 +1867,15 @@ msgstr "Configuración de wiimote de Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin en &Google Code" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +>>>>>>> Update from master branch. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1814,11 +1883,15 @@ msgstr "" "Dolphin no pudo encontrar ninguna ISO de GC/Wii. Haz doble clic aquí para " "buscar..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +>>>>>>> Update from master branch. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1894,6 +1967,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1903,6 +1977,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Holandés" @@ -1923,7 +2002,7 @@ 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 recientemente actualizó su distribución de " +"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." @@ -1966,7 +2045,7 @@ msgstr "Efecto" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" -msgstr "Bufer de frames embebido" +msgstr "Búfer de fotogramas embebido" #: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" @@ -2041,6 +2120,7 @@ msgstr "Habilitar BAT" msgid "Enable Block Merging" msgstr "Habilitar asociación de bloques" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" @@ -2048,15 +2128,25 @@ msgstr "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "Permitir el cálculo del cuadro delimitador" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Habilitar caché" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Habilitar trucos" @@ -2117,7 +2207,7 @@ msgstr "" "Mejora la calidad de las texturas que tienen un ángulo de visión obliquo.\n" "Puede causar problemas en algunos juegos.\n" "\n" -"Si está inseguro, déjelo sin marcar." +"Si estás inseguro, déjalo sin marcar." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" @@ -2142,7 +2232,7 @@ msgstr "" "representación.\n" "Si esto es desactivado, una ventana de renderizado se creará en su lugar.\n" "\n" -"Si no está seguro, déjelo sin marcar." +"Si no estás seguro, déjalo sin marcar." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" @@ -2154,13 +2244,17 @@ msgstr "" "Active esto si quiere usar la ventana principal de Dolphin para renderizar " "en vez de una ventana aparte.\n" "\n" -"Si está inseguro, déjelo sin marcar." +"Si no estás seguro, déjalo sin marcar." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update from master branch. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2191,7 +2285,8 @@ msgid "" msgstr "" "Activa el escaneo progresivo si es soportado por el software emulado.\n" "A muchos juegos no les afecta esto.\n" -"Si está inseguro, déjelo sin marcar." +"\n" +"Si no estás seguro, déjalo sin marcar." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "" @@ -2209,12 +2304,13 @@ msgid "" msgstr "" "Codificar el volcado de los frames usando el códec FFV1.\n" "\n" -"Si está inseguro, déjelo sin marcar." +"Si estás inseguro, déjalo sin marcar." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:50 msgid "End" msgstr "Fin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2224,6 +2320,11 @@ msgstr "Fin" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Inglés" @@ -2253,6 +2354,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -2270,12 +2372,39 @@ msgid "Error" msgstr "Error" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Error" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" +"Error en PlayWiimote. %u != %u, byte %d.\n" +"Disculpa, la grabación de Wii no funciona temporalmente." + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Error al cargar el idioma seleccionado. Volviendo al defecto del sistema." #: Source/Core/Common/Src/ChunkFile.h:180 +<<<<<<< HEAD +======= +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" +"Error: Después de \"%s\", se ha encontrado %d (0x%X) en vezde la marca de " +"guardado %d (0x%X). Cancelando carga del guardado..." + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +>>>>>>> Update from master branch. #, c-format msgid "" <<<<<<< HEAD @@ -2440,7 +2569,7 @@ msgstr "Fallo al descargar los códigos." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" -msgstr "Fallo al extraer a %s!" +msgstr "Falló al extraer a %s!" #: Source/Core/Core/Src/DSP/DSPCore.cpp:66 #, c-format @@ -2466,12 +2595,12 @@ msgstr "" #: 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 "Fallo al cargar bthprops.cpl" +msgstr "Falló al cargar 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 "Fallo al cargar hid.dll" +msgstr "Falló al cargar hid.dll" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" @@ -2503,7 +2632,7 @@ msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" msgstr "" -"Falló leer el directorio de respaldo correctamente\n" +"Falló la lectura del directorio de respaldo\n" "(0x4000-0x5FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:132 @@ -2511,7 +2640,7 @@ msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" msgstr "" -"Falló leer el directorio correctamente\n" +"Falló la lectura del directorio\n" "(0x2000-0x3FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:121 @@ -2534,25 +2663,25 @@ msgstr "" #: Source/Core/DiscIO/Src/VolumeGC.cpp:61 msgid "Failed to read unique ID from disc image" -msgstr "Fallo al leer la ID única de la imagen de disco" +msgstr "Falló al leer la ID única de la imagen de disco" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:83 msgid "Failed to write BT.DINF to SYSCONF" -msgstr "Fallo al escribir BT.DINF a SYSCONF" +msgstr "Falló al escribir BT.DINF a SYSCONF" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228 msgid "Failed to write bkhdr" -msgstr "Fallo al escribir bkhdr" +msgstr "Falló al escribir bkhdr" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164 #, c-format msgid "Failed to write header for %s" -msgstr "Fallo al escribir la cabecera para %s" +msgstr "Falló al escribir la cabecera para %s" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258 #, c-format msgid "Failed to write header for file %d" -msgstr "Fallo al escribir la cabecera para el archivo %d" +msgstr "Falló al escribir la cabecera para el archivo %d" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 msgid "Fast" @@ -2687,7 +2816,7 @@ msgid "" "Choose no for sjis (NTSC-J)" msgstr "" "Formato como ASCII (NTSC\\PAL)?\n" -"Escoger no para sjis (NTSC-J)" +"Elige no para sjis (NTSC-J)" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:278 msgid "Forward" @@ -2731,6 +2860,7 @@ msgstr "Frames a grabar" msgid "Free Look" msgstr "Cámara libre" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2740,6 +2870,11 @@ msgstr "Cámara libre" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Francés" @@ -2765,9 +2900,14 @@ msgid "GCI File(*.gci)" msgstr "Archivo GCI (*.gci)" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +<<<<<<< HEAD #, fuzzy msgid "GCMic Configuration" msgstr "Configuración de registro" +======= +msgid "GCMic Configuration" +msgstr "Configuración del micro de GC" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" @@ -2807,10 +2947,14 @@ msgstr "&Configuración del mando Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Tarjetas de memoria de Gamecube (*.raw,*.gcp)" @@ -2834,11 +2978,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -2847,6 +2996,7 @@ msgstr "General" msgid "General Settings" msgstr "Ajustes generales" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2856,6 +3006,11 @@ msgstr "Ajustes generales" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Alemán" @@ -2895,6 +3050,7 @@ msgid "" "If unsure, leave this checked." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD "Mejora bastante la calidad de las texturas generadas usando los efectos de " "renderización para la textura.\n" "Aumentar la resolución interna va a mejorar el efecto de este ajuste.\n" @@ -2910,6 +3066,12 @@ msgstr "" "Aumentar la resolución interna va a mejorar el efecto de este ajuste.\n" "Diminuye ligeramente el desempeño y probablemente provoca fallos (aunque es " >>>>>>> Updated Spanish translation +======= +"Mejora bastante la calidad de las texturas generadas usando los efectos de " +"renderización para la textura.\n" +"Aumentar la resolución interna va a mejorar el efecto de este ajuste.\n" +"Reduce ligeramente el desempeño y posiblemente cause fallos (altamente " +>>>>>>> Update from master branch. "improbable).\n" "\n" "Si está inseguro, déjelo marcado." @@ -3008,11 +3170,16 @@ msgstr "Configuración de atajos" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Atajos" @@ -3085,6 +3252,11 @@ msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +<<<<<<< HEAD +======= +"Si se elige, los registros del cuadro delimitador serán actualizados. Es " +"usado por los juegos de Paper Mario." +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" @@ -3093,11 +3265,15 @@ msgstr "" "Si los FPS son erróneos, esta opción puede ayudar. (ON = Compatible, OFF = " "Rápido)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +>>>>>>> Update from master branch. msgid "" "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." @@ -3241,11 +3417,15 @@ msgstr "" "Se ha llamado InstallExceptionHandler, pero esta plataforma no lo soporta " "todavía." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Instalando WAD..." @@ -3327,6 +3507,7 @@ msgstr "Archivo de grabación no válido" msgid "Invalid state" msgstr "Estado no válido" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3336,6 +3517,11 @@ msgstr "Estado no válido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italiano" @@ -3493,6 +3679,7 @@ msgstr "&Cargar estado 8" msgid "Load State..." msgstr "Cargar estado..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3506,6 +3693,13 @@ msgstr "Cargar Menú de sistema Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Cargar Menú de sistema Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Cargar Menú de sistema Wii %d %c" @@ -3587,11 +3781,15 @@ msgstr "Hack de velocidad MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Archivos MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick principal" @@ -3623,10 +3821,14 @@ msgstr "Byte de memoria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Tarjeta de memoria" @@ -3733,6 +3935,9 @@ msgstr "" "\n" "\n" "\n" +"\n" +"\n" +"\n" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:72 msgid "Multiply" @@ -3830,11 +4035,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Arriba" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3914,18 +4123,22 @@ msgstr "Noruego Bokmal" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Not Equal" -msgstr "No Igual" +msgstr "No igual" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" -msgstr "No Definido" +msgstr "No definido" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Sin conectar" @@ -3987,9 +4200,13 @@ msgstr "Solo %d bloques disponibles" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Abrir" @@ -4066,7 +4283,7 @@ msgid "" "manually stop the game." msgstr "" "¡¡El otro cliente se ha desconectado mientras el juego estaba ejecutándose!! " -"NetPlay ha sido deshabilitado. Debe detener el juego manualmente." +"NetPlay ha sido deshabilitado. Debes detener el juego manualmente." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 msgid "Output" @@ -4121,6 +4338,7 @@ msgstr "Parches" msgid "Paths" msgstr "Directorios" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4128,6 +4346,10 @@ msgstr "Directorios" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4148,12 +4370,17 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Reproducir" @@ -4179,17 +4406,21 @@ msgstr "Opciones de reproducción" msgid "Players" msgstr "Jugadores" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." -msgstr "Confirme, por favor..." +msgstr "Confirma, por favor..." #: Source/Core/DolphinWX/Src/FrameAui.cpp:578 msgid "Please create a perspective before saving" -msgstr "Por favor, cree una perspectiva antes de guardar" +msgstr "Por favor, crea una perspectiva antes de guardar" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:36 msgid "Plus-Minus" @@ -4235,17 +4466,29 @@ msgstr "Efecto de posprocesado:" #: Source/Core/Core/Src/Movie.cpp:735 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "Final prematuro de la película en PlayController. %u + 8 > %u" +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:829 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "Final prematuro de la película en PlayWiimote. %u + %d > %u" +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:806 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "Final prematuro de la película en PlayWiimote. %u > %u" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " @@ -4394,6 +4637,7 @@ msgstr "Actualizar lista" msgid "Refresh game list" msgstr "Actualizar lista de juegos" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4405,6 +4649,12 @@ msgstr "Actualizar lista de juegos" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Eliminar" @@ -4424,9 +4674,13 @@ msgstr "Renderizar a ventana principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -4469,11 +4723,15 @@ msgstr "Guardar estado" msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Frecuencia del sonido:" @@ -4599,6 +4857,7 @@ msgstr "No se ha encontrado la sección %s en SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4614,6 +4873,14 @@ msgstr "Seleccionar archivo de grabación" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Seleccionar archivo de grabación" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Elige un WAD de Wii para instalar" @@ -4639,6 +4906,7 @@ msgstr "Selecciona las ventanas flotantes" msgid "Select the file to load" msgstr "Selecciona el archivo para cargar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4651,15 +4919,22 @@ msgstr "Selecciona el estado para cargar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Selecciona el archivo de guardado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Selecciona el estado para cargar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Selecciona el estado para guardar" @@ -4734,11 +5009,15 @@ msgstr "Separador" msgid "Serbian" msgstr "Serbio" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +>>>>>>> Update from master branch. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -5070,6 +5349,7 @@ msgstr "Falló la creación del búfer de sonido: %s" msgid "Space" msgstr "Espacio" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -5079,6 +5359,11 @@ msgstr "Espacio" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Español" @@ -5122,11 +5407,15 @@ msgstr "Stick cuadrado" msgid "Standard Controller" msgstr "Control estándar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5162,9 +5451,13 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Detener" @@ -5245,15 +5538,23 @@ msgstr "Tabla derecha" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Captura de pantalla" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "TaruKonga (Bongos)" +<<<<<<< HEAD msgstr "" +======= +msgstr "TaruKonga (Bongos)" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -5499,18 +5800,26 @@ msgstr "Alternar todos los tipos de registro" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Cambiar a pantalla completa" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Superior" @@ -5583,7 +5892,7 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" "No es posible analizar la línea %lu del código AR introducido como un código " -"válido cifrado o descifrado. Asegúrese de que la ha escrito correctamente.\n" +"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 @@ -5622,6 +5931,7 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "Mensaje desconocido con id:%d recibido del jugador:%d ¡Echando al jugador!" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/Memmap.cpp:633 #, c-format msgid "" @@ -5631,6 +5941,8 @@ msgid "" msgstr "" "Mensaje desconocido con id:%d recibido del jugador:%d ¡Echando al jugador!" +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5796,6 +6108,12 @@ msgid "" "%u > %u) (frame %u > %u). You should load another save before continuing, or " "load this state with read-only mode off." msgstr "" +<<<<<<< HEAD +======= +"Advertencia: Has cargado un guardado de después del final de la película " +"actual.(Byte %u > %u) (frame %u > %u). Deberías cargar otor guardado antes " +"de continuar, o cargar éste sin el modo de solo lectura." +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:646 #, c-format @@ -5804,6 +6122,13 @@ msgid "" "should load another save before continuing, or load this state with read-" "only mode off. Otherwise you'll probably get a desync." msgstr "" +<<<<<<< HEAD +======= +"Advertencia: has cargado una partida guardada con desjustes en %d bytes (0x" +"%X). Debe de cargar otro guardado antes de continuar, o cargar este guardado " +"con el modo de solo lectura desactivado. De lo contrario probablemente " +"obtenga una desincronización." +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:655 #, c-format @@ -5823,6 +6148,24 @@ 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 "" +<<<<<<< HEAD +======= +"Advertencia: has cargado una partida guardada con desajustes en %d bytes. " +"Debes cargar otro guardado antes de continuar, o cargar este guardado con el " +"modo de solo lectura desactivado. De lo contrario, probablemente obtengas " +"una desincronización.\n" +"\n" +"Más información: La película actual dura %d fotogramas y el guardado de la " +"película dura %d fotogramas.\n" +"\n" +"En el fotograma %d, la película actual presiona:\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" +"En el fotograma %d, el guardado de la película presiona:\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" +>>>>>>> Update from master branch. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -5857,11 +6200,15 @@ msgstr "Raíz de la NAND de Wii:" msgid "Wii Save Import" msgstr "Importar guardado de Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Archivos de guardado Wii (*.bin)|*.bin" @@ -5892,11 +6239,15 @@ msgstr "" "o mucho tiempo de espera, o alguna otra razón.\n" "¿Desea reconectarlo inmediatamente?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote conectado" @@ -5928,6 +6279,7 @@ msgstr "Windows Derecha" msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5937,6 +6289,11 @@ msgstr "Word Wrap" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Trabajando..." @@ -5985,11 +6342,11 @@ msgstr "No puede cerrar ventanas que tengan páginas en ellas." #: Source/Core/DolphinWX/Src/NetWindow.cpp:194 msgid "You must choose a game!!" -msgstr "¡¡Debe elegir un juego!!" +msgstr "¡¡Debes elegir un juego!!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" -msgstr "¡Debe escribir un nombre!" +msgstr "¡Debes escribir un nombre!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 msgid "You must enter a valid decimal, hexadecimal or octal value." @@ -5997,11 +6354,11 @@ msgstr "Debes introducir un valor decimal o hexadecimal válido." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 msgid "You must enter a valid profile name." -msgstr "Debe introducir un nombre de perfil válido." +msgstr "Debes introducir un nombre de perfil válido." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 msgid "You must restart Dolphin in order for the change to take effect." -msgstr "Debe reiniciar Dolphin para que el cambio tenga efecto." +msgstr "Debes reiniciar Dolphin para que el cambio tenga efecto." #: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" diff --git a/Languages/po/fr.po b/Languages/po/fr.po index 5af84de44e..d5f462ae2c 100644 --- a/Languages/po/fr.po +++ b/Languages/po/fr.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-28 23:40+0100\n" ======= @@ -23,6 +24,10 @@ msgstr "" "POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-12-20 18:42+0100\n" >>>>>>> Update Hungarian and Turkish translations. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +"PO-Revision-Date: 2011-10-28 23:40+0100\n" +>>>>>>> Update from master branch. "Last-Translator: Pascal\n" "Language-Team: \n" "Language: French\n" @@ -64,9 +69,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sCopie%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -194,11 +199,11 @@ msgstr "Gestionnaire de &cheats" msgid "&DSP Settings" msgstr "Paramètres &DSP (audio)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "&Delete ISO..." msgstr "&Supprimer l'ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 msgid "&Delete selected ISOs..." msgstr "&Supprimer les ISO sélectionnés" @@ -262,7 +267,7 @@ msgstr "&Pause" msgid "&Play" msgstr "&Démarrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 msgid "&Properties" msgstr "&Propriétés" @@ -306,7 +311,7 @@ msgstr "&Affichage" msgid "&Wiimote Settings" msgstr "Paramètres de la &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "&Wiki" msgstr "&Wiki" @@ -355,10 +360,11 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "" msgstr "" @@ -415,8 +421,8 @@ msgstr "" "\n" "Vous devez indiquer le port TCP à l'hôte !!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" msgstr "AM-Baseboard" @@ -463,6 +469,7 @@ msgstr "" "Dans le doute, cochez plutôt EFB vers texture." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 msgid "Action" msgstr "Action" @@ -563,11 +570,11 @@ msgstr "Carte :" msgid "Add" msgstr "Ajouter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 msgid "Add ActionReplay Code" msgstr "Ajouter un code ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 msgid "Add Patch" msgstr "Ajouter un patch" @@ -575,6 +582,7 @@ msgstr "Ajouter un patch" msgid "Add new pane" msgstr "Ajouter un nouveau panneau" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -590,6 +598,11 @@ msgstr "Ajouter un nouveau panneau" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Ajouter..." @@ -642,7 +655,7 @@ msgstr "" msgid "Advanced" msgstr "Avancé" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Advanced Settings" msgstr "Paramètres avancés" @@ -650,14 +663,15 @@ msgstr "Paramètres avancés" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Tous les fichiers GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Toutes les images GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 msgid "All Gamecube GCM files (gcm)" msgstr "Tous les fichiers GameCube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -670,18 +684,22 @@ msgstr "Tous les fichiers GameCube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Tous les états sauvegardés (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Wii ISO files (iso)" msgstr "Tous les fichiers ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tous les fichiers ISO compressés GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "All files (*.*)|*.*" msgstr "Tous les fichiers (*.*)|*.*" @@ -728,7 +746,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:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 msgid "Apploader:" msgstr "Apploader :" @@ -747,7 +765,7 @@ msgstr "" "\n" "Dans le doute, sélectionnez (aucun)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Arabic" msgstr "Arabe" @@ -756,7 +774,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:1121 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -764,12 +782,13 @@ msgstr "" "Êtes-vous sûr de vouloir supprimer ces fichiers ?\n" "Ils seront définitivement supprimés !" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 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 !" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -779,6 +798,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Format d'écran :" @@ -787,11 +809,11 @@ 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:527 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" msgstr "Moteur audio :" @@ -799,6 +821,7 @@ msgstr "Moteur audio :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -808,6 +831,9 @@ msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -852,7 +878,7 @@ msgstr "" msgid "Back" msgstr "Retour" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" msgstr "Paramètres de l'interface audio" @@ -862,7 +888,7 @@ msgid "Backend:" msgstr "Moteur :" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Entrée en arrière-plan" @@ -875,15 +901,15 @@ msgid "Bad File Header" msgstr "Mauvaise entête de fichier" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 msgid "Banner" msgstr "Bannière" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 msgid "Banner Details" msgstr "Détails de la bannière" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 msgid "Banner:" msgstr "Bannière :" @@ -895,7 +921,7 @@ msgstr "Barre" msgid "Basic" msgstr "Paramètres de base" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 msgid "Basic Settings" msgstr "Paramètres de base" @@ -928,6 +954,7 @@ msgstr "Bleu Droite" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -935,6 +962,9 @@ msgstr "Bleu Droite" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Bas" @@ -943,7 +973,7 @@ msgstr "Bas" msgid "Bound Controls: %lu" msgstr "Contrôles liés : %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Broken" msgstr "Corrompu" @@ -951,7 +981,7 @@ msgstr "Corrompu" msgid "Browse" msgstr "Parcourir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 msgid "Browse for a directory to add" msgstr "Choisir un dossier à ajouter" @@ -959,7 +989,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:1187 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" msgstr "Parcourir un dossier de destination" @@ -967,6 +997,7 @@ msgstr "Parcourir un dossier de destination" msgid "Buffer:" msgstr "Buffer :" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 @@ -976,6 +1007,9 @@ msgstr "Buffer :" ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -985,11 +1019,11 @@ msgstr "Boutons" msgid "C Stick" msgstr "Stick-C" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" msgstr "Stick-C" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "CPU Emulator Engine" msgstr "Moteur d'émulation du CPU" @@ -1042,16 +1076,12 @@ msgstr "Annuler" msgid "Cannot open %s" msgstr "Impossible d'ouvrir %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "Impossible d'enregistrer des films en mode Lecture seule." - #: Source/Core/Core/Src/CoreTiming.cpp:122 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:1016 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1062,7 +1092,7 @@ msgstr "" "%s\n" "n'est pas un fichier de carte mémoire GameCube valide." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1093,7 +1123,7 @@ msgstr "" msgid "Caps Lock" msgstr "Verr Maj" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Catalan" msgstr "Catalan" @@ -1110,6 +1140,7 @@ msgid "Change &Disc..." msgstr "&Changer de disque..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" msgstr "Changer de disque" @@ -1117,7 +1148,7 @@ msgstr "Changer de disque" msgid "Change Game" msgstr "Changer de Jeu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1133,8 +1164,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:502 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "Changing this will have no effect while the emulator is running!" msgstr "Changer ceci n'aura aucun effet durant l'émulation !" @@ -1154,31 +1185,31 @@ msgstr "Rechercher un cheat" msgid "Cheats Manager" msgstr "Gestionnaire de Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Simplified)" msgstr "Chinois (simplifié)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Chinese (Traditional)" msgstr "Chinois (traditionnel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a DVD root directory:" msgstr "Choisir un dossier racine pour le DVD :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Choose a NAND root directory:" msgstr "Choisir un dossier racine pour la NAND :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 msgid "Choose a default ISO:" msgstr "Choisir un ISO par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 msgid "Choose a directory to add" msgstr "Choisir un dossier à ajouter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 msgid "Choose a file to open" msgstr "Choisir un fichier à ouvrir" @@ -1186,6 +1217,7 @@ msgstr "Choisir un fichier à ouvrir" msgid "Choose a memory card:" msgstr "Choisir une carte mémoire :" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 @@ -1196,6 +1228,9 @@ msgstr "Choisir une carte mémoire :" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +>>>>>>> Update from master branch. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1210,8 +1245,8 @@ msgstr "Choisir un fichier comme apploader : (uniquement pour les disques créé ======= >>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:764 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 msgid "Choose the folder to extract to" msgstr "Choisir le dossier de destination de l'extraction" @@ -1230,7 +1265,7 @@ msgstr "Classique" msgid "Clear" msgstr "Effacer" -#: Source/Core/Core/Src/CoreTiming.cpp:173 +#: Source/Core/Core/Src/CoreTiming.cpp:174 msgid "Clear failed." msgstr "Echec de l'éffacement" @@ -1246,6 +1281,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1253,6 +1289,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fermer" @@ -1277,20 +1316,20 @@ msgstr "Commande" msgid "Comment" msgstr "Commentaire" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Comment:" msgstr "Commentaire :" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 msgid "Compress ISO..." msgstr "Compresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 msgid "Compress selected ISOs..." msgstr "Compresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Compressing ISO" msgstr "Compression de l'ISO" @@ -1317,13 +1356,13 @@ msgstr "Configurer les manettes" msgid "Configure..." msgstr "Configurer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Confirm File Overwrite" msgstr "Confirmer l'écrasement du fichier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 msgid "Confirm on Stop" msgstr "Confirmer l'arrêt de l'émulation" @@ -1332,7 +1371,7 @@ msgstr "Confirmer l'arrêt de l'émulation" msgid "Connect" msgstr "Connecter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 msgid "Connect USB Keyboard" msgstr "Connecter le clavier USB" @@ -1342,21 +1381,26 @@ msgid "Connect Wiimote %i" msgstr "Connecter la Wiimote %i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" msgstr "Connecter la 1ère Wiimote" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" msgstr "Connecter la 2è Wiimote" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" msgstr "Connecter la 3è Wiimote" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" msgstr "Connecter la 4è Wiimote" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 @@ -1366,6 +1410,9 @@ msgstr "Connecter la 4è Wiimote" ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Connexion..." @@ -1390,7 +1437,7 @@ msgstr "Echec de la copie" msgid "Copy to Memcard %c" msgstr "Copier vers la carte mémoire %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Core" msgstr "Core" @@ -1421,7 +1468,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Impossible de reconnaître le fichier ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 #, c-format msgid "Could not save %s" msgstr "Impossible de sauvegarder %s" @@ -1449,7 +1496,7 @@ 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:1044 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" msgstr "Impossible de trouver la commande d'ouverture pour l'extension 'ini' !" @@ -1466,7 +1513,7 @@ msgstr "" msgid "Count:" msgstr "Nombre :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Country:" msgstr "Pays :" @@ -1480,10 +1527,11 @@ msgstr "Créer un code AR" msgid "Create new perspective" msgstr "Créer une nouvelle perspective" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by KDE-Look.org" msgstr "Créé par KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 @@ -1494,6 +1542,9 @@ msgstr "Créé par KDE-Look.org" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +>>>>>>> Update from master branch. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1506,11 +1557,11 @@ msgstr "Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com ======= >>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" msgstr "Créé par VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Créé par black_rider et publié sur ForumW.org > Web Developments" @@ -1545,7 +1596,7 @@ msgstr "Crossfade" 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:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" msgstr "Hack de projection personnalisé" @@ -1553,15 +1604,15 @@ msgstr "Hack de projection personnalisé" msgid "Custom Projection Hack Settings" msgstr "Paramètres du hack de projection personnalisé" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." msgstr "Personnalise certains paramètres de projection orthographique." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Czech" msgstr "Tchèque" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" msgstr "Pad numérique" @@ -1569,13 +1620,14 @@ msgstr "Pad numérique" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP Emulator Engine" msgstr "Moteur d'émulation du DSP (Audio)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 @@ -1583,18 +1635,21 @@ msgstr "Moteur d'émulation du DSP (Audio)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "Emulation du DSP en HLE (rapide)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 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:606 msgid "DSP LLE on Thread" msgstr "DSP LLE sur thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE recompiler" msgstr "Recompilateur du DSP en LLE" @@ -1602,7 +1657,7 @@ msgstr "Recompilateur du DSP en LLE" msgid "DSP settings" msgstr "Paramètres DSP (audio)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 msgid "DVD Root:" msgstr "Racine du DVD :" @@ -1610,7 +1665,7 @@ msgstr "Racine du DVD :" msgid "Data Size" msgstr "Taille des données" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Date:" msgstr "Date :" @@ -1639,16 +1694,16 @@ msgstr "Débug" msgid "Decimal" msgstr "Décimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Decompress ISO..." msgstr "Décompresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 msgid "Decompress selected ISOs..." msgstr "Décompresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 msgid "Decompressing ISO" msgstr "Décompression de l'ISO" @@ -1656,7 +1711,7 @@ msgstr "Décompression de l'ISO" msgid "Default" msgstr "Par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 msgid "Default ISO:" msgstr "ISO par défaut :" @@ -1700,8 +1755,8 @@ msgstr "" msgid "Device" msgstr "Appareil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 msgid "Device Settings" msgstr "Paramètres de la console virtuelle" @@ -1786,7 +1841,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" msgstr "Disque" @@ -1813,6 +1868,7 @@ msgstr "" msgid "Divide" msgstr "Diviser" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1822,10 +1878,13 @@ msgstr "Diviser" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Voulez-vous arrêter l'émulation en cours ?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 msgid "Dolphin" msgstr "Dolphin" @@ -1850,6 +1909,7 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1874,6 +1934,14 @@ msgstr "Configuration de la manette GC pour Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Configuration de la manette GC pour Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Films TAS Dolphin (*.dtm)" @@ -1885,6 +1953,7 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin dans &Google Code" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 @@ -1895,6 +1964,9 @@ msgstr "Dolphin dans &Google Code" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +>>>>>>> Update from master branch. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1915,8 +1987,12 @@ msgstr "Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher d >>>>>>> Update translation files for recent changes in the code. ======= +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +>>>>>>> Update from master branch. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1953,7 +2029,7 @@ msgstr "Percussions" msgid "Dummy" msgstr "Factice" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Enregistrer le son" @@ -2000,6 +2076,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -2015,6 +2092,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Néerlandais" @@ -2067,8 +2149,8 @@ msgstr "Editer le patch" msgid "Edit current perspective" msgstr "Modifier la perspective actuelle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 msgid "Edit..." msgstr "Editer..." @@ -2080,7 +2162,7 @@ msgstr "Effets" msgid "Embedded Frame Buffer" msgstr "Buffer d'image embarqué" -#: Source/Core/Core/Src/Core.cpp:173 +#: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" msgstr "Thread d'émulation déjà en cours d'exécution" @@ -2118,7 +2200,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wiimote émulée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Emulation State: " msgstr "Etat de l'émulation :" @@ -2146,7 +2228,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "Activer la journalisation AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Enable Audio Throttle" msgstr "Activer le contrôle audio" @@ -2160,18 +2242,25 @@ msgstr "Activer l'assemblage de blocs" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Hungarian and Turkish translations. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Activer le cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2181,10 +2270,13 @@ msgstr "Activer le cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Activer les Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 msgid "Enable DTK Music" msgstr "Activer la musique DTK" @@ -2192,7 +2284,7 @@ msgstr "Activer la musique DTK" msgid "Enable Dual Core" msgstr "Activer le Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Enable Dual Core (speedup)" msgstr "Activer le Dual Core (plus rapide)" @@ -2204,7 +2296,7 @@ msgstr "Activer les touches de raccourci" msgid "Enable Idle Skipping" msgstr "Activer le saut d'inactivité" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Idle Skipping (speedup)" msgstr "Activer le saut d'inactivité (plus rapide)" @@ -2217,7 +2309,7 @@ msgstr "Activer le MMU" msgid "Enable Progressive Scan" msgstr "Activer le Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Enable Screen Saver" msgstr "Activer l'économiseur d'écran" @@ -2281,6 +2373,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 @@ -2291,6 +2384,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update from master branch. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2315,7 +2411,7 @@ 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:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" msgstr "Active un hack de projection personnalisé" @@ -2353,6 +2449,7 @@ msgstr "" msgid "End" msgstr "Fin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2368,6 +2465,11 @@ msgstr "Fin" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Anglais" @@ -2398,6 +2500,7 @@ msgstr "Egal" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erreur" @@ -2428,9 +2531,19 @@ msgid "" msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +>>>>>>> Update from master branch. msgid "Error" msgstr "Erreur" +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2438,7 +2551,14 @@ msgstr "" "défaut du système." >>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 +#: Source/Core/Common/Src/ChunkFile.h:180 +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format <<<<<<< HEAD <<<<<<< HEAD @@ -2487,11 +2607,12 @@ msgstr "Quitter Dolphin avec l'émulateur" msgid "Export Failed" msgstr "Echec de l'exportation" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Export File" msgstr "Exporter un fichier" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Export Recording" msgstr "Exporter l'enregistrement..." @@ -2503,7 +2624,7 @@ msgstr "Exporter l'enregistrement..." msgid "Export Save" msgstr "Exporter une sauvegarde" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" msgstr "Exporter une sauvegarde Wii (expérimental)" @@ -2535,44 +2656,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:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract All Files..." msgstr "Extraire tous les fichiers..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Apploader..." msgstr "Extraire l'Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract DOL..." msgstr "Extraire le DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract Directory..." msgstr "Extraire un dossier..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract File..." msgstr "Extraire un fichier..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Partition..." msgstr "Extraire une partition..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 #, c-format msgid "Extracting %s" msgstr "Extraction de %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting All Files" msgstr "Extraction de tous les fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 msgid "Extracting Directory" msgstr "Extraction du dossier" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 msgid "Extracting..." msgstr "Extraction..." @@ -2588,7 +2709,7 @@ msgstr "Lecteur FIFO" msgid "FRANCE" msgstr "France" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "FST Size:" msgstr "Taille FST :" @@ -2604,7 +2725,7 @@ msgstr "Ecoute impossible !" msgid "Failed to download codes." msgstr "Impossible de télécharger les codes." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 #, c-format msgid "Failed to extract to %s!" msgstr "Impossible d'extraire vers %s !" @@ -2781,11 +2902,11 @@ 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:538 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 msgid "Filesystem" msgstr "Système de fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Type de fichier 'ini' est inconnu ! Ne sera pas ouvert !" @@ -2805,7 +2926,7 @@ msgstr "Forcer 16/9è" msgid "Force 4:3" msgstr "Forcer 4/3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Force Console as NTSC-J" msgstr "Forcer la console comme NTSC-J" @@ -2839,7 +2960,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2871,6 +2992,7 @@ msgid "Frame " msgstr "Image " #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" msgstr "Avancement d'image" @@ -2886,7 +3008,7 @@ msgstr "Plage d'images :" msgid "Frame S&kipping" msgstr "Saut d'&image :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" msgstr "Image/s max :" @@ -2898,6 +3020,7 @@ msgstr "Images à enregistrer :" msgid "Free Look" msgstr "Vue libre" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2913,6 +3036,11 @@ msgstr "Vue libre" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Français" @@ -2938,18 +3066,24 @@ msgid "GCI File(*.gci)" msgstr "Fichier GCI (*.gci)" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 #, fuzzy msgid "GCMic Configuration" msgstr "Configuration de la journalisation" +<<<<<<< HEAD ======= >>>>>>> Update Hungarian and Turkish translations. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "Manette GC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Game ID:" msgstr "ID du jeu :" @@ -2965,7 +3099,7 @@ msgstr "Le jeu n'est pas en cours d'émulation !" msgid "Game not found!!" msgstr "Jeu non trouvé !!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Game-Specific Settings" msgstr "Paramètres spécifiques au jeu" @@ -2973,7 +3107,7 @@ msgstr "Paramètres spécifiques au jeu" msgid "GameConfig" msgstr "Config du Jeu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Gamecube" msgstr "GameCube" @@ -2984,6 +3118,7 @@ msgstr "Paramètres de la &manette GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2991,6 +3126,9 @@ msgstr "Paramètres de la &manette GameCube" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Carte mémoires de GameCube (*.raw,*.gcp)" @@ -3015,6 +3153,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= @@ -3023,6 +3162,10 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Général" @@ -3031,6 +3174,7 @@ msgstr "Général" msgid "General Settings" msgstr "Paramètres généraux" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -3046,6 +3190,11 @@ msgstr "Paramètres généraux" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Allemand" @@ -3110,7 +3259,7 @@ msgstr "" "\n" "Dans le doute, cochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" msgstr "Grèque" @@ -3142,7 +3291,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:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hebrew" msgstr "Hébreu" @@ -3207,6 +3356,7 @@ msgstr "Configuration des raccourcis clavier" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= @@ -3215,10 +3365,14 @@ msgstr "Configuration des raccourcis clavier" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Raccourcis clavier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Hungarian" msgstr "Hongrois" @@ -3250,7 +3404,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - mauvaise destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 msgid "IPL Settings" msgstr "Paramètres IPL" @@ -3266,11 +3420,11 @@ msgstr "Pointeur IR" msgid "IR Sensitivity:" msgstr "Sensibilité de l'IR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 msgid "ISO Details" msgstr "Détails de l'ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 msgid "ISO Directories" msgstr "Dossiers des ISO" @@ -3283,14 +3437,20 @@ msgid "Icon" msgstr "Icône" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update Hungarian and Turkish translations. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" @@ -3298,6 +3458,7 @@ msgstr "" "Si les FPS ne sont pas corrects, cette option peut résoudre le souci. (ON = " "Compatible, OFF = Vitesse)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 @@ -3308,6 +3469,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +>>>>>>> Update from master branch. msgid "" "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." @@ -3406,7 +3570,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" msgstr "Dans le jeu" @@ -3435,7 +3599,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:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" msgstr "Insérer une carte SD" @@ -3447,7 +3611,7 @@ msgstr "Indiquer un nom ici..." msgid "Install WAD" msgstr "Installer un WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 msgid "Install to Wii Menu" msgstr "Installer dans le menu Wii" @@ -3458,6 +3622,7 @@ msgstr "" "InstallExceptionHandler a été appelé, mais cette plateforme ne le prend pas " "encore en charge." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3467,22 +3632,25 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Installation du WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 msgid "Interface" msgstr "Interface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Interface Settings" msgstr "Paramètres de l'interface" -#: Source/Core/Core/Src/State.cpp:192 +#: Source/Core/Core/Src/State.cpp:242 msgid "Internal LZO Error - compression failed" msgstr "Erreur interne LZO - échec de la compression" -#: Source/Core/Core/Src/State.cpp:292 +#: Source/Core/Core/Src/State.cpp:338 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3491,7 +3659,7 @@ 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:390 +#: Source/Core/Core/Src/State.cpp:461 msgid "Internal LZO Error - lzo_init() failed" msgstr "Erreur interne LZO - échec de lzo_init()" @@ -3499,11 +3667,11 @@ msgstr "Erreur interne LZO - échec de lzo_init()" msgid "Internal Resolution:" msgstr "Résolution interne :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "Interpreter (VERY slow)" msgstr "Interpréteur (TRES lent)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Intro" msgstr "Intro" @@ -3520,7 +3688,7 @@ msgstr "Valeur non valide !" msgid "Invalid bat.map or dir entry" msgstr "bar.map ou entrée dir non valide" -#: Source/Core/Core/Src/CoreTiming.cpp:534 +#: Source/Core/Core/Src/CoreTiming.cpp:536 #, c-format msgid "Invalid event type %i" msgstr "Type d'évènement non valide : %i" @@ -3540,14 +3708,15 @@ msgstr "" "%s\n" "Vous devriez copier à nouveau ce jeu." -#: Source/Core/Core/Src/Movie.cpp:374 +#: Source/Core/Core/Src/Movie.cpp:503 msgid "Invalid recording file" msgstr "Fichier d'enregitrement non valide" -#: Source/Core/Core/Src/Core.cpp:488 +#: Source/Core/Core/Src/Core.cpp:489 msgid "Invalid state" msgstr "Etat non valide" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3563,6 +3732,11 @@ msgstr "Etat non valide" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italien" @@ -3570,16 +3744,16 @@ msgstr "Italien" msgid "JAPAN" msgstr "Japon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JIT Recompiler (recommended)" msgstr "Recompilateur JIT (recommandé) " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "JITIL experimental recompiler" msgstr "Recompilateur expérimental JIT" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Japanese" msgstr "Japonais" @@ -3588,16 +3762,17 @@ msgid "KOREA" msgstr "Corée" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 msgid "Key" msgstr "Touche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Korean" msgstr "Coréen" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" msgstr "L" @@ -3606,11 +3781,11 @@ msgid "L Button" msgstr "Bouton L" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" msgstr "L Analog." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Language:" msgstr "Langue :" @@ -3633,6 +3808,7 @@ msgid "Left Stick" msgstr "Stick Gauche" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3662,7 +3838,7 @@ msgstr "" msgid "Less Than" msgstr "Plus petit que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Limit by FPS" msgstr "Nb de FPS comme limite" @@ -3675,34 +3851,42 @@ msgid "Load Custom Textures" msgstr "Charger textures personnalisées" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 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 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 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 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 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 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 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 msgid "Load State Slot 8" msgstr "Charger l'état du Slot 8" @@ -3710,6 +3894,7 @@ msgstr "Charger l'état du Slot 8" msgid "Load State..." msgstr "Charger un état..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3731,6 +3916,13 @@ msgstr "Charger le Menu Système Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Charger le Menu Système Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Charger le Menu Système Wii %d%c" @@ -3759,7 +3951,7 @@ msgstr "Charge le fichier spécifié (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Lock Threads to Cores" msgstr "Verrouiller les threads aux coeurs" @@ -3814,6 +4006,7 @@ msgstr "Hack de vitesse pour le MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Fichiers MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 @@ -3823,15 +4016,18 @@ msgstr "Fichiers MadCatz Gameshark (*.gcs)" ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Maker ID:" msgstr "ID concepteur :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Maker:" msgstr "Concepteur :" @@ -3855,6 +4051,7 @@ msgstr "Octet mémoire" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3862,6 +4059,9 @@ msgstr "Octet mémoire" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Carte mémoire" @@ -3900,7 +4100,7 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Mic" msgstr "Micro" @@ -3913,7 +4113,7 @@ msgstr "Min" msgid "Misc" msgstr "Divers" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 msgid "Misc Settings" msgstr "Paramètres divers" @@ -3944,7 +4144,7 @@ msgid "Motion Plus" msgstr "Motion Plus" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Vibreur" @@ -4062,6 +4262,7 @@ msgstr "NP Tabulation" msgid "NP Up" msgstr "NP Haut" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -4071,6 +4272,9 @@ msgstr "NP Haut" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4109,7 +4313,7 @@ msgstr "Pseudo :" msgid "No Country (SDK)" msgstr "Pas de pays (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 msgid "No ISOs or WADS found" msgstr "Aucun ISO ou WAD trouvé" @@ -4144,7 +4348,7 @@ msgstr "Aucun dossier de sauvegarde trouvé pour le titre %s" msgid "None" msgstr "Aucune" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" msgstr "Norvégien BokmÃ¥l" @@ -4152,11 +4356,12 @@ msgstr "Norvégien BokmÃ¥l" msgid "Not Equal" msgstr "Différent" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 msgid "Not Set" msgstr "Non défini" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 @@ -4166,10 +4371,13 @@ msgstr "Non défini" ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Non connectée" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Notes" msgstr "Notes" @@ -4211,7 +4419,7 @@ msgstr "Objet" msgid "Object Range" msgstr "Plage d'objets :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 msgid "Off" msgstr "Arrêt" @@ -4228,19 +4436,23 @@ msgstr "%d blocs disponibles seulement" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Ouvrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 msgid "Open &containing folder" msgstr "Ouvrir l'emplacement du fichier" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Open Wii &save folder" msgstr "Ouvrir le dossier de &sauvegarde Wii" @@ -4279,7 +4491,7 @@ msgid "Opens the logger" msgstr "Ouvrir le journaliseur" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:91 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Options" @@ -4360,10 +4572,11 @@ msgstr "Partition %i" msgid "Patches" msgstr "Patchs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Paths" msgstr "Chemins" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4376,6 +4589,10 @@ msgstr "Chemins" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4384,7 +4601,7 @@ msgstr "Pause" msgid "Per-Pixel Lighting" msgstr "Eclairage par pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 msgid "Perfect" msgstr "Parfait" @@ -4397,6 +4614,7 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4407,18 +4625,24 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Démarrer" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Play Recording" msgstr "Jouer l'enregistrement..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 msgid "Play/Pause" msgstr "Démarrer/Arrêter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Playable" msgstr "Jouable" @@ -4430,6 +4654,7 @@ msgstr "Options de lecture" msgid "Players" msgstr "Joueurs" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4439,6 +4664,9 @@ msgstr "Joueurs" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Veuillez confirmer..." @@ -4450,23 +4678,23 @@ msgstr "Merci de créer une perspective avant de sauvegarder" msgid "Plus-Minus" msgstr "Plus-Moins" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Polish" msgstr "Polonais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 msgid "Port 4" msgstr "Port 4" @@ -4475,11 +4703,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese" msgstr "Portugais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" msgstr "Portugais (brésilien)" @@ -4488,6 +4716,9 @@ msgid "Post-Processing Effect:" msgstr "Effet de Post-processing :" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:735 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" @@ -4503,8 +4734,11 @@ msgstr "" msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update Hungarian and Turkish translations. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "Pré-réglages :" @@ -4547,7 +4781,7 @@ msgid "Quit" msgstr "Quitter" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" msgstr "R" @@ -4556,7 +4790,7 @@ msgid "R Button" msgstr "Bouton R" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" msgstr "R Analog." @@ -4573,6 +4807,7 @@ msgid "Range" msgstr "Etendue" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 msgid "Read-only mode" msgstr "Mode Lecture seule" @@ -4644,6 +4879,7 @@ msgid "Refresh" msgstr "Rafraîchir" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 msgid "Refresh List" msgstr "Rafraîchir la liste" @@ -4651,6 +4887,7 @@ msgstr "Rafraîchir la liste" msgid "Refresh game list" msgstr "Rafraîchir la liste des jeux" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4669,6 +4906,12 @@ msgstr "Rafraîchir la liste des jeux" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Retirer" @@ -4689,11 +4932,15 @@ msgstr "Rendu dans la fenêtre principale" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -4716,15 +4963,15 @@ msgid "Right Stick" msgstr "Stick Droit" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 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:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Russian" msgstr "Russe" @@ -4736,6 +4983,7 @@ msgstr "Sau&vegarder l'état" msgid "Safe" msgstr "Sûr " +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4745,6 +4993,9 @@ msgstr "Sûr " ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Echantillonnage :" @@ -4759,34 +5010,42 @@ msgid "Save GCI as..." msgstr "Enregistrer GCI sous..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 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 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 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 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 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 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 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 msgid "Save State Slot 8" msgstr "Sauvegarder l'état vers le Slot 8" @@ -4794,12 +5053,12 @@ msgstr "Sauvegarder l'état vers le Slot 8" msgid "Save State..." msgstr "Enregistrer l'état" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 msgid "Save as..." msgstr "Enregistrer sous..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "Save compressed GCM/ISO" msgstr "Sauver le fichier compressé GCM/ISO" @@ -4807,11 +5066,11 @@ msgstr "Sauver le fichier compressé GCM/ISO" msgid "Save current perspective" msgstr "Sauvegarder la perspective actuelle" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 msgid "Save decompressed GCM/ISO" msgstr "Sauvegarder le fichier GCM/ISO décompressé" -#: Source/Core/Core/Src/Movie.cpp:428 +#: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4822,16 +5081,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "Copie à l'échelle de l'EFB" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, c-format msgid "Scanning %s" msgstr "Analyse de %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 msgid "Scanning for ISOs" msgstr "Recherche d'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 msgid "Scanning..." msgstr "Recherche..." @@ -4847,7 +5106,7 @@ msgstr "Arrêt défil." msgid "Search Filter" msgstr "Fitre de recherche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Search Subfolders" msgstr "Chercher dans sous-dossiers" @@ -4862,6 +5121,7 @@ msgstr "La section %s n'a pas été trouvée dans SYSCONF" msgid "Select" msgstr "Select" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4886,6 +5146,14 @@ msgstr "Sélectionner le fichier d'enregistrement" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Sélectionner le fichier d'enregistrement" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Sélectionner un fichier WAD de Wii à installer" @@ -4911,6 +5179,7 @@ msgstr "Sélectionner les fenêtres flottantes" msgid "Select the file to load" msgstr "Sélectionner le fichier à charger" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4928,18 +5197,25 @@ msgstr "Sélectionner l'état à charger" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Sélectionner le fichier à enregistrer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Sélectionner l'état à charger" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Sélectionner l'état à enregistrer" @@ -5011,10 +5287,11 @@ msgstr "Position de la Sensor Bar :" msgid "Separator" msgstr "Séparateur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "Serbe" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 @@ -5025,6 +5302,9 @@ msgstr "Serbe" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +>>>>>>> Update from master branch. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -5042,7 +5322,7 @@ msgstr "Port série 1 - C'est le port que les périphériques tels que l'adaptat msgid "Set" msgstr "Paramétrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "Set as &default ISO" msgstr "Définir comme l'ISO par &défaut" @@ -5058,11 +5338,11 @@ msgstr "" "SetARCode_IsActive : L'index est plus grand que la taille de la liste des " "codes AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." msgstr "Configurer..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Impossible de trouver le fichier des paramètres" @@ -5070,7 +5350,7 @@ msgstr "SetupWiiMem: Impossible de trouver le fichier des paramètres" msgid "Shake" msgstr "Secouement" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Short Name:" msgstr "Nom court :" @@ -5130,7 +5410,7 @@ msgstr "Afficher Japon" msgid "Show Korea" msgstr "Afficher Corée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Show Language:" msgstr "Afficher la langue :" @@ -5170,11 +5450,11 @@ msgstr "Afficher WAD" msgid "Show Wii" msgstr "Afficher Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 msgid "Show a confirmation box before stopping a game." msgstr "Demande confirmation avant d'arrêter le jeu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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 " @@ -5239,15 +5519,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote à l'horizontale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Simplified Chinese" msgstr "Chinois simplifié" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 msgid "Size" msgstr "Taille" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 msgid "Skip BIOS" msgstr "Ne pas exécuter le BIOS" @@ -5326,11 +5606,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 msgid "Slot B" msgstr "Slot B" @@ -5355,7 +5635,7 @@ msgstr "" "Êtes-vous certain d'activer le rendu logiciel ? Dans le doute, choisissez " "'Non'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Paramètres audio" @@ -5373,6 +5653,7 @@ msgstr "Echec de la création du buffer audio : %s" msgid "Space" msgstr "Espace" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5388,6 +5669,11 @@ msgstr "Espace" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Espagnol" @@ -5431,6 +5717,7 @@ msgstr "Stick carré" msgid "Standard Controller" msgstr "Contrôleur standard" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 @@ -5440,6 +5727,9 @@ msgstr "Contrôleur standard" ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5454,14 +5744,16 @@ msgid "Start Re&cording" msgstr "Commencer l'enregistrement" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" msgstr "Commencer l'enregistrement" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:300 msgid "State" msgstr "Etat" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "Etats" @@ -5474,11 +5766,15 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Arrêter" @@ -5522,8 +5818,8 @@ msgstr "Fichiers de sauvegarde importés avec succès" msgid "Swing" msgstr "Balancement" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "System Language:" msgstr "Langue du système :" @@ -5557,6 +5853,7 @@ msgstr "Table Droite" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. @@ -5572,6 +5869,16 @@ msgid "Take Screenshot" msgstr "Capture d'écran" >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +msgid "Take Screenshot" +msgstr "Capture d'écran" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +msgid "TaruKonga (Bongos)" +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "Test" @@ -5600,13 +5907,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:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 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:1227 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 #, c-format msgid "" "The file %s already exists.\n" @@ -5696,7 +6003,7 @@ 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:573 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 msgid "Theme" msgstr "Thème" @@ -5728,7 +6035,7 @@ 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:509 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." msgstr "Ceci peut ralentir le Menu Wii et quelques jeux." @@ -5751,7 +6058,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -5767,11 +6074,11 @@ msgstr "" "Raccourci clavier : Appuyer pour instantanément désactiver cette " "option." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Ceci est utilisé pour lire les pistes de musique, comme les BGM." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5799,7 +6106,7 @@ msgid "Tilt" msgstr "Tilt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 msgid "Title" msgstr "Titre" @@ -5816,17 +6123,22 @@ msgstr "Activer tous les types de journaux" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Activer le plein écran" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5834,10 +6146,13 @@ msgstr "Activer le plein écran" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Haut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 msgid "Traditional Chinese" msgstr "Chinois traditionnel" @@ -5845,7 +6160,7 @@ msgstr "Chinois traditionnel" msgid "Tried to load an unknown file type." msgstr "Echec de chargement d'un type de fichier inconnu." -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" msgstr "Déclencheurs" @@ -5861,7 +6176,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:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Turkish" msgstr "Turque" @@ -5954,6 +6269,7 @@ msgstr "" "Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" >>>>>>> Update Hungarian and Turkish translations. +<<<<<<< HEAD #: Source/Core/Core/Src/HW/Memmap.cpp:633 #, c-format msgid "" @@ -5969,6 +6285,8 @@ msgstr "" "Continuer ?" >>>>>>> Update Hungarian and Turkish translations. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5983,7 +6301,7 @@ msgstr "Mettre à jour" msgid "Upright Wiimote" msgstr "Wiimote debout" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utiliser le mode EuRGB60 (PAL60)" @@ -5995,7 +6313,7 @@ msgstr "&Plein écran" msgid "Use Hex" msgstr "Utiliser Hexa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" msgstr "Utiliser les gestionnaires de panique" @@ -6051,7 +6369,7 @@ msgstr "Valeur" msgid "Verbosity" msgstr "Verbosité" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 msgid "Video" msgstr "Vidéo" @@ -6059,7 +6377,7 @@ msgstr "Vidéo" msgid "Virtual" msgstr "Virtuel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 msgid "Volume" msgstr "Volume" @@ -6127,6 +6445,9 @@ msgstr "" "Continuer ?" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:629 #, c-format msgid "" @@ -6162,8 +6483,11 @@ msgid "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update Hungarian and Turkish translations. +======= +>>>>>>> Update from master branch. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -6181,15 +6505,15 @@ msgstr "Hack écran large (16/9è)" msgid "Width" msgstr "Largeur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 msgid "Wii Console" msgstr "Console Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 msgid "Wii NAND Root:" msgstr "Racine de la NAND (Wii) :" @@ -6197,6 +6521,7 @@ msgstr "Racine de la NAND (Wii) :" msgid "Wii Save Import" msgstr "Importer une sauvegarde Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -6206,6 +6531,9 @@ msgstr "Importer une sauvegarde Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin" @@ -6236,6 +6564,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 ?" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 @@ -6245,6 +6574,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote connectée" @@ -6276,6 +6608,7 @@ msgstr "Windows Droit" msgid "Word Wrap" msgstr "Casse" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6291,6 +6624,11 @@ msgstr "Casse" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Travail..." @@ -6354,7 +6692,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:877 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 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." @@ -6377,7 +6715,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:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "ZTP hack" msgstr "ZTP hack" @@ -6448,7 +6786,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6465,7 +6803,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:447 +#: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT : Lecture de l'Opcode depuis %x. Merci de nous le signaler." @@ -6486,7 +6824,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Commande inconnue 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute a retourné -1 sur l'exécution de l'application !" @@ -6598,6 +6936,9 @@ msgstr "| OR" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "Impossible d'ouvrir %s, une fonction manque" +#~ msgid "Cannot record movies in read-only mode." +#~ msgstr "Impossible d'enregistrer des films en mode Lecture seule." + #~ msgid "Config..." #~ msgstr "Configurer..." @@ -6697,9 +7038,6 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "Paramètres graphiques de l'émulateur" -#~ msgid "Enable Bounding Box Calculation" -#~ msgstr "Activer le calcul de la boît de saut" - #~ msgid "Enable CPU Access" #~ msgstr "Activer l'accès CPU" @@ -6758,13 +7096,6 @@ msgstr "| OR" #~ msgid "Error allocating buffer" #~ msgstr "Erreur d'allocation du buffer" -#~ msgid "" -#~ "Error in PlayWiimote. %u != %u, byte %d.\n" -#~ "Sorry, Wii recording is temporarily broken." -#~ msgstr "" -#~ "Erreur dans PlayWiimote. %u != %u, octet %d.\n" -#~ "Désolé, l'enregistrement Wii est temporairement instable." - #~ msgid "Error loading %s: can't read info" #~ msgstr "Erreur lors du chargement de %s : inpossible de lire l'info" @@ -6777,13 +7108,6 @@ msgstr "| OR" #~ msgid "Error opening file %s for recording" #~ msgstr "Erreur d'ouverture du fichier %s pour l'enregistrement" -#~ msgid "" -#~ "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " -#~ "Aborting savestate load..." -#~ msgstr "" -#~ "Erreur : Apres \"%s\", %d (0x%X) a été trouvé au lieu du marqueur de " -#~ "sauvegarde %d (0x%X). Abandon du chargement de la sauvegarde d'état..." - #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6822,9 +7146,6 @@ msgstr "| OR" #~ "en ont besoin pour fonctionneer correctement, mais peut être aussi très " #~ "lent." -#~ msgid "GCMic Configuration" -#~ msgstr "Configuration du micro de la GC" - #~ msgid "GFX Config" #~ msgstr "Configurer..." @@ -6848,13 +7169,6 @@ msgstr "| OR" #~ "Si un jeu bloque, fonctionne seulement avec l'Interpreteur ou que Dolphin " #~ "plante, cette option peut corriger le jeu." -#~ 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 de saut seront mis à jour. Utilisé " -#~ "par les jeux Paper Mario." - #~ msgid "Input Source" #~ msgstr "Source d'entrée" @@ -6943,15 +7257,6 @@ msgstr "| OR" #~ " Exécutez-vous Dolphin à partir d'un média en lecture seule ou d'un " #~ "dossier d'où Dolphin n'est pas situé ?" -#~ msgid "Premature movie end in PlayController. %u + 8 > %u" -#~ msgstr "Fin prématurée du film dans PlayController. %u + 8 > %u" - -#~ msgid "Premature movie end in PlayWiimote. %u + %d > %u" -#~ msgstr "Fin prématurée du film dans PlayWiimote. %u + %d > %u" - -#~ msgid "Premature movie end in PlayWiimote. %u > %u" -#~ msgstr "Fin prématurée du film dans PlayWiimote. %u > %u" - #~ msgid "Projection Stats" #~ msgstr "Stats de projection" @@ -7077,9 +7382,6 @@ msgstr "| OR" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Démarrer la fenêtre de rendu en plein écran." -#~ msgid "TaruKonga (Bongos)" -#~ msgstr "TaruKonga (Bongos)" - #~ msgid "The file " #~ msgstr "Le fichier " @@ -7094,6 +7396,13 @@ msgstr "| OR" #~ msgstr "" #~ "Le type de configuration %d n'est pas pris en charge dans le plug-in %s" +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "Pointeur inconnu %#08x\n" +#~ "Continuer ?" + #~ msgid "Use FPS For Limiting" #~ msgstr "Utiliser les FPS pour limiter" @@ -7124,60 +7433,6 @@ msgstr "| OR" #~ "Attendre les blancs verticaux (ou synchro verticale).\n" #~ "Réduit les sauts mais peut aussi baisser les performances" -#~ 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 actuel. (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 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 ne correspond " -#~ "pas à 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. " -#~ "Autrement, vous aurez probablement une désynchronisation." - -#~ 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" -#~ "\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" -#~ "\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" -#~ msgstr "" -#~ "Attention : vous avez chargé une sauvegarde dont le film ne correspond " -#~ "pas à l'image %d. Vous devriez charger une autre sauvegarde avant de " -#~ "continuer, ou charger cet état en désactivant le mode Lecture seule. " -#~ "Autrement, vous aurez probablement une désynchronisation.\n" -#~ "\n" -#~ "Infos complémentaires : Le film actuel fait %d images et alors que le " -#~ "film de la sauvegarde d'état fait %d images.\n" -#~ "\n" -#~ "A l'image %d, le film actuel appuie sur :\n" -#~ "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DHaut=%d, DBas=%d, DGauche=%d, " -#~ "DDroit=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=" -#~ "%d\n" -#~ "\n" -#~ "A l'image %d, le film de la sauvegarde d'état appuie sur :\n" -#~ "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DHaut=%d, DBas=%d, DGauche=%d, " -#~ "DDroit=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" - #~ msgid "" #~ "When using EFB to RAM we very often need to decode RAM data to a VRAM " #~ "texture, which is a very time-consuming task.\n" diff --git a/Languages/po/he.po b/Languages/po/he.po index 857ec27567..ea10f8cea4 100644 --- a/Languages/po/he.po +++ b/Languages/po/he.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-01-08 20:50+0200\n" "Last-Translator: Ely \n" "Language-Team: \n" @@ -510,6 +514,7 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -519,6 +524,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "" @@ -572,6 +582,7 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -579,6 +590,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "" @@ -656,11 +671,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -681,11 +700,15 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -795,10 +818,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "" @@ -831,11 +858,15 @@ msgstr "" msgid "Buffer:" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1058,10 +1089,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "" @@ -1170,11 +1205,15 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "" @@ -1350,10 +1389,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1563,11 +1606,15 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1596,15 +1643,20 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +>>>>>>> Update from master branch. #, fuzzy msgid "Dolphin GCPad Configuration" msgstr "הגדרות גרפיקה" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 @@ -1612,6 +1664,10 @@ msgstr "הגדרות גרפיקה" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1694,6 +1750,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1703,6 +1760,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "" @@ -1826,21 +1888,31 @@ msgid "Enable Block Merging" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "" @@ -1966,6 +2038,7 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -1975,6 +2048,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "" @@ -2004,6 +2082,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -2021,6 +2100,19 @@ msgid "Error" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2435,6 +2527,7 @@ msgstr "" msgid "Free Look" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2444,6 +2537,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "" @@ -2513,10 +2611,14 @@ msgstr "הגדרות קול" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2538,11 +2640,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2552,6 +2659,7 @@ msgstr "" msgid "General Settings" msgstr "הגדרות קול" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2561,6 +2669,11 @@ msgstr "הגדרות קול" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "" @@ -2676,11 +2789,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "" @@ -2870,11 +2988,15 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "" @@ -2951,6 +3073,7 @@ msgstr "" msgid "Invalid state" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -2960,6 +3083,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "" @@ -3110,6 +3238,7 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3123,6 +3252,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3200,11 +3336,15 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3236,10 +3376,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "" @@ -3416,11 +3560,15 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3507,11 +3655,15 @@ msgstr "" msgid "Not Set" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "" @@ -3573,9 +3725,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "" @@ -3701,6 +3857,7 @@ msgstr "" msgid "Paths" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3708,6 +3865,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3728,12 +3889,17 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "" @@ -3759,11 +3925,15 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "" @@ -3969,6 +4139,7 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -3980,6 +4151,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "" @@ -3996,9 +4173,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -4041,11 +4222,15 @@ msgstr "" msgid "Safe" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "" @@ -4129,11 +4314,15 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "" @@ -4173,6 +4362,7 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4188,6 +4378,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "" @@ -4210,6 +4408,7 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4222,15 +4421,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "" @@ -4566,6 +4772,7 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4575,6 +4782,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "" @@ -4610,11 +4822,15 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4650,9 +4866,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -4725,9 +4945,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "" @@ -4940,18 +5164,26 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "" @@ -5053,6 +5285,7 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5063,6 +5296,8 @@ msgid "" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5265,11 +5500,15 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5296,11 +5535,15 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "" @@ -5332,6 +5575,7 @@ msgstr "" msgid "Word Wrap" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5341,6 +5585,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "" diff --git a/Languages/po/hu.po b/Languages/po/hu.po index 4e43ee3092..27ed2a0941 100644 --- a/Languages/po/hu.po +++ b/Languages/po/hu.po @@ -8,6 +8,7 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-18 13:41-0600\n" ======= @@ -18,6 +19,10 @@ msgstr "" ======= "PO-Revision-Date: 2011-12-20 17:22-0600\n" >>>>>>> Update Hungarian and Turkish translations. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +"PO-Revision-Date: 2011-12-27 08:22-0600\n" +>>>>>>> Update from master branch. "Last-Translator: Delirious \n" "Language-Team: Delirious \n" "Language: Hungarian\n" @@ -586,6 +591,7 @@ msgstr "Patch hozzáadása" msgid "Add new pane" msgstr "Új mezÅ‘ hozzáadása" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -595,6 +601,11 @@ msgstr "Új mezÅ‘ hozzáadása" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Hozzáadás..." @@ -664,6 +675,7 @@ msgstr "Minden GC/Wii képfájl (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Minden Gamecube GCM fájl (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -671,6 +683,10 @@ msgstr "Minden Gamecube GCM fájl (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Minden állásmentés (sav, s##)" @@ -769,11 +785,15 @@ msgstr "" 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!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Képarány:" @@ -794,11 +814,15 @@ msgstr "Hang feldolgozó:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Hiba az AO eszköz megnyitásakor.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatikus" @@ -916,10 +940,14 @@ msgstr "Kék jobbra" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Lent" @@ -952,11 +980,15 @@ msgstr "Kimeneti könyvtár tallózása" msgid "Buffer:" msgstr "Puffer:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1022,6 +1054,7 @@ msgstr "Mégsem" msgid "Cannot open %s" msgstr "%s nem nyitható meg" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:721 @@ -1029,15 +1062,21 @@ msgid "Cannot record movies in read-only mode." msgstr "A mozgások rögzítése nem lehetséges írásvédett módban." >>>>>>> Update Hungarian and Turkish translations. +======= +>>>>>>> Update from master branch. #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "Nem lehet események bejegyzéseket törölni függÅ‘ben lévÅ‘ eseményekkel" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 >>>>>>> Update Hungarian and Turkish translations. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +>>>>>>> Update from master branch. #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1214,10 +1253,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Bezárás" @@ -1326,11 +1369,15 @@ msgstr "Wiimote 3 csatlakoztatása" msgid "Connect Wiimote 4" msgstr "Wiimote 4 csatlakoztatása" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Csatlakozás..." @@ -1521,10 +1568,14 @@ msgstr "DSP emulátor motor" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emuláció (gyors)" @@ -1757,11 +1808,15 @@ msgstr "" msgid "Divide" msgstr "Megosztás" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Le akarod állítani az éppen működÅ‘ emulációt?" @@ -1790,6 +1845,7 @@ msgstr "Dolphin emulált Wiimote beállítások" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1805,6 +1861,14 @@ msgstr "Dolphin GCPad beállítások" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad beállítások" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS videók (*.dtm)" @@ -1901,6 +1965,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1910,6 +1975,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Holland" @@ -2053,6 +2123,7 @@ msgstr "BAT használata" msgid "Enable Block Merging" msgstr "Blokk csatlakozás használata" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" @@ -2060,15 +2131,25 @@ msgstr "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "Bounding Box kalkuláció használata" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Gyorsítótár használata" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Csalások használata" @@ -2224,6 +2305,7 @@ msgstr "" msgid "End" msgstr "Vége" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2233,6 +2315,11 @@ msgstr "Vége" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Angol" @@ -2262,6 +2349,7 @@ msgstr "EgyenlÅ‘" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Hiba" @@ -2279,6 +2367,21 @@ msgid "Error" msgstr "Hiba" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Hiba" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" +"PlayWiimote hiba. %u != %u, bájt %d.\n" +"Sajnos a Wii videó rögzítés egyenlÅ‘re nem működik." + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2291,6 +2394,11 @@ msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" +<<<<<<< HEAD +======= +"Hiba: \"%s\" után, %d (0x%X) található a mentési jelölÅ‘ helyett %d (0x%X). " +"Mentés betöltésének leállítása..." +>>>>>>> Update from master branch. #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format @@ -2738,6 +2846,7 @@ msgstr "RögzítendÅ‘ képkockák" msgid "Free Look" msgstr "Szabad nézet" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2747,6 +2856,11 @@ msgstr "Szabad nézet" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Francia" @@ -2772,9 +2886,14 @@ msgid "GCI File(*.gci)" msgstr "GCI fájl(*.gci)" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +<<<<<<< HEAD #, fuzzy msgid "GCMic Configuration" msgstr "Napló beállítások" +======= +msgid "GCMic Configuration" +msgstr "GCMic beállítások" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" @@ -2814,10 +2933,14 @@ msgstr "Gamecube &irányító beállítások" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube memóriakártyák (*.raw,*.gcp)" @@ -2841,11 +2964,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Ãltalános" @@ -2854,6 +2982,7 @@ msgstr "Ãltalános" msgid "General Settings" msgstr "Ãltalános beállítások" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2863,6 +2992,11 @@ msgstr "Ãltalános beállítások" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Német" @@ -3002,11 +3136,16 @@ msgstr "Gyorsbillentyű beállítások" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Gyorsbill." @@ -3079,6 +3218,11 @@ msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +<<<<<<< HEAD +======= +"Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper Mario " +"játékok használják." +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" @@ -3231,11 +3375,15 @@ msgid "" msgstr "" "InstallExceptionHandler elÅ‘idézve, de ez a platform még nem támogatja azt." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "WAD telepítése..." @@ -3317,6 +3465,7 @@ msgstr "Nem megfelelÅ‘ rögzített fájl" msgid "Invalid state" msgstr "Nem megfelelÅ‘ mentés" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3326,6 +3475,11 @@ msgstr "Nem megfelelÅ‘ mentés" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Olasz" @@ -3483,6 +3637,7 @@ msgstr "Ãllás betöltése a 8. helyrÅ‘l" msgid "Load State..." msgstr "Ãllás betöltése..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3496,6 +3651,13 @@ msgstr "Wii rendszer menü betöltése" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Wii rendszer menü betöltése" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii rendszer menü betöltése %d%c" @@ -3577,11 +3739,15 @@ msgstr "MMU sebesség növelÅ‘ hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark fájlok (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "FÅ‘kar" @@ -3613,10 +3779,14 @@ msgstr "Memória bájt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Memóriakártya" @@ -3814,11 +3984,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3905,11 +4079,15 @@ msgstr "Nem egyenlÅ‘" msgid "Not Set" msgstr "Nincs beállítva" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Nincs csatlakoztatva" @@ -3971,9 +4149,13 @@ msgstr "Csak %d blokk szabad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Megnyitás" @@ -4104,6 +4286,7 @@ msgstr "Javítások" msgid "Paths" msgstr "Mappák" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4111,6 +4294,10 @@ msgstr "Mappák" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Szünet" @@ -4131,12 +4318,17 @@ msgstr "%d perspektíva" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Indítás" @@ -4162,11 +4354,15 @@ msgstr "Visszajátszási lehetÅ‘ségek" msgid "Players" msgstr "Játékosok" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Változtatás jóváhagyása..." @@ -4218,17 +4414,29 @@ msgstr "Utófeldolgozási effektus:" #: Source/Core/Core/Src/Movie.cpp:735 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "Túl korai PlayController videó befejezés. %u + 8 > %u" +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:829 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "Túl korai PlayWiimote videó befejezés. %u + %d > %u" +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:806 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "Túl korai PlayWiimote videó befejezés. %u > %u" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " @@ -4377,6 +4585,7 @@ msgstr "A lista frissítése" msgid "Refresh game list" msgstr "Játéklista frissítése" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4388,6 +4597,12 @@ msgstr "Játéklista frissítése" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Törlés" @@ -4407,9 +4622,13 @@ msgstr "Megjelenítés a fÅ‘ablakban" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Alapra állítás" @@ -4452,11 +4671,15 @@ msgstr "Ãl&lás mentése" msgid "Safe" msgstr "Biztonságos" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Mintavételezési frekvencia:" @@ -4540,11 +4763,15 @@ 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" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "Keresés %s" @@ -4584,6 +4811,7 @@ msgstr "%s rész nem található a SYSCONF fájlban" msgid "Select" msgstr "Választás" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4599,6 +4827,14 @@ msgstr "Válassz rögzítendÅ‘ fájlt" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Válassz rögzítendÅ‘ fájlt" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Válassz telepítendÅ‘ Wii WAD fájlt" @@ -4624,6 +4860,7 @@ msgstr "Válassz lebegÅ‘ ablakokat" msgid "Select the file to load" msgstr "BetöltendÅ‘ fájl kiválasztása" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4636,15 +4873,22 @@ msgstr "Válassz betöltendÅ‘ állásmentést" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Válassz mentési fájlt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Válassz betöltendÅ‘ állásmentést" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Válassz mentendÅ‘ állást" @@ -5026,6 +5270,7 @@ msgstr "Hang puffer létrehozása sikertelen: %s" msgid "Space" msgstr "Szóköz" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -5035,6 +5280,11 @@ msgstr "Szóköz" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Spanyol" @@ -5078,11 +5328,15 @@ msgstr "Negyzetes kar" msgid "Standard Controller" msgstr "Normál irányító" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5118,9 +5372,13 @@ msgstr "Kar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Leállítás" @@ -5206,15 +5464,23 @@ msgstr "Tábla jobbra" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Pillanatkép készítése" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "TaruKonga (Bongos)" +<<<<<<< HEAD msgstr "" +======= +msgstr "TaruKonga (Bongos)" +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -5455,18 +5721,26 @@ msgstr "Minden napló típus kijelölése" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Váltás teljes nézetre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Fent" @@ -5577,6 +5851,7 @@ msgstr "" "Ismeretlen üzenet érkezett ezzel az azonosítóval:%d ettÅ‘l a játékostól:%d " "Játékos kirúgása!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5589,6 +5864,8 @@ msgstr "" "Folytatod?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5751,6 +6028,13 @@ msgid "" "%u > %u) (frame %u > %u). You should load another save before continuing, or " "load this state with read-only mode off." msgstr "" +<<<<<<< HEAD +======= +"Figyelem: Olyan mentést töltöttél be, ami a választott videó befejezése " +"utáni. (%u > %u bájt) (%u > %u képkocka). Folytatás elÅ‘tt betölthetsz egy " +"másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása " +"után." +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:646 #, c-format @@ -5759,6 +6043,13 @@ msgid "" "should load another save before continuing, or load this state with read-" "only mode off. Otherwise you'll probably get a desync." msgstr "" +<<<<<<< HEAD +======= +"Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d (0x%X) bájt " +"eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy " +"betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ " +"esetben szinkronizációs hibák jelentkezhetnek." +>>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:655 #, c-format @@ -5778,6 +6069,24 @@ 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 "" +<<<<<<< HEAD +======= +"Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d képkocka eltérés " +"mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy betöltheted " +"ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ esetben " +"szinkronizációs hibák jelentkezhetnek.\n" +"\n" +"BÅ‘vebb információk: A választott videó %d képkocka hosszú, a mentett állás " +"videója pedig %d képkocka hosszú.\n" +"\n" +"%d képkockánál a videó tömörítve lesz:\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 képkockánál a mentett állás videója tömörítve lesz:\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" +>>>>>>> Update from master branch. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -5812,11 +6121,15 @@ msgstr "Wii NAND gyökér könyvtár:" msgid "Wii Save Import" msgstr "Wii mentés importálása" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii mentés fájlok (*.bin)|*.bin" @@ -5847,11 +6160,15 @@ msgstr "" "esetleg az üresjárati idÅ‘korlát letelt vagy egyéb ok miatt történt.\n" "Újra akarod csatlakoztatni most?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote csatlakoztatva" @@ -5883,6 +6200,7 @@ msgstr "Jobb Windows" msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5892,6 +6210,11 @@ msgstr "Word Wrap" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Folyamatban..." @@ -6298,9 +6621,6 @@ msgstr "| VAGY" #~ msgid "Emulator Display Settings" #~ msgstr "Emulátor kijelzÅ‘ beállítások" -#~ msgid "Enable Bounding Box Calculation" -#~ msgstr "Bounding Box kalkuláció használata" - #~ msgid "Enable CPU Access" #~ msgstr "Processzor hozzáférés engedélyezése" @@ -6358,13 +6678,6 @@ msgstr "| VAGY" #~ msgid "Error allocating buffer" #~ msgstr "Puffer kiosztási hiba" -#~ msgid "" -#~ "Error in PlayWiimote. %u != %u, byte %d.\n" -#~ "Sorry, Wii recording is temporarily broken." -#~ msgstr "" -#~ "PlayWiimote hiba. %u != %u, bájt %d.\n" -#~ "Sajnos a Wii videó rögzítés egyenlÅ‘re nem működik." - #~ msgid "Error loading %s: can't read info" #~ msgstr "Hiba a(z) %s betöltése közben: az infó nem olvasható" @@ -6377,13 +6690,6 @@ 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 "" -#~ "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " -#~ "Aborting savestate load..." -#~ msgstr "" -#~ "Hiba: \"%s\" után, %d (0x%X) található a mentési jelölÅ‘ helyett %d (0x" -#~ "%X). Mentés betöltésének leállítása..." - #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6421,9 +6727,6 @@ msgstr "| VAGY" #~ "Ez sokkal pontosabb mint az EFB másolás textúrába, és néhány játékhoz " #~ "szükséges a megfelelÅ‘ működéshez, ugyanakkor nagyon lassú is lehet." -#~ msgid "GCMic Configuration" -#~ msgstr "GCMic beállítások" - #~ msgid "GFX Config" #~ msgstr "GFX beállítások" @@ -6447,13 +6750,6 @@ 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 "" -#~ "If checked, the bounding box registers will be updated. Used by the Paper " -#~ "Mario games." -#~ msgstr "" -#~ "Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper " -#~ "Mario játékok használják." - #~ msgid "Input Source" #~ msgstr "Bemeneti forrás" @@ -6543,15 +6839,6 @@ msgstr "| VAGY" #~ " A Dolphin emulátort csak olvasható eszközrÅ‘l futtatod vagy egy olyan " #~ "könyvtárból amely nem tartalmazza az emulátort?" -#~ msgid "Premature movie end in PlayController. %u + 8 > %u" -#~ msgstr "Túl korai PlayController videó befejezés. %u + 8 > %u" - -#~ msgid "Premature movie end in PlayWiimote. %u + %d > %u" -#~ msgstr "Túl korai PlayWiimote videó befejezés. %u + %d > %u" - -#~ msgid "Premature movie end in PlayWiimote. %u > %u" -#~ msgstr "Túl korai PlayWiimote videó befejezés. %u > %u" - #~ msgid "Projection Stats" #~ msgstr "Kivetítési statisztikák" @@ -6671,9 +6958,6 @@ msgstr "| VAGY" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "A megjelenítési ablak teljes képernyÅ‘s módban indul." -#~ msgid "TaruKonga (Bongos)" -#~ msgstr "TaruKonga (Bongos)" - #~ msgid "The file " #~ msgstr "A fájl" @@ -6723,60 +7007,6 @@ msgstr "| VAGY" #~ "Várakozás a függÅ‘leges képkioltásra.\n" #~ "Csökkenti a képszakadást de egyben a teljesítményt is." -#~ 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 "" -#~ "Figyelem: Olyan mentést töltöttél be, ami a választott videó befejezése " -#~ "utáni. (%u > %u bájt) (%u > %u képkocka). Folytatás elÅ‘tt betölthetsz egy " -#~ "másik mentést, vagy betöltheted ezt a mentést az írásvédett mód " -#~ "kikapcsolása után." - -#~ 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 "" -#~ "Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d (0x%X) bájt " -#~ "eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy " -#~ "betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ " -#~ "esetben szinkronizációs hibák jelentkezhetnek." - -#~ 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" -#~ "\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" -#~ "\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" -#~ msgstr "" -#~ "Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d képkocka " -#~ "eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy " -#~ "betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ " -#~ "esetben szinkronizációs hibák jelentkezhetnek.\n" -#~ "\n" -#~ "BÅ‘vebb információk: A választott videó %d képkocka hosszú, a mentett " -#~ "állás videója pedig %d képkocka hosszú.\n" -#~ "\n" -#~ "%d képkockánál a videó tömörítve lesz:\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 képkockánál a mentett állás videója tömörítve lesz:\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" - #~ msgid "" #~ "When using EFB to RAM we very often need to decode RAM data to a VRAM " #~ "texture, which is a very time-consuming task.\n" diff --git a/Languages/po/it.po b/Languages/po/it.po index c27de2da97..622cfea1fe 100644 --- a/Languages/po/it.po +++ b/Languages/po/it.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-04-08 20:40+0100\n" "Last-Translator: RebuMan, Dolphin Team\n" "Language-Team: \n" @@ -556,6 +560,7 @@ msgstr "Aggiungi Patch" msgid "Add new pane" msgstr "Aggiungi nuovo riquadro" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -565,6 +570,11 @@ msgstr "Aggiungi nuovo riquadro" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Aggiungi..." @@ -636,6 +646,7 @@ msgstr "Tutti i file di immagine GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tutti i file GCM GameCube (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -643,6 +654,10 @@ msgstr "Tutti i file GCM GameCube (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Tutti gli Stati di Gioco Salvati (sav, s##)" @@ -726,11 +741,15 @@ 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!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspetto:" @@ -751,11 +770,15 @@ msgstr "Interfaccia Audio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "Audiocommon: Errore nell'apertura della periferica AO.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -869,10 +892,14 @@ msgstr "Blu Destro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Sotto" @@ -905,11 +932,15 @@ msgstr "Cerca una directory di destinazione" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1148,10 +1179,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Chiudi" @@ -1261,11 +1296,15 @@ msgstr "Collega Wiimote 3" msgid "Connect Wiimote 4" msgstr "Collega Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Connessione in corso..." @@ -1455,10 +1494,14 @@ msgstr "Motore di Emulazione DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "Emulazione DSP HLE (veloce)" @@ -1678,11 +1721,15 @@ msgstr "Visualizza i tasti di input letti dall'emulatore." msgid "Divide" msgstr "/" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Vuoi interrompere l'emulazione in corso?" @@ -1711,6 +1758,7 @@ msgstr "Dolphin - Configurazione Wiimote Emulato" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1726,6 +1774,14 @@ msgstr "Dolphin - Configurazione Controlli GC" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin - Configurazione Controlli GC" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmati TAS Dolphin (*.dtm)" @@ -1814,6 +1870,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1823,6 +1880,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Olandese" @@ -1952,22 +2014,32 @@ msgid "Enable Block Merging" msgstr "Attiva Unione Blocchi" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Attiva Cache" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Abilita Trucchi" @@ -2108,6 +2180,7 @@ msgstr "" msgid "End" msgstr "Fine" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2117,6 +2190,11 @@ msgstr "Fine" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Inglese" @@ -2146,6 +2224,7 @@ msgstr "Uguale" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Errore/i" @@ -2163,6 +2242,19 @@ msgid "Error" msgstr "Errore/i" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Errore/i" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2627,6 +2719,7 @@ msgstr "Fotogrammi da Registrare:" msgid "Free Look" msgstr "Visuale Libera" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2636,6 +2729,11 @@ msgstr "Visuale Libera" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Francese" @@ -2704,10 +2802,14 @@ msgstr "Impostazioni &Controlli GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Schede di Memoria GameCube (*.raw,*.gcp)" @@ -2731,11 +2833,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generale" @@ -2745,6 +2852,7 @@ msgstr "Generale" msgid "General Settings" msgstr "Impostazioni Interfaccia" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2754,6 +2862,11 @@ msgstr "Impostazioni Interfaccia" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Tedesco" @@ -2879,11 +2992,16 @@ msgstr "Configurazione Tasti di Scelta Rapida" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Tasti di Scelta Rapida" @@ -3097,11 +3215,15 @@ msgstr "" "E' stata sollevata un'Eccezione all'Installazione, tuttavia questa " "piattaforma non la supporta ancora." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Installazione WAD..." @@ -3185,6 +3307,7 @@ msgstr "File di registrazione non valido" msgid "Invalid state" msgstr "Stato non valido" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3194,6 +3317,11 @@ msgstr "Stato non valido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italiano" @@ -3352,20 +3480,28 @@ msgstr "Carica Stato di Gioco dall'Ingresso 8" msgid "Load State..." msgstr "Carica Stato di Gioco..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +>>>>>>> Update from master branch. #, fuzzy msgid "Load Wii System Menu" msgstr "Carica il Menu di Sistema Wii %d%c" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carica il Menu di Sistema Wii %d%c" @@ -3448,11 +3584,15 @@ msgstr "Hack Velocità MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "File MadCatz Gameshark(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Levetta Principale" @@ -3484,10 +3624,14 @@ msgstr "Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Scheda di Memoria" @@ -3673,11 +3817,15 @@ msgstr "TN Tab" msgid "NP Up" msgstr "TN Su" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3764,11 +3912,15 @@ msgstr "Diverso" msgid "Not Set" msgstr "Non Impostato" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Non collegato" @@ -3830,9 +3982,13 @@ msgstr "Solo %d blocchi disponibili" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Apri" @@ -3966,6 +4122,7 @@ msgstr "Patches" msgid "Paths" msgstr "Percorsi" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3973,6 +4130,10 @@ msgstr "Percorsi" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -3994,12 +4155,17 @@ msgstr "Prospettiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Gioca" @@ -4025,11 +4191,15 @@ msgstr "Opzioni di Riproduzione" msgid "Players" msgstr "Giocatori" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Per favore confermare..." @@ -4243,6 +4413,7 @@ msgstr "Aggiorna Elenco" msgid "Refresh game list" msgstr "Aggiorna elenco giochi" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4254,6 +4425,12 @@ msgstr "Aggiorna elenco giochi" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Rimuovi" @@ -4273,9 +4450,13 @@ msgstr "Rendering nella finestra Principale" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Resetta" @@ -4318,11 +4499,15 @@ msgstr "Sa&lva Stato di Gioco" msgid "Safe" msgstr "Accurata" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Frequenza di Campionamento:" @@ -4407,11 +4592,15 @@ msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..." msgid "Scaled EFB Copy" msgstr "Scala Copie EFB" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Scanning %s" msgstr "Ricerca..." @@ -4451,6 +4640,7 @@ msgstr "Sezione %s non trovata in SYSCONF" msgid "Select" msgstr "Seleziona" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4466,6 +4656,14 @@ msgstr "Seleziona il File di Registrazione" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Seleziona il File di Registrazione" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Seleziona un file WAD Wii da installare" @@ -4491,6 +4689,7 @@ msgstr "Seleziona finestre libere/mobili" msgid "Select the file to load" msgstr "Seleziona il file da caricare" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4503,15 +4702,22 @@ msgstr "Seleziona lo stato di gioco da caricare" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Seleziona il file di salvataggio" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Seleziona lo stato di gioco da caricare" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Seleziona lo stato di gioco da salvare" @@ -4866,6 +5072,7 @@ msgstr "Creazione buffer audio non riuscita: %s" msgid "Space" msgstr "Spazio" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4875,6 +5082,11 @@ msgstr "Spazio" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Spagnolo" @@ -4910,11 +5122,15 @@ msgstr "Levetta Quadrata" msgid "Standard Controller" msgstr "Controller Standard" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4950,9 +5166,13 @@ msgstr "Levetta" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Arresta" @@ -5026,9 +5246,13 @@ msgstr "Semipiano destro" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Genera un'Istantanea di Gioco" @@ -5274,18 +5498,26 @@ msgstr "Seleziona/Deseleziona tutti i Tipi di Log" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Commuta a Schermo Intero" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Sopra" @@ -5391,6 +5623,7 @@ msgstr "" "Messaggio sconosciuto avente id:%d ricevuto dal giocatore:%d Giocatore " "espluso!!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5403,6 +5636,8 @@ msgstr "" "Continuare?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5615,11 +5850,15 @@ msgstr "Origine DVD:" msgid "Wii Save Import" msgstr "Importa Salvataggi Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Salva i file Wii (*.bin)|*.bin" @@ -5650,11 +5889,15 @@ msgstr "" " o forse è dovuto ad altri motivi. \n" "Vuoi riconnettersi immediatamente?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Collegato" @@ -5687,6 +5930,7 @@ msgstr "Windows Destro" msgid "Word Wrap" msgstr "Adatta Testo" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5696,6 +5940,11 @@ msgstr "Adatta Testo" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Attività in corso..." diff --git a/Languages/po/ja.po b/Languages/po/ja.po index 1392815cb3..12fee69911 100644 --- a/Languages/po/ja.po +++ b/Languages/po/ja.po @@ -8,6 +8,7 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-12 20:45+0900\n" ======= @@ -16,6 +17,9 @@ msgstr "" "PO-Revision-Date: 2011-08-19 08:37-0500\n" >>>>>>> Update translation files for recent changes in the code. ======= +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-10-12 20:45+0900\n" >>>>>>> Update Arabic and Japanese translations. "Last-Translator: DanbSky\n" @@ -566,6 +570,7 @@ msgstr "パッãƒã‚’追加" msgid "Add new pane" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -575,6 +580,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "追加" @@ -640,6 +650,7 @@ msgstr "å…¨ã¦ã® GC/Wii イメージ (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "GC GCMファイル (gcm)|*.gcm" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -647,6 +658,10 @@ msgstr "GC GCMファイル (gcm)|*.gcm" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "å…¨ã¦ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイル (sav, s##)" @@ -745,11 +760,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ファイルを削除ã—ã¾ã™ã‹ï¼Ÿå…ƒã«æˆ»ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“ï¼" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "アスペクト比：" @@ -770,11 +789,15 @@ msgstr "出力API (Audio Backend)" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error opening AO device.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" @@ -890,10 +913,14 @@ msgstr "é’ - å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "下部" @@ -926,11 +953,15 @@ msgstr "出力先をé¸æŠž" msgid "Buffer:" msgstr "ãƒãƒƒãƒ•ã‚¡ï¼š" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1178,10 +1209,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "é–‰ã˜ã‚‹" @@ -1290,11 +1325,15 @@ msgstr "3Pã®Wii リモコンを接続ï¼åˆ‡æ–­" msgid "Connect Wiimote 4" msgstr "4Pã®Wii リモコンを接続ï¼åˆ‡æ–­" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "接続中..." @@ -1486,10 +1525,14 @@ msgstr "DSPエミュレーション方å¼" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP-HLE エミュレーション (高速)" @@ -1720,11 +1763,15 @@ msgstr "" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "動作中ã®ã‚²ãƒ¼ãƒ ã‚’åœæ­¢ã—ã¾ã™ã‹ï¼Ÿ" @@ -1753,6 +1800,7 @@ msgstr "Wii リモコンã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³è¨­å®š" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1768,6 +1816,14 @@ msgstr "GCコントローラ設定" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "GCコントローラ設定" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS ムービー (*.dtm)" @@ -1864,6 +1920,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1873,6 +1930,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "オランダ語" @@ -2017,21 +2079,31 @@ msgid "Enable Block Merging" msgstr "Enable Block Merging" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Enable Cache" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ã‚’有効化" @@ -2185,6 +2257,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2194,6 +2267,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "英語" @@ -2223,6 +2301,7 @@ msgstr "ã«ä¸€è‡´ã™ã‚‹" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "エラー" @@ -2240,6 +2319,19 @@ msgid "Error" msgstr "エラー" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "エラー" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2698,6 +2790,7 @@ msgstr "録画フレーム数設定" msgid "Free Look" msgstr "フリールック" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2707,6 +2800,11 @@ msgstr "フリールック" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "フランス語" @@ -2774,10 +2872,14 @@ msgstr "ゲームキューブ入力設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "メモリーカードファイル (*.raw,*.gcp)|*.raw;*.gcp" @@ -2801,11 +2903,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -2814,6 +2921,7 @@ msgstr "一般" msgid "General Settings" msgstr "一般" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2823,6 +2931,11 @@ msgstr "一般" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "ドイツ語" @@ -2962,11 +3075,16 @@ msgstr "ホットキーã®è¨­å®š" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "ホットキー" @@ -3189,11 +3307,15 @@ msgstr "" "InstallExceptionHandler ãŒå‘¼ã³å‡ºã•ã‚Œã¾ã—ãŸãŒã€ã“ã®ãƒ—ラットフォームã¯ã¾ã ã‚µ" "ãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "WADファイルを追加ã—ã¦ã„ã¾ã™..." @@ -3275,6 +3397,7 @@ msgstr "ä¸æ­£ãªéŒ²ç”»ãƒ•ã‚¡ã‚¤ãƒ«" msgid "Invalid state" msgstr "ä¸æ­£ãªã‚»ãƒ¼ãƒ–ï¼ãƒ­ãƒ¼ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3284,6 +3407,11 @@ msgstr "ä¸æ­£ãªã‚»ãƒ¼ãƒ–ï¼ãƒ­ãƒ¼ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "イタリア語" @@ -3441,6 +3569,7 @@ msgstr "ステートロード - スロット 8" msgid "Load State..." msgstr "ファイルã‹ã‚‰ãƒ­ãƒ¼ãƒ‰" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3454,6 +3583,13 @@ msgstr "Wiiメニューを起動" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Wiiメニューを起動" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wiiメニューを起動 ( ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š%d %c )" @@ -3536,11 +3672,15 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark セーブファイル(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "コントロールスティック" @@ -3572,10 +3712,14 @@ msgstr "メモリãƒã‚¤ãƒˆ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "メモリーカード" @@ -3771,11 +3915,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3862,11 +4010,15 @@ msgstr "ã«ä¸€è‡´ã—ãªã„" msgid "Not Set" msgstr "未確èª" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "未接続" @@ -3928,9 +4080,13 @@ msgstr "残り %d ブロックã—ã‹ã‚ã‚Šã¾ã›ã‚“ï¼" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "é–‹ã" @@ -4061,6 +4217,7 @@ msgstr "パッãƒ" msgid "Paths" msgstr "フォルダ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4068,6 +4225,10 @@ msgstr "フォルダ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "一時åœæ­¢" @@ -4088,12 +4249,17 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "開始" @@ -4119,11 +4285,15 @@ msgstr "å†ç”Ÿã‚ªãƒ—ション" msgid "Players" msgstr "プレイヤー一覧" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "確èª" @@ -4335,6 +4505,7 @@ msgstr "ゲームリストをå†æ›´æ–°" msgid "Refresh game list" msgstr "ゲームリストをå†æ›´æ–°ã—ã¾ã™" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4346,6 +4517,12 @@ msgstr "ゲームリストをå†æ›´æ–°ã—ã¾ã™" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "削除" @@ -4365,9 +4542,13 @@ msgstr "メインウィンドウ部分ã«æç”»" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "åˆæœŸåŒ–" @@ -4410,11 +4591,15 @@ msgstr "ステートセーブ(&V)" msgid "Safe" msgstr "Safe" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "サンプルレート" @@ -4498,11 +4683,15 @@ msgstr "Savestate movie %s ã®ç ´æを確èªã—ã¾ã—ãŸã€‚録画を中止㗠msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "確èªä¸­... .%s" @@ -4542,6 +4731,7 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "é¸æŠž" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4557,6 +4747,14 @@ msgstr "録画ファイルをé¸æŠž" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "録画ファイルをé¸æŠž" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "追加ã™ã‚‹WADファイルをé¸æŠž" @@ -4582,6 +4780,7 @@ msgstr "" msgid "Select the file to load" msgstr "ロードã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4594,15 +4793,22 @@ msgstr "ロードã™ã‚‹ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイルをé¸æŠž" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "セーブファイルをé¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "ロードã™ã‚‹ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイルをé¸æŠž" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "ステートセーブã®ä¿å­˜å…ˆã‚’é¸æŠž" @@ -4981,6 +5187,7 @@ msgstr "Sound buffer creation failed: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4990,6 +5197,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "スペイン語" @@ -5033,11 +5245,15 @@ msgstr "丸ã¿" msgid "Standard Controller" msgstr "標準コントローラ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5073,9 +5289,13 @@ msgstr "スティック" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "åœæ­¢" @@ -5153,9 +5373,13 @@ msgstr "å³ãƒ†ãƒ¼ãƒ–ル" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "スクリーンショット" @@ -5407,18 +5631,26 @@ msgstr "å…¨ã¦ã®ãƒ­ã‚°æƒ…報をé¸æŠžï¼è§£é™¤" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "フルスクリーン表示切り替ãˆ" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "上部" @@ -5527,6 +5759,7 @@ msgstr "次ã®IDã‹ã‚‰ä¸æ˜Žãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’å—ä¿¡ : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Unknown message with id:%d received from player:%d Kicking player!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5539,6 +5772,8 @@ msgstr "" "Continue?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5762,11 +5997,15 @@ msgstr "Wii NANDルート" msgid "Wii Save Import" msgstr "Wiiã®ã‚»ãƒ¼ãƒ–データをインãƒãƒ¼ãƒˆ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wiiセーブデータ (*.bin)|*.bin" @@ -5797,11 +6036,15 @@ msgstr "" "ã¾ãŸã¯ã—ã°ã‚‰ã入力ãŒãªã‹ã£ãŸãŸã‚çœé›»åŠ›ãƒ¢ãƒ¼ãƒ‰ã«å…¥ã£ãŸã®ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“\n" "å†æŽ¥ç¶šã—ã¾ã™ã‹ï¼Ÿ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wii リモコン接続中" @@ -5833,6 +6076,7 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ワードラップ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5842,6 +6086,11 @@ msgstr "ワードラップ" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "動作中..." @@ -6549,6 +6798,13 @@ msgstr "| (...ã‚‚ã—ãã¯)" ======= >>>>>>> Update translation files for recent changes in the code. +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" + #~ msgid "Use FPS For Limiting" #~ msgstr "有効化" diff --git a/Languages/po/ko.po b/Languages/po/ko.po index 6378880eee..a8cc90fdaa 100644 --- a/Languages/po/ko.po +++ b/Languages/po/ko.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-07-07 10:24+0900\n" "Last-Translator: \n" "Language-Team: \n" @@ -553,6 +557,7 @@ msgstr "패치 추가" msgid "Add new pane" msgstr "새로운 ì°½ 추가" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -562,6 +567,11 @@ msgstr "새로운 ì°½ 추가" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "추가..." @@ -629,6 +639,7 @@ msgstr "모든 GC/Wii ì´ë¯¸ì§€ë“¤ (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "모든 게임í브 GCM 파ì¼ë“¤ (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -636,6 +647,10 @@ msgstr "모든 게임í브 GCM 파ì¼ë“¤ (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "모든 ìƒíƒœë“¤ 저장 (sav, s##)" @@ -723,11 +738,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ì´ íŒŒì¼ì„ ì •ë§ë¡œ 지우고 싶습니까? ê·¸ê²ƒì€ ì˜ì›ížˆ 사ë¼ì§‘니다!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "종횡비:" @@ -748,11 +767,15 @@ msgstr "오디오 백엔드:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO 장치를 열기 ì—러.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "ìžë™" @@ -868,10 +891,14 @@ msgstr "파랑 오른쪽" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "아래" @@ -904,11 +931,15 @@ msgstr "출력 디렉토리 둘러보기" msgid "Buffer:" msgstr "버í¼:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1150,10 +1181,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "닫기" @@ -1262,11 +1297,15 @@ msgstr "위모트 3 ì—°ê²°" msgid "Connect Wiimote 4" msgstr "위모트 4 ì—°ê²°" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "연결중..." @@ -1458,10 +1497,14 @@ msgstr "DSP ì—뮬레ì´í„° 엔진" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE ì—뮬레ì´ì…˜ (빠름)" @@ -1690,11 +1733,15 @@ msgstr "" msgid "Divide" msgstr "나누기" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "현재 ì—뮬레ì´ì…˜ì„ 중단하고 싶습니까?" @@ -1723,6 +1770,7 @@ msgstr "ëŒí•€ ì—ë®¬ëœ ìœ„ëª¨íŠ¸ 환경설정" msgid "Dolphin FIFO" msgstr "ëŒí•€ FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1738,6 +1786,14 @@ msgstr "ëŒí•€ GC패드 환경설정" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "ëŒí•€ GC패드 환경설정" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "ëŒí•€ TAS ë™ì˜ìƒ (*.dtm)" @@ -1833,6 +1889,7 @@ msgstr "" "\n" "확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1842,6 +1899,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "네ëœëž€ë“œì–´" @@ -1985,21 +2047,31 @@ msgid "Enable Block Merging" msgstr "ë¸”ë¡ í•©ì¹˜ê¸° 활성" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "ìºì‰¬ 활성" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "치트 활성" @@ -2150,6 +2222,7 @@ msgstr "" msgid "End" msgstr "ë" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2159,6 +2232,11 @@ msgstr "ë" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "ì˜ì–´" @@ -2188,6 +2266,7 @@ msgstr "ê°™ìŒ" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "ì—러" @@ -2205,6 +2284,19 @@ msgid "Error" msgstr "ì—러" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "ì—러" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "ì„ íƒëœ 언어 로딩 ì—러. 시스템 기본으로 ëŒì•„갑니다." @@ -2659,6 +2751,7 @@ msgstr "녹화할 프레임" msgid "Free Look" msgstr "ìžìœ ë¡œìš´ 보기" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2668,6 +2761,11 @@ msgstr "ìžìœ ë¡œìš´ 보기" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "프랑스어" @@ -2735,10 +2833,14 @@ msgstr "게임í브 패드 설정(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "게임í브 메모리 카드들 (*.raw,*.gcp)" @@ -2762,11 +2864,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "ì¼ë°˜" @@ -2775,6 +2882,7 @@ msgstr "ì¼ë°˜" msgid "General Settings" msgstr "ì¼ë°˜ 설정" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2784,6 +2892,11 @@ msgstr "ì¼ë°˜ 설정" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "ë…ì¼ì–´" @@ -2914,11 +3027,16 @@ msgstr "단축키 설정" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "단축키들" @@ -3140,11 +3258,15 @@ msgstr "" "InstallExceptionHandler 호출ë¨, 하지만 ì´ í”Œëž«í¼ì€ ì•„ì§ ê·¸ê²ƒì„ ì§€ì›í•˜ì§€ 않습" "니다." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "WAD 설치하기..." @@ -3226,6 +3348,7 @@ msgstr "비ì í•© ê¸°ë¡ íŒŒì¼" msgid "Invalid state" msgstr "비ì í•© ìƒíƒœ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3235,6 +3358,11 @@ msgstr "비ì í•© ìƒíƒœ" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "ì´íƒˆë¦¬ì•„ì–´" @@ -3392,6 +3520,7 @@ msgstr "슬롯8 ìƒíƒœ 로드" msgid "Load State..." msgstr "ìƒíƒœ 로드..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3405,6 +3534,13 @@ msgstr "Wii 시스템 메뉴 로드" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Wii 시스템 메뉴 로드" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii 시스템 메뉴 %d %c 로드" @@ -3486,11 +3622,15 @@ msgstr "MMU 스피드 핵" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz ê²Œìž„ìƒ¤í¬ íŒŒì¼ë“¤(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "ë©”ì¸ ìŠ¤í‹±" @@ -3522,10 +3662,14 @@ msgstr "메모리 ë°”ì´íŠ¸" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "메모리 ì¹´ë“œ" @@ -3723,11 +3867,15 @@ msgstr "NP 탭" msgid "NP Up" msgstr "NP 위" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3814,11 +3962,15 @@ msgstr "같지 ì•ŠìŒ" msgid "Not Set" msgstr "설정 안함" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "ì—°ê²°ë˜ì§€ ì•ŠìŒ" @@ -3880,9 +4032,13 @@ msgstr "%d 블럭들만 유용한" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "열기" @@ -4010,6 +4166,7 @@ msgstr "패치" msgid "Paths" msgstr "경로" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4017,6 +4174,10 @@ msgstr "경로" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "ì¼ì‹œì •ì§€" @@ -4037,12 +4198,17 @@ msgstr "ê´€ì  %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr " 실행 " @@ -4068,11 +4234,15 @@ msgstr "ìž¬ìƒ ì˜µì…˜" msgid "Players" msgstr "플레ì´ì–´" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "확ì¸í•´ì£¼ì„¸ìš”..." @@ -4284,6 +4454,7 @@ msgstr "ëª©ë¡ ìƒˆë¡œ 고침" msgid "Refresh game list" msgstr "게임 ëª©ë¡ ìƒˆë¡œ 고침" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4295,6 +4466,12 @@ msgstr "게임 ëª©ë¡ ìƒˆë¡œ 고침" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "제거" @@ -4314,9 +4491,13 @@ msgstr "ë©”ì¸ ìœˆë„ìš°ì— ë Œë”" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "리셋" @@ -4359,11 +4540,15 @@ msgstr "ìƒíƒœ 저장(&v) " msgid "Safe" msgstr "안전" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "샘플율:" @@ -4447,11 +4632,15 @@ msgstr "%s ì˜ìƒ ìƒíƒœì €ìž¥ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤, ì˜ìƒ ê¸°ë¡ ì¤‘ì§€... msgid "Scaled EFB Copy" msgstr "스케ì¼ëœ EFB 복사" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "스ìºë‹ %s" @@ -4491,6 +4680,7 @@ msgstr "섹션 %s를 SYSCONFì—ì„œ ì°¾ì„ ìˆ˜ ì—†ìŒ" msgid "Select" msgstr "ì„ íƒ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4506,6 +4696,14 @@ msgstr "ê¸°ë¡ íŒŒì¼ ì„ íƒ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "ê¸°ë¡ íŒŒì¼ ì„ íƒ" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "설치할 Wii WAD íŒŒì¼ ì„ íƒ" @@ -4531,6 +4729,7 @@ msgstr "유ë™ì ì¸ 윈ë„우즈 ì„ íƒ" msgid "Select the file to load" msgstr "로드할 íŒŒì¼ ì„ íƒ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4543,15 +4742,22 @@ msgstr "로드할 ìƒíƒœ ì„ íƒ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "저장 파ì¼ì„ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "로드할 ìƒíƒœ ì„ íƒ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "저장할 ìƒíƒœ ì„ íƒ" @@ -4926,6 +5132,7 @@ msgstr "사운드 ë²„í¼ ìƒì„± 실패했습니다: %s" msgid "Space" msgstr "스페ì´ìŠ¤" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4935,6 +5142,11 @@ msgstr "스페ì´ìŠ¤" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "스페ì¸ì–´" @@ -4978,11 +5190,15 @@ msgstr "스퀘어 스틱" msgid "Standard Controller" msgstr "표준 컨트롤러" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5018,9 +5234,13 @@ msgstr "스틱" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "중지" @@ -5097,9 +5317,13 @@ msgstr "í…Œì´ë¸” 오른쪽" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "스í¬ë¦°ìƒ· ì°ê¸°" @@ -5342,18 +5566,26 @@ msgstr "모든 로그 타입 토글" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "전체화면 토글" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "위" @@ -5461,6 +5693,7 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "id:%dì˜ ì•Œë ¤ì§€ì§€ ì•Šì€ ë©”ì‹œì§€, 플레ì´ì–´:%d 플레ì´ì–´ 킥킹으로 부터 전달ëœ!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5473,6 +5706,8 @@ msgstr "" "계ì†í•©ë‹ˆê¹Œ?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5694,11 +5929,15 @@ msgstr "Wii NAND 루트:" msgid "Wii Save Import" msgstr "Wii 저장 가져오기" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 저장 파ì¼ë“¤ (*.bin)|*.bin" @@ -5729,11 +5968,15 @@ msgstr "" "í˜¹ì€ ì•„ë§ˆë„ ì•„ì´ë“¤ 타임 아웃ì´ê±°ë‚˜ 다른 ì›ì¸ ë•Œë¬¸ì¸ ê²ƒ 같습니다.\n" "ë‹¹ì‹ ì€ ì¦‰ì‹œ 재연결 하고 싶습니까?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "위모트가 ì—°ê²°ë¨" @@ -5766,6 +6009,7 @@ msgstr "윈ë„우즈 오른쪽" msgid "Word Wrap" msgstr "ìžë™ 줄바꿈" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5775,6 +6019,11 @@ msgstr "ìžë™ 줄바꿈" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "ìž‘ë™ì¤‘..." diff --git a/Languages/po/nb.po b/Languages/po/nb.po index f916e21416..d321d1dde5 100644 --- a/Languages/po/nb.po +++ b/Languages/po/nb.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-06-06 20:15+0100\n" "Last-Translator: Knut \n" "Language-Team: Norwegian \n" @@ -559,6 +563,7 @@ msgstr "Legg til Patch" msgid "Add new pane" msgstr "Legg til ny rute" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -568,6 +573,11 @@ msgstr "Legg til ny rute" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Legg til..." @@ -635,6 +645,7 @@ msgstr "Alle GC/Wii-bildefiler (gcm, iso, ciso, wad)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle GameCube GCM-filer (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -642,6 +653,10 @@ msgstr "Alle GameCube GCM-filer (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Alle Save States (sav, s##)" @@ -733,11 +748,15 @@ msgstr "" "Er du sikker pÃ¥ at du vil slette denne filen?\n" "Den vil bli borte for alltid!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspektforhold:" @@ -758,11 +777,15 @@ msgstr "Audio Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Feil ved Ã¥pning av AO-device.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisk" @@ -878,10 +901,14 @@ msgstr "BlÃ¥ Høyre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Bunn" @@ -914,11 +941,15 @@ msgstr "Bla etter lagringssted" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1162,10 +1193,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Lukk" @@ -1274,11 +1309,15 @@ msgstr "Koble til Wiimote 3" msgid "Connect Wiimote 4" msgstr "Koble til Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Kobler til..." @@ -1469,10 +1508,14 @@ msgstr "CPU Emulatormotor" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE-emulering (raskt)" @@ -1703,11 +1746,15 @@ msgstr "" msgid "Divide" msgstr "Del" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Vil du stoppe pÃ¥gÃ¥ende emulering?" @@ -1736,6 +1783,7 @@ msgstr "Dolphin Emulert Wiimote Konfigurasjon" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1751,6 +1799,14 @@ msgstr "Dolphin GC-kontroll konfigurasjon" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC-kontroll konfigurasjon" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS-Filmer (*.dtm)" @@ -1846,6 +1902,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1855,6 +1912,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Nederlansk" @@ -1998,21 +2060,31 @@ msgid "Enable Block Merging" msgstr "Aktiver Block Merging" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Aktiver cache" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Aktiver Juksekoder" @@ -2167,6 +2239,7 @@ msgstr "" msgid "End" msgstr "Slutt" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2176,6 +2249,11 @@ msgstr "Slutt" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Engelsk" @@ -2205,6 +2283,7 @@ msgstr "Lik" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Feil" @@ -2222,6 +2301,19 @@ msgid "Error" msgstr "Feil" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Feil" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Feil ved lasting av valgt sprÃ¥k. Faller tilbake til systemstandarden." @@ -2677,6 +2769,7 @@ msgstr "Bilder Til Opptak" msgid "Free Look" msgstr "Fri Utkikk" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2686,6 +2779,11 @@ msgstr "Fri Utkikk" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Fransk" @@ -2753,10 +2851,14 @@ msgstr "Innstillinger for &GameCube-kontroll" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube-minnekort (*.raw,*.gcp)" @@ -2780,11 +2882,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generelt" @@ -2793,6 +2900,7 @@ msgstr "Generelt" msgid "General Settings" msgstr "Generelle Innstillinger" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2802,6 +2910,11 @@ msgstr "Generelle Innstillinger" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Tysk" @@ -2933,11 +3046,16 @@ msgstr "Konfigurer Snarveistaster" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Snarveistaster" @@ -3156,11 +3274,15 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "InstallExceptionHandler kalt, men denne plattformen støtter den ikke." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Installer WAD..." @@ -3242,6 +3364,7 @@ msgstr "Ugyldig opptaksfil" msgid "Invalid state" msgstr "Ugyldig save state" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3251,6 +3374,11 @@ msgstr "Ugyldig save state" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italiensk" @@ -3408,6 +3536,7 @@ msgstr "Last Inn Save State Slot 8" msgid "Load State..." msgstr "Last Inn Save State..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3421,6 +3550,13 @@ msgstr "Last inn Wii System Meny" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Last inn Wii System Meny" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Last inn Wii System Meny %d %c" @@ -3502,11 +3638,15 @@ msgstr "Ytelses-hack for MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark-filer(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Hoved-joystick" @@ -3538,10 +3678,14 @@ msgstr "Memory Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Minnekort" @@ -3739,11 +3883,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Opp" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3830,11 +3978,15 @@ msgstr "Ikke Lik" msgid "Not Set" msgstr "Ikke Satt" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Ikke tilkoblet" @@ -3896,9 +4048,13 @@ msgstr "Kun %d blokker tilgjengelig" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Ã…pne" @@ -4029,6 +4185,7 @@ msgstr "Patcher" msgid "Paths" msgstr "Mappestier" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4036,6 +4193,10 @@ msgstr "Mappestier" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4056,12 +4217,17 @@ msgstr "Perspektiv %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Spill" @@ -4087,11 +4253,15 @@ msgstr "Avspillingsalterntiver" msgid "Players" msgstr "Spillere" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Vennligst bekreft..." @@ -4304,6 +4474,7 @@ msgstr "Oppdater liste" msgid "Refresh game list" msgstr "Oppdater spilliste" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4315,6 +4486,12 @@ msgstr "Oppdater spilliste" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Fjern" @@ -4334,9 +4511,13 @@ msgstr "Render til Hovedvindu" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Restart" @@ -4379,11 +4560,15 @@ msgstr "Lagre Sa&ve State" msgid "Safe" msgstr "Sikker" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Samplingsratio:" @@ -4467,11 +4652,15 @@ msgstr "Save State-film %s er korrupt, opptak avsluttes..." msgid "Scaled EFB Copy" msgstr "Skalert EFB-kopi" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "Søker i %s" @@ -4511,6 +4700,7 @@ msgstr "Seksjon %s ikke funnet i SYSCONF" msgid "Select" msgstr "Velg" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4526,6 +4716,14 @@ msgstr "Velg Opptaksfil" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Velg Opptaksfil" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Velg en Wii WAD-fil Ã¥ innstallere" @@ -4551,6 +4749,7 @@ msgstr "Velg flytvindu" msgid "Select the file to load" msgstr "Velg fil Ã¥ laste" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4563,15 +4762,22 @@ msgstr "Velg en save state Ã¥ laste" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Velg lagringsfil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Velg en save state Ã¥ laste" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Velg en save state Ã¥ lagre" @@ -4948,6 +5154,7 @@ msgstr "Laging av lydbuffer mislyktes: %s" msgid "Space" msgstr "Mellomrom" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4957,6 +5164,11 @@ msgstr "Mellomrom" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Spansk" @@ -4999,11 +5211,15 @@ msgstr "Kvadrat-joystick" msgid "Standard Controller" msgstr "Standardkontroller" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5039,9 +5255,13 @@ msgstr "Joystick" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stopp" @@ -5120,9 +5340,13 @@ msgstr "Tabell Høyre" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Ta Skjermbilde" @@ -5366,18 +5590,26 @@ msgstr "Vipp Alle Loggtyper" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Vipp Mellom Vindu/Fullskjerm" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Topp" @@ -5484,6 +5716,7 @@ msgstr "Ukjent melding mottatt med ID: %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Ukjent melding mottatt med ID: %d fra spiller: %d Sparker spiller!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5496,6 +5729,8 @@ msgstr "" "Fortsett?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5718,11 +5953,15 @@ msgstr "Wii NAND-rot:" msgid "Wii Save Import" msgstr "Importer Wii-lagringsfil" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii-lagringsfiler (*.bin)|*.bin" @@ -5753,11 +5992,15 @@ msgstr "" "eller kanskje den koblet seg fra pga. inaktivitet.\n" "Vil du koble til igjen øyeblikkelig?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Tilkoblet" @@ -5790,6 +6033,7 @@ msgstr "Windows Høyre" msgid "Word Wrap" msgstr "Ordkrumning" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5799,6 +6043,11 @@ msgstr "Ordkrumning" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Arbeider..." diff --git a/Languages/po/nl.po b/Languages/po/nl.po index 76e2b607fc..f6c2081f53 100644 --- a/Languages/po/nl.po +++ b/Languages/po/nl.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-08-07 16:43+0100\n" "Last-Translator: Goost \n" "Language-Team: DevPro Team. \n" @@ -560,6 +564,7 @@ msgstr "Voeg Patch toe" msgid "Add new pane" msgstr "Voeg een nieuwe paneel toe" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -569,6 +574,11 @@ msgstr "Voeg een nieuwe paneel toe" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Voeg toe..." @@ -636,6 +646,7 @@ msgstr "Alle GC/Wii images (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM bestanden (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -643,6 +654,10 @@ msgstr "Alle Gamecube GCM bestanden (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Alle Opgeslagen Staten (sav, s##)" @@ -733,11 +748,15 @@ msgstr "" "Weet je zeker dat je dit bestand wilt verwijderen? Deze gegevens zijn niet " "terug te halen!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Beeldverhouding:" @@ -758,11 +777,15 @@ msgstr "Geluid Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -874,10 +897,14 @@ msgstr "Blauw Rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Onder" @@ -910,11 +937,15 @@ msgstr "Zoek een uitvoer folder" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1160,10 +1191,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Sluit" @@ -1273,11 +1308,15 @@ msgstr "Verbind Wiimote 3" msgid "Connect Wiimote 4" msgstr "Verbind Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Verbinden..." @@ -1469,10 +1508,14 @@ msgstr "DSP Emulator Motor" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulatie (snel)" @@ -1705,11 +1748,15 @@ msgstr "" msgid "Divide" msgstr "Verdelen" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Wil je de emulatie stoppen?" @@ -1738,6 +1785,7 @@ msgstr "Dolphin Geëmuleerde Wiimote configuratie" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1753,6 +1801,14 @@ msgstr "Dolphin GCPad Configuratie" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad Configuratie" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Film (*.dtm)" @@ -1847,6 +1903,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1856,6 +1913,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Nederlands" @@ -1999,22 +2061,32 @@ msgid "Enable Block Merging" msgstr "Activeer Block Merging" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Activeer Cache" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Activeer Cheats" @@ -2170,6 +2242,7 @@ msgstr "" msgid "End" msgstr "Einde" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2179,6 +2252,11 @@ msgstr "Einde" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Engels" @@ -2208,6 +2286,7 @@ msgstr "Gelijk" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error (Fout)" @@ -2225,6 +2304,19 @@ msgid "Error" msgstr "Error (Fout)" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Error (Fout)" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2687,6 +2779,7 @@ msgstr "Frames om op te nemen" msgid "Free Look" msgstr "Vrije kijk" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2696,6 +2789,11 @@ msgstr "Vrije kijk" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Frans" @@ -2764,10 +2862,14 @@ msgstr "Gamecube &Pad Instellingen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Kaarten (*.raw,*.gcp)" @@ -2791,11 +2893,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Algemeen" @@ -2804,6 +2911,7 @@ msgstr "Algemeen" msgid "General Settings" msgstr "Algemene Instellingen" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2813,6 +2921,11 @@ msgstr "Algemene Instellingen" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Duits" @@ -2944,11 +3057,16 @@ msgstr "Sneltoets Configuratie" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Hotkeys" @@ -3173,11 +3291,15 @@ msgstr "" "InstallExceptionHandler opgeroepen, maar dit platform ondersteund dit nog " "niet." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "WAD aan het installeren..." @@ -3260,6 +3382,7 @@ msgstr "Onjuist opname bestand" msgid "Invalid state" msgstr "Onjuiste staat" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3269,6 +3392,11 @@ msgstr "Onjuiste staat" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italië" @@ -3426,20 +3554,28 @@ msgstr "Laad staat 8" msgid "Load State..." msgstr "Laad staat..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +>>>>>>> Update from master branch. #, fuzzy msgid "Load Wii System Menu" msgstr "Laad Wii System Menu(%d %c)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Laad Wii System Menu(%d %c)" @@ -3521,11 +3657,15 @@ msgstr "MMU Snelheids Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark bestanden(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3557,10 +3697,14 @@ msgstr "Geheugen Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Geheugen Kaart" @@ -3759,11 +3903,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Omhoog" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3850,11 +3998,15 @@ msgstr "Niet gelijk" msgid "Not Set" msgstr "Niet ingesteld" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Niet verbonden" @@ -3916,9 +4068,13 @@ msgstr "Er zijn maar %d blocks beschikaarr" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Open" @@ -4050,6 +4206,7 @@ msgstr "Patches" msgid "Paths" msgstr "Pad" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4057,6 +4214,10 @@ msgstr "Pad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pauze" @@ -4077,12 +4238,17 @@ msgstr "Perspectief %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Speel" @@ -4108,11 +4274,15 @@ msgstr "Terugspeel Opties" msgid "Players" msgstr "Spelers" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Bevestig alsjeblieft..." @@ -4325,6 +4495,7 @@ msgstr "Lijst Verversen" msgid "Refresh game list" msgstr "Ververs de speellijst" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4336,6 +4507,12 @@ msgstr "Ververs de speellijst" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Verwijder" @@ -4356,9 +4533,13 @@ msgstr "Geef weer op hoofdscherm" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Opnieuw" @@ -4401,11 +4582,15 @@ msgstr "S&la Staat Op" msgid "Safe" msgstr "Opslaan" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Sample Rate:" @@ -4490,11 +4675,15 @@ msgstr "Save staat film %s is corrupt, het opnemen van de film is gestopt..." msgid "Scaled EFB Copy" msgstr "EFB Verkleinde Kopie" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "Scannen van %s" @@ -4534,6 +4723,7 @@ msgstr "Sectie %s niet gevonden in SYSCONF" msgid "Select" msgstr "Selecteer" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4549,6 +4739,14 @@ msgstr "Selecteer de opname Bestand" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Selecteer de opname Bestand" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Selecteer een Wii WAD bestand om te installeren" @@ -4574,6 +4772,7 @@ msgstr "Selecteer zwevende vensters" msgid "Select the file to load" msgstr "Selecteer het bestand om het te laden" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4586,15 +4785,22 @@ msgstr "Selecteer de Staat om te laden" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Selecteer het save - bestand" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Selecteer de Staat om te laden" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Selecteer de Staat om op te slaan" @@ -4967,6 +5173,7 @@ msgstr "Het aanmaken van de geluids buffer is mislukt: %s" msgid "Space" msgstr "Ruimte" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4976,6 +5183,11 @@ msgstr "Ruimte" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Spaans" @@ -5019,11 +5231,15 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5059,9 +5275,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stop" @@ -5134,9 +5354,13 @@ msgstr "Rechter Tabel" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Neem een Schermafdruk" @@ -5383,18 +5607,26 @@ msgstr "Zet Alle Log Types Aan" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Volledig Scherm Inschakelen" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Boven" @@ -5504,6 +5736,7 @@ msgstr "" "Onbekend bericht ontvagen met id : %d ontvangen van speler: %d Speler " "eruitgeschopt!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5516,6 +5749,8 @@ msgstr "" "Doorgaan?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5739,11 +5974,15 @@ msgstr "Wii NAND basismap:" msgid "Wii Save Import" msgstr "Wii Save Importeren" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii save bestanden (*.bin)|*.bin" @@ -5774,11 +6013,15 @@ msgstr "" "of misschien is het te wijten aan een time-out of een andere reden.\n" "Wilt u meteen opnieuw verbinden?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Connected" @@ -5811,6 +6054,7 @@ msgstr "Venster Rechts" msgid "Word Wrap" msgstr "Regelafbreking" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5820,6 +6064,11 @@ msgstr "Regelafbreking" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Werken..." diff --git a/Languages/po/pl.po b/Languages/po/pl.po index 39aa254b51..1da1a68e37 100644 --- a/Languages/po/pl.po +++ b/Languages/po/pl.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-08-12 17:04+0100\n" "Last-Translator: Krzysztof Baszczok \n" "Language-Team: Polish \n" @@ -558,6 +562,7 @@ msgstr "Dodaj Å‚atkÄ™" msgid "Add new pane" msgstr "Dodaj nowy panel" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -567,6 +572,11 @@ msgstr "Dodaj nowy panel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Dodaj..." @@ -634,6 +644,7 @@ msgstr "Wszystkie obrazy GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Pliki GCM" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -641,6 +652,10 @@ msgstr "Pliki GCM" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Stany zapisu (sav, s##)" @@ -728,11 +743,15 @@ msgstr "" 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!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporcje ekranu:" @@ -753,11 +772,15 @@ msgstr "Audio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: BÅ‚Ä…d otwarcia urzÄ…dzenia AO.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -873,10 +896,14 @@ msgstr "Niebieski prawo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Dół" @@ -909,11 +936,15 @@ msgstr "Szukaj folderu wyjÅ›ciowego" msgid "Buffer:" msgstr "Bufor:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1114,11 +1145,15 @@ msgstr "Wybierz plik do otwarcia" msgid "Choose a memory card:" msgstr "Wybierz kartÄ™ pamiÄ™ci:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +>>>>>>> Update from master branch. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1161,10 +1196,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Zamknij" @@ -1273,11 +1312,15 @@ msgstr "PoÅ‚Ä…cz Wiilot 3" msgid "Connect Wiimote 4" msgstr "PoÅ‚Ä…cz Wiilot 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "ÅÄ…czÄ™..." @@ -1393,11 +1436,15 @@ msgstr "Utwórz nowÄ… perspektywÄ™" msgid "Created by KDE-Look.org" msgstr "Utworzone przez KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +>>>>>>> Update from master branch. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1474,10 +1521,14 @@ msgstr "DSP Emulator Engine" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulacja (szybkie)" @@ -1708,11 +1759,15 @@ msgstr "" msgid "Divide" msgstr "Podziel" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Zatrzymać aktualnÄ… emulacjÄ™?" @@ -1741,6 +1796,7 @@ msgstr "Konfiguracja emulowanego Wiilota" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1756,6 +1812,14 @@ msgstr "Konfiguracja GCPad'a" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Konfiguracja GCPad'a" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmy TAS (*.dtm)" @@ -1767,11 +1831,15 @@ msgstr "Konfiguracja Wiilot'a" msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +>>>>>>> Update from master branch. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1779,11 +1847,15 @@ msgstr "" "Program nie mógÅ‚ znaleść żadnych obrazów GC/Wii ISO. Kliknij tutaj by " "przeglÄ…dać pliki..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +>>>>>>> Update from master branch. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1859,6 +1931,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1868,6 +1941,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Holenderski" @@ -2012,21 +2090,31 @@ msgid "Enable Block Merging" msgstr "WÅ‚Ä…cz Å‚Ä…czenie bloków" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "WÅ‚Ä…cz cache" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "WÅ‚Ä…cz kody" @@ -2125,11 +2213,15 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update from master branch. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2185,6 +2277,7 @@ msgstr "" msgid "End" msgstr "Koniec" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2194,6 +2287,11 @@ msgstr "Koniec" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Angielski" @@ -2223,6 +2321,7 @@ msgstr "Równy" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "BÅ‚Ä…d" @@ -2240,6 +2339,19 @@ msgid "Error" msgstr "BÅ‚Ä…d" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "BÅ‚Ä…d" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "BÅ‚Ä…d wczytywania wybranego jÄ™zyka. Ustawienia domyÅ›lne." @@ -2248,6 +2360,9 @@ msgstr "BÅ‚Ä…d wczytywania wybranego jÄ™zyka. Ustawienia domyÅ›lne." #, c-format msgid "" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" @@ -2697,6 +2812,7 @@ msgstr "Ramki do nagrania" msgid "Free Look" msgstr "Free Look" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2706,6 +2822,11 @@ msgstr "Free Look" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Francuski" @@ -2773,10 +2894,14 @@ msgstr "Ustawienia &pada GC" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Karty pamiÄ™ci GC (*.raw,*.gcp)" @@ -2800,11 +2925,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Główne" @@ -2813,6 +2943,7 @@ msgstr "Główne" msgid "General Settings" msgstr "Ustawienia ogólne" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2822,6 +2953,11 @@ msgstr "Ustawienia ogólne" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Niemiecki" @@ -2951,11 +3087,16 @@ msgstr "Konfiguracja skrótów klawiszowych" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Skróty klawiszowe" @@ -3035,11 +3176,15 @@ msgstr "" "JeÅ›li FPS jest niezrównoważony, ta opcja może pomóc. (ON = kompatybilny, OFF " "= szybko)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +>>>>>>> Update from master branch. msgid "" "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." @@ -3180,11 +3325,15 @@ msgid "" msgstr "" "InstallExceptionHandler wywoÅ‚any, ale ta platforma nie wspiera go jeszcze." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Instalacja WAD..." @@ -3266,6 +3415,7 @@ msgstr "NewÅ‚aÅ›ciwy plik nagrania" msgid "Invalid state" msgstr "NiewÅ‚aÅ›ciwy stan" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3275,6 +3425,11 @@ msgstr "NiewÅ‚aÅ›ciwy stan" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "WÅ‚oski" @@ -3432,6 +3587,7 @@ msgstr "Wczytaj stan Slot 8" msgid "Load State..." msgstr "Wczytaj stan..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3445,6 +3601,13 @@ msgstr "Wczytaj Wii System Menu" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Wczytaj Wii System Menu" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wczytaj Wii System Menu %d %c" @@ -3526,11 +3689,15 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Pliki MadCatz Gameshark(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Główna gaÅ‚ka" @@ -3562,10 +3729,14 @@ msgstr "Bajt pamiÄ™ci" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Karta pamiÄ™ci" @@ -3763,11 +3934,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3854,11 +4029,15 @@ msgstr "Nie równe" msgid "Not Set" msgstr "Nie ustawiono" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Nie poÅ‚Ä…czono" @@ -3920,9 +4099,13 @@ msgstr "DostÄ™pnych tylko %d bloków" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Otwórz" @@ -4053,6 +4236,7 @@ msgstr "Patche" msgid "Paths" msgstr "Åšcieżki" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4060,6 +4244,10 @@ msgstr "Åšcieżki" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4080,12 +4268,17 @@ msgstr "Perspekrtywa %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Play" @@ -4111,11 +4304,15 @@ msgstr "Opcje playback'u" msgid "Players" msgstr "Gracze" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Potwierdź..." @@ -4326,6 +4523,7 @@ msgstr "OdÅ›wież listÄ™" msgid "Refresh game list" msgstr "OdÅ›wież listÄ™ gier" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4337,6 +4535,12 @@ msgstr "OdÅ›wież listÄ™ gier" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "UsuÅ„" @@ -4356,9 +4560,13 @@ msgstr "Generuj w oknie głównym" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -4401,11 +4609,15 @@ msgstr "Zapisz &stan" msgid "Safe" msgstr "Bezpieczny" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Wskaźnik próbkowania:" @@ -4489,11 +4701,15 @@ msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..." msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "SknaujÄ™ %s" @@ -4533,6 +4749,7 @@ msgstr "Nie odnaleziono sekcji %s w SYSCONF" msgid "Select" msgstr "Select" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4548,6 +4765,14 @@ msgstr "Wybierz plik nagrania" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Wybierz plik nagrania" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Wybierz plik Wii WAD do zainstalowania" @@ -4573,6 +4798,7 @@ msgstr "Select floating windows" msgid "Select the file to load" msgstr "Wybierz plik do wczytania" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4585,15 +4811,22 @@ msgstr "Wybierz stan do wczytania" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Wybierz plik do zapisu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Wybierz stan do wczytania" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Wybierz stan do zapisu" @@ -4666,11 +4899,15 @@ msgstr "Separator" msgid "Serbian" msgstr "Serbski" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +>>>>>>> Update from master branch. 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" @@ -4972,6 +5209,7 @@ msgstr "Utworzenie bufora dźwiÄ™ku nie powiodÅ‚o siÄ™: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4981,6 +5219,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "HiszpaÅ„ski" @@ -5024,11 +5267,15 @@ msgstr "Square Stick" msgid "Standard Controller" msgstr "Standard Controller" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5064,9 +5311,13 @@ msgstr "GaÅ‚ka" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stop" @@ -5144,9 +5395,13 @@ msgstr "Talerz prawo" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Zrób zdjÄ™cie" @@ -5392,18 +5647,26 @@ msgstr "PrzeÅ‚Ä…cz wszystkie typy logów" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "PrzeÅ‚Ä…cz na peÅ‚ny ekran" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Góra" @@ -5512,6 +5775,7 @@ msgstr "Nieznana wiadomość o ID: %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Nieznana wiadomość o ID: %d od gracza: %d Gracz wylatuje!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5524,6 +5788,8 @@ msgstr "" "Kontynuować?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5746,11 +6012,15 @@ msgstr "ŹródÅ‚o Wii NAND:" msgid "Wii Save Import" msgstr "Import zapisów Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Pliki zapisu Wii (*.bin)|*.bin" @@ -5781,11 +6051,15 @@ msgstr "" "lub zbyt dÅ‚ugi czas nieobecnoÅ›ci lub coÅ› innego.\n" "PoÅ‚Ä…czyć ponownie?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiilot poÅ‚Ä…czony" @@ -5817,6 +6091,7 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Zawijanie wierszy" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5826,6 +6101,11 @@ msgstr "Zawijanie wierszy" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "PracujÄ™..." diff --git a/Languages/po/pt.po b/Languages/po/pt.po index 62025d0da8..89c344c8b5 100644 --- a/Languages/po/pt.po +++ b/Languages/po/pt.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-07-23 15:53-0000\n" "Last-Translator: Zilaan \n" "Language-Team: Zilaan \n" @@ -560,6 +564,7 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painel" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -569,6 +574,11 @@ msgstr "Adicionar novo painel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Adicionar..." @@ -637,6 +647,7 @@ msgstr "Todas as imagens GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Todos os ficheiros Gamecube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -644,6 +655,10 @@ msgstr "Todos os ficheiros Gamecube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Todos os Estados Guardados (sav, s##)" @@ -733,11 +748,15 @@ msgstr "" "Tem a certeza que quer eliminar este ficheiro? Será eliminado " "permanentemente!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção de ecrã:" @@ -758,11 +777,15 @@ msgstr "Ãudio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -879,10 +902,14 @@ msgstr "Azul Direita" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Inferior" @@ -915,11 +942,15 @@ msgstr "Procurar por pasta de destino" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1168,10 +1199,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fechar" @@ -1280,11 +1315,15 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "A conectar..." @@ -1476,10 +1515,14 @@ msgstr "Motor de Emulador DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "Emulação de DSP HLE (rápido)" @@ -1710,11 +1753,15 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Deseja parar a emulação actual?" @@ -1743,6 +1790,7 @@ msgstr "Configuração da emulação de Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1758,6 +1806,14 @@ msgstr "Configuração de GCPad " #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Configuração de GCPad " + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS filmes (*.dtm)" @@ -1854,6 +1910,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1863,6 +1920,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Holandês" @@ -2007,21 +2069,31 @@ msgid "Enable Block Merging" msgstr "Activar Fusão de blocos" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Activar Cache" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Activar Cheats" @@ -2177,6 +2249,7 @@ msgstr "" msgid "End" msgstr "Fim" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2186,6 +2259,11 @@ msgstr "Fim" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Inglês" @@ -2215,6 +2293,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erro" @@ -2232,6 +2311,19 @@ msgid "Error" msgstr "Erro" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Erro" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2692,6 +2784,7 @@ msgstr "Quadros para Gravar" msgid "Free Look" msgstr "Vista Livre" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2701,6 +2794,11 @@ msgstr "Vista Livre" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Francês" @@ -2768,10 +2866,14 @@ msgstr "Definições de Comando &Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Cartões de memória Gamecube (*.raw,*.gcp)" @@ -2795,11 +2897,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -2808,6 +2915,7 @@ msgstr "Geral" msgid "General Settings" msgstr "Definições Gerais" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2817,6 +2925,11 @@ msgstr "Definições Gerais" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Alemão" @@ -2947,11 +3060,16 @@ msgstr "Configuração de Teclas de atalho" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Teclas de Atalho" @@ -3175,11 +3293,15 @@ msgid "" msgstr "" "InstallExceptionHandler chamado, mas esta plataforma ainda não a suporta." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "A Instalar WAD..." @@ -3261,6 +3383,7 @@ msgstr "Ficheiro de Gravação inválido" msgid "Invalid state" msgstr "Estado Inválido" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3270,6 +3393,11 @@ msgstr "Estado Inválido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italiano" @@ -3427,6 +3555,7 @@ msgstr "Carregar Estado Slot 8" msgid "Load State..." msgstr "Carregar Estado..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3440,6 +3569,13 @@ msgstr "Carregar Sistema de Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Carregar Sistema de Menu Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Sistema de Menu Wii %d%c" @@ -3521,11 +3657,15 @@ msgstr "MMU Hack de velocidade" msgid "MadCatz Gameshark files(*.gcs)" msgstr "ficheiros MadCatz Gameshark(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick Principal" @@ -3557,10 +3697,14 @@ msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Cartão de memória" @@ -3759,11 +3903,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3850,11 +3998,15 @@ msgstr "Não igual" msgid "Not Set" msgstr "Não definido" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Não conectado" @@ -3916,9 +4068,13 @@ msgstr "Apenas %d blocos disponíveis" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Abrir" @@ -4049,6 +4205,7 @@ msgstr "Patches" msgid "Paths" msgstr "Caminhos" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4056,6 +4213,10 @@ msgstr "Caminhos" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4076,12 +4237,17 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Começar" @@ -4107,11 +4273,15 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Por favor confirme..." @@ -4324,6 +4494,7 @@ msgstr "Actualizar Lista" msgid "Refresh game list" msgstr "Actualizar lista de Jogos" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4335,6 +4506,12 @@ msgstr "Actualizar lista de Jogos" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Remover" @@ -4354,9 +4531,13 @@ msgstr "Renderizar para a Janela Principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -4399,11 +4580,15 @@ msgstr "Gua&rdar Estado" msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Taxa de Amostragem:" @@ -4487,11 +4672,15 @@ msgstr "O filme de Savestate %s está corrupto, gravação de filme a parar..." msgid "Scaled EFB Copy" msgstr "Cópia EFB Escalada" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "A procurar %s" @@ -4531,6 +4720,7 @@ msgstr "Selecção %s não encontrada em SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4546,6 +4736,14 @@ msgstr "Seleccione o Ficheiro de Gravação" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Seleccione o Ficheiro de Gravação" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Seleccione um ficheiro Wii WAD para instalar" @@ -4571,6 +4769,7 @@ msgstr "Seleccionar janelas flutuantes" msgid "Select the file to load" msgstr "Seleccione o ficheiro para carregar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4583,15 +4782,22 @@ msgstr "Seleccione o estado para carregar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Seleccione o ficheiro de jogo guardado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Seleccione o estado para carregar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Seleccione o estado para gravar" @@ -4972,6 +5178,7 @@ msgstr "Criação do buffer de som falhou: %s" msgid "Space" msgstr "Espaço" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4981,6 +5188,11 @@ msgstr "Espaço" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Espanhol" @@ -5024,11 +5236,15 @@ msgstr "Stick quadrado" msgid "Standard Controller" msgstr "Comando padrão" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5064,9 +5280,13 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Parar" @@ -5144,9 +5364,13 @@ msgstr "Table Direita" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Tirar Screenshot" @@ -5398,18 +5622,26 @@ msgstr "Alternar Todos os Tipos de Relatório" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Alternar Ecrã Inteiro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Topo" @@ -5518,6 +5750,7 @@ msgstr "" "Mensagem desconhecida com a id:%d recebida pelo jogador:%d Excluindo o " "jogador!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5530,6 +5763,8 @@ msgstr "" "Continuar?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5755,11 +5990,15 @@ msgstr "Raiz de NAND Wii:" msgid "Wii Save Import" msgstr "Importação de Jogo Guardado Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin" @@ -5791,11 +6030,15 @@ msgstr "" "razão.\n" "Quer reconectar imediatamente?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Conectado" @@ -5828,6 +6071,7 @@ msgstr "Janelas Direita" msgid "Word Wrap" msgstr "Moldar o texto" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5837,6 +6081,11 @@ msgstr "Moldar o texto" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "A trabalhar..." @@ -6450,6 +6699,9 @@ msgstr "| OU" #~ msgstr "Começar a janela renderizada em ecrã inteiro" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -6457,8 +6709,11 @@ msgstr "| OU" #~ "Apontador desconhecido %#08x\n" #~ "Continuar?" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #~ msgid "Use FPS For Limiting" #~ msgstr "Usar FPS como limitador" diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index 8f2c968751..6dc3dd9b7b 100644 --- a/Languages/po/pt_BR.po +++ b/Languages/po/pt_BR.po @@ -8,12 +8,17 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-18 13:38-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-09-11 23:35-0300\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +"PO-Revision-Date: 2011-12-18 13:38-0600\n" +>>>>>>> Update from master branch. "Last-Translator: Runo \n" "Language-Team: Portuguese (BR) \n" "Language: \n" @@ -563,6 +568,7 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painél" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -572,6 +578,11 @@ msgstr "Adicionar novo painél" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Adicionar..." @@ -639,6 +650,7 @@ msgstr "Todas as imagens CG/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Todos os arquivos Gamecube CGM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -646,6 +658,10 @@ msgstr "Todos os arquivos Gamecube CGM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Todos os Pontos de Jogo Salvos (sav, s##)" @@ -735,11 +751,15 @@ msgstr "" "Você tem certeza que quer deletar este arquivo? Ele ficará perdido para " "sempre!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção:" @@ -760,11 +780,15 @@ msgstr "Backend de Audio" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -881,10 +905,14 @@ msgstr "Azul Direito" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Embaixo" @@ -917,11 +945,15 @@ msgstr "Procurar por um diretório de saída" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1126,11 +1158,15 @@ msgstr "Escolher um arquivo para abrir" msgid "Choose a memory card:" msgstr "Escolher um cartão de memória:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +>>>>>>> Update from master branch. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1173,10 +1209,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fechar" @@ -1285,11 +1325,15 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Conectando..." @@ -1406,11 +1450,15 @@ msgstr "Criar nova perspectiva" msgid "Created by KDE-Look.org" msgstr "Criado por KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +>>>>>>> Update from master branch. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1485,10 +1533,14 @@ msgstr "Engine de Emulação do DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "Emulação HLE do DSP (rápido)" @@ -1719,11 +1771,15 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Você quer parar a emulação atual?" @@ -1752,6 +1808,7 @@ msgstr "Configuração de Wiimote Emulado do Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1767,6 +1824,14 @@ msgstr "Configuração do GCPad do Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Configuração do GCPad do Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmes TAS Dolphin (*.dtm)" @@ -1778,11 +1843,15 @@ msgstr "Configuração de Wiimote Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin no &Google Code" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +>>>>>>> Update from master branch. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1790,11 +1859,15 @@ msgstr "" "Dolphin não pôde encontrar ISOs GC/Wii. Duplo-clique aqui para procurar por " "arquivos..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +>>>>>>> Update from master branch. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1870,6 +1943,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1879,6 +1953,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Holandês" @@ -2023,21 +2102,31 @@ msgid "Enable Block Merging" msgstr "Ativar Block Merging" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Ativar Cache" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Ativar Cheats" @@ -2137,11 +2226,15 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update from master branch. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2197,6 +2290,7 @@ msgstr "" msgid "End" msgstr "Fim" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2206,6 +2300,11 @@ msgstr "Fim" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "Inglês" @@ -2235,6 +2334,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erro" @@ -2252,11 +2352,34 @@ msgid "Error" msgstr "Erro" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Erro" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema." #: Source/Core/Common/Src/ChunkFile.h:180 +<<<<<<< HEAD +======= +#, c-format +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +>>>>>>> Update from master branch. #, c-format msgid "" <<<<<<< HEAD @@ -2711,6 +2834,7 @@ msgstr "QUadros para Capturar" msgid "Free Look" msgstr "Olhar Livre" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2720,6 +2844,11 @@ msgstr "Olhar Livre" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "Francês" @@ -2787,10 +2916,14 @@ msgstr "Configurações de &Controle de Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Memory Cards do Gamecube (*.raw,*.gcp)" @@ -2814,11 +2947,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -2827,6 +2965,7 @@ msgstr "Geral" msgid "General Settings" msgstr "Configurações Gerais" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2836,6 +2975,11 @@ msgstr "Configurações Gerais" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Alemão" @@ -2967,11 +3111,16 @@ msgstr "Configuração de hotkey" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Hotkeys" @@ -3051,11 +3200,15 @@ msgstr "" "Se a taxa de FPS estiver instável, esta opção pode ajudar. (ON = Compatível, " "OFF = Rápido)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +>>>>>>> Update from master branch. msgid "" "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." @@ -3199,11 +3352,15 @@ msgstr "" "InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem " "suporte a ele." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "Instalando WAD..." @@ -3285,6 +3442,7 @@ msgstr "Arquivo de gravação inválido" msgid "Invalid state" msgstr "Estado Salvo Inválido" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3294,6 +3452,11 @@ msgstr "Estado Salvo Inválido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italiano" @@ -3451,6 +3614,7 @@ msgstr "Carregar Estado do Slot 8" msgid "Load State..." msgstr "Carregar State..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3464,6 +3628,13 @@ msgstr "Carregar Menu de Sistema do Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Carregar Menu de Sistema do Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Menu de Sistema do Wii %d %c" @@ -3546,11 +3717,15 @@ msgstr "Hack de velocidade MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Arquivos de Gameshark MadCatz(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Analógico Principal" @@ -3582,10 +3757,14 @@ msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Cartão de memoria" @@ -3784,11 +3963,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3875,11 +4058,15 @@ msgstr "Não igual" msgid "Not Set" msgstr "Indefinido" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Não conectado" @@ -3941,9 +4128,13 @@ msgstr "Apenas %d blocos disponíveis" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Abrir" @@ -4074,6 +4265,7 @@ msgstr "Patches" msgid "Paths" msgstr "Diretórios" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4081,6 +4273,10 @@ msgstr "Diretórios" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausar" @@ -4101,12 +4297,17 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Executar" @@ -4132,11 +4333,15 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "Favor confirmar..." @@ -4347,6 +4552,7 @@ msgstr "Atualizar Lista" msgid "Refresh game list" msgstr "Atualizar a lista de jogos" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4358,6 +4564,12 @@ msgstr "Atualizar a lista de jogos" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Remover" @@ -4377,9 +4589,13 @@ msgstr "Renderizar na Janela Principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -4422,11 +4638,15 @@ msgstr "Sal&var estado atual" msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "Taxa de Amostragem:" @@ -4510,11 +4730,15 @@ msgstr "O Estado Salvo capturado %s está corrompido, parando captura..." msgid "Scaled EFB Copy" msgstr "Cópia Escalada do EFB" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, c-format msgid "Scanning %s" msgstr "Escaneando %s" @@ -4554,6 +4778,7 @@ msgstr "A seção %s não foi encontrada no SYSCONF" msgid "Select" msgstr "Selecionar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4569,6 +4794,14 @@ msgstr "Selecione o arquivo de Gravação" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Selecione o arquivo de Gravação" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "Selecione um arquivo WAD de Wii para instalar" @@ -4593,6 +4826,7 @@ msgstr "Selecionar Janelas flutuantes" msgid "Select the file to load" msgstr "Selecione um arquivo para carregar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4605,15 +4839,22 @@ msgstr "Selecione um estado para carregar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Selecione o arquivo de salva" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Selecione um estado para carregar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Selecione um estado para salvar" @@ -4687,11 +4928,15 @@ msgstr "Separador" msgid "Serbian" msgstr "Sérvio" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +>>>>>>> Update from master branch. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4998,6 +5243,7 @@ msgstr "Falha na criação do buffer de som: %s" msgid "Space" msgstr "Barra de Espaço" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -5007,6 +5253,11 @@ msgstr "Barra de Espaço" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Espanhol" @@ -5050,11 +5301,15 @@ msgstr "Analógico Quadrado" msgid "Standard Controller" msgstr "Controle Padrão" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5090,9 +5345,13 @@ msgstr "Analógico" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Parar" @@ -5170,9 +5429,13 @@ msgstr "Direita da Mesa" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Capturar Tela" @@ -5421,18 +5684,26 @@ msgstr "Ligar/Desligar Todos os Logs" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Ir para Tela Cheia" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Topo" @@ -5545,6 +5816,7 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/Memmap.cpp:633 #, c-format msgid "" @@ -5554,6 +5826,8 @@ msgid "" msgstr "" "Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!" +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5779,11 +6053,15 @@ msgstr "Raiz do Wii NAND" msgid "Wii Save Import" msgstr "Importar Save de Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Arquivos de Salva do Wii (*.bin)|*.bin" @@ -5814,11 +6092,15 @@ msgstr "" "ou talvez tenha sido pelo tempo parado ou por outra razão.\n" "Você quer reconectar imediatamente?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Conectado" @@ -5850,6 +6132,7 @@ msgstr "Janelas da Direita" msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5859,6 +6142,11 @@ msgstr "Word Wrap" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Funcionando..." diff --git a/Languages/po/ru.po b/Languages/po/ru.po index 02636c4777..31745e4349 100644 --- a/Languages/po/ru.po +++ b/Languages/po/ru.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-01-20 14:40+0300\n" "Last-Translator: firnis \n" "Language-Team: Russian <>\n" @@ -543,6 +547,7 @@ msgstr "Добавление патча" msgid "Add new pane" msgstr "Добавить панель" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -552,6 +557,11 @@ msgstr "Добавить панель" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Добавить..." @@ -606,6 +616,7 @@ msgstr "Ð’Ñе образа от GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Ð’Ñе GCM-файлы Gamecube (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -613,6 +624,10 @@ msgstr "Ð’Ñе GCM-файлы Gamecube (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "Файлы быÑтрых Ñохранений (sav, s##)" @@ -693,11 +708,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Ð’Ñ‹ уверены, что хотите удалить Ñтот файл? Он иÑчезнет навÑегда!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Соотношение Ñторон:" @@ -719,11 +738,15 @@ msgstr "СиÑтема вывода" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ ÑƒÑтройÑтва вывода звука.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Ðвто" @@ -839,10 +862,14 @@ msgstr "СинÑÑ Ñправа" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Ñнизу" @@ -875,11 +902,15 @@ msgstr "Укажите папку Ð´Ð»Ñ ÑохранениÑ" msgid "Buffer:" msgstr "Буфер:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1114,10 +1145,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Закрыть" @@ -1227,11 +1262,15 @@ msgstr "Подключить Wiimote 3" msgid "Connect Wiimote 4" msgstr "Подключить Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Подключение..." @@ -1418,10 +1457,14 @@ msgstr "Режим ÑмулÑции CPU" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1637,11 +1680,15 @@ msgstr "" msgid "Divide" msgstr "/" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "Ð’Ñ‹ хотите оÑтановить ÑмулÑцию?" @@ -1671,6 +1718,7 @@ msgstr "ÐаÑтройки Ñмулируемого Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1686,6 +1734,14 @@ msgstr "ÐаÑтройки Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "ÐаÑтройки Dolphin GCPad" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1773,6 +1829,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1782,6 +1839,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. #, fuzzy msgid "Dutch" msgstr "Dutch" @@ -1910,22 +1972,32 @@ msgid "Enable Block Merging" msgstr "Включить Ñовмещение блоков" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "кÑшировать" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "Включить чит-коды" @@ -2066,6 +2138,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2075,6 +2148,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. #, fuzzy msgid "English" msgstr "English" @@ -2105,6 +2183,7 @@ msgstr "Равно" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Ошибки" @@ -2122,6 +2201,19 @@ msgid "Error" msgstr "Ошибки" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Ошибки" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Ошибка загрузки выбранного Ñзыка. ВозвращаемÑÑ Ðº Ñтандартному." @@ -2556,6 +2648,7 @@ msgstr "" msgid "Free Look" msgstr "Свободный обзор" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2565,6 +2658,11 @@ msgstr "Свободный обзор" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. #, fuzzy msgid "French" msgstr "French" @@ -2635,10 +2733,14 @@ msgstr "Опции &контроллера Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Файлы карт памÑти Gamecube (*.raw,*.gcp)" @@ -2660,11 +2762,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Общие" @@ -2674,6 +2781,7 @@ msgstr "Общие" msgid "General Settings" msgstr "ÐаÑтройки интерфейÑа" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2683,6 +2791,11 @@ msgstr "ÐаÑтройки интерфейÑа" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. #, fuzzy msgid "German" msgstr "German" @@ -2811,11 +2924,16 @@ msgstr "ÐаÑтройка \"горÑчих\" клавиш" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "Клавиши" @@ -3032,11 +3150,15 @@ msgid "" msgstr "" "Вызван InstallExceptionHandler, но ваша платформа его еще не поддерживает." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. #, fuzzy msgid "Installing WAD..." msgstr "УÑтанавливаетÑÑ WAD в меню Wii..." @@ -3121,6 +3243,7 @@ msgstr "Ðеверный файл запиÑи" msgid "Invalid state" msgstr "Ðеверное Ñохранение" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3130,6 +3253,11 @@ msgstr "Ðеверное Ñохранение" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. #, fuzzy msgid "Italian" msgstr "Italian" @@ -3295,20 +3423,28 @@ msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" msgid "Load State..." msgstr "Загрузить игру..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +>>>>>>> Update from master branch. #, fuzzy msgid "Load Wii System Menu" msgstr "Загрузить Wii System Menu (%d %c)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Загрузить Wii System Menu (%d %c)" @@ -3392,11 +3528,15 @@ msgstr "УÑкорить MMU (Ñпидхак)" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Файлы Gameshark MadCatz (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3429,10 +3569,14 @@ msgstr "Па&мÑÑ‚ÑŒ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "Карта памÑти" @@ -3610,11 +3754,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Вверх" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3703,11 +3851,15 @@ msgstr "Ðе равно" msgid "Not Set" msgstr "ÐеизвеÑтно" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "Ðе подключено" @@ -3769,9 +3921,13 @@ msgstr "ДоÑтупно только %d блоков" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Открыть" @@ -3897,6 +4053,7 @@ msgstr "Патчи" msgid "Paths" msgstr "Папки" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3904,6 +4061,10 @@ msgstr "Папки" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Пауза" @@ -3925,12 +4086,17 @@ msgstr "Точка %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "ЗапуÑк" @@ -3958,11 +4124,15 @@ msgstr "Опции" msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "" @@ -4187,6 +4357,7 @@ msgstr "&Обновить ÑпиÑок игр" msgid "Refresh game list" msgstr "Обновление ÑпиÑка игр" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4198,6 +4369,12 @@ msgstr "Обновление ÑпиÑка игр" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "Удалить" @@ -4217,9 +4394,13 @@ msgstr "Выводить изображение в главное окно" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð½Ð°Ñтроек" @@ -4262,11 +4443,15 @@ msgstr "БыÑтрое &Ñохранение" msgid "Safe" msgstr "безопаÑное" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. #, fuzzy msgid "Sample Rate:" msgstr "ЧаÑтота" @@ -4359,11 +4544,15 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Scanning %s" msgstr "ПоиÑк..." @@ -4403,6 +4592,7 @@ msgstr "Ð¡ÐµÐºÑ†Ð¸Ñ %s не найдена в SYSCONF" msgid "Select" msgstr "Выбрать" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4418,6 +4608,14 @@ msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи игрового проц #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи игрового процеÑÑа" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð°" @@ -4444,6 +4642,7 @@ msgstr "" msgid "Select the file to load" msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4456,15 +4655,22 @@ msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Выберите файл Ñохранений Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Выберите или укажите файл Ð´Ð»Ñ Ð±Ñ‹Ñтрого ÑохранениÑ" @@ -4825,6 +5031,7 @@ msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð°ÑƒÐ´Ð¸Ð¾-буфера %s." msgid "Space" msgstr "Пробел" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4834,6 +5041,11 @@ msgstr "Пробел" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. #, fuzzy msgid "Spanish" msgstr "Spanish" @@ -4871,11 +5083,15 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4913,9 +5129,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Стоп" @@ -4988,9 +5208,13 @@ msgstr "ÐŸÑ€Ð°Ð²Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Сделать Ñкриншот" @@ -5236,18 +5460,26 @@ msgstr "Включить вÑе" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Включение полноÑкранного режима" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "Ñверху" @@ -5351,6 +5583,7 @@ msgstr "Получено неизвеÑтное Ñообщение Ñ id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Получено неизвеÑтное Ñообщение Ñ id : %d от игрока:%d Игрок выкинут!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5363,6 +5596,8 @@ msgstr "" "Продолжить?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5573,11 +5808,15 @@ msgstr "DVD-диÑк:" msgid "Wii Save Import" msgstr "Импорт Ñохранений Wii" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Файлы Ñохранений Wii (*.bin)|*.bin" @@ -5604,11 +5843,15 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote подключен" @@ -5644,6 +5887,7 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ñтрок" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5653,6 +5897,11 @@ msgstr "ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ñтрок" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Подождите..." diff --git a/Languages/po/sr.po b/Languages/po/sr.po index 098435044b..c90b7828e7 100644 --- a/Languages/po/sr.po +++ b/Languages/po/sr.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-03-02 21:58+0100\n" "Last-Translator: nikolassj\n" "Language-Team: \n" @@ -512,6 +516,7 @@ msgstr "Dodaj Patch " msgid "Add new pane" msgstr "Dodaj nova okna" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -521,6 +526,11 @@ msgstr "Dodaj nova okna" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "Dodaj..." @@ -574,6 +584,7 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -581,6 +592,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "" @@ -660,11 +675,15 @@ msgstr "" 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!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -685,11 +704,15 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -801,10 +824,14 @@ msgstr "Blue right " #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "Donji deo/dno" @@ -837,11 +864,15 @@ msgstr "" msgid "Buffer:" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1069,10 +1100,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Zatvori" @@ -1181,11 +1216,15 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "Povezivanje..." @@ -1361,10 +1400,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1576,11 +1619,15 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1610,6 +1657,7 @@ msgstr "" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1625,6 +1673,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1707,6 +1763,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1716,6 +1773,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "" @@ -1839,21 +1901,31 @@ msgid "Enable Block Merging" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "" @@ -1979,6 +2051,7 @@ msgstr "" msgid "End" msgstr "Kraj" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -1988,6 +2061,11 @@ msgstr "Kraj" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "" @@ -2017,6 +2095,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -2034,6 +2113,19 @@ msgid "Error" msgstr "Error" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Error" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2450,6 +2542,7 @@ msgstr "" msgid "Free Look" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2459,6 +2552,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "" @@ -2527,10 +2625,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2552,11 +2654,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2566,6 +2673,7 @@ msgstr "" msgid "General Settings" msgstr "Opcije Uredjaja " +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2575,6 +2683,11 @@ msgstr "Opcije Uredjaja " #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "Nemacki " @@ -2692,11 +2805,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "" @@ -2892,11 +3010,15 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "" @@ -2974,6 +3096,7 @@ msgstr "" msgid "Invalid state" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -2983,6 +3106,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italianski " @@ -3134,20 +3262,28 @@ msgstr "Ucitaj State Slot 8" msgid "Load State..." msgstr "Ucitaj State" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +>>>>>>> Update from master branch. #, fuzzy msgid "Load Wii System Menu" msgstr "Ucitaj Wii Sistem Meni (%d %c)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Ucitaj Wii Sistem Meni (%d %c)" @@ -3224,11 +3360,15 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3261,10 +3401,14 @@ msgstr "&Memorija" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "" @@ -3441,11 +3585,15 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3532,11 +3680,15 @@ msgstr "" msgid "Not Set" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "" @@ -3598,9 +3750,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "Otvori " @@ -3726,6 +3882,7 @@ msgstr "" msgid "Paths" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3733,6 +3890,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pauza " @@ -3754,12 +3915,17 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "Pokreni " @@ -3786,11 +3952,15 @@ msgstr "Opcije " msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "" @@ -3998,6 +4168,7 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4009,6 +4180,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "" @@ -4025,9 +4202,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset/Restart " @@ -4070,11 +4251,15 @@ msgstr "" msgid "Safe" msgstr "Siguran " +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "" @@ -4158,11 +4343,15 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Scanning %s" msgstr "Skeniranje..." @@ -4202,6 +4391,7 @@ msgstr "" msgid "Select" msgstr "Izaberi " +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4217,6 +4407,14 @@ msgstr "Izaberi Snimani fajl" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Izaberi Snimani fajl" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje " @@ -4243,6 +4441,7 @@ msgstr "" msgid "Select the file to load" msgstr "Izaberi fajl za ucitavanje " +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4255,15 +4454,22 @@ msgstr "Izaberi state za ucitavanje " #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "Izaberi \"snimani fajl/the save state\"" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Izaberi state za ucitavanje " +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "Izaberi state za snimanje/save" @@ -4599,6 +4805,7 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4608,6 +4815,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "" @@ -4643,11 +4855,15 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4683,9 +4899,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr " Zaustavi" @@ -4758,9 +4978,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "" @@ -4975,18 +5199,26 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "" @@ -5088,6 +5320,7 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5098,6 +5331,8 @@ msgid "" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5305,11 +5540,15 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5336,11 +5575,15 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "" @@ -5373,6 +5616,7 @@ msgstr "" msgid "Word Wrap" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5382,6 +5626,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "Radi..." diff --git a/Languages/po/zh_CN.po b/Languages/po/zh_CN.po index 331fbb422d..4a55b8ea04 100644 --- a/Languages/po/zh_CN.po +++ b/Languages/po/zh_CN.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-01-09 13:55-0800\n" "Last-Translator: thegfw \n" "Language-Team: \n" @@ -540,6 +544,7 @@ msgstr "添加补ä¸" msgid "Add new pane" msgstr "添加新é¢æ¿" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -549,6 +554,11 @@ msgstr "添加新é¢æ¿" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "添加..." @@ -602,6 +612,7 @@ msgstr "所有 GC/Wii é•œåƒ (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 文件 (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -609,6 +620,10 @@ msgstr "所有 Gamecube GCM 文件 (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "æ‰€æœ‰å­˜æ¡£çŠ¶æ€ (sav, s##)" @@ -689,11 +704,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "请确认真的è¦åˆ é™¤è¿™äº›æ–‡ä»¶?这将是永久性的删除!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "高宽比:" @@ -714,11 +733,15 @@ msgstr "音频åŽç«¯:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: 打开 AO 设备错误.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自动" @@ -831,10 +854,14 @@ msgstr "è“ å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "底部" @@ -867,11 +894,15 @@ msgstr "æµè§ˆè¾“出目录" msgid "Buffer:" msgstr "缓冲区:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1107,10 +1138,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "关闭" @@ -1220,11 +1255,15 @@ msgstr "连接 Wiimote 3" msgid "Connect Wiimote 4" msgstr "连接 Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "连接中..." @@ -1411,10 +1450,14 @@ msgstr "音频模拟引擎" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "音频 HLE 模拟(很快)" @@ -1634,11 +1677,15 @@ msgstr "按模拟器显示输入读å–" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "您确定是å¦åœæ­¢å½“å‰æ¨¡æ‹Ÿ?" @@ -1668,6 +1715,7 @@ msgstr "Dolphin 模拟 Wiimote 设置" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1683,6 +1731,14 @@ msgstr "Dolphin GC 手柄设置" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC 手柄设置" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 电影 (*.dtm)" @@ -1766,6 +1822,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1775,6 +1832,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "è·å…°è¯­" @@ -1903,22 +1965,32 @@ msgid "Enable Block Merging" msgstr "å¯ç”¨åŒºå—åˆå¹¶" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "å¯ç”¨ç¼“å­˜" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "å¯ç”¨ä½œå¼Š" @@ -2053,6 +2125,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2062,6 +2135,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "英语" @@ -2091,6 +2169,7 @@ msgstr "等于" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "错误" @@ -2108,6 +2187,19 @@ msgid "Error" msgstr "错误" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "错误" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Error loading selected language. Falling back to system default." @@ -2562,6 +2654,7 @@ msgstr "" msgid "Free Look" msgstr "自由视点" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2571,6 +2664,11 @@ msgstr "自由视点" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "法语" @@ -2639,10 +2737,14 @@ msgstr "Gamecube 手柄设置(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube å†…å­˜å¡ (*.raw,*.gcp)" @@ -2666,11 +2768,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "常规" @@ -2680,6 +2787,7 @@ msgstr "常规" msgid "General Settings" msgstr "ç•Œé¢è®¾ç½®" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2689,6 +2797,11 @@ msgstr "ç•Œé¢è®¾ç½®" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "德语" @@ -2811,11 +2924,16 @@ msgstr "热键设置" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "热键" @@ -3025,11 +3143,15 @@ msgid "" msgstr "" "InstallExceptionHandler called, but this platform does not yet support it." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. #, fuzzy msgid "Installing WAD..." msgstr "安装 WAD 到 Wii èœå•ä¸­..." @@ -3114,6 +3236,7 @@ msgstr "无效录制文件" msgid "Invalid state" msgstr "Invalid state" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3123,6 +3246,11 @@ msgstr "Invalid state" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "æ„大利语" @@ -3281,20 +3409,28 @@ msgstr "载入存档æ’槽 8" msgid "Load State..." msgstr "载入状æ€..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +>>>>>>> Update from master branch. #, fuzzy msgid "Load Wii System Menu" msgstr "载入 Wii 系统èœå•(%d %c)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "载入 Wii 系统èœå•(%d %c)" @@ -3375,11 +3511,15 @@ msgstr "MMU 速度破解" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark 文件(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "主摇æ†" @@ -3412,10 +3552,14 @@ msgstr "内存(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "内存å¡" @@ -3599,11 +3743,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3691,11 +3839,15 @@ msgstr "ä¸ç­‰äºŽ" msgid "Not Set" msgstr "未设置" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "未连接" @@ -3757,9 +3909,13 @@ msgstr "åªæœ‰ %d 区å—有效" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "打开" @@ -3890,6 +4046,7 @@ msgstr "è¡¥ä¸" msgid "Paths" msgstr "路径" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3897,6 +4054,10 @@ msgstr "路径" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "æš‚åœ" @@ -3918,12 +4079,17 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "开始" @@ -3950,11 +4116,15 @@ msgstr "选项" msgid "Players" msgstr "玩家" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "请确认..." @@ -4169,6 +4339,7 @@ msgstr "刷新列表" msgid "Refresh game list" msgstr "刷新游æˆåˆ—表" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4180,6 +4351,12 @@ msgstr "刷新游æˆåˆ—表" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "移除" @@ -4199,9 +4376,13 @@ msgstr "附加到主窗å£" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "é‡ç½®" @@ -4244,11 +4425,15 @@ msgstr "ä¿å­˜çŠ¶æ€(&V)" msgid "Safe" msgstr "安全" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "采样率:" @@ -4333,11 +4518,15 @@ msgstr "Savestate movie %s is corrupted, movie recording stopping..." msgid "Scaled EFB Copy" msgstr "EFB 比例å¤åˆ¶" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Scanning %s" msgstr "扫æ中..." @@ -4377,6 +4566,7 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "选择" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4392,6 +4582,14 @@ msgstr "选择录制文件" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "选择录制文件" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "选择è¦å¯¼å…¥çš„存档" @@ -4418,6 +4616,7 @@ msgstr "选择浮动窗å£" msgid "Select the file to load" msgstr "选择è¦è½½å…¥çš„文件" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4430,15 +4629,22 @@ msgstr "选择è¦è½½å…¥çš„状æ€" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "选择一个存档文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "选择è¦è½½å…¥çš„状æ€" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "选择è¦ä¿å­˜çš„状æ€" @@ -4787,6 +4993,7 @@ msgstr "声音缓冲区创建失败: %s" msgid "Space" msgstr "空格" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4796,6 +5003,11 @@ msgstr "空格" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "西ç­ç‰™è¯­" @@ -4831,11 +5043,15 @@ msgstr "æ–¹å—é”®" msgid "Standard Controller" msgstr "标准控制器" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4871,9 +5087,13 @@ msgstr "摇æ†" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "åœæ­¢" @@ -4947,9 +5167,13 @@ msgstr "Table Right" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "å±å¹•æˆªå›¾(&T)" @@ -5186,18 +5410,26 @@ msgstr "切æ¢æ‰€æœ‰æ—¥å¿—类型" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "切æ¢å…¨å±" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "顶部" @@ -5301,6 +5533,7 @@ msgstr "Unknown message received with id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Unknown message with id:%d received from player:%d Kicking player!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5313,6 +5546,8 @@ msgstr "" "继续?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5523,11 +5758,15 @@ msgstr "DVD 根目录:" msgid "Wii Save Import" msgstr "导入 Wii 存档" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存档文件 (*.bin)|*.bin" @@ -5558,11 +5797,15 @@ msgstr "" "or maybe it is due to idle time out or other reason.\n" "Do you want to reconnect immediately?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote 已连接" @@ -5595,6 +5838,7 @@ msgstr "窗å£å³ä¾§" msgid "Word Wrap" msgstr "自动æ¢è¡Œ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5604,6 +5848,11 @@ msgstr "自动æ¢è¡Œ" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "工作中..." diff --git a/Languages/po/zh_TW.po b/Languages/po/zh_TW.po index ab270c846f..d171170136 100644 --- a/Languages/po/zh_TW.po +++ b/Languages/po/zh_TW.po @@ -8,10 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Update from master branch. "PO-Revision-Date: 2011-03-15 02:51+0800\n" "Last-Translator: khiav \n" "Language-Team: khiav&yrbn \n" @@ -540,6 +544,7 @@ msgstr "新增修正" msgid "Add new pane" msgstr "新增é¢ç‰ˆ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -549,6 +554,11 @@ msgstr "新增é¢ç‰ˆ" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Update from master branch. msgid "Add..." msgstr "新增..." @@ -615,6 +625,7 @@ msgstr "所有 GC/Wii 映åƒæª” (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 檔案 (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -622,6 +633,10 @@ msgstr "所有 Gamecube GCM 檔案 (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Update from master branch. msgid "All Save States (sav, s##)" msgstr "所有å³æ™‚存檔 (sav, s##)" @@ -702,11 +717,15 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "是å¦çœŸçš„è¦åˆªé™¤é€™äº›æª”案？刪了之後就回ä¸ä¾†äº†å“¦ï¼" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "ç•«é¢æ¯”例：" @@ -727,11 +746,15 @@ msgstr "è²éŸ³è£ç½®ï¼š" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon：開啟 AO è£ç½®å‡ºéŒ¯ã€‚\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" @@ -844,10 +867,14 @@ msgstr "è— å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update from master branch. msgid "Bottom" msgstr "下方" @@ -880,11 +907,15 @@ msgstr "ç€è¦½è¼¸å‡ºçš„資料夾" msgid "Buffer:" msgstr "ç·©è¡ï¼š" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1116,10 +1147,14 @@ msgstr "在éŠæˆ²åŸ·è¡Œæ™‚客戶端斷開連接ï¼ï¼ç¶²è·¯å°æˆ°å·²ç¶“被關閉 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "關閉" @@ -1229,11 +1264,15 @@ msgstr "連接 Wiimote 3" msgid "Connect Wiimote 4" msgstr "連接 Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update from master branch. msgid "Connecting..." msgstr "正在連接..." @@ -1419,10 +1458,14 @@ msgstr "DSP 模擬引擎" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Update from master branch. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE 模擬器 (å¿«)" @@ -1642,11 +1685,15 @@ msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Update from master branch. msgid "Do you want to stop the current emulation?" msgstr "您è¦åœæ­¢ç›®å‰çš„模擬嗎？" @@ -1676,6 +1723,7 @@ msgstr "Dolphin 模擬 Wiimote 設定" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1691,6 +1739,14 @@ msgstr "Dolphin GC 控制器設定" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC 控制器設定" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Update from master branch. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 影片 (*.dtm)" @@ -1774,6 +1830,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1783,6 +1840,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update from master branch. msgid "Dutch" msgstr "Dutch" @@ -1909,22 +1971,32 @@ msgid "Enable Block Merging" msgstr "é–‹å•Ÿå¡Šåˆä½µ" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "é–‹å•Ÿå¿«å–" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Update from master branch. msgid "Enable Cheats" msgstr "開啟作弊" @@ -2056,6 +2128,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2065,6 +2138,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update from master branch. msgid "English" msgstr "English" @@ -2094,6 +2172,7 @@ msgstr "等於" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "錯誤" @@ -2111,6 +2190,19 @@ msgid "Error" msgstr "錯誤" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "錯誤" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" + +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "讀å–é¸æ“‡çš„語系出錯。返回使用系統é è¨­å€¼ã€‚" @@ -2563,6 +2655,7 @@ msgstr "" msgid "Free Look" msgstr "自由視點" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2572,6 +2665,11 @@ msgstr "自由視點" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update from master branch. msgid "French" msgstr "French" @@ -2640,10 +2738,14 @@ msgstr "Gamecube 控制器設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Update from master branch. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube è¨˜æ†¶å¡ (*.raw,*.gcp)" @@ -2667,11 +2769,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -2681,6 +2788,7 @@ msgstr "一般" msgid "General Settings" msgstr "ç•Œé¢è¨­å®š" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2690,6 +2798,11 @@ msgstr "ç•Œé¢è¨­å®š" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update from master branch. msgid "German" msgstr "German" @@ -2812,11 +2925,16 @@ msgstr "å¿«æ·éµè¨­å®š" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Update from master branch. msgid "Hotkeys" msgstr "å¿«æ·éµ" @@ -3018,11 +3136,15 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "調用 InstallExceptionHandler，但是這個平å°å°šæœªæ”¯æ´æ­¤åŠŸèƒ½ã€‚" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Update from master branch. msgid "Installing WAD..." msgstr "æ­£åœ¨å®‰è£ WAD 至 Wii é¸å–®..." @@ -3106,6 +3228,7 @@ msgstr "無效的錄åƒæª”" msgid "Invalid state" msgstr "無效的狀態" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3115,6 +3238,11 @@ msgstr "無效的狀態" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Update from master branch. msgid "Italian" msgstr "Italian" @@ -3273,20 +3401,28 @@ msgstr "讀å–儲存格 8" msgid "Load State..." msgstr "讀å–進度檔..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +>>>>>>> Update from master branch. #, fuzzy msgid "Load Wii System Menu" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Update from master branch. #, c-format msgid "Load Wii System Menu %d%c" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" @@ -3367,11 +3503,15 @@ msgstr "MMU 速度修正" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark 檔案(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "主æ–æ¡¿" @@ -3404,10 +3544,14 @@ msgstr "記憶å¡(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Update from master branch. msgid "Memory Card" msgstr "記憶å¡" @@ -3591,11 +3735,15 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3683,11 +3831,15 @@ msgstr "ä¸ç›¸ç­‰" msgid "Not Set" msgstr "未設定" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Update from master branch. msgid "Not connected" msgstr "未連接" @@ -3749,9 +3901,13 @@ msgstr "僅 %d 個å€å¡Šå¯ç”¨" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Update from master branch. msgid "Open" msgstr "é–‹å•Ÿ" @@ -3880,6 +4036,7 @@ msgstr "修正" msgid "Paths" msgstr "路徑" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -3887,6 +4044,10 @@ msgstr "路徑" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "æš«åœ" @@ -3908,12 +4069,17 @@ msgstr "ç‰ˆå¼ %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Update from master branch. msgid "Play" msgstr "執行" @@ -3940,11 +4106,15 @@ msgstr "é¸é …" msgid "Players" msgstr "玩家" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Update from master branch. msgid "Please confirm..." msgstr "請確èª..." @@ -4158,6 +4328,7 @@ msgstr "更新列表" msgid "Refresh game list" msgstr "æ›´æ–°éŠæˆ²åˆ—表" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4169,6 +4340,12 @@ msgstr "æ›´æ–°éŠæˆ²åˆ—表" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Update from master branch. msgid "Remove" msgstr "移除" @@ -4188,9 +4365,13 @@ msgstr "渲染至主視窗" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "é‡ç½®" @@ -4233,11 +4414,15 @@ msgstr "儲存進度(&V)" msgid "Safe" msgstr "安全" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Update from master branch. msgid "Sample Rate:" msgstr "å–樣率：" @@ -4322,11 +4507,15 @@ msgstr "儲存的影片 %s 是æ毀的，影片錄製åœæ­¢..." msgid "Scaled EFB Copy" msgstr "EFB 縮放複製" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Update from master branch. #, fuzzy, c-format msgid "Scanning %s" msgstr "正在掃瞄..." @@ -4366,6 +4555,7 @@ msgstr "é …ç›® %s 在 SYSCONF 中找ä¸åˆ°" msgid "Select" msgstr "é¸æ“‡" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4381,6 +4571,14 @@ msgstr "é¸æ“‡å·²éŒ„製的檔案" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "é¸æ“‡å·²éŒ„製的檔案" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Update from master branch. msgid "Select a Wii WAD file to install" msgstr "é¸æ“‡è¦å®‰è£çš„ Wii WAD" @@ -4406,6 +4604,7 @@ msgstr "é¸æ“‡æµ®å‹•è¦–窗" msgid "Select the file to load" msgstr "é¸æ“‡è¦è®€å–的檔案" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4418,15 +4617,22 @@ msgstr "é¸æ“‡è¦è®€å–的進度" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Update from master branch. msgid "Select the save file" msgstr "é¸æ“‡å­˜æª”" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "é¸æ“‡è¦è®€å–的進度" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Update from master branch. msgid "Select the state to save" msgstr "é¸æ“‡è¦å„²å­˜çš„進度" @@ -4774,6 +4980,7 @@ msgstr "è²éŸ³ç·©è¡å»ºç«‹å¤±æ•—：%s" msgid "Space" msgstr "Space" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4783,6 +4990,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Update from master branch. msgid "Spanish" msgstr "Spanish" @@ -4818,11 +5030,15 @@ msgstr "Square Stick" msgid "Standard Controller" msgstr "標準控制器" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4858,9 +5074,13 @@ msgstr "æ–æ¡¿" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "åœæ­¢" @@ -4934,9 +5154,13 @@ msgstr "Table å³" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "截å–ç•«é¢" @@ -5163,18 +5387,26 @@ msgstr "å…¨é¸/全部å–消" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "切æ›å…¨èž¢å¹•" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Update from master branch. msgid "Top" msgstr "上方" @@ -5278,6 +5510,7 @@ msgstr "接收到帶有未知 id 的錯誤訊æ¯ï¼š%d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "知訊æ¯å¸¶æœ‰ id:%d 接收於玩家:%d 正在æ出玩家ï¼" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5290,6 +5523,8 @@ msgstr "" "是å¦ç¹¼çºŒï¼Ÿ" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5500,11 +5735,15 @@ msgstr "DVD 根：" msgid "Wii Save Import" msgstr "匯入 Wii 存檔" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Update from master branch. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存檔 (*.bin)|*.bin" @@ -5535,11 +5774,15 @@ msgstr "" "或閒置的時間太久。\n" "是å¦è¦é‡æ–°é€£æŽ¥ï¼Ÿ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote 已連接" @@ -5572,6 +5815,7 @@ msgstr "視窗 å³" msgid "Word Wrap" msgstr "自動æ›è¡Œ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5581,6 +5825,11 @@ msgstr "自動æ›è¡Œ" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Update from master branch. msgid "Working..." msgstr "執行中..." From 685d02c0a607b241437ac1c758aeb23f0c6adcbd Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 27 Dec 2011 08:37:26 -0600 Subject: [PATCH 352/381] Clean up Turkish translation file. --- Languages/po/tr.po | 417 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 322 insertions(+), 95 deletions(-) diff --git a/Languages/po/tr.po b/Languages/po/tr.po index fe4f784856..a3e5d84924 100644 --- a/Languages/po/tr.po +++ b/Languages/po/tr.po @@ -8,6 +8,7 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -15,6 +16,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-08-19 08:38-0500\n" ======= +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Clean up Turkish translation file. "PO-Revision-Date: 2011-12-20 19:22+0200\n" >>>>>>> Update Hungarian and Turkish translations. "Last-Translator: nlgzrgn \n" @@ -561,6 +565,7 @@ msgstr "Yama Ekle" msgid "Add new pane" msgstr "Bölme ekle" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -570,6 +575,11 @@ msgstr "Bölme ekle" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +>>>>>>> Clean up Turkish translation file. msgid "Add..." msgstr "Ekle..." @@ -639,6 +649,7 @@ msgstr "Tüm GC/Wii kalıpları (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tüm GameCube GCM Dosyaları (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -646,6 +657,10 @@ msgstr "Tüm GameCube GCM Dosyaları (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +>>>>>>> Clean up Turkish translation file. msgid "All Save States (sav, s##)" msgstr "Tüm Kayıtlı Oyunlar (sav,s##)" @@ -734,11 +749,15 @@ msgstr "" "Bu dosyayı gerçekten silmek istiyor musunuz? Silindikten sonra bu dosyaları " "geri döndüremezsiniz!" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "En-boy Oranı:" @@ -759,11 +778,15 @@ msgstr "Ses Çözücüsü:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO sürücüyü açarken hata.\n" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Otomatik" @@ -879,10 +902,14 @@ msgstr "Mavi SaÄŸ" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Clean up Turkish translation file. msgid "Bottom" msgstr "Alt" @@ -915,11 +942,15 @@ msgstr "Çıkış klasörü için gözat" msgid "Buffer:" msgstr "Tampon:" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1166,10 +1197,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Kapat" @@ -1278,11 +1313,15 @@ msgstr "Wiimote 3'ü BaÄŸla" msgid "Connect Wiimote 4" msgstr "Wiimote 4'ü BaÄŸla" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 ======= #: Source/Core/DolphinWX/Src/Main.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Clean up Turkish translation file. msgid "Connecting..." msgstr "BaÄŸlanıyor..." @@ -1476,10 +1515,14 @@ msgstr "Ses Emülatörü Motoru" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +>>>>>>> Clean up Turkish translation file. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emülasyonu (Hızlı)" @@ -1709,11 +1752,15 @@ msgstr "" msgid "Divide" msgstr "Böl" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +>>>>>>> Clean up Turkish translation file. msgid "Do you want to stop the current emulation?" msgstr "Emülasyonu durdurmak istiyor musunuz?" @@ -1742,6 +1789,7 @@ msgstr "Dolphin Taklit Wiimote Yapılandırması" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1757,6 +1805,14 @@ msgstr "Dolphin GC Kolu Yapılandırması" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC Kolu Yapılandırması" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Clean up Turkish translation file. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filmleri (*.dtm)" @@ -1853,6 +1909,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1862,6 +1919,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Clean up Turkish translation file. msgid "Dutch" msgstr "Flemenkçe" @@ -2004,6 +2066,7 @@ msgstr "BAT'a Ä°zin Ver" msgid "Enable Block Merging" msgstr "Blok BirleÅŸimine Ä°zin Ver" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" @@ -2011,15 +2074,25 @@ msgstr "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "Sınırlayıcı Kutu Hesaplama'yı EtkinleÅŸtir" + +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Ön BelleÄŸe Ä°zin Ver" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +>>>>>>> Clean up Turkish translation file. msgid "Enable Cheats" msgstr "Hilelere Ä°zin Ver" @@ -2176,6 +2249,7 @@ msgstr "" msgid "End" msgstr "Son" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2185,6 +2259,11 @@ msgstr "Son" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Clean up Turkish translation file. msgid "English" msgstr "Ä°ngilizce" @@ -2214,6 +2293,7 @@ msgstr "EÅŸit" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Hata" @@ -2231,6 +2311,21 @@ msgid "Error" msgstr "Hata" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Hata" + +#: Source/Core/Core/Src/Movie.cpp:820 +#, c-format +msgid "" +"Error in PlayWiimote. %u != %u, byte %d.\n" +"Sorry, Wii recording is temporarily broken." +msgstr "" +"PlayWiimote'da hata. %u != %u, byte %d.\n" +"Ãœzgünüz, Wii kaydında geçici hasar var." + +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/Main.cpp:346 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." @@ -2241,6 +2336,11 @@ msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" +<<<<<<< HEAD +======= +"Hata: \"%s\" 'dan sonra, %d (0x%X) bulundu ( %d (0x%X) yerine). Durum kaydı " +"yüklemesinden vazgeçiliyor..." +>>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format @@ -2685,6 +2785,7 @@ msgstr "Çekilecek Çerçeveler" msgid "Free Look" msgstr "Serbest Bakış" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2694,6 +2795,11 @@ msgstr "Serbest Bakış" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Clean up Turkish translation file. msgid "French" msgstr "Fransızca" @@ -2719,9 +2825,14 @@ msgid "GCI File(*.gci)" msgstr "GCI Dosyası (*.gci)" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +<<<<<<< HEAD #, fuzzy msgid "GCMic Configuration" msgstr "GeçmiÅŸ Yapılandırması" +======= +msgid "GCMic Configuration" +msgstr "GCMic Yapılandırması" +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" @@ -2761,10 +2872,14 @@ msgstr "Gamecube Kolu Ayarları (&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +>>>>>>> Clean up Turkish translation file. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube Hafıza Kartları (*.raw,*.gcp)" @@ -2788,11 +2903,16 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Genel" @@ -2801,6 +2921,7 @@ msgstr "Genel" msgid "General Settings" msgstr "Genel Ayarlar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2810,6 +2931,11 @@ msgstr "Genel Ayarlar" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Clean up Turkish translation file. msgid "German" msgstr "Almanca" @@ -2939,11 +3065,16 @@ msgstr "Kısayol TuÅŸu Yapılandırması" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +>>>>>>> Clean up Turkish translation file. msgid "Hotkeys" msgstr "TuÅŸlar" @@ -3014,6 +3145,11 @@ msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +<<<<<<< HEAD +======= +"EÄŸer iÅŸaretlenmiÅŸse, sınırlayıcı kutu kayıtları güncellenecektir. Paper " +"Mario oyunları tarafından kullanılır." +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" @@ -3166,11 +3302,15 @@ msgstr "" "Kurulum Özel Durum Ä°ÅŸleyici çaÄŸrıldı, ama bu platform henüz bunu " "desteklemiyor." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +>>>>>>> Clean up Turkish translation file. msgid "Installing WAD..." msgstr "WAD kuruluyor..." @@ -3252,6 +3392,7 @@ msgstr "Hatalı çekim dosyası" msgid "Invalid state" msgstr "Hatalı durum" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3261,6 +3402,11 @@ msgstr "Hatalı durum" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +>>>>>>> Clean up Turkish translation file. msgid "Italian" msgstr "Ä°talyanca" @@ -3418,6 +3564,7 @@ msgstr "Durumu Yükle : 8" msgid "Load State..." msgstr "Durumu Yükle..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3431,6 +3578,13 @@ msgstr "Wii Sistem Menüsünü Yükle" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +msgid "Load Wii System Menu" +msgstr "Wii Sistem Menüsünü Yükle" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Clean up Turkish translation file. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii Sistem Menüsünü Yükle %d%c" @@ -3512,11 +3666,15 @@ msgstr "MMU Hız Hilesi" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark dosyaları(*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Ana Çubuk" @@ -3548,10 +3706,14 @@ msgstr "Hafıza Baytı" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +>>>>>>> Clean up Turkish translation file. msgid "Memory Card" msgstr "Hafıza Kartı" @@ -3749,11 +3911,15 @@ msgstr "NP Sekme" msgid "NP Up" msgstr "NP Yukarı" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3840,11 +4006,15 @@ msgstr "EÅŸit DeÄŸil" msgid "Not Set" msgstr "Ayarlanmamış" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 ======= #: Source/Core/DolphinWX/Src/Main.cpp:597 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:596 +>>>>>>> Clean up Turkish translation file. msgid "Not connected" msgstr "BaÄŸlı deÄŸil" @@ -3906,9 +4076,13 @@ msgstr "Sadece %d blok kullanılabilir" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +>>>>>>> Clean up Turkish translation file. msgid "Open" msgstr "Aç" @@ -4039,6 +4213,7 @@ msgstr "Yamalar" msgid "Paths" msgstr "Yollar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4046,6 +4221,10 @@ msgstr "Yollar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Duraklat" @@ -4066,12 +4245,17 @@ msgstr "Perspektif %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +>>>>>>> Clean up Turkish translation file. msgid "Play" msgstr "Oynat" @@ -4097,11 +4281,15 @@ msgstr "Oynatma Seçenekleri" msgid "Players" msgstr "Oyuncular" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +>>>>>>> Clean up Turkish translation file. msgid "Please confirm..." msgstr "Lütfen onaylayın..." @@ -4153,17 +4341,29 @@ msgstr "Geç Ä°ÅŸleme Etkisi:" #: Source/Core/Core/Src/Movie.cpp:735 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "PlayController'da erken kayıt bitiÅŸi. %u + 8 > %u" +>>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/Movie.cpp:829 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "PlayWiimote'da erken kayıt bitiÅŸi. %u + %d > %u" +>>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/Movie.cpp:806 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "PlayWiimote'da erken kayıt bitiÅŸi. %u > %u" +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " @@ -4312,6 +4512,7 @@ msgstr "Listeyi Yenile" msgid "Refresh game list" msgstr "Oyun Listesini Yenile" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4323,6 +4524,12 @@ msgstr "Oyun Listesini Yenile" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +>>>>>>> Clean up Turkish translation file. msgid "Remove" msgstr "Kaldır" @@ -4342,9 +4549,13 @@ msgstr "Ana pencerede yorumla" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Sıfırla" @@ -4387,11 +4598,15 @@ msgstr "Durumu Kaydet (&V)" msgid "Safe" msgstr "Güvenli" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +>>>>>>> Clean up Turkish translation file. msgid "Sample Rate:" msgstr "Örnek Oran:" @@ -4475,11 +4690,15 @@ msgstr "Kayıtlı durum filmi %s bozuk, film çekimi duruyor..." msgid "Scaled EFB Copy" msgstr "Boyutlandırılmış EFB Kopyası" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +>>>>>>> Clean up Turkish translation file. #, c-format msgid "Scanning %s" msgstr "Taranıyor %s" @@ -4519,6 +4738,7 @@ msgstr "SYSCONF içinde %s bölümü bulunamadı" msgid "Select" msgstr "Seç" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4534,6 +4754,14 @@ msgstr "Çekim Dosyasını Seç" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +msgid "Select The Recording File" +msgstr "Çekim Dosyasını Seç" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Clean up Turkish translation file. msgid "Select a Wii WAD file to install" msgstr "Kurmak için bir Wii WAD dosyası seçin" @@ -4559,6 +4787,7 @@ msgstr "Sabit olmayan pencereyi seçin" msgid "Select the file to load" msgstr "Yüklemek için dosyayı seçin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4571,15 +4800,22 @@ msgstr "Yüklemek için durum seçin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Clean up Turkish translation file. msgid "Select the save file" msgstr "Kayıt dosyasını seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Yüklemek için durum seçin" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Clean up Turkish translation file. msgid "Select the state to save" msgstr "Kaydetmek için durum seçin" @@ -4955,6 +5191,7 @@ msgstr "Ses tamponu oluÅŸturulamadı: %s" msgid "Space" msgstr "BoÅŸluk" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4964,6 +5201,11 @@ msgstr "BoÅŸluk" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +>>>>>>> Clean up Turkish translation file. msgid "Spanish" msgstr "Ä°spanyolca" @@ -5007,11 +5249,15 @@ msgstr "Kare Çubuk" msgid "Standard Controller" msgstr "Varsayılan Denetim Aygıtı" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ======= #: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5047,9 +5293,13 @@ msgstr "Çubuk" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Durdur" @@ -5127,15 +5377,23 @@ msgstr "Tablo SaÄŸ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +>>>>>>> Clean up Turkish translation file. msgid "Take Screenshot" msgstr "Ekran Görüntüsü Al" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "TaruKonga (Bongos)" +<<<<<<< HEAD msgstr "" +======= +msgstr "TaruKonga (Bongos)" +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -5374,18 +5632,26 @@ msgstr "Tüm GeçmiÅŸ Türlerini Seç" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +>>>>>>> Clean up Turkish translation file. msgid "Toggle Fullscreen" msgstr "Tam Ekran Moduna Geç" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +>>>>>>> Clean up Turkish translation file. msgid "Top" msgstr "Ãœst" @@ -5494,6 +5760,7 @@ msgstr "Åžu ID ile bilinmeyen mesaj alındı : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "ID %d ile %d oyuncusundan bilinmeyen mesaj alındı. Oyuncu atılıyor!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5506,6 +5773,8 @@ msgstr "" "Devam?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Clean up Turkish translation file. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5667,6 +5936,13 @@ msgid "" "%u > %u) (frame %u > %u). You should load another save before continuing, or " "load this state with read-only mode off." msgstr "" +<<<<<<< HEAD +======= +"Dikkat: Åžu anki kaydın bitiÅŸinden sonra yer alan bir kayıt yüklediniz. (Bayt " +"%u > %u) (Çerçeve %u > %u). Devam etmeden önce baÅŸka bir kayıt yüklemeniz, " +"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." +>>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/Movie.cpp:646 #, c-format @@ -5675,6 +5951,13 @@ msgid "" "should load another save before continuing, or load this state with read-" "only mode off. Otherwise you'll probably get a desync." msgstr "" +<<<<<<< HEAD +======= +"Dikkat: Bayt %d (0x%X) ile eÅŸleÅŸmeyen bir kayıt yüklediniz. Devam etmeden " +"önce baÅŸka bir kayıt yüklemeniz, 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." +>>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/Movie.cpp:655 #, c-format @@ -5694,6 +5977,24 @@ 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 "" +<<<<<<< HEAD +======= +"Dikkat: Çerçeve %d ile eÅŸleÅŸmeyen bir kayıt yüklediniz. Devam etmeden önce " +"baÅŸka bir kayıt yüklemeniz, 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.\n" +"\n" +"Daha fazla bilgi: Åžu anki kayıt %d çerçeve uzunluÄŸunda, ama durum kaydı %d " +"çerçeve uzunluÄŸunda.\n" +"\n" +"Çerçeve %d 'de, ÅŸu anki kayıt bunları basıyor:\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" +"Çerçeve %d 'de, durum kaydı bunları basıyor:\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" +>>>>>>> Clean up Turkish translation file. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -5728,11 +6029,15 @@ msgstr "Wii NAND Kök Dizini:" msgid "Wii Save Import" msgstr "Wii Kaydı Al" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +>>>>>>> Clean up Turkish translation file. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii kayıt dosyaları (*.bin)|*.bin" @@ -5763,11 +6068,15 @@ msgstr "" "bir zaman aşımı olabilir veya baÅŸka bir ÅŸey olabilir. \n" "Tekrar baÄŸlamak istiyor musunuz?" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 ======= #: Source/Core/DolphinWX/Src/Main.cpp:599 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Clean up Turkish translation file. msgid "Wiimote Connected" msgstr "Wiimote BaÄŸlandı" @@ -5799,6 +6108,7 @@ msgstr "Pencereleri SaÄŸa Döşe" msgid "Word Wrap" msgstr "Heceleme" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5808,6 +6118,11 @@ msgstr "Heceleme" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +>>>>>>> Clean up Turkish translation file. msgid "Working..." msgstr "Çalışıyor..." @@ -6112,11 +6427,17 @@ msgstr "| VEYA" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "%s açılamıyor, kayıp bir iÅŸleve sahip." +<<<<<<< HEAD <<<<<<< HEAD #~ msgid "Cannot record movies in read-only mode." #~ msgstr "Salt-okunur modda film çekilemez." ======= +======= +#~ msgid "Cannot record movies in read-only mode." +#~ msgstr "Salt-okunur modda film çekilemez." + +>>>>>>> Clean up Turkish translation file. #, fuzzy >>>>>>> Update Hungarian and Turkish translations. #~ msgid "Config..." @@ -6230,9 +6551,6 @@ msgstr "| VEYA" #~ msgid "Emulator Display Settings" #~ msgstr "Emülatör Görüntü Ayarları" -#~ msgid "Enable Bounding Box Calculation" -#~ msgstr "Sınırlayıcı Kutu Hesaplama'yı EtkinleÅŸtir" - #, fuzzy #~ msgid "Enable CPU Access" #~ msgstr "Ön BelleÄŸe Ä°zin Ver" @@ -6296,13 +6614,6 @@ msgstr "| VEYA" #~ msgid "Error allocating buffer" #~ msgstr "Tampon ayırma hatası" -#~ msgid "" -#~ "Error in PlayWiimote. %u != %u, byte %d.\n" -#~ "Sorry, Wii recording is temporarily broken." -#~ msgstr "" -#~ "PlayWiimote'da hata. %u != %u, byte %d.\n" -#~ "Ãœzgünüz, Wii kaydında geçici hasar var." - #~ msgid "Error loading %s: can't read info" #~ msgstr "%s yüklenirken hata: Bilgi okunamıyor." @@ -6315,13 +6626,6 @@ msgstr "| VEYA" #~ msgid "Error opening file %s for recording" #~ msgstr "Kayıt için %s dosyasını açarken hata." -#~ msgid "" -#~ "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " -#~ "Aborting savestate load..." -#~ msgstr "" -#~ "Hata: \"%s\" 'dan sonra, %d (0x%X) bulundu ( %d (0x%X) yerine). Durum " -#~ "kaydı yüklemesinden vazgeçiliyor..." - #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6360,9 +6664,6 @@ msgstr "| VEYA" #~ "Dokuya EFB Kopyalamaktan daha doÄŸrudur, ve bazı oyunlar düzgün çalışmak " #~ "için buna ihtiyaç duyar, ama çok yavaÅŸ olabilir." -#~ msgid "GCMic Configuration" -#~ msgstr "GCMic Yapılandırması" - #, fuzzy #~ msgid "GFX Config" #~ msgstr "Yapılandırma" @@ -6388,13 +6689,6 @@ msgstr "| VEYA" #~ "EÄŸer bir oyun çakılırsa, sadece Interpreter'da çalışıyorsa veya Dolphin " #~ "çökerse, bu seçenek oyunu düzeltebilir." -#~ msgid "" -#~ "If checked, the bounding box registers will be updated. Used by the Paper " -#~ "Mario games." -#~ msgstr "" -#~ "EÄŸer iÅŸaretlenmiÅŸse, sınırlayıcı kutu kayıtları güncellenecektir. Paper " -#~ "Mario oyunları tarafından kullanılır." - #~ msgid "Input Source" #~ msgstr "GiriÅŸ Kaynağı" @@ -6489,15 +6783,6 @@ msgstr "| VEYA" #~ "Dolphin'i salt okunur bir konumdan veya kurulmadığı yerden mi " #~ "çalıştırıyorsunuz?" -#~ msgid "Premature movie end in PlayController. %u + 8 > %u" -#~ msgstr "PlayController'da erken kayıt bitiÅŸi. %u + 8 > %u" - -#~ msgid "Premature movie end in PlayWiimote. %u + %d > %u" -#~ msgstr "PlayWiimote'da erken kayıt bitiÅŸi. %u + %d > %u" - -#~ msgid "Premature movie end in PlayWiimote. %u > %u" -#~ msgstr "PlayWiimote'da erken kayıt bitiÅŸi. %u > %u" - #, fuzzy #~ msgid "Projection Stats" #~ msgstr "Özel Görüntüleme Hilesi Ayarları" @@ -6624,9 +6909,6 @@ msgstr "| VEYA" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Oyununuz tam ekran görüntüyle baÅŸlar." -#~ msgid "TaruKonga (Bongos)" -#~ msgstr "TaruKonga (Bongos)" - #~ msgid "The file " #~ msgstr "Dosya" @@ -6678,61 +6960,6 @@ msgstr "| VEYA" #~ "Dikey boÅŸlukları bekle. \n" #~ "Yırtılmayı azaltır ama performansı da azaltır." -#~ 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 "" -#~ "Dikkat: Åžu anki kaydın bitiÅŸinden sonra yer alan bir kayıt yüklediniz. " -#~ "(Bayt %u > %u) (Çerçeve %u > %u). Devam etmeden önce baÅŸka bir kayıt " -#~ "yüklemeniz, 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." - -#~ 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 "" -#~ "Dikkat: Bayt %d (0x%X) ile eÅŸleÅŸmeyen bir kayıt yüklediniz. Devam etmeden " -#~ "önce baÅŸka bir kayıt yüklemeniz, 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." - -#~ 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" -#~ "\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" -#~ "\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" -#~ msgstr "" -#~ "Dikkat: Çerçeve %d ile eÅŸleÅŸmeyen bir kayıt yüklediniz. Devam etmeden " -#~ "önce baÅŸka bir kayıt yüklemeniz, 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.\n" -#~ "\n" -#~ "Daha fazla bilgi: Åžu anki kayıt %d çerçeve uzunluÄŸunda, ama durum kaydı " -#~ "%d çerçeve uzunluÄŸunda.\n" -#~ "\n" -#~ "Çerçeve %d 'de, ÅŸu anki kayıt bunları basıyor:\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" -#~ "Çerçeve %d 'de, durum kaydı bunları basıyor:\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" - #~ msgid "" #~ "When using EFB to RAM we very often need to decode RAM data to a VRAM " #~ "texture, which is a very time-consuming task.\n" From 5c66c5b138071e454061f3a68b578f7bd2f01d95 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Wed, 28 Dec 2011 08:55:06 -0600 Subject: [PATCH 353/381] Update Hungarian translation. --- Languages/po/hu.po | 666 +++++++++++++++------------------------------ 1 file changed, 224 insertions(+), 442 deletions(-) diff --git a/Languages/po/hu.po b/Languages/po/hu.po index 27ed2a0941..7bdf045357 100644 --- a/Languages/po/hu.po +++ b/Languages/po/hu.po @@ -21,8 +21,12 @@ msgstr "" >>>>>>> Update Hungarian and Turkish translations. ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" +<<<<<<< HEAD "PO-Revision-Date: 2011-12-27 08:22-0600\n" >>>>>>> Update from master branch. +======= +"PO-Revision-Date: 2011-12-28 09:44+0100\n" +>>>>>>> Update Hungarian translation. "Last-Translator: Delirious \n" "Language-Team: Delirious \n" "Language: Hungarian\n" @@ -128,8 +132,7 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" "%s memóriakártyakénti betöltése sikertelen\n" -"a fájl nem elég nagy ahhoz, hogy megfelelÅ‘ memóriakártya fájl lehessen (0x%x " -"bájt)" +"a fájl nem elég nagy ahhoz, hogy megfelelÅ‘ memóriakártya fájl lehessen (0x%x bájt)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -264,7 +267,7 @@ msgstr "&Memória" #: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Open..." -msgstr "&Megnyitás" +msgstr "&Megnyitás..." #: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "&Options" @@ -395,19 +398,17 @@ msgid "" "(Only the Microsoft bluetooth stack is supported.)" msgstr "" "Nem található támogatott bluetooth eszköz!\n" -"(Csak a Microsoft bluetooth eszközök támogatottak.)" +"(Csak Microsoft rangsorolású bluetooth eszköz támogatott.)" #: Source/Core/DolphinWX/Src/NetWindow.cpp:93 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" @@ -417,17 +418,14 @@ msgid "" msgstr "" "FIGYELEM:\n" "\n" -"A NetPlay jelenleg csak a következÅ‘ beállítások használatával működik " -"megfelelÅ‘en:\n" +"A NetPlay jelenleg csak a következÅ‘ beállítások használatával működik megfelelÅ‘en:\n" " - Dual Core [KI]\n" " - Hang szabályozás [KI]\n" " - DSP-HLE \"Null Audio\" használatával vagy DSP-LLE\n" -" - Kézileg legyen beállítva az irányítók pontos száma, amik használva " -"lesznek, mint [szabvány irányító]\n" +" - Kézileg legyen beállítva az irányítók pontos száma, amik használva lesznek, mint [szabvány irányító]\n" "\n" "Minden játékosnak azonos Dolphin verziót és beállításokat kell használnia.\n" -"Legyen minden memóriakártya kikapcsolva vagy mindenkinek továbbítani kell a " -"játék megkezdése elÅ‘tt.\n" +"Legyen minden memóriakártya kikapcsolva vagy mindenkinek továbbítani kell a játék megkezdése elÅ‘tt.\n" "Wiimote támogatás még nem működik.\n" "\n" "Továbbítani kell a TCP portot a host számára!!" @@ -468,14 +466,12 @@ msgstr "Pontos VBeam emuláció" >>>>>>> Update Hungarian and Turkish translations. 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 másolatok pontos emulációja.\n" -"Néhány játék számára elengedhetetlen bizonyos grafikai effektushoz vagy a " -"játszhatóság végett.\n" +"Néhány játék számára elengedhetetlen bizonyos grafikai effektushoz vagy a játszhatóság végett.\n" "\n" "Ha bizonytalan vagy, válaszd az EFB textúrába másolása lehetÅ‘séget." @@ -501,38 +497,23 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" -msgstr "" -"Action Replay hiba: érvénytelen méret (%08x : address = %08x) a kód " -"hozzáadásban (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +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 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " -"(%s)" -msgstr "" -"Action Replay hiba: érvénytelen méret (%08x : address = %08x) a kitöltésben " -"és regiszterben (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)" +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 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " -"Fill (%s)" -msgstr "" -"Action Replay hiba: érvénytelen méret (%08x : address = %08x) a RAM írásban " -"és kitöltésben (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)" +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 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Write To " -"Pointer (%s)" -msgstr "" -"Action Replay hiba: érvénytelen méret (%08x : address = %08x) a mutató " -"írásában (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Write To Pointer (%s)" +msgstr "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a mutató írásában (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:803 #, c-format @@ -541,8 +522,7 @@ msgstr "Action Replay hiba: érvénytelen érték (%08x) a memória másolásban #: Source/Core/Core/Src/ActionReplay.cpp:684 #, c-format -msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" msgstr "Action Replay hiba: Mester kód és CCXXXXXX írása nincs beépítve (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -617,16 +597,14 @@ msgstr "Cím:" 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 "" "Meghatározott értéket ad a zFar paraméterhez.\n" "Két módja a lebegÅ‘pontos értékek kifejezésének.\n" -"Például: a ''200'' vagy ''0.0002'' érték közvetlen megadása, azonos " -"hatásokat eredményez, a kapott érték ''0.0002'' lesz.\n" +"Például: a ''200'' vagy ''0.0002'' érték közvetlen megadása, azonos hatásokat eredményez, a kapott érték ''0.0002'' lesz.\n" "Értékek: (0->+/-egész szám) vagy (0->+/-FP[6 számjegyes pontosság])\n" "\n" "MEGJEGYZÉS: EllenÅ‘rizd a napló ablakot/konzolt a kapott értékekhez." @@ -635,25 +613,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 "" "Meghatározott értéket ad a zNear paraméterhez.\n" "Két módja a lebegÅ‘pontos értékek kifejezésének.\n" -"Például: a ''200'' vagy ''0.0002'' érték közvetlen megadása, azonos " -"hatásokat eredményez, a kapott érték ''0.0002'' lesz.\n" +"Például: a ''200'' vagy ''0.0002'' érték közvetlen megadása, azonos hatásokat eredményez, a kapott érték ''0.0002'' lesz.\n" "Értékek: (0->+/-egész szám) vagy (0->+/-FP[6 számjegyes pontosság])\n" "\n" "MEGJEGYZÉS: EllenÅ‘rizd a napló ablakot/konzolt a kapott értékekhez." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 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." +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:520 msgid "Advanced" @@ -704,13 +678,11 @@ msgstr "Minden fájl (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Bizonyos opciók elérhetÅ‘vé válnak a 3, 4, 5, 6 és 7 gyorsbillentyűkkel az " -"emulációs ablakon belül.\n" +"Bizonyos opciók elérhetÅ‘vé válnak a 3, 4, 5, 6 és 7 gyorsbillentyűkkel az emulációs ablakon belül.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -739,8 +711,7 @@ msgstr "Élsimítás:" #: Source/Core/DiscIO/Src/VolumeDirectory.cpp:317 msgid "Apploader is the wrong size...is it really an apploader?" -msgstr "" -"A betöltÅ‘ program nem megfelelÅ‘ méretű...ez tényleg egy betöltÅ‘ program?" +msgstr "A betöltÅ‘ program nem megfelelÅ‘ méretű...ez tényleg egy betöltÅ‘ program?" #: Source/Core/DiscIO/Src/VolumeDirectory.cpp:311 msgid "Apploader unable to load from file" @@ -752,7 +723,7 @@ msgstr "BetöltÅ‘ program:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 msgid "Apply" -msgstr "Elfogadás" +msgstr "Alkalmaz" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" @@ -760,7 +731,7 @@ msgid "" "\n" "If unsure, select (off)." msgstr "" -"Egy képkocka elkészültét követÅ‘en egy utófeldolgozási effektus alkalmazása.\n" +"Képkocka létrehozását követÅ‘en utófeldolgozási effektus alkalmazása.\n" "\n" "Ha bizonytalan vagy, válaszd ezt: (ki)." @@ -856,10 +827,8 @@ msgid "" "\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" +"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." @@ -949,7 +918,7 @@ msgstr "Kék jobbra" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. msgid "Bottom" -msgstr "Lent" +msgstr "Gomb" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 #, c-format @@ -1013,17 +982,12 @@ msgstr "KijelzÅ‘ listák gyorsítótárazása" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 "" -"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" +"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." @@ -1035,8 +999,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"A 3D-s grafikai fényhatásokat képpont alapon számolja inkább, mintsem " -"csúcspont alapon.\n" +"A 3D-s grafikai fényhatásokat képpont alapon számolja inkább, mintsem csúcspont alapon.\n" "Néhány százalékkal csökkenti az emuláció sebességét (videókártyától függ).\n" "Ez többnyire biztonságos finomítás, de idÅ‘nként hibákat okozhat.\n" "\n" @@ -1045,7 +1008,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" -msgstr "Mégsem" +msgstr "Mégse" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 @@ -1066,7 +1029,7 @@ msgstr "A mozgások rögzítése nem lehetséges írásvédett módban." >>>>>>> Update from master branch. #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" -msgstr "Nem lehet események bejegyzéseket törölni függÅ‘ben lévÅ‘ eseményekkel" +msgstr "Nem lehet esemény bejegyzéseket törölni függÅ‘ben lévÅ‘ eseményekkel" <<<<<<< HEAD <<<<<<< HEAD @@ -1211,12 +1174,8 @@ msgid "Choose a memory card:" msgstr "Válassz memóriakártyát:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 -msgid "" -"Choose file to use as apploader: (applies to discs constructed from " -"directories only)" -msgstr "" -"Válassz betöltÅ‘ programnak használandó fájlt: (csak könyvtárakból " -"létrehozott lemezekre érvényesíthetÅ‘)" +msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" +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:768 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 @@ -1243,12 +1202,8 @@ msgid "Clear failed." msgstr "Törlés sikertelen." #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "" -"Client disconnect while game is running!! NetPlay is disabled. You must " -"manually stop the game." -msgstr "" -"A kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. Kézileg " -"kell leállítanod a játékot." +msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." +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:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 @@ -1418,14 +1373,8 @@ msgstr "%s hang feldolgozó iniciálása sikertelen." #: 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 "" -"\"%s\" nem olvasható. Nincs lemez a meghajtóban, vagy ez nem egy GC/Wii " -"biztonsági mentés. Célszerű tudni, hogy az eredeti Gamecube és Wii " -"lemezeket a legtöbb számítógépes DVD meghajtó nem képes olvasni." +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\" nem olvasható. Nincs lemez a meghajtóban, vagy ez nem egy GC/Wii biztonsági mentés. Célszerű tudni, hogy az eredeti Gamecube és Wii lemezeket a legtöbb számítógépes DVD meghajtó nem képes olvasni." #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format @@ -1450,8 +1399,7 @@ msgstr "" 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 memóriakártya fájl nem írható.\n" "\n" @@ -1493,10 +1441,8 @@ msgid "Created by KDE-Look.org" msgstr "Készítette: KDE-Look.org" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 -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 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 msgid "Created by VistaIcons.com" @@ -1504,8 +1450,7 @@ msgstr "Készítette: VistaIcons.com" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 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" +msgstr "Készítette: black_rider és közzétette ForumW.org > Web Developments oldalon" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 msgid "Creator: " @@ -1681,12 +1626,8 @@ msgstr "Észlelés" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -msgid "" -"Detected attempt to read more data from the DVD than fit inside the out " -"buffer. Clamp." -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." +msgid "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp." +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 @@ -1742,32 +1683,24 @@ msgstr "Textúrák kikapcsolása" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 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 "" "Bármilyen XFB emuláció kikapcsolása.\n" -"Nagymértékben gyorsítja az emulációt, de számos grafikai hibát okoz sok " -"olyan játékban, amelyhez szükséges az XFB (fÅ‘leg egyedi fejlesztésű " -"alkalmazások).\n" +"Nagymértékben gyorsítja az emulációt, de számos grafikai hibát okoz sok olyan játékban, amelyhez szükséges az XFB (fÅ‘leg egyedi fejlesztésű alkalmazások).\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 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 másolatok emulációjának kikapcsolása.\n" -"A másolatok gyakran használatosak utófeldolgozáshoz vagy textúra " -"megjelenítési effektusokhoz, ezért ennek a beállításnak a kijelölésével " -"nagymértékű sebesség növekedés érhetÅ‘ el, azonban majdnem mindig hibákat is " -"okoz.\n" +"A másolatok gyakran használatosak utófeldolgozáshoz vagy textúra megjelenítési effektusokhoz, ezért ennek a beállításnak a kijelölésével nagymértékű sebesség növekedés érhetÅ‘ el, azonban majdnem mindig hibákat is okoz.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -1881,20 +1814,12 @@ msgid "Dolphin at &Google Code" msgstr "Dolphin &Google Code oldal" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 -msgid "" -"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " -"files..." -msgstr "" -"Dolphin nem talált egyetlen GC/Wii ISO fájlt sem. Fájlok tallózásához dupla " -"kattintás ide..." +msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." +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:343 -msgid "" -"Dolphin is currently set to hide all games. Doubleclick here to show all " -"games..." -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..." +msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." +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/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -1940,8 +1865,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Az összes létrehozott képkocka mentése egy AVI fájlba ide: User/Dump/" -"Frames/\n" +"Az összes létrehozott képkocka mentése egy AVI fájlba ide: User/Dump/Frames/\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -1993,16 +1917,8 @@ msgstr "EFB másolatok" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, 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 "" -"HIBA: A Dolphin ezen változatához szükséges a TAP-Win32 driver %d.%d " -"verziója legalább -- Ha mostanában telepítetted a Dolphin emulátort, akkor " -"valószínűleg újra kell indítanod a számítógépet, hogy a Windows felismerje " -"az új illesztÅ‘programot." +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 "HIBA: A Dolphin ezen változatához szükséges a TAP-Win32 driver %d.%d verziója legalább -- Ha mostanában telepítetted a Dolphin emulátort, akkor valószínűleg újra kell indítanod a számítógépet, hogy a Windows felismerje az új illesztÅ‘programot." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 msgid "EUROPE" @@ -2052,30 +1968,24 @@ msgstr "Az emuláció már fut" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 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 "" "Az XFB pontos emulációja.\n" -"JelentÅ‘sen lassítja az emulációt és korlátozza a nagy felbontású " -"megjelenítést, azonban szükséges számos játék pontos emulációjához.\n" +"JelentÅ‘sen lassítja az emulációt és korlátozza a nagy felbontású megjelenítést, azonban szükséges számos játék pontos emulációjához.\n" "\n" "Ha bizonytalan vagy, jelöld ki inkább az XFB emulációt." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 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 "" "XFB emuláció grafikai processzor textúra objektumainak használatával.\n" -"Javít sok XFB emuláció nélkül nem működÅ‘ játékot miközben nem olyan lassú, " -"mint a valódi XFB emuláció. Azonban, még mindig nem használható sok más " -"játék esetén (fÅ‘leg egyedi fejlesztésű alkalmazások).\n" +"Javít sok XFB emuláció nélkül nem működÅ‘ játékot miközben nem olyan lassú, mint a valódi XFB emuláció. Azonban, még mindig nem használható sok más játék esetén (fÅ‘leg egyedi fejlesztésű alkalmazások).\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." @@ -2093,15 +2003,13 @@ msgstr "Használat" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 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 "" -"A 3D-s effektusok megjelenítése sztereoszkópikus módon az Nvidia 3D Vision " -"technológia használatával, ha támogatja a videókártya.\n" +"A 3D-s effektusok megjelenítése sztereoszkópikus módon az Nvidia 3D Vision technológia használatával, ha támogatja a videókártya.\n" "Estleg hibákat okozhat.\n" "Működéséhez teljes képernyÅ‘ szükséges.\n" "\n" @@ -2213,12 +2121,8 @@ msgstr "" "Ha bizonytalan vagy, válaszd ezt: 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -msgid "" -"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " -"Compatible)" -msgstr "" -"Gyors lemez hozzáférés használata. Szükséges néhány játékhoz. (BE = gyors, " -"KI = kompatibilis)" +msgid "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)" +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:799 msgid "Enable pages" @@ -2238,33 +2142,21 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 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 "" -"Kapcsold be ha azt akarod, hogy inkább a Dolphin fÅ‘ ablakában jelenjen meg " -"az emuláció, mint sem egy különálló ablakban.\n" +"Kapcsold be ha azt akarod, hogy inkább a Dolphin fÅ‘ ablakában jelenjen meg az emuláció, mint sem egy különálló ablakban.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 -msgid "" -"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " -"ANY other game." -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." +msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." +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:311 -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 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:337 msgid "Enables Custom Projection Hack" @@ -2277,19 +2169,14 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Bekapcsolja a progresszív pásztázást, ha az támogatott az emulált szoftver " -"által.\n" +"Bekapcsolja a progresszív pásztázást, ha az támogatott az emulált szoftver által.\n" "A legtöbb játék nem használja ezt.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -msgid "" -"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " -"OFF = Fast)" -msgstr "" -"Bekapcsolja a memória kezelÅ‘ egységet (Memory Management Unit), szükséges " -"néhány játékhoz. (BE = kompatibilis, KI = gyors)" +msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" +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:117 msgid "" @@ -2384,12 +2271,11 @@ msgstr "" >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." -msgstr "" -"Hiba a kiválasztott nyelv betöltése közben. Rendszer alapértelmezett " -"visszaállítva." +msgstr "Hiba a kiválasztott nyelv betöltése közben. Rendszer alapértelmezett visszaállítva." #: Source/Core/Common/Src/ChunkFile.h:180 #, c-format +<<<<<<< HEAD msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." @@ -2399,16 +2285,15 @@ msgstr "" "Hiba: \"%s\" után, %d (0x%X) található a mentési jelölÅ‘ helyett %d (0x%X). " "Mentés betöltésének leállítása..." >>>>>>> Update from master branch. +======= +msgid "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). Aborting savestate load..." +msgstr "Hiba: \"%s\" után, %d (0x%X) található a mentési jelölÅ‘ helyett %d (0x%X). Mentés betöltésének leállítása..." +>>>>>>> Update Hungarian translation. #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format -msgid "" -"Error: Trying to access %s fonts but they are not loaded. Games may not show " -"fonts correctly, or crash." -msgstr "" -"Hiba: A(z) %s betűtípusokhoz történÅ‘ hozzáférési próbálkozás során, a " -"betöltésük sikertelen. A játékokban a betűk lehet nem jelennek meg " -"megfelelÅ‘en, vagy kifagynak." +msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." +msgstr "Hiba: A(z) %s betűtípusokhoz történÅ‘ hozzáférési próbálkozás során, a betöltésük sikertelen. A játékokban a betűk lehet nem jelennek meg megfelelÅ‘en, vagy kifagynak." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2598,8 +2483,7 @@ msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" msgstr "" -"A blokk kiosztási tábla biztonsági mentésének pontos visszaolvasása " -"sikertelen\n" +"A blokk kiosztási tábla biztonsági mentésének pontos visszaolvasása sikertelen\n" "(0x8000-0x9FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:144 @@ -2768,8 +2652,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Kényszerített textúra szűrés lesz még akkor is, ha a játék határozottan " -"letiltotta azt.\n" +"Kényszerített textúra szűrés lesz még akkor is, ha a játék határozottan letiltotta azt.\n" "Némileg javítja a textúra minÅ‘séget, de képhibákat okozhat néhány játékban.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -2781,7 +2664,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"A játék kiemeneti grafikája kényszerített szélesvásznú felbontású lesz.\n" +"A játék kimeneti grafikája kényszerített szélesvásznú felbontású lesz.\n" "Grafikai hibákat okozhat néhány játékban.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -2789,12 +2672,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 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 "" "Az NTSC-J működési módot kényszeríti japán ROM betűkészlet használatához.\n" -"Hagyd kijelöletlenül, a Dolphin alapértelmezett az NTSC-U és automatikusan " -"bekapcsolódik ez a beállítás japán játékok használatakor." +"Hagyd kijelöletlenül, a Dolphin alapértelmezett az NTSC-U és automatikusan bekapcsolódik ez a beállítás japán játékok használatakor." #: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" @@ -3026,19 +2907,15 @@ msgstr "Nagyobb mint" ======= >>>>>>> Update Hungarian and Turkish translations. 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 "" -"Nagymértékben javítja azon textúrák minÅ‘ségét, amelyeket a textúra " -"effektusokhoz használatos képalkotó hozott létre.\n" +"Nagymértékben javítja azon textúrák minÅ‘ségét, amelyeket a textúra effektusokhoz használatos képalkotó hozott létre.\n" "A belsÅ‘ felbontás növelése javítja ennek a beállításnak a hatását.\n" -"Némileg csökkenti a teljesítményt és esetlegesen hibákat okozhat (habár " -"valószínűtlen).\n" +"Némileg csökkenti a teljesítményt és esetlegesen hibákat okozhat (habár valószínűtlen).\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." @@ -3097,8 +2974,7 @@ msgid "" msgstr "" "Szia,\n" "\n" -"A Dolphin működéséhez szükséges, hogy a processzor rendelkezzen SSE2 " -"utasításkészlettel.\n" +"A Dolphin működéséhez szükséges, hogy a processzor rendelkezzen SSE2 utasításkészlettel.\n" "Sajnos a processzorod nem támogatja azt, ezért a Dolphin nem fog működni.\n" "\n" "Sayonara!\n" @@ -3160,20 +3036,16 @@ msgstr "Hibrid Wiimote" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 #, 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" +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:795 #, 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: A játék megkísérelte az IOS újratöltését vagy egy olyan " -"címét ami nem érhetÅ‘ el a NAND mentésedben\n" +"IOCTL_ES_LAUNCH: A játék megkísérelte az IOS újratöltését vagy egy olyan címét ami nem érhetÅ‘ el a NAND mentésedben\n" "TitleID %016llx.\n" " A Dolphin valószínűleg kifagy most" @@ -3214,6 +3086,7 @@ msgid "Icon" msgstr "Ikon" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +<<<<<<< HEAD msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3223,22 +3096,18 @@ msgstr "" "Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper Mario " "játékok használják." >>>>>>> Update from master branch. +======= +msgid "If checked, the bounding box registers will be updated. Used by the Paper Mario games." +msgstr "Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper Mario játékok használják." +>>>>>>> Update Hungarian translation. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -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)" +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:485 -msgid "" -"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." -msgstr "" -"Ha a képkocka korlát értéke magasabb a játék teljes sebességénél (NTSC:60, " -"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. " +msgid "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." +msgstr "Ha a képkocka korlát értéke magasabb a játék teljes sebességénél (NTSC:60, 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:432 msgid "Ignore Format Changes" @@ -3247,29 +3116,24 @@ msgstr "Formátum változások kihagyása" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 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 "" "Minden EFB formátum változás figyelmen kívül hagyása.\n" -"Sok játékban növeli a teljesítményt bármilyen negatív hatás nélkül. Noha " -"grafikai hiányosságok jelentkezhetnek kevés egyéb játékban.\n" +"Sok játékban növeli a teljesítményt bármilyen negatív hatás nélkül. Noha grafikai hiányosságok jelentkezhetnek kevés egyéb játékban.\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 "" -"Figyelmen kívül hagyja a processzor összes EFB-re irányuló kiolvasási vagy " -"írási kérelmét.\n" -"Néhány játékban növeli a teljesítményt, de kikapcsolhat néhány játékmenetre " -"vonatkozó funkciót vagy grafikus effektust.\n" +"Figyelmen kívül hagyja a processzor összes EFB-re irányuló kiolvasási vagy írási kérelmét.\n" +"Néhány játékban növeli a teljesítményt, de kikapcsolhat néhány játékmenetre vonatkozó funkciót vagy grafikus effektust.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -3303,13 +3167,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 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öveli a teljesítményt de képhibákat okoz azokban a játékban, amelykben " -"fontos a megfelelÅ‘ köd emuláció.\n" +"Növeli a teljesítményt de képhibákat okoz azokban a játékban, amelykben fontos a megfelelÅ‘ köd emuláció.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -3319,8 +3181,7 @@ msgid "" "\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ö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." @@ -3351,7 +3212,7 @@ msgstr "Insert" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:175 msgid "Insert Encrypted or Decrypted code here..." -msgstr "Lekódolt vagy kódolatlan kódok beszúrása ide..." +msgstr "Lekódolt vagy kódolatlan kód beszúrása ide..." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" @@ -3370,10 +3231,8 @@ msgid "Install to Wii Menu" msgstr "Telepítés a Wii menübe" #: Source/Core/Core/Src/MemTools.cpp:248 -msgid "" -"InstallExceptionHandler called, but this platform does not yet support it." -msgstr "" -"InstallExceptionHandler elÅ‘idézve, de ez a platform még nem támogatja azt." +msgid "InstallExceptionHandler called, but this platform does not yet support it." +msgstr "InstallExceptionHandler elÅ‘idézve, de ez a platform még nem támogatja azt." <<<<<<< HEAD <<<<<<< HEAD @@ -3791,12 +3650,8 @@ msgid "Memory Card" msgstr "Memóriakártya" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "" -"Memory Card Manager WARNING-Make backups before using, should be fixed but " -"could mangle stuff!" -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!" +msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" +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 #, c-format @@ -3847,13 +3702,11 @@ msgstr "Változó" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 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 "" -"Tetxúrák módosítása a kódolásukhoz használt formátum megjelenítéséhez. A " -"legtöbb esetben az emuláció alapra állítása szükséges.\n" +"Tetxúrák módosítása a kódolásukhoz használt formátum megjelenítéséhez. A legtöbb esetben az emuláció alapra állítása szükséges.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -3893,12 +3746,8 @@ msgid "Multiply" msgstr "Multiply" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -msgid "" -"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " -"effect on emulated wiimotes." -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." +msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." +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/WXInputBase.cpp:126 msgid "NP Add" @@ -4226,12 +4075,8 @@ msgid "Other" msgstr "Egyéb" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "" -"Other client disconnected while game is running!! NetPlay is disabled. You " -"manually stop the game." -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." +msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." +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 msgid "Output" @@ -4405,7 +4250,7 @@ msgstr "Portugál" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" -msgstr "Portugál (brazíliai)" +msgstr "Portugál (brazil)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" @@ -4564,8 +4409,7 @@ msgid "" "\n" "If unsure, select None." msgstr "" -"Csökkenti az éltöredezettséget, amit a képpontokra felbontott 3D-s grafika " -"okoz.\n" +"Csökkenti az éltöredezettséget, amit a képpontokra felbontott 3D-s grafika okoz.\n" "Ezáltal a megjelenített kép kevésbé lesz recézett.\n" "ErÅ‘sen csökkenti az emuláció sebességét és néha hibákat okoz.\n" "Ha bizonytalan vagy, válaszd ezt: Nincs. " @@ -4800,8 +4644,10 @@ msgstr "Keresési szűrÅ‘" msgid "Search Subfolders" msgstr "Keresés az almappákban" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: Source/Core/Common/Src/SysConf.h:104 +#: Source/Core/Common/Src/SysConf.h:127 +#: Source/Core/Common/Src/SysConf.h:147 +#: Source/Core/Common/Src/SysConf.h:168 #, c-format msgid "Section %s not found in SYSCONF" msgstr "%s rész nem található a SYSCONF fájlban" @@ -4917,15 +4763,13 @@ msgstr "Kiválasztott betűtípus" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 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 "" "A teljes kijelzÅ‘ estén használatos felbontást állítja be.\n" -"Ennek mindig nagyobbnak, vagy azonosnak kell lennie a belsÅ‘ felbontással. " -"Hatása a teljesítményre elhanyagolható.\n" +"Ennek mindig nagyobbnak, vagy azonosnak kell lennie a belsÅ‘ felbontással. Hatása a teljesítményre elhanyagolható.\n" "\n" "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." @@ -4933,17 +4777,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 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 "" "Kiválasztja melyik grafikus API legyen használva belsÅ‘leg.\n" -"A Direct3D 9 többnyire a leggyorsabb. Az OpenGL azonban pontosabb. A " -"Direct3D 11 valahol a kettÅ‘ között van.\n" -"Vedd figyelembe, hogy a Direct3D feldolgozók csak Windows esetén állnak " -"rendelkezésre.\n" +"A Direct3D 9 többnyire a leggyorsabb. Az OpenGL azonban pontosabb. A Direct3D 11 valahol a kettÅ‘ között van.\n" +"Vedd figyelembe, hogy a Direct3D feldolgozók csak Windows esetén állnak rendelkezésre.\n" "\n" "Ha bizonytalan vagy, használd ezt: Direct3D 9." @@ -4957,17 +4798,15 @@ msgstr "ÉrzékelÅ‘ helyzete:" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:74 msgid "Separator" -msgstr "Separator" +msgstr "Elválasztó" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "Szerb" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 -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" +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 msgid "Set" @@ -4985,8 +4824,7 @@ msgstr "Beállítás alapértelmezett %c. memóriakártyaként" #: Source/Core/Core/Src/ActionReplay.cpp:462 #, c-format 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" +msgstr "SetARCode_IsActive: A jelzÅ‘szám nagyobb mint az ar kód lista mérete %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." @@ -5107,13 +4945,10 @@ msgstr "A játék leállítása elÅ‘tt megjelenik egy megerÅ‘sítÅ‘ ablak." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 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 "" -"FigyelmeztetÅ‘ üzenet jelenik meg egy potenciálisan komoly hiba " -"bekövetkezésekor.\n" -"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." +"FigyelmeztetÅ‘ üzenet jelenik meg egy potenciálisan komoly hiba bekövetkezésekor.\n" +"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:812 msgid "Show first block" @@ -5137,13 +4972,11 @@ msgstr "MentendÅ‘ címek megjelenítése" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 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 "" -"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" +"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." @@ -5191,13 +5024,11 @@ msgstr "Az EFB processzor hozzáférésének átugrása" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 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 "" -"A sok játékban különféle grafikai effektusokhoz használt destination alpha " -"pass figyelmen kívül hagyása.\n" +"A sok játékban különféle grafikai effektusokhoz használt destination alpha pass figyelmen kívül hagyása.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -5205,15 +5036,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 "" "Kissé gyorsítja az EFB RAM másolatokat az emuláció pontosságának rovására.\n" "Néha a vizuális minÅ‘séget is növeli.\n" -"Ha bármely hibát tapasztalsz, próbáld növelni a textúra gyorsítótár " -"pontosságát vagy kapcsold ki ezt az opciót.\n" +"Ha bármely hibát tapasztalsz, próbáld növelni a textúra gyorsítótár pontosságát vagy kapcsold ki ezt az opciót.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -5241,16 +5070,13 @@ msgstr "Szoftveres képalkotó" #: 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 "" -"A szoftveres képleképezés egy fontosságbeli sorrenden alapul és lassabb a " -"feldolgozók használatánál.\n" +"A szoftveres képalkotó egy fontosságbeli sorrenden alapul és lassabb a feldolgozók használatánál.\n" "Csak hibakeresési célra hasznos.\n" -"Biztosan be kívánod kapcsolni a szoftveres képleképezést? Ha bizonytalan " -"vagy, válaszd ezt: 'Nem'." +"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 msgid "Sound Settings" @@ -5294,21 +5120,13 @@ msgstr "Hangszóró hangerÅ‘:" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 "" -"Meghatározza a megjelenítéshez használatos felbontást. A magas felbontás " -"nagyban növeli a vizuális minÅ‘séget, de erÅ‘sen befolyásolja a teljesítményt " -"és képhibákat okozhat bizonyos játékoknál.\n" -"\"640x528 többszöröse\" egy kicsivel lassabb, mint az \"Ablak méret\" " -"viszont kevesebb hibák eredményez. Ãltalánosságban elmondható, minél kisebb " -"a belsÅ‘ felbontás, annál jobb a teljesítmény.\n" +"Meghatározza a megjelenítéshez használatos felbontást. A magas felbontás nagyban növeli a vizuális minÅ‘séget, de erÅ‘sen befolyásolja a teljesítményt és képhibákat okozhat bizonyos játékoknál.\n" +"\"640x528 többszöröse\" egy kicsivel lassabb, mint az \"Ablak méret\" viszont kevesebb hibák eredményez. Ãltalánosságban elmondható, minél kisebb a belsÅ‘ felbontás, annál jobb a teljesítmény.\n" "\n" "Ha bizonytalan vagy, válaszd ezt: 640x528." @@ -5322,7 +5140,7 @@ msgstr "A lemez adatátviteli arány gyorsítása" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:243 msgid "Square Stick" -msgstr "Negyzetes kar" +msgstr "Négyzetes kar" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 msgid "Standard Controller" @@ -5386,15 +5204,12 @@ msgstr "Leállítás" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 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 "" "Az EFB másolatokat a grafikai processzor textúra objektumaiban tárolja.\n" -"Ez nem annyira pontos, de elég jól működik a legtöbb játék esetén és " -"jelentÅ‘s sebességnövekedést okoz az EFB RAM-ban történÅ‘ tárolásával " -"szemben.\n" +"Ez nem annyira pontos, de elég jól működik a legtöbb játék esetén és jelentÅ‘s sebességnövekedést okoz az EFB RAM-ban történÅ‘ tárolásával szemben.\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." @@ -5527,12 +5342,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 fájl nem nyitható meg íráshoz. EllenÅ‘rizd, hogy nincs-e megnyitva már " -"másik program által." +msgid "The file %s could not be opened for writing. Please check if it's already opened by another program." +msgstr "%s fájl nem nyitható meg íráshoz. EllenÅ‘rizd, hogy nincs-e megnyitva már másik program által." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format @@ -5558,13 +5369,11 @@ msgstr "A kapott kódolatlan AR kód nem tartalmaz sorokat." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 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 second-fastest value from the right." msgstr "" -"Minél biztonságosabb a beállítás, annál kevésbé valószínű, hogy az emulátor " -"textúra frissítést fog a RAM-ból hiányolni.\n" +"Minél biztonságosabb a beállítás, annál kevésbé valószínű, hogy az emulátor textúra frissítést fog a RAM-ból hiányolni.\n" "\n" "Ha bizonytalan vagy, használd a második leggyorsabb értéket jobbról." @@ -5573,12 +5382,8 @@ 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 -msgid "" -"The selected language is not supported by your system. Falling back to " -"system default." -msgstr "" -"A választott nyelvet nem támogatja az oprációs rendszer. Visszaállás a " -"rendszer alapértelmezettre." +msgid "The selected language is not supported by your system. Falling back to system default." +msgstr "A választott nyelvet nem támogatja az oprációs rendszer. Visszaállás a rendszer alapértelmezettre." #: Source/Core/Core/Src/NetPlayClient.cpp:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -5614,12 +5419,8 @@ 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:467 -msgid "" -"There must be a ticket for 00000001/00000002. Your NAND dump is probably " -"incomplete." -msgstr "" -"Kell lennie egy jegynek itt: 00000001/00000002. A NAND mentésed valószínűleg " -"befejezetlen." +msgid "There must be a ticket for 00000001/00000002. Your NAND dump is probably incomplete." +msgstr "Kell lennie egy jegynek itt: 00000001/00000002. A NAND mentésed valószínűleg befejezetlen." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "" @@ -5630,12 +5431,8 @@ msgstr "" "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 -msgid "" -"This action replay simulator does not support codes that modify Action " -"Replay itself." -msgstr "" -"Az action replay szimulátor nem támogat olyan kódokat, amelyek módosítját " -"magát az Action Replay-t." +msgid "This action replay simulator does not support codes that modify Action Replay itself." +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:513 msgid "This could cause slow down in Wii Menu and some games." @@ -5644,19 +5441,12 @@ msgstr "Ez lassulást okozhat a Wii menüben és néhány játékban." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 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 "" "Ez a funkció lehetÅ‘vé teszi a játék kamera szabad irányítását.\n" -"Tartsd lenyomva a jobb egér gombot és mozgasd az egeret, hogy körbepásztázz " -"a kamerával. Tartsd lenyomva a SHIFT billentyűt és a WASD billentyűk " -"valamelyikével mozgasd a kamerát távolsági léptékenként (SHIFT+0 megduplázza " -"(x2) és a SHIFT+9 megfelezi (x0.5)). Nyomd le a SHIFT+R kombinációt a " -"kamera alapértékre állításához.\n" +"Tartsd lenyomva a jobb egér gombot és mozgasd az egeret, hogy körbepásztázz a kamerával. Tartsd lenyomva a SHIFT billentyűt és a WASD billentyűk valamelyikével mozgasd a kamerát távolsági léptékenként (SHIFT+0 megduplázza (x2) és a SHIFT+9 megfelezi (x0.5)). Nyomd le a SHIFT+R kombinációt a kamera alapértékre állításához.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -5672,8 +5462,7 @@ msgstr "" "Kikapcsolása rendellenes sebességet okozhat, többnyire túl gyorsat.\n" "Viszont néha a bekapcsolása folyamatos zajt eredményezhet.\n" "\n" -"Gyorsbillentyű : Tartsd lenyomva a szabályozás azonnali " -"kikapcsolásához." +"Gyorsbillentyű : Tartsd lenyomva a szabályozás azonnali kikapcsolásához." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." @@ -5681,15 +5470,11 @@ msgstr "Ez a zenei sávok, mint BGM lejátszásra szolgál." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 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 "" -"Ez megosztja a videó és processzor folyamatágakat, így azok külön magon " -"futhatnak.\n" -"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." +"Ez megosztja a videó és processzor folyamatágakat, így azok külön magon futhatnak.\n" +"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:283 msgid "This will let you Manually Edit the INI config file" @@ -5756,7 +5541,8 @@ msgstr "Próbálkozás egy ismeretlen fájltípus betöltésével. " msgid "Triggers" msgstr "Kioldó gombok" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:92 +#: Source/Core/Common/Src/SysConf.h:115 msgid "Trying to read from invalid SYSCONF" msgstr "Olvasási próbálkozás az érvénytelen SYSCONF fájlból" @@ -5808,12 +5594,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 "" -"A megadott AR kód %lu sorának érvényes kódolt, vagy kódolatlan kódként " -"történÅ‘ elemzése nem lehetséges. GyÅ‘zÅ‘dj meg róla, hogy helyesen írtad be.\n" +"A megadott AR kód %lu sorának érvényes kódolt, vagy kódolatlan kódként 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 @@ -5847,9 +5631,7 @@ msgstr "Ismeretlen üzenet érkezett ezzel az azonosítóval : %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" -msgstr "" -"Ismeretlen üzenet érkezett ezzel az azonosítóval:%d ettÅ‘l a játékostól:%d " -"Játékos kirúgása!" +msgstr "Ismeretlen üzenet érkezett ezzel az azonosítóval:%d ettÅ‘l a játékostól:%d Játékos kirúgása!" <<<<<<< HEAD <<<<<<< HEAD @@ -5894,7 +5676,7 @@ msgstr "Hexa használat" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" -msgstr "Hibaüzenetek megjelenítése" +msgstr "HibakezelÅ‘k használata" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" @@ -5904,23 +5686,19 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Több folyamatág használata a textúrák dekódolásához.\n" -"Sebesség növekedést eredményezhet (fÅ‘leg a két magnál többel rendelkezÅ‘ " -"processzorok esetén).\n" +"Sebesség növekedést eredményezhet (fÅ‘leg a két magnál többel rendelkezÅ‘ processzorok esetén).\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 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 "" -"Ãltalában ha az árnyaló összeállítása sikertelen, megjelenik egy " -"hibaüzenet.\n" -"Azonban, ennek az opciónak a kijelölésével elérhetÅ‘ a felugró ablak " -"kihagyása, azaz a megszakítás nélküli játékmenet.\n" +"Ãltalában ha az árnyaló összeállítása sikertelen, megjelenik egy hibaüzenet.\n" +"Azonban, ennek az opciónak a kijelölésével elérhetÅ‘ a felugró ablak kihagyása, azaz a megszakítás nélküli játékmenet.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -5930,7 +5708,7 @@ msgstr "Kellékek" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" -msgstr "Várakozás a képfrissítésre" +msgstr "V-Sync" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 msgid "Value" @@ -5965,7 +5743,7 @@ msgstr "HangerÅ‘" #: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 #, c-format msgid "WAD installation failed: error creating %s" -msgstr "WAD telepítési hiba: hiba naplózása %s" +msgstr "WAD telepítési hiba: hiba a(z) %s létrehozása közben" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" @@ -6023,6 +5801,7 @@ msgstr "" #: Source/Core/Core/Src/Movie.cpp:629 #, c-format +<<<<<<< HEAD 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 " @@ -6050,43 +5829,53 @@ 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." >>>>>>> Update from master branch. +======= +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 "Figyelem: Olyan mentést töltöttél be, ami a választott videó befejezése utáni. (%u > %u bájt) (%u > %u képkocka). Folytatás elÅ‘tt betölthetsz egy 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:646 +#, 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 "Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d (0x%X) bájt eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ esetben szinkronizációs hibák jelentkezhetnek." +>>>>>>> Update Hungarian translation. #: Source/Core/Core/Src/Movie.cpp:655 #, 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 "" <<<<<<< HEAD +<<<<<<< HEAD ======= "Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d képkocka eltérés " "mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy betöltheted " "ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ esetben " "szinkronizációs hibák jelentkezhetnek.\n" +======= +"Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d képkocka eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ esetben szinkronizációs hibák jelentkezhetnek.\n" +>>>>>>> Update Hungarian translation. "\n" -"BÅ‘vebb információk: A választott videó %d képkocka hosszú, a mentett állás " -"videója pedig %d képkocka hosszú.\n" +"BÅ‘vebb információk: A választott videó %d képkocka hosszú, a mentett állás videója pedig %d képkocka hosszú.\n" "\n" "%d képkockánál a videó tömörítve lesz:\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 képkockánál a mentett állás videója tömörítve lesz:\n" +<<<<<<< HEAD "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" >>>>>>> Update from master branch. +======= +"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" +>>>>>>> Update Hungarian translation. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -6271,8 +6060,7 @@ msgstr "Meg kell adnod egy nevet!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 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." +msgstr "Be kell írnod egy érvényes decimális, hexadecimális vagy oktális értéket." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 msgid "You must enter a valid profile name." @@ -6280,8 +6068,7 @@ msgstr "Meg kell adnod egy érvényes profil nevet." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 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." +msgstr "Újra kell indítanod a Dolphin emulátort a változtatások érvényesítéséhez." #: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" @@ -6339,19 +6126,14 @@ msgstr "[Egyedi]" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 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 "" "[KÃSÉRLETI]\n" -"Az emuláció gyorsítása a célja a textúrák kirakásával dekódolva a grafikai " -"processzor számára az OpenCL keretrendszert használva.\n" -"Azonban, jelenleg köztudottan textúra hiányosságokat okoz számos játékban. " -"Lassabb is mint az átlagos processzoros textúra dekódolás a legtöbb " -"esetben.\n" +"Az emuláció gyorsítása a célja a textúrák kirakásával dekódolva a grafikai processzor számára az OpenCL keretrendszert használva.\n" +"Azonban, jelenleg köztudottan textúra hiányosságokat okoz számos játékban. Lassabb is mint az átlagos processzoros textúra dekódolás a legtöbb esetben.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." From d73f4d8240565b5adb1d2cc1a53175c2b3584160 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 24 Jan 2012 23:27:19 -0600 Subject: [PATCH 354/381] Update Korean translations. --- Languages/po/ko.po | 202 ++++++++++++++++++++++++++------------------- 1 file changed, 119 insertions(+), 83 deletions(-) diff --git a/Languages/po/ko.po b/Languages/po/ko.po index a8cc90fdaa..f756486f36 100644 --- a/Languages/po/ko.po +++ b/Languages/po/ko.po @@ -10,6 +10,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +<<<<<<< HEAD ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. @@ -17,6 +18,9 @@ msgstr "" "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. "PO-Revision-Date: 2011-07-07 10:24+0900\n" +======= +"PO-Revision-Date: 2012-01-19 11:47+0900\n" +>>>>>>> Update Korean translations. "Last-Translator: \n" "Language-Team: \n" "Language: Korean\n" @@ -66,9 +70,9 @@ msgid "%d Hz" msgstr "%d Hz" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 -#, fuzzy, c-format +#, c-format msgid "%i connected" -msgstr "ì—°ê²°í•´ì œëœ" +msgstr "%i ì—°ê²°ë˜ì—ˆìŠµë‹ˆë‹¤" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296 @@ -82,22 +86,22 @@ msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s ê°€ 실패해서 취소ë˜ì—ˆìŠµë‹ˆë‹¤. ì´ë¯¸ì§€ê°€ ì†ìƒëœ 것 같습니다." #: Source/Core/Core/Src/HW/GCMemcard.cpp:97 -#, fuzzy, c-format +#, c-format msgid "" "%s failed to load as a memorycard \n" " Card file size is invalid (0x%x bytes)" msgstr "" -"메모리카드가 ë¡œë“œì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤\n" -" ì¹´ë“œ í¬ê¸°ê°€ 비ì í•©í•¨ (%04X)" +"%s 는 ë©”ëª¨ë¦¬ì¹´ë“œë¡œì¨ ë¶ˆëŸ¬ì˜¤ê¸°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤ \n" +" ì¹´ë“œ íŒŒì¼ í¬ê¸°ê°€ 유효하지 않습니다 (0x%x bytes)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:112 -#, fuzzy, c-format +#, c-format msgid "" "%s failed to load as a memorycard \n" " Card size is invalid (0x%x bytes)" msgstr "" -"메모리카드가 ë¡œë“œì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤\n" -" ì¹´ë“œ í¬ê¸°ê°€ 비ì í•©í•¨ (%04X)" +"%s 는 ë©”ëª¨ë¦¬ì¹´ë“œë¡œì¨ ë¡œë“œí•˜ëŠ”ë°ì— 실패했습니다 \n" +" ì¹´ë“œ í¬ê¸°ê°€ 유효하지 않습니다 (0x%x bytes)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format @@ -105,6 +109,8 @@ 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 bytes)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -433,7 +439,6 @@ msgid "Accurate VBeam emulation" msgstr "정확한 VBeam ì—뮬레ì´ì…˜" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -#, fuzzy msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -444,7 +449,7 @@ msgstr "" "정확하게 EFB 복사를 ì—뮬합니다.\n" "ì¼ë¶€ ê²Œìž„ë“¤ì€ ê·¸ëž˜í”½ 효과나 ê²Œìž„í”Œë ˆì´ ê¸°ëŠ¥ì„ ì´ê²ƒì— ì˜ì¡´í•©ë‹ˆë‹¤.\n" "\n" -"확신 없으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요" +"확신 없으면, í…ìŠ¤ì²˜ì— EFB를 ì²´í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 @@ -679,9 +684,8 @@ msgstr "" "확신 없으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -#, fuzzy msgid "Alternate Wiimote Timing" -msgstr "ì—ë®¬ëœ ìœ„ëª¨íŠ¸" +msgstr "위모트 타ì´ë° 대안" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -800,7 +804,7 @@ msgid "" msgstr "" "윈ë„ìš° í¬ê¸°ë¥¼ 내부 í•´ìƒë„ë¡œ ìžë™ 조정합니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" @@ -812,7 +816,7 @@ msgstr "" "메모리ì—ì„œ ë°‰ë§µë“¤ì„ ë””ì½”ë”©í•˜ëŠ” ëŒ€ì‹ ì— ìžë™ì ìœ¼ë¡œ ìƒì„±í•©ë‹ˆë‹¤.\n" "성능향ìƒì„ 조금 가져옵니다만 미약한 í…스처 ê²°í•¨ì´ ë°œìƒí• ì§€ë„ 모릅니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ ì²´í¬ìƒíƒœë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ ì²´í¬ìƒíƒœë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" @@ -974,7 +978,7 @@ msgstr "" "í”½ì…€ê´‘ì› ëª…ì•”(í–¥ìƒ)ì—ì„œ, 픽셀단위 ê¹Šì´ ê³„ì‚°ì€ ì†Œìˆ˜ ê²Œìž„ë“¤ì„ ì œëŒ€ë¡œ ì—뮬할 ë•Œ " "필요가 있습니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ ì²´í¬ìƒíƒœë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ ì²´í¬ìƒíƒœë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" @@ -988,7 +992,7 @@ msgstr "" "ì¼ë¶€ 비율(GPUíž˜ì— ë‹¬ë¦¼)ë¡œ ì—뮬레ì´ì…˜ ì†ë„를 ê°ì†Œì‹œí‚µë‹ˆë‹¤.\n" "ì´ê²ƒì€ 보통 안전한 í–¥ìƒìž…니다, 하지만 때때로 ì´ìŠˆë“¤ì„ ìœ ë°œí• ì§€ë„ ëª¨ë¦…ë‹ˆë‹¤.\n" "\n" -"확신 없다면, ì–¸ì²´í¬ ìƒíƒœë¡œ ë‘세요." +"모르겠으면, ì–¸ì²´í¬ ìƒíƒœë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 @@ -1007,14 +1011,15 @@ msgid "Cannot unregister events with events pending" msgstr "ì´ë²¤íŠ¸ë“¤ ë¯¸í•´ê²°ì„ ì§€ë‹Œ ì´ë²¤íŠ¸ë“¤ì„ 등ë¡í•˜ì§€ ì•Šì„ ìˆ˜ ì—†ìŒ" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 -#, fuzzy, c-format +#, c-format msgid "" "Cannot use that file as a memory card.\n" "%s\n" "is not a valid gamecube memory card file" msgstr "" -"ê·¸ 파ì¼ì„ 메모리 카드로 사용할 수 ì—†ìŒ.\n" -"ë‘˜ë‹¤ì˜ ìŠ¬ë¡¯ë“¤ì— ê°™ì€ íŒŒì¼ì„ 사용하려 합니까?" +"ê·¸ 파ì¼ì„ 메모리 카드로 사용할 수 없습니다.\n" +"%s\n" +"는 유효한 게임í브 메모리 ì¹´ë“œ 파ì¼ì´ 아닙니다" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" @@ -1442,7 +1447,7 @@ msgstr "만든ì´:" #: Source/Core/Common/Src/MsgHandler.cpp:68 msgid "Critical" -msgstr "" +msgstr "치명ì " #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" @@ -1456,7 +1461,7 @@ msgid "" msgstr "" "ê·¸ë¦¼ì„ 4:3ì—ì„œ 5:4ë¡œ í˜¹ì€ 16:9ì—ì„œ 16:10으로 ìžë¦…니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48 msgid "Crossfade" @@ -1680,7 +1685,7 @@ msgstr "" "ì—뮬레ì´ì…˜ ì†ë„ê°€ ë§Žì´ í–¥ìƒë˜ì§€ë§Œ ê·¸ê²ƒë“¤ì— ì˜ì¡´í•˜ëŠ” ë§Žì€ ê²Œìž„ë“¤(특히 ìžê°€ ì–´" "플들)ì—ì„œ 심ê°í•œ ê²°í•¨ë“¤ì„ ìœ ë°œí•©ë‹ˆë‹¤.\n" "\n" -"확신 없다면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" @@ -1694,7 +1699,7 @@ msgstr "" "\"EFB 복사\" ì—뮬레ì´ì…˜ì„ 비활성합니다.\n" "ì´ë“¤ì€ 종종 후-처리나 í…스처로 ë Œë” íš¨ê³¼ë“¤ì— ì‚¬ìš©ë©ë‹ˆë‹¤, 그래서 ì´ ì„¸íŒ…ì„ ì²´" "í¬í•˜ë©´ 대단한 ì†ë„í–¥ìƒì„ 가져오지만 ê·¸ê²ƒì€ ê±°ì˜ í•­ìƒ ì´ìŠˆë“¤ë„ 유발합니다.\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" @@ -1704,7 +1709,7 @@ msgid "" msgstr "" "í…스처ë§ì„ 비활성합니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" @@ -1727,7 +1732,7 @@ msgid "" msgstr "" "ì—뮬레ì´í„°ì—ì„œ ì½í˜€ì§„ ìž…ë ¥ë“¤ì„ í‘œì‹œí•©ë‹ˆë‹¤.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:77 msgid "Divide" @@ -1867,7 +1872,7 @@ msgid "" msgstr "" "모든 ë Œë”ëœ í”„ë ˆìž„ë“¤ì„ User/Dump/Frames/ì•ˆì— AVI 파ì¼ë¡œ ë¤í”„합니다\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" @@ -1877,7 +1882,7 @@ msgid "" msgstr "" "User/Dump/Textures// ì— ë””ì½”ë“œëœ ê²Œìž„ í…ìŠ¤ì²˜ë“¤ì„ ë¤í”„합니다\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" @@ -1887,7 +1892,7 @@ msgid "" msgstr "" "User/Dump/Textures/ë¡œ EFB ë³µì‚¬ì˜ ë‚´ìš©ì„ ë¤í”„합니다\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." <<<<<<< HEAD <<<<<<< HEAD @@ -1984,7 +1989,7 @@ msgstr "" "ì—뮬레ì´ì…˜ì´ ë§Žì´ ëŠë ¤ì§€ê³  ê³ í•´ìƒ ë Œë”ë§ì„ 막지만 ë‹¤ìˆ˜ì˜ ê²Œìž„ë“¤ì„ ì ì ˆížˆ ì—뮬" "하기위해 필요합니다.\n" "\n" -"확신 없다면, ëŒ€ì‹ ì— \"ê°€ìƒ XFB ì—뮬레ì´ì…˜\"ì„ ì²´í¬í•˜ì„¸ìš”." +"모르겠으면, ëŒ€ì‹ ì— \"ê°€ìƒ XFB ì—뮬레ì´ì…˜\"ì„ ì²´í¬í•˜ì„¸ìš”." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" @@ -2000,7 +2005,7 @@ msgstr "" "않는 ë§Žì€ ê²Œìž„ë“¤ì„ ê³ ì¹©ë‹ˆë‹¤. 하지만, 여전히 ë§Žì€ ë‹¤ë¥¸ 게임들(특히 ìžê°€ 어플)" "ì—서는 실패합니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 msgid "Emulated Wiimote" @@ -2028,7 +2033,7 @@ msgstr "" "ì•„ë§ˆë„ ì´ìŠˆë“¤ì„ ì¼ìœ¼í‚µë‹ˆë‹¤.\n" "ìž‘ë™í•˜ë ¤ë©´ ì „ì²´í™”ë©´ì´ ìš”êµ¬ë©ë‹ˆë‹¤.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 msgid "Enable AR Logging" @@ -2052,7 +2057,7 @@ msgstr "ë¸”ë¡ í•©ì¹˜ê¸° 활성" >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" -msgstr "" +msgstr "바운딩 박스 계산 켜기" <<<<<<< HEAD ======= @@ -2132,7 +2137,7 @@ msgstr "" "비스듬한 보기 ê°ë„ë“¤ì— ìžˆëŠ” í…ìŠ¤ì²˜ë“¤ì˜ ë¹„ì£¼ì–¼ í’ˆì§ˆì„ í–¥ìƒì‹œí‚¨ë‹¤.\n" "소수 게임ì—ì„œ ì´ìŠˆë“¤ì„ ì¼ìœ¼í‚¬ì§€ë„ 모른다.\n" "\n" -"확신 없다면, 1x를 ì„ íƒí•˜ì„¸ìš”." +"모르겠으면, 1x를 ì„ íƒí•˜ì„¸ìš”." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" @@ -2155,7 +2160,7 @@ msgstr "" "ì „ì²´ í™”ë©´ì´ ë Œë”ë§ì— 사용ë˜ê¸¸ ì›í•˜ë©´ ì´ê²ƒì„ 활성화하세요.\n" "ì´ê²ƒì´ 비활성화ë˜ë©´, ë Œë” ìœˆë„ìš°ê°€ 대신 ìƒì„±ë  것입니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" @@ -2167,7 +2172,7 @@ msgstr "" "ë Œë”를 위해 ë¶„ë¦¬ëœ ë Œë” ì°½ì´ ì•„ë‹Œ ë©”ì¸ ëŒí•€ ì°½ì„ ì‚¬ìš©í•˜ë ¤ë©´ ì´ê²ƒì„ 활성화하세" "ìš”.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" @@ -2200,7 +2205,7 @@ msgstr "" "ì—ë®¬ëœ ì†Œí”„íŠ¸ì—ì„œ 지ì›ë˜ë©´ 프로그레시브 ìŠ¤ìº”ì„ í™œì„±í™”í•©ë‹ˆë‹¤.\n" "ëŒ€ë¶€ë¶„ì˜ ê²Œìž„ë“¤ì€ ì´ê²ƒì— 대해 ìƒê´€í•˜ì§€ 않습니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "" @@ -2216,7 +2221,7 @@ msgid "" msgstr "" "FFV1 ì½”ë±ì„ 사용하여 프레임 ë¤í”„ë“¤ì„ ì¸ì½”드합니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:50 msgid "End" @@ -2295,6 +2300,8 @@ msgid "" "Error in PlayWiimote. %u != %u, byte %d.\n" "Sorry, Wii recording is temporarily broken." msgstr "" +"PlayWiimoteì— ì—러발ìƒ. %u != %u, byte %d.\n" +"죄송합니다, Wii 녹화가 ì¼ì‹œì ìœ¼ë¡œ 깨졌습니다." >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 @@ -2307,6 +2314,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:279 #, c-format @@ -2677,7 +2686,7 @@ msgstr "" "ê²Œìž„ì´ ëª…ë°±ížˆ ê·¸ê²ƒì„ ê»ë”ë¼ë„ í…스처 í•„í„°ë§ì„ 강제시킨다.\n" "í…스처 í’ˆì§ˆì„ í–¥ìƒì‹œí‚¨ë‹¤ 하지만 ì¼ë¶€ 게임들ì—서는 ê²°í•¨ë“¤ì„ ìœ ë°œí•œë‹¤.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" @@ -2689,7 +2698,7 @@ msgstr "" "와ì´ë“œìŠ¤í¬ë¦° í•´ìƒë„ ê·¸ëž˜í”½ì„ ì¶œë ¥í•˜ê²Œ ê²Œìž„ì„ ê°•ì œì‹œí‚µë‹ˆë‹¤.\n" "ì¼ë¶€ 게임ì—ì„œ 그래픽 ê²°í•¨ì„ ìœ ë°œí•©ë‹ˆë‹¤.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" @@ -2791,9 +2800,8 @@ msgid "GCI File(*.gci)" msgstr "GCI 파ì¼(*.gci)" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 -#, fuzzy msgid "GCMic Configuration" -msgstr "로그 환경설정" +msgstr "GCMic 환경설정" #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" @@ -2918,7 +2926,6 @@ msgid "Greater Than" msgstr "보다 í°" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -#, fuzzy msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2928,10 +2935,12 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"\"í…ìŠ¤ì²˜ì— ë Œë”\"를 사용하여 ìƒì„±ëœ í…스ì³ë“¤ì˜ ì§ˆì„ ì—„ì²­ë‚˜ê²Œ í–¥ìƒì‹œí‚µë‹ˆë‹¤.\n" -"내부 í•´ìƒë„를 올리면 ì´ ì„¸íŒ…ì˜ íš¨ê³¼ë¥¼ í–¥ìƒì‹œí‚¬ 것입니다.\n" +"\"í…ìŠ¤ì²˜ì— ë Œë”\" íš¨ê³¼ë“¤ì„ ì‚¬ìš©í•˜ì—¬ ìƒì„±ëœ í…스ì³ë“¤ì˜ ì§ˆì„ ì—„ì²­ë‚˜ê²Œ í–¥ìƒì‹œí‚µ" +"니다.\n" +"내부 í•´ìƒë„를 올리면 ì´ ì„¸íŒ…ì˜ íš¨ê³¼ë¥¼ í–¥ìƒì‹œí‚µë‹ˆë‹¤.\n" +"ì„±ëŠ¥ì„ ì•½ê°„ ê°ì†Œì‹œí‚¤ê³  ì´ìŠˆë¥¼ ì•„ë§ˆë„ ìœ ë°œí•  수 있습니다 (ì˜ˆìƒ ë°–ì¼ì§€ë¼ë„).\n" "\n" -"확신 없다면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" @@ -3010,7 +3019,7 @@ msgid "" msgstr "" "ì—뮬레ì´ì…˜ 윈ë„ìš° ìœ„ì— ë§ˆìš°ìŠ¤ 커서가 ìžˆì„ ë•Œ 숨ê¹ë‹ˆë‹¤.\n" "\n" -"확신 없다면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Home" @@ -3109,6 +3118,8 @@ msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +"ì²´í¬í•˜ë©´, 바운딩 박스 ë ˆì§€ìŠ¤í„°ë“¤ì´ ì—…ë°ì´íŠ¸ë  것입니다. Paper Mario 게임들ì—" +"ì„œ 사용ë©ë‹ˆë‹¤." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" @@ -3141,7 +3152,7 @@ msgstr "" "네거티브 효과 없는 ë§Žì€ ê²Œìž„ë“¤ì—ì„œ ì„±ëŠ¥ì„ í–¥ìƒì‹œí‚µë‹ˆë‹¤. 소수 다른 게임들ì—ì„œ " "그래픽 ê²°í•¨ì„ ìœ ë°œí•˜ê¸´ 합니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" @@ -3155,7 +3166,7 @@ msgstr "" "ì¼ë¶€ 게임들ì—ì„œ ì„±ëŠ¥ì„ í–¥ìƒì‹œí‚µë‹ˆë‹¤, 하지만 ì¼ë¶€ 게임플레ì´ê´€ë ¨ 특성들ì´ë‚˜ ê·¸" "래픽 íš¨ê³¼ë“¤ì´ ë¹„í™œì„±í™” ë ì§€ 모릅니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 msgid "Import Save" @@ -3194,7 +3205,7 @@ msgid "" msgstr "" "ì„±ëŠ¥ì´ í–¥ìƒë˜ì§€ë§Œ 올바른 안개 ì—뮬레ì´ì…˜ì— ì˜ì¡´í•œ ëŒ€ë¶€ë¶„ì˜ ê²Œìž„ì—ì„œ ê²°í•¨ì„ ìœ " "발합니다.\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" @@ -3204,7 +3215,7 @@ msgid "" msgstr "" "ì„±ëŠ¥ì´ í–¥ìƒë˜ì§€ë§Œ ëŒ€ë¶€ë¶„ì˜ ê²Œìž„ì—ì„œ ë¹›ì´ ì‚¬ë¼ì§ì„ 유발합니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" @@ -3553,7 +3564,7 @@ msgid "" msgstr "" "User/Load/Textures// ì—ì„œ 커스텀 í…ìŠ¤ì²˜ë“¤ì„ ë¡œë“œ\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/PHackSettings.cpp:49 msgid "Load preset values from hack patterns available." @@ -3700,7 +3711,7 @@ msgstr "" #: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" -msgstr "" +msgstr "메모리카드 파ì¼í¬ê¸°ê°€ í—¤ë” í¬ê¸°ì™€ 불ì¼ì¹˜í•©ë‹ˆë‹¤" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:47 msgid "Menu" @@ -3738,7 +3749,7 @@ msgstr "" "ì¸ì½”딩ë˜ê³  있는 í¬ë©§ì„ 보여주기위해 í…ìŠ¤ì²˜ë“¤ì„ ìˆ˜ì •í•©ë‹ˆë‹¤. ëŒ€ê°œì˜ ê²½ìš° ì—뮬레" "ì´ì…˜ 리셋ì´ìš”구ë©ë‹ˆë‹¤.\n" "\n" -"확신 없다면 ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/LogWindow.cpp:113 msgid "Monospaced font" @@ -4294,17 +4305,17 @@ msgstr "후-처리 효과:" #: Source/Core/Core/Src/Movie.cpp:735 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" -msgstr "" +msgstr "PlayControllerì— ì˜ìƒë§ˆë¬´ë¦¬ê°€ 미완성ë˜ì—ˆìŠµë‹ˆë‹¤. %u + 8 > %u" #: Source/Core/Core/Src/Movie.cpp:829 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" -msgstr "" +msgstr "PlayWiimoteì— ì˜ìƒ 마무리가 미완성ë˜ì—ˆìŠµë‹ˆë‹¤. %u + %d > %u" #: Source/Core/Core/Src/Movie.cpp:806 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" -msgstr "" +msgstr "PlayWiimoteì— ì˜ìƒ 마무리가 미완성ë˜ì—ˆìŠµë‹ˆë‹¤. %u > %u" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " @@ -4387,9 +4398,8 @@ msgid "Real Wiimote" msgstr "실제 위모트" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 -#, fuzzy msgid "Real Wiimotes" -msgstr "실제 위모트" +msgstr "리얼 위모트" #: Source/Core/DolphinWX/Src/Frame.cpp:163 msgid "Reconnect Wiimote Confirm" @@ -4437,7 +4447,7 @@ msgstr "" "ì´ê²ƒì€ ë Œë”ëœ ê·¸ë¦¼ì´ ëœ ë¸”ëŸ­ì ¸ ë³´ì´ê²Œ 합니다.\n" "심ê°í•˜ê²Œ ì—뮬레ì´ì…˜ ì†ë„를 ê°ì†ì‹œí‚¤ê³  때때로 ì´ìŠˆë“¤ì„ 유발합니다.\n" "\n" -"확신 없다면, ì—†ìŒì„ ì„ íƒí•˜ì„¸ìš”." +"모르겠으면, ì—†ìŒì„ ì„ íƒí•˜ì„¸ìš”." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 #: Source/Core/DolphinWX/Src/FrameTools.cpp:434 @@ -4483,7 +4493,7 @@ msgid "" msgstr "" "와ì´ì–´í”„레임으로 ìž¥ë©´ì„ ë Œë”합니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" @@ -4777,7 +4787,7 @@ msgstr "" "ê°•ì œ 4:3: ê·¸ë¦¼ì„ 4:3 종횡비로 늘림\n" "윈ë„ìš°ë¡œ 늘림: ê·¸ë¦¼ì„ ìœˆë„ìš° í¬ê¸°ë¡œ 늘림\n" "\n" -"확신 없다면, ìžë™ì„ ì„ íƒí•˜ì„¸ìš”." +"모르겠으면, ìžë™ì„ ì„ íƒí•˜ì„¸ìš”." #: Source/Core/DolphinWX/Src/LogWindow.cpp:114 msgid "Selected font" @@ -4796,8 +4806,8 @@ msgstr "" "ì´ê²ƒì€ 내부 í•´ìƒë„보다 ë” í¬ê±°ë‚˜ 같아야합니다. 성능 ì˜í–¥ì€ ë¬´ì‹œí•´ë„ ë  ì •ë„ìž…" "니다.\n" "\n" -"ìžì‹  없으면, ë°ìŠ¤í¬íƒ‘ í•´ìƒë„를 사용하세요.\n" -"여전히 ìžì‹  없으면, ìž‘ë™í•˜ëŠ” 최고 í•´ìƒë„를 사용하세요." +"모르겠으면, ë°ìŠ¤í¬íƒ‘ í•´ìƒë„를 사용하세요.\n" +"ê·¸ëž˜ë„ ëª¨ë¥´ê² ìœ¼ë©´, ìž‘ë™í•˜ëŠ” 최고 í•´ìƒë„를 사용하세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" @@ -4813,7 +4823,7 @@ msgstr "" "둘 ì‚¬ì´ ì–´ë”˜ê°€ìž…ë‹ˆë‹¤.\n" "Direct3D ë°±ì—”ë“œë“¤ì€ ìœˆë„우즈 ìƒì—서만 사용할 수 있다는 ê²ƒì„ ì•Œì•„ë‘세요.\n" "\n" -"ìžì‹  없으면, Direct3D 9ì„ ì‚¬ìš©í•˜ì„¸ìš”." +"모르겠으면, Direct3D 9ì„ ì‚¬ìš©í•˜ì„¸ìš”." #: Source/Core/DolphinWX/Src/NetWindow.cpp:275 msgid "Send" @@ -5009,7 +5019,7 @@ msgid "" msgstr "" "ì—뮬레ì´ì…˜ ì†ë„ì˜ ì¸¡ì •ìœ¼ë¡œ 초당 ë Œë”ë˜ëŠ” 프레임 수치를 ë³´ì—¬ì¤ë‹ˆë‹¤.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/Main.cpp:119 msgid "Show this help message" @@ -5027,7 +5037,7 @@ msgid "" msgstr "" "다양한 í†µê³„ë“¤ì„ ë³´ì—¬ì¤ë‹ˆë‹¤.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 msgid "Sideways Wiimote" @@ -5063,7 +5073,7 @@ msgstr "" "다양한 그래픽 íš¨ê³¼ë“¤ì„ ìœ„í•´ ë§Žì€ ê²Œìž„ë“¤ì—ì„œ 사용ë˜ëŠ” \"목표 알파 패스\"를 스" "킵합니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" @@ -5079,7 +5089,7 @@ msgstr "" "때때로 비주얼 í€„ë¦¬í‹°ë„ í–¥ìƒì‹œí‚µë‹ˆë‹¤.\n" "ì–´ëŠ ì´ìŠˆë¥¼ 겪는다면, í…스처 ìºì‰¬ 정확ë„를 올려보거나 ì´ ì˜µì…˜ì„ ë„세요.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 @@ -5112,7 +5122,7 @@ msgid "" msgstr "" "소프트웨어 ë Œë”ë§ì€ 다른 백엔드들 보다 ìƒë‹¹ížˆ ëŠë¦½ë‹ˆë‹¤.\n" "디버깅 목ì ìœ¼ë¡œë§Œ 유용합니다.\n" -"소프트웨어 ë Œë”ë§ì„ í™œì„±ì„ ì •ë§ ì›í•©ë‹ˆê¹Œ? ìžì‹  없으면, '아니오'를 ì„ íƒí•˜ì„¸ìš”." +"소프트웨어 ë Œë”ë§ì„ í™œì„±ì„ ì •ë§ ì›í•©ë‹ˆê¹Œ? 모르겠으면, '아니오'를 ì„ íƒí•˜ì„¸ìš”." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" @@ -5172,7 +5182,7 @@ msgstr "" "다. ì¼ë°˜ì ìœ¼ë¡œ ë§í•´ì„œ, ë‚®ì€ ë‚´ë¶€ í•´ìƒë„ì¼ ìˆ˜ë¡, ë” ë‚˜ì€ ì„±ëŠ¥ì´ ë‚˜ì˜¬ 것입니" "다.\n" "\n" -"확신 없다면, 640x528를 ì„ íƒí•˜ì„¸ìš”." +"모르겠으면, 640x528를 ì„ íƒí•˜ì„¸ìš”." #: Source/Core/DolphinWX/Src/Main.cpp:144 msgid "Specify a video backend" @@ -5256,7 +5266,7 @@ msgstr "" "GPU í…스처 오브ì íŠ¸ì•ˆì˜ EFB ë³µì‚¬ë“¤ì„ ë‹´ìŠµë‹ˆë‹¤.\n" "ì´ê²ƒì€ 그렇게 정확하지는 않습니다. 하지만 ëŒ€ë¶€ë¶„ì˜ ê²Œìž„ì—ì„œ 충분히 잘 ìž‘ë™í•˜" "ê³  \"ëž¨ì— EFB\"를 넘는 대단한 ì†ë„í–¥ìƒì„ ì¤ë‹ˆë‹¤.\n" -"확신 없다면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" @@ -5329,7 +5339,7 @@ msgstr "스í¬ë¦°ìƒ· ì°ê¸°" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "TaruKonga (Bongos)" -msgstr "" +msgstr "타루콩가 (봉고스)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -5414,7 +5424,7 @@ msgid "" msgstr "" "ì´ê²ƒì„ 안전하게 ì •í•  수ë¡, ì—뮬레ì´í„°ê°€ 램으로 부터 í…스처 ì—…ë°ì´íŠ¸ë“¤ì„ ëœ ë†“" "치는 ê²½í–¥ì´ ìžˆìŠµë‹ˆë‹¤.\n" -"확신 없다면, 오른쪽ì—ì„œ ë‘번째-ê°€ìž¥ë¹ ë¦„ì„ ì‚¬ìš©í•˜ì„¸ìš”." +"모르겠으면, 오른쪽ì—ì„œ ë‘번째-ê°€ìž¥ë¹ ë¦„ì„ ì‚¬ìš©í•˜ì„¸ìš”." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" @@ -5505,7 +5515,7 @@ msgstr "" "ì— í•˜ë‚˜ë¥¼ 누르세요 (쉬프트+0 ì€ ë” ë¹ ë¥¸ ì´ë™ì´ê³  쉬프트+9ì€ ë” ëŠë¦° ì´ë™). ì¹´" "ë©”ë¼ë¥¼ 리셋하려면 쉬프트+Rì„ ëˆ„ë¥´ì„¸ìš”.\n" "\n" -"확신 없다면. ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면. ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" @@ -5647,6 +5657,8 @@ msgid "" "Unable to create patch from given values.\n" "Entry not modified." msgstr "" +"주어진 값들ì—ì„œ 패치를 ìƒì„±í•  수 없습니다.\n" +"í•­ëª©ì´ ìˆ˜ì •ë˜ì§€ 않았습니다." #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:123 #, c-format @@ -5748,7 +5760,7 @@ msgstr "" "í…스처를 디코드하기 위해 멀티 쓰레드를 사용합니다.\n" "ì†ë„í–¥ìƒë  ê²ë‹ˆë‹¤ (특히 듀얼코어 ì´ìƒì˜ CPU들 ìƒì—ì„œ).\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" @@ -5762,7 +5774,7 @@ msgstr "" "그렇지만, ì´ ì˜µì…˜ ì²´í¬ë¡œ ìžìœ ë¡œìš´ 게임플레ì´ë¥¼ 방해하는 íŒì—…ë“¤ì„ ìŠ¤í‚µí•  수 있" "습니다.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" @@ -5817,7 +5829,7 @@ msgstr "" "ê°ˆë¼ì§ì„ 줄ì´ê¸°ìœ„í•´ ìˆ˜ì§ ë¸”ëž­í¬ë¥¼ 기다립니다. \n" "ì—뮬레ì´ì…˜ ì†ë„ê°€ 100% ì´í•˜ë¼ë©´ ì„±ëŠ¥ì„ ì €í•˜ì‹œí‚µë‹ˆë‹¤.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/Common/Src/MsgHandler.cpp:67 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 @@ -5868,6 +5880,9 @@ msgid "" "%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). You should load another save before continuing, or load this state " +"with read-only mode off." #: Source/Core/Core/Src/Movie.cpp:646 #, c-format @@ -5876,6 +5891,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:655 #, c-format @@ -5895,6 +5913,20 @@ 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" +"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" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -5951,9 +5983,9 @@ msgid "Wiimote" msgstr "위모트" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 -#, fuzzy, c-format +#, c-format msgid "Wiimote %i" -msgstr "위모트" +msgstr "위모트 %i" #: Source/Core/DolphinWX/Src/Frame.cpp:162 #, c-format @@ -5989,7 +6021,6 @@ msgid "Wiimote settings" msgstr "위모트 설정" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 -#, fuzzy msgid "Wiimotes" msgstr "위모트" @@ -6063,6 +6094,8 @@ msgid "" "You are using free dsp roms made by Dolphin Team.\n" "Only Zelda ucode games will work correctly with them.\n" msgstr "" +"ë‹¹ì‹ ì€ ëŒí•€ íŒ€ì— ì˜í•´ 만들어진 공짜 dsp ë¡¬ë“¤ì„ ì‚¬ìš©í•˜ê³  있습니다.\n" +"Zelda ucode ê²Œìž„ë“¤ë§Œì´ ê·¸ê²ƒë“¤ë¡œ 올바르게 ìž‘ë™í•  것입니다.\n" #: Source/Core/DolphinWX/Src/FrameAui.cpp:72 msgid "You can't close panes that have pages in them." @@ -6135,7 +6168,7 @@ msgstr "" "[고장남]\n" "EFB ì˜ì—­ 하ì´ë¼ì´íŠ¸ê°€ 복사ë˜ì—ˆìŠµë‹ˆë‹¤.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/PHackSettings.cpp:90 msgid "[Custom]" @@ -6157,7 +6190,7 @@ msgstr "" "하지만, 지금 ë‹¹ìž¥ì€ ë‹¤ì–‘í•œ 게임ì—ì„œ í…스처 ê²°í•¨ì„ ìœ ë°œí•˜ëŠ” 것으로 알려집니" "다. ë˜í•œ ëŒ€ë¶€ë¶„ì˜ ê²½ìš°ì—ì„œ ì •ê·œ CPU í…스처 디코딩보다 ëŠë¦½ë‹ˆë‹¤.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" @@ -6171,7 +6204,7 @@ msgstr "" "화면표시 목ë¡ì„ ìºì‰¬í•¨ìœ¼ë¡œ ì—뮬레ì´ì…˜ì„ 약간 ì†ë„í–¥ìƒì‹œí‚µë‹ˆë‹¤.\n" "ì´ìŠˆë“¤ì„ ì¼ìœ¼í‚¬ 수 있지만.\n" "\n" -"확신 없다면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 msgid "^ ADD" @@ -6320,6 +6353,9 @@ msgstr "| OR" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "%s를 열수 ì—†ìŒ, ê·¸ê²ƒì€ ë†“ì¹œ 함수를 가진다" +#~ msgid "Cannot record movies in read-only mode." +#~ msgstr "ì½ê¸°-ì „ìš© 모드ì—ì„œ ì˜ìƒì„ 기ë¡í•  수 없습니다." + #~ msgid "Config..." #~ msgstr "환경설정..." From 1b1016ece71a637a3589396fad66e7338d045c4c Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Fri, 9 Mar 2012 16:58:57 -0600 Subject: [PATCH 355/381] Update the pot file to reflect recent changes in the code. --- Languages/po/ar.po | 968 ++++++++++++-------- Languages/po/ca.po | 964 ++++++++++++-------- Languages/po/cs.po | 1556 +++++++++++++++++++++----------- Languages/po/de.po | 967 ++++++++++++-------- Languages/po/dolphin-emu.pot | 937 ++++++++++++-------- Languages/po/el.po | 996 +++++++++++++-------- Languages/po/en.po | 937 ++++++++++++-------- Languages/po/es.po | 989 +++++++++++++-------- Languages/po/fa.po | 883 ++++++++++--------- Languages/po/fr.po | 988 +++++++++++++-------- Languages/po/he.po | 937 ++++++++++++-------- Languages/po/hu.po | 1614 ++++++++++++++++++++++------------ Languages/po/it.po | 971 ++++++++++++-------- Languages/po/ja.po | 970 ++++++++++++-------- Languages/po/ko.po | 970 ++++++++++++-------- Languages/po/nb.po | 966 ++++++++++++-------- Languages/po/nl.po | 967 ++++++++++++-------- Languages/po/pl.po | 980 +++++++++++++-------- Languages/po/pt.po | 968 ++++++++++++-------- Languages/po/pt_BR.po | 981 +++++++++++++-------- Languages/po/ru.po | 962 ++++++++++++-------- Languages/po/sr.po | 937 ++++++++++++-------- Languages/po/tr.po | 973 ++++++++++++-------- Languages/po/zh_CN.po | 963 ++++++++++++-------- Languages/po/zh_TW.po | 963 ++++++++++++-------- 25 files changed, 15680 insertions(+), 9627 deletions(-) diff --git a/Languages/po/ar.po b/Languages/po/ar.po index 10b8d4bb51..08cfb17be9 100644 --- a/Languages/po/ar.po +++ b/Languages/po/ar.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-16 11:25-0500\n" "Last-Translator: mansoor\n" @@ -22,6 +23,9 @@ msgstr "" "PO-Revision-Date: 2011-10-16 11:25-0500\n" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-27 08:27-0600\n" >>>>>>> Update from master branch. "Last-Translator: mansoor\n" @@ -65,9 +69,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:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d هرتز" @@ -157,7 +161,7 @@ msgstr "%sتصدير GCI%s" msgid "%sImport GCI%s" msgstr "%sاستيراد GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" @@ -190,11 +194,11 @@ msgstr "&مدير الاسرار" msgid "&DSP Settings" msgstr "&إعدادات الصوت" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&مسح ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&حذ٠تحديد ايزو" @@ -258,7 +262,7 @@ msgstr "&وقÙØ©" msgid "&Play" msgstr "&ابداء اللعبه" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&خصائص" @@ -302,7 +306,7 @@ msgstr "&القائمة" msgid "&Wiimote Settings" msgstr "&إعدادات تحكم الوي" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&معلومات عن اللعبة" @@ -346,7 +350,7 @@ msgstr "<أدخل اسم هنا>" msgid "" msgstr "<لم يتم العثور على القرارات>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "<لا شيء>" @@ -355,7 +359,7 @@ msgstr "<لا شيء>" msgid "" msgstr "<اضغط على Ù…Ùتاح>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<النظام>" @@ -409,13 +413,13 @@ msgstr "" "\n" "يجب عليك إعادة توجيه البرنامج منÙØ° الهوست!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "اسرار" @@ -427,11 +431,11 @@ msgstr "ترجمة البرنامج بواسطة الررائع" msgid "Acceleration" msgstr "تسريع" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "ضبط:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulation" @@ -542,11 +546,11 @@ msgstr "كرت الشاشه :" msgid "Add" msgstr "أضÙ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "إضاÙØ© رمز ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "أض٠باتش" @@ -554,6 +558,7 @@ msgstr "أض٠باتش" msgid "Add new pane" msgstr "إضاÙØ© جزء جديد" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -569,6 +574,11 @@ msgstr "إضاÙØ© جزء جديد" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "أضÙ" @@ -602,11 +612,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "ضبط السيطرة على ضغط التناظرية المطلوبة لتنشيط الأزرار." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "متقدم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "إعدادات متقدمة" @@ -614,14 +624,15 @@ msgstr "إعدادات متقدمة" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "All GC/Wii images (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "جميع ملÙات الجيم كيوب (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -634,18 +645,22 @@ msgstr "جميع ملÙات الجيم كيوب (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Ø­Ùظ جميع الحالات (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "جميع ملÙات ايزو الوي" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "جميع مضغوط GC/Wii ISO files (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "جميع الملÙات (*.*)|*.*" @@ -661,6 +676,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD <<<<<<< HEAD @@ -672,6 +688,9 @@ msgid "Alternate Wiimote Timing" msgstr "محاكاة ويموت" >>>>>>> Update translation files for recent changes in the code. ======= +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "بديل ويموت" >>>>>>> Update Arabic and Japanese translations. @@ -692,7 +711,7 @@ msgstr "محمل التطبيق هو حجم الخطأ... هل حقا محمل msgid "Apploader unable to load from file" msgstr "Apploader غير قادر على تحميل مل٠من" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -710,7 +729,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا حدد إيقاÙ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arabic" @@ -719,16 +738,17 @@ msgstr "Arabic" msgid "Are you sure you want to delete \"%s\"?" msgstr "هل أنت متأكد أنك تريد حذ٠\"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙØŸ " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙات؟" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -738,6 +758,9 @@ msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙات؟" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "نسبة العرض :" @@ -746,18 +769,20 @@ msgstr "نسبة العرض :" msgid "At least one pane must remain open." msgstr "يجب أن لا يقل عن جزء واحد لا تزال Ù…Ùتوحة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "صوت الخلÙية :" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -767,6 +792,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "تلقائي" @@ -809,7 +837,7 @@ msgstr "" msgid "Back" msgstr "رجوع" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "إعدادات الخلÙية" @@ -836,11 +864,11 @@ msgstr "سيء بداية المل٠" msgid "Banner" msgstr "بنر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "تÙاصيل بنر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "بنر:" @@ -852,7 +880,7 @@ msgstr "شريط" msgid "Basic" msgstr "الأساسية" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "إعدادات أساسية" @@ -883,6 +911,7 @@ msgstr "اليمين أزرق" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -890,6 +919,9 @@ msgstr "اليمين أزرق" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "أسÙÙ„" @@ -898,7 +930,7 @@ msgstr "أسÙÙ„" msgid "Bound Controls: %lu" msgstr "يلزم التحكم: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "معطلة" @@ -914,7 +946,7 @@ msgstr "لتصÙØ­ دليل لإضاÙØ©" msgid "Browse for an ISO directory..." msgstr "لاستعراض الدليل ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "لاستعراض الدليل الإخراج" @@ -944,11 +976,11 @@ msgstr "العصا الأيمن " msgid "C-Stick" msgstr "العصا الأيمن " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "محرك محاكي المعالج" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "شاشة القوائم المؤقته" @@ -1008,6 +1040,7 @@ msgstr "لا يمكن تسجيل الأÙلام ÙÙŠ وضع للقراءة ÙÙ‚ msgid "Cannot unregister events with events pending" msgstr "لا يمكن إلغاء تسجيل الأحداث مع الأحداث المعلقة" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 @@ -1017,6 +1050,9 @@ msgstr "لا يمكن إلغاء تسجيل الأحداث مع الأحداث ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1027,7 +1063,7 @@ msgstr "" "%s\n" "ليست ذاكرة جيم كيوب مل٠بطاقة صالحة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1045,8 +1081,6 @@ msgstr "غير قادر العثور على ويموت: %02x:%02x:%02x:%02x:%02x msgid "Cant find WiiMote by connection handle %02x" msgstr "غير قادر على العثور ويموت بواسطة معالج الاتصال %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1056,7 +1090,7 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Catalan" @@ -1081,7 +1115,7 @@ msgstr "تغيير القرص" msgid "Change Game" msgstr "تغيير اللعبة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1097,8 +1131,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:506 #: 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 "تغيير هذه ليس لها أي أثر ÙÙŠ حين أن المحاكي قيد التشغيل!" @@ -1118,31 +1152,31 @@ msgstr "بحث عن اسرار" msgid "Cheats Manager" msgstr "قائمة الاسرار" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinese (Simplified)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinese (Traditional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "DVD اختيار الدليل أصل :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: 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:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "اختيار ايزو الاÙتراضية :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "اختيار دليل لإضاÙØ©" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "اختيار مل٠لÙتح" @@ -1150,15 +1184,15 @@ msgstr "اختيار مل٠لÙتح" msgid "Choose a memory card:" msgstr "اختيار بطاقة الذاكرة :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: 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:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "اختيار مجلد لاستخراج" @@ -1170,14 +1204,14 @@ msgstr "دائرة العصا" msgid "Classic" msgstr "الكلاسيكية" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "أزال" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Ùشل ÙÙŠ الازاله." @@ -1193,6 +1227,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1201,6 +1236,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "إغلاق" @@ -1224,20 +1263,20 @@ msgstr "الأمر" msgid "Comment" msgstr "التعليق" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "التعليق:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "ضغط ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "اختيار ضغط ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "ضغط ايزو" @@ -1264,13 +1303,13 @@ msgstr "تكوين منصات" msgid "Configure..." msgstr "إعدادات" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "تأكيد الكتابة Ùوق ملÙ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "تأكيد على التوقÙ" @@ -1279,7 +1318,7 @@ msgstr "تأكيد على التوقÙ" msgid "Connect" msgstr "اتصال" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "ربط كيبورد يو اس بي" @@ -1336,12 +1375,12 @@ msgstr "GCIتحويل إلى " msgid "Copy failed" msgstr "Ùشل نسخ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "نسخ إلى بطاقة الذاكرة %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "الأساسية" @@ -1371,7 +1410,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "لا يمكن التعر٠مل٠ايزو %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "لا يمكن Ø­Ùظ %s" @@ -1384,7 +1423,7 @@ msgstr "" "تعذر تعيين منصات. وغادر لاعب أو لعبة قيد التشغيل حاليا!\n" "(منصات الإعداد أثناء قيد التشغيل اللعبة غير معتمد حتى الآن)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1397,7 +1436,7 @@ msgstr "" "Are you running Dolphin from a CD/DVD, or is the save file maybe write " "protected?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "لا يمكن العثور Ùتح الأوامر للتمديد 'ini'!" @@ -1414,7 +1453,7 @@ msgstr "" msgid "Count:" msgstr "الاحصاء :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "البلد:" @@ -1428,28 +1467,28 @@ msgstr "إنشاء رموز اسرار" msgid "Create new perspective" msgstr "إنشاء منظور جديد" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr " KDE-Look.org تم بواسطة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 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:498 msgid "Created by VistaIcons.com" msgstr " VistaIcons.com تم بواسطة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 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:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "المنشئ :" @@ -1457,7 +1496,7 @@ msgstr "المنشئ :" msgid "Critical" msgstr "حرج" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "محصول" @@ -1480,7 +1519,7 @@ msgstr "الإبهات المتداخل" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "المسار الحالي تغيرت من %s to %s after wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "هاك مخصص العرض" @@ -1488,11 +1527,11 @@ msgstr "هاك مخصص العرض" msgid "Custom Projection Hack Settings" msgstr "إعدادات هاك مخصص العرض" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "تخصيص بعض المعلمات العرض على إملائي." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Czech" @@ -1504,10 +1543,11 @@ msgstr "الاسهم" msgid "DSP" msgstr "الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "محرك محاكي الصوت" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1518,18 +1558,22 @@ msgstr "محرك محاكي الصوت" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulation (سريع)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (بطيء)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE on Thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE recompiler" @@ -1537,15 +1581,23 @@ msgstr "DSP LLE recompiler" msgid "DSP settings" msgstr "إعدادات الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD Root:" +#: 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:176 msgid "Data Size" msgstr "حجم البيانات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "التاريخ :" @@ -1566,7 +1618,7 @@ msgstr "المنطقة الميتة" msgid "Debug" msgstr "التصحيح" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "التصحيح" @@ -1574,16 +1626,16 @@ msgstr "التصحيح" msgid "Decimal" msgstr "عشري" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "ضغط ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "اختيار إلغاء ضغط ايزو " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "ÙÙƒ ايزو" @@ -1591,11 +1643,11 @@ msgstr "ÙÙƒ ايزو" msgid "Default" msgstr "الاÙتراضي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ايزو الاÙتراضية :" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "الخط الاÙتراضي" @@ -1604,7 +1656,7 @@ msgstr "الخط الاÙتراضي" msgid "Delete" msgstr "حذÙ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "حذ٠الحÙظ" @@ -1613,7 +1665,7 @@ msgstr "حذ٠الحÙظ" msgid "Delete the existing file '%s'?" msgstr "حذ٠المل٠الموجود '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "الوصÙ" @@ -1621,8 +1673,8 @@ msgstr "الوصÙ" msgid "Detect" msgstr "كشÙ" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: 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." @@ -1633,8 +1685,8 @@ msgstr "" msgid "Device" msgstr "أداة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "إعدادات الجهاز" @@ -1659,23 +1711,23 @@ msgstr "" " Ùˆ Ùشل دليل الاختباري الاحتياطية" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "تعطيل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "تعطيل الضباب" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "تعطيل إضاءة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "تعطيل العمق لكل بكسل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Texturesتعطيل " @@ -1719,7 +1771,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "القرص" @@ -1746,6 +1798,7 @@ msgstr "" msgid "Divide" msgstr "انقسام" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1755,10 +1808,13 @@ msgstr "انقسام" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "هل تريد اغلق اللعبة الحالية؟" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "دولÙين" @@ -1783,6 +1839,7 @@ msgstr "إعدادات تحكم الوي" msgid "Dolphin FIFO" msgstr "دولÙين" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1807,6 +1864,14 @@ msgstr "إعدادات تحكم الجيم كيوب" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "إعدادات تحكم الجيم كيوب" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1837,11 +1902,11 @@ msgstr "" msgid "Down" msgstr "أسÙÙ„" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "تحميل اسرار للعبة" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu وأضا٠%lu تم تحميل الاسرار " @@ -1850,23 +1915,23 @@ msgstr "%lu وأضا٠%lu تم تحميل الاسرار " msgid "Drums" msgstr "الطبول" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "وهمي " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Dump Audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Dump EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "تÙريغ الإطارات" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Dump Textures" @@ -1900,6 +1965,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1915,6 +1981,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Dutch" @@ -1935,7 +2006,7 @@ msgid "" "driver." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "أوروبا" @@ -1951,7 +2022,7 @@ msgstr "تحرير" msgid "Edit ActionReplay Code" msgstr "تعديل رمز ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "تعديل الاعدادات" @@ -1963,8 +2034,8 @@ msgstr "تعديل الباتش" msgid "Edit current perspective" msgstr "تعديل المنظور الحالي" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "تحرير" @@ -2009,7 +2080,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "محاكاة ويموت" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "حالة المحاكاه: " @@ -2038,18 +2109,15 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Enable Audio Throttle" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "BAT تمكين" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "تمكين منع الدمج" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 @@ -2060,6 +2128,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "تمكين تنظيم حساب الإطار" @@ -2068,6 +2139,7 @@ msgstr "تمكين تنظيم حساب الإطار" msgid "Enable Cache" msgstr "تمكين التخزين المؤقت" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2077,51 +2149,54 @@ msgstr "تمكين التخزين المؤقت" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "تمكين الاسرار " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Enable DTK Music" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Enable Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Enable Dual Core (لزيادة السرعة)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "تمكين الاختصارات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Enable Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Enable Idle Skipping (لزيادة السرعة)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "MMU تمكين" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "تمكين المسح التقدمي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "تمكين شاشة التوقÙ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "تمكين شاشة عريضة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "تمكين الإطار السلكي" @@ -2139,7 +2214,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا حدد X1." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2147,7 +2222,7 @@ msgstr "" "تمكين الوصول السريع القرص.اللازمة لعدد قليل من الألعاب. (ON = Fast, OFF = " "Compatible)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "تمكين صÙحات" @@ -2175,20 +2250,20 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "تمكين هذا لتسريع أسطورة زيلدا : الشÙÙ‚ الاميرة. لتعطيل أي لعبة أخرى." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: 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:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "يمكن توقعات مخصص هاك" @@ -2204,7 +2279,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذه غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2224,6 +2299,7 @@ msgstr "" msgid "End" msgstr "نهاية" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2239,6 +2315,11 @@ msgstr "نهاية" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "English" @@ -2269,6 +2350,7 @@ msgstr "المساواة" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "خطأ" @@ -2299,18 +2381,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "خطأ" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "خطأ ÙÙŠ تحميل اللغة المختارة. يتراجع إلى النظام الاÙتراضية." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2344,7 +2432,7 @@ msgstr "للخروج مع المحاكي" msgid "Export Failed" msgstr "Ùشل تصدير" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Ùشل تصدير" @@ -2357,15 +2445,15 @@ msgstr "تصدير تسجيل" msgid "Export Recording..." msgstr "تصدير تسجيل" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "تصدير Ø­Ùظ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "تصدير Ø­Ùظ الوي" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "تصدير جميع الحÙظ" @@ -2381,7 +2469,7 @@ msgstr "تصدير Ø­Ùظ باسم" msgid "Extension" msgstr "تمديد" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "عزل الاطار الخارجي" @@ -2393,44 +2481,44 @@ msgstr "معلمة إضاÙية" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "استخراج كاÙØ© الملÙات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "استخراج Apploader" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "استخراج دليل" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "استخراج الملÙات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "استخراج التقسيم" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "استخراج %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "استخراج كاÙØ© الملÙات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "استخراج دليل" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "استخراج" @@ -2442,11 +2530,11 @@ msgstr "بايت" msgid "FIFO Player" msgstr "لاعبين" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "Ùرنسا" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "الحجم :" @@ -2458,11 +2546,11 @@ msgstr "خطأ الاتصال" msgid "Failed to Listen!!" msgstr "لم اسمع!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "اللعبه لاتوجد ÙÙŠ قاعده البيانات." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Ùشل ÙÙŠ الاستخراج إلى %s!" @@ -2561,18 +2649,28 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "Ùشل لكتابة عنوان لمل٠%d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "سريع" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Mipmaps سريع" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "لاعبين" @@ -2581,7 +2679,7 @@ msgstr "لاعبين" msgid "File Info" msgstr "مل٠المعلومات" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "المل٠لا يتضمن اسرار." @@ -2614,16 +2712,16 @@ msgstr "لم يتم التعر٠على المل٠كمل٠بطاقة ذاكر msgid "File not compressed" msgstr "مل٠غير مضغوط " -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "الملÙات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "نوع المل٠غير معروÙ! لن تÙتح!" @@ -2631,7 +2729,7 @@ msgstr "نوع المل٠غير معروÙ! لن تÙتح!" msgid "First Block" msgstr "أول بلوك" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "الإصلاح اختبارية" @@ -2643,7 +2741,7 @@ msgstr "العرض 16:9" msgid "Force 4:3" msgstr "العرض 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Ùرض وحدة التحكم على النظام الياباني" @@ -2675,7 +2773,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 " @@ -2709,7 +2807,7 @@ msgstr "الإطار" msgid "Frame Advance" msgstr "الإطار المسبق" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Frame Dumps use FFV1" @@ -2721,7 +2819,7 @@ msgstr "مجموعة الإطار " msgid "Frame S&kipping" msgstr "تخطي الإطار " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "حد الإطار:" @@ -2729,10 +2827,11 @@ msgstr "حد الإطار:" msgid "Frames To Record" msgstr "إطارات لتسجيل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "تحكم بكاميرا اللعبة" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2748,6 +2847,11 @@ msgstr "تحكم بكاميرا اللعبة" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "French" @@ -2785,7 +2889,7 @@ msgstr "سجل الإعدادات" msgid "GCPad" msgstr "تحكم الجيم كيوب" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "معر٠اللعبة:" @@ -2801,15 +2905,15 @@ msgstr "اللعبة ليست على التوالي!" msgid "Game not found!!" msgstr "لم يتم العثور على لعبة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "إعدادات معينه للعبه" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "إعدادات اللعبة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "جيم كيوب" @@ -2820,6 +2924,7 @@ msgstr "إعدادات تحكم جيم كيوب" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2827,6 +2932,9 @@ msgstr "إعدادات تحكم جيم كيوب" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "بطاقه ذاكره الجيم كيوب (*.raw,*.gcp) " @@ -2835,15 +2943,17 @@ msgid "Gamecube Pad settings" msgstr "إعدادات تحكم جيم كيوب" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "تحميل اسرار" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, 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.)" +"(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 "" "GeckoCode Ùشل تشغيل (CT%i CST%i) (%s)\n" "(إما غير رمز سيئة أو نوع رمز غير مدعومة حتى الآن.)" @@ -2852,6 +2962,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2860,6 +2971,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "عام" @@ -2868,6 +2982,7 @@ msgstr "عام" msgid "General Settings" msgstr "الإعدادات العامة" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2883,6 +2998,11 @@ msgstr "الإعدادات العامة" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "German" @@ -2926,7 +3046,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا، اترك هذا التحقق." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Greek" @@ -2958,7 +3078,7 @@ msgstr "هاك" msgid "Header checksum failed" msgstr "عنوان اختباري Ùشل" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebrew" @@ -3028,12 +3148,16 @@ msgstr "إعدادات الاختصارات" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "الاختصارات" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Hungarian" @@ -3041,12 +3165,12 @@ msgstr "Hungarian" msgid "Hybrid Wiimote" msgstr "ويموت هجين" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3055,11 +3179,11 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL إعدادات" @@ -3075,15 +3199,15 @@ msgstr "IR المؤشر" msgid "IR Sensitivity:" msgstr "IR حساسية:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "تÙاصيل ايزو" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "مجلد الايزو" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "إيطاليا" @@ -3091,7 +3215,7 @@ msgstr "إيطاليا" msgid "Icon" msgstr " أيقونة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3102,15 +3226,17 @@ msgstr "" "ماريو" >>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: 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:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy msgid "" -"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." +"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 "" "لجعلها Ùعالة Audio Throttle يجب عليك تعطيل NTSC:60, PAL:50 إذا قمت بتعيين " "حد الإطار أعلى من السرعة لعبة الاÙتراضية " @@ -3147,7 +3273,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Ø­Ùظ استيراد" @@ -3193,7 +3319,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا ترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "تتعطل ÙÙŠ اللعبة" @@ -3202,7 +3328,7 @@ msgid "In-Game" msgstr "ÙÙŠ اللعبة" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "معلومات" @@ -3222,7 +3348,7 @@ msgstr "إدراج" msgid "Insert Encrypted or Decrypted code here..." msgstr "إدراج رمز المشÙرة أو ÙÙƒ Ø´Ùرة هنا" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "SD Card ادرج " @@ -3234,7 +3360,7 @@ msgstr "أدخل اسم هنا" msgid "Install WAD" msgstr "wad تثبيت" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "تثبيت إلى قائمة الوي" @@ -3243,6 +3369,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3252,14 +3379,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "wad تثبيت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "الواجهة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "واجهة الإعدادات" @@ -3284,11 +3414,11 @@ msgstr "" msgid "Internal Resolution:" msgstr "الدقة الداخلية :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreter (بطيئة جدا)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "تتعطل ÙÙŠ المقدمة" @@ -3305,7 +3435,7 @@ msgstr "قيمة غير صالحة!" msgid "Invalid bat.map or dir entry" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "غير صالح نوع الحدث %i" @@ -3322,14 +3452,15 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "تسجيل المل٠غير صالح" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "غير صالح حالة" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3345,27 +3476,32 @@ msgstr "غير صالح حالة" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italian" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "اليابان" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (موصى به)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL recompiler (تجريبي )" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japanese" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "كوريا" @@ -3374,8 +3510,8 @@ msgstr "كوريا" msgid "Key" msgstr "المÙتاح" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Korean" @@ -3393,7 +3529,7 @@ msgstr "L Button" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "اللغة :" @@ -3441,7 +3577,7 @@ msgstr "" msgid "Less Than" msgstr "أقل من" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "الحد من عدد الإطارات ÙÙŠ الثانية " @@ -3449,7 +3585,7 @@ msgstr "الحد من عدد الإطارات ÙÙŠ الثانية " msgid "Load" msgstr "تحميل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "تحميل القوام المخصص" @@ -3497,6 +3633,7 @@ msgstr "8 تحميل حالة" msgid "Load State..." msgstr "تحميل حالة" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3518,6 +3655,13 @@ msgstr "تحميل قائمة نظام الوي" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "تحميل قائمة نظام الوي" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "تحميل قائمة نظام الوي %d%c" @@ -3544,7 +3688,7 @@ msgstr "تحميل المل٠المحدد (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "المحلية" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Lock Threads to Cores" @@ -3556,11 +3700,11 @@ msgstr "سجل" msgid "Log Configuration" msgstr "سجل الإعدادات" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "نوع السجل" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "مختلÙان النواتج" @@ -3588,7 +3732,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU سرعة هاك" @@ -3610,11 +3754,11 @@ msgstr "" msgid "Main Stick" msgstr "العصا الأيسر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "معر٠المنتج :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "المنتج :" @@ -3638,6 +3782,7 @@ msgstr "ذاكرة بايت" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3645,6 +3790,9 @@ msgstr "ذاكرة بايت" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "بطاقة الذاكرة" @@ -3679,7 +3827,7 @@ msgstr "حجم بطاقة الذاكرة لا تتطابق مع حجم المل msgid "Menu" msgstr "القائمة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "الميكروÙون" @@ -3688,11 +3836,11 @@ msgstr "الميكروÙون" msgid "Min" msgstr "منخÙض" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "متÙرقات" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "إعدادات منوعة" @@ -3713,7 +3861,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "الخط أحادي المساÙØ©" @@ -3726,7 +3874,7 @@ msgstr "موشن بلس" msgid "Motor" msgstr "محرك" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3748,7 +3896,7 @@ msgstr "" msgid "Multiply" msgstr "تضاعÙ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3840,6 +3988,7 @@ msgstr "التبويب" msgid "NP Up" msgstr "Ùوق" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3849,6 +3998,9 @@ msgstr "Ùوق" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3857,7 +4009,7 @@ msgstr "الاسم :" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "الاسم :" @@ -3871,7 +4023,7 @@ msgid "New Scan" msgstr "بحث جديد" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "الصÙحة التالية" @@ -3883,7 +4035,7 @@ msgstr "البحث التالي" msgid "Nickname :" msgstr "اسمك :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "لا يوجد بلد (SDK)" @@ -3922,7 +4074,7 @@ msgstr "لا Ø­Ùظ المجلد نتيجة البحث عن العنوان %s" msgid "None" msgstr "لا شيء" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norwegian Bokmaal" @@ -3930,8 +4082,8 @@ msgstr "Norwegian Bokmaal" msgid "Not Equal" msgstr "لا يساوي" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "غير مجموعة" @@ -3951,7 +4103,7 @@ msgstr "غير متصل" msgid "Notes" msgstr "ملاحظات" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "ملاحظات :" @@ -3989,7 +4141,7 @@ msgstr "الهدÙ" msgid "Object Range" msgstr "نطاق الهدÙ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "إيقاÙ" @@ -4015,11 +4167,11 @@ msgstr "Ùقط %d كتل متاحة" msgid "Open" msgstr "Ùتح" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Ùتح المجلد المتضمن" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "اÙتح مجلد Ø­Ùظ الوي" @@ -4041,11 +4193,11 @@ msgstr "OpenAL : لا يمكن العثور على أجهزة الصوت" msgid "OpenAL: can't open device %s" msgstr "OpenAL : لا يمكن Ùتح الجهاز %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -4077,7 +4229,7 @@ msgstr "" "واستيراد وحÙظ لبطاقة ذاكرة جديدة\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "أخرى" @@ -4129,19 +4281,20 @@ msgstr "الÙقرة" msgid "Parameters" msgstr "معلمات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "قسم %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "باتش" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "مسارات" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4154,6 +4307,10 @@ msgstr "مسارات" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "وقÙØ©" @@ -4162,7 +4319,7 @@ msgstr "وقÙØ©" msgid "Per-Pixel Lighting" msgstr "لكل بكسل إضاءة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "مثالية" @@ -4175,6 +4332,7 @@ msgstr "مشهد %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4185,6 +4343,10 @@ msgstr "مشهد %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "بدأ اللعبه" @@ -4198,7 +4360,7 @@ msgstr "تشغيل التسجيل" msgid "Play/Pause" msgstr "بدأ/ايقاÙ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "قابلة للتشغيل" @@ -4210,6 +4372,7 @@ msgstr "خيارات التشغيل" msgid "Players" msgstr "لاعبين" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4219,6 +4382,9 @@ msgstr "لاعبين" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "يرجى تأكيد" @@ -4230,23 +4396,23 @@ msgstr "الرجاء إنشاء منظور قبل الحÙظ" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polish" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "تحكم 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "تحكم 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "تحكم 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "تحكم 4" @@ -4255,11 +4421,11 @@ msgstr "تحكم 4" msgid "Port :" msgstr "المنÙØ° :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portuguese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portuguese (Brazilian)" @@ -4267,17 +4433,17 @@ msgstr "Portuguese (Brazilian)" msgid "Post-Processing Effect:" msgstr "بعد معالجة تأثير:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4290,7 +4456,7 @@ msgstr "إعدادات مسبقة :" msgid "Prev Page" msgstr "الصÙحة السابقة" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "الصÙحة السابقة" @@ -4341,7 +4507,7 @@ msgstr "R-Analog" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "روسيا" @@ -4354,7 +4520,7 @@ msgstr "قوه" msgid "Read-only mode" msgstr "وضع القراءة Ùقط" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "حقيقي" @@ -4429,6 +4595,7 @@ msgstr "تحديث قائمة" msgid "Refresh game list" msgstr "تحديث القائمة" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4447,6 +4614,12 @@ msgstr "تحديث القائمة" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "إزالة" @@ -4499,11 +4672,11 @@ msgstr "العصا الايمن" msgid "Rumble" msgstr "هزاز" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: 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:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russian" @@ -4511,10 +4684,11 @@ msgstr "Russian" msgid "Sa&ve State" msgstr "Ø­Ùظ الحالة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "آمنة" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4524,6 +4698,9 @@ msgstr "آمنة" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "معدل العينة :" @@ -4581,12 +4758,12 @@ msgstr "8 Ø­Ùظ حالة" msgid "Save State..." msgstr "Ø­Ùظ حالة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Ø­Ùظ باسم" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Ø­Ùظ مضغوط GCM/ISO" @@ -4594,11 +4771,11 @@ msgstr "Ø­Ùظ مضغوط GCM/ISO" msgid "Save current perspective" msgstr "Ø­Ùظ المنظور الحالي" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Ø­Ùظ الضغط GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4609,6 +4786,7 @@ msgid "Scaled EFB Copy" <<<<<<< HEAD msgstr "EFB Copia a escala" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 <<<<<<< HEAD ======= @@ -4621,15 +4799,18 @@ msgstr "EFB Copia a escala" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Ùحص %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "بحث ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Ùحص" @@ -4645,12 +4826,12 @@ msgstr "انتقل تأمين" msgid "Search Filter" msgstr "بحث Ùلتر" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "البحث ÙÙŠ المجلدات الÙرعية" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: 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 "" @@ -4660,6 +4841,7 @@ msgstr "" msgid "Select" msgstr "حدد" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4684,6 +4866,14 @@ msgstr "اختر مل٠تسجيل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "اختر مل٠تسجيل" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "لتثبيت wad حدد ملÙ" @@ -4709,16 +4899,21 @@ msgstr "اختر النواÙØ° العائمة" msgid "Select the file to load" msgstr "حدد المل٠لتحميل" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "حدد Ø­Ùظ الملÙ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "حدد حالة التحميل" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4738,6 +4933,9 @@ msgstr "حدد حالة التحميل" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "حدد حالة الحÙظ" @@ -4759,7 +4957,7 @@ msgstr "" "\n" "إذاغير متأكد حدد التلقائي." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "تحديد الخط" @@ -4807,11 +5005,11 @@ msgstr "موضع الاستشعار:" msgid "Separator" msgstr "الÙاصل" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbian" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: 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 -- وهذا هو المنÙØ° الذي الأجهزة مثل استخدام محول شبكة" @@ -4820,11 +5018,11 @@ msgstr "المنÙØ° التسلسلي 1 -- وهذا هو المنÙØ° الذي msgid "Set" msgstr "ضبط" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "تعيين كاÙتراضي ايزو" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "تعيين كاÙتراضي بطاقة الذاكرة %c" @@ -4834,7 +5032,7 @@ msgstr "تعيين كاÙتراضي بطاقة الذاكرة %c" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "إعدادات" @@ -4846,7 +5044,7 @@ msgstr "SetupWiiMem: الإعداد غير قادر على إيجاد ملÙ" msgid "Shake" msgstr "هزة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "الاسم المختصر :" @@ -4874,7 +5072,7 @@ msgstr "أظهر شريط الأدوات" msgid "Show Drives" msgstr "اظهر محرك الاقراص" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "إظهار نسخة الصادرات للمناطق" @@ -4890,7 +5088,7 @@ msgstr "Ùرنسا" msgid "Show GameCube" msgstr "جيم كيوب" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "إظهار مدخلات العرض" @@ -4906,7 +5104,7 @@ msgstr "اليابان" msgid "Show Korea" msgstr "كوريا" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "أظهر اللغة :" @@ -4926,7 +5124,7 @@ msgstr "عرض الاجهزه" msgid "Show Regions" msgstr "إظهار المناطق" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "إظهار الإحصاءات" @@ -4946,11 +5144,11 @@ msgstr "Wad اظهار" 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 " @@ -4960,23 +5158,23 @@ msgstr "" "يمكن تجنب تعطيل هذه الرسائل المزعجة ØŒ ولكنه يمكن تعني أيضا أن دولÙين يتعطل " "Ùجأة دون أي تÙسير على الإطلاق." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "إظهار اول كتلة" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "إظهار كتل Ø­Ùظ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "إظهار Ø­Ùظ التعليقات" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "إظهار أيقونة الحÙظ " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "إظهارعنوان الحÙظ " @@ -5013,7 +5211,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "ويموت جانبي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Simplified Chinese" @@ -5021,11 +5219,11 @@ msgstr "Simplified Chinese" msgid "Size" msgstr "الحجم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "تخطي البيوس" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -5066,11 +5264,11 @@ msgstr "" msgid "Slot %i" msgstr "Ùتحة %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "A خانة " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "B خانة " @@ -5093,7 +5291,7 @@ msgstr "" "انها Ù…Ùيدة Ùقط لأغراض التصحيح.\n" "هل حقا تريد تمكين تقديم البرامج؟ إذا لم تكن متأكدا، اختر 'لا'.." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "إعدادات الصوت" @@ -5111,6 +5309,7 @@ msgstr "Ùشل إنشاء المخزن المؤقت الصوت : %s" msgid "Space" msgstr "مجال" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5126,6 +5325,11 @@ msgstr "مجال" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spanish" @@ -5157,7 +5361,7 @@ msgstr "" msgid "Specify a video backend" msgstr "حدد الخلÙية مل٠Ùيديو" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "تسريع معدل نقل القرص" @@ -5165,7 +5369,7 @@ msgstr "تسريع معدل نقل القرص" msgid "Square Stick" msgstr "مربع العصا" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "وحدة تحكم القياسية" @@ -5263,12 +5467,12 @@ msgstr "استيرادها بنجاح Ø­Ùظ الملÙات" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "نظام اللغة :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "تايوان" @@ -5307,7 +5511,7 @@ msgstr "الجدول الأيمن" msgid "Take Screenshot" msgstr "اخذ لقطه من الشاشه" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" <<<<<<< HEAD msgstr "" @@ -5348,7 +5552,7 @@ msgstr "" msgstr "Texture Cache" >>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "" @@ -5364,13 +5568,13 @@ msgstr "عنوان غير صالح" msgid "The checksum was successfully fixed" msgstr "تم إصلاح بنجاح الاختباري" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "الدليل المختار هو بالÙعل ÙÙŠ قائمة" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5392,7 +5596,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:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "لا وجود له (%s) المل٠الذي حددته" @@ -5410,11 +5614,12 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" "أكثر أمانا ضبط هذا، Ùإن على الأرجح أقل المضاهاة تكون Ù…Ùقودة أي تحديثات " "الملمس من ذاكرة الوصول العشوائي.\n" @@ -5457,7 +5662,7 @@ msgstr "" msgid "The value is invalid" msgstr "قيمة غير صالحة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "ثيم" @@ -5465,13 +5670,13 @@ msgstr "ثيم" msgid "Theme selection went wrong" msgstr "اختيار ثيم خاظئ" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5483,7 +5688,7 @@ msgid "" "Replay itself." msgstr "هذه المحاكاة إعادة العمل لا تدعم تعديل الرموز التي اعادتها العمل Ù†Ùسه." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "هذا يمكن أن يسبب بطء ÙÙŠ القائمة لوى وبعض الألعاب." @@ -5507,24 +5712,10 @@ msgstr "" "إذا لم تكن متأكدا اترك هذا غير محددة." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -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" -"اختصار : اضغط باستمرار على الÙور لتعطيل الخنق ÙÙŠ لوحة المÙاتيح." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr " BGM هذا وتستخدم لتشغيل مسارات الموسيقى ØŒ مثل." -#: 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" @@ -5532,7 +5723,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "هذا تسمح لك التعديل اليدوي رسائل كتبها هذا المؤل٠مل٠التكوين" @@ -5555,7 +5746,7 @@ msgstr "العنوان" msgid "To" msgstr "إلى" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "تبديل جميع أنواع السجل" @@ -5575,6 +5766,7 @@ msgstr "اللعب بالشاشة كاملة" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5582,14 +5774,17 @@ msgstr "اللعب بالشاشة كاملة" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "أعلى" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Traditional Chinese" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "حاول تحميل نوع مل٠غير معروÙ." @@ -5597,7 +5792,7 @@ msgstr "حاول تحميل نوع مل٠غير معروÙ." msgid "Triggers" msgstr "Triggers" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "محاولة قراءة من SYSCONF غير صالحة" @@ -5607,7 +5802,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turkish" @@ -5628,11 +5823,11 @@ msgstr "UDP منÙØ° :" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "غير معروÙ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "امريكا" @@ -5717,7 +5912,7 @@ msgstr "التحديث" msgid "Upright Wiimote" msgstr "ويموت مستقيم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "(PAL60) استخدم وضع " @@ -5729,7 +5924,7 @@ msgstr "استخدام شاشة كاملة" msgid "Use Hex" msgstr "استخدام الهيكس" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "" @@ -5760,7 +5955,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Ùائدة" @@ -5784,25 +5979,29 @@ msgstr "القيمة:" msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Ùديو" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "الظاهري" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "الصوت" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format 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" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5821,15 +6020,15 @@ msgstr "" msgid "Warning" msgstr "التنبيه" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "تحذير -- ايزو ابتداء من الخطأ وضع وحدة التحكم!" @@ -5895,7 +6094,7 @@ msgstr "" ======= >>>>>>> Update Arabic and Japanese translations. -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5903,7 +6102,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5911,7 +6110,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5939,7 +6138,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "شاشة واسعة هاك" @@ -5947,15 +6146,15 @@ msgstr "شاشة واسعة هاك" msgid "Width" msgstr "عرض" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "الوي" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "جهاز الوي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND Root:" @@ -5963,6 +6162,7 @@ msgstr "Wii NAND Root:" msgid "Wii Save Import" msgstr "استيراد Ø­Ùظ الوي" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5972,6 +6172,9 @@ msgstr "استيراد Ø­Ùظ الوي" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "ملÙات Ø­Ùظ الوي (*.bin)|*.bin" @@ -6038,10 +6241,11 @@ msgstr "نواÙØ° القائمة" msgid "Windows Right" msgstr "نواÙØ° اليمين" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "كلمة ختامية" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6057,6 +6261,11 @@ msgstr "كلمة ختامية" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "العمل" @@ -6064,6 +6273,11 @@ msgstr "العمل" msgid "Write to Console" msgstr "الكتابة إلى وحدة التحكم" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "الكتابة على الملÙ" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "الكتابة على الملÙ" @@ -6117,7 +6331,7 @@ msgstr "يجب إدخال صالح العشري، أو الست عشرية قي msgid "You must enter a valid profile name." msgstr "يجب إدخال اسم المل٠صالح." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "يجب إعادة تشغيل دولÙين من أجل التغيير ناÙØ° المÙعول." @@ -6138,7 +6352,7 @@ msgstr "" "يجب أن يكون 0x%04x (but is 0x%04llx)\n" "هل تريد إنشاء واحدة جديدة?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP هاك" @@ -6208,7 +6422,7 @@ msgstr "" msgid "^ ADD" msgstr "^أض٠" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6239,12 +6453,12 @@ msgstr "ليس Ø­Ùظ الوي أو قراءة Ùشلة لحجم عنوان ا msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "أمر غير معرو٠0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returned -1 on application run!" @@ -6486,6 +6700,9 @@ msgstr "أو" #~ msgid "Emulator Display Settings" #~ msgstr "إعدادات العرض " +#~ msgid "Enable Audio Throttle" +#~ msgstr "Enable Audio Throttle" + #~ msgid "Enable CPU Access" #~ msgstr "CPU Access تمكين" @@ -6877,6 +7094,19 @@ msgstr "أو" #~ msgid "The file " #~ msgstr "El archivo " +#~ 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 usually used to play voice and sound effects." #~ msgstr "Esto es usado comunmente para reproducir voces y efectos de sonido." diff --git a/Languages/po/ca.po b/Languages/po/ca.po index e7664edac1..2cdcaf6800 100644 --- a/Languages/po/ca.po +++ b/Languages/po/ca.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-08-19 08:36-0500\n" "Last-Translator: Jordi Coma \n" "Language-Team: Catalan \n" @@ -63,9 +67,9 @@ msgstr "\"%s\" no és un fitxer GCM/ISO valid, o no és una ISO GC/Wii." msgid "%1$sCopy%1$s" msgstr "%1$sCopia%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -162,7 +166,7 @@ msgstr "%sExportar com a GCI%s" msgid "%sImport GCI%s" msgstr "%sImportar GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u blocs lliures; %u Entrades Lliures" @@ -195,11 +199,11 @@ msgstr "Gestor de &Trucs" msgid "&DSP Settings" msgstr "Configuració de &DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Eliminar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&EliminarISOs seleccionades ..." @@ -263,7 +267,7 @@ msgstr "&Pausa" msgid "&Play" msgstr "&Executar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Propietats" @@ -307,7 +311,7 @@ msgstr "&Visualitza" msgid "&Wiimote Settings" msgstr "Configuració «&Wiimote»" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -351,7 +355,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -360,7 +364,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -417,13 +421,13 @@ msgstr "" "\n" "Vostè ha d'enviar el port TCP per rebre!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-placa base" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Codis AR " @@ -435,11 +439,11 @@ msgstr "Sobre Dolphin" msgid "Acceleration" msgstr "Acceleració" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "Precisió:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulació acurada de Vbeam" @@ -560,11 +564,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Afegeix" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Afegeix codi ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Afegeix Pegat" @@ -572,6 +576,7 @@ msgstr "Afegeix Pegat" msgid "Add new pane" msgstr "Afegeix un nou panell" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -587,6 +592,11 @@ msgstr "Afegeix un nou panell" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Afegir ..." @@ -634,11 +644,11 @@ 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:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Avançada" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Configuració avançada" @@ -646,14 +656,15 @@ msgstr "Configuració avançada" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Tots els arxius GC / Wii (elf, dol, gcm, iso, ciso, GCZ, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Totes les imatges GC / Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Tots els fitxers GameCube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -666,18 +677,22 @@ msgstr "Tots els fitxers GameCube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tots els Estats (savi, s##\")" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Tots els fitxers ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 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:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Tots els fitxers (*.*)|*.*" @@ -693,7 +708,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Wiimote emulat" @@ -714,7 +729,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:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -732,7 +747,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat (off)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Àrab" @@ -741,7 +756,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -749,11 +764,12 @@ msgstr "" "Esteu segur que voleu eliminar aquests arxius? \n" "No es podran recuperar mai més!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -763,6 +779,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relació d'aspecte:" @@ -771,18 +790,20 @@ 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:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Àudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Suport d'àudio:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error en obrir el dispositiu AO \n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -792,6 +813,9 @@ msgstr "AudioCommon: Error en obrir el dispositiu AO \n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -835,7 +859,7 @@ msgstr "" msgid "Back" msgstr "Tornar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Configuració del Suport" @@ -862,11 +886,11 @@ msgstr "Mala capçalera a l'arxiu" msgid "Banner" msgstr "Imatge" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Detalls del Imatge" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Imatge:" @@ -878,7 +902,7 @@ msgstr "Barra" msgid "Basic" msgstr "Bàsic" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Configuració bàsica" @@ -909,6 +933,7 @@ msgstr "Blau dret" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -916,6 +941,9 @@ msgstr "Blau dret" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Abaix" @@ -924,7 +952,7 @@ msgstr "Abaix" msgid "Bound Controls: %lu" msgstr "Controls enllaçats: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Trencat" @@ -940,7 +968,7 @@ msgstr "Examineu un directori per afegir" msgid "Browse for an ISO directory..." msgstr "Examineu un directori ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Examineu el directori de sortida" @@ -970,11 +998,11 @@ msgstr "Palanca-C" msgid "C-Stick" msgstr "Palanca-C" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Motor d'emulació de CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Llistes de memòria cau de pantalla" @@ -1037,7 +1065,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:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1048,7 +1076,7 @@ msgstr "" "%s\n" "No és un arxiu de targeta de memòria gamecube vàlid." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1066,8 +1094,6 @@ msgstr "No es pot trobar WiiMote per bd: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "No es pot trobar l'identificador de connexió WiiMote %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1077,7 +1103,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:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Català" @@ -1102,7 +1128,7 @@ msgstr "Canviar Disc" msgid "Change Game" msgstr "Canvi de joc" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1118,8 +1144,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:506 #: 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!" @@ -1139,31 +1165,31 @@ msgstr "Cerca trucs" msgid "Cheats Manager" msgstr "Administrador de trucs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Xinès (simplificat)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Xinès (tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: 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:762 +#: 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:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Triar una ISO per defecte:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Trieu un directori per afegir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Trieu un arxiu per obrir" @@ -1171,7 +1197,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:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1179,8 +1205,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:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: 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" @@ -1192,14 +1218,14 @@ msgstr "Palanca Cercle" msgid "Classic" msgstr "Clàssic" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Esborrar" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Fallada a l'esborrar." @@ -1215,6 +1241,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1223,6 +1250,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Tancar" @@ -1246,20 +1277,20 @@ msgstr "Comanda" msgid "Comment" msgstr "Comentari" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Comentari:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Comprimir ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Comprimir ISOs seleccionades ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Comprimeix ISO" @@ -1286,13 +1317,13 @@ msgstr "Configurar Control" msgid "Configure..." msgstr "Configuració..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Confirmar contraescriptura del fitxer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Confirmar a l'aturar" @@ -1301,7 +1332,7 @@ msgstr "Confirmar a l'aturar" msgid "Connect" msgstr "Connectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Connectar el teclat USB" @@ -1358,12 +1389,12 @@ msgstr "Convertir a GCI" msgid "Copy failed" msgstr "Copia fallada" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Copiar a la targeta de memòria %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Nucli" @@ -1393,7 +1424,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "No es pot reconèixer el fitxer ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "No s'ha pogut desar %s" @@ -1407,7 +1438,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:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1420,7 +1451,7 @@ 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:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "No s'ha trobat la comanda d'obertura per l'extensió 'ini'!" @@ -1437,7 +1468,7 @@ msgstr "" msgid "Count:" msgstr "Compta:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "País:" @@ -1451,25 +1482,25 @@ 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:500 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:497 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:498 msgid "Created by VistaIcons.com" msgstr "Creat per VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 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:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Creador:" @@ -1477,7 +1508,7 @@ msgstr "Creador:" msgid "Critical" msgstr "Crític" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Retallar" @@ -1500,7 +1531,7 @@ msgstr "Atenuar" 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:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Projecció personalitzada" @@ -1508,11 +1539,11 @@ msgstr "Projecció personalitzada" msgid "Custom Projection Hack Settings" msgstr "Configuració de la projecció personalitzada" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Configuració d'alguns paràmetres de projecció Ortogràfica." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Txec" @@ -1524,10 +1555,11 @@ msgstr "Direcció digital" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Motor d'emulació DSP" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1538,18 +1570,22 @@ msgstr "Motor d'emulació DSP" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulació DSP HLE (ràpid)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "Intèrpret DSP LLE (lent)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE al fil d'execució" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "Recompilador DSP LLE " @@ -1557,15 +1593,23 @@ msgstr "Recompilador DSP LLE " msgid "DSP settings" msgstr "Configuració DSP " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Arrel del DVD:" +#: 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:176 msgid "Data Size" msgstr "Mida de dades" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Data:" @@ -1586,7 +1630,7 @@ msgstr "Zona morta" msgid "Debug" msgstr "Depuració" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Depuració" @@ -1594,16 +1638,16 @@ msgstr "Depuració" msgid "Decimal" msgstr "Decimals" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Descomprimir ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISO seleccionades..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Descomprimint ISO" @@ -1611,11 +1655,11 @@ msgstr "Descomprimint ISO" msgid "Default" msgstr "Per defecte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ISO per defecte:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Font per defecte" @@ -1624,7 +1668,7 @@ msgstr "Font per defecte" msgid "Delete" msgstr "Eliminar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Eliminar partida desada" @@ -1633,7 +1677,7 @@ msgstr "Eliminar partida desada" msgid "Delete the existing file '%s'?" msgstr "Eliminar el fitxer existent '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Descripció" @@ -1641,8 +1685,8 @@ msgstr "Descripció" msgid "Detect" msgstr "Detectar" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: 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." @@ -1654,8 +1698,8 @@ msgstr "" msgid "Device" msgstr "Dispositiu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Configuració del dispositiu" @@ -1680,23 +1724,23 @@ msgstr "" "i també ha fallat la comprovació de la suma de la copia del directory" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Deshabilitar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Deshabilitar boira" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Deshabilitar l'il·luminació" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Deshabilitar la profunditat per-pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Deshabilitar Textures" @@ -1741,7 +1785,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disc" @@ -1768,6 +1812,7 @@ msgstr "" msgid "Divide" msgstr "Divideix" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1777,10 +1822,13 @@ msgstr "Divideix" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Voleu aturar l'emulació actual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1805,6 +1853,7 @@ msgstr "Configuració de Wiimote emulat" msgid "Dolphin FIFO" msgstr "FIFO Dolphin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1829,6 +1878,14 @@ msgstr "Configuració del control GC Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Configuració del control GC Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin Pel·lícules TAS (*.dtm)" @@ -1861,11 +1918,11 @@ msgstr "" msgid "Down" msgstr "Avall" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Descarregar Codis (base de dades WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Descarregat %lu codis. (Afegits %lu)" @@ -1874,23 +1931,23 @@ msgstr "Descarregat %lu codis. (Afegits %lu)" msgid "Drums" msgstr "Tambors" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Maniquí" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Bolcat d'àudio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Bolcat de destinació EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Bolcat d'imatges" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Bolcat de textures" @@ -1925,6 +1982,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1940,6 +1998,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holandès" @@ -1964,7 +2027,7 @@ msgstr "" "Dolphin, probablement és necessari reiniciar el Windows per veure el nou " "controlador." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPA" @@ -1980,7 +2043,7 @@ msgstr "Edita" msgid "Edit ActionReplay Code" msgstr "Modificar codi ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Modificar configuració" @@ -1992,8 +2055,8 @@ msgstr "Modificar el pagat" msgid "Edit current perspective" msgstr "Modificar perspectiva actual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Modificació ..." @@ -2043,7 +2106,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wiimote emulat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Estat d'emulació:" @@ -2072,23 +2135,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "Habilitar el registre de logs d'AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Habilitar la regulació de so" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Habilitar les millors tècniques disponibles" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Habilitar fusió de Bloc" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2101,6 +2164,7 @@ msgstr "" msgid "Enable Cache" msgstr "Habilitar memòria cau" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2110,51 +2174,54 @@ msgstr "Habilitar memòria cau" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Activar Trucs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Habilitar Música DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Habilitar Doble nucli" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Habilitar Doble nucli (acceleració)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Activar tecles d'accés ràpid" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Habilitar salt d'inactiu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Habilitar salt d'inactiu (acceleració)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Habilitar MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Habilitar exploració &Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Habilitar el protector de pantalla" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Habilitar pantalla panoràmica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Habilitar malla" @@ -2170,7 +2237,7 @@ msgstr "" "Millora la qualitat visual de les textures que es troben en un angle de " "visió obliqua." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2178,7 +2245,7 @@ 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:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Habilitar pàgines" @@ -2206,7 +2273,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2214,7 +2281,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:311 +#: 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 = " @@ -2224,7 +2291,7 @@ msgstr "" "Gestió de memòria. Precisa en el maquinari, però lent per emular. " "(Activat=compatible, Desactivat = ràpid)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Activa la modificació personalitzada de projecció" @@ -2240,7 +2307,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2262,6 +2329,7 @@ msgstr "" msgid "End" msgstr "Fi" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2277,6 +2345,11 @@ msgstr "Fi" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Anglès" @@ -2307,6 +2380,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -2337,20 +2411,26 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Error" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Error en carregar l'idioma seleccionat. Es retorna a l'idioma per defecte " "del sistema." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2385,7 +2465,7 @@ msgstr "Sortir de Dolphin amb emulador" msgid "Export Failed" msgstr "Fallada d'exportació" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Exportar fitxer" @@ -2398,15 +2478,15 @@ msgstr "Exportar gravació" msgid "Export Recording..." msgstr "Exportar gravació ..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Exportar partida desada" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Exportar partida desada Wii (Experimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Exportar totes les partides desades" @@ -2422,7 +2502,7 @@ msgstr "Desar exportació com a..." msgid "Extension" msgstr "Extensió" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Memòria cau d'imatge externa" @@ -2434,44 +2514,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Extreure tots els arxius ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Extreure «Apploader» ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Extreure DOL ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Extreure del repertori ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Extreure arxiu ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Extreure partició ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Extraient %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Extreure tots els arxius" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Extraient Directori" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Extraient ..." @@ -2483,11 +2563,11 @@ msgstr "Byte FIFO" msgid "FIFO Player" msgstr "Jugador FIFO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANÇA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Mida FST:" @@ -2499,11 +2579,11 @@ msgstr "Error al connectar!" msgid "Failed to Listen!!" msgstr "Error a l'escoltar!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Error al descarregar codis." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Error a l' extreure a %s!" @@ -2620,18 +2700,28 @@ 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/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Ràpid" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Mipmaps ràpids" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Jugador fifo" @@ -2640,7 +2730,7 @@ msgstr "Jugador fifo" msgid "File Info" msgstr "informació del fitxer" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "L'arxiu no conté codis." @@ -2673,16 +2763,16 @@ msgstr "L'arxiu no es pot reconèixer com una targeta de memòria" msgid "File not compressed" msgstr "Arxiu no comprimit" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Mode d'obertura desconegut: 0x% 02x " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Sistema d'arxius" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "'ini' Tipus de fitxer és desconegut! no s'obre!" @@ -2690,7 +2780,7 @@ msgstr "'ini' Tipus de fitxer és desconegut! no s'obre!" msgid "First Block" msgstr "Primer Bloc" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Arregla les sumes de comprovació" @@ -2702,7 +2792,7 @@ msgstr "Forçar 16:9" msgid "Force 4:3" msgstr "Forçar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Força la consola com NTSC-J" @@ -2735,7 +2825,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 " @@ -2771,7 +2861,7 @@ msgstr "Imatge" msgid "Frame Advance" msgstr "Avançar imatges" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Bolcat d'imatges utilitzant FFV1" @@ -2783,7 +2873,7 @@ msgstr "Rang d'imatges" msgid "Frame S&kipping" msgstr "Salta imatge&s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Limit d'imatges/s:" @@ -2791,10 +2881,11 @@ msgstr "Limit d'imatges/s:" msgid "Frames To Record" msgstr "Imatges a Enregistrar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Visió lliure" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2810,6 +2901,11 @@ msgstr "Visió lliure" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francès" @@ -2843,7 +2939,7 @@ msgstr "Configuració de gràfics" msgid "GCPad" msgstr "Control GC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID del Joc:" @@ -2859,15 +2955,15 @@ msgstr "El joc no està funcionant!" msgid "Game not found!!" msgstr "Joc no trobat!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Configuració de jocs específics" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Configuració de joc" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2878,6 +2974,7 @@ msgstr "Configuració control «&Gamecube»" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2885,6 +2982,9 @@ msgstr "Configuració control «&Gamecube»" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Targetes de memòria per GameCube (*.raw, *.gcp)" @@ -2893,15 +2993,17 @@ msgid "Gamecube Pad settings" msgstr "Configuració control Gamecube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Codis Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, 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.)" +"(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 "" "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.)" @@ -2910,6 +3012,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2918,6 +3021,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -2926,6 +3032,7 @@ msgstr "General" msgid "General Settings" msgstr "Configuració General" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2941,6 +3048,11 @@ msgstr "Configuració General" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Alemany" @@ -2981,7 +3093,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Grec" @@ -3013,7 +3125,7 @@ msgstr "Modificacions" msgid "Header checksum failed" msgstr "Comprovació de la checksum de capçalera ha fallat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebreu" @@ -3083,12 +3195,16 @@ msgstr "Tecla d'accés de configuració" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Tecles d'accés" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Hongarès" @@ -3096,14 +3212,14 @@ msgstr "Hongarès" msgid "Hybrid Wiimote" msgstr "Wiimote Híbrid" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3116,11 +3232,11 @@ msgstr "" "TitleID %016llx. \n" "Probablement Dolphin es penjarà ara." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destinació dolenta" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Configuració de IPL" @@ -3136,15 +3252,15 @@ msgstr "Punter IR" msgid "IR Sensitivity:" msgstr "Sensibilitat d'IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Detalls d'ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Directoris ISO:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITÀLIA" @@ -3152,23 +3268,25 @@ msgstr "ITÀLIA" msgid "Icon" msgstr "Icona" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: 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:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy msgid "" -"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." +"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 heu establert límit al nombre d'imatges per segon major que la velocitat " "del joc complet (NTSC: 60, PAL: 50), també cal deshabilitar la regulació de " @@ -3206,7 +3324,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Desar importació" @@ -3257,7 +3375,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "En Joc" @@ -3266,7 +3384,7 @@ msgid "In-Game" msgstr "En-joc" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3286,7 +3404,7 @@ msgstr "Insereix" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inseriu el codi xifrat o desxifrat aquí ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Inserir la targeta SD" @@ -3298,7 +3416,7 @@ msgstr "Introduïu un nom aquí .." msgid "Install WAD" msgstr "Instal·lar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Instal·lar al Menú de Wii" @@ -3309,6 +3427,7 @@ msgstr "" "InstallExceptionHandler cridat, però aquesta plataforma no està suportada " "encara." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3318,14 +3437,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instal·lant WAD ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Interfície" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Configuració d'interfície" @@ -3350,11 +3472,11 @@ msgstr "Error intern LZO - lzo_init () ha fallat" msgid "Internal Resolution:" msgstr "Resolució Interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Intèrpret (molt lent)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Introducció" @@ -3371,7 +3493,7 @@ msgstr "Valor invàlid!" msgid "Invalid bat.map or dir entry" msgstr "Invàlid bat.map o entrada al directori" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Tipus d'esdeveniment invàlid %i" @@ -3391,14 +3513,15 @@ msgstr "" "% s\n" "És possible que necessiti re-descarregar aquest joc." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Enregistrament de fitxer invàlid" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Estat invàlid" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3414,27 +3537,32 @@ msgstr "Estat invàlid" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italià" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPÓ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "Recompilador JIT (recomanat)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "Recompilador JITIL experimental" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japonès" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "COREA" @@ -3443,8 +3571,8 @@ msgstr "COREA" msgid "Key" msgstr "Clau" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Corea" @@ -3462,7 +3590,7 @@ msgstr "Botó L" msgid "L-Analog" msgstr "L-Analògic" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Idioma:" @@ -3515,7 +3643,7 @@ msgstr "" msgid "Less Than" msgstr "Menys de" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Limitar per FPS " @@ -3523,7 +3651,7 @@ msgstr "Limitar per FPS " msgid "Load" msgstr "Carregar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Carrega textures personalitzades" @@ -3571,6 +3699,7 @@ msgstr "Carregar ranura d'estat 8" msgid "Load State..." msgstr "Carregar Estat..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3592,6 +3721,13 @@ msgstr "Carregar el menú del sistema Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Carregar el menú del sistema Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar menú del sistema Wii %d%c" @@ -3618,7 +3754,7 @@ msgstr "Carrega els fitxer especificats (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Bloca els fils d'execució als nuclis" @@ -3630,11 +3766,11 @@ msgstr "Registre Log" msgid "Log Configuration" msgstr "Configuració del registre Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Tipus de registre Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Sortides del registrador Log" @@ -3664,7 +3800,7 @@ msgstr "" "desajust MD5 \n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "Modificació de velocitat MMU" @@ -3686,11 +3822,11 @@ msgstr "Arxius MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "Palanca principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID Fabricant:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Fabricant:" @@ -3714,6 +3850,7 @@ msgstr "Byte de memòria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3721,6 +3858,9 @@ msgstr "Byte de memòria" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Targeta de memòria" @@ -3758,7 +3898,7 @@ msgstr "" msgid "Menu" msgstr "Menú" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Micròfon" @@ -3767,11 +3907,11 @@ msgstr "Micròfon" msgid "Min" msgstr "Mínim" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Altres" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Altres Configuracions" @@ -3792,7 +3932,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Fonts d'espiat simple" @@ -3805,7 +3945,7 @@ msgstr "Motion Plus®" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3828,7 +3968,7 @@ msgstr "" msgid "Multiply" msgstr "Múltiple" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3920,6 +4060,7 @@ msgstr "NP Tabulador" msgid "NP Up" msgstr "NP Amunt" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3929,6 +4070,9 @@ msgstr "NP Amunt" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3937,7 +4081,7 @@ msgstr "Nom:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nom:" @@ -3951,7 +4095,7 @@ msgid "New Scan" msgstr "Nou escaneig" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Pàgina següent" @@ -3963,7 +4107,7 @@ msgstr "Següent escaneig" msgid "Nickname :" msgstr "Sobrenom:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "No país (SDK)" @@ -4002,7 +4146,7 @@ msgstr "No s'ha trobat la carpeta de partides desades per el joc %s" msgid "None" msgstr "Cap" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Noruega Bokmaal" @@ -4010,8 +4154,8 @@ msgstr "Noruega Bokmaal" msgid "Not Equal" msgstr "No igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Sense establir" @@ -4031,7 +4175,7 @@ msgstr "No està connectat" msgid "Notes" msgstr "Notes" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notes:" @@ -4069,7 +4213,7 @@ msgstr "Objecte" 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" @@ -4095,11 +4239,11 @@ msgstr "Només queden %d blocs disponibles" msgid "Open" msgstr "Obrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Obrir directori &contingut" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Obrir la carpeta de partide&s desades" @@ -4121,11 +4265,11 @@ 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:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "Descodificador de textura OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "Activar descodificador de textura OpenMP" @@ -4157,7 +4301,7 @@ msgstr "" "i importeu les partides desades una targeta de memòria nova\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Altres" @@ -4209,19 +4353,20 @@ msgstr "Paràgraf" msgid "Parameters" msgstr "Paràmetres" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partició %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Pegats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Camins" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4234,6 +4379,10 @@ msgstr "Camins" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4242,7 +4391,7 @@ msgstr "Pausa" msgid "Per-Pixel Lighting" msgstr "Il·luminació per píxel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfecte" @@ -4255,6 +4404,7 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4265,6 +4415,10 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Executar" @@ -4278,7 +4432,7 @@ msgstr "Reproduir enregistrament" msgid "Play/Pause" msgstr "Reproduir/Pausa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Jugable" @@ -4290,6 +4444,7 @@ msgstr "Opcions de reproducció" msgid "Players" msgstr "Jugadors" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4299,6 +4454,9 @@ msgstr "Jugadors" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Confirmeu ..." @@ -4310,23 +4468,23 @@ msgstr "Creeu una perspectiva abans de desar" msgid "Plus-Minus" msgstr "Més-Menys" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polonès" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4335,11 +4493,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portuguès" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portuguès (Brasil)" @@ -4347,17 +4505,17 @@ msgstr "Portuguès (Brasil)" msgid "Post-Processing Effect:" msgstr "Efectes de post-procés:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4370,7 +4528,7 @@ msgstr "Preestablerts:" msgid "Prev Page" msgstr "Pàgina anterior" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Pàgina anterior" @@ -4421,7 +4579,7 @@ msgstr "R-Analògic" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RÚSSIA" @@ -4434,7 +4592,7 @@ msgstr "Rang" msgid "Read-only mode" msgstr "Només lectura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Real" @@ -4510,6 +4668,7 @@ msgstr "Actualitzar llista" msgid "Refresh game list" msgstr "Actualitza la llista de jocs" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4528,6 +4687,12 @@ msgstr "Actualitza la llista de jocs" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Treure" @@ -4580,11 +4745,11 @@ msgstr "Palanca dreta" msgid "Rumble" msgstr "Vibració" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: 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:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Rússia" @@ -4592,10 +4757,11 @@ msgstr "Rússia" msgid "Sa&ve State" msgstr "&Desa l'estat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Segur" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4605,6 +4771,9 @@ msgstr "Segur" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Freqüència de mostreig:" @@ -4662,12 +4831,12 @@ msgstr "Desar ranura estat 8" msgid "Save State..." msgstr "Desar Estat ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Desar com ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Desar GCM/ISO comprimit" @@ -4675,11 +4844,11 @@ msgstr "Desar GCM/ISO comprimit" msgid "Save current perspective" msgstr "Desar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Desar GCM/ISO descomprimit" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "La pal·lícula guardada %s és corrupta, s'atura la gravació..." @@ -4688,6 +4857,7 @@ msgstr "La pal·lícula guardada %s és corrupta, s'atura la gravació..." msgid "Scaled EFB Copy" msgstr "Copia EFB escalada" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4697,15 +4867,18 @@ msgstr "Copia EFB escalada" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Escanejant %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Cercant ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Cercant ..." @@ -4721,12 +4894,12 @@ msgstr "Bloc desplaçament" msgid "Search Filter" msgstr "Filtre de cerca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Cercar en subcarpetes" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: 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 secció %s no trobada a SYSCONF" @@ -4736,6 +4909,7 @@ msgstr "La secció %s no trobada a SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4760,6 +4934,14 @@ msgstr "Seleccionar el fitxer de gravació" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Seleccionar el fitxer de gravació" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleccionar un fitxer WAD de Wii per instal·lar" @@ -4784,6 +4966,7 @@ msgstr "Seleccioneu finestres flotants" msgid "Select the file to load" msgstr "Seleccioneu el fitxer a carregar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4800,19 +4983,26 @@ msgstr "Seleccioneu l'estat a carregar" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Seleccioneu el fitxer de partida desada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Seleccioneu l'estat a carregar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Seleccioneu l'estat a desar" @@ -4834,7 +5024,7 @@ msgstr "" "\n" "Si no n'esteu segurs, seleccioneu Automàtic" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Font seleccionada" @@ -4882,11 +5072,11 @@ msgstr "Barra de sensors de posició" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4897,11 +5087,11 @@ msgstr "" msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Definir la imatge ISO per &defecte" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Definir com a targeta de memòria predeterminada %c" @@ -4913,7 +5103,7 @@ msgstr "" "SetARCode_IsActive: L'índex és major que la grandària de la llista de codis " "AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Configuració ..." @@ -4925,7 +5115,7 @@ msgstr "SetupWiiMem: No es troba el fitxer de configuració" msgid "Shake" msgstr "Sacsejar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Nom curt:" @@ -4953,7 +5143,7 @@ msgstr "Mostrar Barra d'&eines" msgid "Show Drives" msgstr "Mostrar unitats" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Mostrar regions de copia EFB" @@ -4969,7 +5159,7 @@ msgstr "Mostrar França" msgid "Show GameCube" msgstr "Mostrar GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Mostrar entrada" @@ -4985,7 +5175,7 @@ msgstr "Mostrar Japó" msgid "Show Korea" msgstr "Mostrar Corea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Mostrar Idioma:" @@ -5005,7 +5195,7 @@ msgstr "Mostrar Plataformes" msgid "Show Regions" msgstr "Mostrar Regions" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Mostrar estadístiques" @@ -5025,11 +5215,11 @@ msgstr "Mostrar Wad" 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 " @@ -5039,23 +5229,23 @@ 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:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Mostra primer bloc" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Mostra blocs de partida desada" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Mostra desar un comentari" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Mostra icona de desar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Mostra títol desat" @@ -5093,7 +5283,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote horitzontal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Xinès simplificat" @@ -5101,11 +5291,11 @@ msgstr "Xinès simplificat" msgid "Size" msgstr "Mida" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Saltar BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Salta pas Dest. Alpha" @@ -5148,11 +5338,11 @@ msgstr "" msgid "Slot %i" msgstr "Ranura %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Ranura A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Ranura B" @@ -5177,7 +5367,7 @@ 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:621 msgid "Sound Settings" msgstr "Configuració de so" @@ -5195,6 +5385,7 @@ msgstr "Ha fallat la creació del buffer de so: %s" msgid "Space" msgstr "Espai" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5210,6 +5401,11 @@ msgstr "Espai" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Espanyol" @@ -5242,7 +5438,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Especifiqueu un suport de vídeo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Accelerar la tassa de transferència de Disc" @@ -5250,7 +5446,7 @@ msgstr "Accelerar la tassa de transferència de Disc" msgid "Square Stick" msgstr "Palanca quadrada" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Control estàndard" @@ -5348,12 +5544,12 @@ msgstr "Arxius de partides desades importats correctament" msgid "Swing" msgstr "Oscil·lació" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Idioma del sistema:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWAN" @@ -5392,7 +5588,7 @@ msgstr "Taula dreta" msgid "Take Screenshot" msgstr "Capturar pantalla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5408,7 +5604,7 @@ msgstr "Textura" msgid "Texture Cache" msgstr "Memòria cau de textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Superposició del format de textura" @@ -5424,13 +5620,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:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "El directori triat ja és a la llista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5453,7 +5649,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:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "L'arxiu especificat (%s) no existeix" @@ -5471,11 +5667,12 @@ 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:98 +#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" "Quant més segura ajusteu això, més probablement l'emulador no es saltarà " "actualitzacions de textura de la RAM.\n" @@ -5520,7 +5717,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:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema visual" @@ -5528,7 +5725,7 @@ msgstr "Tema visual" 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:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5536,7 +5733,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:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5552,7 +5749,7 @@ msgstr "" "Aquest simulador «ActionReplay» no és compatible amb els codis que " "modifiquen «ActionReplay»." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: 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." @@ -5575,25 +5772,11 @@ msgstr "" "Si no n'esteu segur, deixeu-ho desactivat." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -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 "" -"S'utilitza per controlar la velocitat del joc per la de so. \n" -"Desactivar-ho pot causar una velocitat anormal, pot ser massa ràpida.\n" -"Però de vegades activant-ho pot causar soroll constant.\n" -"\n" -"Drecera de teclat : Arpeta per desactivar-ho." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" "Això s'utilitza per reproduir pistes de música, com BGM (música de fons)" -#: 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" @@ -5605,7 +5788,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:283 +#: 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" @@ -5628,7 +5811,7 @@ msgstr "Títol" msgid "To" msgstr "a" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Activar tots els tipus de registre de Log" @@ -5648,6 +5831,7 @@ msgstr "Activar pantalla completa" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5655,14 +5839,17 @@ msgstr "Activar pantalla completa" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Dalt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Xinés tradicional" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "S'ha intentat de carregar un tipus de fitxer desconegut." @@ -5670,7 +5857,7 @@ msgstr "S'ha intentat de carregar un tipus de fitxer desconegut." msgid "Triggers" msgstr "Gatells" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Provant de llegir des d'un SYSCONF invàlid" @@ -5682,7 +5869,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:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turc" @@ -5703,11 +5890,11 @@ msgstr "Port UDP:" msgid "UDP Wiimote" msgstr "Wiimote UDP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "DESCONEGUT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "EUA" @@ -5793,7 +5980,7 @@ msgstr "Actualitzar" msgid "Upright Wiimote" msgstr "Wiimote vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utilitzar mode EuRGB60 (PAL60)" @@ -5805,7 +5992,7 @@ msgstr "Utilitzar pantalla completa" msgid "Use Hex" msgstr "Utilitzeu hexagonal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Utilitzar advertències" @@ -5837,7 +6024,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Utilitat" @@ -5861,25 +6048,29 @@ msgstr "Valor:" msgid "Verbosity" msgstr "Verbositat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volum" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "instal·lació del WAD ha fallat: Error en crear %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "instal·lació del WAD ha fallat: Error en crear %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5898,15 +6089,15 @@ msgstr "" msgid "Warning" msgstr "Advertència" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 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:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Advertència - Inicialitzant ELF en mode de consola incorrecte!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Advertència - Inicialitzant ISO en mode de consola incorrecte!" @@ -5936,7 +6127,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:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5944,7 +6135,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5952,7 +6143,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5980,7 +6171,7 @@ msgstr "WaveFileWriter - Fitxer no obert." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Modificació de pantalla panoràmica" @@ -5988,15 +6179,15 @@ msgstr "Modificació de pantalla panoràmica" msgid "Width" msgstr "Ample" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Arrel de la NAND:" @@ -6004,6 +6195,7 @@ msgstr "Arrel de la NAND:" msgid "Wii Save Import" msgstr "Importar partida guardada Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -6013,6 +6205,9 @@ msgstr "Importar partida guardada Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Arxius de partida guardada Wii (*.bin)|*.bin" @@ -6079,10 +6274,11 @@ msgstr "Finestra menú" msgid "Windows Right" msgstr "Finestra dreta" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Envoltant de paraula" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6098,6 +6294,11 @@ msgstr "Envoltant de paraula" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Treballant ..." @@ -6105,6 +6306,11 @@ msgstr "Treballant ..." msgid "Write to Console" msgstr "Escriu a consola" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Escriu en un Fitxer" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Escriu en un Fitxer" @@ -6160,7 +6366,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:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Ha de reiniciar Dolphin perquè el canvi tingui efecte." @@ -6183,7 +6389,7 @@ msgstr "" "Hauria de ser 0x%04x (però és 0x%04llx) \n" "Vol generar un de nou?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "Modificador ZTP" @@ -6255,7 +6461,7 @@ msgstr "" msgid "^ ADD" msgstr "^ Afegir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6288,12 +6494,12 @@ msgstr "" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "Comanda desconeguda 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute Ha retornat -1 en l'execució de l'aplicació!" @@ -6437,6 +6643,9 @@ msgstr "| O" #~ msgid "Emulator Display Settings" #~ msgstr "Configuració de pantalla de l'emulador" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Habilitar la regulació de so" + #~ msgid "Enable CPU Access" #~ msgstr "Habilitar l'accés a CPU" @@ -6673,6 +6882,19 @@ msgstr "| O" <<<<<<< HEAD ======= >>>>>>> Update from master branch. +#~ 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 "" +#~ "S'utilitza per controlar la velocitat del joc per la de so. \n" +#~ "Desactivar-ho pot causar una velocitat anormal, pot ser massa ràpida.\n" +#~ "Però de vegades activant-ho pot causar soroll constant.\n" +#~ "\n" +#~ "Drecera de teclat : Arpeta per desactivar-ho." + #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" diff --git a/Languages/po/cs.po b/Languages/po/cs.po index b561011572..d9d24e6b40 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -11,6 +11,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" <<<<<<< HEAD "PO-Revision-Date: 2011-10-15 14:50+0100\n" @@ -26,6 +27,9 @@ msgstr "" "PO-Revision-Date: 2011-10-15 14:50+0100\n" >>>>>>> Update Greek and Czech translations ======= +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-19 07:39+0100\n" >>>>>>> Update Czeck translation. ======= @@ -72,9 +76,9 @@ msgstr "\"%s\" je neplatný soubor GCM/ISO, nebo není GC/Wii ISO." msgid "%1$sCopy%1$s" msgstr "%1$sKopírovat%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -120,7 +124,8 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" "%s nelze naÄíst jako paměťovou kartu\n" -"soubor není dostateÄnÄ› velký, aby byl platným souborem paměťové karty (0x%x bajtů)" +"soubor není dostateÄnÄ› velký, aby byl platným souborem paměťové karty (0x%x " +"bajtů)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -168,7 +173,7 @@ msgstr "%sExportovat GCI%s" msgid "%sImport GCI%s" msgstr "%sImportovat GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Volných Bloků; %u Volných Záznamů Adr" @@ -201,11 +206,11 @@ msgstr "Správce &Cheatů" msgid "&DSP Settings" msgstr "&DSP Nastavení" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Smazat ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Smazat vybraná ISO..." @@ -269,7 +274,7 @@ msgstr "&Pauza" msgid "&Play" msgstr "&PÅ™ehrát" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Vlastnosti" @@ -313,7 +318,7 @@ msgstr "&Zobrazit" msgid "&Wiimote Settings" msgstr "&Wiimote Nastavení" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -357,7 +362,7 @@ msgstr "" msgid "" msgstr "<Žádné rozliÅ¡ení nenalezeno>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -366,7 +371,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -392,11 +397,13 @@ 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" @@ -406,11 +413,13 @@ msgid "" msgstr "" "POZOR:\n" "\n" -"Netplay bude v souÄasnosti správnÄ› fungovat pouze pÅ™i použití následujících nastavení:\n" +"Netplay bude v souÄasnosti správnÄ› fungovat pouze pÅ™i použití následujících " +"nastavení:\n" " - Dvojité Jádro [VYPNUTO]\n" " - PÅ™iÅ¡krcení Zvuku [VYPNUTO]\n" " - DSP-HLE s \"Nulovým Zvukem\" nebo DSP-LLE\n" -" - RuÄnÄ› nastavit pÅ™esné Äíslo ovladaÄů, které budou použity na [Standardní OvladaÄ]\n" +" - RuÄnÄ› nastavit pÅ™esné Äíslo ovladaÄů, které budou použity na [Standardní " +"OvladaÄ]\n" "\n" "VÅ¡ichni hráÄi by mÄ›li používat stejné nastavení i verzi Dolphina.\n" "Zakázat vÅ¡echny paměťové karty nebo je poslat hráÄům pÅ™ed spuÅ¡tÄ›ním.\n" @@ -418,13 +427,13 @@ msgstr "" "\n" "Musíte pÅ™esmÄ›rovat Váš TCP port na hostitele!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM Základní Deska" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Kódy AR" @@ -436,11 +445,11 @@ msgstr "O Dolphinu" msgid "Acceleration" msgstr "Zrychlení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "PÅ™esnost:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Precizní emulace VBeam" @@ -459,7 +468,8 @@ msgstr "Precizní emulace VBeam" >>>>>>> The actual update of the Greek and Czech translations. The last commit 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 "" @@ -490,23 +500,38 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" -msgstr "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Kódu PÅ™idat (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +msgstr "" +"Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Kódu PÅ™idat " +"(%s)" #: Source/Core/Core/Src/ActionReplay.cpp:756 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)" -msgstr "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Naplnit a Sesunout (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " +"(%s)" +msgstr "" +"Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Naplnit a " +"Sesunout (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:549 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)" -msgstr "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Ram Zápisu A NaplnÄ›ní (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " +"Fill (%s)" +msgstr "" +"Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Ram Zápisu A " +"NaplnÄ›ní (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:609 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Write To Pointer (%s)" -msgstr "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Zápisu Do Ukazatele (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Write To " +"Pointer (%s)" +msgstr "" +"Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Zápisu Do " +"Ukazatele (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:803 #, c-format @@ -515,8 +540,10 @@ msgstr "Chyba Action Replay: Neplatná hodnota (%08x) v Kopii PamÄ›ti (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:684 #, c-format -msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "Chyba Action Replay: Hlavní Kód a Zápis do CCXXXXXX nejsou zavedeny (%s)" +msgid "" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgstr "" +"Chyba Action Replay: Hlavní Kód a Zápis do CCXXXXXX nejsou zavedeny (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -552,11 +579,11 @@ msgstr "Adaptér:" msgid "Add" msgstr "PÅ™idat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "PÅ™idat kód ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "PÅ™idat Záplatu" @@ -568,6 +595,7 @@ msgstr "PÅ™idat nový panel" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 @@ -591,6 +619,11 @@ msgstr "PÅ™idat nový panel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "PÅ™idat..." @@ -602,14 +635,16 @@ msgstr "Adresa :" 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 "" "PÅ™idá zadanou hodnotu do Parametru ZFar.\n" "Dva způsoby jak vyjádÅ™it hodnoty v plovoucí desetinné Äárce.\n" -"Příklad: přímé zadání \"200\" nebo \"0.0002\" má stejný úÄinek, získaná hodnota bude \"0.0002\".\n" +"Příklad: přímé zadání \"200\" nebo \"0.0002\" má stejný úÄinek, získaná " +"hodnota bude \"0.0002\".\n" "Hodnoty: (0->+/-Celé Äíslo) nebo (0->+/-PDÄŒ[6 desetinných míst])\n" "\n" "Poznámka: Zkontrolujte Konzoli/Okno protokolu pro získané hodnoty" @@ -618,14 +653,16 @@ 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 "" "PÅ™idá zadanou hodnotu do Parametru zNear.\n" "Dva způsoby jak vyjádÅ™it hodnoty v plovoucí desetinné Äárce.\n" -"Příklad: přímé zadání \"200\" nebo \"0.0002\" má stejný úÄinek, získaná hodnota bude \"0.0002\".\n" +"Příklad: přímé zadání \"200\" nebo \"0.0002\" má stejný úÄinek, získaná " +"hodnota bude \"0.0002\".\n" "Hodnoty: (0->+/-Celé Äíslo) nebo (0->+/-PDÄŒ[6 desetinných míst])\n" "\n" "Poznámka: Zkontrolujte Konzoli/Okno protokolu pro získané hodnoty\"" @@ -634,11 +671,11 @@ 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:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "PokroÄilé" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "PokroÄilá Nastavení" @@ -646,11 +683,11 @@ msgstr "PokroÄilá Nastavení" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "VÅ¡echny soubory GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "VÅ¡echny obrazy GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" @@ -658,6 +695,7 @@ msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ======= @@ -676,35 +714,45 @@ msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "VÅ¡echny Uložené Stavy (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "VÅ¡echny soubory Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "VÅ¡echny komprimované soubory GC/WII ISO (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "VÅ¡echny soubory (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 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 uvnitÅ™ okna emulace.\n" +"Umožní pÅ™epínání jistých možností pomocí horkých kláves 3, 4, 5, 6 a 7 " +"uvnitÅ™ okna emulace.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Střídat Äasování Wiimote" ======= @@ -739,7 +787,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:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "ZavadÄ›Ä aplikace:" @@ -757,7 +805,7 @@ msgstr "" "\n" " Pokud si nejste jisti, zvolte (vypnuto)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "ArabÅ¡tina" @@ -766,7 +814,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -774,10 +822,11 @@ msgstr "" "Jste si jisti, že chcete tyto soubory smazat?\n" "Budou navždy ztraceny!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -794,6 +843,9 @@ msgstr "Opravdu chcete smazat tento soubor? Bude navždy ztracen!" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Aspect Ratio:" @@ -803,18 +855,20 @@ 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:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Backend Zvuku:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Chyba pÅ™i otevírání zařízení zvukového výstupu.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -831,6 +885,9 @@ msgstr "AudioCommon: Chyba pÅ™i otevírání zařízení zvukového výstupu.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Auto" @@ -874,7 +931,7 @@ msgstr "" msgid "Back" msgstr "ZpÄ›t" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Nastavení Backendu" @@ -901,11 +958,11 @@ msgstr "Å patná hlaviÄka souboru" msgid "Banner" msgstr "Plakát" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Detaily Plakátu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Plakát:" @@ -917,7 +974,7 @@ msgstr "Vibráto" msgid "Basic" msgstr "Základní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Základní nastavení" @@ -950,6 +1007,7 @@ msgstr "Modrá vpravo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -965,6 +1023,9 @@ msgstr "Modrá vpravo" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Dole" @@ -973,7 +1034,7 @@ msgstr "Dole" msgid "Bound Controls: %lu" msgstr "Spojené ovladaÄe: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Rozbité" @@ -989,7 +1050,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:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Procházet pro výstupní adresář" @@ -1029,23 +1090,26 @@ msgstr "Kr Stick" msgid "C-Stick" msgstr "Kr-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Jádro Emulátoru Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Ukládat pÅ™edvyt. obj. do vyr. pam." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 "" "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" +"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é." @@ -1058,7 +1122,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "VypoÄítat osvÄ›tlení 3D grafiky podle pixelu, radÄ›ji než podle bodu.\n" -"Sníží rychlost emulace o nÄ›jaké procento (záleží na VaÅ¡em grafikém procesoru).\n" +"Sníží rychlost emulace o nÄ›jaké procento (záleží na VaÅ¡em grafikém " +"procesoru).\n" "Toto je vÄ›tÅ¡inou bezpeÄné vylepÅ¡ení, ale může nÄ›kdy způsobit problémy.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -1079,7 +1144,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:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1090,7 +1155,7 @@ msgstr "" "%s\n" "není platný soubor paměťové karty gamecube" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1108,8 +1173,6 @@ msgstr "Nelze najít Wiimote podle bz: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Nelze najít Wiimote pomocí obslužné rutiny spojení %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1119,7 +1182,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:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "KatalánÅ¡tina" @@ -1144,7 +1207,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:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1160,8 +1223,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:506 #: 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ěží!" @@ -1181,31 +1244,31 @@ msgstr "Hledání Cheatů" msgid "Cheats Manager" msgstr "Správce Cheatů" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "ČínÅ¡tina (ZjednoduÅ¡ená)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "ČínÅ¡tina (TradiÄní)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: 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:762 +#: 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:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Zvolte výchozí ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Zvolte adresář k pÅ™idání" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Zvolte soubor k otevÅ™ení" @@ -1213,12 +1276,16 @@ msgstr "Zvolte soubor k otevÅ™ení" msgid "Choose a memory card:" msgstr "Zvolte paměťovou kartu:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 -msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" -msgstr "Zvolte soubor, který má být použit jako zavadÄ›Ä aplikace: (platí pouze pro disky sestavené z adresářů)" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +msgid "" +"Choose file to use as apploader: (applies to discs constructed from " +"directories only)" +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:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: 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" @@ -1230,25 +1297,29 @@ msgstr "Kruhový Stick" msgid "Classic" msgstr "Klasické" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "VyÄistit" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "VyÄiÅ¡tÄ›ní selhalo" #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." -msgstr "Klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru musíte ukonÄit ruÄnÄ›." +msgid "" +"Client disconnect while game is running!! NetPlay is disabled. You must " +"manually stop the game." +msgstr "" +"Klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru musíte ukonÄit ruÄnÄ›." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1265,6 +1336,10 @@ msgstr "Klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru musíte ukonÄit >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Zavřít" @@ -1288,20 +1363,20 @@ msgstr "Příkaz" msgid "Comment" msgstr "Komentář" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Komentář:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Komprimovat ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Komprimovat vybraná ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Komprimuji ISO" @@ -1328,13 +1403,13 @@ msgstr "Nastavit Pady" msgid "Configure..." msgstr "Nastavit..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Potvrdit PÅ™epsání Souboru" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "PÅ™i zastavení Potvrdit" @@ -1343,7 +1418,7 @@ msgstr "PÅ™i zastavení Potvrdit" msgid "Connect" msgstr "PÅ™ipojit" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "PÅ™ipojit USB Klávesnici" @@ -1408,12 +1483,12 @@ msgstr "PÅ™evést na GCI" msgid "Copy failed" msgstr "Kopírování selhalo" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Kopírovat na Paměťovou kartu %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Jádro" @@ -1429,15 +1504,21 @@ msgstr "Nezle spustit 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." -msgstr "\"%s\" nelze Äíst. BuÄ není v mechanice žádný disk, nebo toto není záloha GC/Wii. Nezapomeňte, že původní disky GameCube a Wii nepÅ™eÄte vÄ›tÅ¡ina PC DVD mechanik." +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\" nelze Äíst. BuÄ není v mechanice žádný disk, nebo toto není záloha GC/" +"Wii. Nezapomeňte, že původní disky GameCube a Wii nepÅ™eÄte vÄ›tÅ¡ina PC DVD " +"mechanik." #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "Nelze rozpoznat ISO soubor %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Nelze uložit %s" @@ -1450,18 +1531,20 @@ 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:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, 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 "" "Nelze zapsat soubor paměťové karty %s.\n" "\n" -"SpouÅ¡títe Dolphina z CD/DVD, nebo je snad soubor s uložením chránÄ›ný proti zápisu?" +"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:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Nelze najít příkaz pro otevÅ™ení přípony 'ini'!" @@ -1478,7 +1561,7 @@ msgstr "" msgid "Count:" msgstr "PoÄet:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "ZemÄ›:" @@ -1492,23 +1575,25 @@ 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:500 msgid "Created by KDE-Look.org" msgstr "VytvoÅ™il KDE-look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 -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:497 +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:498 msgid "Created by VistaIcons.com" msgstr "VytvoÅ™il VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 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:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Tvůrce:" @@ -1516,7 +1601,7 @@ msgstr "Tvůrce:" msgid "Critical" msgstr "Kritické" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Oříznout" @@ -1539,7 +1624,7 @@ msgstr "Crossfade" 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:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Vlastní Hack Projekce" @@ -1547,11 +1632,11 @@ msgstr "Vlastní Hack Projekce" msgid "Custom Projection Hack Settings" msgstr "Nastavení Vlastního Hacku Projekce" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "PÅ™izpůsobte nÄ›které Ortografické parametry Projekce" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "ÄŒeÅ¡tina" @@ -1563,10 +1648,11 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Jádro Emulátoru DSP" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 @@ -1587,18 +1673,22 @@ msgstr "Jádro Emulátoru DSP" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulace (rychlé)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE pÅ™evadÄ›Ä (pomalé)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE ve VláknÄ›" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE rekompilátor" @@ -1606,15 +1696,23 @@ msgstr "DSP LLE rekompilátor" msgid "DSP settings" msgstr "Nastavení DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" 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 "" + +#: 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:176 msgid "Data Size" msgstr "Velikost data" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Datum:" @@ -1635,7 +1733,7 @@ msgstr "Mrtvá Zóna" msgid "Debug" msgstr "LadÄ›ní" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "LadÄ›ní" @@ -1643,16 +1741,16 @@ msgstr "LadÄ›ní" msgid "Decimal" msgstr "Desetinné" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Dekomprimovat ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Dekomprimovat vybraná ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Dekomprimuji ISO" @@ -1660,11 +1758,11 @@ msgstr "Dekomprimuji ISO" msgid "Default" msgstr "Výchozí" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Výchozí ISO:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Výchozí typ písma" @@ -1673,7 +1771,7 @@ msgstr "Výchozí typ písma" msgid "Delete" msgstr "Smazat" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Smazat Uloženou Hru" @@ -1682,7 +1780,7 @@ msgstr "Smazat Uloženou Hru" msgid "Delete the existing file '%s'?" msgstr "Vymazat existující soubor '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Popis" @@ -1690,18 +1788,22 @@ msgstr "Popis" msgid "Detect" msgstr "Zjistit" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -msgid "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp." -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/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 "" +"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 msgid "Device" msgstr "Zařízení" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Nastavení Zařízení" @@ -1726,47 +1828,53 @@ msgstr "" "i záložní kontrolní souÄet Adresáře selhal" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Zakázat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Zakázat Mlhu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Zakázat OsvÄ›tlení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Zakázat Hloubku Podle Pixelu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Zakázat Textury" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 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 "" "Zakázat jakoukoli emulaci XFB.\n" -"Velmi zrychluje emulaci, ale způsobuje hodnÄ› chyb v mnoha hrách, které na nich závisejí (zvláštÄ› po domácku vyrobené aplikace).\n" +"Velmi zrychluje emulaci, ale způsobuje hodnÄ› chyb v mnoha hrách, které na " +"nich závisejí (zvláštÄ› po domácku vyrobené aplikace).\n" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 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 "" "Zakázat emulaci EFB kopií.\n" -"Tyto jsou Äasto používány pro efekty následného zpracování nebo vykreslení do textur, takže když toto zaÅ¡krtnete, dostanete velké zrychlení, ale toto také skoro vždy způsobuje problémy.\n" +"Tyto jsou Äasto používány pro efekty následného zpracování nebo vykreslení " +"do textur, takže když toto zaÅ¡krtnete, dostanete velké zrychlení, ale toto " +"také skoro vždy způsobuje problémy.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -1780,7 +1888,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disk" @@ -1811,6 +1919,7 @@ msgstr "RozdÄ›lit" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 @@ -1824,10 +1933,13 @@ msgstr "RozdÄ›lit" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Chcete souÄasnou emulaci zastavit?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1856,6 +1968,7 @@ msgstr "Dolphin FIFO" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Nastavení" @@ -1892,6 +2005,14 @@ msgstr "Dolphin GCPad Nastavení" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad Nastavení" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" @@ -1904,23 +2025,31 @@ msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 -msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." -msgstr "Dolphin nemohl nalézt žádná GX/Wii ISO. KliknÄ›te zde dvakrát k prohledání souborů..." +msgid "" +"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " +"files..." +msgstr "" +"Dolphin nemohl nalézt žádná GX/Wii ISO. KliknÄ›te zde dvakrát k prohledání " +"souborů..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 -msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." -msgstr "Dolphin je v souÄasnosti nastaven na skrytí vÅ¡ech her. KliknÄ›te zde dvakrát pro zobrazení vÅ¡ech her..." +msgid "" +"Dolphin is currently set to hide all games. Doubleclick here to show all " +"games..." +msgstr "" +"Dolphin je v souÄasnosti nastaven na skrytí vÅ¡ech her. KliknÄ›te zde dvakrát " +"pro zobrazení vÅ¡ech her..." #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Dolů" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Stáhnout kódy (Databáze WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Stáhnuto %lu kódů. (přídáno %lu)" @@ -1929,23 +2058,23 @@ msgstr "Stáhnuto %lu kódů. (přídáno %lu)" msgid "Drums" msgstr "Bubny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Atrapa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Vypsat Zvuk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Vypsat Cíl EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Vypsat Snímky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Vypsat Textury" @@ -1983,6 +2112,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 @@ -2006,6 +2136,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "NizozemÅ¡tina" @@ -2019,10 +2154,17 @@ msgstr "EFB Kopie" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, 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 "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Ä." +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 "" +"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Ä." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EVROPA" @@ -2038,7 +2180,7 @@ msgstr "Upravit" msgid "Edit ActionReplay Code" msgstr "Upravit kód ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Upravit nastavení" @@ -2050,8 +2192,8 @@ msgstr "Upravit záplatu" msgid "Edit current perspective" msgstr "Upravit souÄasnou perspektivu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Upravit" @@ -2070,24 +2212,30 @@ msgstr "Vlákno Emulace již běží" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 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 "" "PÅ™esnÄ› Emulovat XFB.\n" -"Velmi zpomaluje emulaci a brání vykreslování ve vysokém rozliÅ¡ení, ale je nutná k řádné emulaci jistého poÄtu her.\n" +"Velmi zpomaluje emulaci a brání vykreslování ve vysokém rozliÅ¡ení, ale je " +"nutná k řádné emulaci jistého poÄtu her.\n" "\n" "Pokud si nejste jisti, zaÅ¡krtnÄ›te místo tohoto virtuální emulaci XFB." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 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 "" "Emulovat XFB pomocí objektů textury grafického procesoru.\n" -"Spraví mnoho her, které nefungují bez emulace EFB, aniž by byla tak pomalá jako opravdová emulace EFB. NicménÄ› stále může selhat v mnoha jiných hrách (zvláštÄ› po domácku vyrobené aplikace).\n" +"Spraví mnoho her, které nefungují bez emulace EFB, aniž by byla tak pomalá " +"jako opravdová emulace EFB. NicménÄ› stále může selhat v mnoha jiných hrách " +"(zvláštÄ› po domácku vyrobené aplikace).\n" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." @@ -2095,7 +2243,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emulovaný Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Stav Emulace:" @@ -2105,13 +2253,15 @@ msgstr "Povolit" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 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 "" -"Zapnout 3D efekty pomocí stereoskopie použitím technologie Nvidia 3D Vision, pokud je podporována Vaším grafickým procesorem.\n" +"Zapnout 3D efekty pomocí stereoskopie použitím technologie Nvidia 3D Vision, " +"pokud je podporována Vaším grafickým procesorem.\n" "Může způsobovat problémy.\n" "Pro fungování vyžaduje režim celé obrazovky.\n" "\n" @@ -2121,15 +2271,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "Povolit protokolování AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Zapnout PÅ™iÅ¡krcení Zvuku" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Zapnout BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Zapnout SluÄování Bloků" @@ -2137,9 +2283,13 @@ msgstr "Zapnout SluÄování Bloků" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "Povolit výpoÄet ohraniÄujícího rámeÄku" @@ -2157,6 +2307,7 @@ msgstr "Povolit vyrovnávací paměť" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= ======= @@ -2168,51 +2319,54 @@ msgstr "Povolit vyrovnávací paměť" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Povolit Cheaty" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Zapnout DTK Hudbu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Povolit dvojité jádro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Zapnout dvojité jádro (zrychlení)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Povolit klávesové zkratky" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: 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:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Povolit PÅ™eskakování NeÄinných Příkazů (zrychlení)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Zapnout MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Povolit Progresivní Skenování" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Povolit SpoÅ™iÄ Obrazovky" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Povolit Å irokoúhlou obrazovku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Povolit DrátÄ›ný Model" @@ -2230,11 +2384,15 @@ msgstr "" "\n" "Pokud si nejste jisti, zvolte 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -msgid "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)" -msgstr "Zapnout rychlý přístup k disku. NÄ›které hry to potÅ™ebují. (ZAPNUTO = rychlé, VYPNUTO = Kompatibilní)" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +msgid "" +"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " +"Compatible)" +msgstr "" +"Zapnout rychlý přístup k disku. NÄ›které hry to potÅ™ebují. (ZAPNUTO = rychlé, " +"VYPNUTO = Kompatibilní)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Zapnout stránky" @@ -2245,30 +2403,43 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Toto povolte, pokud chcete, aby celá obrazovka byla použita pro vykreslování.\n" +"Toto povolte, pokud chcete, aby celá obrazovka byla použita pro " +"vykreslování.\n" "Pokud je toto zakázáno, bude místo toho vytvoÅ™eno vykreslovací okno.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 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 "" -"Toto zapnÄ›te, pokud chcete použít hlavní okno Dolphin pro vykreslování radÄ›ji, než oddÄ›lené vykreslovací okno.\n" +"Toto zapnÄ›te, pokud chcete použít hlavní okno Dolphin pro vykreslování " +"radÄ›ji, než oddÄ›lené vykreslovací okno.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 -msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." -msgstr "Povolte toto pro zrychlení The Legend of Zelda: Twilight Princess. Zakažte pro VÅ ECHNY ostatní hry." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +msgid "" +"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " +"ANY other game." +msgstr "" +"Povolte toto pro zrychlení The Legend of Zelda: Twilight Princess. Zakažte " +"pro VÅ ECHNY ostatní hry." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 -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: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:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Povolit Vlastní Hack Projekce" @@ -2284,9 +2455,13 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" -msgstr "Povolí Jednotku Správy PamÄ›ti, potÅ™ebnou v nÄ›jakých hrách. (ZAPNUTO = Kompatibilní, VYPNUTO = Rychlé)" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +msgid "" +"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " +"OFF = Fast)" +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:117 msgid "" @@ -2306,6 +2481,7 @@ msgstr "End" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 @@ -2329,6 +2505,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "AngliÄtina" @@ -2360,6 +2541,7 @@ msgstr "Rovná se" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Chyba" @@ -2406,20 +2588,35 @@ msgstr "" #: Source/Core/DolphinWX/Src/Main.cpp:356 >>>>>>> Update Greek and Czech translations ======= +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Chyba" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 >>>>>>> The actual update of the Greek and Czech translations. The last commit 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." +msgstr "" +"Chyba pÅ™i nahrávání zvoleného jazyka. Vracím se na výchozí jazyk systému." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format -msgid "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). Aborting savestate load..." -msgstr "Chyba: Po \"%s\", nalezeno %d (0x%X) místo znaÄky uložení %d (0x%X). UkonÄuji naÄtení uloženého stavu..." +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" +"Chyba: Po \"%s\", nalezeno %d (0x%X) místo znaÄky uložení %d (0x%X). " +"UkonÄuji naÄtení uloženého stavu..." -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format -msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." -msgstr "Chyba: Pokus o přístup k písmům %s, ale ty nejsou naÄtena. Hry nemusí zobrazit písma správnÄ›, nebo se můžou zhroutit" +msgid "" +"Error: Trying to access %s fonts but they are not loaded. Games may not show " +"fonts correctly, or crash." +msgstr "" +"Chyba: Pokus o přístup k písmům %s, ale ty nejsou naÄtena. Hry nemusí " +"zobrazit písma správnÄ›, nebo se můžou zhroutit" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2446,7 +2643,7 @@ msgstr "UkonÄit Dolphin s emulátorem" msgid "Export Failed" msgstr "Export Selhal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Exportovat Soubor" @@ -2459,15 +2656,15 @@ msgstr "Exportovat Nahrávku" msgid "Export Recording..." msgstr "Exportovat Nahrávku..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Exportovat Uloženou hru" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Exportovat uloženou hru Wii (Experimentální)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Exportovat vÅ¡echny Uložené hry" @@ -2483,7 +2680,7 @@ msgstr "Exportovat Uloženou hru jako..." msgid "Extension" msgstr "Rozšíření" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "VnÄ›jší Vyr. Paměť Snímků" @@ -2495,44 +2692,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Extrahovat VÅ¡echny Soubory..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Extrahovat ZavadÄ›Ä Aplikace..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Extrahovat DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Extrahovat Adresář..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Extrahovat Soubor..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Extrahovat Oddíl..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Extrahuji %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Extrahuji VÅ¡echny Soubory" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Extrahuji Adresář" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Extrahuji..." @@ -2544,11 +2741,11 @@ msgstr "FIFO Bajt" msgid "FIFO Player" msgstr "PÅ™ehrávaÄ FIFO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANCIE" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Velikost FST:" @@ -2560,11 +2757,11 @@ msgstr "PÅ™ipojení Selhalo!" msgid "Failed to Listen!!" msgstr "Naslouchání Selhalo!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Stahování kódů selhalo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Nelze extrahovat do %s!" @@ -2584,7 +2781,8 @@ msgstr "" "Nelze naÄíst ROM DSP:\t%s\n" "\n" "Tento soubor je vyžadován pÅ™i použití DSP LLE.\n" -"Není distribuován s Dolphinem, protože obsahuje data chránÄ›ná autorským právem.\n" +"Není distribuován s Dolphinem, protože obsahuje data chránÄ›ná autorským " +"právem.\n" "Použijte DSPSpy k výpisu soubor z Vaší skuteÄné konzole.\n" "\n" "Můžete použít jádro DSP HLE, které nevyžaduje výpisy ROM.\n" @@ -2681,18 +2879,28 @@ 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/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Rychlá" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Rychlé Mipmapy" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "PÅ™ehrávaÄ Fifo" @@ -2701,7 +2909,7 @@ msgstr "PÅ™ehrávaÄ Fifo" msgid "File Info" msgstr "Informace o souboru" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Soubor neobsahoval žádné kódy" @@ -2734,16 +2942,16 @@ msgstr "Soubor nerozpoznán jako paměťová karta" msgid "File not compressed" msgstr "Soubor není komprimovaný" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Neznámý režim otevÅ™ení : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Souborový systém" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Typ souboru 'ini' je neznámý! Nelze otevřít!" @@ -2751,7 +2959,7 @@ msgstr "Typ souboru 'ini' je neznámý! Nelze otevřít!" msgid "First Block" msgstr "První blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Spravit Kontrolní SouÄty" @@ -2763,7 +2971,7 @@ msgstr "Vynutit 16:9" msgid "Force 4:3" msgstr "Vynutit 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Donutit konzoli být jako NTSC-J" @@ -2795,13 +3003,15 @@ 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 setting when playing Japanese games." +"Left unchecked, dolphin defaults to NTSC-U and automatically enables this " +"setting when playing Japanese games." msgstr "" "Donutí použít režim NTSC-J pro použití Japonského písma ROMu.\n" -"Pokud není zaÅ¡krtnuto, Dolphin standardnÄ› pÅ™ejde na NTSC-U a automaticky zapne toto nastavení pÅ™i hraní Japonských her." +"Pokud není zaÅ¡krtnuto, Dolphin standardnÄ› pÅ™ejde na NTSC-U a automaticky " +"zapne toto nastavení pÅ™i hraní Japonských her." #: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" @@ -2829,7 +3039,7 @@ msgstr "Snímek" msgid "Frame Advance" msgstr "Postup Snímkem" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Uložení snímků použije FFV1" @@ -2841,7 +3051,7 @@ msgstr "Rozsah Snímku" msgid "Frame S&kipping" msgstr "PÅ™es&kakování snímků:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Limit Snímků:" @@ -2849,7 +3059,7 @@ msgstr "Limit Snímků:" msgid "Frames To Record" msgstr "Snímky k Nahrání" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Rozhlížení pomocí myÅ¡i" @@ -2857,6 +3067,7 @@ msgstr "Rozhlížení pomocí myÅ¡i" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 @@ -2880,6 +3091,11 @@ msgstr "Rozhlížení pomocí myÅ¡i" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "FrancouzÅ¡tina" @@ -2912,7 +3128,7 @@ msgstr "Nastavení GCMic" msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID Hry:" @@ -2928,15 +3144,15 @@ msgstr "Hra neběží!" msgid "Game not found!!" msgstr "Hra nenalezena!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Nastavení Konkrétní Hry" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Nastavení Hry" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2955,6 +3171,7 @@ msgstr "Nastavení Gamecube &Pad" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 @@ -2964,6 +3181,9 @@ msgstr "Nastavení Gamecube &Pad" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" @@ -2972,15 +3192,17 @@ msgid "Gamecube Pad settings" msgstr "Gamecube Pad nastavení" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Kódy Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, 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.)" +"(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 "" "Nelze spustit GeckoKód (CT%i CST%i) (%s)\n" "(buÄ Å¡patný kód, nebo typ kódu není jeÅ¡tÄ› podporován.)" @@ -2990,10 +3212,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -3017,6 +3243,7 @@ msgstr "Obecná Nastavení" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 @@ -3040,6 +3267,11 @@ msgstr "Obecná Nastavení" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "NÄ›mÄina" @@ -3074,19 +3306,22 @@ msgstr "VÄ›tší než" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 >>>>>>> The actual update of the Greek and Czech translations. The last commit 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 "" -"Velmi zvýší kvalitu vytvářených textur použitím efektů vykreslení do textury.\n" +"Velmi zvýší kvalitu vytvářených textur použitím efektů vykreslení do " +"textury.\n" "Zvýšení vnitÅ™ního rozliÅ¡ení zlepší úÄinnek tohoto nastavení.\n" "TroÅ¡ku sníží výkon a možná způsobí problémy (i když to je nepravdÄ›podobné).\n" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "ŘeÄtina" @@ -3118,7 +3353,7 @@ msgstr "Hacky" msgid "Header checksum failed" msgstr "Kontrolní souÄet hlaviÄky selhal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "HebrejÅ¡tina" @@ -3183,6 +3418,7 @@ msgstr "Nastavení klávesových zkratek" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 @@ -3199,10 +3435,13 @@ msgstr "Nastavení klávesových zkratek" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Klávesové zkratky" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "MaÄarÅ¡tina" @@ -3210,27 +3449,29 @@ msgstr "MaÄarÅ¡tina" msgid "Hybrid Wiimote" msgstr "Hybridní Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, 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: Hra se pokusila znovu naÄíst ios nebo název, který není dostupný ve VaÅ¡em nand výpisu\n" +"IOCTL_ES_LAUNCH: Hra se pokusila znovu naÄíst ios nebo název, který není " +"dostupný ve VaÅ¡em nand výpisu\n" "IDNázvu %016llx.\n" "Dolphin se teÄ pravdÄ›podobnÄ› zasekne" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - Å¡patný cíl" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Nastavení IPL" @@ -3246,15 +3487,15 @@ msgstr "InfraÄer. Ukazovátko" msgid "IR Sensitivity:" msgstr "Citlivost InfraÄer.:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Detaily ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Adresáře ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITÃLIE" @@ -3262,17 +3503,30 @@ msgstr "ITÃLIE" msgid "Icon" msgstr "Ikona" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 -msgid "If checked, the bounding box registers will be updated. Used by the Paper Mario games." -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:337 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +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:315 -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/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:485 -msgid "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." -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/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é." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" @@ -3281,28 +3535,32 @@ msgstr "Ignorovat ZmÄ›ny Formátu" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 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 "" "Ignorovat vÅ¡echny zmÄ›ny formátu EFB.\n" -"Zlepší výkon v mnoha hrách, bez žádného negativního efektu. PÅ™esto způsobuje grafické chyby v malém poÄtu jiných her.\n" +"Zlepší výkon v mnoha hrách, bez žádného negativního efektu. PÅ™esto způsobuje " +"grafické chyby v malém poÄtu jiných her.\n" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 "" "Ignorovat vÅ¡echny požadavky procesoru pro Ätení a zápis do EFB.\n" -"Zvýší výkon v nÄ›kterých hrách, ale může vypnout nÄ›které funkce související s hraním a grafické efekty.\n" +"Zvýší výkon v nÄ›kterých hrách, ale může vypnout nÄ›které funkce související s " +"hraním a grafické efekty.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Importovat Uloženou hru" @@ -3332,11 +3590,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 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 "" -"Zlepší výkon, ale způsobuje chyby ve vÄ›tÅ¡inÄ› her, které závisejí na správné emulaci mlhy.\n" +"Zlepší výkon, ale způsobuje chyby ve vÄ›tÅ¡inÄ› her, které závisejí na správné " +"emulaci mlhy.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -3350,7 +3610,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Ve HÅ™e" @@ -3359,7 +3619,7 @@ msgid "In-Game" msgstr "Ve HÅ™e" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3379,7 +3639,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:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Vložit SD Kartu" @@ -3391,18 +3651,22 @@ msgstr "Zde vložte jméno..." msgid "Install WAD" msgstr "Instalovat WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Instalovat do Wii Menu" #: Source/Core/Core/Src/MemTools.cpp:248 -msgid "InstallExceptionHandler called, but this platform does not yet support it." -msgstr "Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› nepodporuje." +msgid "" +"InstallExceptionHandler called, but this platform does not yet support it." +msgstr "" +"Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› " +"nepodporuje." <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 @@ -3416,14 +3680,17 @@ msgstr "Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› ne ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instaluji WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Rozhraní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Nastavení Rozhraní" @@ -3448,11 +3715,11 @@ msgstr "VnitÅ™ní chyba LZO - lzo_init() selhalo" msgid "Internal Resolution:" msgstr "VnitÅ™ní RozliÅ¡ení:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "PÅ™evadÄ›Ä (VELMI pomalé)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3469,7 +3736,7 @@ msgstr "Neplatná Hodnota!" msgid "Invalid bat.map or dir entry" msgstr "Neplatný bat.map nebo záznam adr." -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Neplatná událost typu %i" @@ -3489,11 +3756,11 @@ msgstr "" "%s\n" "Možná budete muset hru znovu vypsat." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Neplatný soubor s nahrávkou" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Neplatný stav" @@ -3501,6 +3768,7 @@ msgstr "Neplatný stav" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 @@ -3524,27 +3792,32 @@ msgstr "Neplatný stav" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "ItalÅ¡tina" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPONSKO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Rekompilátor (doporuÄeno)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL experimentální rekompilátor" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "JaponÅ¡tina" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KOREA" @@ -3553,8 +3826,8 @@ msgstr "KOREA" msgid "Key" msgstr "Klávesa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "KorejÅ¡tina" @@ -3572,7 +3845,7 @@ msgstr "TlaÄítko L" msgid "L-Analog" msgstr "Levý Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Jazyk:" @@ -3625,7 +3898,7 @@ msgstr "" msgid "Less Than" msgstr "Menší než" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Limitovat podle SzS" @@ -3633,7 +3906,7 @@ msgstr "Limitovat podle SzS" msgid "Load" msgstr "Nahrát" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Nahrát Vlastní Textury" @@ -3685,6 +3958,7 @@ msgstr "Nahrát Stav..." <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Nahrát Systémové Menu Wii" @@ -3718,6 +3992,13 @@ msgstr "Nahrát Systémové Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Nahrát Systémové Menu Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Nahrát Systémové Menu Wii %d%c" @@ -3744,7 +4025,7 @@ msgstr "Nahraje urÄený soubor (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Místní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Uzamknout Vlákna do Jader" @@ -3756,11 +4037,11 @@ msgstr "Záznam" msgid "Log Configuration" msgstr "Nastavení Záznamu" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Typy Záznamu" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Výstup ZapisovaÄe" @@ -3790,7 +4071,7 @@ msgstr "" "MD5 se neshoduje\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Hack Rychlosti" @@ -3820,11 +4101,11 @@ msgstr "Soubory MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "Hlavní Stick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID Výrobce:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Výrobce:" @@ -3850,6 +4131,7 @@ msgstr "Bajt PamÄ›ti" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3865,12 +4147,19 @@ msgstr "Bajt PamÄ›ti" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Paměťová karta" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" -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!" +msgid "" +"Memory Card Manager WARNING-Make backups before using, should be fixed but " +"could mangle stuff!" +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 #, c-format @@ -3897,7 +4186,7 @@ msgstr "Velikost paměťové karty se neshoduje s velikosti hlaviÄky" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mikrofon" @@ -3906,11 +4195,11 @@ msgstr "Mikrofon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Ostatní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Ostatní Nastavení" @@ -3921,15 +4210,17 @@ msgstr "Modifikátor" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 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 "" -"ZmÄ›nit textury, aby zobrazovali formát, v kterém jsou zakódovány. Ve vÄ›tÅ¡inÄ› případů vyžaduje resetovaní emulace.\n" +"ZmÄ›nit textury, aby zobrazovali formát, v kterém jsou zakódovány. Ve vÄ›tÅ¡inÄ› " +"případů vyžaduje resetovaní emulace.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Písmo se stejnou rozteÄí" @@ -3942,7 +4233,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3964,9 +4255,13 @@ msgstr "" msgid "Multiply" msgstr "Násobit" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." -msgstr "Ztlumí reproduktor Wiimote. Spravuje náhodná odpojování u opravdových Wiimote. Žádný efekt na emulovaná Wiimote." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +msgid "" +"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " +"effect on emulated wiimotes." +msgstr "" +"Ztlumí reproduktor Wiimote. Spravuje náhodná odpojování u opravdových " +"Wiimote. Žádný efekt na emulovaná Wiimote." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:126 msgid "NP Add" @@ -4056,6 +4351,7 @@ msgstr "NK Nahoru" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 @@ -4068,6 +4364,9 @@ msgstr "NK Nahoru" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4076,7 +4375,7 @@ msgstr "Jméno:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Jméno: " @@ -4090,7 +4389,7 @@ msgid "New Scan" msgstr "Nové Skenování" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Další Stránka" @@ -4102,7 +4401,7 @@ msgstr "Další Skenování" msgid "Nickname :" msgstr "PÅ™ezdívka :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Žádná ZemÄ› (SDK)" @@ -4141,7 +4440,7 @@ msgstr "Nebyl nalezen žádný ukládací adresář pro název %s" msgid "None" msgstr "Žádný" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norský BokmÃ¥l" @@ -4149,8 +4448,8 @@ msgstr "Norský BokmÃ¥l" msgid "Not Equal" msgstr "Nerovná se" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Nenastaven" @@ -4178,7 +4477,7 @@ msgstr "NepÅ™ipojen" msgid "Notes" msgstr "Poznámky" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Poznámky:" @@ -4216,7 +4515,7 @@ msgstr "Objekt" msgid "Object Range" msgstr "Rozsah Objektu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Vypnuto" @@ -4250,11 +4549,11 @@ msgstr "Pouze bloky %d jsou dostupné" msgid "Open" msgstr "Otevřít" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Otevřít &adresář umístÄ›ní" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Otevřít Wii adre&sář uložení" @@ -4276,11 +4575,11 @@ 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:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL Dekodér Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP Dekodér Textury" @@ -4312,13 +4611,16 @@ msgstr "" "a importujte je do nové paměťové karty\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Jiné" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." -msgstr "Jiný klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru ukonÄete ruÄnÄ›." +msgid "" +"Other client disconnected while game is running!! NetPlay is disabled. You " +"manually stop the game." +msgstr "" +"Jiný klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru ukonÄete ruÄnÄ›." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 msgid "Output" @@ -4360,16 +4662,16 @@ msgstr "Odstavec" msgid "Parameters" msgstr "Parametry" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Oddíl %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Záplaty" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Cesty" @@ -4377,6 +4679,7 @@ msgstr "Cesty" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ======= @@ -4393,6 +4696,10 @@ msgstr "Cesty" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pozastavit" @@ -4401,7 +4708,7 @@ msgstr "Pozastavit" msgid "Per-Pixel Lighting" msgstr "OsvÄ›tlení Podle Pixelu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Dokonalá" @@ -4429,6 +4736,7 @@ msgstr "Perspektiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> The actual update of the Greek and Czech translations. The last commit @@ -4436,6 +4744,10 @@ msgstr "Perspektiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Spustit" @@ -4449,7 +4761,7 @@ msgstr "PÅ™ehrát nahrávku" msgid "Play/Pause" msgstr "PÅ™ehrát/Pozastavit" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Hratelné" @@ -4465,6 +4777,7 @@ msgstr "HráÄi" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 @@ -4478,6 +4791,9 @@ msgstr "HráÄi" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Prosím potvrÄte..." @@ -4489,23 +4805,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:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "PolÅ¡tina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4514,11 +4830,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "PortugalÅ¡tina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "PortugalÅ¡tina (Brazilská)" @@ -4526,17 +4842,17 @@ msgstr "PortugalÅ¡tina (Brazilská)" msgid "Post-Processing Effect:" msgstr "Efekt Následného Zpracování:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, 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:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, 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:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "PÅ™edÄasný konec filmu v PlayWiimote. %u > %u" @@ -4549,7 +4865,7 @@ msgstr "PÅ™edvolby:" msgid "Prev Page" msgstr "PÅ™ed. stránka" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "PÅ™edchozí Stránka" @@ -4600,7 +4916,7 @@ msgstr "Pravý Analog" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSKO" @@ -4613,7 +4929,7 @@ msgstr "Rozsah" msgid "Read-only mode" msgstr "Režim pouze pro Ätení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Opravdová" @@ -4692,6 +5008,7 @@ msgstr "Obnovit seznam her" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 @@ -4720,6 +5037,12 @@ msgstr "Obnovit seznam her" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Odstranit" @@ -4777,11 +5100,11 @@ msgstr "Pravý Stick" msgid "Rumble" msgstr "Vibrace" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: 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:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "RuÅ¡tina" @@ -4789,6 +5112,7 @@ msgstr "RuÅ¡tina" msgid "Sa&ve State" msgstr "Uložit Sta&v" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -4811,6 +5135,13 @@ msgstr "BezpeÄná" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +msgid "Safe" +msgstr "BezpeÄná" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Vzorkovací frekvence:" @@ -4868,12 +5199,12 @@ msgstr "Uložit do Slotu Stavu 8" msgid "Save State..." msgstr "Uložit Stav..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Uložit jako" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Uložit komprimované GCM/ISO" @@ -4881,11 +5212,11 @@ msgstr "Uložit komprimované GCM/ISO" msgid "Save current perspective" msgstr "Uložit souÄasnou perspektivu" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Uložit dekomprimované GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, 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..." @@ -4901,6 +5232,7 @@ msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= ======= @@ -4912,15 +5244,18 @@ msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Skenuji %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Skenuji pro ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Skenuji..." @@ -4936,14 +5271,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Hledat Filtr" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Hledat Podadresáře" -#: Source/Core/Common/Src/SysConf.h:104 -#: Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 -#: Source/Core/Common/Src/SysConf.h:168 +#: 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 "Sekce %s nebyla v SYSCONF nalezena" @@ -4953,6 +5286,7 @@ msgstr "Sekce %s nebyla v SYSCONF nalezena" msgid "Select" msgstr "Vybrat" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4985,6 +5319,14 @@ msgstr "Vyberte Soubor s Nahrávkou" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Vyberte Soubor s Nahrávkou" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" @@ -5014,6 +5356,7 @@ msgstr "Vyberte soubor k nahrání" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" @@ -5034,16 +5377,20 @@ msgstr "Vyberte stav k nahrání" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Vyberte stav k nahrání" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= @@ -5055,6 +5402,9 @@ msgstr "Vyberte stav k nahrání" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Vyberte stav k uložení" @@ -5074,34 +5424,39 @@ msgstr "" "Vynutit 4:3: Roztáhne obraz na pomÄ›r4:3.\n" "Roztáhnout do okna: Roztáhne obraz do velikosti okna." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Vybraný typ písma" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 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 "" "Vybere rozliÅ¡ení obrazovky použité v režimu celé obrazovky.\n" -"To by mÄ›lo být vždycky vÄ›tší než nebo rovno vnitÅ™nímu rozliÅ¡ení. Dopad na výkon je zanedbatelný.\n" +"To by mÄ›lo být vždycky vÄ›tší než nebo rovno vnitÅ™nímu rozliÅ¡ení. Dopad na " +"výkon je zanedbatelný.\n" "\n" "Pokud si nejste jisti, použijte VaÅ¡e rozliÅ¡ení obrazovky.\n" -"Pokud si stále nejste jisti, použijte takové nejvyšší rozliÅ¡ení, které Vám funguje." +"Pokud si stále nejste jisti, použijte takové nejvyšší rozliÅ¡ení, které Vám " +"funguje." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 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 "" "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" +"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" "\n" "Pokud si nejste jisti, použijte Direct3D 9" @@ -5118,23 +5473,26 @@ msgstr "UmístÄ›ní Senzorové TyÄe:" msgid "Separator" msgstr "OddÄ›lovaÄ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "SrbÅ¡tina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 -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/ConfigMain.cpp:511 +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 msgid "Set" msgstr "Nastavit" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Nastavit jako &výchozí ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Nastavit jako výchozí paměťovou kartu %c" @@ -5144,7 +5502,7 @@ 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:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Nastavení..." @@ -5156,7 +5514,7 @@ msgstr "SetupWiiMem: Nelze najít soubor s nastavením" msgid "Shake" msgstr "TÅ™es" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Krátké Jméno:" @@ -5184,7 +5542,7 @@ msgstr "Zobrazit Panel Nás&trojů" msgid "Show Drives" msgstr "Zobrazit Disky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Zobrazit EFB Regiony Kopie" @@ -5200,7 +5558,7 @@ msgstr "Zobrazit Francii" msgid "Show GameCube" msgstr "Zobrazit GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Zobrazit Obrazovku Vstupu" @@ -5216,7 +5574,7 @@ msgstr "Zobrazit JAP" msgid "Show Korea" msgstr "Zobrazit Koreu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Jazyk Zobrazení:" @@ -5236,7 +5594,7 @@ msgstr "Zobrazit Platformy" msgid "Show Regions" msgstr "Zobrazit Regiony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Zobrazit Statistiky" @@ -5256,45 +5614,49 @@ msgstr "Zobrazit Wad" 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 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 "" "Zobrazit rámeÄek se zprávou, pÅ™i zjiÅ¡tÄ›ní potenciálnÄ› závažné chyby.\n" -"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í." +"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:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Zobrazit první blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Zobrazit uložené bloky" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Zobrazit komentář uložení" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Zobrazit ikonu uložení" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Zobrazit název uložení" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 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 "" -"Zobrazí poÄet snímků vykreslených za sekundu jako měřítko rychlosti emulace.\n" +"Zobrazí poÄet snímků vykreslených za sekundu jako měřítko rychlosti " +"emulace.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -5320,7 +5682,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Å ikmý Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "ZjednoduÅ¡ená ÄínÅ¡tina" @@ -5328,11 +5690,11 @@ msgstr "ZjednoduÅ¡ená ÄínÅ¡tina" msgid "Size" msgstr "Velikost" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "PÅ™eskoÄit BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Vypnout Průchod Cíl. Průhl." @@ -5342,11 +5704,13 @@ msgstr "PÅ™eskoÄit EFB Přístup z Procesoru" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 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 "" -"PÅ™eskoÄit průchod cílové průhlednosti používaný ve vÄ›tÅ¡inÄ› her pro různé grafické efekty.\n" +"PÅ™eskoÄit průchod cílové průhlednosti používaný ve vÄ›tÅ¡inÄ› her pro různé " +"grafické efekty.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -5354,13 +5718,15 @@ 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 "" "Lehce zrychlí kopie EFB do RAM obÄ›továním pÅ™esnosti emulace.\n" "NÄ›kdy také zvýší kvalitu obrazu.\n" -"Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit pÅ™esnost textury, nebo tuto možnost vypnout.\n" +"Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit pÅ™esnost textury, " +"nebo tuto možnost vypnout.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -5370,11 +5736,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5388,15 +5754,18 @@ msgstr "Softwarový VykreslovaÄ" #: 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 "" -"Softwarové vykreslování je řádovÄ› pomalejší, než pÅ™i použití ostatních backendů.\n" +"Softwarové vykreslování je řádovÄ› pomalejší, než pÅ™i použití ostatních " +"backendů.\n" "Je užiteÄné pouze pro úÄely ladÄ›ní.\n" -"Opravdu chcete zapnout softwarové vykreslování? Pokud si nejste jisti, zvolte 'Ne'." +"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:621 msgid "Sound Settings" msgstr "Nastavení Zvuku" @@ -5418,6 +5787,7 @@ msgstr "Mezerník" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 @@ -5441,6 +5811,11 @@ msgstr "Mezerník" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Å panÄ›lÅ¡tina" @@ -5450,13 +5825,21 @@ msgstr "Hlasitost Reproduktoru:" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 "" -"UrÄuje rozliÅ¡ení, v kterém bude vykresleno. Vysoké rozliÅ¡ení vlemi zvýší kvalitu obrazu, ale je také o dost nároÄnÄ›jší na výkon a může způsobovat v nÄ›kterých hrách chyby.\n" -"\"Násobek 640x528\" je o trochu pomalejší než \"Velikost Okna\", ale také nezpůsobuje tolik problémů. ObecnÄ› Å™eÄeno, Äím nižší je vnitÅ™ní rozliÅ¡ení, tím lepší výkon bude.\n" +"UrÄuje rozliÅ¡ení, v kterém bude vykresleno. Vysoké rozliÅ¡ení vlemi zvýší " +"kvalitu obrazu, ale je také o dost nároÄnÄ›jší na výkon a může způsobovat v " +"nÄ›kterých hrách chyby.\n" +"\"Násobek 640x528\" je o trochu pomalejší než \"Velikost Okna\", ale také " +"nezpůsobuje tolik problémů. ObecnÄ› Å™eÄeno, Äím nižší je vnitÅ™ní rozliÅ¡ení, " +"tím lepší výkon bude.\n" "\n" "Pokud si nejste jisti, zvolte 640x528." @@ -5464,7 +5847,7 @@ msgstr "" msgid "Specify a video backend" msgstr "UrÄit backend videa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Zvýšit rychlost pÅ™enosu Disku" @@ -5472,7 +5855,7 @@ msgstr "Zvýšit rychlost pÅ™enosu Disku" msgid "Square Stick" msgstr "ÄŒtvercový Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Standardní OvladaÄ" @@ -5550,12 +5933,14 @@ msgstr "Zastavit" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 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 "" "Ukládat EFB kopie do objektů textury grafického procesoru.\n" -"Toto není pÅ™esné, ale pro vÄ›tÅ¡inu her funguje dostateÄnÄ› dobÅ™e a dává vÄ›tší zrychlení než EFB do RAM.\n" +"Toto není pÅ™esné, ale pro vÄ›tÅ¡inu her funguje dostateÄnÄ› dobÅ™e a dává vÄ›tší " +"zrychlení než EFB do RAM.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -5584,12 +5969,12 @@ msgstr "Uložení byly úspěšnÄ› importovány" msgid "Swing" msgstr "Å vihnutí" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Jazyk Systému:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TCHAJ-WAN" @@ -5635,7 +6020,7 @@ msgstr "Deska vpravo" msgid "Take Screenshot" msgstr "VytvoÅ™it Snímek Obrazovky" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bonga)" @@ -5651,7 +6036,7 @@ msgstr "Textura" msgid "Texture Cache" msgstr "Vyrovnávací Paměť Textur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "PÅ™ekryv Formátu Textury" @@ -5667,13 +6052,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:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "Zvolený adresář je už v seznamu" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5684,15 +6069,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 "Soubor %s nemohl být otevÅ™en pro zápis. Zkontrolujte, prosím, je-li už otevÅ™en jiným programem." +msgid "" +"The file %s could not be opened for writing. Please check if it's already " +"opened by another program." +msgstr "" +"Soubor %s nemohl být otevÅ™en pro zápis. Zkontrolujte, prosím, je-li už " +"otevÅ™en jiným programem." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format 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:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Zadaný soubor (%s) neexistuje" @@ -5710,12 +6099,15 @@ 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:98 +#, fuzzy 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 second-fastest value from the right." +"If unsure, use the rightmost value." 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" +"Čí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." @@ -5724,8 +6116,12 @@ 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 -msgid "The selected language is not supported by your system. Falling back to system default." -msgstr "Zvolený jazyk není VaÅ¡im systémem podporován. Vracím se na výchozí jazyk systému." +msgid "" +"The selected language is not supported by your system. Falling back to " +"system default." +msgstr "" +"Zvolený jazyk není VaÅ¡im systémem podporován. Vracím se na výchozí jazyk " +"systému." #: Source/Core/Core/Src/NetPlayClient.cpp:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -5752,7 +6148,7 @@ msgstr "Zadaný soubor \"%s\" neexistuje" msgid "The value is invalid" msgstr "Hodnota je neplatná" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Vzhled" @@ -5760,11 +6156,15 @@ msgstr "Vzhled" msgid "Theme selection went wrong" msgstr "VýbÄ›r vzhledu se zvrtl" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 -msgid "There must be a ticket for 00000001/00000002. Your NAND dump is probably incomplete." -msgstr "Musí existovat lístek pro 00000001/00000002. VaÅ¡e NAND vypsání je pravdÄ›podobnÄ› neúplné" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 +msgid "" +"There must be a ticket for 00000001/00000002. Your NAND dump is probably " +"incomplete." +msgstr "" +"Musí existovat lístek pro 00000001/00000002. VaÅ¡e NAND vypsání je " +"pravdÄ›podobnÄ› neúplné" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5773,52 +6173,52 @@ msgstr "" "NeurÄený znamená, že hra použije nastavení Dolphin." #: Source/Core/Core/Src/ActionReplay.cpp:356 -msgid "This action replay simulator does not support codes that modify Action Replay itself." -msgstr "Tento simulátor action replay nepodporuje kód, který mÄ›ní samotný Action Replay." +msgid "" +"This action replay simulator does not support codes that modify Action " +"Replay itself." +msgstr "" +"Tento simulátor action replay nepodporuje kód, který mÄ›ní samotný Action " +"Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: 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:119 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 "" "Tato funkce Vám umožňuje si pohrát s herní kamerou.\n" -"Podržte pravé tlaÄítko myÅ¡i a pohybujte s ní pro zmÄ›nu pohledu kamery. Podržte SHIFT a zmáÄknÄ›te jednu z kláves WASD, abyste kamerou pohnuli v urÄité vzdálenosti kroku (SHIFT+0 pro rychlejší pohyb a SHIFT+9 pro pomalejší). StisknÄ›te SHIFT+R k resetu kamery.\n" +"Podržte pravé tlaÄítko myÅ¡i a pohybujte s ní pro zmÄ›nu pohledu kamery. " +"Podržte SHIFT a zmáÄknÄ›te jednu z kláves WASD, abyste kamerou pohnuli v " +"urÄité vzdálenosti kroku (SHIFT+0 pro rychlejší pohyb a SHIFT+9 pro " +"pomalejší). StisknÄ›te SHIFT+R k resetu kamery.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -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 "" -"Toto je použito pro kontrolu rychlosti hry pomocí pÅ™iÅ¡krcení zvuku.\n" -"Vypnutí tohoto může způsobit nesprávnou rychlost hry, napÅ™. příliÅ¡ rychle.\n" -"Ale nÄ›kdy zapnutím můžete způsobit nepÅ™etržitý hluk.\n" -"\n" -"Klávesová Zkratka : Podržte pro okamžité vypnutí ZaÅ¡krcení." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." -msgstr "Toto se používá pro pÅ™ehrávání hudebních stop, jako napÅ™. hudba v pozadí." +msgstr "" +"Toto se používá pro pÅ™ehrávání hudebních stop, jako napÅ™. hudba v pozadí." -#: 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" -"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 "" "Toto rozdÄ›lí vlákna Obrazu a Procesoru, takže běží na oddÄ›lených jádrech.\n" -"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." +"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:283 +#: 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" @@ -5841,7 +6241,7 @@ msgstr "Název" msgid "To" msgstr "Do" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Zapnout VÅ¡echny Typy Záznamů" @@ -5873,6 +6273,7 @@ msgstr "PÅ™epnout na Celou Obrazovku" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5880,14 +6281,17 @@ msgstr "PÅ™epnout na Celou Obrazovku" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "NahoÅ™e" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "TradiÄní ČínÅ¡tina" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Pokus o naÄtení souboru neznámého typu." @@ -5895,8 +6299,7 @@ msgstr "Pokus o naÄtení souboru neznámého typu." msgid "Triggers" msgstr "SpínaÄe" -#: Source/Core/Common/Src/SysConf.h:92 -#: Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Pokus o Ätení z neplatného SYSCONF" @@ -5908,7 +6311,7 @@ msgstr "" "Pokus o Ätení z neplatného SYSCONF\n" "ID bt wiimote nejsou dostupné" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "TureÄtina" @@ -5929,11 +6332,11 @@ msgstr "UDP Port:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "NEZNÃMÃ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -5948,10 +6351,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 "" -"Nelze analyzovat řádek %lu zadaného kódu AR jako platný zaÅ¡ifrovaný nebo rozÅ¡ifrovaný kód. UjistÄ›te se, že jste ho správnÄ› zadali.\n" +"Nelze analyzovat řádek %lu zadaného kódu AR jako platný zaÅ¡ifrovaný nebo " +"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 @@ -6024,7 +6429,7 @@ msgstr "Aktualizovat" msgid "Upright Wiimote" msgstr "Svislý Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Použít režim EuRGB60 (PAL60)" @@ -6036,7 +6441,7 @@ msgstr "Použít Celou Obrazovku" msgid "Use Hex" msgstr "Použít Å estnáctkovou soustavu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Použít Obslužné Rutiny Paniky" @@ -6048,23 +6453,26 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Použít více vláken k dekódování textur.\n" -"Může vést ke zrychlení (zvláštÄ› u procesorů, která mají více než dvÄ› jádra).\n" +"Může vést ke zrychlení (zvláštÄ› u procesorů, která mají více než dvÄ› " +"jádra).\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 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 "" "NormálnÄ› pokud kompilace shadera selže, je zobrazena chybová zpráva.\n" -"NicménÄ›, zaÅ¡krtnutím této možnosti tyto vyskakovací okna pÅ™eskoÄíte, což Vám umožní nepÅ™eruÅ¡ované hraní.\n" +"NicménÄ›, zaÅ¡krtnutím této možnosti tyto vyskakovací okna pÅ™eskoÄíte, což Vám " +"umožní nepÅ™eruÅ¡ované hraní.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Pomůcky" @@ -6088,25 +6496,29 @@ msgstr "Hodnota:" msgid "Verbosity" msgstr "Úroveň" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtuální" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Hlasitost" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format 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" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -6125,15 +6537,15 @@ msgstr "" msgid "Warning" msgstr "Varování" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 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:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Varování - ELF se spouÅ¡tí ve Å¡patném režimu konzole!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Varování - ISO se spouÅ¡tí ve Å¡patném režimu konzole!" @@ -6161,37 +6573,62 @@ msgstr "" "a mají stejný název jako soubor na VaÅ¡i paměťové kartÄ›\n" "PokraÄovat?" -#: Source/Core/Core/Src/Movie.cpp:629 -#, 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 "Varování: NaÄetli jste uloženou pozici, která je umístÄ›na po skonÄení souÄasného filmu. (bajt %u > %u) (snímek %u > %u). PÅ™ed pokraÄováním byste 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:646 -#, 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 "Varování: NaÄetli jste uloženou pozici, jejíž film má neshodu v bajtu %d (0x%X). PÅ™ed pokraÄováním byste mÄ›li naÄíst jinou pozici, nebo tento stav naÄíst bez zapnutého režimu pouze pro Ätení. Jinak pravdÄ›podobnÄ› dojde k desynchronizaci." - -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:667 #, 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 "" +"Varování: NaÄetli jste uloženou pozici, která je umístÄ›na po skonÄení " +"souÄasného filmu. (bajt %u > %u) (snímek %u > %u). PÅ™ed pokraÄováním byste " +"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:684 +#, 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 "" +"Varování: NaÄetli jste uloženou pozici, jejíž film má neshodu v bajtu %d (0x" +"%X). PÅ™ed pokraÄováním byste mÄ›li naÄíst jinou pozici, nebo tento stav " +"naÄíst bez zapnutého režimu pouze pro Ätení. Jinak pravdÄ›podobnÄ› dojde k " +"desynchronizaci." + +#: Source/Core/Core/Src/Movie.cpp:693 +#, 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 "" -"Varování: NaÄetli jste uloženou pozici, jejíž film má neshodu ve snímku %d. PÅ™ed pokraÄováním byste mÄ›li naÄíst jinou pozici, nebo tento stav naÄíst bez zapnutého režimu pouze pro Ätení. Jinak pravdÄ›podobnÄ› dojde k desynchronizaci.\n" +"Varování: NaÄetli jste uloženou pozici, jejíž film má neshodu ve snímku %d. " +"PÅ™ed pokraÄováním byste mÄ›li naÄíst jinou pozici, nebo tento stav naÄíst bez " +"zapnutého režimu pouze pro Ätení. Jinak pravdÄ›podobnÄ› dojde k " +"desynchronizaci.\n" "\n" -"Další informace: SouÄasný film je dlouhý %d snímků a uložený stav filmu je dlouhý %d snímků.\n" +"Další informace: SouÄasný film je dlouhý %d snímků a uložený stav filmu je " +"dlouhý %d snímků.\n" "\n" "Ve snímku %d souÄasný film stiskává:\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" "Na snímku %d, film uloženého stavu stiskává:\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 @@ -6202,7 +6639,7 @@ msgstr "WaveFileWriter - soubor není otevÅ™en." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Hack Å irokoúhlého obrazu" @@ -6210,15 +6647,15 @@ msgstr "Hack Å irokoúhlého obrazu" msgid "Width" msgstr "Šířka" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Konzole Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii KoÅ™en NAND:" @@ -6230,6 +6667,7 @@ msgstr "Import uložených pozic Wii" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 @@ -6243,6 +6681,9 @@ msgstr "Import uložených pozic Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -6317,7 +6758,7 @@ msgstr "Klávesa Windows Menu" msgid "Windows Right" msgstr "Klávesa Windows Vpravo" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Zalamování textu" @@ -6325,6 +6766,7 @@ msgstr "Zalamování textu" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 @@ -6344,6 +6786,11 @@ msgstr "Zalamování textu" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Pracuji..." @@ -6351,6 +6798,11 @@ msgstr "Pracuji..." msgid "Write to Console" msgstr "Zapsat do Konzole" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Zapsat do Souboru" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Zapsat do Souboru" @@ -6400,13 +6852,15 @@ msgstr "Musíte zadat jméno!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 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Ä›." +msgstr "" +"Musíte zadat platnou hodnotu v desítkové, Å¡estnáctkové nebo osmiÄkové " +"soustavÄ›." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 msgid "You must enter a valid profile name." msgstr "Musíte zadat platné jméno profilu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Pro uplatnÄ›ní zmÄ›n musíte Dolphin restartovat." @@ -6429,7 +6883,7 @@ msgstr "" "MÄ›l by být 0x%04x (ale je 0x%04llx)\n" "Chcete vytvoÅ™it nový?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP hack" @@ -6466,14 +6920,19 @@ msgstr "[Vlastní]" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 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 "" "[EXPERIMENTÃLNÃ]\n" -"Usiluje o zrychlení emulace tím, že dekódování textury pÅ™enechá grafickému procesoru použitím struktury OpenCL.\n" -"NicménÄ› v tuto dobu je známo, že způsobuje vady textur v různých hrách. Také je ve vÄ›tÅ¡inÄ› případů pomalejší, než normální dekódování textur pÅ™es procesor.\n" +"Usiluje o zrychlení emulace tím, že dekódování textury pÅ™enechá grafickému " +"procesoru použitím struktury OpenCL.\n" +"NicménÄ› v tuto dobu je známo, že způsobuje vady textur v různých hrách. Také " +"je ve vÄ›tÅ¡inÄ› případů pomalejší, než normální dekódování textur pÅ™es " +"procesor.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -6486,7 +6945,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "[EXPERIMENTÃLNÃ]\n" -"Trochu zrychlí emulaci ukládáním pÅ™edvytvoÅ™ených objektů do vyrovnávací pamÄ›ti\n" +"Trochu zrychlí emulaci ukládáním pÅ™edvytvoÅ™ených objektů do vyrovnávací " +"pamÄ›ti\n" "Může ale také způsobovat problémy\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -6495,7 +6955,7 @@ msgstr "" msgid "^ ADD" msgstr "^ PŘIDAT" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "zavadÄ›Ä aplikace (.img)" @@ -6526,12 +6986,12 @@ msgstr "není uložená hra wii nebo nelze Äíst z hlaviÄky souboru o velikost msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "neznámý příkaz 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute pÅ™i bÄ›hu aplikace vrátil -1!" @@ -6695,6 +7155,9 @@ msgstr "| NEBO" #~ msgid "Emulator Display Settings" #~ msgstr "Obrazová Nastavení Emulátoru" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Zapnout PÅ™iÅ¡krcení Zvuku" + #~ msgid "Enable CPU Access" #~ msgstr "Povolit Přístup k Procesoru" @@ -6738,6 +7201,13 @@ msgstr "| NEBO" #~ msgid "Error allocating buffer" #~ msgstr "Chyba pÅ™i alokaci vyrovnávací pamÄ›ti" +#~ msgid "" +#~ "Error in PlayWiimote. %u != %u, byte %d.\n" +#~ "Sorry, Wii recording is temporarily broken." +#~ msgstr "" +#~ "Chyba v PlayWiimote. %u != %u, bajt %d.\n" +#~ "Je nám líto, nahrávání Wii je doÄasnÄ› nefunkÄní." + #~ msgid "Error opening file %s for recording" #~ msgstr "Chyba pÅ™i otevírání souboru %s pro nahrávání" @@ -6955,6 +7425,20 @@ msgstr "| NEBO" <<<<<<< HEAD ======= >>>>>>> Update from master branch. +#~ 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 "" +#~ "Toto je použito pro kontrolu rychlosti hry pomocí pÅ™iÅ¡krcení zvuku.\n" +#~ "Vypnutí tohoto může způsobit nesprávnou rychlost hry, napÅ™. příliÅ¡ " +#~ "rychle.\n" +#~ "Ale nÄ›kdy zapnutím můžete způsobit nepÅ™etržitý hluk.\n" +#~ "\n" +#~ "Klávesová Zkratka : Podržte pro okamžité vypnutí ZaÅ¡krcení." + #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" diff --git a/Languages/po/de.po b/Languages/po/de.po index 52e4251e01..6ed4fa1ca7 100644 --- a/Languages/po/de.po +++ b/Languages/po/de.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-02-17 01:23+0100\n" "Last-Translator: LucasX \n" "Language-Team: \n" @@ -57,9 +61,9 @@ msgstr "\"%s\" ist ein ungültiges GC/Wii-Image, oder kein GC/Wii-Image." msgid "%1$sCopy%1$s" msgstr "%1$sKopie%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -154,7 +158,7 @@ msgstr "%sGCI exportieren%s" msgid "%sImport GCI%s" msgstr "%sGCI importieren%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u freie Blöcke; %u freie Verzeichniseinträge" @@ -187,11 +191,11 @@ msgstr "&Cheat Manager" msgid "&DSP Settings" msgstr "&DSP Einstellungen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "ISO &löschen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "Ausgewählte ISOs &löschen" @@ -255,7 +259,7 @@ msgstr "Pau&se" msgid "&Play" msgstr "&Start" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Eigenschaften" @@ -299,7 +303,7 @@ msgstr "&Ansicht" msgid "&Wiimote Settings" msgstr "&Wiimote Einstellungen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "" @@ -343,7 +347,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -352,7 +356,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -409,13 +413,13 @@ msgstr "" "\n" "TCP Port zum Hoster muss geöffnet sein!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR Codes" @@ -427,11 +431,11 @@ msgstr "Ãœber Dolphin" msgid "Acceleration" msgstr "Beschleunigung" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Genaue VBeam Emulation" @@ -547,11 +551,11 @@ msgstr "Grafikkarte:" msgid "Add" msgstr "Hinzufügen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "ActionReplay Code hinzufügen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Patch hinzufügen" @@ -559,6 +563,7 @@ msgstr "Patch hinzufügen" msgid "Add new pane" msgstr "Neue Palette hinzufügen" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -574,6 +579,11 @@ msgstr "Neue Palette hinzufügen" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Hinzufügen..." @@ -621,11 +631,11 @@ 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:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Erweitert" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Erweiterte Einstellungen" @@ -634,14 +644,15 @@ msgstr "Erweiterte Einstellungen" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Alle GC/Wii Dateien (elf, dol, gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Alle GC/Wii Images (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM Dateien (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -654,18 +665,22 @@ msgstr "Alle Gamecube GCM Dateien (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Speicherstände (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO Dateien (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle komprimierten GC/Wii ISO Dateien (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Alle Dateien (*.*)|*.*" @@ -677,7 +692,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Emulierte Wiimote" @@ -699,7 +714,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Kann Apploader aus dieser Datei nicht laden." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -714,7 +729,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -723,7 +738,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -731,11 +746,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:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -745,6 +761,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Seitenverhältnis:" @@ -753,18 +772,20 @@ 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:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Audio Backend:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -774,6 +795,9 @@ msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisch" @@ -814,7 +838,7 @@ msgstr "" msgid "Back" msgstr "Zurück" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Backend Einstellungen" @@ -842,11 +866,11 @@ msgstr "Ungültige Header-Datei" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Banner Details" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Banner:" @@ -858,7 +882,7 @@ msgstr "Leiste" msgid "Basic" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Grundeinstellungen" @@ -889,6 +913,7 @@ msgstr "Blau rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -896,6 +921,9 @@ msgstr "Blau rechts" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Unten" @@ -904,7 +932,7 @@ msgstr "Unten" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Defekt" @@ -920,7 +948,7 @@ msgstr "Ordner suchen und hinzufügen" msgid "Browse for an ISO directory..." msgstr "ISO-Verzeichnis hinzufügen..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Ausgabeverzeichnis auswählen" @@ -951,11 +979,11 @@ msgstr "C-Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU Emulator Engine" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 #, fuzzy msgid "Cache Display Lists" msgstr "Anzeigeliste zwischenspeichern" @@ -996,7 +1024,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:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1006,7 +1034,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:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 #, fuzzy msgid "" "Cannot use that file as a memory card.\n" @@ -1025,8 +1053,6 @@ msgstr "Kann WiiMote bei BD: %02x:%02x:%02x:%02x:%02x:%02x nicht finden." msgid "Cant find WiiMote by connection handle %02x" msgstr "Kann Wiimote bei Verbindungs-Handle %02x nicht finden." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1036,7 +1062,7 @@ msgstr "Kann von DVD_Plugin/DVD-Schnittstelle nicht lesen: Fataler Fehler" msgid "Caps Lock" msgstr "Feststellen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -1061,7 +1087,7 @@ msgstr "Disc wechseln" msgid "Change Game" msgstr "Spiel wechseln" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1079,8 +1105,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:506 #: 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." @@ -1101,32 +1127,32 @@ msgstr "Cheat Suche" msgid "Cheats Manager" msgstr "Cheat Manager" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinesisch (Vereinfacht)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinesisch (Traditionell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: 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:762 +#: 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:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Standard ISO auswählen:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Ordner zum Hinzufügen auswählen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Datei zum Öffnen auswählen" @@ -1134,15 +1160,15 @@ msgstr "Datei zum Öffnen auswählen" msgid "Choose a memory card:" msgstr "Wähle eine Memory Card:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: 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:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: 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" @@ -1154,14 +1180,14 @@ msgstr "" msgid "Classic" msgstr "Klassik" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Löschen" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Löschen fehlgeschlagen." @@ -1177,6 +1203,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1185,6 +1212,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Schließen" @@ -1208,20 +1239,20 @@ msgstr "Befehl" msgid "Comment" msgstr "Kommentar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Kommentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "ISO komprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Ausgewählte ISOs komprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Komprimiere ISO" @@ -1248,13 +1279,13 @@ msgstr "Pads konfigurieren" msgid "Configure..." msgstr "Konfigurieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Ãœberschreiben Bestätigen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 #, fuzzy msgid "Confirm on Stop" msgstr "Bestätigung beim Beenden" @@ -1264,7 +1295,7 @@ msgstr "Bestätigung beim Beenden" msgid "Connect" msgstr "Verbinden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "USB-Keyboard anschließen" @@ -1321,12 +1352,12 @@ msgstr "Zu GCI konvertieren" msgid "Copy failed" msgstr "Kopieren fehlgeschlagen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Auf Memcard %c kopieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Kern" @@ -1356,7 +1387,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Konnte ISO-Datei %s nicht erkennen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Konnte %s nicht speichern." @@ -1371,7 +1402,7 @@ msgstr "" "derzeit!\n" "(Pads während der Emulation einzustellen, wird noch nicht unterstützt.)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1384,7 +1415,7 @@ msgstr "" "Führen Sie Dolphin von einer CD/DVD aus, oder ist die Speicherdatei " "vielleicht schreibgeschützt?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Konnte denn Befehl zum öffnen der Dateierweiterung 'ini' nicht finden!" @@ -1402,7 +1433,7 @@ msgstr "" msgid "Count:" msgstr "Anzahl:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Land:" @@ -1416,26 +1447,26 @@ 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:500 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:497 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:498 msgid "Created by VistaIcons.com" msgstr "Erstellt von VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 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:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Ersteller: " @@ -1443,7 +1474,7 @@ msgstr "Ersteller: " msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Abschneiden" @@ -1464,7 +1495,7 @@ 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:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Benutzerdefinierter Projection-Hack" @@ -1472,11 +1503,11 @@ msgstr "Benutzerdefinierter Projection-Hack" msgid "Custom Projection Hack Settings" msgstr "Benutzerdefinierter Projection-Hack Einstellungen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Einige orthographische Projection Parameter anpassen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Tschechisch" @@ -1488,10 +1519,11 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1502,19 +1534,23 @@ msgstr "DSP Emulator Engine" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emulation (schnell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE Interpreter (langsam)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 #, fuzzy msgid "DSP LLE on Thread" msgstr "DSP LLE in eigenem Thread ausführen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE Recompiler" @@ -1522,15 +1558,23 @@ msgstr "DSP LLE Recompiler" msgid "DSP settings" msgstr "DSP Einstellungen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD Laufwerk:" +#: 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:176 msgid "Data Size" msgstr "Datengröße" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Datum:" @@ -1551,7 +1595,7 @@ msgstr "Tote Zone" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 #, fuzzy msgid "Debugging" msgstr "Debug" @@ -1560,16 +1604,16 @@ msgstr "Debug" msgid "Decimal" msgstr "Dezimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "ISO dekomprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Ausgewählte ISOs dekomprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Dekomprimiere ISO" @@ -1577,11 +1621,11 @@ msgstr "Dekomprimiere ISO" msgid "Default" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Standard ISO:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Standard Schriftart" @@ -1590,7 +1634,7 @@ msgstr "Standard Schriftart" msgid "Delete" msgstr "Löschen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Spielstand löschen" @@ -1599,7 +1643,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:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 #, fuzzy msgid "Description" msgstr "Frage" @@ -1608,8 +1652,8 @@ msgstr "Frage" msgid "Detect" msgstr "Erkenne" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: 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." @@ -1620,8 +1664,8 @@ msgstr "" msgid "Device" msgstr "Gerät" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Geräteeinstellungen" @@ -1646,25 +1690,25 @@ msgstr "" "und ebenfalls die Backup-Verzeichnis-Prüfsumme." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 #, fuzzy msgid "Disable" msgstr "kein Nebel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "kein Nebel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "keine Beleuchtung" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 #, fuzzy msgid "Disable Per-Pixel Depth" msgstr "Farbtiefe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "keine Texturen" @@ -1694,7 +1738,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disc" @@ -1718,6 +1762,7 @@ msgstr "" msgid "Divide" msgstr "Dividieren" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1727,10 +1772,13 @@ msgstr "Dividieren" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Laufende Emulation stoppen?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1756,6 +1804,7 @@ msgstr "Dolphin Emulierte-Wiimote Einstellungen" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1780,6 +1829,14 @@ msgstr "Dolphin GCPad Konfiguration" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad Konfiguration" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filme (*.dtm)" @@ -1812,11 +1869,11 @@ msgstr "" msgid "Down" msgstr "Runter" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Codes Herunterladen (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu Codes heruntergeladen. (%lu hinzugefügt)" @@ -1825,23 +1882,23 @@ msgstr "%lu Codes heruntergeladen. (%lu hinzugefügt)" msgid "Drums" msgstr "Trommeln" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Audio dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "EFB-Target dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Frames dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Texturen dumpen" @@ -1867,6 +1924,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1882,6 +1940,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holländisch" @@ -1907,7 +1970,7 @@ msgstr "" "aktualisiert haben, wird jezt wahrscheinlich ein Neustart benötigt, damit " "Windows denn neuen Treiber ladet." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPA" @@ -1923,7 +1986,7 @@ msgstr "Bearbeiten" msgid "Edit ActionReplay Code" msgstr "ActionReplay Code bearbeiten" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Einstellungen bearbeiten" @@ -1935,8 +1998,8 @@ msgstr "Patch bearbeiten" msgid "Edit current perspective" msgstr "Aktuelle Ansicht ändern" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Bearbeiten..." @@ -1975,7 +2038,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emulierte Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Emulierbarkeit:" @@ -1997,23 +2060,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "AR Logging aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Audio-Throttle aktivieren" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "BAT aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Blockvereinigung aktivieren" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2027,6 +2090,7 @@ msgstr "" msgid "Enable Cache" msgstr "Cache verwenden" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2036,52 +2100,55 @@ msgstr "Cache verwenden" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Cheats aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "DTK Musik aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Dual Core aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Dual Core aktivieren (Beschleunigung)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Tastenkürzel aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Idle-Skipping aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Idle-Skipping aktivieren (Beschleunigung)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "MMU aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Vollbildverfahren aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 #, fuzzy msgid "Enable Screen Saver" msgstr "Breitbildmodus" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Breitbildmodus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Drahtgitter aktivieren" @@ -2097,7 +2164,7 @@ msgstr "" "Anisotropische Filterung aktivieren.\n" "Verbessert die Grafikqualität bei schrägen Blickwinkeln." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2105,7 +2172,7 @@ msgstr "" "Aktiviert schnellen Zugriff auf die Disc. Wird für einige Spiele benötigt. " "(ON = Schnell, OFF = Kompatibel)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Blättern verwenden" @@ -2125,7 +2192,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2133,7 +2200,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:311 +#: 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 = " @@ -2143,7 +2210,7 @@ msgstr "" "Speicherverwaltungs-Einheit. Präzise für die Hardware, aber langsamer zu " "Emulieren. (ON = Kompatibel, OFF = Schnell)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Benutzerdefinierten Projection-Hack aktivieren" @@ -2155,7 +2222,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2174,6 +2241,7 @@ msgstr "" msgid "End" msgstr "Ende" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2189,6 +2257,11 @@ msgstr "Ende" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Englisch" @@ -2219,6 +2292,7 @@ msgstr "Gleich" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Fehler" @@ -2249,20 +2323,26 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Fehler" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Fehler beim Laden der ausgewählten Sprache. Kehre nun zu dem Systemstandart " "zurück." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2298,7 +2378,7 @@ msgstr "Dolphin mit Emulator beenden." msgid "Export Failed" msgstr "Exportieren fehlgeschlagen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Datei exportieren" @@ -2311,15 +2391,15 @@ msgstr "Aufnahme exportieren" msgid "Export Recording..." msgstr "Aufnahme exportieren..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Spielstand exportieren" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Wii Spielstand exportieren (Experimentell)..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Alle Spielstände exportieren" @@ -2335,7 +2415,7 @@ msgstr "Spielstand exportieren als..." msgid "Extension" msgstr "Erweiterung" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 #, fuzzy msgid "External Frame Buffer" msgstr "Extra Parameter" @@ -2348,44 +2428,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Alle Dateien extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Apploader extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "DOL extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Ordner extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Datei extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Partition extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Extrahiere %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Alle Dateien extrahieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Ordner extrahieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Extrahieren..." @@ -2398,11 +2478,11 @@ msgstr "" msgid "FIFO Player" msgstr "Spieler" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANKREICH" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FST Größe:" @@ -2415,11 +2495,11 @@ msgstr "Verbindungsaufbau fehlgeschlagen!" msgid "Failed to Listen!!" msgstr "_Listen_ Fehlgeschlagen!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Download von Codes ist Fehlgeschlagen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Entpacken nach %s ist Fehlgeschlagen!" @@ -2529,19 +2609,29 @@ 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/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Schnell" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 #, fuzzy msgid "Fast Mipmaps" msgstr "Native Mipmaps laden" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 #, fuzzy msgid "Fifo Player" @@ -2552,7 +2642,7 @@ msgstr "Spieler" msgid "File Info" msgstr "Code Info" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Datei enthielt keine Codes." @@ -2585,16 +2675,16 @@ msgstr "Diese Datei wird nicht als Memorycard anerkannt." msgid "File not compressed" msgstr "Datei nicht komprimiert" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Unbekanter Open-Modus : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Dateisystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Der Datentyp 'ini' ist unbekannt! Wird nicht geöffnet!" @@ -2602,7 +2692,7 @@ msgstr "Der Datentyp 'ini' ist unbekannt! Wird nicht geöffnet!" msgid "First Block" msgstr "Erster Block" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Prüfsummen korrigieren" @@ -2614,7 +2704,7 @@ msgstr "16:9 erzwingen" msgid "Force 4:3" msgstr "4:3 erzwingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 #, fuzzy msgid "Force Console as NTSC-J" msgstr "Konsole auf NTSC-J umschalten" @@ -2648,7 +2738,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 " @@ -2683,7 +2773,7 @@ msgstr "Einzelbildwiedergabe" msgid "Frame Advance" msgstr "Einzelbildwiedergabe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "Frame-Dumps verwenden FFV1" @@ -2697,7 +2787,7 @@ msgstr "Einzelbildwiedergabe" msgid "Frame S&kipping" msgstr "Frames ü&berspringen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Framelimit:" @@ -2705,10 +2795,11 @@ msgstr "Framelimit:" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Frei Umsehen" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2724,6 +2815,11 @@ msgstr "Frei Umsehen" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Französisch" @@ -2758,7 +2854,7 @@ msgstr "Tastenkürzel Einstellungen" msgid "GCPad" msgstr "GC-Pad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "Spiel ID:" @@ -2774,15 +2870,15 @@ msgstr "Spiel wird nicht emuliert!" msgid "Game not found!!" msgstr "Spiel nicht gefunden!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Spiel-Spezifische Einstellungen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Spieleinstellungen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2794,6 +2890,7 @@ msgstr "Gamecube-&Pad Einstellungen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2801,6 +2898,9 @@ msgstr "Gamecube-&Pad Einstellungen" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Cards (*.raw,*.gcp)" @@ -2809,15 +2909,17 @@ msgid "Gamecube Pad settings" msgstr "Gamecube Pad Einstellungen" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko Codes" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, 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.)" +"(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 "" "Fehler beim Starten des GeckoCode (CT%i CST%i) (%s)\n" "(Entweder ist der Code Fehlerhafter oder der Code-Typ wird noch nicht " @@ -2833,8 +2935,12 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Allgemein" @@ -2844,6 +2950,7 @@ msgstr "Allgemein" msgid "General Settings" msgstr "Interface Einstellungen" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2859,6 +2966,11 @@ msgstr "Interface Einstellungen" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Deutsch" @@ -2890,7 +3002,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Griechisch" @@ -2922,7 +3034,7 @@ msgstr "" msgid "Header checksum failed" msgstr "Header-Prüfsumme fehlerhaft" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebräisch" @@ -2992,12 +3104,16 @@ msgstr "Tastenkürzel Einstellungen" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Tastenkürzel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Ungarisch" @@ -3005,14 +3121,14 @@ msgstr "Ungarisch" msgid "Hybrid Wiimote" msgstr "Hybrid Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3025,11 +3141,11 @@ msgstr "" "TitleID %016llx.\n" " Dolphin wird wahrscheinlich jetzt hängen bleiben." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - Fehlerhafte Beschreibung" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL Einstellungen" @@ -3045,15 +3161,15 @@ msgstr "IR-Zeiger" msgid "IR Sensitivity:" msgstr "IR-Empfindlichkeit" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "ISO Details" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "ISO Verzeichnisse" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITALIEN" @@ -3061,23 +3177,25 @@ msgstr "ITALIEN" msgid "Icon" msgstr "Symbol" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: 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:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy msgid "" -"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." +"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 "" "Wenn das Framelimit höher als die Maximalgeschwindigkeit des Spiels " "(NTSC:60, PAL:50) eingestellt ist, muss Audio Throttle in den DSP-" @@ -3106,7 +3224,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Spielstand importieren" @@ -3155,7 +3273,7 @@ msgstr "" "Beleuchtung Deaktivieren. Verbessert die Performance, aber schaltet " "Beleuchtung in Spielen ab, die sie benutzen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Ingame" @@ -3164,7 +3282,7 @@ msgid "In-Game" msgstr "In-Game" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3184,7 +3302,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:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "SD-Karte einlegen" @@ -3197,7 +3315,7 @@ msgstr "Namen hier eingeben.." msgid "Install WAD" msgstr "Wii-Menü installieren" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Zum Wii-Menü hinzufügen" @@ -3208,6 +3326,7 @@ msgstr "" "InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesn " "noch nicht." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3217,16 +3336,19 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "WAD ins Wii-Menü installieren..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 #, fuzzy msgid "Interface" msgstr "Interface Einstellungen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Interface Einstellungen" @@ -3253,11 +3375,11 @@ msgstr "Internationaler LZO-Fehler - lzo_init() fehlerhaft" msgid "Internal Resolution:" msgstr "Vollbildauflösung:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreter (SEHR langsam)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3274,7 +3396,7 @@ msgstr "Ungültigen Wert!" msgid "Invalid bat.map or dir entry" msgstr "Ungültige bat.map oder Verzeichnis-Eintrag" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Ungültiger Ereignis-Typ %i" @@ -3294,14 +3416,15 @@ msgstr "" "%s\n" " Möglicherweise müssen Sie dieses Spiel neu dumpen." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Ungültige Aufnahmedatei" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Ungültiger Status" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3317,27 +3440,32 @@ msgstr "Ungültiger Status" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italienisch" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (empfohlen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL experimenteller Recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japanisch" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KOREA" @@ -3346,8 +3474,8 @@ msgstr "KOREA" msgid "Key" msgstr "Taste" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Koreanisch" @@ -3365,7 +3493,7 @@ msgstr "L Taste" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Sprache:" @@ -3418,7 +3546,7 @@ msgstr "" msgid "Less Than" msgstr "Kleiner als" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3426,7 +3554,7 @@ msgstr "" msgid "Load" msgstr "Laden" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 #, fuzzy msgid "Load Custom Textures" msgstr "Hochauflösende Texturen laden" @@ -3475,6 +3603,7 @@ msgstr "Status aus Slot 8 laden" msgid "Load State..." msgstr "Status laden..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3484,10 +3613,14 @@ msgstr "Status laden..." ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Wii-Menü laden (%d %c)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 @@ -3497,6 +3630,9 @@ msgstr "Wii-Menü laden (%d %c)" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii-Menü laden (%d %c)" @@ -3522,7 +3658,7 @@ msgstr "Lade die ausgewählte Datei (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Lokal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 #, fuzzy msgid "Lock Threads to Cores" msgstr "Threads an Cores binden" @@ -3536,12 +3672,12 @@ msgstr "Log" msgid "Log Configuration" msgstr "Tastenkürzel Einstellungen" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 #, fuzzy msgid "Log Types" msgstr "Typ" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 #, fuzzy msgid "Logger Outputs" msgstr "Ausgabe" @@ -3572,7 +3708,7 @@ msgstr "" "MD5 Konflikt\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" @@ -3594,11 +3730,11 @@ msgstr "MadCatz Gameshark Dateien(*.gcs)" msgid "Main Stick" msgstr "Main Stick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "Hersteller ID" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Hersteller:" @@ -3623,6 +3759,7 @@ msgstr "Speicher" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3630,6 +3767,9 @@ msgstr "Speicher" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Memory Card" @@ -3666,7 +3806,7 @@ msgstr "" msgid "Menu" msgstr "Menü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mikrofon" @@ -3676,11 +3816,11 @@ msgstr "Mikrofon" msgid "Min" msgstr "Mikrofon" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Sonstiges" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Sonstige Einstellungen" @@ -3697,7 +3837,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Monospaced Schriftart" @@ -3710,7 +3850,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3725,7 +3865,7 @@ msgstr "" msgid "Multiply" msgstr "Stern" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3816,6 +3956,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Hoch" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3825,6 +3966,9 @@ msgstr "NP Hoch" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3833,7 +3977,7 @@ msgstr "Name:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Name: " @@ -3847,7 +3991,7 @@ msgid "New Scan" msgstr "Neuer Scan" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Nächste Seite" @@ -3859,7 +4003,7 @@ msgstr "Nächster Scan" msgid "Nickname :" msgstr "Nickname:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Kein Land (SDK)" @@ -3899,7 +4043,7 @@ msgstr "Keinen Spielstand-Ordner für Tittel %s gefunden." msgid "None" msgstr "Keine" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norwegisch" @@ -3907,8 +4051,8 @@ msgstr "Norwegisch" msgid "Not Equal" msgstr "Ungleich" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Nicht Festgelegt" @@ -3928,7 +4072,7 @@ msgstr "Nicht Verbunden" msgid "Notes" msgstr "Notizen" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notizen: " @@ -3966,7 +4110,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Aus" @@ -3992,11 +4136,11 @@ msgstr "Nur %d Blöcke verfügbar" msgid "Open" msgstr "Öffnen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Beinhaltenden &Ordner öffnen..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "&Wii Spielstand-Ordner öffnen..." @@ -4018,11 +4162,11 @@ 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:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -4055,7 +4199,7 @@ msgstr "" "und importiere die Spielstände auf eine neue Memorycard.\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -4107,19 +4251,20 @@ msgstr "Paragraph" msgid "Parameters" msgstr "Parameter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partition %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Pfade" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4132,6 +4277,10 @@ msgstr "Pfade" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4141,7 +4290,7 @@ msgstr "Pause" msgid "Per-Pixel Lighting" msgstr "Pixel Beleuchtung" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfekt" @@ -4154,6 +4303,7 @@ msgstr "Perspektive %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4164,6 +4314,10 @@ msgstr "Perspektive %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Start" @@ -4177,7 +4331,7 @@ msgstr "Aufnahme abspielen" msgid "Play/Pause" msgstr "Start/Pause" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Spielbar" @@ -4190,6 +4344,7 @@ msgstr "Optionen" msgid "Players" msgstr "Spieler" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4199,6 +4354,9 @@ msgstr "Spieler" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Bitte Bestätigen..." @@ -4210,23 +4368,23 @@ msgstr "Bitte legen Sie vor dem Speichern eine Perspektive fest" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polnisch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4235,11 +4393,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugiesisch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugiesisch (Brasilianisch)" @@ -4248,17 +4406,17 @@ msgstr "Portugiesisch (Brasilianisch)" msgid "Post-Processing Effect:" msgstr "Post-Processing Shader:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4271,7 +4429,7 @@ msgstr "" msgid "Prev Page" msgstr "Vorh. Seite" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Vorherige Seite" @@ -4322,7 +4480,7 @@ msgstr "R-Analog" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSSLAND" @@ -4335,7 +4493,7 @@ msgstr "Weite" msgid "Read-only mode" msgstr "Nur-Lese-Modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Echt" @@ -4414,6 +4572,7 @@ msgstr "Liste aktualisieren" msgid "Refresh game list" msgstr "Spieleliste aktualisieren" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4432,6 +4591,12 @@ msgstr "Spieleliste aktualisieren" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Entfernen" @@ -4484,11 +4649,11 @@ msgstr "Stick rechts" msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: 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:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russisch" @@ -4496,10 +4661,11 @@ msgstr "Russisch" msgid "Sa&ve State" msgstr "S&tatus speichern" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Sicher" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4509,6 +4675,9 @@ msgstr "Sicher" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Abtastrate:" @@ -4566,12 +4735,12 @@ msgstr "Status in Slot 8 speichern" msgid "Save State..." msgstr "Status speichern..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Speichern unter..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Komprimierte GCM/ISO speichern" @@ -4579,11 +4748,11 @@ msgstr "Komprimierte GCM/ISO speichern" msgid "Save current perspective" msgstr "Aktuelle Perspektive speichern" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Dekomprimierte GCM/ISO speichern" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Film-Status %s ist fehlerhaft, breche die Filmaufnahme ab..." @@ -4593,6 +4762,7 @@ msgstr "Film-Status %s ist fehlerhaft, breche die Filmaufnahme ab..." msgid "Scaled EFB Copy" msgstr "EFB Scaled Copy" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4602,15 +4772,18 @@ msgstr "EFB Scaled Copy" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Suche..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Suche nach ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Suche..." @@ -4626,12 +4799,12 @@ msgstr "Rollen Feststell" msgid "Search Filter" msgstr "Suchfilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Unterordner durchsuchen" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: 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 "Ausgewähltes %s nicht gefunden in SYSCONF" @@ -4641,6 +4814,7 @@ msgstr "Ausgewähltes %s nicht gefunden in SYSCONF" msgid "Select" msgstr "Auswählen" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4665,6 +4839,14 @@ msgstr "Aufnahmedatei auswählen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Aufnahmedatei auswählen" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Speicherdatei zum Importieren auswählen" @@ -4691,16 +4873,21 @@ msgstr "Wähle unverankerte Fenster" msgid "Select the file to load" msgstr "Datei zum Laden auswählen" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Wii-Spielstand auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Status zum Laden auswählen" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4720,6 +4907,9 @@ msgstr "Status zum Laden auswählen" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Status zum Speichern auswählen" @@ -4740,7 +4930,7 @@ msgstr "" "Erzwinge 4:3: Bild auf das Verhältnis 4:3 strecken.\n" "An Fenster anpassen: Bild auf Fenstergröße strecken." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Ausgewählte Schriftart" @@ -4776,11 +4966,11 @@ msgstr "Position der Sensorleiste:" msgid "Separator" msgstr "Trennzeichen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4791,11 +4981,11 @@ msgstr "" msgid "Set" msgstr "Zuweisen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Als &Standard-ISO festlegen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Als Standard-Speicherkarte %c auswählen" @@ -4806,7 +4996,7 @@ 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:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Einstellungen..." @@ -4818,7 +5008,7 @@ msgstr "SetupWiiMem: Kann die Einstellungsdatei nicht finden" msgid "Shake" msgstr "Schütteln" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Kurzer Name:" @@ -4847,7 +5037,7 @@ msgstr "&Werkzeugleiste anzeigen" msgid "Show Drives" msgstr "Laufwerke anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 #, fuzzy msgid "Show EFB Copy Regions" msgstr "EFB Kopie-Regionen" @@ -4864,7 +5054,7 @@ msgstr "Frankreich anzeigen" msgid "Show GameCube" msgstr "GameCube anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 #, fuzzy msgid "Show Input Display" msgstr "Italien anzeigen" @@ -4881,7 +5071,7 @@ msgstr "JAP anzeigen" msgid "Show Korea" msgstr "Korea anzeigen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Sprache anzeigen:" @@ -4902,7 +5092,7 @@ msgstr "Plattformen anzeigen" msgid "Show Regions" msgstr "Regionen anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 #, fuzzy msgid "Show Statistics" msgstr "Statistiken" @@ -4923,11 +5113,11 @@ msgstr "Wad anzeigen" 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 " @@ -4939,23 +5129,23 @@ msgstr "" "aber es kann dann vorkommen, dass Dolphin plötzlich ohne eine Warnung " "abstürzt." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Ersten Block anzeigen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Blöcke anzeigen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Kommentar anzeigen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Symbol anzeigen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Namen anzeigen" @@ -4987,7 +5177,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "_Seitwärts_ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Vereinfachtes Chinesisch" @@ -4995,12 +5185,12 @@ msgstr "Vereinfachtes Chinesisch" msgid "Size" msgstr "Größe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 #, fuzzy msgid "Skip BIOS" msgstr "GC-BIOS überspringen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "Dest. Alpha Pass ausschalten" @@ -5033,11 +5223,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5057,7 +5247,7 @@ 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:621 msgid "Sound Settings" msgstr "Sound Einstelungen" @@ -5075,6 +5265,7 @@ msgstr "Erstellen des Sound-Buffer fehlgeschlagen: %s" msgid "Space" msgstr "Leertaste" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5090,6 +5281,11 @@ msgstr "Leertaste" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spanisch" @@ -5113,7 +5309,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Wähle ein Video-Backend" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Disc-Ãœbertragungsrate beschleunigen" @@ -5121,7 +5317,7 @@ msgstr "Disc-Ãœbertragungsrate beschleunigen" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Standard-Controller" @@ -5214,12 +5410,12 @@ msgstr "Die gespeicherte Datei wurde erfolgreich importiert" msgid "Swing" msgstr "Schwenken" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Systemsprache:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWAN" @@ -5259,7 +5455,7 @@ msgstr "" msgid "Take Screenshot" msgstr "Screenshot erstellen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5276,7 +5472,7 @@ msgstr "Textur" msgid "Texture Cache" msgstr "Cache löschen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 #, fuzzy msgid "Texture Format Overlay" msgstr "Texturformat" @@ -5293,13 +5489,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:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 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:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5324,7 +5520,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:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Die angegebene Datei (%s) existiert nicht" @@ -5346,7 +5542,7 @@ msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5389,7 +5585,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:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Theme" @@ -5397,7 +5593,7 @@ msgstr "Theme" msgid "Theme selection went wrong" msgstr "Theme-Auswahl schiefgelaufen" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5405,7 +5601,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:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5422,7 +5618,7 @@ msgstr "" "Dieser Action-Replay-Simulator unterstützt keine Codes, die sich selber " "verändern können." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: 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." @@ -5438,26 +5634,10 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -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 "" -"Wird verwendet, um die Spielgeschwindigkeit anhand der Audio-Drossel zu " -"steuern.\n" -"Deaktivieren kann zu unnormaler (z.B. zu schneller) Spielgeschwindigkeit " -"führen. \n" -"Aber manchmal kann das Aktivieren dauerhafte Störgeräusche verursachen.\n" -"\n" -"Tastaturkürzel : Zur Deaktivierung der Drossel gedrückt halten." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Wird zur Wiedergabe von Musik (z.B. Hintergrundmusik) benutzt" -#: 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" @@ -5470,7 +5650,7 @@ msgstr "" "als einem Kern,\n" "kann aber gelegentlich Abstürze/Fehler verursachen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: 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" @@ -5494,7 +5674,7 @@ msgstr "Titel" msgid "To" msgstr "Oben" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 #, fuzzy msgid "Toggle All Log Types" msgstr "Alle umschalten" @@ -5515,6 +5695,7 @@ msgstr "Vollbildmodus wechseln" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5522,14 +5703,17 @@ msgstr "Vollbildmodus wechseln" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Oben" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Traditionelles Chinesisch" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Versuche gerade einen unbekannten Dateityp zu Laden." @@ -5537,7 +5721,7 @@ msgstr "Versuche gerade einen unbekannten Dateityp zu Laden." msgid "Triggers" msgstr "Schultertasten" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Versuche gerade eine ungültige SYSCONF zu Lesen" @@ -5549,7 +5733,7 @@ msgstr "" "Versuche gerade eine ungültige SYSCONF zu Lesen\n" "Wiimote BT-IDs sind nicht verfügbar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Türkisch" @@ -5570,11 +5754,11 @@ msgstr "UDP Port:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "UNBEKANNT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -5655,7 +5839,7 @@ msgstr "Update" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 Modus (PAL60) verwenden" @@ -5668,7 +5852,7 @@ msgstr "&Vollbild" msgid "Use Hex" msgstr "Hex verwenden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Warnmeldungen anzeigen" @@ -5689,7 +5873,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Hilfsmittel" @@ -5713,25 +5897,29 @@ msgstr "Wert: " msgid "Verbosity" msgstr "Ausführung" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtuell" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Lautstärke" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, fuzzy, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD-Installation fehlgeschlagen: _Fehler erstellt_ %S" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "WAD-Installation fehlgeschlagen: _Fehler erstellt_ %S" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5746,15 +5934,15 @@ msgstr "" msgid "Warning" msgstr "Warnungen" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Warnung - Starte DOL im falschen Consolen-Modus!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Warnung - Starte ELF im falschen Consolen-Modus!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Warnung - Starte ISO im falschen Consolen-Modus!" @@ -5782,7 +5970,7 @@ msgstr "" "und hat den gleichen Namen wie die Datei auf Ihrer Memory-Card\n" "Fortfahren?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5790,7 +5978,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5798,7 +5986,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5826,7 +6014,7 @@ msgstr "WaveFileWriter - Konnte Datei nicht öffnen." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Breitbild Hack" @@ -5834,15 +6022,15 @@ msgstr "Breitbild Hack" msgid "Width" msgstr "Weite" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii Konsole" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD Laufwerk:" @@ -5851,6 +6039,7 @@ msgstr "DVD Laufwerk:" msgid "Wii Save Import" msgstr "Wii Spielstand importieren" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5860,6 +6049,9 @@ msgstr "Wii Spielstand importieren" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii Speicherdateien (*.bin)|*.bin" @@ -5927,10 +6119,11 @@ msgstr "Windows Menü" msgid "Windows Right" msgstr "Windows Rechts" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Zeilenumbruch" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5946,6 +6139,11 @@ msgstr "Zeilenumbruch" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Arbeite..." @@ -5953,6 +6151,11 @@ msgstr "Arbeite..." msgid "Write to Console" msgstr "In Konsole ausgeben" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "In Datei ausgeben" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "In Datei ausgeben" @@ -6008,7 +6211,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:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 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." @@ -6029,7 +6232,7 @@ msgid "" msgstr "" "Ihre SYSCONF-Datei hat eine falsche Größe - Sollte 0x%04x (Aber ist 0x%04llx)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP Hack" @@ -6083,7 +6286,7 @@ msgstr "" msgid "^ ADD" msgstr "^ HINZUF." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "Apploader (.img)" @@ -6114,12 +6317,12 @@ msgstr "Dies ist kein Wii-Spielstand oder Lesefehler in Datei-Header-Größe %x" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "Unbekanter CMD 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute meldet -1 beim Start der Anwendung!" @@ -6405,6 +6608,9 @@ msgstr "| ODER" #~ msgid "Emulator Display Settings" #~ msgstr "Anzeige Einstellungen" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Audio-Throttle aktivieren" + #~ msgid "Enable CPU Access" #~ msgstr "CPU-Zugriff aktivieren" @@ -6788,6 +6994,21 @@ msgstr "| ODER" #~ msgid "The file " #~ msgstr "Die Datei " +#~ 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 "" +#~ "Wird verwendet, um die Spielgeschwindigkeit anhand der Audio-Drossel zu " +#~ "steuern.\n" +#~ "Deaktivieren kann zu unnormaler (z.B. zu schneller) Spielgeschwindigkeit " +#~ "führen. \n" +#~ "Aber manchmal kann das Aktivieren dauerhafte Störgeräusche verursachen.\n" +#~ "\n" +#~ "Tastaturkürzel : Zur Deaktivierung der Drossel gedrückt halten." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Wird zur Wiedergabe für Sprach- und Soundeffekten verwendet" diff --git a/Languages/po/dolphin-emu.pot b/Languages/po/dolphin-emu.pot index 271f6d526b..0f5636c238 100644 --- a/Languages/po/dolphin-emu.pot +++ b/Languages/po/dolphin-emu.pot @@ -10,6 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -17,6 +18,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:56-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -56,9 +60,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "" @@ -143,7 +147,7 @@ msgstr "" msgid "%sImport GCI%s" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" @@ -176,11 +180,11 @@ msgstr "" msgid "&DSP Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "" @@ -244,7 +248,7 @@ msgstr "" msgid "&Play" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "" @@ -288,7 +292,7 @@ msgstr "" msgid "&Wiimote Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "" @@ -332,7 +336,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -341,7 +345,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -380,13 +384,13 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "" @@ -398,11 +402,11 @@ msgstr "" msgid "Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "" @@ -502,11 +506,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "" @@ -514,6 +518,7 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -529,6 +534,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "" @@ -562,11 +572,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "" @@ -574,14 +584,15 @@ msgstr "" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -594,18 +605,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "" @@ -617,7 +632,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Alternate Wiimote Timing" msgstr "" @@ -637,7 +652,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "" @@ -652,7 +667,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -661,16 +676,17 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -680,6 +696,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -688,18 +707,20 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -709,6 +730,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -744,7 +768,7 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "" @@ -771,11 +795,11 @@ msgstr "" msgid "Banner" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "" @@ -787,7 +811,7 @@ msgstr "" msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "" @@ -818,6 +842,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -825,6 +850,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "" @@ -833,7 +861,7 @@ msgstr "" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "" @@ -849,7 +877,7 @@ msgstr "" msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "" @@ -879,11 +907,11 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "" @@ -922,7 +950,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -930,7 +958,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -946,8 +974,6 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -957,7 +983,7 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -982,7 +1008,7 @@ msgstr "" msgid "Change Game" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -996,8 +1022,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: 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 "" @@ -1017,31 +1043,31 @@ msgstr "" msgid "Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "" @@ -1049,14 +1075,14 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: 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:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "" @@ -1068,14 +1094,14 @@ msgstr "" msgid "Classic" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "" @@ -1089,6 +1115,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1097,6 +1124,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "" @@ -1120,20 +1151,20 @@ msgstr "" msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "" @@ -1160,13 +1191,13 @@ msgstr "" msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "" @@ -1175,7 +1206,7 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "" @@ -1232,12 +1263,12 @@ msgstr "" msgid "Copy failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "" @@ -1264,7 +1295,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "" @@ -1275,7 +1306,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1284,7 +1315,7 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "" @@ -1299,7 +1330,7 @@ msgstr "" msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "" @@ -1313,24 +1344,24 @@ msgstr "" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 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:498 msgid "Created by VistaIcons.com" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "" @@ -1338,7 +1369,7 @@ msgstr "" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "" @@ -1358,7 +1389,7 @@ msgstr "" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "" @@ -1366,11 +1397,11 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "" @@ -1382,10 +1413,11 @@ msgstr "" msgid "DSP" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1396,18 +1428,22 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "" @@ -1415,15 +1451,23 @@ msgstr "" msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" 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:176 msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "" @@ -1444,7 +1488,7 @@ msgstr "" msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "" @@ -1452,16 +1496,16 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "" @@ -1469,11 +1513,11 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "" @@ -1482,7 +1526,7 @@ msgstr "" msgid "Delete" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "" @@ -1491,7 +1535,7 @@ msgstr "" msgid "Delete the existing file '%s'?" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "" @@ -1499,8 +1543,8 @@ msgstr "" msgid "Detect" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: 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." @@ -1511,8 +1555,8 @@ msgstr "" msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "" @@ -1535,23 +1579,23 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "" @@ -1581,7 +1625,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "" @@ -1605,6 +1649,7 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1614,10 +1659,13 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "" @@ -1642,6 +1690,7 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1666,6 +1715,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1694,11 +1751,11 @@ msgstr "" msgid "Down" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "" @@ -1707,23 +1764,23 @@ msgstr "" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "" @@ -1748,6 +1805,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1763,6 +1821,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "" @@ -1783,7 +1846,7 @@ msgid "" "driver." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "" @@ -1799,7 +1862,7 @@ msgstr "" msgid "Edit ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "" @@ -1811,8 +1874,8 @@ msgstr "" msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "" @@ -1851,7 +1914,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "" @@ -1873,23 +1936,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -1902,6 +1965,7 @@ msgstr "" msgid "Enable Cache" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -1911,51 +1975,54 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "" @@ -1968,13 +2035,13 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: 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:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "" @@ -1994,20 +2061,20 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: 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:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "" @@ -2019,7 +2086,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2036,6 +2103,7 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2051,6 +2119,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "" @@ -2081,6 +2154,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -2111,18 +2185,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2154,7 +2234,7 @@ msgstr "" msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "" @@ -2167,15 +2247,15 @@ msgstr "" msgid "Export Recording..." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "" @@ -2191,7 +2271,7 @@ msgstr "" msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "" @@ -2203,44 +2283,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "" @@ -2252,11 +2332,11 @@ msgstr "" msgid "FIFO Player" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "" @@ -2268,11 +2348,11 @@ msgstr "" msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2368,18 +2448,28 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "" @@ -2388,7 +2478,7 @@ msgstr "" msgid "File Info" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "" @@ -2417,16 +2507,16 @@ msgstr "" msgid "File not compressed" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2434,7 +2524,7 @@ msgstr "" msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "" @@ -2446,7 +2536,7 @@ msgstr "" msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "" @@ -2470,7 +2560,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 " @@ -2501,7 +2591,7 @@ msgstr "" msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "" @@ -2513,7 +2603,7 @@ msgstr "" msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "" @@ -2521,10 +2611,11 @@ msgstr "" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2540,6 +2631,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "" @@ -2572,7 +2668,7 @@ msgstr "" msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "" @@ -2588,15 +2684,15 @@ msgstr "" msgid "Game not found!!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "" @@ -2607,6 +2703,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2614,6 +2711,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2622,21 +2722,24 @@ msgid "Gamecube Pad settings" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "" -#: Source/Core/Core/Src/GeckoCode.cpp:139 +#: Source/Core/Core/Src/GeckoCode.cpp:222 #, 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.)" +"(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 "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2645,6 +2748,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2653,6 +2759,7 @@ msgstr "" msgid "General Settings" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2668,6 +2775,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "" @@ -2699,7 +2811,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "" @@ -2731,7 +2843,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "" @@ -2791,12 +2903,16 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "" @@ -2804,12 +2920,12 @@ msgstr "" msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2818,11 +2934,11 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "" @@ -2838,15 +2954,15 @@ msgstr "" msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "" @@ -2854,21 +2970,22 @@ msgstr "" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: 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:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 msgid "" -"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." +"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:432 @@ -2893,7 +3010,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "" @@ -2932,7 +3049,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "" @@ -2941,7 +3058,7 @@ msgid "In-Game" msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "" @@ -2961,7 +3078,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "" @@ -2973,7 +3090,7 @@ msgstr "" msgid "Install WAD" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "" @@ -2982,6 +3099,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -2991,14 +3109,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "" @@ -3021,11 +3142,11 @@ msgstr "" msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "" @@ -3042,7 +3163,7 @@ msgstr "" msgid "Invalid bat.map or dir entry" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "" @@ -3059,14 +3180,15 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3082,27 +3204,32 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "" @@ -3111,8 +3238,8 @@ msgstr "" msgid "Key" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "" @@ -3130,7 +3257,7 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "" @@ -3176,7 +3303,7 @@ msgstr "" msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3184,7 +3311,7 @@ msgstr "" msgid "Load" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "" @@ -3232,6 +3359,7 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3253,6 +3381,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3276,7 +3411,7 @@ msgstr "" msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "" @@ -3288,11 +3423,11 @@ msgstr "" msgid "Log Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "" @@ -3320,7 +3455,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "" @@ -3342,11 +3477,11 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "" @@ -3370,6 +3505,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3377,6 +3513,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "" @@ -3405,7 +3544,7 @@ msgstr "" msgid "Menu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "" @@ -3414,11 +3553,11 @@ msgstr "" msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "" @@ -3435,7 +3574,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "" @@ -3448,7 +3587,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3463,7 +3602,7 @@ msgstr "" msgid "Multiply" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3553,6 +3692,7 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3562,6 +3702,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3570,7 +3713,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "" @@ -3584,7 +3727,7 @@ msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "" @@ -3596,7 +3739,7 @@ msgstr "" msgid "Nickname :" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "" @@ -3635,7 +3778,7 @@ msgstr "" msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "" @@ -3643,8 +3786,8 @@ msgstr "" msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "" @@ -3664,7 +3807,7 @@ msgstr "" msgid "Notes" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "" @@ -3702,7 +3845,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "" @@ -3728,11 +3871,11 @@ msgstr "" msgid "Open" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "" @@ -3754,11 +3897,11 @@ msgstr "" msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -3787,7 +3930,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -3837,19 +3980,20 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -3862,6 +4006,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3870,7 +4018,7 @@ msgstr "" msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "" @@ -3883,6 +4031,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -3893,6 +4042,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "" @@ -3906,7 +4059,7 @@ msgstr "" msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "" @@ -3918,6 +4071,7 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -3927,6 +4081,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -3938,23 +4095,23 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "" @@ -3963,11 +4120,11 @@ msgstr "" msgid "Port :" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "" @@ -3975,17 +4132,17 @@ msgstr "" msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3998,7 +4155,7 @@ msgstr "" msgid "Prev Page" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "" @@ -4049,7 +4206,7 @@ msgstr "" msgid "RAM" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "" @@ -4062,7 +4219,7 @@ msgstr "" msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "" @@ -4132,6 +4289,7 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4150,6 +4308,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "" @@ -4199,11 +4363,11 @@ msgstr "" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "" @@ -4211,10 +4375,11 @@ msgstr "" msgid "Sa&ve State" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4224,6 +4389,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -4281,12 +4449,12 @@ msgstr "" msgid "Save State..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "" @@ -4294,11 +4462,11 @@ msgstr "" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4307,6 +4475,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4316,15 +4485,18 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "" @@ -4340,12 +4512,12 @@ msgstr "" msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: 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 "" @@ -4355,6 +4527,7 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4379,6 +4552,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4401,6 +4582,7 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4417,19 +4599,26 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4444,7 +4633,7 @@ msgid "" "If unsure, select Auto." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "" @@ -4480,11 +4669,11 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4493,11 +4682,11 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "" @@ -4507,7 +4696,7 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "" @@ -4519,7 +4708,7 @@ msgstr "" msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "" @@ -4547,7 +4736,7 @@ msgstr "" msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "" @@ -4563,7 +4752,7 @@ msgstr "" msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "" @@ -4579,7 +4768,7 @@ msgstr "" msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "" @@ -4599,7 +4788,7 @@ msgstr "" msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "" @@ -4619,34 +4808,34 @@ msgstr "" 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:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "" @@ -4677,7 +4866,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "" @@ -4685,11 +4874,11 @@ msgstr "" msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -4721,11 +4910,11 @@ msgstr "" msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "" @@ -4745,7 +4934,7 @@ 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:621 msgid "Sound Settings" msgstr "" @@ -4763,6 +4952,7 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -4778,6 +4968,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "" @@ -4801,7 +4996,7 @@ msgstr "" msgid "Specify a video backend" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4809,7 +5004,7 @@ msgstr "" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "" @@ -4902,12 +5097,12 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "" @@ -4946,7 +5141,7 @@ msgstr "" msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -4962,7 +5157,7 @@ msgstr "" msgid "Texture Cache" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "" @@ -4978,13 +5173,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5003,7 +5198,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -5025,7 +5220,7 @@ msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5063,7 +5258,7 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "" @@ -5071,13 +5266,13 @@ msgstr "" msgid "Theme selection went wrong" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5089,7 +5284,7 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" @@ -5105,19 +5300,10 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -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 "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." 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" @@ -5125,7 +5311,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" @@ -5148,7 +5334,7 @@ msgstr "" msgid "To" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "" @@ -5168,6 +5354,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5175,14 +5362,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "" @@ -5190,7 +5380,7 @@ msgstr "" msgid "Triggers" msgstr "" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "" @@ -5200,7 +5390,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "" @@ -5221,11 +5411,11 @@ msgstr "" msgid "UDP Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "" @@ -5303,7 +5493,7 @@ msgstr "" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -5315,7 +5505,7 @@ msgstr "" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "" @@ -5336,7 +5526,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "" @@ -5360,25 +5550,28 @@ msgstr "" msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +msgid "WAD installation failed: error creating ticket" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5393,15 +5586,15 @@ msgstr "" msgid "Warning" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "" @@ -5422,7 +5615,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5430,7 +5623,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5438,7 +5631,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5466,7 +5659,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "" @@ -5474,15 +5667,15 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "" @@ -5490,6 +5683,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5499,6 +5693,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5561,10 +5758,11 @@ msgstr "" msgid "Windows Right" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5580,6 +5778,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "" @@ -5587,6 +5790,10 @@ msgstr "" msgid "Write to Console" msgstr "" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +msgid "Write to Debugger" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "" @@ -5640,7 +5847,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5658,7 +5865,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "" @@ -5712,7 +5919,7 @@ msgstr "" msgid "^ ADD" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "" @@ -5743,12 +5950,12 @@ msgstr "" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/el.po b/Languages/po/el.po index f5da4c8403..74d89374e1 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -11,7 +11,11 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -71,9 +75,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:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -171,7 +175,7 @@ msgstr "%sΕξαγωγή GCI%s" msgid "%sImport GCI%s" msgstr "%sΕισαγωγή GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u ΕλεÏθεÏα μπλοκ; %u ΕλεÏθεÏες Θέσεις Φακέλων" @@ -204,11 +208,11 @@ msgstr "&ΔιαχειÏιστής Cheat" msgid "&DSP Settings" msgstr "&Ρυθμίσεις DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&ΔιαγÏαφή ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&ΔιαγÏαφή επιλεγμένων ISO..." @@ -272,7 +276,7 @@ msgstr "&ΠαÏση" msgid "&Play" msgstr "&ΑναπαÏαγωγή" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Ιδιότητες" @@ -316,7 +320,7 @@ msgstr "&ΠÏοβολή" msgid "&Wiimote Settings" msgstr "&Ρυθμίσεις Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -360,7 +364,7 @@ msgstr "<Εισάγετε όνομα εδώ>" msgid "" msgstr "<Δε βÏέθηκαν αναλÏσεις>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "<Τίποτα>" @@ -369,7 +373,7 @@ msgstr "<Τίποτα>" msgid "" msgstr "<Πατήστε ΠλήκτÏο>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<Συστήματος>" @@ -425,13 +429,13 @@ msgstr "" "\n" "Θα Ï€Ïέπει να έχετε κάνει Ï€Ïοώθηση της πόÏτας TCP στον host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Κωδικοί AR" @@ -443,6 +447,7 @@ msgstr "Σχετικά με το Dolphin" msgid "Acceleration" msgstr "Επιτάχυνση" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 @@ -462,6 +467,13 @@ msgstr "ΑκÏίβεια:" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +msgid "Accuracy:" +msgstr "ΑκÏίβεια:" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Accurate VBeam emulation" msgstr "ΑκÏιβής VBeam εξομοίωση" @@ -593,11 +605,11 @@ msgstr "ΠÏοσαÏμογέας:" msgid "Add" msgstr "ΠÏοσθήκη" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "ΠÏοσθήκη ÎšÏ‰Î´Î¹ÎºÎ¿Ï ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "ΠÏοσθήκη Patch" @@ -609,6 +621,7 @@ msgstr "ΠÏοσθήκη νέου pane" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 @@ -632,6 +645,11 @@ msgstr "ΠÏοσθήκη νέου pane" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "ΠÏοσθήκη..." @@ -667,11 +685,11 @@ msgstr "" "ΡÏθμιση της απαιτοÏμενης πίεσης του Î±Î½Î±Î»Î¿Î³Î¹ÎºÎ¿Ï Ï‡ÎµÎ¹ÏιστηÏίου για την " "ενεÏγοποίηση των κουμπιών." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Για Ï€ÏοχωÏημένους" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Ρυθμίσεις για ΠÏοχωÏημένους" @@ -679,11 +697,11 @@ msgstr "Ρυθμίσεις για ΠÏοχωÏημένους" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Όλα τα αÏχεία GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" @@ -691,6 +709,7 @@ msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ======= @@ -709,18 +728,22 @@ msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Όλα τα αÏχεία Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Όλα τα συμπιεσμένα αÏχεία GC/Wii ISO (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Όλα τα αÏχεία (*.*)|*.*" @@ -736,6 +759,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 @@ -754,6 +778,9 @@ msgstr "Εξομοιωμένο Wiimote" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Εναλλακτικός ΧÏονισμός Wiimote" @@ -774,7 +801,7 @@ msgstr "Ο Apploader έχει λάθος μέγεθος... είναι Ï€Ïάγμ msgid "Apploader unable to load from file" msgstr "Ο Apploader απέτυχε να φοÏτωθεί από αÏχείο" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -792,7 +819,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε (ανενεÏγό)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "ΑÏαβικά" @@ -801,7 +828,7 @@ msgstr "ΑÏαβικά" msgid "Are you sure you want to delete \"%s\"?" msgstr "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε το \"%s\";" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -809,12 +836,13 @@ msgstr "" "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτά τα αÏχεία;\n" "Θα εξαφανιστοÏν για πάντα!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για " "πάντα!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -823,6 +851,9 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 @@ -840,18 +871,20 @@ msgstr "Αναλογία Οθόνης:" msgid "At least one pane must remain open." msgstr "Τουλάχιστον ένα pane Ï€Ïέπει να μένει ανοιχτό." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Ήχος" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Backend Ήχου:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -860,6 +893,9 @@ msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" <<<<<<< HEAD <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 @@ -931,7 +967,7 @@ msgstr "" msgid "Back" msgstr "Πίσω" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Backend Ρυθμίσεις" @@ -958,11 +994,11 @@ msgstr "Μη ΈγκυÏη Κεφαλίδα ΑÏχείου" msgid "Banner" msgstr "Εικονίδιο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "ΛεπτομέÏειες Εικονιδίου:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Εικονίδιο:" @@ -974,7 +1010,7 @@ msgstr "Bar" msgid "Basic" msgstr "Βασικές" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Βασικές Ρυθμίσεις" @@ -1006,6 +1042,7 @@ msgstr "Δεξί Μπλε" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -1022,6 +1059,9 @@ msgstr "Δεξί Μπλε" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Βάση" @@ -1030,7 +1070,7 @@ msgstr "Βάση" msgid "Bound Controls: %lu" msgstr "Δεσμευμένοι ΧειÏισμοί: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Χαλασμένο" @@ -1046,7 +1086,7 @@ msgstr "ΕÏÏεση φακέλου για Ï€Ïοσθήκη" msgid "Browse for an ISO directory..." msgstr "ΕÏÏεση φακέλου ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "ΕÏÏεση φακέλου Ï€ÏοοÏισμοÏ" @@ -1086,11 +1126,11 @@ msgstr "Stick ΚάμεÏας " msgid "C-Stick" msgstr "Stick ΚάμεÏας" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Μηχανή Εξομοίωσης CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Cache Display Lists" @@ -1141,7 +1181,7 @@ msgstr "Αποτυχία ανοίγματος %s" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1152,7 +1192,7 @@ msgstr "" "%s\n" "δεν είναι έγκυÏο αÏχείο κάÏτας μνήμης gamecube" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1170,8 +1210,6 @@ msgstr "Αποτυχία εÏÏεσης WiiMote με bd: %02x:%02x:%02x:%02x:%02 msgid "Cant find WiiMote by connection handle %02x" msgstr "Αδυναμία εÏÏεσης του WiiMote με handle σÏνδεσης %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1181,7 +1219,7 @@ msgstr "Αδυναμία ανάγνωσης από το DVD_Plugin - DVD-Interfa msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Καταλανικά" @@ -1206,7 +1244,7 @@ msgstr "Αλλαγή Δίσκου" msgid "Change Game" msgstr "Αλλαγή ΠαιχνιδιοÏ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1222,8 +1260,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: 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 "Αυτή η αλλαγή δε θα έχει επίπτωση όσο ο εξομοιωτής εκτελείται!" @@ -1243,31 +1281,31 @@ msgstr "Αναζήτηση Cheat" msgid "Cheats Manager" msgstr "ΔιαχείÏιση Cheat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Κινέζικα (Απλοποιημένα)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Κινέζικα (ΠαÏαδοσιακά)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Επιλέξτε έναν φάκελο Ïίζας DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Επιλέξτε έναν φάκελο Ïίζας NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Επιλέξτε ένα Ï€Ïοεπιλεγμένο ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Επιλέξτε έναν φάκελο για Ï€Ïοσθήκη" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Επιλέξτε ένα αÏχείο για άνοιγμα" @@ -1275,6 +1313,7 @@ msgstr "Επιλέξτε ένα αÏχείο για άνοιγμα" msgid "Choose a memory card:" msgstr "Επιλέξτε μια κάÏτα μνήμης:" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 @@ -1285,6 +1324,9 @@ msgstr "Επιλέξτε μια κάÏτα μνήμης:" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1299,8 +1341,8 @@ msgstr "Επιλέξτε ένα αÏχείο για χÏήση ως apploader: ( ======= >>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Επιλέξτε τον φάκελο Ï€Ïος αποσυμπίεση" @@ -1312,14 +1354,14 @@ msgstr "Κυκλικό Stick" msgid "Classic" msgstr "Κλασικό ΧειÏιστήÏιο" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "ΚαθάÏισ." -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Το καθάÏισμα απέτυχε." @@ -1335,6 +1377,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1351,6 +1394,10 @@ msgstr "" >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Κλείσιμο" @@ -1374,20 +1421,20 @@ msgstr "Εντολή" msgid "Comment" msgstr "Σχόλιο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Σχόλιο:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Συμπίεση ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Συμπίεση επιλεγμένων ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Συμπίεση ISO" @@ -1414,13 +1461,13 @@ msgstr "Ρυθμίσεις ΧειÏιστηÏίων" msgid "Configure..." msgstr "Γενικές Ρυθμίσεις..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Επιβεβαίωση Αντικατάστασης ΑÏχείου" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Επιβεβαίωση Διακοπής" @@ -1429,7 +1476,7 @@ msgstr "Επιβεβαίωση Διακοπής" msgid "Connect" msgstr "ΣÏνδεση" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "ΣÏνδεση ΠληκτÏολογίου USB" @@ -1494,12 +1541,12 @@ msgstr "ΜετατÏοπή σε GCI" msgid "Copy failed" msgstr "Η αντιγÏαφή απέτυχε" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "ΑντιγÏαφή στην κάÏτα μνήμης %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "ΠυÏήνας" @@ -1530,7 +1577,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Αποτυχία αναγνώÏισης του αÏχείου ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Αποτυχία αποθήκευσης του %s" @@ -1545,7 +1592,7 @@ msgstr "" "(ο καθοÏισμός των χειÏιστηÏίων ενώ το παιχνίδι Ï„Ïέχει δεν υποστηÏίζεται Ï€Ïος " "το παÏόν)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1558,7 +1605,7 @@ msgstr "" "Μήπως εκτελείτε το Dolphin από CD/DVD, ή το αποθηκευόμενο αÏχείο έχει " "Ï€Ïοστασία εγγÏαφής;" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Αδυναμία εÏÏεσης εντολής ανοίγματος για την επέκταση 'ini'!" @@ -1575,7 +1622,7 @@ msgstr "" msgid "Count:" msgstr "Πλήθος:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "ΧώÏα:" @@ -1589,10 +1636,11 @@ msgstr "ΔημιουÏγία ÎšÏ‰Î´Î¹ÎºÎ¿Ï AR" msgid "Create new perspective" msgstr "ΔημιουÏγία νέας οπτικής" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "ΔημιουÏγήθηκε από KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 @@ -1603,6 +1651,9 @@ msgstr "ΔημιουÏγήθηκε από KDE-Look.org" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1616,17 +1667,17 @@ msgstr "ΔημιουÏγήθηκε από Milosz Wlazlo [miloszwl@miloszwl.com, ======= >>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "ΔημιουÏγήθηκε από VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 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:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "ΔημιουÏγός: " @@ -1634,7 +1685,7 @@ msgstr "ΔημιουÏγός: " msgid "Critical" msgstr "ΚÏίσιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Κόψιμο" @@ -1657,7 +1708,7 @@ msgstr "Crossfade" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Ο Ï„Ïέχων φάκελος άλλαξε από %s σε %s μετά από τον wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "ΠÏοσαÏμοζόμενο Projection Hack" @@ -1665,11 +1716,11 @@ msgstr "ΠÏοσαÏμοζόμενο Projection Hack" msgid "Custom Projection Hack Settings" msgstr "Ρυθμίσεις ΠÏοσαÏμοζόμενου Projection Hack" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Τσέχικα" @@ -1681,10 +1732,11 @@ msgstr "Ψηφιακό Pad" msgid "DSP" msgstr "Ήχος (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Μηχανή Εξομοίωσης DSP" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 @@ -1705,18 +1757,22 @@ msgstr "Μηχανή Εξομοίωσης DSP" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE εξομοίωση (γÏήγοÏη)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (αÏγή)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE σε ΞεχωÏιστό Îήμα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE recompiler" @@ -1724,15 +1780,23 @@ msgstr "DSP LLE recompiler" msgid "DSP settings" msgstr "Ρυθμίσεις ήχου (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" 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 "" + +#: 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:176 msgid "Data Size" msgstr "Μέγεθος Δεδομένων" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "ΗμεÏομηνία:" @@ -1753,7 +1817,7 @@ msgstr "ÎεκÏή Ζώνη" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Debugging" @@ -1761,16 +1825,16 @@ msgstr "Debugging" msgid "Decimal" msgstr "Δεκαδικός" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Αποσυμπίεση ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Αποσυμπίεση επιλεγμένων ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Γίνεται αποσυμπίεση ISO" @@ -1778,11 +1842,11 @@ msgstr "Γίνεται αποσυμπίεση ISO" msgid "Default" msgstr "ΠÏοεπιλ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ΠÏοεπιλεγμένο ISO:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "ΠÏοεπιλεγμένη γÏαμματοσειÏά" @@ -1791,7 +1855,7 @@ msgstr "ΠÏοεπιλεγμένη γÏαμματοσειÏά" msgid "Delete" msgstr "ΔιαγÏαφή" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "ΔιαγÏαφή Αποθήκευσης" @@ -1800,7 +1864,7 @@ msgstr "ΔιαγÏαφή Αποθήκευσης" msgid "Delete the existing file '%s'?" msgstr "ΔιαγÏαφή του υπάÏχοντος αÏχείου '%s';" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "ΠεÏιγÏαφή" @@ -1808,8 +1872,8 @@ msgstr "ΠεÏιγÏαφή" msgid "Detect" msgstr "Ανίχνευση" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: 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." @@ -1822,8 +1886,8 @@ msgstr "" msgid "Device" msgstr "Συσκευή" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Ρυθμίσεις Συσκευής" @@ -1848,23 +1912,23 @@ msgstr "" " καθώς και το checksum του εφεδÏÎ¹ÎºÎ¿Ï ÎšÎ±Ï„Î±Î»ÏŒÎ³Î¿Ï… απέτυχε" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "ΑπενεÏγοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "ΑπενεÏγοποίηση Ομίχλης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "ΑπενεÏγοποίηση ΦωτισμοÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "ΑπενεÏγοποίηση Βάθους ανά Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "ΑπενεÏγοποίηση Υφών" @@ -1908,7 +1972,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Δίσκος" @@ -1939,6 +2003,7 @@ msgstr "Divide" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 @@ -1952,10 +2017,13 @@ msgstr "Divide" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξομοίωση;" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1984,6 +2052,7 @@ msgstr "Dolphin FIFO" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Ρυθμίσεις Dolphin GCPad" @@ -2020,6 +2089,14 @@ msgstr "Ρυθμίσεις Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Ρυθμίσεις Dolphin GCPad" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" @@ -2082,11 +2159,11 @@ msgstr "Το Dolphin είναι Ïυθμισμένο να αποκÏÏπτει msgid "Down" msgstr "Κάτω" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "ΜεταφόÏτωση Κωδικών (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "ΜεταφοÏτώθηκαν %lu κωδικοί. (Ï€Ïοστέθηκαν %lu)" @@ -2095,23 +2172,23 @@ msgstr "ΜεταφοÏτώθηκαν %lu κωδικοί. (Ï€Ïοστέθηκαν msgid "Drums" msgstr "ΤÏμπανα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Εξαγωγή Ήχου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Εξαγωγή EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Εξαγωγή ΚαÏέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Εξαγωγή Υφών" @@ -2151,6 +2228,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 @@ -2174,6 +2252,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Ολλανδικά" @@ -2198,7 +2281,7 @@ msgstr "" "Dolphin σας, μία επανεκκίνηση απαιτείται για να κάνει τα Windows να δοÏνε " "τους νέους οδηγοÏÏ‚." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "ΕΥΡΩΠΗ" @@ -2214,7 +2297,7 @@ msgstr "ΕπεξεÏγασία" msgid "Edit ActionReplay Code" msgstr "ΕπεξεÏγασία ÎšÏ‰Î´Î¹ÎºÎ¿Ï ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "ΕπεξεÏγασία Ρυθμίσεων" @@ -2226,8 +2309,8 @@ msgstr "ΕπεξεÏγασία Patch" msgid "Edit current perspective" msgstr "ΕπεξεÏγασία Ï„Ïέχουσας οπτικής" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "ΕπεξεÏγασία..." @@ -2278,7 +2361,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Εξομοιωμένο Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Κατάσταση ΛειτουÏγίας:" @@ -2306,15 +2389,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "ΕνεÏγοποίηση ΚαταγÏαφής AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "ΕνεÏγοποίηση Throttle Ήχου" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "ΕνεÏγοποίηση BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "ΕνεÏγοποίηση Block Merging" @@ -2322,9 +2401,13 @@ msgstr "ΕνεÏγοποίηση Block Merging" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2337,6 +2420,7 @@ msgstr "" msgid "Enable Cache" msgstr "ΕνεÏγοποίηση Cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2355,51 +2439,54 @@ msgstr "ΕνεÏγοποίηση Cheat" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "ΕνεÏγοποίηση Cheat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "ΕνεÏγοποίηση Μουσικής DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα (επιτάχυνση)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "ΕνεÏγοποίηση ΣυντομεÏσεων" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "ΕνεÏγοποίηση Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "ΕνεÏγοποίηση Idle Skipping (επιτάχυνση)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "ΕνεÏγοποίηση MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "ΕνεÏγοποίηση ΠÏοοδευτικής ΣάÏωσης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "ΕνεÏγοποίηση ΠÏοφÏλαξης Οθόνης" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "ΕνεÏγοποίηση ΕυÏείας Οθόνης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "ΕνεÏγοποίηση Wireframe" @@ -2418,7 +2505,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2426,7 +2513,7 @@ msgstr "" "ΕνεÏγοποιεί τη γÏήγοÏη Ï€Ïόσβαση δίσκου. ΑπαÏαίτητο για μεÏικά παιχνίδια. " "(ΕÎΕΡΓΟ = ΓÏήγοÏο, ΑÎΕÎΕΡΓΟ = Συμβατό)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "ΕνεÏγοποίηση σελίδων" @@ -2455,6 +2542,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 @@ -2465,6 +2553,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2479,7 +2570,7 @@ msgstr "ΕνεÏγοποιήστε το για να επιταχÏνετε το ======= >>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: 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 = " @@ -2489,7 +2580,7 @@ msgstr "" "ΔιαχείÏισης Μνήμης. ΑκÏιβές ως Ï€Ïος το υλικό, αλλά αÏγό στην εξομοίωση. " "(ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "ΕνεÏγοποιεί το ΠÏοσαÏμοζόμενο Projection Hack" @@ -2505,7 +2596,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2531,6 +2622,7 @@ msgstr "Τέλος" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 @@ -2554,6 +2646,11 @@ msgstr "Τέλος" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Αγγλικά" @@ -2585,6 +2682,7 @@ msgstr "Ίσο" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Σφάλμα" @@ -2646,21 +2744,31 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Σφάλμα" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή " "συστήματος." +<<<<<<< HEAD #: Source/Core/Common/Src/ChunkFile.h:180 >>>>>>> Update from master branch. +======= +#: Source/Core/Common/Src/ChunkFile.h:194 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2696,7 +2804,7 @@ msgstr "Έξοδος από το Dolphin με τον εξομοιωτή" msgid "Export Failed" msgstr "Αποτυχία Εξαγωγής" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Εξαγωγή ΑÏχείου" @@ -2709,15 +2817,15 @@ msgstr "Εξαγωγή ΕγγÏαφής" msgid "Export Recording..." msgstr "Εξαγωγή ΕγγÏαφής..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Εξαγωγή Αποθήκευσης" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Εξαγωγή Αποθήκευσης Wii (ΠειÏαματικό)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Εξαγωγή όλων των αποθηκεÏσεων" @@ -2733,7 +2841,7 @@ msgstr "Εξαγωγή αποθήκευσης ως..." msgid "Extension" msgstr "Επέκταση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "ΕξωτεÏικό Frame Buffer" @@ -2745,44 +2853,44 @@ msgstr "Επιπλέον ΠαÏάμετÏος" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Η Επιπλέον ΠαÏάμετÏος είναι χÏήσιμη μόνο στο ''Metroid: Other M''." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Εξαγωγή όλων των αÏχείων..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Εξαγωγή Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Εξαγωγή DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Εξαγωγή Φακέλου..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Εξαγωγή ΑÏχείου..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Εξαγωγή Κατάτμησης..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Γίνεται εξαγωγή %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Γίνεται εξαγωγή όλων των αÏχείων" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Γίνεται εξαγωγή φακέλου" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Γίνεται εξαγωγή..." @@ -2794,11 +2902,11 @@ msgstr "FIFO Byte" msgid "FIFO Player" msgstr "ΑναπαÏαγωγή FIFO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "ΓΑΛΛΙΑ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Μέγεθος FST:" @@ -2810,11 +2918,11 @@ msgstr "Αποτυχία σÏνδεσης!" msgid "Failed to Listen!!" msgstr "Αποτυχία ακÏόασης!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Αποτυχία μεταφόÏτωσης κωδικών." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Αποτυχία εξαγωγής στο %s!" @@ -2930,6 +3038,7 @@ msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το msgid "Failed to write header for file %d" msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το αÏχείο %d" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 @@ -2937,17 +3046,25 @@ msgid "Fast" <<<<<<< HEAD ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Fast" >>>>>>> The actual update of the Greek and Czech translations. The last commit msgstr "ΓÏήγοÏη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "ΓÏήγοÏα Mipmaps" <<<<<<< HEAD ======= msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Fast Mipmaps" msgstr "" @@ -2959,9 +3076,18 @@ msgstr "" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Fast version of the MMU. Does not work for every game." msgstr "ΓÏήγοÏη έκδοση του MMU. Δε δουλεÏει για όλα τα παιχνίδια." +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "ΑναπαÏαγωγή Fifo" @@ -2970,7 +3096,7 @@ msgstr "ΑναπαÏαγωγή Fifo" msgid "File Info" msgstr "ΠληÏοφοÏίες ΑÏχείου" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Το αÏχείο δεν πεÏιείχε κωδικοÏÏ‚." @@ -3003,16 +3129,16 @@ msgstr "Το αÏχείο δεν αναγνωÏίζεται σαν κάÏτα μ msgid "File not compressed" msgstr "Το αÏχείο δεν είναι συμπιεσμένο" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Άγνωστη λειτουÏγία ανοίγματος : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "ΑÏχεία δίσκου" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Ο Ï„Ïπος αÏχείου 'ini' είναι άγνωστος! Δε θα γίνει άνοιγμα!" @@ -3020,7 +3146,7 @@ msgstr "Ο Ï„Ïπος αÏχείου 'ini' είναι άγνωστος! Δε θ msgid "First Block" msgstr "ΠÏώτο Μπλοκ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "ΕπιδιόÏθωση Checksum" @@ -3032,7 +3158,7 @@ msgstr "Επιβολή 16:9" msgid "Force 4:3" msgstr "Επιβολή 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Επιβολή της Κονσόλας ως NTSC-J" @@ -3065,7 +3191,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 " @@ -3102,7 +3228,7 @@ msgstr "ΚαÏέ" msgid "Frame Advance" msgstr "ΠÏοώθηση ανά ΚαÏέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "FFV1 Για Τα Εξαγώμενα ΚαÏέ" @@ -3114,7 +3240,7 @@ msgstr "ΕÏÏος ΚαÏέ" msgid "Frame S&kipping" msgstr "ΠαÏάλειψη Κ&αÏέ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "ΠεÏιοÏισμός ΚαÏέ:" @@ -3122,7 +3248,7 @@ msgstr "ΠεÏιοÏισμός ΚαÏέ:" msgid "Frames To Record" msgstr "ΚαÏέ ΠÏος ΕγγÏαφή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "ΕλεÏθεÏη Ματιά" @@ -3130,6 +3256,7 @@ msgstr "ΕλεÏθεÏη Ματιά" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 @@ -3153,6 +3280,11 @@ msgstr "ΕλεÏθεÏη Ματιά" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Γαλλικά" @@ -3186,7 +3318,7 @@ msgstr "Ρυθμίσεις ΚαταγÏαφής" msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID ΠαιχνιδιοÏ:" @@ -3202,15 +3334,15 @@ msgstr "Το παιχνίδι δεν εκτελείται!" msgid "Game not found!!" msgstr "Το παιχνίδι δε βÏέθηκε!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Ρυθμίσεις ΣυγκεκÏιμένου ΠαιχνιδιοÏ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Ρυθμίσεις ΠαιχνιδιοÏ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -3230,6 +3362,7 @@ msgstr "Ρυθμίσεις Gamecube &Pad" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 @@ -3238,6 +3371,9 @@ msgstr "Ρυθμίσεις Gamecube &Pad" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "ΚάÏτες Μνήμης Gamecube (*.raw,*.gcp)" @@ -3246,15 +3382,17 @@ msgid "Gamecube Pad settings" msgstr "Ρυθμίσεις ΧειÏιστηÏίου Gamecube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Κωδικοί Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, 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.)" +"(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" "(ή είναι ένας κακός κωδικός ή ο Ï„Ïπος του ÎºÏ‰Î´Î¹ÎºÎ¿Ï Î´ÎµÎ½ υποστηÏίζεται.)" @@ -3264,10 +3402,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -3291,6 +3433,7 @@ msgstr "Γενικές Ρυθμίσεις" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 @@ -3314,6 +3457,11 @@ msgstr "Γενικές Ρυθμίσεις" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "ΓεÏμανικά" @@ -3366,7 +3514,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Ελληνικά" @@ -3398,7 +3546,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Αποτυχία ελέγχου κεφαλίδας" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "ΕβÏαϊκά" @@ -3478,12 +3626,16 @@ msgstr "Ρυθμίσεις ΠλήκτÏων Συντόμευσης" >>>>>>> The actual update of the Greek and Czech translations. The last commit ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "ΠλήκτÏα Συντόμευσης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "ΟυγγÏικά" @@ -3491,14 +3643,14 @@ msgstr "ΟυγγÏικά" msgid "Hybrid Wiimote" msgstr "ΥβÏιδικό Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3511,11 +3663,11 @@ msgstr "" "TitleID %016llx.\n" "Το Dolphin πιθανότατα θα κολλήσει Ï„ÏŽÏα." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - μη έγκυÏος Ï€ÏοοÏισμός" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Ρυθμίσεις IPL" @@ -3531,15 +3683,15 @@ msgstr "Δείκτης IR" msgid "IR Sensitivity:" msgstr "Ευαισθησία IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "ΛεπτομέÏειες ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Φάκελοι ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ΙΤΑΛΙΑ" @@ -3547,19 +3699,20 @@ msgstr "ΙΤΑΛΙΑ" msgid "Icon" msgstr "Εικονίδιο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Αν τα FPS διακυμαίνονται, αυτή η επιλογή μποÏείο να βοηθήσει. (ΕνεÏγό = " "Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 @@ -3579,6 +3732,14 @@ msgid "" "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." >>>>>>> Update from master branch. +======= +#: 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)." +>>>>>>> Update the pot file to reflect recent changes in the code. msgstr "" "Αν θέσετε τιμή υψηλότεÏη από την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, " "PAL:50),\n" @@ -3618,7 +3779,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Εισαγωγή Αποθήκευσης" @@ -3669,7 +3830,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Εντός ΠαιχνιδιοÏ" @@ -3678,7 +3839,7 @@ msgid "In-Game" msgstr "Εντός ΠαιχνιδιοÏ" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "ΠληÏοφοÏίες" @@ -3698,7 +3859,7 @@ msgstr "Εισάγετε" msgid "Insert Encrypted or Decrypted code here..." msgstr "Εισάγετε Κωδικοποιημένο ή μη Κωδικό εδώ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Εισαγωγή ΚάÏτας SD" @@ -3710,7 +3871,7 @@ msgstr "Εισάγετε όνομα εδώ..." msgid "Install WAD" msgstr "Εγκατάσταση WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Εγκατάσταση στο ÎœÎµÎ½Î¿Ï Wii" @@ -3725,6 +3886,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 @@ -3738,14 +3900,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Διεπαφή" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Ρυθμίσεις Διεπαφής" @@ -3770,11 +3935,11 @@ msgstr "ΕσωτεÏικό Σφάλμα LZO - αποτυχία lzo_init()" msgid "Internal Resolution:" msgstr "ΕσωτεÏική Ανάλυση:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreter (ΠΟΛΥ αÏγός)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Εισαγωγή" @@ -3791,7 +3956,7 @@ msgstr "Μη έγκυÏη τιμή!" msgid "Invalid bat.map or dir entry" msgstr "Μη έγκυÏο bat.map ή εγγÏαφή φακέλου" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Μη έγκυÏος Ï„Ïπος συμβάντος %i" @@ -3811,11 +3976,11 @@ msgstr "" "%s\n" " Ίσως χÏειαστεί να ξαναεξάγετε την εικόνα Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î±Ï€ÏŒ τον δίσκο." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Μη έγκυÏο αÏχείο εγγÏαφής" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Μη έγκυÏο κατάσταση" @@ -3823,6 +3988,7 @@ msgstr "Μη έγκυÏο κατάσταση" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 @@ -3846,27 +4012,32 @@ msgstr "Μη έγκυÏο κατάσταση" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Ιταλικά" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "ΙΑΠΩÎΙΑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (Ï€Ïοτείνεται)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL δοκιμαστικός recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Ιαπωνικά" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "ΚΟΡΕΑ" @@ -3875,8 +4046,8 @@ msgstr "ΚΟΡΕΑ" msgid "Key" msgstr "ΠλήκτÏο" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "ΚοÏεάτικα" @@ -3894,7 +4065,7 @@ msgstr "L Button" msgid "L-Analog" msgstr "L-Αναλογική" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Γλώσσα:" @@ -3947,7 +4118,7 @@ msgstr "" msgid "Less Than" msgstr "ΜικÏότεÏο από" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "ΠεÏιοÏισμός με βάση τα ΚαÏέ" @@ -3955,7 +4126,7 @@ msgstr "ΠεÏιοÏισμός με βάση τα ΚαÏέ" msgid "Load" msgstr "ΦόÏτωσ." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "ΦόÏτωση ΤÏοποποιημένων Υφών" @@ -4007,6 +4178,7 @@ msgstr "ΦόÏτωση Σημείου Αποθήκευσης..." <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" @@ -4040,6 +4212,13 @@ msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii %d%c" @@ -4066,7 +4245,7 @@ msgstr "ΦοÏτώνει το καθοÏισμένο αÏχείο (DOL,ELF,GCM,I msgid "Local" msgstr "Τοπικό" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Κλείδωμα Îημάτων στους ΠυÏήνες " @@ -4078,11 +4257,11 @@ msgstr "ΚαταγÏαφή" msgid "Log Configuration" msgstr "Ρυθμίσεις ΚαταγÏαφής" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "ΤÏποι ΚαταγÏαφής" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Έξοδοι ΚαταγÏαφής" @@ -4112,7 +4291,7 @@ msgstr "" "Ασυμφωνία MD5\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" @@ -4142,11 +4321,11 @@ msgstr "ΑÏχεία MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "ΚÏÏιο Stick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID ΔημιουÏγοÏ:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "ΔημιουÏγός:" @@ -4182,11 +4361,15 @@ msgstr "Memory Byte" ======= #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 >>>>>>> The actual update of the Greek and Czech translations. The last commit ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "ΚάÏτα Μνήμης" @@ -4225,7 +4408,7 @@ msgstr "" msgid "Menu" msgstr "ΜενοÏ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "ΜικÏόφωνο" @@ -4234,11 +4417,11 @@ msgstr "ΜικÏόφωνο" msgid "Min" msgstr "Ελάχιστη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "ΔιάφοÏα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "ΔιάφοÏες Ρυθμίσεις" @@ -4260,7 +4443,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Ισοπλατής γÏαμματοσειÏά" @@ -4273,7 +4456,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "ΜοτέÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -4294,7 +4477,7 @@ msgstr "" msgid "Multiply" msgstr "Multiply" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -4390,6 +4573,7 @@ msgstr "NP Up" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 @@ -4402,6 +4586,9 @@ msgstr "NP Up" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4410,7 +4597,7 @@ msgstr "Όνομα:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Όνομα: " @@ -4424,7 +4611,7 @@ msgid "New Scan" msgstr "Îέα Ανίχνευση" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Επόμενη Σελίδα" @@ -4436,7 +4623,7 @@ msgstr "Επόμενη Ανίχνευση" msgid "Nickname :" msgstr "Ψευδώνυμο :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Καμία ΧώÏα (SDK)" @@ -4475,7 +4662,7 @@ msgstr "Δε βÏέθηκε φάκελος αποθήκευσης για τον msgid "None" msgstr "Καμία" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "ÎοÏβηγικά Bokmaal" @@ -4483,8 +4670,8 @@ msgstr "ÎοÏβηγικά Bokmaal" msgid "Not Equal" msgstr "Όχι ίσο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Μη ΟÏισμένο" @@ -4512,7 +4699,7 @@ msgstr "Μη Συνδεδεμένο" msgid "Notes" msgstr "Σημειώσεις" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Σημειώσεις: " @@ -4550,7 +4737,7 @@ msgstr "Αντικείμενο" msgid "Object Range" msgstr "ΕÏÏος Αντικειμένου" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "ΑνενεÏγός" @@ -4584,11 +4771,11 @@ msgstr "Διαθέσιμα μόνο %d μπλοκ" msgid "Open" msgstr "Άνοιγμα" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Άνοιγμα &τοποθεσίας αÏχείου" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Άνοιγμα φακέλου αποθήκευσης Wii" @@ -4610,11 +4797,11 @@ msgstr "OpenAL: αδυναμία εÏÏεσης συσκευών ήχου" msgid "OpenAL: can't open device %s" msgstr "OpenAL: αδυναμία ανοίγματος της συσκευής %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL Αποκωδικοποιητής Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP Αποκωδικοποιητής Υφών" @@ -4647,7 +4834,7 @@ msgstr "" "και εισάγετέ τα σε μία νέα κάÏτα μνήμης.\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Άλλα" @@ -4699,16 +4886,16 @@ msgstr "ΠαÏάγÏαφος" msgid "Parameters" msgstr "ΠαÏάμετÏοι" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Κατάτμηση %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Φάκελοι" @@ -4716,6 +4903,7 @@ msgstr "Φάκελοι" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ======= @@ -4732,6 +4920,10 @@ msgstr "Φάκελοι" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "ΠαÏση" @@ -4740,7 +4932,7 @@ msgstr "ΠαÏση" msgid "Per-Pixel Lighting" msgstr "Φωτισμός ανά Pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Τέλειο" @@ -4768,6 +4960,7 @@ msgstr "Οπτική %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 >>>>>>> The actual update of the Greek and Czech translations. The last commit @@ -4775,6 +4968,10 @@ msgstr "Οπτική %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "ΑναπαÏαγωγή" @@ -4788,7 +4985,7 @@ msgstr "ΑναπαÏαγωγή ΕγγÏαφής" msgid "Play/Pause" msgstr "ΑναπαÏαγωγή/ΠαÏση" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Παίζεται" @@ -4804,6 +5001,7 @@ msgstr "Παίχτες" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 @@ -4817,6 +5015,9 @@ msgstr "Παίχτες" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "ΠαÏακαλώ επιβεβαιώστε..." @@ -4828,23 +5029,23 @@ msgstr "ΠαÏακαλώ δημιουÏγήστε μια οπτική Ï€Ïιν msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Πολωνέζικα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "ΘÏÏα 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "ΘÏÏα 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "ΘÏÏα 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "ΘÏÏα 4" @@ -4853,11 +5054,11 @@ msgstr "ΘÏÏα 4" msgid "Port :" msgstr "ΘÏÏα :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "ΠοÏτογαλικά" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "ΠοÏτογαλικά (Î’Ïαζιλιάνικα)" @@ -4865,17 +5066,17 @@ msgstr "ΠοÏτογαλικά (Î’Ïαζιλιάνικα)" msgid "Post-Processing Effect:" msgstr "Post-Processing Εφέ:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4888,7 +5089,7 @@ msgstr "ΠÏοεπιλογές: " msgid "Prev Page" msgstr "ΠÏοηγοÏμενη Σελίδα" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "ΠÏοηγοÏμενη Σελίδα" @@ -4939,7 +5140,7 @@ msgstr "R-Αναλογική" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "ΡΩΣΙΑ" @@ -4952,7 +5153,7 @@ msgstr "ΕÏÏος" msgid "Read-only mode" msgstr "Μόνο Για Ανάγνωση (ΕγγÏαφής)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "ΠÏαγματικό" @@ -5031,6 +5232,7 @@ msgstr "Ανανέωση λίστας παιχνιδιών" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 @@ -5059,6 +5261,12 @@ msgstr "Ανανέωση λίστας παιχνιδιών" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "ΑφαίÏεση" @@ -5116,11 +5324,11 @@ msgstr "Δεξί Stick" msgid "Rumble" msgstr "Δόνηση" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: 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:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Ρώσικα" @@ -5128,13 +5336,18 @@ msgstr "Ρώσικα" msgid "Sa&ve State" msgstr "Απ&οθήκευση Σημείου Αποθήκευσης" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Safe" <<<<<<< HEAD msgstr "Ασφαλής" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 <<<<<<< HEAD ======= @@ -5152,6 +5365,9 @@ msgstr "Ασφαλής" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Ρυθμός Δειγματοληψίας:" @@ -5209,12 +5425,12 @@ msgstr "Αποθήκευση Σημείου Αποθήκευσης 8" msgid "Save State..." msgstr "Αποθήκευση Σημείου..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Αποθήκευση ως..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Αποθήκευση συμπιεσμένου GCM/ISO" @@ -5222,11 +5438,11 @@ msgstr "Αποθήκευση συμπιεσμένου GCM/ISO" msgid "Save current perspective" msgstr "Αποθήκευση Ï„Ïέχουσας οπτικής" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Αποθήκευση αποσυμπιεσμένου GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -5237,6 +5453,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "ΚλιμακοÏμενα EFB ΑντίγÏαφα" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 @@ -5254,15 +5471,18 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Ανίχνευση %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Αναζήτηση για ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Ανίχνευση..." @@ -5278,12 +5498,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "ΦίλτÏο Αναζήτησης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Αναζήτηση σε Υποφακέλους" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: 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" @@ -5293,6 +5513,7 @@ msgstr "Η ενότητα %s δε βÏέθηκε στο SYSCONF" msgid "Select" msgstr "Επιλογή" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -5325,6 +5546,14 @@ msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αÏχείο για εγκατάσταση" @@ -5354,14 +5583,19 @@ msgstr "Επιλέξτε το αÏχείο για φόÏτωση" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Επιλέξτε αÏχείο αποθήκευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Επιλέξτε το σημείο φόÏτωσης" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -5395,6 +5629,9 @@ msgstr "Επιλέξτε το σημείο φόÏτωσης" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" @@ -5417,7 +5654,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι επιλέξτε Αυτόματα." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Επιλεγμένη γÏαμματοσειÏά" @@ -5466,10 +5703,11 @@ msgstr "Θέση Sensor Bar:" msgid "Separator" msgstr "ΔιαχωÏιστής" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "ΣεÏβικά" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 @@ -5480,6 +5718,9 @@ msgstr "ΣεÏβικά" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -5497,11 +5738,11 @@ msgstr "ΣειÏιακή ΘÏÏα 1 - Αυτή είναι η θÏÏα που χ msgid "Set" msgstr "ΟÏισμός" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "ΟÏισμός ως Ï€Ïοεπιλεγμένο &ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "ΟÏισμός ως Ï€Ïοεπιλεγμένη ΚάÏτα Μνήμης %c" @@ -5513,7 +5754,7 @@ msgstr "" "SetARCode_IsActive: Ο δείκτης είναι μεγαλÏτεÏος από το μέγεθος λίστας των " "κωδικών ar %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Ρυθμίσεις..." @@ -5525,7 +5766,7 @@ msgstr "SetupWiiMem:Αδυναμία εÏÏεσης αÏχείου Ïυθμίσ msgid "Shake" msgstr "ΚοÏνημα" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "ΣÏντομο Όνομα:" @@ -5553,7 +5794,7 @@ msgstr "Εμφάνιση ΓÏαμμής &ΕÏγαλείων" msgid "Show Drives" msgstr "Εμφάνιση Οδηγών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Εμφάνιση ΠεÏιοχών EFB ΑντιγÏαφών" @@ -5569,7 +5810,7 @@ msgstr "Εμφάνιση Γαλλίας" msgid "Show GameCube" msgstr "Εμφάνιση GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Εμφάνιση ΠÏοβολής ΧειÏισμών" @@ -5585,7 +5826,7 @@ msgstr "Εμφάνιση JAP" msgid "Show Korea" msgstr "Εμφάνιση ΚοÏέας" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Εμφάνιση Γλώσσας:" @@ -5605,7 +5846,7 @@ msgstr "Εμφάνιση ΠλατφόÏμας" msgid "Show Regions" msgstr "Εμφάνιση ΠεÏιοχών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Εμφάνιση Στατιστικών" @@ -5625,11 +5866,11 @@ msgstr "Εμφάνιση Wad" 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 " @@ -5640,23 +5881,23 @@ msgstr "" "κÏίσιμα σφάλματα, αλλά \n" "το Dolphin μποÏεί να κÏασάÏει ξαφνικά χωÏίς καμία εξήγηση. " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Εμφάνιση Ï€Ïώτου μπλοκ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Εμφάνιση μπλοκ αποθήκευσης" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Εμφάνιση αποθηκευμένου σχολίου" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Εμφάνιση αποθηκευμένου εικονιδίου" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Εμφάνιση αποθηκευμένου τίτλου" @@ -5694,7 +5935,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "ΟÏιζόντια Θέση Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Κινέζικα Απλοποιημένα" @@ -5702,11 +5943,11 @@ msgstr "Κινέζικα Απλοποιημένα" msgid "Size" msgstr "Μέγεθος" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "ΠαÏάλειψη BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "ΠαÏάλειψη Dest. Alpha Pass" @@ -5798,11 +6039,11 @@ msgstr "" msgid "Slot %i" msgstr "Θέση %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Θέση Α" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Θέση Î’" @@ -5827,7 +6068,7 @@ msgstr "" "Θέλετε όντως να χÏησιμοποιήσετε την απεικόνιση λογισμικοÏ; Αν δεν είστε " "σίγουÏοι, επιλέξτε 'Όχι'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Ρυθμίσεις Ήχου" @@ -5849,6 +6090,7 @@ msgstr "Space" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 @@ -5872,6 +6114,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Ισπανικά" @@ -5904,7 +6151,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Επιλέξτε ένα backend βίντεο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Επιτάχυνση του Î¡Ï…Î¸Î¼Î¿Ï ÎœÎµÏ„Î±Ï†Î¿Ïάς από τον Δίσκο" @@ -5912,7 +6159,7 @@ msgstr "Επιτάχυνση του Î¡Ï…Î¸Î¼Î¿Ï ÎœÎµÏ„Î±Ï†Î¿Ïάς από το msgid "Square Stick" msgstr "ΤετÏάγωνο Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Τυπικός Controller" @@ -6051,12 +6298,12 @@ msgstr "Επιτυχής εισαγωγή σημείων αποθήκευσης" msgid "Swing" msgstr "Swing" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Γλώσσα Συστήματος:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "ΤΑΪΒΑÎ" @@ -6102,7 +6349,7 @@ msgstr "Δεξί Table" msgid "Take Screenshot" msgstr "ΔημιουÏγία Στιγμιότυπου" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -6135,6 +6382,7 @@ msgid "Texture Cache" msgstr "ΚαθαÏισμός Cache" >>>>>>> Update translation files for recent changes in the code. +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 @@ -6143,6 +6391,9 @@ msgstr "ΚαθαÏισμός Cache" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Texture Format Overlay" msgstr "Επικάλυψη Του Format Υφών" @@ -6158,13 +6409,13 @@ msgstr "Η διεÏθυνση είναι άκυÏη" msgid "The checksum was successfully fixed" msgstr "Το checksum διοÏθώθηκε με επιτυχία" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "Ο επιλεγμένος φάκελος βÏίσκεται ήδη στη λίστα" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -6187,7 +6438,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:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Το αÏχείο που επιλέξατε (%s) δεν υπάÏχει" @@ -6206,11 +6457,12 @@ msgstr "" "Το αποτέλεσμα αποκÏυπτογÏάφησης του ÎºÏ‰Î´Î¹ÎºÎ¿Ï AR δεν πεÏιέχει καθόλου γÏαμμές." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" "Όσο πιο ασφαλής είναι αυτή η ÏÏθμιση, τόσο λιγότεÏο πιθανό ο εξομοιωτής να " "χάσει ανανεώσεις των υφών από την RAM.\n" @@ -6273,7 +6525,7 @@ msgstr "Το επιλεγμένο αÏχείο \"%s\" δεν υπάÏχει" msgid "The value is invalid" msgstr "Η τιμή είναι άκυÏη" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Θέμα" @@ -6281,7 +6533,7 @@ msgstr "Θέμα" msgid "Theme selection went wrong" msgstr "Η επιλογή θέματος απέτυχε" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -6289,7 +6541,7 @@ msgstr "" "ΠÏέπει να υπάÏχει εισητήÏιο για 00000001/00000002. Το NAND dump σας είναι " "πιθανότατα ημιτελές." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -6306,7 +6558,7 @@ msgstr "" "Αυτός ο Ï€Ïοσομοιωτής action replay δεν υποστηÏίζει κωδικοÏÏ‚ που αλλάζουν το " "ίδιο το Action Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "Αυτό μποÏεί να Ï€Ïοκαλέσει καθυστεÏήσεις στο ÎœÎµÎ½Î¿Ï Wii και σε μεÏικά " @@ -6333,27 +6585,10 @@ msgstr "" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -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 "" -"ΧÏησιμοποιείται για τον έλεγχο της ταχÏτητας του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î¼Îµ throttle " -"ήχου.\n" -"ΑπενεÏγοποιώντας το μποÏεί να Ï€Ïοκλήθει αφÏσικη ταχÏτητα σε παιχνίδια, Ï€.χ. " -"Ï€Î¿Î»Ï Î³ÏήγοÏη.\n" -"Όμως οÏισμένες φοÏές η ενεÏγοποίησή της μποÏεί να Ï€Ïοκαλέσει μόνιμο θόÏυβο.\n" -"\n" -"Συντόμευση πληκτÏολογίου : ΚÏατήστε το πατημένο για να απενεÏγοποιηθεί " -"η λειτουÏγία Throttle." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "ΧÏησιμοποιείται για την αναπαÏαγωγή μουσικών κομματιών, όπως BGM." -#: 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" @@ -6365,7 +6600,7 @@ msgstr "" "ΠÏοκαλεί μεγάλη επιτάχυνση σε PC με πεÏισσότεÏους από έναν πυÏήνες,\n" "αλλά μποÏεί να Ï€Ïοκαλέσει κÏασαÏίσματα ή άλλα Ï€Ïοβλήματα. " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" "Αυτό σας επιτÏέπει την χειÏοκίνητη επεξεÏγασία του αÏχείου Ïυθμίσεων INI" @@ -6389,7 +6624,7 @@ msgstr "Τίτλος" msgid "To" msgstr "Εώς" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Εναλλαγή Όλων ΤÏπων ΚαταγÏαφής " @@ -6421,6 +6656,7 @@ msgstr "Εναλλαγή ΠλήÏους Οθόνης" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -6428,14 +6664,17 @@ msgstr "Εναλλαγή ΠλήÏους Οθόνης" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "ΚοÏυφή" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Κινέζικα ΠαÏαδοσιακά " -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "ΠÏοσπάθεια φόÏτωσης ενός άγνωστου Ï„Ïπου αÏχείο." @@ -6443,7 +6682,7 @@ msgstr "ΠÏοσπάθεια φόÏτωσης ενός άγνωστου Ï„Ïπο msgid "Triggers" msgstr "Σκανδάλες" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "ΠÏοσπάθεια ανάγνωσης από ένα μη έγκυÏο SYSCONF" @@ -6455,7 +6694,7 @@ msgstr "" "ΠÏοσπάθεια ανάγνωσης από ένα μη έγκυÏο SYSCONF\n" "Τα Wiimote bt ids δεν είναι διαθέσιμα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "ΤουÏκικά" @@ -6476,11 +6715,11 @@ msgstr "ΠόÏτα UDP:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "ΑΓÎΩΣΤΟ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "ΗΠΑ" @@ -6574,7 +6813,7 @@ msgstr "ΕνημέÏωση" msgid "Upright Wiimote" msgstr "Κάθετη Θέση Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "ΧÏήση ΛειτουÏγίας EuRGB60 (PAL60)" @@ -6586,7 +6825,7 @@ msgstr "ΧÏήση ΠλήÏους Οθόνης" msgid "Use Hex" msgstr "ΧÏήση Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "ΧÏήση Οθονών ΠανικοÏ" @@ -6618,7 +6857,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "ΕÏγαλεία" @@ -6642,25 +6881,29 @@ msgstr "Τιμή: " msgid "Verbosity" msgstr "Αναλυτικότητα" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Βίντεο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Εικονικό" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Ένταση" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format 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" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -6680,15 +6923,15 @@ msgstr "" msgid "Warning" msgstr "ΠÏοειδοποίηση" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση DOL σε λάθος λειτουÏγία κονσόλας!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση ELF σε λάθος λειτουÏγία κονσόλας!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση ISO σε λάθος λειτουÏγία κονσόλας!" @@ -6718,7 +6961,7 @@ msgstr "" "και έχουν το ίδιο όνομα με αÏχεία στη memcard\n" "Συνέχεια;" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -6726,7 +6969,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -6734,7 +6977,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -6762,7 +7005,7 @@ msgstr "WaveFileWriter - το αÏχείο δεν είναι ανοιχτό." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Hack ΕυÏείας Οθόνης" @@ -6770,15 +7013,15 @@ msgstr "Hack ΕυÏείας Οθόνης" msgid "Width" msgstr "Πλάτος" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii Κονσόλα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND Ρίζα:" @@ -6790,6 +7033,7 @@ msgstr "Εισαγωγή Αποθήκευσης Wii" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 @@ -6803,6 +7047,9 @@ msgstr "Εισαγωγή Αποθήκευσης Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -6877,7 +7124,7 @@ msgstr "Windows Menu" msgid "Windows Right" msgstr "Windows Right" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Αναδίπλωση Λέξεων" @@ -6885,6 +7132,7 @@ msgstr "Αναδίπλωση Λέξεων" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 @@ -6904,6 +7152,11 @@ msgstr "Αναδίπλωση Λέξεων" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Σε εÏγασία..." @@ -6911,6 +7164,11 @@ msgstr "Σε εÏγασία..." msgid "Write to Console" msgstr "ΕγγÏαφή στην Κονσόλα" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "ΕγγÏαφή σε ΑÏχείο" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "ΕγγÏαφή σε ΑÏχείο" @@ -6966,7 +7224,7 @@ msgstr "ΠÏέπει να εισάγετε μία έγκυÏη οκταδική msgid "You must enter a valid profile name." msgstr "ΠÏέπει να εισάγετε ένα έγκυÏο όνομα Ï€Ïοφίλ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" "ΠÏέπει να κάνετε επανεκκίνηση του Dolphin για να έχει επίπτωση αυτή η αλλαγή." @@ -6990,7 +7248,7 @@ msgstr "" "Θα έπÏεπε να είναι 0x%04x (αλλά είναι 0x%04llx)\n" "Θέλετε να δημιουÏγηθεί ένα καινοÏÏιο;" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP hack" @@ -7061,7 +7319,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -7094,12 +7352,12 @@ msgstr "" msgid "s" msgstr "." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "άγνωστη εντολή 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "Το wxExecute επέστÏεψε -1 κατά την εκκίνηση της εφαÏμογής!" @@ -7125,6 +7383,26 @@ msgstr "| OR" #~ msgstr "" #~ "Δεν μποÏεί να γίνει εγγÏαφή ταινιών σε λειτουÏγία μόνο για ανάγνωση." +#~ msgid "Enable Audio Throttle" +#~ msgstr "ΕνεÏγοποίηση Throttle Ήχου" + +#~ 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 "" +#~ "ΧÏησιμοποιείται για τον έλεγχο της ταχÏτητας του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î¼Îµ throttle " +#~ "ήχου.\n" +#~ "ΑπενεÏγοποιώντας το μποÏεί να Ï€Ïοκλήθει αφÏσικη ταχÏτητα σε παιχνίδια, Ï€." +#~ "χ. Ï€Î¿Î»Ï Î³ÏήγοÏη.\n" +#~ "Όμως οÏισμένες φοÏές η ενεÏγοποίησή της μποÏεί να Ï€Ïοκαλέσει μόνιμο " +#~ "θόÏυβο.\n" +#~ "\n" +#~ "Συντόμευση πληκτÏολογίου : ΚÏατήστε το πατημένο για να " +#~ "απενεÏγοποιηθεί η λειτουÏγία Throttle." + #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" diff --git a/Languages/po/en.po b/Languages/po/en.po index 0667cfbf71..a5b3cab7a4 100644 --- a/Languages/po/en.po +++ b/Languages/po/en.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-01-06 14:53+0100\n" "Last-Translator: BhaaL \n" "Language-Team: \n" @@ -55,9 +59,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "" @@ -142,7 +146,7 @@ msgstr "" msgid "%sImport GCI%s" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" @@ -175,11 +179,11 @@ msgstr "" msgid "&DSP Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "" @@ -243,7 +247,7 @@ msgstr "" msgid "&Play" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "" @@ -287,7 +291,7 @@ msgstr "" msgid "&Wiimote Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "" @@ -331,7 +335,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -340,7 +344,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -379,13 +383,13 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "" @@ -397,11 +401,11 @@ msgstr "" msgid "Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "" @@ -501,11 +505,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "" @@ -513,6 +517,7 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -528,6 +533,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "" @@ -561,11 +571,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "" @@ -573,14 +583,15 @@ msgstr "" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -593,18 +604,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "" @@ -616,7 +631,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Alternate Wiimote Timing" msgstr "" @@ -636,7 +651,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "" @@ -651,7 +666,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -660,16 +675,17 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -679,6 +695,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -687,18 +706,20 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -708,6 +729,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -743,7 +767,7 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "" @@ -770,11 +794,11 @@ msgstr "" msgid "Banner" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "" @@ -786,7 +810,7 @@ msgstr "" msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "" @@ -817,6 +841,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -824,6 +849,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "" @@ -832,7 +860,7 @@ msgstr "" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "" @@ -848,7 +876,7 @@ msgstr "" msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "" @@ -878,11 +906,11 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "" @@ -921,7 +949,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -929,7 +957,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -945,8 +973,6 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -956,7 +982,7 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -981,7 +1007,7 @@ msgstr "" msgid "Change Game" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -995,8 +1021,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: 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 "" @@ -1016,31 +1042,31 @@ msgstr "" msgid "Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "" @@ -1048,14 +1074,14 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: 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:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "" @@ -1067,14 +1093,14 @@ msgstr "" msgid "Classic" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "" @@ -1088,6 +1114,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1096,6 +1123,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "" @@ -1119,20 +1150,20 @@ msgstr "" msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "" @@ -1159,13 +1190,13 @@ msgstr "" msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "" @@ -1174,7 +1205,7 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "" @@ -1231,12 +1262,12 @@ msgstr "" msgid "Copy failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "" @@ -1263,7 +1294,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "" @@ -1274,7 +1305,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1283,7 +1314,7 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "" @@ -1298,7 +1329,7 @@ msgstr "" msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "" @@ -1312,24 +1343,24 @@ msgstr "" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 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:498 msgid "Created by VistaIcons.com" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "" @@ -1337,7 +1368,7 @@ msgstr "" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "" @@ -1357,7 +1388,7 @@ msgstr "" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "" @@ -1365,11 +1396,11 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "" @@ -1381,10 +1412,11 @@ msgstr "" msgid "DSP" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1395,18 +1427,22 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "" @@ -1414,15 +1450,23 @@ msgstr "" msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" 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:176 msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "" @@ -1443,7 +1487,7 @@ msgstr "" msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "" @@ -1451,16 +1495,16 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "" @@ -1468,11 +1512,11 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "" @@ -1481,7 +1525,7 @@ msgstr "" msgid "Delete" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "" @@ -1490,7 +1534,7 @@ msgstr "" msgid "Delete the existing file '%s'?" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "" @@ -1498,8 +1542,8 @@ msgstr "" msgid "Detect" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: 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." @@ -1510,8 +1554,8 @@ msgstr "" msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "" @@ -1534,23 +1578,23 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "" @@ -1580,7 +1624,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "" @@ -1604,6 +1648,7 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1613,10 +1658,13 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "" @@ -1641,6 +1689,7 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1665,6 +1714,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1693,11 +1750,11 @@ msgstr "" msgid "Down" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "" @@ -1706,23 +1763,23 @@ msgstr "" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "" @@ -1747,6 +1804,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1762,6 +1820,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "" @@ -1782,7 +1845,7 @@ msgid "" "driver." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "" @@ -1798,7 +1861,7 @@ msgstr "" msgid "Edit ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "" @@ -1810,8 +1873,8 @@ msgstr "" msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "" @@ -1850,7 +1913,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "" @@ -1872,23 +1935,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -1901,6 +1964,7 @@ msgstr "" msgid "Enable Cache" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -1910,51 +1974,54 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "" @@ -1967,13 +2034,13 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: 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:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "" @@ -1993,20 +2060,20 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: 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:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "" @@ -2018,7 +2085,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2035,6 +2102,7 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2050,6 +2118,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "" @@ -2080,6 +2153,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -2110,18 +2184,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2153,7 +2233,7 @@ msgstr "" msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "" @@ -2166,15 +2246,15 @@ msgstr "" msgid "Export Recording..." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "" @@ -2190,7 +2270,7 @@ msgstr "" msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "" @@ -2202,44 +2282,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "" @@ -2251,11 +2331,11 @@ msgstr "" msgid "FIFO Player" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "" @@ -2267,11 +2347,11 @@ msgstr "" msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2367,18 +2447,28 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "" @@ -2387,7 +2477,7 @@ msgstr "" msgid "File Info" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "" @@ -2416,16 +2506,16 @@ msgstr "" msgid "File not compressed" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2433,7 +2523,7 @@ msgstr "" msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "" @@ -2445,7 +2535,7 @@ msgstr "" msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "" @@ -2469,7 +2559,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 " @@ -2500,7 +2590,7 @@ msgstr "" msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "" @@ -2512,7 +2602,7 @@ msgstr "" msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "" @@ -2520,10 +2610,11 @@ msgstr "" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2539,6 +2630,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "" @@ -2571,7 +2667,7 @@ msgstr "" msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "" @@ -2587,15 +2683,15 @@ msgstr "" msgid "Game not found!!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "" @@ -2606,6 +2702,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2613,6 +2710,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2621,21 +2721,24 @@ msgid "Gamecube Pad settings" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "" -#: Source/Core/Core/Src/GeckoCode.cpp:139 +#: Source/Core/Core/Src/GeckoCode.cpp:222 #, 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.)" +"(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 "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2644,6 +2747,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2652,6 +2758,7 @@ msgstr "" msgid "General Settings" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2667,6 +2774,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "" @@ -2698,7 +2810,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "" @@ -2730,7 +2842,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "" @@ -2790,12 +2902,16 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "" @@ -2803,12 +2919,12 @@ msgstr "" msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2817,11 +2933,11 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "" @@ -2837,15 +2953,15 @@ msgstr "" msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "" @@ -2853,21 +2969,22 @@ msgstr "" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: 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:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 msgid "" -"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." +"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:432 @@ -2892,7 +3009,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "" @@ -2931,7 +3048,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "" @@ -2940,7 +3057,7 @@ msgid "In-Game" msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "" @@ -2960,7 +3077,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "" @@ -2972,7 +3089,7 @@ msgstr "" msgid "Install WAD" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "" @@ -2981,6 +3098,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -2990,14 +3108,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "" @@ -3020,11 +3141,11 @@ msgstr "" msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "" @@ -3041,7 +3162,7 @@ msgstr "" msgid "Invalid bat.map or dir entry" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "" @@ -3058,14 +3179,15 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3081,27 +3203,32 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "" @@ -3110,8 +3237,8 @@ msgstr "" msgid "Key" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "" @@ -3129,7 +3256,7 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "" @@ -3175,7 +3302,7 @@ msgstr "" msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3183,7 +3310,7 @@ msgstr "" msgid "Load" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "" @@ -3231,6 +3358,7 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3252,6 +3380,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3275,7 +3410,7 @@ msgstr "" msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "" @@ -3287,11 +3422,11 @@ msgstr "" msgid "Log Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "" @@ -3319,7 +3454,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "" @@ -3341,11 +3476,11 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "" @@ -3369,6 +3504,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3376,6 +3512,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "" @@ -3404,7 +3543,7 @@ msgstr "" msgid "Menu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "" @@ -3413,11 +3552,11 @@ msgstr "" msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "" @@ -3434,7 +3573,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "" @@ -3447,7 +3586,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3462,7 +3601,7 @@ msgstr "" msgid "Multiply" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3552,6 +3691,7 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3561,6 +3701,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3569,7 +3712,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "" @@ -3583,7 +3726,7 @@ msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "" @@ -3595,7 +3738,7 @@ msgstr "" msgid "Nickname :" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "" @@ -3634,7 +3777,7 @@ msgstr "" msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "" @@ -3642,8 +3785,8 @@ msgstr "" msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "" @@ -3663,7 +3806,7 @@ msgstr "" msgid "Notes" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "" @@ -3701,7 +3844,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "" @@ -3727,11 +3870,11 @@ msgstr "" msgid "Open" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "" @@ -3753,11 +3896,11 @@ msgstr "" msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -3786,7 +3929,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -3836,19 +3979,20 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -3861,6 +4005,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3869,7 +4017,7 @@ msgstr "" msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "" @@ -3882,6 +4030,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -3892,6 +4041,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "" @@ -3905,7 +4058,7 @@ msgstr "" msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "" @@ -3917,6 +4070,7 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -3926,6 +4080,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -3937,23 +4094,23 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "" @@ -3962,11 +4119,11 @@ msgstr "" msgid "Port :" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "" @@ -3974,17 +4131,17 @@ msgstr "" msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3997,7 +4154,7 @@ msgstr "" msgid "Prev Page" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "" @@ -4048,7 +4205,7 @@ msgstr "" msgid "RAM" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "" @@ -4061,7 +4218,7 @@ msgstr "" msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "" @@ -4131,6 +4288,7 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4149,6 +4307,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "" @@ -4198,11 +4362,11 @@ msgstr "" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "" @@ -4210,10 +4374,11 @@ msgstr "" msgid "Sa&ve State" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4223,6 +4388,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -4280,12 +4448,12 @@ msgstr "" msgid "Save State..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "" @@ -4293,11 +4461,11 @@ msgstr "" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4306,6 +4474,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4315,15 +4484,18 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "" @@ -4339,12 +4511,12 @@ msgstr "" msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: 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 "" @@ -4354,6 +4526,7 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4378,6 +4551,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4400,6 +4581,7 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4416,19 +4598,26 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4443,7 +4632,7 @@ msgid "" "If unsure, select Auto." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "" @@ -4479,11 +4668,11 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4492,11 +4681,11 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "" @@ -4506,7 +4695,7 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "" @@ -4518,7 +4707,7 @@ msgstr "" msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "" @@ -4546,7 +4735,7 @@ msgstr "" msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "" @@ -4562,7 +4751,7 @@ msgstr "" msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "" @@ -4578,7 +4767,7 @@ msgstr "" msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "" @@ -4598,7 +4787,7 @@ msgstr "" msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "" @@ -4618,34 +4807,34 @@ msgstr "" 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:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "" @@ -4676,7 +4865,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "" @@ -4684,11 +4873,11 @@ msgstr "" msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -4720,11 +4909,11 @@ msgstr "" msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "" @@ -4744,7 +4933,7 @@ 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:621 msgid "Sound Settings" msgstr "" @@ -4762,6 +4951,7 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -4777,6 +4967,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "" @@ -4800,7 +4995,7 @@ msgstr "" msgid "Specify a video backend" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4808,7 +5003,7 @@ msgstr "" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "" @@ -4901,12 +5096,12 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "" @@ -4945,7 +5140,7 @@ msgstr "" msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -4961,7 +5156,7 @@ msgstr "" msgid "Texture Cache" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "" @@ -4977,13 +5172,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5002,7 +5197,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -5024,7 +5219,7 @@ msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5062,7 +5257,7 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "" @@ -5070,13 +5265,13 @@ msgstr "" msgid "Theme selection went wrong" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5088,7 +5283,7 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" @@ -5104,19 +5299,10 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -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 "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." 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" @@ -5124,7 +5310,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" @@ -5147,7 +5333,7 @@ msgstr "" msgid "To" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "" @@ -5167,6 +5353,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5174,14 +5361,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "" @@ -5189,7 +5379,7 @@ msgstr "" msgid "Triggers" msgstr "" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "" @@ -5199,7 +5389,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "" @@ -5220,11 +5410,11 @@ msgstr "" msgid "UDP Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "" @@ -5302,7 +5492,7 @@ msgstr "" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -5314,7 +5504,7 @@ msgstr "" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "" @@ -5335,7 +5525,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "" @@ -5359,25 +5549,28 @@ msgstr "" msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +msgid "WAD installation failed: error creating ticket" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5392,15 +5585,15 @@ msgstr "" msgid "Warning" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "" @@ -5421,7 +5614,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5429,7 +5622,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5437,7 +5630,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5465,7 +5658,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "" @@ -5473,15 +5666,15 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "" @@ -5489,6 +5682,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5498,6 +5692,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5560,10 +5757,11 @@ msgstr "" msgid "Windows Right" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5579,6 +5777,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "" @@ -5586,6 +5789,10 @@ msgstr "" msgid "Write to Console" msgstr "" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +msgid "Write to Debugger" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "" @@ -5639,7 +5846,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5657,7 +5864,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "" @@ -5711,7 +5918,7 @@ msgstr "" msgid "^ ADD" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "" @@ -5742,12 +5949,12 @@ msgstr "" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/es.po b/Languages/po/es.po index 5b7d2b9a35..3e31ea03ed 100644 --- a/Languages/po/es.po +++ b/Languages/po/es.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-09 00:28+0100\n" ======= @@ -21,6 +22,9 @@ msgstr "" >>>>>>> Updated Spanish translation ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-23 16:03+0100\n" >>>>>>> Update from master branch. "Last-Translator: Petiso Carambanal \n" @@ -64,9 +68,9 @@ msgstr "\"%s\" no es un archivo GCM/ISO válido, o no es una ISO GC/Wii." msgid "%1$sCopy%1$s" msgstr "%1$sCopiar%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -163,7 +167,7 @@ msgstr "%sExportar GCI%s" msgid "%sImport GCI%s" msgstr "%sImportar GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Bloques libres; %u entradas de dir. libres" @@ -196,11 +200,11 @@ msgstr "Administrador de &trucos" msgid "&DSP Settings" msgstr "&Configuración DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Borrar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Borrar ISO seleccionadas..." @@ -264,7 +268,7 @@ msgstr "&Pausa" msgid "&Play" msgstr "&Jugar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Propiedades" @@ -308,7 +312,7 @@ msgstr "&Vista" msgid "&Wiimote Settings" msgstr "&Configuración de wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -352,7 +356,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -361,7 +365,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -418,13 +422,13 @@ msgstr "" "\n" "¡¡Debe redireccionar el puerto TCP para hostear!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "Placa base AM" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Códigos AR" @@ -436,11 +440,11 @@ msgstr "Acerca de Dolphin" msgid "Acceleration" msgstr "Aceleración" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "Exactitud:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulación de VBeam Precisa" @@ -568,11 +572,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Añadir" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Añadir código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Añadir Parche" @@ -580,6 +584,7 @@ msgstr "Añadir Parche" msgid "Add new pane" msgstr "Añadir nueva ventana" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -595,6 +600,11 @@ msgstr "Añadir nueva ventana" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Añadir..." @@ -643,11 +653,11 @@ 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:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Avanzado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Configuración avanzada" @@ -655,14 +665,15 @@ msgstr "Configuración avanzada" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Todos los archivos GC/Wii (elf, dol, gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Todas las imágenes GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Todos los archivos Gamecube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -675,18 +686,22 @@ msgstr "Todos los archivos Gamecube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos los estados guardados (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Todos los archivos ISO de Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos los archivos ISO comprimidos de GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Todos los archivos (*.*)|*.*" @@ -702,6 +717,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD <<<<<<< HEAD @@ -713,6 +729,9 @@ msgid "Alternate Wiimote Timing" msgstr "Wiimote emulado" >>>>>>> Update translation files for recent changes in the code. ======= +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Sincronización alternativa del Wiimote" >>>>>>> Updated Spanish translation @@ -733,7 +752,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:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -751,7 +770,7 @@ msgstr "" "\n" "Si no está seguro, seleccione (off)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Ãrabe" @@ -760,7 +779,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -768,10 +787,11 @@ msgstr "" "¿Seguro que quieres borrar estos archivos?\n" "¡Desaparecerán para siempre!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -781,6 +801,9 @@ msgstr "¿Seguro que quieres borrar este archivo? ¡Desaparecerá para siempre!" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relación de aspecto:" @@ -789,18 +812,20 @@ 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:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Motor de Audio:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error al abrir dispositivo AO.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -810,6 +835,9 @@ msgstr "AudioCommon: Error al abrir dispositivo AO.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -853,7 +881,7 @@ msgstr "" msgid "Back" msgstr "Atrás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Configuración del motor" @@ -880,11 +908,11 @@ msgstr "Cabecera de archivo incorrecta" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Detalles del banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Banner:" @@ -896,7 +924,7 @@ msgstr "Barra" msgid "Basic" msgstr "Básico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Configuración básica" @@ -927,6 +955,7 @@ msgstr "Azul derecha" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -934,6 +963,9 @@ msgstr "Azul derecha" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Inferior" @@ -942,7 +974,7 @@ msgstr "Inferior" msgid "Bound Controls: %lu" msgstr "Controles asignados: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Quebrado" @@ -958,7 +990,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:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Busca un directorio de salida" @@ -988,11 +1020,11 @@ msgstr "Stick C" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Emulador de CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Caché de listas de visualización" @@ -1046,7 +1078,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:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1057,7 +1089,7 @@ msgstr "" "%s\n" "no es un fichero válido de tarjeta de memoria de Gamecube." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1075,8 +1107,6 @@ msgstr "No se puede encontrar el WiiMote por bd: %02x:%02x:%02x:%02x:%02x:%02x" 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/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1086,7 +1116,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:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Catalán" @@ -1111,7 +1141,7 @@ msgstr "Cambiar disco" msgid "Change Game" msgstr "Cambiar Juego" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1127,8 +1157,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:506 #: 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!" @@ -1149,31 +1179,31 @@ msgstr "Búscar trucos" msgid "Cheats Manager" msgstr "Administrador de trucos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chino Simplificado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chino (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: 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:762 +#: 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:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Escoge una ISO por defecto:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Escoge un directorio para añadir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Escoge un archivo a abrir" @@ -1181,6 +1211,7 @@ msgstr "Escoge un archivo a abrir" msgid "Choose a memory card:" msgstr "Escoge una tarjeta de memoria:" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 @@ -1190,6 +1221,9 @@ msgstr "Escoge una tarjeta de memoria:" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1197,8 +1231,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:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: 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" @@ -1210,14 +1244,14 @@ msgstr "Circle Stick" msgid "Classic" msgstr "Clásico" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Limpiar" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Fallo al borrar." @@ -1233,6 +1267,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1241,6 +1276,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Cerrar" @@ -1264,20 +1303,20 @@ msgstr "Comando" msgid "Comment" msgstr "Comentario" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Comentario:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Comprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Comprimir ISO seleccionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Comprimiendo ISO" @@ -1304,13 +1343,13 @@ msgstr "Configurar mandos" msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Confirmar sobrescritura de archivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Confirmar al detenerse" @@ -1319,7 +1358,7 @@ msgstr "Confirmar al detenerse" msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Conectar Teclado USB" @@ -1376,12 +1415,12 @@ msgstr "Convertir a GCI" msgid "Copy failed" msgstr "Fallo al copiar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Copiar a tarjeta de memoria %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Núcleo" @@ -1411,7 +1450,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "No se pudo reconocer el archivo ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "No se pudo guardar %s" @@ -1426,7 +1465,7 @@ msgstr "" "(definir los pads mientras el juego está ejecutándose no está permitido " "todavía)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1439,7 +1478,7 @@ msgstr "" "¿Está ejecutando Dolphin desde un CD/DVD, o el archivo de guardado está " "protegido contra escritura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "No se pudo hallar el comando para abrir la extension 'ini'!" @@ -1456,7 +1495,7 @@ msgstr "" msgid "Count:" msgstr "Cuenta:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "País:" @@ -1470,10 +1509,11 @@ 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:500 msgid "Created by KDE-Look.org" msgstr "Creado por KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 @@ -1483,20 +1523,23 @@ msgstr "Creado por KDE-Look.org" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +>>>>>>> Update the pot file to reflect recent changes in the code. 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:498 msgid "Created by VistaIcons.com" msgstr "Creado por VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 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:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Creador:" @@ -1504,7 +1547,7 @@ msgstr "Creador:" msgid "Critical" msgstr "Critico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Cortar" @@ -1527,7 +1570,7 @@ msgstr "Fundido" 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:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Hack de proyección personalizado" @@ -1535,11 +1578,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:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Personalizar algunos párametros de la proyección ortográfica." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Checo" @@ -1551,10 +1594,11 @@ msgstr "Pad direccional" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Motor de emulación DSP" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1565,18 +1609,22 @@ msgstr "Motor de emulación DSP" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulación DSP HLE (rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "Intérprete DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE en un proceso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "Recompilador DSP LLE" @@ -1584,15 +1632,23 @@ msgstr "Recompilador DSP LLE" msgid "DSP settings" msgstr "Configuración DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Raíz DVD:" +#: 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:176 msgid "Data Size" msgstr "Tamaño de datos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Fecha:" @@ -1613,7 +1669,7 @@ msgstr "Zona muerta" msgid "Debug" msgstr "Depurar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Depurarando" @@ -1621,16 +1677,16 @@ msgstr "Depurarando" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Descomprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISO seleccionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Descomprimir ISO" @@ -1638,11 +1694,11 @@ msgstr "Descomprimir ISO" msgid "Default" msgstr "Defecto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ISO por defecto:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Fuente por defecto" @@ -1651,7 +1707,7 @@ msgstr "Fuente por defecto" msgid "Delete" msgstr "Borrar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Borrar guardado" @@ -1660,7 +1716,7 @@ msgstr "Borrar guardado" msgid "Delete the existing file '%s'?" msgstr "¿Borrar el archivo existente '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Descripción" @@ -1668,8 +1724,8 @@ msgstr "Descripción" msgid "Detect" msgstr "Detectar" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: 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." @@ -1682,8 +1738,8 @@ msgstr "" msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Configuración del dispositivo" @@ -1708,23 +1764,23 @@ msgstr "" " y falló la suma de verificación del directorio backup" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Deshabilitar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Deshabilitar niebla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Deshabilitar iluminación" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Desactivar profundidad por píxel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Deshabilitar texturas" @@ -1768,7 +1824,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disco" @@ -1795,6 +1851,7 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1804,10 +1861,13 @@ msgstr "Dividir" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "¿Quieres detener la emulación actual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1832,6 +1892,7 @@ msgstr "Configuración de wiimote emulado de Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1856,6 +1917,14 @@ msgstr "Configuración de GCPad Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Configuración de GCPad Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Películas TAS de Dolphin (*.dtm)" @@ -1904,11 +1973,11 @@ msgstr "" msgid "Down" msgstr "Abajo" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Descargar códigos (base de datos de WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Se descargaron %lu códigos. (%lu añadidos)" @@ -1917,23 +1986,23 @@ msgstr "Se descargaron %lu códigos. (%lu añadidos)" msgid "Drums" msgstr "Tambores" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Depósito de audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Volcar objetivo EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Volcar frames" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Volcar texturas" @@ -1967,6 +2036,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1982,6 +2052,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holandés" @@ -2006,7 +2081,7 @@ msgstr "" "Dolphin, puede que se necesite reiniciar para que Windows reconozca el nuevo " "controlador." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPA" @@ -2022,7 +2097,7 @@ msgstr "Editar" msgid "Edit ActionReplay Code" msgstr "Editar código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Editar configuración" @@ -2034,8 +2109,8 @@ msgstr "Editar parche" msgid "Edit current perspective" msgstr "Editar perspectiva actual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Editar..." @@ -2080,7 +2155,7 @@ msgstr "Emular XFB usando texturas de objetos de la GPU" msgid "Emulated Wiimote" msgstr "Wiimote emulado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Estado de emulación:" @@ -2108,18 +2183,15 @@ msgstr "" msgid "Enable AR Logging" msgstr "Habilitar Registro de AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Habilitar aceleración de audio" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Habilitar BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Habilitar asociación de bloques" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 @@ -2130,6 +2202,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "Permitir el cálculo del cuadro delimitador" @@ -2138,6 +2213,7 @@ msgstr "Permitir el cálculo del cuadro delimitador" msgid "Enable Cache" msgstr "Habilitar caché" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2147,51 +2223,54 @@ msgstr "Habilitar caché" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Habilitar trucos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Habilitar música DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Habilitar doble núcleo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Habilitar doble núcleo (mejora)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Habilitar atajos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Habilitar salto de fotogramas inactivos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Habilitar salto de fotogramas inactivos (mejora)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Habilitar MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Habilitar escaneado progresivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Habilitar salvapantallas" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Habilitar pantalla panorámica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Habilitar \"alambrado\" (wireframe)" @@ -2209,7 +2288,7 @@ msgstr "" "\n" "Si estás inseguro, déjalo sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2217,7 +2296,7 @@ msgstr "" "Habilitar acceso rápido al disco. Es necesario para algunos juegos. (ON = " "Rápido, OFF=Compatible)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Habilitar páginas" @@ -2246,6 +2325,7 @@ msgstr "" "\n" "Si no estás seguro, déjalo sin marcar." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 @@ -2255,6 +2335,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2262,7 +2345,7 @@ msgstr "" "Habilitar esto para acelerar The Legend of Zelda: Twilight Princess. " "Deshabilitar para CUALQUIER OTRO juego." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: 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 = " @@ -2272,7 +2355,7 @@ 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:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Habilta un hack de proyección personalizado" @@ -2288,7 +2371,7 @@ msgstr "" "\n" "Si no estás seguro, déjalo sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2310,6 +2393,7 @@ msgstr "" msgid "End" msgstr "Fin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2325,6 +2409,11 @@ msgstr "Fin" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Inglés" @@ -2355,6 +2444,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -2387,14 +2477,24 @@ msgstr "" "Disculpa, la grabación de Wii no funciona temporalmente." >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Error" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Error al cargar el idioma seleccionado. Volviendo al defecto del sistema." +<<<<<<< HEAD #: Source/Core/Common/Src/ChunkFile.h:180 <<<<<<< HEAD ======= +======= +#: Source/Core/Common/Src/ChunkFile.h:194 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " @@ -2403,8 +2503,12 @@ msgstr "" "Error: Después de \"%s\", se ha encontrado %d (0x%X) en vezde la marca de " "guardado %d (0x%X). Cancelando carga del guardado..." +<<<<<<< HEAD #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 >>>>>>> Update from master branch. +======= +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" <<<<<<< HEAD @@ -2448,7 +2552,7 @@ msgstr "Cerrar Dolphin con el emulador" msgid "Export Failed" msgstr "Fallo al exportar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Exportar archivo" @@ -2461,15 +2565,15 @@ msgstr "Exportar grabación..." msgid "Export Recording..." msgstr "Exportar grabación..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Exportar guardado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Exportar guardado de Wii (experimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Exportar todos los guardados" @@ -2485,7 +2589,7 @@ msgstr "Exportar guardado como..." msgid "Extension" msgstr "Extensión" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Buffer de frames externo" @@ -2497,44 +2601,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Extraer todos los archivos..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Extraer Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Extraer DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Extraer directorio..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Extraer archivo..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Extraer partición" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Extrayendo %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Extrayendo todos los archivos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Extraer directorio" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Extrayendo..." @@ -2546,11 +2650,11 @@ msgstr "Byte de FIFO" msgid "FIFO Player" msgstr "Jugador FIFO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANCIA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Tamaño del FST:" @@ -2562,11 +2666,11 @@ msgstr "¡Fallo al conectar!" msgid "Failed to Listen!!" msgstr "¡Fallo al escuchar!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Fallo al descargar los códigos." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Falló al extraer a %s!" @@ -2683,18 +2787,28 @@ msgstr "Falló al escribir la cabecera para %s" msgid "Failed to write header for file %d" msgstr "Falló al escribir la cabecera para el archivo %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Rápido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Mipmaps rápidos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Jugador Fifo" @@ -2703,7 +2817,7 @@ msgstr "Jugador Fifo" msgid "File Info" msgstr "Información del fichero" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "El archivo no contenía códigos." @@ -2736,16 +2850,16 @@ msgstr "El archivo no es reconocido como una tarjeta de memoria" msgid "File not compressed" msgstr "Archivo sin comprimir" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Modo desconocido de apertura : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Sistema de archivos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "¡Tipo de archivo INI desconocido: no se abrirá!" @@ -2753,7 +2867,7 @@ msgstr "¡Tipo de archivo INI desconocido: no se abrirá!" msgid "First Block" msgstr "Primer bloque" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Reparar sumas de verificación" @@ -2765,7 +2879,7 @@ msgstr "Forzar 16:9" msgid "Force 4:3" msgstr "Forzar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Forzar consola como NTSC-J" @@ -2800,7 +2914,7 @@ msgstr "" "\n" "Si está inseguro, déjelo 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 " @@ -2836,7 +2950,7 @@ msgstr "Frame " msgid "Frame Advance" msgstr "Avanzar &fotogramas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Volcado de fotogramas usa FFV1" @@ -2848,7 +2962,7 @@ msgstr "Información de la grabación" msgid "Frame S&kipping" msgstr "Salto de &fotogramas" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Límite de fotogramas:" @@ -2856,10 +2970,11 @@ msgstr "Límite de fotogramas:" msgid "Frames To Record" msgstr "Frames a grabar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Cámara libre" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2875,6 +2990,11 @@ msgstr "Cámara libre" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francés" @@ -2913,7 +3033,7 @@ msgstr "Configuración del micro de GC" msgid "GCPad" msgstr "Pad GC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID del juego:" @@ -2929,15 +3049,15 @@ msgstr "¡El juego no está ejecutándose!" msgid "Game not found!!" msgstr "¡¡Juego no encontrado!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Configuración específica del juego" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Configurar Juego" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2948,6 +3068,7 @@ msgstr "&Configuración del mando Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2955,6 +3076,9 @@ msgstr "&Configuración del mando Gamecube" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Tarjetas de memoria de Gamecube (*.raw,*.gcp)" @@ -2963,15 +3087,17 @@ msgid "Gamecube Pad settings" msgstr "Configuración del Pad de Gamecube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Códigos Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, 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.)" +"(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 "" "GeckoCode falló al ejecutarse (CT%i CST%i) (%s)\n" "(puede ser un código incorrecto o su tipo no es soportado todavía.)" @@ -2986,8 +3112,12 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -2996,6 +3126,7 @@ msgstr "General" msgid "General Settings" msgstr "Ajustes generales" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -3011,6 +3142,11 @@ msgstr "Ajustes generales" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Alemán" @@ -3076,7 +3212,7 @@ msgstr "" "\n" "Si está inseguro, déjelo marcado." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Griego" @@ -3108,7 +3244,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Falló la suma de verificación de cabecera" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebreo" @@ -3172,6 +3308,7 @@ msgstr "Configuración de atajos" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 @@ -3180,10 +3317,13 @@ msgstr "Configuración de atajos" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Atajos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Húngaro" @@ -3191,14 +3331,14 @@ msgstr "Húngaro" msgid "Hybrid Wiimote" msgstr "Wiimote híbrido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3211,11 +3351,11 @@ msgstr "" "TitleID %016llx.\n" " Dolphin probablemente se bloqueará ahora" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destino incorrecto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Configuración IPL" @@ -3231,15 +3371,15 @@ msgstr "Puntero IR" msgid "IR Sensitivity:" msgstr "Sensibilidad IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Detalles del ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Directorios de ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITALIA" @@ -3247,7 +3387,7 @@ msgstr "ITALIA" msgid "Icon" msgstr "Icono" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3258,13 +3398,14 @@ msgstr "" "usado por los juegos de Paper Mario." >>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: 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)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 @@ -3274,9 +3415,14 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" -"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." +"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 define un límite de fotogramas por segunda mayor que la velocidad de " "juego completa (NTSC: 60, PAL: 50), también debe deshabilitar la regulación " @@ -3314,7 +3460,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Importar Guardado" @@ -3365,7 +3511,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "En juego" @@ -3374,7 +3520,7 @@ msgid "In-Game" msgstr "En juego" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Información" @@ -3394,7 +3540,7 @@ msgstr "Insertar" msgid "Insert Encrypted or Decrypted code here..." msgstr "Insertar código encriptado o desencriptado aquí..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Insertar tarjeta SD" @@ -3406,7 +3552,7 @@ msgstr "Insertar un nombre aquí.." msgid "Install WAD" msgstr "Instalar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Instalar al menú de la Wii" @@ -3417,6 +3563,7 @@ msgstr "" "Se ha llamado InstallExceptionHandler, pero esta plataforma no lo soporta " "todavía." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3426,14 +3573,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instalando WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Interfaz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Configuración de la interfaz" @@ -3458,11 +3608,11 @@ msgstr "Error Interno de LZO - lzo_init() falló" msgid "Internal Resolution:" msgstr "Resolución interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Intérprete (MUY lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3479,7 +3629,7 @@ msgstr "¡Valor no válido!" msgid "Invalid bat.map or dir entry" msgstr "bat.map o entrada de directorio no válido" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Evento de tipo %i no válido" @@ -3499,14 +3649,15 @@ msgstr "" "%s\n" " Puede que necesitas volcar este juego de nuevo." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Archivo de grabación no válido" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Estado no válido" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3522,27 +3673,32 @@ msgstr "Estado no válido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiano" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPÓN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "Recompilador JIT (recomendado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "Recompilador experimental JITIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japonés" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "COREA" @@ -3551,8 +3707,8 @@ msgstr "COREA" msgid "Key" msgstr "Clave" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Coreano" @@ -3570,7 +3726,7 @@ msgstr "Botón L" msgid "L-Analog" msgstr "L-Analógico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Idioma:" @@ -3623,7 +3779,7 @@ msgstr "" msgid "Less Than" msgstr "Menor que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Usar FPS para limitar" @@ -3631,7 +3787,7 @@ msgstr "Usar FPS para limitar" msgid "Load" msgstr "Cargar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Cargar texturas personalizadas" @@ -3679,6 +3835,7 @@ msgstr "&Cargar estado 8" msgid "Load State..." msgstr "Cargar estado..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3700,6 +3857,13 @@ msgstr "Cargar Menú de sistema Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Cargar Menú de sistema Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Cargar Menú de sistema Wii %d %c" @@ -3726,7 +3890,7 @@ msgstr "Carga el archivo especificado (DOL, ELF, WAD, GCM, ISO)" msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Fijar procesos en núcleos" @@ -3738,11 +3902,11 @@ msgstr "Registrar" msgid "Log Configuration" msgstr "Configuración de registro" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Tipos de registro" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Salida de registro" @@ -3772,7 +3936,7 @@ msgstr "" "MD5 no coinciden\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "Hack de velocidad MMU" @@ -3794,11 +3958,11 @@ msgstr "Archivos MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "Stick principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID del fabricante:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Fabricante:" @@ -3822,6 +3986,7 @@ msgstr "Byte de memoria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3829,6 +3994,9 @@ msgstr "Byte de memoria" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Tarjeta de memoria" @@ -3867,7 +4035,7 @@ msgstr "" msgid "Menu" msgstr "Menú" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mic" @@ -3876,11 +4044,11 @@ msgstr "Mic" msgid "Min" msgstr "Mín." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Varios" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Configuraciones varias" @@ -3901,7 +4069,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Fuente monoespaciada" @@ -3914,7 +4082,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3943,7 +4111,7 @@ msgstr "" msgid "Multiply" msgstr "Multiplicar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -4035,6 +4203,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Arriba" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -4044,6 +4213,9 @@ msgstr "NP Arriba" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4052,7 +4224,7 @@ msgstr "Nombre:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nombre:" @@ -4066,7 +4238,7 @@ msgid "New Scan" msgstr "Nuevo escaneado" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Próxima página" @@ -4078,7 +4250,7 @@ msgstr "Próximo escaneado" msgid "Nickname :" msgstr "Apodo:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Ningún país (SDK)" @@ -4117,7 +4289,7 @@ msgstr "No se encontró carpeta de guardado para el juego %s" msgid "None" msgstr "Ninguno" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Noruego Bokmal" @@ -4125,8 +4297,8 @@ msgstr "Noruego Bokmal" msgid "Not Equal" msgstr "No igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "No definido" @@ -4146,7 +4318,7 @@ msgstr "Sin conectar" msgid "Notes" msgstr "Notas" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notas:" @@ -4184,7 +4356,7 @@ msgstr "Objeto" 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" @@ -4210,11 +4382,11 @@ msgstr "Solo %d bloques disponibles" msgid "Open" msgstr "Abrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Abrir directorio &contenedor" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Abrir carpeta de guardado&s de Wii" @@ -4236,11 +4408,11 @@ 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:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "Descodificador de texturas OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "Descodificador de texturas OpenMP" @@ -4273,7 +4445,7 @@ msgstr "" "e impórtalos a una nueva tarjeta de memoria\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Otros" @@ -4325,19 +4497,20 @@ msgstr "Párrafo" msgid "Parameters" msgstr "Parámetros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partición %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Parches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Directorios" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4350,6 +4523,10 @@ msgstr "Directorios" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4358,7 +4535,7 @@ msgstr "Pausa" msgid "Per-Pixel Lighting" msgstr "Iluminación por píxel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfecto" @@ -4371,6 +4548,7 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4381,6 +4559,10 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Reproducir" @@ -4394,7 +4576,7 @@ msgstr "Reproducir grabación" msgid "Play/Pause" msgstr "Reproducir/pausa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Jugable" @@ -4406,6 +4588,7 @@ msgstr "Opciones de reproducción" msgid "Players" msgstr "Jugadores" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4415,6 +4598,9 @@ msgstr "Jugadores" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Confirma, por favor..." @@ -4426,23 +4612,23 @@ msgstr "Por favor, crea una perspectiva antes de guardar" msgid "Plus-Minus" msgstr "Más-menos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polaco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Puerto 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Puerto 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Puerto 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Puerto 4" @@ -4451,11 +4637,11 @@ msgstr "Puerto 4" msgid "Port :" msgstr "Puerto:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugués" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugués (Brasil)" @@ -4463,7 +4649,7 @@ msgstr "Portugués (Brasil)" msgid "Post-Processing Effect:" msgstr "Efecto de posprocesado:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" <<<<<<< HEAD @@ -4472,7 +4658,7 @@ msgstr "" msgstr "Final prematuro de la película en PlayController. %u + 8 > %u" >>>>>>> Update from master branch. -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" <<<<<<< HEAD @@ -4481,7 +4667,7 @@ msgstr "" msgstr "Final prematuro de la película en PlayWiimote. %u + %d > %u" >>>>>>> Update from master branch. -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" <<<<<<< HEAD @@ -4498,7 +4684,7 @@ msgstr "Predefinidos:" msgid "Prev Page" msgstr "Página previa" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Página previa" @@ -4549,7 +4735,7 @@ msgstr "R-Analógico" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSIA" @@ -4562,7 +4748,7 @@ msgstr "Rango" msgid "Read-only mode" msgstr "Solo lectura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Real" @@ -4637,6 +4823,7 @@ msgstr "Actualizar lista" msgid "Refresh game list" msgstr "Actualizar lista de juegos" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4655,6 +4842,12 @@ msgstr "Actualizar lista de juegos" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Eliminar" @@ -4707,11 +4900,11 @@ msgstr "Stick Derecho" msgid "Rumble" msgstr "Vibración" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: 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:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Ruso" @@ -4719,10 +4912,11 @@ msgstr "Ruso" msgid "Sa&ve State" msgstr "Guardar estado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4732,6 +4926,9 @@ msgstr "Seguro" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Frecuencia del sonido:" @@ -4789,12 +4986,12 @@ msgstr "Guardar estado 8" msgid "Save State..." msgstr "Guardar estado..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Guardar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Guardar GCM/ISO comprimido" @@ -4802,11 +4999,11 @@ msgstr "Guardar GCM/ISO comprimido" msgid "Save current perspective" msgstr "Guardar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Guardar GCM/ISO descomprimido" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4817,16 +5014,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "EFB Copia a escala" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 #, c-format msgid "Scanning %s" msgstr "Escaneando %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Buscando ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Escaneando..." @@ -4842,12 +5039,12 @@ msgstr "Bloq. desplazamiento" msgid "Search Filter" msgstr "Filtro de búsqueda" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Buscar en subcarpetas" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: 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 "No se ha encontrado la sección %s en SYSCONF" @@ -4857,6 +5054,7 @@ msgstr "No se ha encontrado la sección %s en SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4881,6 +5079,14 @@ msgstr "Seleccionar archivo de grabación" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Seleccionar archivo de grabación" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Elige un WAD de Wii para instalar" @@ -4906,16 +5112,21 @@ msgstr "Selecciona las ventanas flotantes" msgid "Select the file to load" msgstr "Selecciona el archivo para cargar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Selecciona el archivo de guardado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Selecciona el estado para cargar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4935,6 +5146,9 @@ msgstr "Selecciona el estado para cargar" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Selecciona el estado para guardar" @@ -4956,7 +5170,7 @@ msgstr "" "\n" "Si está inseguro, elija Automático." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Fuente seleccionada" @@ -5005,10 +5219,11 @@ msgstr "Posición de la barra sensora:" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbio" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 @@ -5018,6 +5233,9 @@ msgstr "Serbio" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -5028,11 +5246,11 @@ msgstr "" msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Definir como ISO por &defecto" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Definir como Memory Card por defecto %c" @@ -5044,7 +5262,7 @@ 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:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Configuración..." @@ -5056,7 +5274,7 @@ msgstr "SetupWiiMem: No se puede encontrar el archivo de configuración" msgid "Shake" msgstr "Sacudir" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Nombre corto:" @@ -5084,7 +5302,7 @@ msgstr "Mostrar barra de herramien&tas" msgid "Show Drives" msgstr "Mostrar unidades" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Mostrar regiones de copiado de EFB" @@ -5100,7 +5318,7 @@ msgstr "Mostrar Francia" msgid "Show GameCube" msgstr "Mostrar Gamecube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Mostrar entrada" @@ -5116,7 +5334,7 @@ msgstr "Mostrar JAP" msgid "Show Korea" msgstr "Mostrar Corea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Mostrar idioma:" @@ -5136,7 +5354,7 @@ msgstr "Mostrar plataformas" msgid "Show Regions" msgstr "Mostrar regiones" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Mostar estadísticas" @@ -5156,11 +5374,11 @@ msgstr "Mostrar WAD" 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 " @@ -5171,23 +5389,23 @@ msgstr "" "pero también significa que Dolphin puede cerrarse ante un error sin ninguna " "explicación." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Mostrar primer bloque" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Mostrar bloques de guardado" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Mostrar comentario del guardado" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Mostrar icono del guardado" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Mostrar título del guardado" @@ -5225,7 +5443,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote de costado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Chino simplificado" @@ -5233,11 +5451,11 @@ msgstr "Chino simplificado" msgid "Size" msgstr "Tamaño" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Saltar BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Saltar pase de alpha en dest." @@ -5303,11 +5521,11 @@ msgstr "" msgid "Slot %i" msgstr "Ranura %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Ranura A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Ranura B" @@ -5331,7 +5549,7 @@ msgstr "" "¿Realmente quieres activar renderizado por software? Si está inseguro, " "escoja No." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Configuración de sonido" @@ -5349,6 +5567,7 @@ msgstr "Falló la creación del búfer de sonido: %s" msgid "Space" msgstr "Espacio" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5364,6 +5583,11 @@ msgstr "Espacio" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Español" @@ -5395,7 +5619,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Especifica un motor de vídeo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Acelerar la transferencia de disco" @@ -5403,7 +5627,7 @@ msgstr "Acelerar la transferencia de disco" msgid "Square Stick" msgstr "Stick cuadrado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Control estándar" @@ -5504,12 +5728,12 @@ msgstr "Los archivos de guardado se han importado con éxito." msgid "Swing" msgstr "Oscilar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Idioma del sistema:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWÃN" @@ -5548,7 +5772,7 @@ msgstr "Tabla derecha" msgid "Take Screenshot" msgstr "Captura de pantalla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" <<<<<<< HEAD msgstr "" @@ -5568,7 +5792,7 @@ msgstr "Textura" msgid "Texture Cache" msgstr "Caché de texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Superposición del formato de la textura" @@ -5584,13 +5808,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:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 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:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5614,7 +5838,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:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "El archivo especificado (%s) no existe" @@ -5632,11 +5856,12 @@ 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:98 +#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" "Cuanto más seguro ajuste esto, es menos probable que el emulador se pierda " "las actualizaciones de la textura de la memoria RAM.\n" @@ -5681,7 +5906,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:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema visual" @@ -5689,7 +5914,7 @@ msgstr "Tema visual" 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:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5697,7 +5922,7 @@ msgstr "" "Debe haber un ticket para 00000001/00000002. Probablemente su volcado de " "NAND esté incompleto." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5713,7 +5938,7 @@ msgstr "" "El simulador de Action Replay no soporta códigos que modifiquen al Action " "Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: 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." @@ -5739,26 +5964,11 @@ msgstr "" "Si no está seguro, deje esta casilla sin marcar." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -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 "" -"Esto es utilizado para controlar la velocidad del juego por la del audio.\n" -"Deshabilitar esto puede causar velocidad de juego anormal, como muy rápido.\n" -"Pero a veces puede provocar ruido constante.\n" -"\n" -"Atajo de Teclado : Mantén la tecla presionada para desabilitar la " -"regulación instantáneamente." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" "Esto es usado para reproducir pistas de música, como música de fondo (BGM)." -#: 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" @@ -5770,7 +5980,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:283 +#: 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" @@ -5793,7 +6003,7 @@ msgstr "Título" msgid "To" msgstr "A" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Alternar todos los tipos de registro" @@ -5813,6 +6023,7 @@ msgstr "Cambiar a pantalla completa" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5820,14 +6031,17 @@ msgstr "Cambiar a pantalla completa" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Superior" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Chino tradicional" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Se trató de cargar un archivo de tipo desconocido." @@ -5835,7 +6049,7 @@ msgstr "Se trató de cargar un archivo de tipo desconocido." msgid "Triggers" msgstr "Gatillos" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Intentando leer de un SYSCONF no válido" @@ -5847,7 +6061,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:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turco" @@ -5868,11 +6082,11 @@ msgstr "Puerto UDP:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "DESCONOCIDO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "EUA" @@ -5957,7 +6171,7 @@ msgstr "Actualizar" msgid "Upright Wiimote" msgstr "Wiimote parado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar Modo EuRGB60 (PAL60)" @@ -5969,7 +6183,7 @@ msgstr "Usar pantalla completa" msgid "Use Hex" msgstr "Usar hexadecimal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Usar advertencias" @@ -6001,7 +6215,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Utilidad" @@ -6025,25 +6239,29 @@ msgstr "Valor:" msgid "Verbosity" msgstr "Verbosidad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Vídeo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volumen" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "La instalación del WAD falló: error al crear %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "La instalación del WAD falló: error al crear %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -6063,15 +6281,15 @@ msgstr "" msgid "Warning" msgstr "Advertencia" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 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:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Advertencia - arrancando un ELF en un modo de consola incorrecto!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Advertencia - arrancando un ISO en un modo de consola incorrecto!" @@ -6101,7 +6319,7 @@ msgstr "" "y tienen el mismo nombre que el archivo en tu memcard\n" "Continuar?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -6115,7 +6333,7 @@ msgstr "" "de continuar, o cargar éste sin el modo de solo lectura." >>>>>>> Update from master branch. -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -6130,7 +6348,7 @@ msgstr "" "obtenga una desincronización." >>>>>>> Update from master branch. -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -6176,7 +6394,7 @@ msgstr "WaveFileWriter - el archivo no está abierto." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Hack de pantalla ancha (widescreen)" @@ -6184,15 +6402,15 @@ msgstr "Hack de pantalla ancha (widescreen)" msgid "Width" msgstr "Ancho" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Raíz de la NAND de Wii:" @@ -6200,6 +6418,7 @@ msgstr "Raíz de la NAND de Wii:" msgid "Wii Save Import" msgstr "Importar guardado de Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -6209,6 +6428,9 @@ msgstr "Importar guardado de Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Archivos de guardado Wii (*.bin)|*.bin" @@ -6275,10 +6497,11 @@ msgstr "Windows Menú" msgid "Windows Right" msgstr "Windows Derecha" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6294,6 +6517,11 @@ msgstr "Word Wrap" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Trabajando..." @@ -6301,6 +6529,11 @@ msgstr "Trabajando..." msgid "Write to Console" msgstr "Escribir a la consola" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Escribir a archivo" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Escribir a archivo" @@ -6356,7 +6589,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:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Debes reiniciar Dolphin para que el cambio tenga efecto." @@ -6379,7 +6612,7 @@ msgstr "" "Debería ser 0x%04x (pero es 0x%04llx)\n" "¿Quiere crear uno nuevo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "Zelda TP hack" @@ -6450,7 +6683,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6483,12 +6716,12 @@ msgstr "" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "cmd 0x%08x desconocido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute dio un -1 al arrancar la aplicación!" @@ -6697,6 +6930,9 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "Configuración de la visualización del Emulador" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Habilitar aceleración de audio" + #~ msgid "Enable CPU Access" #~ msgstr "Habilitar acceso a la CPU" @@ -6754,6 +6990,13 @@ msgstr "| OR" #~ msgid "Error allocating buffer" #~ msgstr "Error al asignar el búfer" +#~ msgid "" +#~ "Error in PlayWiimote. %u != %u, byte %d.\n" +#~ "Sorry, Wii recording is temporarily broken." +#~ msgstr "" +#~ "Error en PlayWiimote. %u != %u, byte %d.\n" +#~ "Disculpa, la grabación de Wii no funciona temporalmente." + #~ msgid "Error loading %s: can't read info" #~ msgstr "Error al cargar %s: no se puede leer la información" @@ -7035,6 +7278,22 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "El archivo " +#~ 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 "" +#~ "Esto es utilizado para controlar la velocidad del juego por la del " +#~ "audio.\n" +#~ "Deshabilitar esto puede causar velocidad de juego anormal, como muy " +#~ "rápido.\n" +#~ "Pero a veces puede provocar ruido constante.\n" +#~ "\n" +#~ "Atajo de Teclado : Mantén la tecla presionada para desabilitar la " +#~ "regulación instantáneamente." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Esto es usado comunmente para reproducir voces y efectos de sonido." diff --git a/Languages/po/fa.po b/Languages/po/fa.po index e73a5c95ba..f643a327a3 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: 2011-12-18 13:39-0600\n" +"POT-Creation-Date: 2012-03-09 16:54-0600\n" "PO-Revision-Date: 2011-12-18 14:00-0600\n" "Last-Translator: Hamed Khakbiz \n" "Language-Team: Hamed Khakbiz \n" @@ -49,9 +49,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "" @@ -136,7 +136,7 @@ msgstr "%sصادر کردن GCI%s" msgid "%sImport GCI%s" msgstr "%sوارد کردن GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" @@ -169,11 +169,11 @@ msgstr "&مدریت کدهای تقلب" msgid "&DSP Settings" msgstr "&تنظیمات صدا DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&پاک کردن Ùایل ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&پاک کردن Ùایل ISO انطخاب شده" @@ -237,7 +237,7 @@ msgstr "Ù…Ú©Ø«" msgid "&Play" msgstr "&شروع بازی" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "خواص" @@ -281,7 +281,7 @@ msgstr "&دیدن" msgid "&Wiimote Settings" msgstr "&تنظیمات Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&ویکی" @@ -325,7 +325,7 @@ msgstr "<اسم را اینجا وارد کنید>" msgid "" msgstr "<سایز تصویر پیدا نشد>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "<هیچ>" @@ -334,7 +334,7 @@ msgstr "<هیچ>" msgid "" msgstr "<Ùشار کلید>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<سیستم>" @@ -373,13 +373,13 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "کدهای اکشن ریپلی" @@ -391,11 +391,11 @@ msgstr "درباره دلÙین" msgid "Acceleration" msgstr "شتاب دهنده" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "دقت" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "" @@ -495,11 +495,11 @@ msgstr "آداپتور" msgid "Add" msgstr "اضاÙÙ‡ کردن" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "اضاÙÙ‡ کردن کد اکشن ریپلی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "اضاÙÙ‡ کردن وصله" @@ -507,9 +507,9 @@ msgstr "اضاÙÙ‡ کردن وصله" msgid "Add new pane" msgstr "اضاÙÙ‡ کردن تکه جدید" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "اضاÙÙ‡ کردن..." @@ -543,11 +543,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "پیشرÙته" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "تنظیمات پیشرÙته" @@ -555,28 +555,28 @@ msgstr "تنظیمات پیشرÙته" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "تمام اسناد Wii ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "تمام اسناد Ùشرده شده GC/Wii ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "تمام اسناد (*.*)|*.*" @@ -588,7 +588,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Alternate Wiimote Timing" msgstr "" @@ -608,7 +608,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "" @@ -623,7 +623,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "عربی" @@ -632,17 +632,17 @@ msgstr "عربی" msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "نصبت طول به عرض تصویر:" @@ -651,19 +651,20 @@ msgstr "نصبت طول به عرض تصویر:" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "صدا" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "پشتوانه صدا" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "اتوماتیک" @@ -699,7 +700,7 @@ msgstr "" msgid "Back" msgstr "برگشت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "تنضیمات پشتوانه" @@ -726,11 +727,11 @@ msgstr "" msgid "Banner" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "" @@ -742,7 +743,7 @@ msgstr "نوار" msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "" @@ -771,7 +772,7 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "پائین" @@ -780,7 +781,7 @@ msgstr "پائین" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "خراب" @@ -796,7 +797,7 @@ msgstr "جوستجو پوشه برای اضاÙÙ‡ کردن" msgid "Browse for an ISO directory..." msgstr "جوستجو برای پوشه ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "جوستجو برای پوشه خروجی" @@ -818,11 +819,11 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "موتور جوستجو پردازشگر" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "" @@ -861,7 +862,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -869,7 +870,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -885,8 +886,6 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -896,7 +895,7 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -921,7 +920,7 @@ msgstr "تغییر دیسک" msgid "Change Game" msgstr "تغییر بازی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -937,8 +936,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: 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 "این تغییر در زمانی Ú©Ù‡ شبیه ساز در حال کار Ù…ÛŒ باشد اثری نخواهد داشت!" @@ -958,31 +957,31 @@ msgstr "جوستجو برای کد تقلب" msgid "Cheats Manager" msgstr "مدریت کدهای تقلب" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "چینی (ساده شده)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "چینی (سنتی)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "انتخاب پوشه برای DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "انتخاب پوشه برای NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "انتخاب ISO پیش Ùرز:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "انتخاب پوشه برای اضاÙÙ‡ کردن" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "انتخاب سند برای باز کردن" @@ -990,14 +989,14 @@ msgstr "انتخاب سند برای باز کردن" msgid "Choose a memory card:" msgstr "انتخاب کارت حاÙظه:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: 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:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "انتخاب پوشه برای استخراج در آن" @@ -1009,14 +1008,14 @@ msgstr "" msgid "Classic" msgstr "کلاسیک" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "پاک کردن" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "پاک کردن با شکست مواجه شد." @@ -1028,8 +1027,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 msgid "Close" msgstr "بستن" @@ -1053,20 +1052,20 @@ msgstr "دستور" msgid "Comment" msgstr "توضیح" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "توضیح:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Ùشرده کردن ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Ùشرده کردن ISO انتخاب شده..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "در حال Ùشرده کردن ISO" @@ -1093,13 +1092,13 @@ msgstr "پیکربندی گیم پدها" msgid "Configure..." msgstr "پیکربندی..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "تائید بازنویسی سند" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "تائید برای توقÙ" @@ -1108,7 +1107,7 @@ msgstr "تائید برای توقÙ" msgid "Connect" msgstr "اتصال" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "اتصال کیبورد USB" @@ -1157,12 +1156,12 @@ msgstr "تبدیل به GCI" msgid "Copy failed" msgstr "Ú©Ù¾ÛŒ با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Ú©Ù¾ÛŒ به کارت حاÙظه %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "هسته" @@ -1189,7 +1188,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "" @@ -1200,7 +1199,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1209,7 +1208,7 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "" @@ -1224,7 +1223,7 @@ msgstr "" msgid "Count:" msgstr "شماردن:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "کشور:" @@ -1238,24 +1237,24 @@ msgstr "ساخت کد اکشن ریپلی" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 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:498 msgid "Created by VistaIcons.com" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "سازنده:" @@ -1263,7 +1262,7 @@ msgstr "سازنده:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "حذ٠قسمتى تصوير" @@ -1283,7 +1282,7 @@ msgstr "ضرب دری" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "" @@ -1291,11 +1290,11 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "چکوسلواکی" @@ -1307,24 +1306,24 @@ msgstr "" msgid "DSP" msgstr "صدا DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "موتور شبیه ساز صدا DSP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "" @@ -1332,15 +1331,23 @@ msgstr "" msgid "DSP settings" msgstr "تنظیمات صدا DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" 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 "" + +#: 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:176 msgid "Data Size" msgstr "سایزه داده" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "تاریخ:" @@ -1361,7 +1368,7 @@ msgstr "" msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "" @@ -1369,16 +1376,16 @@ msgstr "" msgid "Decimal" msgstr "دسیمال" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "ناهمÙشرده کردن ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "ناهمÙشرده کردن ISO انتخاب شده..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "در حال ناهمÙشرده کردن ISO" @@ -1386,11 +1393,11 @@ msgstr "در حال ناهمÙشرده کردن ISO" msgid "Default" msgstr "پیش Ùرز" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr ":ISO پیش Ùرز" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "دست خط پیش Ùرز" @@ -1399,7 +1406,7 @@ msgstr "دست خط پیش Ùرز" msgid "Delete" msgstr "پاک کردن" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "پاک کردن Save" @@ -1408,7 +1415,7 @@ msgstr "پاک کردن Save" msgid "Delete the existing file '%s'?" msgstr "آیا سند موجود پاک شود '%s'ØŸ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "شرح" @@ -1416,8 +1423,8 @@ msgstr "شرح" msgid "Detect" msgstr "شناسایی" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: 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." @@ -1428,8 +1435,8 @@ msgstr "" msgid "Device" msgstr "دستگاه" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "تنظیمات دستگاه" @@ -1452,23 +1459,23 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "غیر Ùعال" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "" @@ -1498,7 +1505,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "دیسک" @@ -1522,11 +1529,11 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "دلÙین" @@ -1551,12 +1558,12 @@ msgstr "پیکربندی Wiimote شبیه سازی شده دلÙین" msgid "Dolphin FIFO" msgstr "دلÙین FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "پیکربندی GCPad دلÙین" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 msgid "Dolphin TAS Movies (*.dtm)" msgstr "دلÙین TAS Movies (*.dtm)" @@ -1589,11 +1596,11 @@ msgstr "" msgid "Down" msgstr "پائین" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "دانلود کدها (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "کدهای %lu دانلود شده. (added %lu)" @@ -1602,23 +1609,23 @@ msgstr "کدهای %lu دانلود شده. (added %lu)" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "نسخه بردارى صدا" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "نسخه بردارى Ùریم" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "" @@ -1643,9 +1650,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "هلندی" @@ -1666,7 +1673,7 @@ msgid "" "driver." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "اوروپا" @@ -1682,7 +1689,7 @@ msgstr "ویرایش" msgid "Edit ActionReplay Code" msgstr "ویریش کدهای اکشن ریپلی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "ویرایش پيکربندى" @@ -1694,8 +1701,8 @@ msgstr "ویرایش وصله" msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "ویرایش..." @@ -1734,7 +1741,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "" @@ -1756,19 +1763,15 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable Bounding Box Calculation" msgstr "" @@ -1776,52 +1779,52 @@ msgstr "" msgid "Enable Cache" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "Ùعال کردن کدهای تقلب" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Ùعال کردن موزیک DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Ùعال کردن پردانده با دو هسته یا بیشتر" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Ùعال کردن پردانده با دو هسته یا بیشتر (بالا بردن سرعت)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Ùعال کردن شرت کاتها" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "" @@ -1834,13 +1837,13 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: 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:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "" @@ -1860,20 +1863,20 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: 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:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "" @@ -1885,7 +1888,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -1902,9 +1905,9 @@ msgstr "" msgid "End" msgstr "پایان" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "انگلیسی" @@ -1933,29 +1936,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "خطا" -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -1987,7 +1983,7 @@ msgstr "خروج دلÙین با شبیه ساز" msgid "Export Failed" msgstr "صادر کردن با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "صادر کردن سند" @@ -2000,15 +1996,15 @@ msgstr "صادر کردن ضبط" msgid "Export Recording..." msgstr "صادر کردن ضبط..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "صادر کردن Save" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "صادر کردن Wii save (آزمایشی)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "صادر کردن تمام Save ها" @@ -2024,7 +2020,7 @@ msgstr "صادر کردن Save با عنوان..." msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "" @@ -2036,44 +2032,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "استخراج کردن تمامی اسناد..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "استخراج کردن Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "استخراج کردن DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "استخراج کردن پوشه..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "استخراج کردن سند..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "استخراج کردن پارتیشن..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "استخراج کردن %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "استخراج کردن تمامی اسناد" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "استخراج کردن پوشه" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "استخراج کردن..." @@ -2085,11 +2081,11 @@ msgstr "" msgid "FIFO Player" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "Ùرانسه" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "" @@ -2101,11 +2097,11 @@ msgstr "اتصال با شکست مواجه شد!" msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "دانلود کدها با شکست مواجه شد." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2201,18 +2197,28 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "سریع" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "" @@ -2221,7 +2227,7 @@ msgstr "" msgid "File Info" msgstr "مشخصات سند" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "" @@ -2250,16 +2256,16 @@ msgstr "" msgid "File not compressed" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2267,7 +2273,7 @@ msgstr "" msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "" @@ -2279,7 +2285,7 @@ msgstr "" msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "" @@ -2303,7 +2309,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 " @@ -2334,7 +2340,7 @@ msgstr "" msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "" @@ -2346,7 +2352,7 @@ msgstr "" msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "" @@ -2354,13 +2360,13 @@ msgstr "" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "Ùرانسوی" @@ -2394,7 +2400,7 @@ msgstr "تنضیمات ثبت وقايع" msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "" @@ -2410,15 +2416,15 @@ msgstr "" msgid "Game not found!!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "" @@ -2427,7 +2433,7 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2436,20 +2442,22 @@ msgid "Gamecube Pad settings" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "" -#: Source/Core/Core/Src/GeckoCode.cpp:139 +#: Source/Core/Core/Src/GeckoCode.cpp:222 #, 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.)" +"(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 "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Ú©Ù„ÛŒ" @@ -2458,9 +2466,9 @@ msgstr "Ú©Ù„ÛŒ" msgid "General Settings" msgstr "تنظیمات Ú©Ù„ÛŒ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "" @@ -2492,7 +2500,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "یونانی" @@ -2524,7 +2532,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "" @@ -2576,11 +2584,11 @@ msgstr "پیگربندی شرت کات" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "کاتها" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "مجارستانی" @@ -2588,12 +2596,12 @@ msgstr "مجارستانی" msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2602,11 +2610,11 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "" @@ -2622,15 +2630,15 @@ msgstr "" msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "جزئیات ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "پوشه های ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ايتاليا" @@ -2638,21 +2646,22 @@ msgstr "ايتاليا" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: 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:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 msgid "" -"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." +"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:432 @@ -2677,7 +2686,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr " وارد کردن Save" @@ -2716,7 +2725,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "در بازی" @@ -2725,7 +2734,7 @@ msgid "In-Game" msgstr "در-بازی" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "مشخصات" @@ -2745,7 +2754,7 @@ msgstr "درج" msgid "Insert Encrypted or Decrypted code here..." msgstr "درج کد رمز شده Ùˆ یا کش٠رمز..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "درج کارت SD" @@ -2757,7 +2766,7 @@ msgstr "درج اسم..." msgid "Install WAD" msgstr "نصب WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "نصب به منوی Wii" @@ -2766,15 +2775,15 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 msgid "Installing WAD..." msgstr "در حال نصب WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "" @@ -2797,11 +2806,11 @@ msgstr "" msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "" @@ -2818,7 +2827,7 @@ msgstr "مقدار نا معتبر" msgid "Invalid bat.map or dir entry" msgstr "bat.map نا معتبر یا ورودی پوشه" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "واقعه نا معتبر %i" @@ -2835,38 +2844,38 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "سند ضبط نا معتبر" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "وضیعت نا معتبر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "ایتالیائی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "ژاپن" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "ژاپنی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "کره" @@ -2875,8 +2884,8 @@ msgstr "کره" msgid "Key" msgstr "کلید" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "کره ای" @@ -2894,7 +2903,7 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "زبان:" @@ -2940,7 +2949,7 @@ msgstr "" msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -2948,7 +2957,7 @@ msgstr "" msgid "Load" msgstr "بارگیری" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "بارگیری Texture دلخواه" @@ -2996,11 +3005,11 @@ msgstr "بارگیری State شکا٠۸" msgid "Load State..." msgstr "بارگیری State..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3024,7 +3033,7 @@ msgstr "" msgid "Local" msgstr "محلی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "" @@ -3036,11 +3045,11 @@ msgstr "ثبت وقايع" msgid "Log Configuration" msgstr "تنضیمات ثبت وقايع" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "نوع ثبت وقايع" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "خروجی ثبت وقايع" @@ -3068,7 +3077,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "" @@ -3082,11 +3091,11 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "" @@ -3108,7 +3117,7 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Memory Card" msgstr "کارت حاÙظه" @@ -3137,7 +3146,7 @@ msgstr "" msgid "Menu" msgstr "Ùهرست انتخاب" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "میکروÙÙ†" @@ -3146,11 +3155,11 @@ msgstr "میکروÙÙ†" msgid "Min" msgstr "حداقل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "متÙرقه" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "تنظیمات متÙرقه" @@ -3167,7 +3176,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "" @@ -3180,7 +3189,7 @@ msgstr "" msgid "Motor" msgstr "موتور" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3195,7 +3204,7 @@ msgstr "" msgid "Multiply" msgstr "ضریب" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3285,7 +3294,7 @@ msgstr "" msgid "NP Up" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3294,7 +3303,7 @@ msgstr "اسم:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "اسم:" @@ -3308,7 +3317,7 @@ msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "صÙحه بعد" @@ -3320,7 +3329,7 @@ msgstr "" msgid "Nickname :" msgstr "اسم مستعار" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "" @@ -3359,7 +3368,7 @@ msgstr "" msgid "None" msgstr "هیچکدام" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "" @@ -3367,8 +3376,8 @@ msgstr "" msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "" @@ -3380,7 +3389,7 @@ msgstr "" msgid "Notes" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "" @@ -3418,7 +3427,7 @@ msgstr "شیی" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "خاموش" @@ -3437,11 +3446,11 @@ msgstr "" msgid "Open" msgstr "گشودن" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "" @@ -3463,11 +3472,11 @@ msgstr "" msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -3496,7 +3505,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "غیره" @@ -3546,21 +3555,21 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "وصله ها" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "مسیرها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Ù…Ú©Ø«" @@ -3569,7 +3578,7 @@ msgstr "Ù…Ú©Ø«" msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "کامل" @@ -3580,8 +3589,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 msgid "Play" msgstr "شروع بازی" @@ -3595,7 +3604,7 @@ msgstr "شروع ضبط" msgid "Play/Pause" msgstr "شروع بازی/Ù…Ú©Ø«" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "قابل بازی" @@ -3607,7 +3616,7 @@ msgstr "" msgid "Players" msgstr "بازی کنان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 msgid "Please confirm..." msgstr "لطÙا تایید کنید..." @@ -3619,23 +3628,23 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "لهستانی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "درگاه Û±" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "درگاه Û²" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "درگاه Û³" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "درگاه Û´" @@ -3644,11 +3653,11 @@ msgstr "درگاه Û´" msgid "Port :" msgstr "درگاه :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "پرتقال" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "پرتقال" @@ -3656,17 +3665,17 @@ msgstr "پرتقال" msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3679,7 +3688,7 @@ msgstr "حالت های از پيش تنظيم شده" msgid "Prev Page" msgstr "صÙحه قبلی" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "صÙحه قبلی" @@ -3730,7 +3739,7 @@ msgstr "" msgid "RAM" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "روسیه" @@ -3743,7 +3752,7 @@ msgstr "محدوده" msgid "Read-only mode" msgstr "حالت Ùقط خواندنی" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "واقعی" @@ -3814,10 +3823,10 @@ msgstr "به روز کردن لیست" msgid "Refresh game list" msgstr "به روز کردن لیست بازی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "پاک کردن" @@ -3860,11 +3869,11 @@ msgstr "" msgid "Rumble" msgstr "شوک" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "روسی" @@ -3872,11 +3881,11 @@ msgstr "روسی" msgid "Sa&ve State" msgstr "ذخ&یره State" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "بی خطر" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "نرخ نمونه برداری صدا" @@ -3934,12 +3943,12 @@ msgstr "ذخیره State شکا٠۸" msgid "Save State..." msgstr "ذخیره State..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "ذخیره با عنوان" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "ذخیره GCM/ISO Ùشرده" @@ -3947,11 +3956,11 @@ msgstr "ذخیره GCM/ISO Ùشرده" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "ذخیره GCM/ISO ناهمÙشرده" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -3960,16 +3969,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 #, c-format msgid "Scanning %s" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "" @@ -3985,12 +3994,12 @@ msgstr "" msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: 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 "" @@ -4000,12 +4009,12 @@ msgstr "" msgid "Select" msgstr "انتخاب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "انتخاب سند ضبط شده" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 msgid "Select a Wii WAD file to install" msgstr "انتخاب سند Wii WAD برای نصب" @@ -4028,15 +4037,15 @@ msgstr "انتخاب پنجره شناور" msgid "Select the file to load" msgstr "انتخاب سند برای بارگیری" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 msgid "Select the save file" msgstr "انتخاب سند Save" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "انتخاب State برای بارگیری" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 msgid "Select the state to save" msgstr "انتخاب State برای ذخیره" @@ -4051,7 +4060,7 @@ msgid "" "If unsure, select Auto." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "دست خط انتخاب شده" @@ -4087,11 +4096,11 @@ msgstr "" msgid "Separator" msgstr "جدا کننده" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "صربستانی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4100,11 +4109,11 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "" @@ -4114,7 +4123,7 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "تنظیمات" @@ -4126,7 +4135,7 @@ msgstr "" msgid "Shake" msgstr "لرزش" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "اسم کوتاه:" @@ -4155,7 +4164,7 @@ msgstr "نمایش &نوار ابزار" msgid "Show Drives" msgstr "نمایش درایوها" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "نمایش منطقه Ú©Ù¾ÛŒ EFB" @@ -4171,7 +4180,7 @@ msgstr "نمایش Ùرانسه" msgid "Show GameCube" msgstr "نمایش GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "نمایش ورودی تصویر" @@ -4187,7 +4196,7 @@ msgstr "نمایش ژاپن" msgid "Show Korea" msgstr "نمایش کره" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "نمایش زبان:" @@ -4207,7 +4216,7 @@ msgstr "نمایش پایگاه" msgid "Show Regions" msgstr "نمایش منطقه" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "نمایش آمار" @@ -4227,34 +4236,34 @@ msgstr "نمایش Wad" 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:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "" @@ -4285,7 +4294,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "چینی ساده شده" @@ -4293,11 +4302,11 @@ msgstr "چینی ساده شده" msgid "Size" msgstr "سایز" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -4329,11 +4338,11 @@ msgstr "" msgid "Slot %i" msgstr "شکا٠%i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "شکا٠A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "شکا٠B" @@ -4353,7 +4362,7 @@ 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:621 msgid "Sound Settings" msgstr "تنضیمات صدا" @@ -4371,9 +4380,9 @@ msgstr "" msgid "Space" msgstr "Ùضا" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "اسپانیائی" @@ -4397,7 +4406,7 @@ msgstr "" msgid "Specify a video backend" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4405,7 +4414,7 @@ msgstr "" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "" @@ -4483,12 +4492,12 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "" @@ -4521,7 +4530,7 @@ msgstr "" msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -4537,7 +4546,7 @@ msgstr "" msgid "Texture Cache" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "" @@ -4553,13 +4562,13 @@ msgstr "آدرس بی اعتبار است" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -4578,7 +4587,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -4600,7 +4609,7 @@ msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -4638,7 +4647,7 @@ msgstr "" msgid "The value is invalid" msgstr "مقدار بی اعتبار است" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "" @@ -4646,13 +4655,13 @@ msgstr "" msgid "Theme selection went wrong" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -4664,7 +4673,7 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" @@ -4680,19 +4689,10 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -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 "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." 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" @@ -4700,7 +4700,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" @@ -4723,7 +4723,7 @@ msgstr "عنوان" msgid "To" msgstr "به" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "" @@ -4734,15 +4734,15 @@ msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "اوج" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "چینی سنتی" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "" @@ -4750,7 +4750,7 @@ msgstr "" msgid "Triggers" msgstr "" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "" @@ -4760,7 +4760,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "ترکی" @@ -4781,11 +4781,11 @@ msgstr "" msgid "UDP Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "ناشناخته" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "آمریکا" @@ -4850,7 +4850,7 @@ msgstr "به روز کردن" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -4862,7 +4862,7 @@ msgstr "" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "" @@ -4883,7 +4883,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "کاربردی" @@ -4907,25 +4907,28 @@ msgstr "مقدار:" msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "ویدیو" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "مجازی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "حجم صدا" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +msgid "WAD installation failed: error creating ticket" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -4940,15 +4943,15 @@ msgstr "" msgid "Warning" msgstr "اختار" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "" @@ -4969,7 +4972,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -4977,7 +4980,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -4985,7 +4988,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5013,7 +5016,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "" @@ -5021,15 +5024,15 @@ msgstr "" msgid "Width" msgstr "عرض" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "ميز Ùرمان Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "ریشه Wii NAND:" @@ -5037,7 +5040,7 @@ msgstr "ریشه Wii NAND:" msgid "Wii Save Import" msgstr "وارد کردن Wii Save" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 msgid "Wii save files (*.bin)|*.bin" msgstr "سند Wii save (*.bin)|*.bin" @@ -5093,13 +5096,13 @@ msgstr "" msgid "Windows Right" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 msgid "Working..." msgstr "در حال کار کردن..." @@ -5107,6 +5110,10 @@ msgstr "در حال کار کردن..." msgid "Write to Console" msgstr "" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +msgid "Write to Debugger" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "" @@ -5160,7 +5167,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5178,7 +5185,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "" @@ -5232,7 +5239,7 @@ msgstr "" msgid "^ ADD" msgstr "^ اضاÙÙ‡ کردن" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "" @@ -5263,12 +5270,12 @@ msgstr "" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/fr.po b/Languages/po/fr.po index d5f462ae2c..f50163bd39 100644 --- a/Languages/po/fr.po +++ b/Languages/po/fr.po @@ -10,7 +10,11 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-10-28 23:40+0100\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -69,9 +73,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sCopie%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -166,7 +170,7 @@ msgstr "%sExporter GCI%s" msgid "%sImport GCI%s" msgstr "%sImporter GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u blocs libres, %u entrées de rép. libres" @@ -199,11 +203,11 @@ msgstr "Gestionnaire de &cheats" msgid "&DSP Settings" msgstr "Paramètres &DSP (audio)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Supprimer l'ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Supprimer les ISO sélectionnés" @@ -267,7 +271,7 @@ msgstr "&Pause" msgid "&Play" msgstr "&Démarrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Propriétés" @@ -311,7 +315,7 @@ msgstr "&Affichage" msgid "&Wiimote Settings" msgstr "Paramètres de la &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -355,7 +359,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -364,7 +368,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -421,13 +425,13 @@ msgstr "" "\n" "Vous devez indiquer le port TCP à l'hôte !!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Codes AR" @@ -439,11 +443,11 @@ msgstr "A propos de Dolphin" msgid "Acceleration" msgstr "Accéleration" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "Précision :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulation fidèle VBeam" @@ -570,11 +574,11 @@ msgstr "Carte :" msgid "Add" msgstr "Ajouter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Ajouter un code ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Ajouter un patch" @@ -585,6 +589,7 @@ msgstr "Ajouter un nouveau panneau" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 @@ -603,6 +608,11 @@ msgstr "Ajouter un nouveau panneau" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Ajouter..." @@ -651,11 +661,11 @@ 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:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Avancé" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Paramètres avancés" @@ -663,17 +673,18 @@ msgstr "Paramètres avancés" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Tous les fichiers GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Toutes les images GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Tous les fichiers GameCube GCM (gcm)" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ======= @@ -688,18 +699,22 @@ msgstr "Tous les fichiers GameCube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tous les états sauvegardés (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Tous les fichiers ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tous les fichiers ISO compressés GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Tous les fichiers (*.*)|*.*" @@ -715,6 +730,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD <<<<<<< HEAD @@ -726,6 +742,9 @@ msgid "Alternate Wiimote Timing" msgstr "Wiimote émulée" >>>>>>> Update translation files for recent changes in the code. ======= +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Délai alternatif de communication avec la Wiimote" >>>>>>> Update french translation. @@ -746,7 +765,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:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader :" @@ -765,7 +784,7 @@ msgstr "" "\n" "Dans le doute, sélectionnez (aucun)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arabe" @@ -774,7 +793,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -782,7 +801,7 @@ msgstr "" "Êtes-vous sûr de vouloir supprimer ces fichiers ?\n" "Ils seront définitivement supprimés !" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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é " @@ -791,6 +810,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 @@ -801,6 +821,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Format d'écran :" @@ -809,21 +832,23 @@ 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:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Moteur audio :" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 @@ -834,6 +859,9 @@ msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -878,7 +906,7 @@ msgstr "" msgid "Back" msgstr "Retour" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Paramètres de l'interface audio" @@ -905,11 +933,11 @@ msgstr "Mauvaise entête de fichier" msgid "Banner" msgstr "Bannière" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Détails de la bannière" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Bannière :" @@ -921,7 +949,7 @@ msgstr "Barre" msgid "Basic" msgstr "Paramètres de base" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Paramètres de base" @@ -955,6 +983,7 @@ msgstr "Bleu Droite" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -965,6 +994,9 @@ msgstr "Bleu Droite" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Bas" @@ -973,7 +1005,7 @@ msgstr "Bas" msgid "Bound Controls: %lu" msgstr "Contrôles liés : %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Corrompu" @@ -989,7 +1021,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:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Parcourir un dossier de destination" @@ -1023,11 +1055,11 @@ msgstr "Stick-C" msgid "C-Stick" msgstr "Stick-C" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Moteur d'émulation du CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Cache des listes d'affichage" @@ -1081,7 +1113,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:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1092,7 +1124,7 @@ msgstr "" "%s\n" "n'est pas un fichier de carte mémoire GameCube valide." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1111,8 +1143,6 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "Impossible de trouver la Wiimote par le gestionnaire de connexion %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1123,7 +1153,7 @@ msgstr "" msgid "Caps Lock" msgstr "Verr Maj" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Catalan" @@ -1148,7 +1178,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:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1164,8 +1194,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:506 #: 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 !" @@ -1185,31 +1215,31 @@ msgstr "Rechercher un cheat" msgid "Cheats Manager" msgstr "Gestionnaire de Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinois (simplifié)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinois (traditionnel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: 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:762 +#: 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:755 +#: 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:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Choisir un dossier à ajouter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Choisir un fichier à ouvrir" @@ -1220,6 +1250,7 @@ msgstr "Choisir une carte mémoire :" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 @@ -1231,6 +1262,9 @@ msgstr "Choisir une carte mémoire :" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1245,8 +1279,8 @@ msgstr "Choisir un fichier comme apploader : (uniquement pour les disques créé ======= >>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: 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" @@ -1258,14 +1292,14 @@ msgstr "Stick circulaire" msgid "Classic" msgstr "Classique" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Effacer" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Echec de l'éffacement" @@ -1282,6 +1316,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1293,6 +1328,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Fermer" @@ -1316,20 +1355,20 @@ msgstr "Commande" msgid "Comment" msgstr "Commentaire" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Commentaire :" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Compresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Compresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Compression de l'ISO" @@ -1356,13 +1395,13 @@ msgstr "Configurer les manettes" msgid "Configure..." msgstr "Configurer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Confirmer l'écrasement du fichier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Confirmer l'arrêt de l'émulation" @@ -1371,7 +1410,7 @@ msgstr "Confirmer l'arrêt de l'émulation" msgid "Connect" msgstr "Connecter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Connecter le clavier USB" @@ -1432,12 +1471,12 @@ msgstr "Convertir en GCI" msgid "Copy failed" msgstr "Echec de la copie" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Copier vers la carte mémoire %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Core" @@ -1468,7 +1507,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Impossible de reconnaître le fichier ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Impossible de sauvegarder %s" @@ -1483,7 +1522,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:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1496,7 +1535,7 @@ 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:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Impossible de trouver la commande d'ouverture pour l'extension 'ini' !" @@ -1513,7 +1552,7 @@ msgstr "" msgid "Count:" msgstr "Nombre :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Pays :" @@ -1527,13 +1566,14 @@ 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:500 msgid "Created by KDE-Look.org" msgstr "Créé par KDE-Look.org" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 @@ -1545,6 +1585,9 @@ msgstr "Créé par KDE-Look.org" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1557,15 +1600,15 @@ msgstr "Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com ======= >>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Créé par VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 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:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Créateur :" @@ -1573,7 +1616,7 @@ msgstr "Créateur :" msgid "Critical" msgstr "Critique" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Couper" @@ -1596,7 +1639,7 @@ msgstr "Crossfade" 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:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Hack de projection personnalisé" @@ -1604,11 +1647,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:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Personnalise certains paramètres de projection orthographique." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Tchèque" @@ -1620,10 +1663,11 @@ msgstr "Pad numérique" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Moteur d'émulation du DSP (Audio)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1638,18 +1682,22 @@ msgstr "Moteur d'émulation du DSP (Audio)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulation du DSP en HLE (rapide)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: 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:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE sur thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "Recompilateur du DSP en LLE" @@ -1657,15 +1705,23 @@ msgstr "Recompilateur du DSP en LLE" msgid "DSP settings" msgstr "Paramètres DSP (audio)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Racine du DVD :" +#: 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:176 msgid "Data Size" msgstr "Taille des données" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Date :" @@ -1686,7 +1742,7 @@ msgstr "Zone morte" msgid "Debug" msgstr "Débug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Débug" @@ -1694,16 +1750,16 @@ msgstr "Débug" msgid "Decimal" msgstr "Décimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Décompresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Décompresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Décompression de l'ISO" @@ -1711,11 +1767,11 @@ msgstr "Décompression de l'ISO" msgid "Default" msgstr "Par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ISO par défaut :" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Police par défaut" @@ -1724,7 +1780,7 @@ msgstr "Police par défaut" msgid "Delete" msgstr "Supprimer" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Supprimer la sauvegarde" @@ -1733,7 +1789,7 @@ msgstr "Supprimer la sauvegarde" msgid "Delete the existing file '%s'?" msgstr "Supprimer le fichier '%s' ?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Description" @@ -1741,8 +1797,8 @@ msgstr "Description" msgid "Detect" msgstr "Détecter" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: 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." @@ -1755,8 +1811,8 @@ msgstr "" msgid "Device" msgstr "Appareil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Paramètres de la console virtuelle" @@ -1781,23 +1837,23 @@ msgstr "" " et la vérification de la somme de contrôle du dossier de sauvegarde a échoué" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Désactiver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Désactiver la fumée" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Désactiver l'éclairage" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Désactiver la profondeur / pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Désactiver les textures" @@ -1841,7 +1897,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disque" @@ -1871,6 +1927,7 @@ msgstr "Diviser" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 @@ -1881,10 +1938,13 @@ msgstr "Diviser" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Voulez-vous arrêter l'émulation en cours ?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1912,6 +1972,7 @@ msgstr "Dolphin FIFO" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Configuration de la manette GC pour Dolphin" @@ -1942,6 +2003,14 @@ msgstr "Configuration de la manette GC pour Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +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:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Films TAS Dolphin (*.dtm)" @@ -2012,11 +2081,11 @@ msgstr "Dolphin est paramétré pour cacher tous les jeux. Double-cliquez ici po msgid "Down" msgstr "Bas" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Télécharger des codes (base de données WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu codes ont été téléchargés. (%lu ajoutés)" @@ -2025,23 +2094,23 @@ msgstr "%lu codes ont été téléchargés. (%lu ajoutés)" msgid "Drums" msgstr "Percussions" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Factice" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Enregistrer le son" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Copier l'EFB cible" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Copier les images" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Copier les textures" @@ -2079,6 +2148,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 @@ -2097,6 +2167,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Néerlandais" @@ -2121,7 +2196,7 @@ msgstr "" "distribution de Dolphin, un redémarrage est probablement nécessaire pour que " "Windows charge le nouveau pilote." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "Europe" @@ -2137,7 +2212,7 @@ msgstr "Editer" msgid "Edit ActionReplay Code" msgstr "Editer le code ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Editer la configuration" @@ -2149,8 +2224,8 @@ msgstr "Editer le patch" msgid "Edit current perspective" msgstr "Modifier la perspective actuelle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Editer..." @@ -2200,7 +2275,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wiimote émulée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Etat de l'émulation :" @@ -2228,24 +2303,24 @@ msgstr "" msgid "Enable AR Logging" msgstr "Activer la journalisation AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Activer le contrôle audio" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Activer BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Activer l'assemblage de blocs" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2263,6 +2338,7 @@ msgstr "Activer le cache" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 @@ -2273,51 +2349,54 @@ msgstr "Activer le cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Activer les Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Activer la musique DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Activer le Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: 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:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Activer les touches de raccourci" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Activer le saut d'inactivité" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Activer le saut d'inactivité (plus rapide)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Activer le MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Activer le Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Activer l'économiseur d'écran" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Activer l'écran large (16/9è)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Activer le rendu en fil de fer" @@ -2336,7 +2415,7 @@ msgstr "" "\n" "Dans le doute, sélectionnez 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2344,7 +2423,7 @@ msgstr "" "Activer l'accès disque rapide. Requis pour certains jeux. (MARCHE = Rapide, " "ARRÊT = Compatible)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Activer les appels" @@ -2376,6 +2455,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 @@ -2387,6 +2467,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2401,7 +2484,7 @@ msgstr "Activer ceci pour accélérer La légende de Zelda : Twilight Princess. ======= >>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: 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 = " @@ -2411,7 +2494,7 @@ 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:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Active un hack de projection personnalisé" @@ -2427,7 +2510,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2452,6 +2535,7 @@ msgstr "Fin" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 @@ -2470,6 +2554,11 @@ msgstr "Fin" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Anglais" @@ -2501,6 +2590,7 @@ msgstr "Egal" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erreur" @@ -2544,6 +2634,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Erreur" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2551,14 +2647,14 @@ msgstr "" "défaut du système." >>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format <<<<<<< HEAD <<<<<<< HEAD @@ -2607,7 +2703,7 @@ msgstr "Quitter Dolphin avec l'émulateur" msgid "Export Failed" msgstr "Echec de l'exportation" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Exporter un fichier" @@ -2620,15 +2716,15 @@ msgstr "Exporter l'enregistrement..." msgid "Export Recording..." msgstr "Exporter l'enregistrement..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Exporter une sauvegarde" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Exporter une sauvegarde Wii (expérimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Exporter toutes les sauvegardes" @@ -2644,7 +2740,7 @@ msgstr "Exporter l'enregistrement sous..." msgid "Extension" msgstr "Extension" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Buffer d'image externe" @@ -2656,44 +2752,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Extraire tous les fichiers..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Extraire l'Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Extraire le DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Extraire un dossier..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Extraire un fichier..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Extraire une partition..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Extraction de %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Extraction de tous les fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Extraction du dossier" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Extraction..." @@ -2705,11 +2801,11 @@ msgstr "Octet FIFO" msgid "FIFO Player" msgstr "Lecteur FIFO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "France" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Taille FST :" @@ -2721,11 +2817,11 @@ msgstr "Connexion impossible !" msgid "Failed to Listen!!" msgstr "Ecoute impossible !" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Impossible de télécharger les codes." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Impossible d'extraire vers %s !" @@ -2844,18 +2940,28 @@ 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/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Rapide" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Mipmaps rapides" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Lecteur FIFO" @@ -2864,7 +2970,7 @@ msgstr "Lecteur FIFO" msgid "File Info" msgstr "Infos du fichier" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Le fichier ne contient pas de code." @@ -2897,16 +3003,16 @@ msgstr "Le fichier n'est pas reconnu comme une carte mémoire" msgid "File not compressed" msgstr "Fichier non compressé" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO : mode d'ouverture inconnu : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Système de fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Type de fichier 'ini' est inconnu ! Ne sera pas ouvert !" @@ -2914,7 +3020,7 @@ msgstr "Type de fichier 'ini' est inconnu ! Ne sera pas ouvert !" msgid "First Block" msgstr "Premier bloc" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Corriger les sommes de contôle" @@ -2926,7 +3032,7 @@ msgstr "Forcer 16/9è" msgid "Force 4:3" msgstr "Forcer 4/3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Forcer la console comme NTSC-J" @@ -2960,7 +3066,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 " @@ -2996,7 +3102,7 @@ msgstr "Image " msgid "Frame Advance" msgstr "Avancement d'image" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "L'enregistrement d'images utilise FFV1" @@ -3008,7 +3114,7 @@ msgstr "Plage d'images :" msgid "Frame S&kipping" msgstr "Saut d'&image :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Image/s max :" @@ -3016,13 +3122,14 @@ msgstr "Image/s max :" msgid "Frames To Record" msgstr "Images à enregistrer :" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Vue libre" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 @@ -3041,6 +3148,11 @@ msgstr "Vue libre" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Français" @@ -3083,7 +3195,7 @@ msgstr "Configuration de la journalisation" msgid "GCPad" msgstr "Manette GC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID du jeu :" @@ -3099,15 +3211,15 @@ msgstr "Le jeu n'est pas en cours d'émulation !" msgid "Game not found!!" msgstr "Jeu non trouvé !!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Paramètres spécifiques au jeu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Config du Jeu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "GameCube" @@ -3119,6 +3231,7 @@ msgstr "Paramètres de la &manette GameCube" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -3129,6 +3242,9 @@ msgstr "Paramètres de la &manette GameCube" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Carte mémoires de GameCube (*.raw,*.gcp)" @@ -3137,15 +3253,17 @@ msgid "Gamecube Pad settings" msgstr "Paramètres de la manette GameCube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Codes Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, 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.)" +"(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 dy GeckoCode (CT%i CST%i) (%s)\n" "(ou c'est un mauvais code, ou il n'est pas encore pris en charge.)" @@ -3164,8 +3282,12 @@ msgstr "" >>>>>>> Update Hungarian and Turkish translations. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Général" @@ -3177,6 +3299,7 @@ msgstr "Paramètres généraux" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 @@ -3195,6 +3318,11 @@ msgstr "Paramètres généraux" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Allemand" @@ -3259,7 +3387,7 @@ msgstr "" "\n" "Dans le doute, cochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Grèque" @@ -3291,7 +3419,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:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hébreu" @@ -3358,6 +3486,7 @@ msgstr "Configuration des raccourcis clavier" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 @@ -3369,10 +3498,13 @@ msgstr "Configuration des raccourcis clavier" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Raccourcis clavier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Hongrois" @@ -3380,14 +3512,14 @@ msgstr "Hongrois" msgid "Hybrid Wiimote" msgstr "Wiimote hybride" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3400,11 +3532,11 @@ msgstr "" "ID du titre : %016llx.\n" " Dolphin va probablement figer maintenant" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - mauvaise destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Paramètres IPL" @@ -3420,15 +3552,15 @@ msgstr "Pointeur IR" msgid "IR Sensitivity:" msgstr "Sensibilité de l'IR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Détails de l'ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Dossiers des ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "Italie" @@ -3436,22 +3568,30 @@ msgstr "Italie" msgid "Icon" msgstr "Icône" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update Hungarian and Turkish translations. ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" @@ -3461,6 +3601,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 @@ -3472,9 +3613,14 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" -"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." +"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), vous devez aussi désactiver " @@ -3519,7 +3665,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Importer une sauvegarde" @@ -3570,7 +3716,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Dans le jeu" @@ -3579,7 +3725,7 @@ msgid "In-Game" msgstr "Dans le jeu" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3599,7 +3745,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:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Insérer une carte SD" @@ -3611,7 +3757,7 @@ msgstr "Indiquer un nom ici..." msgid "Install WAD" msgstr "Installer un WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Installer dans le menu Wii" @@ -3625,6 +3771,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 @@ -3635,14 +3782,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Installation du WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Interface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Paramètres de l'interface" @@ -3667,11 +3817,11 @@ msgstr "Erreur interne LZO - échec de lzo_init()" msgid "Internal Resolution:" msgstr "Résolution interne :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpréteur (TRES lent)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3688,7 +3838,7 @@ msgstr "Valeur non valide !" msgid "Invalid bat.map or dir entry" msgstr "bar.map ou entrée dir non valide" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Type d'évènement non valide : %i" @@ -3708,17 +3858,18 @@ msgstr "" "%s\n" "Vous devriez copier à nouveau ce jeu." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Fichier d'enregitrement non valide" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Etat non valide" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 @@ -3737,27 +3888,32 @@ msgstr "Etat non valide" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italien" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "Japon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "Recompilateur JIT (recommandé) " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "Recompilateur expérimental JIT" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japonais" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "Corée" @@ -3766,8 +3922,8 @@ msgstr "Corée" msgid "Key" msgstr "Touche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Coréen" @@ -3785,7 +3941,7 @@ msgstr "Bouton L" msgid "L-Analog" msgstr "L Analog." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Langue :" @@ -3838,7 +3994,7 @@ msgstr "" msgid "Less Than" msgstr "Plus petit que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Nb de FPS comme limite" @@ -3846,7 +4002,7 @@ msgstr "Nb de FPS comme limite" msgid "Load" msgstr "Charger" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Charger textures personnalisées" @@ -3897,6 +4053,7 @@ msgstr "Charger un état..." <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Charger le Menu Système Wii" @@ -3923,6 +4080,13 @@ msgstr "Charger le Menu Système Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Charger le Menu Système Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Charger le Menu Système Wii %d%c" @@ -3951,7 +4115,7 @@ msgstr "Charge le fichier spécifié (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Verrouiller les threads aux coeurs" @@ -3963,11 +4127,11 @@ msgstr "Journal" msgid "Log Configuration" msgstr "Configuration de la journalisation" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Types de journaux" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Sorties des journalisations" @@ -3997,7 +4161,7 @@ msgstr "" "MD5 non concordant\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "Hack de vitesse pour le MMU" @@ -4023,11 +4187,11 @@ msgstr "Fichiers MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "Stick principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID concepteur :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Concepteur :" @@ -4052,6 +4216,7 @@ msgstr "Octet mémoire" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -4062,6 +4227,9 @@ msgstr "Octet mémoire" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Carte mémoire" @@ -4100,7 +4268,7 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Micro" @@ -4109,11 +4277,11 @@ msgstr "Micro" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Divers" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Paramètres divers" @@ -4135,7 +4303,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Police mono-espacée." @@ -4148,7 +4316,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Vibreur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -4170,7 +4338,7 @@ msgstr "" msgid "Multiply" msgstr "Multiplier" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -4265,6 +4433,7 @@ msgstr "NP Haut" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 @@ -4275,6 +4444,9 @@ msgstr "NP Haut" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4283,7 +4455,7 @@ msgstr "Nom :" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nom :" @@ -4297,7 +4469,7 @@ msgid "New Scan" msgstr "Nouvelle recherche" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Page suivante" @@ -4309,7 +4481,7 @@ msgstr "Recherche suivante" msgid "Nickname :" msgstr "Pseudo :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Pas de pays (SDK)" @@ -4348,7 +4520,7 @@ msgstr "Aucun dossier de sauvegarde trouvé pour le titre %s" msgid "None" msgstr "Aucune" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norvégien BokmÃ¥l" @@ -4356,8 +4528,8 @@ msgstr "Norvégien BokmÃ¥l" msgid "Not Equal" msgstr "Différent" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Non défini" @@ -4381,7 +4553,7 @@ msgstr "Non connectée" msgid "Notes" msgstr "Notes" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notes :" @@ -4419,7 +4591,7 @@ msgstr "Objet" 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" @@ -4448,11 +4620,11 @@ msgstr "%d blocs disponibles seulement" msgid "Open" msgstr "Ouvrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Ouvrir l'emplacement du fichier" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Ouvrir le dossier de &sauvegarde Wii" @@ -4474,11 +4646,11 @@ 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:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "Décodeur de texture OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "Décodeur de texture OpenMP" @@ -4511,7 +4683,7 @@ msgstr "" "et importez les sauvegardes vers une nouvelle carte mémoire\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Autres" @@ -4563,22 +4735,23 @@ msgstr "Paragraphe" msgid "Parameters" msgstr "Paramètres" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partition %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patchs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Chemins" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ======= @@ -4593,6 +4766,10 @@ msgstr "Chemins" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4601,7 +4778,7 @@ msgstr "Pause" msgid "Per-Pixel Lighting" msgstr "Eclairage par pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Parfait" @@ -4615,6 +4792,7 @@ msgstr "Perspective %d" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4629,6 +4807,10 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Démarrer" @@ -4642,7 +4824,7 @@ msgstr "Jouer l'enregistrement..." msgid "Play/Pause" msgstr "Démarrer/Arrêter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Jouable" @@ -4657,6 +4839,7 @@ msgstr "Joueurs" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 @@ -4667,6 +4850,9 @@ msgstr "Joueurs" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Veuillez confirmer..." @@ -4678,23 +4864,23 @@ msgstr "Merci de créer une perspective avant de sauvegarder" msgid "Plus-Minus" msgstr "Plus-Moins" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polonais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4703,11 +4889,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugais (brésilien)" @@ -4715,21 +4901,25 @@ msgstr "Portugais (brésilien)" msgid "Post-Processing Effect:" msgstr "Effet de Post-processing :" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:735 +======= +#: Source/Core/Core/Src/Movie.cpp:759 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4747,7 +4937,7 @@ msgstr "Pré-réglages :" msgid "Prev Page" msgstr "Page préc." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Page précédente" @@ -4798,7 +4988,7 @@ msgstr "R Analog." msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "Russie" @@ -4811,7 +5001,7 @@ msgstr "Etendue" msgid "Read-only mode" msgstr "Mode Lecture seule" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Réel" @@ -4890,6 +5080,7 @@ msgstr "Rafraîchir la liste des jeux" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 @@ -4912,6 +5103,12 @@ msgstr "Rafraîchir la liste des jeux" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Retirer" @@ -4967,11 +5164,11 @@ msgstr "Stick Droit" msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: 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:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russe" @@ -4979,13 +5176,14 @@ msgstr "Russe" msgid "Sa&ve State" msgstr "Sau&vegarder l'état" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Sûr " <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 @@ -4996,6 +5194,9 @@ msgstr "Sûr " ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Echantillonnage :" @@ -5053,12 +5254,12 @@ msgstr "Sauvegarder l'état vers le Slot 8" msgid "Save State..." msgstr "Enregistrer l'état" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Enregistrer sous..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Sauver le fichier compressé GCM/ISO" @@ -5066,11 +5267,11 @@ msgstr "Sauver le fichier compressé GCM/ISO" msgid "Save current perspective" msgstr "Sauvegarder la perspective actuelle" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Sauvegarder le fichier GCM/ISO décompressé" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -5081,16 +5282,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "Copie à l'échelle de l'EFB" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 #, c-format msgid "Scanning %s" msgstr "Analyse de %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Recherche d'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Recherche..." @@ -5106,12 +5307,12 @@ msgstr "Arrêt défil." msgid "Search Filter" msgstr "Fitre de recherche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Chercher dans sous-dossiers" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: 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" @@ -5124,6 +5325,7 @@ msgstr "Select" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" @@ -5154,6 +5356,14 @@ msgstr "Sélectionner le fichier d'enregistrement" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Sélectionner le fichier d'enregistrement" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Sélectionner un fichier WAD de Wii à installer" @@ -5182,6 +5392,7 @@ msgstr "Sélectionner le fichier à charger" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -5200,13 +5411,17 @@ msgstr "Sélectionner l'état à charger" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Sélectionner le fichier à enregistrer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Sélectionner l'état à charger" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. @@ -5216,6 +5431,9 @@ msgstr "Sélectionner l'état à charger" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Sélectionner l'état à enregistrer" @@ -5238,7 +5456,7 @@ msgstr "" "\n" "Dans le doute, choisissez Auto." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Police sélectionnée" @@ -5287,13 +5505,14 @@ msgstr "Position de la Sensor Bar :" msgid "Separator" msgstr "Séparateur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbe" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 @@ -5305,6 +5524,9 @@ msgstr "Serbe" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -5322,11 +5544,11 @@ msgstr "Port série 1 - C'est le port que les périphériques tels que l'adaptat msgid "Set" msgstr "Paramétrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Définir comme l'ISO par &défaut" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Définir comme carte mémoire par défaut : %c" @@ -5338,7 +5560,7 @@ msgstr "" "SetARCode_IsActive : L'index est plus grand que la taille de la liste des " "codes AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Configurer..." @@ -5350,7 +5572,7 @@ msgstr "SetupWiiMem: Impossible de trouver le fichier des paramètres" msgid "Shake" msgstr "Secouement" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Nom court :" @@ -5378,7 +5600,7 @@ msgstr "Afficher la barre d'&outils" msgid "Show Drives" msgstr "Afficher les lecteurs" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Afficher les régions copiées d'EFB" @@ -5394,7 +5616,7 @@ msgstr "Afficher France" msgid "Show GameCube" msgstr "Afficher GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Afficher le graphisme en entrée" @@ -5410,7 +5632,7 @@ msgstr "Afficher Japon" msgid "Show Korea" msgstr "Afficher Corée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Afficher la langue :" @@ -5430,7 +5652,7 @@ msgstr "Afficher les plateformes" msgid "Show Regions" msgstr "Afficher les régions" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Afficher les statistiques" @@ -5450,11 +5672,11 @@ msgstr "Afficher WAD" 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 " @@ -5465,23 +5687,23 @@ msgstr "" "mais cela peut aussi signifier que Dolphin plante soudainement sans aucune " "explication." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Afficher le premier bloc" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Afficher les blocs de sauvegarde" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Afficher le commentaire de sauvegarde" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Afficher l'icône de la sauvegarde" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Afficher le titre de sauvegarde" @@ -5519,7 +5741,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote à l'horizontale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Chinois simplifié" @@ -5527,11 +5749,11 @@ msgstr "Chinois simplifié" msgid "Size" msgstr "Taille" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Ne pas exécuter le BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Ignorer Passe Alpha de dest." @@ -5606,11 +5828,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5635,7 +5857,7 @@ 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:621 msgid "Sound Settings" msgstr "Paramètres audio" @@ -5656,6 +5878,7 @@ msgstr "Espace" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 @@ -5674,6 +5897,11 @@ msgstr "Espace" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Espagnol" @@ -5705,7 +5933,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Sélectionner une interface pour les graphismes" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Accélerer le taux de transfert du disque" @@ -5713,7 +5941,7 @@ msgstr "Accélerer le taux de transfert du disque" msgid "Square Stick" msgstr "Stick carré" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Contrôleur standard" @@ -5818,12 +6046,12 @@ msgstr "Fichiers de sauvegarde importés avec succès" msgid "Swing" msgstr "Balancement" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Langue du système :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "Taïwan" @@ -5860,7 +6088,7 @@ msgstr "Table Droite" msgid "Take Screenshot" msgstr "Capture d'écran" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5891,7 +6119,7 @@ msgstr "Texture" msgid "Texture Cache" msgstr "Cache de texture" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Infos de format de texture" @@ -5907,13 +6135,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:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 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:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5936,7 +6164,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:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Le fichier que vous avez spécifié (%s) n'existe pas" @@ -5954,11 +6182,12 @@ 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:98 +#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"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" @@ -6003,7 +6232,7 @@ 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:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Thème" @@ -6011,7 +6240,7 @@ msgstr "Thème" 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:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -6019,7 +6248,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:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -6035,7 +6264,7 @@ 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:513 +#: 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." @@ -6059,26 +6288,10 @@ msgstr "" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -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 "" -"Ceci est utiliser pour contrôler la vitesse du jeu par la constance du son.\n" -"Désactiver cette option peut causer une vitesse anormale du jeu, par exemple " -"trop rapide.\n" -"Mais il se peut parfois qu'activer cette option produise un bruit constant.\n" -"\n" -"Raccourci clavier : Appuyer pour instantanément désactiver cette " -"option." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Ceci est utilisé pour lire les pistes de musique, comme les BGM." -#: 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" @@ -6091,7 +6304,7 @@ msgstr "" "qui plus d'un coeur, mais peut occasionnellement causer des petits pépins ou " "des plantages." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: 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" @@ -6115,7 +6328,7 @@ msgstr "Titre" msgid "To" msgstr "A" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Activer tous les types de journaux" @@ -6139,6 +6352,7 @@ msgstr "Activer le plein écran" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -6149,14 +6363,17 @@ msgstr "Activer le plein écran" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Haut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Chinois traditionnel" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Echec de chargement d'un type de fichier inconnu." @@ -6164,7 +6381,7 @@ msgstr "Echec de chargement d'un type de fichier inconnu." msgid "Triggers" msgstr "Déclencheurs" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: 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" @@ -6176,7 +6393,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:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turque" @@ -6197,11 +6414,11 @@ msgstr "Port UDP :" msgid "UDP Wiimote" msgstr "Wiimote UDP :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "Inconnu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -6301,7 +6518,7 @@ msgstr "Mettre à jour" msgid "Upright Wiimote" msgstr "Wiimote debout" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utiliser le mode EuRGB60 (PAL60)" @@ -6313,7 +6530,7 @@ msgstr "&Plein écran" msgid "Use Hex" msgstr "Utiliser Hexa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Utiliser les gestionnaires de panique" @@ -6345,7 +6562,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Utilitaires" @@ -6369,25 +6586,29 @@ msgstr "Valeur" msgid "Verbosity" msgstr "Verbosité" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Vidéo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtuel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volume" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "Echec de l'installation du WAD : erreur lors de la création de %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "Echec de l'installation du WAD : erreur lors de la création de %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -6406,15 +6627,15 @@ msgstr "" msgid "Warning" msgstr "Attention" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 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:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Attention : démarrage de l'ELF dans un mauvais mode de console !" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Attention : démarrage d\" l'ISO dans un mauvais mode de console !" @@ -6444,11 +6665,15 @@ msgstr "" "et vont avoir le même nom que le fichier sur votre carte mémoire\n" "Continuer ?" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:629 +======= +#: Source/Core/Core/Src/Movie.cpp:667 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -6456,7 +6681,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -6464,7 +6689,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -6497,7 +6722,7 @@ msgstr "WaveFileWriter - fichier non ouvert." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Hack écran large (16/9è)" @@ -6505,15 +6730,15 @@ msgstr "Hack écran large (16/9è)" msgid "Width" msgstr "Largeur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Console Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Racine de la NAND (Wii) :" @@ -6524,6 +6749,7 @@ msgstr "Importer une sauvegarde Wii" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 @@ -6534,6 +6760,9 @@ msgstr "Importer une sauvegarde Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin" @@ -6604,13 +6833,14 @@ msgstr "Windows Menu" msgid "Windows Right" msgstr "Windows Droit" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Casse" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 @@ -6629,6 +6859,11 @@ msgstr "Casse" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Travail..." @@ -6636,6 +6871,11 @@ msgstr "Travail..." msgid "Write to Console" msgstr "Ecrire dans la console" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Ecrire dans le fichier" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Ecrire dans le fichier" @@ -6692,7 +6932,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:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 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." @@ -6715,7 +6955,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:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP hack" @@ -6786,7 +7026,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6819,12 +7059,12 @@ msgstr "" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "Commande inconnue 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute a retourné -1 sur l'exécution de l'application !" @@ -7038,6 +7278,9 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "Paramètres graphiques de l'émulateur" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Activer le contrôle audio" + #~ msgid "Enable CPU Access" #~ msgstr "Activer l'accès CPU" @@ -7385,6 +7628,23 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "Le fichier " +#~ 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 "" +#~ "Ceci est utiliser pour contrôler la vitesse du jeu par la constance du " +#~ "son.\n" +#~ "Désactiver cette option peut causer une vitesse anormale du jeu, par " +#~ "exemple trop rapide.\n" +#~ "Mais il se peut parfois qu'activer cette option produise un bruit " +#~ "constant.\n" +#~ "\n" +#~ "Raccourci clavier : Appuyer pour instantanément désactiver cette " +#~ "option." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "" #~ "Ceci est habituellement utilisé pour lire la voix et les effets sonores." diff --git a/Languages/po/he.po b/Languages/po/he.po index ea10f8cea4..51453ebfe0 100644 --- a/Languages/po/he.po +++ b/Languages/po/he.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-01-08 20:50+0200\n" "Last-Translator: Ely \n" "Language-Team: \n" @@ -55,9 +59,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:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "" @@ -142,7 +146,7 @@ msgstr "" msgid "%sImport GCI%s" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, fuzzy, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%d ×‘×œ×•×§×™× ×—×•×¤×©×™×™×; %d רשומות תיקייה חופשיות" @@ -175,11 +179,11 @@ msgstr "" msgid "&DSP Settings" msgstr "הגדרות קול" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "" @@ -244,7 +248,7 @@ msgstr "" msgid "&Play" msgstr "&שחק" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "" @@ -288,7 +292,7 @@ msgstr "" msgid "&Wiimote Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "" @@ -332,7 +336,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -341,7 +345,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -380,13 +384,13 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "" @@ -398,11 +402,11 @@ msgstr "" msgid "Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "" @@ -502,11 +506,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "" @@ -514,6 +518,7 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -529,6 +534,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "" @@ -562,11 +572,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "" @@ -574,14 +584,15 @@ msgstr "" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -594,18 +605,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "" @@ -617,7 +632,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Alternate Wiimote Timing" msgstr "" @@ -637,7 +652,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "" @@ -652,7 +667,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -661,16 +676,17 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -680,6 +696,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -688,18 +707,20 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -709,6 +730,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -744,7 +768,7 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 #, fuzzy msgid "Backend Settings" msgstr "הגדרות קול" @@ -772,11 +796,11 @@ msgstr "" msgid "Banner" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "" @@ -788,7 +812,7 @@ msgstr "" msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "" @@ -819,6 +843,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -826,6 +851,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "" @@ -834,7 +862,7 @@ msgstr "" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "" @@ -850,7 +878,7 @@ msgstr "" msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "" @@ -880,11 +908,11 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "" @@ -923,7 +951,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -931,7 +959,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -947,8 +975,6 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -958,7 +984,7 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -983,7 +1009,7 @@ msgstr "" msgid "Change Game" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -997,8 +1023,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: 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 "" @@ -1018,31 +1044,31 @@ msgstr "" msgid "Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "" @@ -1050,14 +1076,14 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: 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:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "" @@ -1069,14 +1095,14 @@ msgstr "" msgid "Classic" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "" @@ -1090,6 +1116,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1098,6 +1125,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "" @@ -1121,20 +1152,20 @@ msgstr "" msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "" @@ -1161,13 +1192,13 @@ msgstr "" msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "" @@ -1176,7 +1207,7 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "" @@ -1233,12 +1264,12 @@ msgstr "" msgid "Copy failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "" @@ -1265,7 +1296,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "" @@ -1276,7 +1307,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1285,7 +1316,7 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "" @@ -1300,7 +1331,7 @@ msgstr "" msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "" @@ -1314,24 +1345,24 @@ msgstr "" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 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:498 msgid "Created by VistaIcons.com" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "" @@ -1339,7 +1370,7 @@ msgstr "" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "" @@ -1359,7 +1390,7 @@ msgstr "" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "" @@ -1367,11 +1398,11 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "" @@ -1383,10 +1414,11 @@ msgstr "" msgid "DSP" msgstr "קול" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1397,18 +1429,22 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "" @@ -1416,15 +1452,23 @@ msgstr "" msgid "DSP settings" msgstr "הגדרות קול" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" 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:176 msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "" @@ -1445,7 +1489,7 @@ msgstr "" msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "" @@ -1453,16 +1497,16 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "" @@ -1470,11 +1514,11 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "" @@ -1483,7 +1527,7 @@ msgstr "" msgid "Delete" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "" @@ -1492,7 +1536,7 @@ msgstr "" msgid "Delete the existing file '%s'?" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "" @@ -1500,8 +1544,8 @@ msgstr "" msgid "Detect" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: 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." @@ -1512,8 +1556,8 @@ msgstr "" msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "" @@ -1536,23 +1580,23 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "" @@ -1582,7 +1626,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "" @@ -1606,6 +1650,7 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1615,10 +1660,13 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "" @@ -1643,6 +1691,7 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1652,10 +1701,14 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Dolphin GCPad Configuration" msgstr "הגדרות גרפיקה" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 @@ -1668,6 +1721,10 @@ msgstr "הגדרות גרפיקה" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1696,11 +1753,11 @@ msgstr "" msgid "Down" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "" @@ -1709,23 +1766,23 @@ msgstr "" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "" @@ -1750,6 +1807,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1765,6 +1823,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "" @@ -1785,7 +1848,7 @@ msgid "" "driver." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "" @@ -1801,7 +1864,7 @@ msgstr "" msgid "Edit ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "" @@ -1813,8 +1876,8 @@ msgstr "" msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "" @@ -1853,7 +1916,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "" @@ -1875,23 +1938,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -1904,6 +1967,7 @@ msgstr "" msgid "Enable Cache" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -1913,51 +1977,54 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "" @@ -1970,13 +2037,13 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: 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:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "" @@ -1996,20 +2063,20 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: 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:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "" @@ -2021,7 +2088,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2038,6 +2105,7 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2053,6 +2121,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "" @@ -2083,6 +2156,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -2113,18 +2187,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2156,7 +2236,7 @@ msgstr "" msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "" @@ -2169,15 +2249,15 @@ msgstr "" msgid "Export Recording..." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "" @@ -2193,7 +2273,7 @@ msgstr "" msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "" @@ -2205,44 +2285,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "" @@ -2254,11 +2334,11 @@ msgstr "" msgid "FIFO Player" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "" @@ -2270,11 +2350,11 @@ msgstr "" msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2370,18 +2450,28 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "" @@ -2390,7 +2480,7 @@ msgstr "" msgid "File Info" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "" @@ -2419,16 +2509,16 @@ msgstr "" msgid "File not compressed" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2436,7 +2526,7 @@ msgstr "" msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "" @@ -2448,7 +2538,7 @@ msgstr "" msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "" @@ -2472,7 +2562,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 " @@ -2503,7 +2593,7 @@ msgstr "" msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "" @@ -2515,7 +2605,7 @@ msgstr "" msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "" @@ -2523,10 +2613,11 @@ msgstr "" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2542,6 +2633,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "" @@ -2576,7 +2672,7 @@ msgstr "הגדרות גרפיקה" msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "" @@ -2592,15 +2688,15 @@ msgstr "" msgid "Game not found!!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "" @@ -2612,6 +2708,7 @@ msgstr "הגדרות קול" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2619,6 +2716,9 @@ msgstr "הגדרות קול" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2627,21 +2727,24 @@ msgid "Gamecube Pad settings" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "" -#: Source/Core/Core/Src/GeckoCode.cpp:139 +#: Source/Core/Core/Src/GeckoCode.cpp:222 #, 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.)" +"(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 "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2650,6 +2753,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2659,6 +2765,7 @@ msgstr "" msgid "General Settings" msgstr "הגדרות קול" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2674,6 +2781,11 @@ msgstr "הגדרות קול" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "" @@ -2705,7 +2817,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "" @@ -2737,7 +2849,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "" @@ -2791,6 +2903,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 @@ -2799,10 +2912,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "" @@ -2810,12 +2926,12 @@ msgstr "" msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2824,11 +2940,11 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "" @@ -2844,15 +2960,15 @@ msgstr "" msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "" @@ -2860,21 +2976,22 @@ msgstr "" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: 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:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 msgid "" -"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." +"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:432 @@ -2899,7 +3016,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "" @@ -2938,7 +3055,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "" @@ -2947,7 +3064,7 @@ msgid "In-Game" msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "" @@ -2967,7 +3084,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "" @@ -2979,7 +3096,7 @@ msgstr "" msgid "Install WAD" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "" @@ -2988,6 +3105,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -2997,14 +3115,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "" @@ -3027,11 +3148,11 @@ msgstr "" msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "" @@ -3048,7 +3169,7 @@ msgstr "" msgid "Invalid bat.map or dir entry" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "" @@ -3065,14 +3186,15 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3088,27 +3210,32 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "" @@ -3117,8 +3244,8 @@ msgstr "" msgid "Key" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "" @@ -3136,7 +3263,7 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "" @@ -3182,7 +3309,7 @@ msgstr "" msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3190,7 +3317,7 @@ msgstr "" msgid "Load" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "" @@ -3238,6 +3365,7 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3259,6 +3387,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3282,7 +3417,7 @@ msgstr "" msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "" @@ -3295,11 +3430,11 @@ msgstr "" msgid "Log Configuration" msgstr "הגדרות גרפיקה" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "" @@ -3327,7 +3462,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "" @@ -3349,11 +3484,11 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "" @@ -3377,6 +3512,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3384,6 +3520,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "" @@ -3412,7 +3551,7 @@ msgstr "" msgid "Menu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "" @@ -3421,11 +3560,11 @@ msgstr "" msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "" @@ -3442,7 +3581,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "" @@ -3455,7 +3594,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3470,7 +3609,7 @@ msgstr "" msgid "Multiply" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3560,6 +3699,7 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3569,6 +3709,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3577,7 +3720,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "" @@ -3591,7 +3734,7 @@ msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "" @@ -3603,7 +3746,7 @@ msgstr "" msgid "Nickname :" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "" @@ -3642,7 +3785,7 @@ msgstr "" msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "" @@ -3650,8 +3793,8 @@ msgstr "" msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "" @@ -3671,7 +3814,7 @@ msgstr "" msgid "Notes" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "" @@ -3709,7 +3852,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "" @@ -3735,11 +3878,11 @@ msgstr "" msgid "Open" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "" @@ -3761,11 +3904,11 @@ msgstr "" msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -3794,7 +3937,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -3844,19 +3987,20 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -3869,6 +4013,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3877,7 +4025,7 @@ msgstr "" msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "" @@ -3890,6 +4038,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -3900,6 +4049,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "" @@ -3913,7 +4066,7 @@ msgstr "" msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "" @@ -3925,6 +4078,7 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -3934,6 +4088,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -3945,23 +4102,23 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "" @@ -3970,11 +4127,11 @@ msgstr "" msgid "Port :" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "" @@ -3982,17 +4139,17 @@ msgstr "" msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4005,7 +4162,7 @@ msgstr "" msgid "Prev Page" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "" @@ -4056,7 +4213,7 @@ msgstr "" msgid "RAM" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "" @@ -4069,7 +4226,7 @@ msgstr "" msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "" @@ -4139,6 +4296,7 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4157,6 +4315,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "" @@ -4206,11 +4370,11 @@ msgstr "" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "" @@ -4218,10 +4382,11 @@ msgstr "" msgid "Sa&ve State" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4231,6 +4396,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -4288,12 +4456,12 @@ msgstr "" msgid "Save State..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "" @@ -4301,11 +4469,11 @@ msgstr "" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4314,6 +4482,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4323,15 +4492,18 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "" @@ -4347,12 +4519,12 @@ msgstr "" msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: 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 "" @@ -4362,6 +4534,7 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4386,6 +4559,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4408,16 +4589,21 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4437,6 +4623,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4451,7 +4640,7 @@ msgid "" "If unsure, select Auto." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "" @@ -4487,11 +4676,11 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4500,11 +4689,11 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "" @@ -4514,7 +4703,7 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 #, fuzzy msgid "Settings..." msgstr "הגדרות קול" @@ -4527,7 +4716,7 @@ msgstr "" msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "" @@ -4555,7 +4744,7 @@ msgstr "" msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "" @@ -4571,7 +4760,7 @@ msgstr "" msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "" @@ -4587,7 +4776,7 @@ msgstr "" msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "" @@ -4608,7 +4797,7 @@ msgstr "" msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "" @@ -4628,34 +4817,34 @@ msgstr "" 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:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "" @@ -4686,7 +4875,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "" @@ -4694,11 +4883,11 @@ msgstr "" msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -4730,11 +4919,11 @@ msgstr "" msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "" @@ -4754,7 +4943,7 @@ 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:621 msgid "Sound Settings" msgstr "" @@ -4772,6 +4961,7 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -4787,6 +4977,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "" @@ -4810,7 +5005,7 @@ msgstr "" msgid "Specify a video backend" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4818,7 +5013,7 @@ msgstr "" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "" @@ -4911,12 +5106,12 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "" @@ -4955,7 +5150,7 @@ msgstr "" msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -4971,7 +5166,7 @@ msgstr "" msgid "Texture Cache" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "" @@ -4987,13 +5182,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, fuzzy, c-format msgid "" "The file %s already exists.\n" @@ -5012,7 +5207,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -5034,7 +5229,7 @@ msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5072,7 +5267,7 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "" @@ -5080,13 +5275,13 @@ msgstr "" msgid "Theme selection went wrong" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5098,7 +5293,7 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" @@ -5114,19 +5309,10 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -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 "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." 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" @@ -5134,7 +5320,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" @@ -5157,7 +5343,7 @@ msgstr "" msgid "To" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "" @@ -5177,6 +5363,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5184,14 +5371,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "" @@ -5199,7 +5389,7 @@ msgstr "" msgid "Triggers" msgstr "" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "" @@ -5209,7 +5399,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "" @@ -5230,11 +5420,11 @@ msgstr "" msgid "UDP Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "" @@ -5312,7 +5502,7 @@ msgstr "" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -5325,7 +5515,7 @@ msgstr "&מסך מל×" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "" @@ -5346,7 +5536,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "" @@ -5370,25 +5560,28 @@ msgstr "" msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +msgid "WAD installation failed: error creating ticket" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5403,15 +5596,15 @@ msgstr "" msgid "Warning" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "" @@ -5432,7 +5625,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5440,7 +5633,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5448,7 +5641,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5476,7 +5669,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "" @@ -5484,15 +5677,15 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "" @@ -5500,6 +5693,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5509,6 +5703,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5571,10 +5768,11 @@ msgstr "" msgid "Windows Right" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5590,6 +5788,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "" @@ -5597,6 +5800,10 @@ msgstr "" msgid "Write to Console" msgstr "" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +msgid "Write to Debugger" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "" @@ -5650,7 +5857,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5668,7 +5875,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "" @@ -5722,7 +5929,7 @@ msgstr "" msgid "^ ADD" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "" @@ -5753,12 +5960,12 @@ msgstr "" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/hu.po b/Languages/po/hu.po index 7bdf045357..fb426b13e9 100644 --- a/Languages/po/hu.po +++ b/Languages/po/hu.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-18 13:41-0600\n" ======= @@ -25,6 +26,9 @@ msgstr "" "PO-Revision-Date: 2011-12-27 08:22-0600\n" >>>>>>> Update from master branch. ======= +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-28 09:44+0100\n" >>>>>>> Update Hungarian translation. "Last-Translator: Delirious \n" @@ -68,9 +72,9 @@ msgstr "\"%s\" egy érvénytelen GCM/ISO fájl, vagy nem GC/Wii ISO." 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:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -132,7 +136,8 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" "%s memóriakártyakénti betöltése sikertelen\n" -"a fájl nem elég nagy ahhoz, hogy megfelelÅ‘ memóriakártya fájl lehessen (0x%x bájt)" +"a fájl nem elég nagy ahhoz, hogy megfelelÅ‘ memóriakártya fájl lehessen (0x%x " +"bájt)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -180,7 +185,7 @@ msgstr "%sGCI exportálás%s" msgid "%sImport GCI%s" msgstr "%sGCI importálás%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u szabad blokk; %u szabad könyvtár bejegyzés" @@ -213,11 +218,11 @@ msgstr "&Csalás kezelÅ‘" msgid "&DSP Settings" msgstr "&Hang beállítások" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&ISO törlése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&A kiválasztott ISO fájlok törlése..." @@ -281,7 +286,7 @@ msgstr "&Szünet" msgid "&Play" msgstr "&Indítás" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Tulajdonságok" @@ -325,7 +330,7 @@ msgstr "&Nézet" msgid "&Wiimote Settings" msgstr "&Wiimote beállítások" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -369,7 +374,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -378,7 +383,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -404,11 +409,13 @@ 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" @@ -418,25 +425,28 @@ msgid "" msgstr "" "FIGYELEM:\n" "\n" -"A NetPlay jelenleg csak a következÅ‘ beállítások használatával működik megfelelÅ‘en:\n" +"A NetPlay jelenleg csak a következÅ‘ beállítások használatával működik " +"megfelelÅ‘en:\n" " - Dual Core [KI]\n" " - Hang szabályozás [KI]\n" " - DSP-HLE \"Null Audio\" használatával vagy DSP-LLE\n" -" - Kézileg legyen beállítva az irányítók pontos száma, amik használva lesznek, mint [szabvány irányító]\n" +" - Kézileg legyen beállítva az irányítók pontos száma, amik használva " +"lesznek, mint [szabvány irányító]\n" "\n" "Minden játékosnak azonos Dolphin verziót és beállításokat kell használnia.\n" -"Legyen minden memóriakártya kikapcsolva vagy mindenkinek továbbítani kell a játék megkezdése elÅ‘tt.\n" +"Legyen minden memóriakártya kikapcsolva vagy mindenkinek továbbítani kell a " +"játék megkezdése elÅ‘tt.\n" "Wiimote támogatás még nem működik.\n" "\n" "Továbbítani kell a TCP portot a host számára!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM alaplap" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR kódok" @@ -448,11 +458,11 @@ msgstr "A Dolphin névjegye" msgid "Acceleration" msgstr "Gyorsítás" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "Pontosság:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Pontos VBeam emuláció" @@ -466,12 +476,14 @@ msgstr "Pontos VBeam emuláció" >>>>>>> Update Hungarian and Turkish translations. 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 másolatok pontos emulációja.\n" -"Néhány játék számára elengedhetetlen bizonyos grafikai effektushoz vagy a játszhatóság végett.\n" +"Néhány játék számára elengedhetetlen bizonyos grafikai effektushoz vagy a " +"játszhatóság végett.\n" "\n" "Ha bizonytalan vagy, válaszd az EFB textúrába másolása lehetÅ‘séget." @@ -497,23 +509,38 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" -msgstr "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a kód hozzáadásban (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +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 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)" -msgstr "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a kitöltésben és regiszterben (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " +"(%s)" +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 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)" -msgstr "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a RAM írásban és kitöltésben (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " +"Fill (%s)" +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 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Write To Pointer (%s)" -msgstr "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a mutató írásában (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Write To " +"Pointer (%s)" +msgstr "" +"Action Replay hiba: érvénytelen méret (%08x : address = %08x) a mutató " +"írásában (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:803 #, c-format @@ -522,7 +549,8 @@ msgstr "Action Replay hiba: érvénytelen érték (%08x) a memória másolásban #: Source/Core/Core/Src/ActionReplay.cpp:684 #, c-format -msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgid "" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" msgstr "Action Replay hiba: Mester kód és CCXXXXXX írása nincs beépítve (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -559,11 +587,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Hozzáadás" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "ActionReplay kód hozzáadása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Patch hozzáadása" @@ -571,6 +599,7 @@ msgstr "Patch hozzáadása" msgid "Add new pane" msgstr "Új mezÅ‘ hozzáadása" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -586,6 +615,11 @@ msgstr "Új mezÅ‘ hozzáadása" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Hozzáadás..." @@ -597,14 +631,16 @@ msgstr "Cím:" 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 "" "Meghatározott értéket ad a zFar paraméterhez.\n" "Két módja a lebegÅ‘pontos értékek kifejezésének.\n" -"Például: a ''200'' vagy ''0.0002'' érték közvetlen megadása, azonos hatásokat eredményez, a kapott érték ''0.0002'' lesz.\n" +"Például: a ''200'' vagy ''0.0002'' érték közvetlen megadása, azonos " +"hatásokat eredményez, a kapott érték ''0.0002'' lesz.\n" "Értékek: (0->+/-egész szám) vagy (0->+/-FP[6 számjegyes pontosság])\n" "\n" "MEGJEGYZÉS: EllenÅ‘rizd a napló ablakot/konzolt a kapott értékekhez." @@ -613,27 +649,31 @@ 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 "" "Meghatározott értéket ad a zNear paraméterhez.\n" "Két módja a lebegÅ‘pontos értékek kifejezésének.\n" -"Például: a ''200'' vagy ''0.0002'' érték közvetlen megadása, azonos hatásokat eredményez, a kapott érték ''0.0002'' lesz.\n" +"Például: a ''200'' vagy ''0.0002'' érték közvetlen megadása, azonos " +"hatásokat eredményez, a kapott érték ''0.0002'' lesz.\n" "Értékek: (0->+/-egész szám) vagy (0->+/-FP[6 számjegyes pontosság])\n" "\n" "MEGJEGYZÉS: EllenÅ‘rizd a napló ablakot/konzolt a kapott értékekhez." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 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." +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:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Haladó" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Haladó beállítások" @@ -641,14 +681,15 @@ msgstr "Haladó beállítások" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Minden GC/Wii fájl (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Minden GC/Wii képfájl (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Minden Gamecube GCM fájl (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -661,31 +702,38 @@ msgstr "Minden Gamecube GCM fájl (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Minden állásmentés (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Minden Wii ISO fájl (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 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:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Minden fájl (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Bizonyos opciók elérhetÅ‘vé válnak a 3, 4, 5, 6 és 7 gyorsbillentyűkkel az emulációs ablakon belül.\n" +"Bizonyos opciók elérhetÅ‘vé válnak a 3, 4, 5, 6 és 7 gyorsbillentyűkkel az " +"emulációs ablakon belül.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD <<<<<<< HEAD @@ -697,6 +745,9 @@ msgid "Alternate Wiimote Timing" msgstr "Emulált Wiimote" >>>>>>> Update translation files for recent changes in the code. ======= +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Változtatható Wiimote idÅ‘zítés" >>>>>>> Update Hungarian and Turkish translations. @@ -711,13 +762,14 @@ msgstr "Élsimítás:" #: Source/Core/DiscIO/Src/VolumeDirectory.cpp:317 msgid "Apploader is the wrong size...is it really an apploader?" -msgstr "A betöltÅ‘ program nem megfelelÅ‘ méretű...ez tényleg egy betöltÅ‘ program?" +msgstr "" +"A betöltÅ‘ program nem megfelelÅ‘ méretű...ez tényleg egy betöltÅ‘ program?" #: Source/Core/DiscIO/Src/VolumeDirectory.cpp:311 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:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "BetöltÅ‘ program:" @@ -735,7 +787,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, válaszd ezt: (ki)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arab" @@ -744,7 +796,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -752,10 +804,11 @@ msgstr "" "Biztos törlöd ezeket a fájlokat?\n" "Végleg el fognak veszni!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -765,6 +818,9 @@ msgstr "Biztos törlöd ezt a fájlt? Végleg el fog veszni!" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Képarány:" @@ -773,18 +829,20 @@ 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:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Hang" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Hang feldolgozó:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Hiba az AO eszköz megnyitásakor.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -794,6 +852,9 @@ msgstr "AudioCommon: Hiba az AO eszköz megnyitásakor.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatikus" @@ -827,8 +888,10 @@ msgid "" "\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" +"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." @@ -836,7 +899,7 @@ msgstr "" msgid "Back" msgstr "Hátra" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Hang feldolgozó beállításai" @@ -863,11 +926,11 @@ msgstr "Rossz fájl fejléc" msgid "Banner" msgstr "Játék kép" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Játék kép részletek" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Játék kép:" @@ -879,7 +942,7 @@ msgstr "VevÅ‘" msgid "Basic" msgstr "Alap" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Alap beállítások" @@ -910,6 +973,7 @@ msgstr "Kék jobbra" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -917,6 +981,9 @@ msgstr "Kék jobbra" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Gomb" @@ -925,7 +992,7 @@ msgstr "Gomb" msgid "Bound Controls: %lu" msgstr "Összekötött irányítások: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Hibás" @@ -941,7 +1008,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:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Kimeneti könyvtár tallózása" @@ -971,23 +1038,28 @@ msgstr "C kar" msgid "C-Stick" msgstr "C-kar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Processzor emulátor motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "KijelzÅ‘ listák gyorsítótárazása" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 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 "" -"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" +"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." @@ -999,7 +1071,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"A 3D-s grafikai fényhatásokat képpont alapon számolja inkább, mintsem csúcspont alapon.\n" +"A 3D-s grafikai fényhatásokat képpont alapon számolja inkább, mintsem " +"csúcspont alapon.\n" "Néhány százalékkal csökkenti az emuláció sebességét (videókártyától függ).\n" "Ez többnyire biztonságos finomítás, de idÅ‘nként hibákat okozhat.\n" "\n" @@ -1031,6 +1104,7 @@ msgstr "A mozgások rögzítése nem lehetséges írásvédett módban." msgid "Cannot unregister events with events pending" msgstr "Nem lehet esemény bejegyzéseket törölni függÅ‘ben lévÅ‘ eseményekkel" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 @@ -1040,6 +1114,9 @@ msgstr "Nem lehet esemény bejegyzéseket törölni függÅ‘ben lévÅ‘ események ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1050,7 +1127,7 @@ msgstr "" "%s\n" "fájl nem megfelelÅ‘ GameCube memóriakártya fájl" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1068,8 +1145,6 @@ msgstr "Nem található WiiMote bd szerint: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Nem található WiiMote %02x csatlakozás kezelÅ‘ szerint" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1079,7 +1154,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:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Katalán" @@ -1104,7 +1179,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:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1120,8 +1195,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:506 #: 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!" @@ -1141,31 +1216,31 @@ msgstr "Csalás keresés" msgid "Cheats Manager" msgstr "Csalás kezelÅ‘" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Kínai (egyszerűsített)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Kínai (hagyományos)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: 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:762 +#: 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:755 +#: 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:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Válassz hozzáadandó könyvtárat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Válasz megnyitandó fájl" @@ -1173,12 +1248,16 @@ msgstr "Válasz megnyitandó fájl" msgid "Choose a memory card:" msgstr "Válassz memóriakártyát:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 -msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" -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/ConfigMain.cpp:757 +msgid "" +"Choose file to use as apploader: (applies to discs constructed from " +"directories only)" +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:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: 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" @@ -1190,25 +1269,30 @@ msgstr "Körös kar" msgid "Classic" msgstr "Klasszikus" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Törlés" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Törlés sikertelen." #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." -msgstr "A kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. Kézileg kell leállítanod a játékot." +msgid "" +"Client disconnect while game is running!! NetPlay is disabled. You must " +"manually stop the game." +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:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1217,6 +1301,10 @@ msgstr "A kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. K #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Bezárás" @@ -1240,20 +1328,20 @@ msgstr "Parancs" msgid "Comment" msgstr "Megjegyzés" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Megjegyzés:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "ISO tömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Kiválasztott ISO tömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "ISO tömörítése" @@ -1280,13 +1368,13 @@ msgstr "Irányítók beállítása" msgid "Configure..." msgstr "Beállítások..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Fájl felülírás jóváhagyása" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Kilépéskor megerÅ‘sítés" @@ -1295,7 +1383,7 @@ msgstr "Kilépéskor megerÅ‘sítés" msgid "Connect" msgstr "Csatlakozás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "USB billentyűzet csatlakoztatása" @@ -1352,12 +1440,12 @@ msgstr "Konvertálás: GCI" msgid "Copy failed" msgstr "Másolás sikertelen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "%c. memóriakártyára másolás" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Mag" @@ -1373,15 +1461,21 @@ msgstr "%s hang feldolgozó iniciálása sikertelen." #: 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 "\"%s\" nem olvasható. Nincs lemez a meghajtóban, vagy ez nem egy GC/Wii biztonsági mentés. Célszerű tudni, hogy az eredeti Gamecube és Wii lemezeket a legtöbb számítógépes DVD meghajtó nem képes olvasni." +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\" nem olvasható. Nincs lemez a meghajtóban, vagy ez nem egy GC/Wii " +"biztonsági mentés. Célszerű tudni, hogy az eredeti Gamecube és Wii " +"lemezeket a legtöbb számítógépes DVD meghajtó nem képes olvasni." #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "%s ISO fájl nem ismerhetÅ‘ fel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "%s nem menthetÅ‘ el" @@ -1394,18 +1488,19 @@ 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:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, 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 memóriakártya fájl nem írható.\n" "\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:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Az 'ini' kiterjesztéshez nem található nyitott parancs!" @@ -1422,7 +1517,7 @@ msgstr "" msgid "Count:" msgstr "Számláló:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Ország:" @@ -1436,23 +1531,26 @@ 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:500 msgid "Created by KDE-Look.org" msgstr "Készítette: KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 -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:497 +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:498 msgid "Created by VistaIcons.com" msgstr "Készítette: VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 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" +msgstr "" +"Készítette: black_rider és közzétette ForumW.org > Web Developments oldalon" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "KészítÅ‘:" @@ -1460,7 +1558,7 @@ msgstr "KészítÅ‘:" msgid "Critical" msgstr "Kritikus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Levágás" @@ -1483,7 +1581,7 @@ msgstr "Kereszthalkítás" 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:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Egyedi megjelenítési hack" @@ -1491,11 +1589,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:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 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:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Cseh" @@ -1507,10 +1605,11 @@ msgstr "Digitális irányok" msgid "DSP" msgstr "Hang" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "DSP emulátor motor" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1521,18 +1620,22 @@ msgstr "DSP emulátor motor" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emuláció (gyors)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (lassú)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE folyamatágon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE recompiler" @@ -1540,15 +1643,23 @@ msgstr "DSP LLE recompiler" msgid "DSP settings" msgstr "Hang (DSP) beállítások" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD gyökér könyvtár:" +#: 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:176 msgid "Data Size" msgstr "Adatok mérete" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Dátum:" @@ -1569,7 +1680,7 @@ msgstr "Holtsáv" msgid "Debug" msgstr "HibakeresÅ‘" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Hibakeresés" @@ -1577,16 +1688,16 @@ msgstr "Hibakeresés" msgid "Decimal" msgstr "Decimális" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "ISO kitömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "A kiválasztott ISO fájlok kitömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "ISO kitömörítés" @@ -1594,11 +1705,11 @@ msgstr "ISO kitömörítés" msgid "Default" msgstr "Alap" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Alapértelmezett ISO:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Alap betűtípus" @@ -1607,7 +1718,7 @@ msgstr "Alap betűtípus" msgid "Delete" msgstr "Törlés" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Mentés törlése" @@ -1616,7 +1727,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:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Leírás" @@ -1624,18 +1735,22 @@ msgstr "Leírás" msgid "Detect" msgstr "Észlelés" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 -msgid "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp." -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/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 "" +"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 msgid "Device" msgstr "Eszköz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Eszköz beállítások" @@ -1660,47 +1775,55 @@ msgstr "" " és a könyvtár biztonsági mentés ellenÅ‘rzÅ‘ összeg hibás" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Kikapcsolás" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Köd kikapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Fényhatások kikapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Képpont mélység kikapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Textúrák kikapcsolása" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 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 "" "Bármilyen XFB emuláció kikapcsolása.\n" -"Nagymértékben gyorsítja az emulációt, de számos grafikai hibát okoz sok olyan játékban, amelyhez szükséges az XFB (fÅ‘leg egyedi fejlesztésű alkalmazások).\n" +"Nagymértékben gyorsítja az emulációt, de számos grafikai hibát okoz sok " +"olyan játékban, amelyhez szükséges az XFB (fÅ‘leg egyedi fejlesztésű " +"alkalmazások).\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 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 másolatok emulációjának kikapcsolása.\n" -"A másolatok gyakran használatosak utófeldolgozáshoz vagy textúra megjelenítési effektusokhoz, ezért ennek a beállításnak a kijelölésével nagymértékű sebesség növekedés érhetÅ‘ el, azonban majdnem mindig hibákat is okoz.\n" +"A másolatok gyakran használatosak utófeldolgozáshoz vagy textúra " +"megjelenítési effektusokhoz, ezért ennek a beállításnak a kijelölésével " +"nagymértékű sebesség növekedés érhetÅ‘ el, azonban majdnem mindig hibákat is " +"okoz.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -1714,7 +1837,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Lemez" @@ -1741,6 +1864,7 @@ msgstr "" msgid "Divide" msgstr "Megosztás" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1750,10 +1874,13 @@ msgstr "Megosztás" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. 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:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1778,6 +1905,7 @@ msgstr "Dolphin emulált Wiimote beállítások" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1802,6 +1930,14 @@ msgstr "Dolphin GCPad beállítások" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad beállítások" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS videók (*.dtm)" @@ -1814,23 +1950,31 @@ msgid "Dolphin at &Google Code" msgstr "Dolphin &Google Code oldal" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 -msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." -msgstr "Dolphin nem talált egyetlen GC/Wii ISO fájlt sem. Fájlok tallózásához dupla kattintás ide..." +msgid "" +"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " +"files..." +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:343 -msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." -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..." +msgid "" +"Dolphin is currently set to hide all games. Doubleclick here to show all " +"games..." +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/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Le" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Kódok letöltése (WiiRD adatbázis)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Letöltve %lu kód. (hozzáadva %lu)" @@ -1839,23 +1983,23 @@ msgstr "Letöltve %lu kód. (hozzáadva %lu)" msgid "Drums" msgstr "Dobok" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Utánzat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Hang mentése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "EFB cél letárolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Képkockák letárolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Textúrák letárolása" @@ -1865,7 +2009,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Az összes létrehozott képkocka mentése egy AVI fájlba ide: User/Dump/Frames/\n" +"Az összes létrehozott képkocka mentése egy AVI fájlba ide: User/Dump/" +"Frames/\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -1889,6 +2034,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1904,6 +2050,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holland" @@ -1917,10 +2068,18 @@ msgstr "EFB másolatok" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 #, 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 "HIBA: A Dolphin ezen változatához szükséges a TAP-Win32 driver %d.%d verziója legalább -- Ha mostanában telepítetted a Dolphin emulátort, akkor valószínűleg újra kell indítanod a számítógépet, hogy a Windows felismerje az új illesztÅ‘programot." +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 "" +"HIBA: A Dolphin ezen változatához szükséges a TAP-Win32 driver %d.%d " +"verziója legalább -- Ha mostanában telepítetted a Dolphin emulátort, akkor " +"valószínűleg újra kell indítanod a számítógépet, hogy a Windows felismerje " +"az új illesztÅ‘programot." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EURÓPA" @@ -1936,7 +2095,7 @@ msgstr "Szerkesztés" msgid "Edit ActionReplay Code" msgstr "ActionReplay kód szerkesztése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Beállítások szerkesztése" @@ -1948,8 +2107,8 @@ msgstr "Patch szerkesztése" msgid "Edit current perspective" msgstr "Jelenlegi perspektíva szerkesztése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Szerkesztés..." @@ -1968,24 +2127,30 @@ msgstr "Az emuláció már fut" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 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 "" "Az XFB pontos emulációja.\n" -"JelentÅ‘sen lassítja az emulációt és korlátozza a nagy felbontású megjelenítést, azonban szükséges számos játék pontos emulációjához.\n" +"JelentÅ‘sen lassítja az emulációt és korlátozza a nagy felbontású " +"megjelenítést, azonban szükséges számos játék pontos emulációjához.\n" "\n" "Ha bizonytalan vagy, jelöld ki inkább az XFB emulációt." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 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 "" "XFB emuláció grafikai processzor textúra objektumainak használatával.\n" -"Javít sok XFB emuláció nélkül nem működÅ‘ játékot miközben nem olyan lassú, mint a valódi XFB emuláció. Azonban, még mindig nem használható sok más játék esetén (fÅ‘leg egyedi fejlesztésű alkalmazások).\n" +"Javít sok XFB emuláció nélkül nem működÅ‘ játékot miközben nem olyan lassú, " +"mint a valódi XFB emuláció. Azonban, még mindig nem használható sok más " +"játék esetén (fÅ‘leg egyedi fejlesztésű alkalmazások).\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." @@ -1993,7 +2158,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emulált Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Emuláció állapota:" @@ -2003,13 +2168,15 @@ msgstr "Használat" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 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 "" -"A 3D-s effektusok megjelenítése sztereoszkópikus módon az Nvidia 3D Vision technológia használatával, ha támogatja a videókártya.\n" +"A 3D-s effektusok megjelenítése sztereoszkópikus módon az Nvidia 3D Vision " +"technológia használatával, ha támogatja a videókártya.\n" "Estleg hibákat okozhat.\n" "Működéséhez teljes képernyÅ‘ szükséges.\n" "\n" @@ -2019,18 +2186,15 @@ msgstr "" msgid "Enable AR Logging" msgstr "AR naplózás bekapcsolása" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Hang szabályozás használata" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "BAT használata" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Blokk csatlakozás használata" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 @@ -2041,6 +2205,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "Bounding Box kalkuláció használata" @@ -2049,6 +2216,7 @@ msgstr "Bounding Box kalkuláció használata" msgid "Enable Cache" msgstr "Gyorsítótár használata" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2058,51 +2226,54 @@ msgstr "Gyorsítótár használata" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Csalások használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "DTK zene bekapcsolása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Dual Core használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: 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:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Gyorsbillentyűk használata" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Tétlen állapot mellÅ‘zése" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Tétlen állapot mellÅ‘zése (gyorsítás)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "MMU használata" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Progresszív pásztázás használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "KépernyÅ‘védÅ‘ bekapcsolása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "SzéleskijelzÅ‘ bekapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Vonalháló bekapcsolása" @@ -2120,11 +2291,15 @@ msgstr "" "\n" "Ha bizonytalan vagy, válaszd ezt: 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -msgid "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)" -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/ISOProperties.cpp:325 +msgid "" +"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " +"Compatible)" +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:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Oldalak bekapcsolása" @@ -2142,23 +2317,35 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 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 "" -"Kapcsold be ha azt akarod, hogy inkább a Dolphin fÅ‘ ablakában jelenjen meg az emuláció, mint sem egy különálló ablakban.\n" +"Kapcsold be ha azt akarod, hogy inkább a Dolphin fÅ‘ ablakában jelenjen meg " +"az emuláció, mint sem egy különálló ablakban.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 -msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." -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:340 +msgid "" +"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " +"ANY other game." +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:311 -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: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:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Egyedi megjelenítési hack használata" @@ -2169,14 +2356,19 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Bekapcsolja a progresszív pásztázást, ha az támogatott az emulált szoftver által.\n" +"Bekapcsolja a progresszív pásztázást, ha az támogatott az emulált szoftver " +"által.\n" "A legtöbb játék nem használja ezt.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" -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/ISOProperties.cpp:317 +msgid "" +"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " +"OFF = Fast)" +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:117 msgid "" @@ -2192,6 +2384,7 @@ msgstr "" msgid "End" msgstr "Vége" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2207,6 +2400,11 @@ msgstr "Vége" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Angol" @@ -2237,6 +2435,7 @@ msgstr "EgyenlÅ‘" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Hiba" @@ -2269,18 +2468,30 @@ msgstr "" "Sajnos a Wii videó rögzítés egyenlÅ‘re nem működik." >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Hiba" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." -msgstr "Hiba a kiválasztott nyelv betöltése közben. Rendszer alapértelmezett visszaállítva." +msgstr "" +"Hiba a kiválasztott nyelv betöltése közben. Rendszer alapértelmezett " +"visszaállítva." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD ======= "Hiba: \"%s\" után, %d (0x%X) található a mentési jelölÅ‘ helyett %d (0x%X). " "Mentés betöltésének leállítása..." @@ -2289,11 +2500,20 @@ msgstr "" msgid "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). Aborting savestate load..." msgstr "Hiba: \"%s\" után, %d (0x%X) található a mentési jelölÅ‘ helyett %d (0x%X). Mentés betöltésének leállítása..." >>>>>>> Update Hungarian translation. +======= +"Hiba: \"%s\" után, %d (0x%X) található a mentési jelölÅ‘ helyett %d (0x%X). " +"Mentés betöltésének leállítása..." +>>>>>>> Update the pot file to reflect recent changes in the code. -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format -msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." -msgstr "Hiba: A(z) %s betűtípusokhoz történÅ‘ hozzáférési próbálkozás során, a betöltésük sikertelen. A játékokban a betűk lehet nem jelennek meg megfelelÅ‘en, vagy kifagynak." +msgid "" +"Error: Trying to access %s fonts but they are not loaded. Games may not show " +"fonts correctly, or crash." +msgstr "" +"Hiba: A(z) %s betűtípusokhoz történÅ‘ hozzáférési próbálkozás során, a " +"betöltésük sikertelen. A játékokban a betűk lehet nem jelennek meg " +"megfelelÅ‘en, vagy kifagynak." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2320,7 +2540,7 @@ msgstr "Kilépés a Dolphin emulátorból" msgid "Export Failed" msgstr "Exportálás sikertelen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Fájl exportálása" @@ -2333,15 +2553,15 @@ msgstr "Felvétel exportálása" msgid "Export Recording..." msgstr "Felvétel exportálása..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Mentés exportálása" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Wii mentés exportálása (kísérleti)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Minden mentés exportálása" @@ -2357,7 +2577,7 @@ msgstr "Exportálás mentése másként..." msgid "Extension" msgstr "KiegészítÅ‘" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "KülsÅ‘ képkocka puffer" @@ -2369,44 +2589,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Minden fájl kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "BetöltÅ‘ program kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "DOL kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Könyvtár kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Fájl kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Partíció kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "%s kitömörítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Minden fájl kitömörítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Könyvtár kitömörítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Kitömörítés..." @@ -2418,11 +2638,11 @@ msgstr "FIFO bájt" msgid "FIFO Player" msgstr "FIFO lejátszó" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANCIAORSZÃG" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FST méret:" @@ -2434,11 +2654,11 @@ msgstr "Csatlakozás sikertelen!" msgid "Failed to Listen!!" msgstr "Meghallgatás sikertelen!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Kódok letöltése sikertelen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: 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!" @@ -2483,7 +2703,8 @@ msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" msgstr "" -"A blokk kiosztási tábla biztonsági mentésének pontos visszaolvasása sikertelen\n" +"A blokk kiosztási tábla biztonsági mentésének pontos visszaolvasása " +"sikertelen\n" "(0x8000-0x9FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:144 @@ -2555,18 +2776,28 @@ 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/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Gyors" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Gyors mipmapek" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Fifo lejátszó" @@ -2575,7 +2806,7 @@ msgstr "Fifo lejátszó" msgid "File Info" msgstr "Fájl infó" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "A fájl nem tartalmazott kódokat." @@ -2608,16 +2839,16 @@ msgstr "A fájl nem ismerhetÅ‘ fel memóriakártyaként" msgid "File not compressed" msgstr "A fájl nincs tömörítve" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Ismeretlen megnyitási mód : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Fájlrendszer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Az 'ini' fájltípus ismeretlen! Nem lesz megnyitva!" @@ -2625,7 +2856,7 @@ msgstr "Az 'ini' fájltípus ismeretlen! Nem lesz megnyitva!" msgid "First Block" msgstr "ElsÅ‘ blokk" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Ãllandó ellenÅ‘rzőösszeg" @@ -2637,7 +2868,7 @@ msgstr "Kényszerített 16:9" msgid "Force 4:3" msgstr "Kényszerített 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Konzol kényszerítése NTSC-J típusra" @@ -2652,7 +2883,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Kényszerített textúra szűrés lesz még akkor is, ha a játék határozottan letiltotta azt.\n" +"Kényszerített textúra szűrés lesz még akkor is, ha a játék határozottan " +"letiltotta azt.\n" "Némileg javítja a textúra minÅ‘séget, de képhibákat okozhat néhány játékban.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -2669,13 +2901,15 @@ 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 setting when playing Japanese games." +"Left unchecked, dolphin defaults to NTSC-U and automatically enables this " +"setting when playing Japanese games." msgstr "" "Az NTSC-J működési módot kényszeríti japán ROM betűkészlet használatához.\n" -"Hagyd kijelöletlenül, a Dolphin alapértelmezett az NTSC-U és automatikusan bekapcsolódik ez a beállítás japán játékok használatakor." +"Hagyd kijelöletlenül, a Dolphin alapértelmezett az NTSC-U és automatikusan " +"bekapcsolódik ez a beállítás japán játékok használatakor." #: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" @@ -2703,7 +2937,7 @@ msgstr "Képkocka" msgid "Frame Advance" msgstr "Képkocka léptetés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Képkocka mentések FFV1 használatával" @@ -2715,7 +2949,7 @@ msgstr "Képkocka rendezés" msgid "Frame S&kipping" msgstr "Képkocka k&ihagyás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Képkocka korlát:" @@ -2723,10 +2957,11 @@ msgstr "Képkocka korlát:" msgid "Frames To Record" msgstr "RögzítendÅ‘ képkockák" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Szabad nézet" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2742,6 +2977,11 @@ msgstr "Szabad nézet" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francia" @@ -2780,7 +3020,7 @@ msgstr "GCMic beállítások" msgid "GCPad" msgstr "GC irányító" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "Játék azonosító:" @@ -2796,15 +3036,15 @@ msgstr "A játék nem fut!" msgid "Game not found!!" msgstr "A játék nem található!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "A játék sajátos beállításai" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Játék konfig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2815,6 +3055,7 @@ msgstr "Gamecube &irányító beállítások" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2822,6 +3063,9 @@ msgstr "Gamecube &irányító beállítások" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube memóriakártyák (*.raw,*.gcp)" @@ -2830,15 +3074,17 @@ msgid "Gamecube Pad settings" msgstr "Gamecube irányító beállítások" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko kódok" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, 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.)" +"(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 "" "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.)" @@ -2847,6 +3093,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2855,6 +3102,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Ãltalános" @@ -2863,6 +3113,7 @@ msgstr "Ãltalános" msgid "General Settings" msgstr "Ãltalános beállítások" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2878,6 +3129,11 @@ msgstr "Ãltalános beállítások" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Német" @@ -2907,19 +3163,23 @@ msgstr "Nagyobb mint" ======= >>>>>>> Update Hungarian and Turkish translations. 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 "" -"Nagymértékben javítja azon textúrák minÅ‘ségét, amelyeket a textúra effektusokhoz használatos képalkotó hozott létre.\n" +"Nagymértékben javítja azon textúrák minÅ‘ségét, amelyeket a textúra " +"effektusokhoz használatos képalkotó hozott létre.\n" "A belsÅ‘ felbontás növelése javítja ennek a beállításnak a hatását.\n" -"Némileg csökkenti a teljesítményt és esetlegesen hibákat okozhat (habár valószínűtlen).\n" +"Némileg csökkenti a teljesítményt és esetlegesen hibákat okozhat (habár " +"valószínűtlen).\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Görög" @@ -2951,7 +3211,7 @@ msgstr "Hackek" msgid "Header checksum failed" msgstr "A fejléc ellenÅ‘rzÅ‘ összege hibás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Héber" @@ -2974,7 +3234,8 @@ msgid "" msgstr "" "Szia,\n" "\n" -"A Dolphin működéséhez szükséges, hogy a processzor rendelkezzen SSE2 utasításkészlettel.\n" +"A Dolphin működéséhez szükséges, hogy a processzor rendelkezzen SSE2 " +"utasításkészlettel.\n" "Sajnos a processzorod nem támogatja azt, ezért a Dolphin nem fog működni.\n" "\n" "Sayonara!\n" @@ -3020,12 +3281,16 @@ msgstr "Gyorsbillentyű beállítások" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Gyorsbill." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Magyar" @@ -3033,27 +3298,31 @@ msgstr "Magyar" msgid "Hybrid Wiimote" msgstr "Hibrid Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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" +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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, 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: A játék megkísérelte az IOS újratöltését vagy egy olyan címét ami nem érhetÅ‘ el a NAND mentésedben\n" +"IOCTL_ES_LAUNCH: A játék megkísérelte az IOS újratöltését vagy egy olyan " +"címét ami nem érhetÅ‘ el a NAND mentésedben\n" "TitleID %016llx.\n" " A Dolphin valószínűleg kifagy most" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - rossz cél" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL beállítások" @@ -3069,15 +3338,15 @@ msgstr "IR mutató" msgid "IR Sensitivity:" msgstr "IR érzékenysége:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "ISO részletek" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "ISO könyvtárak" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "OLASZORSZÃG" @@ -3085,13 +3354,18 @@ msgstr "OLASZORSZÃG" msgid "Icon" msgstr "Ikon" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 <<<<<<< HEAD +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD ======= "Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper Mario " "játékok használják." @@ -3100,14 +3374,28 @@ msgstr "" msgid "If checked, the bounding box registers will be updated. Used by the Paper Mario games." msgstr "Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper Mario játékok használják." >>>>>>> Update Hungarian translation. +======= +"Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper Mario " +"játékok használják." +>>>>>>> Update the pot file to reflect recent changes in the code. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -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/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:485 -msgid "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." -msgstr "Ha a képkocka korlát értéke magasabb a játék teljes sebességénél (NTSC:60, 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/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 "" +"Ha a képkocka korlát értéke magasabb a játék teljes sebességénél (NTSC:60, " +"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:432 msgid "Ignore Format Changes" @@ -3116,28 +3404,33 @@ msgstr "Formátum változások kihagyása" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 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 "" "Minden EFB formátum változás figyelmen kívül hagyása.\n" -"Sok játékban növeli a teljesítményt bármilyen negatív hatás nélkül. Noha grafikai hiányosságok jelentkezhetnek kevés egyéb játékban.\n" +"Sok játékban növeli a teljesítményt bármilyen negatív hatás nélkül. Noha " +"grafikai hiányosságok jelentkezhetnek kevés egyéb játékban.\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 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 "" -"Figyelmen kívül hagyja a processzor összes EFB-re irányuló kiolvasási vagy írási kérelmét.\n" -"Néhány játékban növeli a teljesítményt, de kikapcsolhat néhány játékmenetre vonatkozó funkciót vagy grafikus effektust.\n" +"Figyelmen kívül hagyja a processzor összes EFB-re irányuló kiolvasási vagy " +"írási kérelmét.\n" +"Néhány játékban növeli a teljesítményt, de kikapcsolhat néhány játékmenetre " +"vonatkozó funkciót vagy grafikus effektust.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Mentés importálása" @@ -3167,11 +3460,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 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öveli a teljesítményt de képhibákat okoz azokban a játékban, amelykben fontos a megfelelÅ‘ köd emuláció.\n" +"Növeli a teljesítményt de képhibákat okoz azokban a játékban, amelykben " +"fontos a megfelelÅ‘ köd emuláció.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -3181,11 +3476,12 @@ msgid "" "\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ö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:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Elindul" @@ -3194,7 +3490,7 @@ msgid "In-Game" msgstr "Elindul" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Infó" @@ -3214,7 +3510,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:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "SD kártya behelyezése" @@ -3226,14 +3522,17 @@ msgstr "Ãrj be ide nevet..." msgid "Install WAD" msgstr "WAD telepítése" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Telepítés a Wii menübe" #: Source/Core/Core/Src/MemTools.cpp:248 -msgid "InstallExceptionHandler called, but this platform does not yet support it." -msgstr "InstallExceptionHandler elÅ‘idézve, de ez a platform még nem támogatja azt." +msgid "" +"InstallExceptionHandler called, but this platform does not yet support it." +msgstr "" +"InstallExceptionHandler elÅ‘idézve, de ez a platform még nem támogatja azt." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3243,14 +3542,17 @@ msgstr "InstallExceptionHandler elÅ‘idézve, de ez a platform még nem támogatj ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WAD telepítése..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Felhasználói felület" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Felület beállítások" @@ -3275,11 +3577,11 @@ msgstr "BelsÅ‘ LZO hiba - lzo_init() sikertelen" msgid "Internal Resolution:" msgstr "BelsÅ‘ felbontás:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreter (NAGYON lassú)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intró" @@ -3296,7 +3598,7 @@ msgstr "Érvénytelen érték!" msgid "Invalid bat.map or dir entry" msgstr "Érvénytelen bat.map vagy könyvtár bejegyzés" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Érvénytelen esemény fajta %i" @@ -3316,14 +3618,15 @@ msgstr "" "%s\n" " Valószínűleg újra le kell mentened a játékot." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Nem megfelelÅ‘ rögzített fájl" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Nem megfelelÅ‘ mentés" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3339,27 +3642,32 @@ msgstr "Nem megfelelÅ‘ mentés" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Olasz" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPÃN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (ajánlott)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL Recompiler (kísérleti)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japán" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KOREA" @@ -3368,8 +3676,8 @@ msgstr "KOREA" msgid "Key" msgstr "Bill." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Koreai" @@ -3387,7 +3695,7 @@ msgstr "L gomb" msgid "L-Analog" msgstr "Bal analóg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Nyelv:" @@ -3440,7 +3748,7 @@ msgstr "" msgid "Less Than" msgstr "Kevesebb mint" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "FPS alapú korlátozás" @@ -3448,7 +3756,7 @@ msgstr "FPS alapú korlátozás" msgid "Load" msgstr "Betöltés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Egyedi textúrák betöltése" @@ -3496,6 +3804,7 @@ msgstr "Ãllás betöltése a 8. helyrÅ‘l" msgid "Load State..." msgstr "Ãllás betöltése..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3517,6 +3826,13 @@ msgstr "Wii rendszer menü betöltése" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Wii rendszer menü betöltése" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii rendszer menü betöltése %d%c" @@ -3543,7 +3859,7 @@ msgstr "Meghatározott fájlt tölt be (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "Helyi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Folyamatágak magokhoz zárolása" @@ -3555,11 +3871,11 @@ msgstr "Napló" msgid "Log Configuration" msgstr "Napló beállítások" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Napló típus" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Napló kimenetek" @@ -3589,7 +3905,7 @@ msgstr "" "MD5 eltérés\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU sebesség növelÅ‘ hack" @@ -3611,11 +3927,11 @@ msgstr "MadCatz Gameshark fájlok (*.gcs)" msgid "Main Stick" msgstr "FÅ‘kar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "Gyártó azonosító:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Gyártó:" @@ -3639,6 +3955,7 @@ msgstr "Memória bájt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3646,12 +3963,19 @@ msgstr "Memória bájt" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Memóriakártya" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" -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!" +msgid "" +"Memory Card Manager WARNING-Make backups before using, should be fixed but " +"could mangle stuff!" +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 #, c-format @@ -3678,7 +4002,7 @@ 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:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mikrofon" @@ -3687,11 +4011,11 @@ msgstr "Mikrofon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Egyebek" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Egyéb beállítások" @@ -3702,15 +4026,17 @@ msgstr "Változó" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 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 "" -"Tetxúrák módosítása a kódolásukhoz használt formátum megjelenítéséhez. A legtöbb esetben az emuláció alapra állítása szükséges.\n" +"Tetxúrák módosítása a kódolásukhoz használt formátum megjelenítéséhez. A " +"legtöbb esetben az emuláció alapra állítása szükséges.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Azonos szélességű betűtípus" @@ -3723,7 +4049,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3745,9 +4071,13 @@ msgstr "" msgid "Multiply" msgstr "Multiply" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." -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/ISOProperties.cpp:333 +msgid "" +"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " +"effect on emulated wiimotes." +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/WXInputBase.cpp:126 msgid "NP Add" @@ -3833,6 +4163,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3842,6 +4173,9 @@ msgstr "NP Up" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3850,7 +4184,7 @@ msgstr "Cím:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Név:" @@ -3864,7 +4198,7 @@ msgid "New Scan" msgstr "Új keresés" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "KövetkezÅ‘ lap" @@ -3876,7 +4210,7 @@ msgstr "KövetkezÅ‘ keresés" msgid "Nickname :" msgstr "Becenév:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Nincs ország (SDK)" @@ -3915,7 +4249,7 @@ msgstr "%s játékhoz nem található mentési mappa" msgid "None" msgstr "Nincs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norvég" @@ -3923,8 +4257,8 @@ msgstr "Norvég" msgid "Not Equal" msgstr "Nem egyenlÅ‘" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Nincs beállítva" @@ -3944,7 +4278,7 @@ msgstr "Nincs csatlakoztatva" msgid "Notes" msgstr "Megjegyzés" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Megjegyzések:" @@ -3982,7 +4316,7 @@ msgstr "Elem" 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" @@ -4008,11 +4342,11 @@ msgstr "Csak %d blokk szabad" msgid "Open" msgstr "Megnyitás" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "A játékot &tartalmazó mappa megnyitása" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Wii &mentések mappa megnyitása" @@ -4034,11 +4368,11 @@ 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:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL textúra dekódoló" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP textúra dekódoló" @@ -4070,13 +4404,17 @@ msgstr "" "és az állásmentések importálásához az új memóriakártyára\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Egyéb" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." -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." +msgid "" +"Other client disconnected while game is running!! NetPlay is disabled. You " +"manually stop the game." +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 msgid "Output" @@ -4118,19 +4456,20 @@ msgstr "Paragraph" msgid "Parameters" msgstr "Paraméterek" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "%i partíció" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Javítások" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Mappák" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4143,6 +4482,10 @@ msgstr "Mappák" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Szünet" @@ -4151,7 +4494,7 @@ msgstr "Szünet" msgid "Per-Pixel Lighting" msgstr "Képpont alapú fényhatások" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Tökéletes" @@ -4164,6 +4507,7 @@ msgstr "%d perspektíva" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4174,6 +4518,10 @@ msgstr "%d perspektíva" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Indítás" @@ -4187,7 +4535,7 @@ msgstr "Felvétel visszajátszása" msgid "Play/Pause" msgstr "Indítás/Szünet" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Játszható" @@ -4199,6 +4547,7 @@ msgstr "Visszajátszási lehetÅ‘ségek" msgid "Players" msgstr "Játékosok" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4208,6 +4557,9 @@ msgstr "Játékosok" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Változtatás jóváhagyása..." @@ -4219,23 +4571,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:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Lengyel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "1. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "2. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "3. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "4. port" @@ -4244,11 +4596,11 @@ msgstr "4. port" msgid "Port :" msgstr "Port:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugál" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugál (brazil)" @@ -4256,7 +4608,7 @@ msgstr "Portugál (brazil)" msgid "Post-Processing Effect:" msgstr "Utófeldolgozási effektus:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" <<<<<<< HEAD @@ -4265,7 +4617,7 @@ msgstr "" msgstr "Túl korai PlayController videó befejezés. %u + 8 > %u" >>>>>>> Update from master branch. -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" <<<<<<< HEAD @@ -4274,7 +4626,7 @@ msgstr "" msgstr "Túl korai PlayWiimote videó befejezés. %u + %d > %u" >>>>>>> Update from master branch. -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" <<<<<<< HEAD @@ -4291,7 +4643,7 @@ msgstr "Gombkiosztás:" msgid "Prev Page" msgstr "ElÅ‘zÅ‘ lap" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "ElÅ‘zÅ‘ lap" @@ -4342,7 +4694,7 @@ msgstr "Jobb analóg" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "OROSZORSZÃG" @@ -4355,7 +4707,7 @@ msgstr "Hatótáv" msgid "Read-only mode" msgstr "Ãrásvédett mód" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Valódi" @@ -4409,7 +4761,8 @@ msgid "" "\n" "If unsure, select None." msgstr "" -"Csökkenti az éltöredezettséget, amit a képpontokra felbontott 3D-s grafika okoz.\n" +"Csökkenti az éltöredezettséget, amit a képpontokra felbontott 3D-s grafika " +"okoz.\n" "Ezáltal a megjelenített kép kevésbé lesz recézett.\n" "ErÅ‘sen csökkenti az emuláció sebességét és néha hibákat okoz.\n" "Ha bizonytalan vagy, válaszd ezt: Nincs. " @@ -4429,6 +4782,7 @@ msgstr "A lista frissítése" msgid "Refresh game list" msgstr "Játéklista frissítése" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4447,6 +4801,12 @@ msgstr "Játéklista frissítése" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Törlés" @@ -4499,11 +4859,11 @@ msgstr "Jobb kar" msgid "Rumble" msgstr "Rumble funkció" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: 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:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Orosz" @@ -4511,10 +4871,11 @@ msgstr "Orosz" msgid "Sa&ve State" msgstr "Ãl&lás mentése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Biztonságos" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4524,6 +4885,9 @@ msgstr "Biztonságos" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Mintavételezési frekvencia:" @@ -4581,12 +4945,12 @@ msgstr "Ãllás mentés a 8. helyre" msgid "Save State..." msgstr "Ãllás mentése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Mentés másként..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Tömörített GCM/ISO mentése" @@ -4594,11 +4958,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:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Kitömörített GCM/ISO mentése" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, 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..." @@ -4607,6 +4971,7 @@ 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" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4616,15 +4981,18 @@ msgstr "Méretezett EFB másolat" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Keresés %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "ISO fájlok keresése" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Keresés..." @@ -4640,14 +5008,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Keresési szűrÅ‘" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Keresés az almappákban" -#: Source/Core/Common/Src/SysConf.h:104 -#: Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 -#: Source/Core/Common/Src/SysConf.h:168 +#: 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 rész nem található a SYSCONF fájlban" @@ -4657,6 +5023,7 @@ msgstr "%s rész nem található a SYSCONF fájlban" msgid "Select" msgstr "Választás" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4681,6 +5048,14 @@ msgstr "Válassz rögzítendÅ‘ fájlt" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Válassz rögzítendÅ‘ fájlt" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Válassz telepítendÅ‘ Wii WAD fájlt" @@ -4706,6 +5081,7 @@ msgstr "Válassz lebegÅ‘ ablakokat" msgid "Select the file to load" msgstr "BetöltendÅ‘ fájl kiválasztása" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4722,19 +5098,26 @@ msgstr "Válassz betöltendÅ‘ állásmentést" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Válassz mentési fájlt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Válassz betöltendÅ‘ állásmentést" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Válassz mentendÅ‘ állást" @@ -4756,20 +5139,22 @@ msgstr "" "\n" "Ha bizonytalan vagy, válaszd ezt: Automatikus." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Kiválasztott betűtípus" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 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 "" "A teljes kijelzÅ‘ estén használatos felbontást állítja be.\n" -"Ennek mindig nagyobbnak, vagy azonosnak kell lennie a belsÅ‘ felbontással. Hatása a teljesítményre elhanyagolható.\n" +"Ennek mindig nagyobbnak, vagy azonosnak kell lennie a belsÅ‘ felbontással. " +"Hatása a teljesítményre elhanyagolható.\n" "\n" "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." @@ -4777,14 +5162,17 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 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 "" "Kiválasztja melyik grafikus API legyen használva belsÅ‘leg.\n" -"A Direct3D 9 többnyire a leggyorsabb. Az OpenGL azonban pontosabb. A Direct3D 11 valahol a kettÅ‘ között van.\n" -"Vedd figyelembe, hogy a Direct3D feldolgozók csak Windows esetén állnak rendelkezésre.\n" +"A Direct3D 9 többnyire a leggyorsabb. Az OpenGL azonban pontosabb. A " +"Direct3D 11 valahol a kettÅ‘ között van.\n" +"Vedd figyelembe, hogy a Direct3D feldolgozók csak Windows esetén állnak " +"rendelkezésre.\n" "\n" "Ha bizonytalan vagy, használd ezt: Direct3D 9." @@ -4800,23 +5188,25 @@ msgstr "ÉrzékelÅ‘ helyzete:" msgid "Separator" msgstr "Elválasztó" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Szerb" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 -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/ConfigMain.cpp:511 +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 msgid "Set" msgstr "Beáll." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Beállítás &alapértelmezett ISO fájlként" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Beállítás alapértelmezett %c. memóriakártyaként" @@ -4824,9 +5214,10 @@ msgstr "Beállítás alapértelmezett %c. memóriakártyaként" #: Source/Core/Core/Src/ActionReplay.cpp:462 #, c-format 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" +msgstr "" +"SetARCode_IsActive: A jelzÅ‘szám nagyobb mint az ar kód lista mérete %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Beállítások..." @@ -4838,7 +5229,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:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Rövid cím:" @@ -4866,7 +5257,7 @@ msgstr "Eszközsor &mutatása" msgid "Show Drives" msgstr "Meghajtók mutatása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "EFB másolat régiók megjelenítése" @@ -4882,7 +5273,7 @@ msgstr "Franciaország mutatása" msgid "Show GameCube" msgstr "GameCube mutatása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Bemeneti kijelzÅ‘ megjelenítése" @@ -4898,7 +5289,7 @@ msgstr "JAP mutatása" msgid "Show Korea" msgstr "Korea mutatása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "A játék nyelve:" @@ -4918,7 +5309,7 @@ msgstr "Platformok mutatása" msgid "Show Regions" msgstr "Régiók mutatása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Statisztikák megjelenítése" @@ -4938,45 +5329,50 @@ msgstr "Wad mutatása" 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 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 "" -"FigyelmeztetÅ‘ üzenet jelenik meg egy potenciálisan komoly hiba bekövetkezésekor.\n" -"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." +"FigyelmeztetÅ‘ üzenet jelenik meg egy potenciálisan komoly hiba " +"bekövetkezésekor.\n" +"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:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Az elsÅ‘ blokk megjelenítése" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "MentendÅ‘ blokkok megjelenítése" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "MentendÅ‘ megjegyzések megjelenítése" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "MentendÅ‘ ikonok megjelenítése" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "MentendÅ‘ címek megjelenítése" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 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 "" -"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" +"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." @@ -5002,7 +5398,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Oldalt tartott Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Egyszerűsített kínai" @@ -5010,11 +5406,11 @@ msgstr "Egyszerűsített kínai" msgid "Size" msgstr "Méret" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "BIOS kihagyása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Dest. Alpha Pass kihagyása" @@ -5024,11 +5420,13 @@ msgstr "Az EFB processzor hozzáférésének átugrása" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 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 "" -"A sok játékban különféle grafikai effektusokhoz használt destination alpha pass figyelmen kívül hagyása.\n" +"A sok játékban különféle grafikai effektusokhoz használt destination alpha " +"pass figyelmen kívül hagyása.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -5036,13 +5434,15 @@ 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 "" "Kissé gyorsítja az EFB RAM másolatokat az emuláció pontosságának rovására.\n" "Néha a vizuális minÅ‘séget is növeli.\n" -"Ha bármely hibát tapasztalsz, próbáld növelni a textúra gyorsítótár pontosságát vagy kapcsold ki ezt az opciót.\n" +"Ha bármely hibát tapasztalsz, próbáld növelni a textúra gyorsítótár " +"pontosságát vagy kapcsold ki ezt az opciót.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -5052,11 +5452,11 @@ msgstr "" msgid "Slot %i" msgstr "%i hely" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "A hely" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "B hely" @@ -5070,15 +5470,18 @@ msgstr "Szoftveres képalkotó" #: 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 "" -"A szoftveres képalkotó egy fontosságbeli sorrenden alapul és lassabb a feldolgozók használatánál.\n" +"A szoftveres képalkotó egy fontosságbeli sorrenden alapul és lassabb a " +"feldolgozók használatánál.\n" "Csak hibakeresési célra hasznos.\n" -"Biztosan be kívánod kapcsolni a szoftveres képalkotót? Ha bizonytalan vagy, válaszd ezt: 'Nem'." +"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:621 msgid "Sound Settings" msgstr "Hang beállítások" @@ -5096,6 +5499,7 @@ msgstr "Hang puffer létrehozása sikertelen: %s" msgid "Space" msgstr "Szóköz" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5111,6 +5515,11 @@ msgstr "Szóköz" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spanyol" @@ -5120,13 +5529,21 @@ msgstr "Hangszóró hangerÅ‘:" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 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 "" -"Meghatározza a megjelenítéshez használatos felbontást. A magas felbontás nagyban növeli a vizuális minÅ‘séget, de erÅ‘sen befolyásolja a teljesítményt és képhibákat okozhat bizonyos játékoknál.\n" -"\"640x528 többszöröse\" egy kicsivel lassabb, mint az \"Ablak méret\" viszont kevesebb hibák eredményez. Ãltalánosságban elmondható, minél kisebb a belsÅ‘ felbontás, annál jobb a teljesítmény.\n" +"Meghatározza a megjelenítéshez használatos felbontást. A magas felbontás " +"nagyban növeli a vizuális minÅ‘séget, de erÅ‘sen befolyásolja a teljesítményt " +"és képhibákat okozhat bizonyos játékoknál.\n" +"\"640x528 többszöröse\" egy kicsivel lassabb, mint az \"Ablak méret\" " +"viszont kevesebb hibák eredményez. Ãltalánosságban elmondható, minél kisebb " +"a belsÅ‘ felbontás, annál jobb a teljesítmény.\n" "\n" "Ha bizonytalan vagy, válaszd ezt: 640x528." @@ -5134,7 +5551,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Válassz videó feldolgozót" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "A lemez adatátviteli arány gyorsítása" @@ -5142,7 +5559,7 @@ msgstr "A lemez adatátviteli arány gyorsítása" msgid "Square Stick" msgstr "Négyzetes kar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Normál irányító" @@ -5204,12 +5621,15 @@ msgstr "Leállítás" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 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 "" "Az EFB másolatokat a grafikai processzor textúra objektumaiban tárolja.\n" -"Ez nem annyira pontos, de elég jól működik a legtöbb játék esetén és jelentÅ‘s sebességnövekedést okoz az EFB RAM-ban történÅ‘ tárolásával szemben.\n" +"Ez nem annyira pontos, de elég jól működik a legtöbb játék esetén és " +"jelentÅ‘s sebességnövekedést okoz az EFB RAM-ban történÅ‘ tárolásával " +"szemben.\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." @@ -5238,12 +5658,12 @@ msgstr "Mentés fájlok sikeresen importálva" msgid "Swing" msgstr "Lengetés" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Rendszer nyelv:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAJVAN" @@ -5289,7 +5709,7 @@ msgstr "Tábla jobbra" msgid "Take Screenshot" msgstr "Pillanatkép készítése" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" <<<<<<< HEAD msgstr "" @@ -5309,7 +5729,7 @@ msgstr "Textúra" msgid "Texture Cache" msgstr "Textúra gyorsítótár" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Textúra formátum átfedés" @@ -5325,13 +5745,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:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 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:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5342,15 +5762,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 fájl nem nyitható meg íráshoz. EllenÅ‘rizd, hogy nincs-e megnyitva már másik program által." +msgid "" +"The file %s could not be opened for writing. Please check if it's already " +"opened by another program." +msgstr "" +"%s fájl nem nyitható meg íráshoz. EllenÅ‘rizd, hogy nincs-e megnyitva már " +"másik program által." #: 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 fáj már meg van nyitva, a fájl fejléce nem írható." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Az általad megadott (%s) fájl nem létezik" @@ -5368,12 +5792,15 @@ 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:98 +#, fuzzy 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 second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" -"Minél biztonságosabb a beállítás, annál kevésbé valószínű, hogy az emulátor textúra frissítést fog a RAM-ból hiányolni.\n" +"Minél biztonságosabb a beállítás, annál kevésbé valószínű, hogy az emulátor " +"textúra frissítést fog a RAM-ból hiányolni.\n" "\n" "Ha bizonytalan vagy, használd a második leggyorsabb értéket jobbról." @@ -5382,8 +5809,12 @@ 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 -msgid "The selected language is not supported by your system. Falling back to system default." -msgstr "A választott nyelvet nem támogatja az oprációs rendszer. Visszaállás a rendszer alapértelmezettre." +msgid "" +"The selected language is not supported by your system. Falling back to " +"system default." +msgstr "" +"A választott nyelvet nem támogatja az oprációs rendszer. Visszaállás a " +"rendszer alapértelmezettre." #: Source/Core/Core/Src/NetPlayClient.cpp:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -5410,7 +5841,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:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Kinézet" @@ -5418,11 +5849,15 @@ msgstr "Kinézet" 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:467 -msgid "There must be a ticket for 00000001/00000002. Your NAND dump is probably incomplete." -msgstr "Kell lennie egy jegynek itt: 00000001/00000002. A NAND mentésed valószínűleg befejezetlen." +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 +msgid "" +"There must be a ticket for 00000001/00000002. Your NAND dump is probably " +"incomplete." +msgstr "" +"Kell lennie egy jegynek itt: 00000001/00000002. A NAND mentésed valószínűleg " +"befejezetlen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5431,52 +5866,53 @@ msgstr "" "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 -msgid "This action replay simulator does not support codes that modify Action Replay itself." -msgstr "Az action replay szimulátor nem támogat olyan kódokat, amelyek módosítját magát az Action Replay-t." +msgid "" +"This action replay simulator does not support codes that modify Action " +"Replay itself." +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:513 +#: 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:119 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 "" "Ez a funkció lehetÅ‘vé teszi a játék kamera szabad irányítását.\n" -"Tartsd lenyomva a jobb egér gombot és mozgasd az egeret, hogy körbepásztázz a kamerával. Tartsd lenyomva a SHIFT billentyűt és a WASD billentyűk valamelyikével mozgasd a kamerát távolsági léptékenként (SHIFT+0 megduplázza (x2) és a SHIFT+9 megfelezi (x0.5)). Nyomd le a SHIFT+R kombinációt a kamera alapértékre állításához.\n" +"Tartsd lenyomva a jobb egér gombot és mozgasd az egeret, hogy körbepásztázz " +"a kamerával. Tartsd lenyomva a SHIFT billentyűt és a WASD billentyűk " +"valamelyikével mozgasd a kamerát távolsági léptékenként (SHIFT+0 megduplázza " +"(x2) és a SHIFT+9 megfelezi (x0.5)). Nyomd le a SHIFT+R kombinációt a " +"kamera alapértékre állításához.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -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 "" -"Ez a játék sebességének szabályozására szolgál a hang szabályozás által.\n" -"Kikapcsolása rendellenes sebességet okozhat, többnyire túl gyorsat.\n" -"Viszont néha a bekapcsolása folyamatos zajt eredményezhet.\n" -"\n" -"Gyorsbillentyű : Tartsd lenyomva a szabályozás azonnali kikapcsolásához." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Ez a zenei sávok, mint BGM lejátszásra szolgá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" -"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 "" -"Ez megosztja a videó és processzor folyamatágakat, így azok külön magon futhatnak.\n" -"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." +"Ez megosztja a videó és processzor folyamatágakat, így azok külön magon " +"futhatnak.\n" +"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:283 +#: 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" @@ -5499,7 +5935,7 @@ msgstr "Cím" msgid "To" msgstr "eddig:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Minden napló típus kijelölése" @@ -5519,6 +5955,7 @@ msgstr "Váltás teljes nézetre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5526,14 +5963,17 @@ msgstr "Váltás teljes nézetre" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Fent" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Hagyományos kínai" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Próbálkozás egy ismeretlen fájltípus betöltésével. " @@ -5541,8 +5981,7 @@ msgstr "Próbálkozás egy ismeretlen fájltípus betöltésével. " msgid "Triggers" msgstr "Kioldó gombok" -#: Source/Core/Common/Src/SysConf.h:92 -#: Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Olvasási próbálkozás az érvénytelen SYSCONF fájlból" @@ -5554,7 +5993,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:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Török" @@ -5575,11 +6014,11 @@ msgstr "UDP port:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "ISMERETLEN" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -5594,10 +6033,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 "" -"A megadott AR kód %lu sorának érvényes kódolt, vagy kódolatlan kódként történÅ‘ elemzése nem lehetséges. GyÅ‘zÅ‘dj meg róla, hogy helyesen írtad be.\n" +"A megadott AR kód %lu sorának érvényes kódolt, vagy kódolatlan kódként " +"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 @@ -5631,7 +6072,9 @@ msgstr "Ismeretlen üzenet érkezett ezzel az azonosítóval : %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" -msgstr "Ismeretlen üzenet érkezett ezzel az azonosítóval:%d ettÅ‘l a játékostól:%d Játékos kirúgása!" +msgstr "" +"Ismeretlen üzenet érkezett ezzel az azonosítóval:%d ettÅ‘l a játékostól:%d " +"Játékos kirúgása!" <<<<<<< HEAD <<<<<<< HEAD @@ -5662,7 +6105,7 @@ msgstr "Frissítés" msgid "Upright Wiimote" msgstr "ElÅ‘re tartott Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 mód (PAL60) használata" @@ -5674,7 +6117,7 @@ msgstr "Teljes nézet használata" msgid "Use Hex" msgstr "Hexa használat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "HibakezelÅ‘k használata" @@ -5686,23 +6129,27 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Több folyamatág használata a textúrák dekódolásához.\n" -"Sebesség növekedést eredményezhet (fÅ‘leg a két magnál többel rendelkezÅ‘ processzorok esetén).\n" +"Sebesség növekedést eredményezhet (fÅ‘leg a két magnál többel rendelkezÅ‘ " +"processzorok esetén).\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 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 "" -"Ãltalában ha az árnyaló összeállítása sikertelen, megjelenik egy hibaüzenet.\n" -"Azonban, ennek az opciónak a kijelölésével elérhetÅ‘ a felugró ablak kihagyása, azaz a megszakítás nélküli játékmenet.\n" +"Ãltalában ha az árnyaló összeállítása sikertelen, megjelenik egy " +"hibaüzenet.\n" +"Azonban, ennek az opciónak a kijelölésével elérhetÅ‘ a felugró ablak " +"kihagyása, azaz a megszakítás nélküli játékmenet.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Kellékek" @@ -5726,25 +6173,29 @@ msgstr "Érték:" msgid "Verbosity" msgstr "Verbosity" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Kép" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtuális" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "HangerÅ‘" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD telepítési hiba: hiba a(z) %s létrehozása közben" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +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:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5763,15 +6214,15 @@ msgstr "" msgid "Warning" msgstr "Figyelem" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 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:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Figyelem - ELF indítása nem megfelelÅ‘ konzol módban!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Figyelem - ISO indítása nem megfelelÅ‘ konzol módban!" @@ -5799,20 +6250,27 @@ msgstr "" "és azonos néven fog szerepelni a memóriakártyán lévÅ‘kkel\n" "Folytatod?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update the pot file to reflect recent changes in the code. 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 "" <<<<<<< HEAD +<<<<<<< HEAD ======= +======= +>>>>>>> Update the pot file to reflect recent changes in the code. "Figyelem: Olyan mentést töltöttél be, ami a választott videó befejezése " "utáni. (%u > %u bájt) (%u > %u képkocka). Folytatás elÅ‘tt betölthetsz egy " "másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása " "után." +<<<<<<< HEAD >>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:646 @@ -5832,50 +6290,82 @@ msgstr "" ======= 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 "Figyelem: Olyan mentést töltöttél be, ami a választott videó befejezése utáni. (%u > %u bájt) (%u > %u képkocka). Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása után." +======= +>>>>>>> Update the pot file to reflect recent changes in the code. -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format +<<<<<<< HEAD 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 "Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d (0x%X) bájt eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ esetben szinkronizációs hibák jelentkezhetnek." >>>>>>> Update Hungarian translation. +======= +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 "" +"Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d (0x%X) bájt " +"eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy " +"betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ " +"esetben szinkronizációs hibák jelentkezhetnek." +>>>>>>> Update the pot file to reflect recent changes in the code. -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, 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 "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= +======= +>>>>>>> Update the pot file to reflect recent changes in the code. "Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d képkocka eltérés " "mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy betöltheted " "ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ esetben " "szinkronizációs hibák jelentkezhetnek.\n" +<<<<<<< HEAD ======= "Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d képkocka eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ esetben szinkronizációs hibák jelentkezhetnek.\n" >>>>>>> Update Hungarian translation. +======= +>>>>>>> Update the pot file to reflect recent changes in the code. "\n" -"BÅ‘vebb információk: A választott videó %d képkocka hosszú, a mentett állás videója pedig %d képkocka hosszú.\n" +"BÅ‘vebb információk: A választott videó %d képkocka hosszú, a mentett állás " +"videója pedig %d képkocka hosszú.\n" "\n" "%d képkockánál a videó tömörítve lesz:\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 képkockánál a mentett állás videója tömörítve lesz:\n" <<<<<<< HEAD +<<<<<<< HEAD "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" >>>>>>> Update from master branch. ======= "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" >>>>>>> Update Hungarian translation. +======= +"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" +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -5886,7 +6376,7 @@ msgstr "WaveFileWriter - fájl nincs megnyitva." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Szélesvásznú hack" @@ -5894,15 +6384,15 @@ msgstr "Szélesvásznú hack" msgid "Width" msgstr "Szélesség" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii konzol" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND gyökér könyvtár:" @@ -5910,6 +6400,7 @@ msgstr "Wii NAND gyökér könyvtár:" msgid "Wii Save Import" msgstr "Wii mentés importálása" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5919,6 +6410,9 @@ msgstr "Wii mentés importálása" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii mentés fájlok (*.bin)|*.bin" @@ -5985,10 +6479,11 @@ msgstr "Windows menü" msgid "Windows Right" msgstr "Jobb Windows" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6004,6 +6499,11 @@ msgstr "Word Wrap" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Folyamatban..." @@ -6011,6 +6511,11 @@ msgstr "Folyamatban..." msgid "Write to Console" msgstr "Ãrás a konzolba" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Ãrás fájlba" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Ãrás fájlba" @@ -6060,15 +6565,17 @@ msgstr "Meg kell adnod egy nevet!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 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." +msgstr "" +"Be kell írnod egy érvényes decimális, hexadecimális vagy oktális értéket." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 msgid "You must enter a valid profile name." msgstr "Meg kell adnod egy érvényes profil nevet." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 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." +msgstr "" +"Újra kell indítanod a Dolphin emulátort a változtatások érvényesítéséhez." #: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" @@ -6089,7 +6596,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:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP hack" @@ -6126,14 +6633,19 @@ msgstr "[Egyedi]" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 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 "" "[KÃSÉRLETI]\n" -"Az emuláció gyorsítása a célja a textúrák kirakásával dekódolva a grafikai processzor számára az OpenCL keretrendszert használva.\n" -"Azonban, jelenleg köztudottan textúra hiányosságokat okoz számos játékban. Lassabb is mint az átlagos processzoros textúra dekódolás a legtöbb esetben.\n" +"Az emuláció gyorsítása a célja a textúrák kirakásával dekódolva a grafikai " +"processzor számára az OpenCL keretrendszert használva.\n" +"Azonban, jelenleg köztudottan textúra hiányosságokat okoz számos játékban. " +"Lassabb is mint az átlagos processzoros textúra dekódolás a legtöbb " +"esetben.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -6155,7 +6667,7 @@ msgstr "" msgid "^ ADD" msgstr "^ HOZZÃADÃS" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "betöltÅ‘ program (.img)" @@ -6186,12 +6698,12 @@ msgstr "nem Wii mentés vagy a fájl fejléc méretének kiolvasása sikertelen msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "ismeretlen parancs 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute visszatért -1 alkalmazás fut!" @@ -6403,6 +6915,9 @@ msgstr "| VAGY" #~ msgid "Emulator Display Settings" #~ msgstr "Emulátor kijelzÅ‘ beállítások" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Hang szabályozás használata" + #~ msgid "Enable CPU Access" #~ msgstr "Processzor hozzáférés engedélyezése" @@ -6460,6 +6975,13 @@ msgstr "| VAGY" #~ msgid "Error allocating buffer" #~ msgstr "Puffer kiosztási hiba" +#~ msgid "" +#~ "Error in PlayWiimote. %u != %u, byte %d.\n" +#~ "Sorry, Wii recording is temporarily broken." +#~ msgstr "" +#~ "PlayWiimote hiba. %u != %u, bájt %d.\n" +#~ "Sajnos a Wii videó rögzítés egyenlÅ‘re nem működik." + #~ msgid "Error loading %s: can't read info" #~ msgstr "Hiba a(z) %s betöltése közben: az infó nem olvasható" @@ -6743,6 +7265,20 @@ msgstr "| VAGY" #~ msgid "The file " #~ msgstr "A fájl" +#~ 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 "" +#~ "Ez a játék sebességének szabályozására szolgál a hang szabályozás által.\n" +#~ "Kikapcsolása rendellenes sebességet okozhat, többnyire túl gyorsat.\n" +#~ "Viszont néha a bekapcsolása folyamatos zajt eredményezhet.\n" +#~ "\n" +#~ "Gyorsbillentyű : Tartsd lenyomva a szabályozás azonnali " +#~ "kikapcsolásához." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Ez a játék hangok és hang effektusok lejátszásra szolgál." diff --git a/Languages/po/it.po b/Languages/po/it.po index 622cfea1fe..bc89c73efc 100644 --- a/Languages/po/it.po +++ b/Languages/po/it.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-04-08 20:40+0100\n" "Last-Translator: RebuMan, Dolphin Team\n" "Language-Team: \n" @@ -57,9 +61,9 @@ msgstr "\"%s\" è un file GCM/ISO non valido, oppure non è una ISO GC/Wii." msgid "%1$sCopy%1$s" msgstr "%1$sCopia%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -153,7 +157,7 @@ msgstr "%sEsporta GCI%s" msgid "%sImport GCI%s" msgstr "%sImporta GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Blocchi Liberi; %u Voci Directory Libere" @@ -186,11 +190,11 @@ msgstr "Gestore &Trucchi" msgid "&DSP Settings" msgstr "&Impostazioni DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Elimina ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Elimina ISO selezionate..." @@ -254,7 +258,7 @@ msgstr "&Pausa" msgid "&Play" msgstr "&Gioca" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Proprietà" @@ -298,7 +302,7 @@ msgstr "&Visualizza" msgid "&Wiimote Settings" msgstr "Impostazioni &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -342,7 +346,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -351,7 +355,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -409,13 +413,13 @@ msgstr "" "\n" "E' necessario inoltrare la porta TCP all'host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "Scheda basata su AM" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Codici AR" @@ -427,11 +431,11 @@ msgstr "A proposito di Dolphin" msgid "Acceleration" msgstr "Accellerazione" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulazione VBeam accurata" @@ -548,11 +552,11 @@ msgstr "Adattatore:" msgid "Add" msgstr "Aggiungi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Aggiungi codice ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Aggiungi Patch" @@ -560,6 +564,7 @@ msgstr "Aggiungi Patch" msgid "Add new pane" msgstr "Aggiungi nuovo riquadro" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -575,6 +580,11 @@ msgstr "Aggiungi nuovo riquadro" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Aggiungi..." @@ -626,11 +636,11 @@ msgstr "" "Regolare la pressione del comando analogico necessaria per attivare i " "pulsanti." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Avanzate" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Impostazioni Avanzate" @@ -638,14 +648,15 @@ msgstr "Impostazioni Avanzate" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Tutti i file GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Tutti i file di immagine GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Tutti i file GCM GameCube (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -658,18 +669,22 @@ msgstr "Tutti i file GCM GameCube (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tutti gli Stati di Gioco Salvati (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Tutti i file ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tutti i file compressi GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Tutti i file (*.*)|*.*" @@ -681,7 +696,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Wiimote Emulato" @@ -704,7 +719,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Impossibile caricare l'Apploader dal file" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Programma di Caricamento (Apploader):" @@ -719,7 +734,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arabo" @@ -728,7 +743,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -736,11 +751,12 @@ msgstr "" "Sei sicuro di voler eliminare questi file?\n" "Andranno persi definitivamente!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -750,6 +766,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspetto:" @@ -758,18 +777,20 @@ msgstr "Aspetto:" msgid "At least one pane must remain open." msgstr "Almeno un riquadro deve rimanere aperto." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Interfaccia Audio:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "Audiocommon: Errore nell'apertura della periferica AO.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -779,6 +800,9 @@ msgstr "Audiocommon: Errore nell'apertura della periferica AO.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -817,7 +841,7 @@ msgstr "" msgid "Back" msgstr "Indietro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Impostazioni Interfaccia" @@ -845,11 +869,11 @@ msgstr "File di Intestazione (Header) difettoso" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Dettagli Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Banner:" @@ -861,7 +885,7 @@ msgstr "Barra" msgid "Basic" msgstr "Impostazioni di Base" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Impostazioni di Base" @@ -893,6 +917,7 @@ msgstr "Blu Destro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -900,6 +925,9 @@ msgstr "Blu Destro" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Sotto" @@ -908,7 +936,7 @@ msgstr "Sotto" msgid "Bound Controls: %lu" msgstr "Controlli Associati: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Corrotto" @@ -924,7 +952,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:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Cerca una directory di destinazione" @@ -955,11 +983,11 @@ msgstr "Levetta di Controllo" msgid "C-Stick" msgstr "Levetta di Controllo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Motore di Emulazione CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 #, fuzzy msgid "Cache Display Lists" msgstr "Attiva Display List Caching" @@ -999,7 +1027,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:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1009,7 +1037,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:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1028,8 +1056,6 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "Impossibile trovare il WiiMote attraverso l'handle di connessione %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1039,7 +1065,7 @@ msgstr "Impossibile leggere da DVD_Plugin - Interfaccia DVD: Errore Fatale" msgid "Caps Lock" msgstr "Bloc Maiusc" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -1064,7 +1090,7 @@ msgstr "Cambia Disco" msgid "Change Game" msgstr "Cambia Gioco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1080,8 +1106,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:506 #: 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 " @@ -1103,32 +1129,32 @@ msgstr "Cerca Trucco" msgid "Cheats Manager" msgstr "Gestore Trucchi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Cinese (Semplificato)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Cinese (Tradizionale)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: 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:762 +#: 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:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Scegli una ISO predefinita:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Scegli una directory da aggiungere" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Scegli un file da aprire" @@ -1136,7 +1162,7 @@ msgstr "Scegli un file da aprire" msgid "Choose a memory card:" msgstr "Scegli una scheda di memoria:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1144,8 +1170,8 @@ msgstr "" "Scegli il file da utilizzare come apploader: (vale per i dischi costruiti " "solo da directory)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: 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'" @@ -1157,14 +1183,14 @@ msgstr "Levetta Circolare" msgid "Classic" msgstr "Controller Classico" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Cancella" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Cancellazione non riuscita." @@ -1180,6 +1206,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1188,6 +1215,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Chiudi" @@ -1211,20 +1242,20 @@ msgstr "Comando" msgid "Comment" msgstr "Note" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Note:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Comprimi ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Comprimi le ISO selezionate..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Compressione ISO" @@ -1251,13 +1282,13 @@ msgstr "Configura Pads" msgid "Configure..." msgstr "Configura..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Conferma la Sovrascrittura del File" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 #, fuzzy msgid "Confirm on Stop" msgstr "Conferma alla Chiusura" @@ -1267,7 +1298,7 @@ msgstr "Conferma alla Chiusura" msgid "Connect" msgstr "Connetti" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Collega Tastiera USB" @@ -1324,12 +1355,12 @@ msgstr "Converti a GCI" msgid "Copy failed" msgstr "Copia non riuscita" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Copia nella Memcard %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Core" @@ -1359,7 +1390,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Impossibile riconoscere il file ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Impossibile salvare %s" @@ -1374,7 +1405,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:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1387,7 +1418,7 @@ msgstr "" "Stai eseguendo Dolphin da CD/DVD, o il file di salvataggio è protetto in " "scrittura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Impossibile trovare il comando di apertura per l'estensione 'ini'!" @@ -1404,7 +1435,7 @@ msgstr "" msgid "Count:" msgstr "Conteggio:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Paese:" @@ -1418,25 +1449,25 @@ 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:500 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:497 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:498 msgid "Created by VistaIcons.com" msgstr "Creata da VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 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:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Creatore: " @@ -1444,7 +1475,7 @@ msgstr "Creatore: " msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Taglia Immagine lungo i Bordi" @@ -1464,7 +1495,7 @@ msgstr "Dissolvenza Incrociata" 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:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Hack Proiezione Personalizzato" @@ -1472,11 +1503,11 @@ msgstr "Hack Proiezione Personalizzato" msgid "Custom Projection Hack Settings" msgstr "Impostazioni Hack Proiezione Personalizzato" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Personalizza alcuni parametri di Proiezione Ortografica" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Ceco" @@ -1488,10 +1519,11 @@ msgstr "Croce Direzionale" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Motore di Emulazione DSP" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1502,19 +1534,23 @@ msgstr "Motore di Emulazione DSP" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulazione DSP HLE (veloce)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "Interprete DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 #, fuzzy msgid "DSP LLE on Thread" msgstr "Esegui DSP LLE in un processo dedicato" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "Ricompilatore DSP LLE" @@ -1522,15 +1558,23 @@ msgstr "Ricompilatore DSP LLE" msgid "DSP settings" msgstr "Impostazioni DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Origine DVD:" +#: 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:176 msgid "Data Size" msgstr "Dimensione Dati" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Data:" @@ -1551,7 +1595,7 @@ msgstr "Zona Morta" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 #, fuzzy msgid "Debugging" msgstr "Debug" @@ -1560,16 +1604,16 @@ msgstr "Debug" msgid "Decimal" msgstr "." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Decomprimi ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Decomprimi ISO selezionate..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Decompressione ISO" @@ -1577,11 +1621,11 @@ msgstr "Decompressione ISO" msgid "Default" msgstr "Predef." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ISO Predefinita:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Carattere predefinito" @@ -1590,7 +1634,7 @@ msgstr "Carattere predefinito" msgid "Delete" msgstr "Elimina" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Elimina Save" @@ -1599,7 +1643,7 @@ msgstr "Elimina Save" msgid "Delete the existing file '%s'?" msgstr "Elimina l'esistente file di salvataggio '%s'" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 #, fuzzy msgid "Description" msgstr "Descrizione Vertex" @@ -1608,8 +1652,8 @@ msgstr "Descrizione Vertex" msgid "Detect" msgstr "Rileva" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: 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." @@ -1622,8 +1666,8 @@ msgstr "" msgid "Device" msgstr "Periferica" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Impostazioni Periferica" @@ -1648,25 +1692,25 @@ msgstr "" " e 'checksum' Directory di backup" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 #, fuzzy msgid "Disable" msgstr "Disabilita Nebbia" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Disabilita Nebbia" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Disabilita Illuminazione" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 #, fuzzy msgid "Disable Per-Pixel Depth" msgstr "Profondità Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Disabilita Trame" @@ -1696,7 +1740,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disco" @@ -1721,6 +1765,7 @@ msgstr "Visualizza i tasti di input letti dall'emulatore." msgid "Divide" msgstr "/" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1730,10 +1775,13 @@ msgstr "/" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Vuoi interrompere l'emulazione in corso?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1758,6 +1806,7 @@ msgstr "Dolphin - Configurazione Wiimote Emulato" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1782,6 +1831,14 @@ msgstr "Dolphin - Configurazione Controlli GC" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin - Configurazione Controlli GC" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmati TAS Dolphin (*.dtm)" @@ -1813,11 +1870,11 @@ msgstr "" msgid "Down" msgstr "Giù" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Scarica Codici (Database WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Codici %lu scaricati. (%lu aggiunti)" @@ -1826,23 +1883,23 @@ msgstr "Codici %lu scaricati. (%lu aggiunti)" msgid "Drums" msgstr "Percussioni/Batteria" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Fittizio/a" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Immagazzina Audio su disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Immagazzina Oggetti EFB su disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Immagazzina Fotogrammi su disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Immagazzina Trame su disco" @@ -1870,6 +1927,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1885,6 +1943,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Olandese" @@ -1910,7 +1973,7 @@ msgstr "" "distribuzione di Dolphin, probabile sia richiesto un riavvio per consentire " "Windows di 'vedere' il nuovo driver." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPA" @@ -1926,7 +1989,7 @@ msgstr "Modifica" msgid "Edit ActionReplay Code" msgstr "Modifica Codice ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Modifica Configurazione" @@ -1938,8 +2001,8 @@ msgstr "Modifica Pacth" msgid "Edit current perspective" msgstr "Modifica prospettiva corrente" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Modifica..." @@ -1979,7 +2042,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wiimote Emulato" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Stato dell'Emulazione: " @@ -2001,23 +2064,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "Attiva Registrazione Eventi AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Abilita Autoregolazione Audio" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Attiva BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Attiva Unione Blocchi" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2031,6 +2094,7 @@ msgstr "" msgid "Enable Cache" msgstr "Attiva Cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2040,52 +2104,55 @@ msgstr "Attiva Cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Abilita Trucchi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Abilita Audio DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Attiva Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: 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:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Attiva Tasti di Scelta Rapida" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Salta pause dovute a inattività" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Salta pause dovute a inattività (aumenta la velocità)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Attiva MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Attiva Scansione Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 #, fuzzy msgid "Enable Screen Saver" msgstr "Attiva WideScreen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Attiva WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Attiva Rappres. Vettoriale" @@ -2102,7 +2169,7 @@ msgstr "" "Migliora la qualità visiva delle trame che si trovano sotto un angolo di " "vista obliquo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2110,7 +2177,7 @@ msgstr "" "Attivare l'accesso veloce del disco. Necessario per alcuni giochi. " "(Abilitato = Veloce, Disabilitato = Compatibile)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Attiva pagine" @@ -2130,7 +2197,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2138,7 +2205,7 @@ msgstr "" "Se attivato velocizza The Legend of Zelda: Twilight Princess. Disattiva per " "qualsiasi altro gioco" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: 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 = " @@ -2149,7 +2216,7 @@ msgstr "" "Accresce l'accuratezza dell'hardware emulato, ma è lento da eseguire (Attivo " "= Compatibile, Disattivato = Veloce)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Abilita Hack Proiezione Personalizzato" @@ -2161,7 +2228,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2180,6 +2247,7 @@ msgstr "" msgid "End" msgstr "Fine" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2195,6 +2263,11 @@ msgstr "Fine" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Inglese" @@ -2225,6 +2298,7 @@ msgstr "Uguale" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Errore/i" @@ -2255,20 +2329,26 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Errore/i" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Errore caricamento della lingua selezionata. Ritorno alla predefinita di " "sistema." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2304,7 +2384,7 @@ msgstr "Esci dall'Emulatore Dolphin" msgid "Export Failed" msgstr "Esportazione non riuscita" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Esporta File" @@ -2317,15 +2397,15 @@ msgstr "Esporta Registrazione" msgid "Export Recording..." msgstr "Esporta Registrazione..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Esporta Salvataggio" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Esporta salvataggi Wii (sperimentale)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Esporta tutti i salvataggi" @@ -2341,7 +2421,7 @@ msgstr "Esporta salvataggio come..." msgid "Extension" msgstr "Estensione" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 #, fuzzy msgid "External Frame Buffer" msgstr "Frame Buffer" @@ -2354,44 +2434,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Estrai Tutti i File..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Estrai Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Estrai DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Estrai Directory..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Estrai File..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Estrai Partizione..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Estrazione %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Estrazione di Tutti i File" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Estrazione Directory" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Estrazione..." @@ -2403,11 +2483,11 @@ msgstr "Byte FIFO" msgid "FIFO Player" msgstr "Lettore FIFO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANCIA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Dimensione FST:" @@ -2419,11 +2499,11 @@ msgstr "Connessione non riuscita!" msgid "Failed to Listen!!" msgstr "Impossibile 'rimanere in ascolto'!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Download dei codici non riuscito" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Estrazione in %s non riuscita!" @@ -2544,19 +2624,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/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Veloce" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 #, fuzzy msgid "Fast Mipmaps" msgstr "Carica Mip Maps precalcolate" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Lettore Fifo" @@ -2565,7 +2655,7 @@ msgstr "Lettore Fifo" msgid "File Info" msgstr "Info File" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Il file non conteneva codici." @@ -2598,16 +2688,16 @@ msgstr "Il file non è riconosciuto come una memcard" msgid "File not compressed" msgstr "File non compresso" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "File I/O: Modalità di apertura sconosciuta : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Filesystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Il tipo 'ini' è sconosciuto! Il file non verrà aperto!" @@ -2615,7 +2705,7 @@ msgstr "Il tipo 'ini' è sconosciuto! Il file non verrà aperto!" msgid "First Block" msgstr "Primo Blocco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Ripara Somme di Controllo (Checksums)" @@ -2627,7 +2717,7 @@ msgstr "Forza 16:9" msgid "Force 4:3" msgstr "Forza 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 #, fuzzy msgid "Force Console as NTSC-J" msgstr "Imposta come Console NTSC-J" @@ -2661,7 +2751,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 " @@ -2694,7 +2784,7 @@ msgstr "Fotogramma " msgid "Frame Advance" msgstr "Fotogramma per Fotogramma" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "Usa FFV1 per immagazzinare i fotogrammi" @@ -2707,7 +2797,7 @@ msgstr "Intervallo Fotogramma" msgid "Frame S&kipping" msgstr "Salta &Fotogramma" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Limite FPS:" @@ -2715,10 +2805,11 @@ msgstr "Limite FPS:" msgid "Frames To Record" msgstr "Fotogrammi da Registrare:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Visuale Libera" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2734,6 +2825,11 @@ msgstr "Visuale Libera" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francese" @@ -2768,7 +2864,7 @@ msgstr "Configurazione Log" msgid "GCPad" msgstr "Controlli GC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID Gioco:" @@ -2784,15 +2880,15 @@ msgstr "Il gioco non è avviato" msgid "Game not found!!" msgstr "Gioco non trovato!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Impostazioni di Gioco Specifiche" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Configurazione di Gioco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "GameCube" @@ -2803,6 +2899,7 @@ msgstr "Impostazioni &Controlli GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2810,6 +2907,9 @@ msgstr "Impostazioni &Controlli GameCube" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Schede di Memoria GameCube (*.raw,*.gcp)" @@ -2818,15 +2918,17 @@ msgid "Gamecube Pad settings" msgstr "Impostazioni Controlli GameCube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Codici Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, 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.)" +"(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 "" "Esecuzione Codice Gecko non riuscita (CT%i CST%i) (%s)\n" "(codice corrotto oppure tipo di codice non ancora supportato.)" @@ -2841,8 +2943,12 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generale" @@ -2852,6 +2958,7 @@ msgstr "Generale" msgid "General Settings" msgstr "Impostazioni Interfaccia" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2867,6 +2974,11 @@ msgstr "Impostazioni Interfaccia" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Tedesco" @@ -2900,7 +3012,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Greco" @@ -2932,7 +3044,7 @@ msgstr "" msgid "Header checksum failed" msgstr "Somma di controllo dell'intestazione non riuscita" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Ebreo" @@ -3000,12 +3112,16 @@ msgstr "Configurazione Tasti di Scelta Rapida" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Tasti di Scelta Rapida" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Ungherese" @@ -3013,14 +3129,14 @@ msgstr "Ungherese" msgid "Hybrid Wiimote" msgstr "Wiimote Ibrido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3033,11 +3149,11 @@ msgstr "" "IDTitolo %016llx.\n" " Dolphin, adesso, probabile vada in blocco" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destinazione corrotta" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Impostazioni IPL" @@ -3053,15 +3169,15 @@ msgstr "Puntatore a raggi infrarossi (IR)" msgid "IR Sensitivity:" msgstr "Sensibilità IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Dettagli ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Directory ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITALIA" @@ -3069,23 +3185,25 @@ msgstr "ITALIA" msgid "Icon" msgstr "Icona" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: 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:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy msgid "" -"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." +"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 "" "Se si imposta un Limite di Fotogramma elevato (NTSC:60, PAL:50),\n" "bisogna disabilitare l'Autoregolazione Audio in DSP per rendere efficace " @@ -3114,7 +3232,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Salva Importazione" @@ -3163,7 +3281,7 @@ 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:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "In Game" @@ -3172,7 +3290,7 @@ msgid "In-Game" msgstr "In-Game" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3192,7 +3310,7 @@ msgstr "Ins" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inserisci il codice criptato o decriptato qui..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Inserisci SD Card" @@ -3204,7 +3322,7 @@ msgstr "Inserire il nome qui..." msgid "Install WAD" msgstr "Installa WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Installa in Menu Wii" @@ -3215,6 +3333,7 @@ msgstr "" "E' stata sollevata un'Eccezione all'Installazione, tuttavia questa " "piattaforma non la supporta ancora." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3224,15 +3343,18 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Installazione WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 #, fuzzy msgid "Interface" msgstr "Impostazioni Interfaccia" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Impostazioni Interfaccia" @@ -3258,11 +3380,11 @@ msgstr "Errore Interno LZO - lzo_init() non riuscita" msgid "Internal Resolution:" msgstr "Risoluzione video a Schermo Intero:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interprete (molto lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3279,7 +3401,7 @@ msgstr "Valore non Valido!" msgid "Invalid bat.map or dir entry" msgstr "bat.map o voce directory non valide" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Tipo di evento %i non valido" @@ -3299,14 +3421,15 @@ msgstr "" "%s\n" " E' possibile che sia necessario il redumping del gioco." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "File di registrazione non valido" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Stato non valido" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3322,27 +3445,32 @@ msgstr "Stato non valido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiano" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "GIAPPONE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "Ricompilatore JIT (consigliato)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "Ricompilatore JITIL sperimentale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Giapponese" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KOREA" @@ -3351,8 +3479,8 @@ msgstr "KOREA" msgid "Key" msgstr "Combinaz. Tasti" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Coreano" @@ -3370,7 +3498,7 @@ msgstr "Pulsante L" msgid "L-Analog" msgstr "L-Analogico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Lingua:" @@ -3423,7 +3551,7 @@ msgstr "" msgid "Less Than" msgstr "Minore di" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3431,7 +3559,7 @@ msgstr "" msgid "Load" msgstr "Carica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 #, fuzzy msgid "Load Custom Textures" msgstr "Carica Trame ad Alta Risoluzione" @@ -3480,6 +3608,7 @@ msgstr "Carica Stato di Gioco dall'Ingresso 8" msgid "Load State..." msgstr "Carica Stato di Gioco..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3489,10 +3618,14 @@ msgstr "Carica Stato di Gioco..." ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Carica il Menu di Sistema Wii %d%c" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 @@ -3502,6 +3635,9 @@ msgstr "Carica il Menu di Sistema Wii %d%c" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carica il Menu di Sistema Wii %d%c" @@ -3528,7 +3664,7 @@ msgstr "Carica il file specificato (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Locale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 #, fuzzy msgid "Lock Threads to Cores" msgstr "Blocca processi ai nuclei" @@ -3541,11 +3677,11 @@ msgstr "Log" msgid "Log Configuration" msgstr "Configurazione Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Tipi di Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Destinazione Logger" @@ -3575,7 +3711,7 @@ msgstr "" "L'MD5 non corrisponde\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "Hack Velocità MMU" @@ -3597,11 +3733,11 @@ msgstr "File MadCatz Gameshark(*.gcs)" msgid "Main Stick" msgstr "Levetta Principale" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID Produttore:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Produttore:" @@ -3625,6 +3761,7 @@ msgstr "Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3632,6 +3769,9 @@ msgstr "Byte" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Scheda di Memoria" @@ -3668,7 +3808,7 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mic" @@ -3678,11 +3818,11 @@ msgstr "Mic" msgid "Min" msgstr "Mic" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Varie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Impostazioni Varie" @@ -3699,7 +3839,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Carattere a spaziatura fissa" @@ -3712,7 +3852,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motore" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3727,7 +3867,7 @@ msgstr "" msgid "Multiply" msgstr "*" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3817,6 +3957,7 @@ msgstr "TN Tab" msgid "NP Up" msgstr "TN Su" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3826,6 +3967,9 @@ msgstr "TN Su" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3834,7 +3978,7 @@ msgstr "Nome:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nome: " @@ -3848,7 +3992,7 @@ msgid "New Scan" msgstr "Nuova Ricerca" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Pagina Successiva" @@ -3860,7 +4004,7 @@ msgstr "Ricerca Successiva" msgid "Nickname :" msgstr "Pseudonimo:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Nessun Paese (SDK)" @@ -3899,7 +4043,7 @@ msgstr "Nessuna cartella di salvataggio trovata per il titolo %s" msgid "None" msgstr "Nessuno/a" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norvegese" @@ -3907,8 +4051,8 @@ msgstr "Norvegese" msgid "Not Equal" msgstr "Diverso" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Non Impostato" @@ -3928,7 +4072,7 @@ msgstr "Non collegato" msgid "Notes" msgstr "Note" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Note: " @@ -3966,7 +4110,7 @@ msgstr "Oggetto" msgid "Object Range" msgstr "Intervallo Oggetto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Spento" @@ -3992,11 +4136,11 @@ msgstr "Solo %d blocchi disponibili" msgid "Open" msgstr "Apri" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Apri &percorso file" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Apri cartella &salvataggi Wii" @@ -4018,12 +4162,12 @@ 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:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 #, fuzzy msgid "OpenCL Texture Decoder" msgstr "Decodificatore Trama OpenMP" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "Decodificatore Trama OpenMP" @@ -4057,7 +4201,7 @@ msgstr "" "memcard\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -4109,19 +4253,20 @@ msgstr "Paragrafo" msgid "Parameters" msgstr "Parametri" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partizione %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Percorsi" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4134,6 +4279,10 @@ msgstr "Percorsi" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4143,7 +4292,7 @@ msgstr "Pausa" msgid "Per-Pixel Lighting" msgstr "Illuminazione Pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfetto" @@ -4156,6 +4305,7 @@ msgstr "Prospettiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4166,6 +4316,10 @@ msgstr "Prospettiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Gioca" @@ -4179,7 +4333,7 @@ msgstr "Avvia Riproduzione Registrazione" msgid "Play/Pause" msgstr "Gioca/Pausa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Giocabile" @@ -4191,6 +4345,7 @@ msgstr "Opzioni di Riproduzione" msgid "Players" msgstr "Giocatori" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4200,6 +4355,9 @@ msgstr "Giocatori" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Per favore confermare..." @@ -4211,23 +4369,23 @@ msgstr "Si prega di creare un prospettiva prima di salvare" msgid "Plus-Minus" msgstr "Più-Meno" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polacco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Porta 1:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Porta 2:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Porta 3:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Porta 4:" @@ -4236,11 +4394,11 @@ msgstr "Porta 4:" msgid "Port :" msgstr "Porta:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portoghese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portoghese (Brasiliano)" @@ -4249,17 +4407,17 @@ msgstr "Portoghese (Brasiliano)" msgid "Post-Processing Effect:" msgstr "Effetti di Post-Processing:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4272,7 +4430,7 @@ msgstr "Preimpostazioni: " msgid "Prev Page" msgstr "Pagina Precedente" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Pagina Precedente" @@ -4323,7 +4481,7 @@ msgstr "R-Analogico" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSSIA" @@ -4336,7 +4494,7 @@ msgstr "Gamma" msgid "Read-only mode" msgstr "Modalità in Sola-lettura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Reale" @@ -4413,6 +4571,7 @@ msgstr "Aggiorna Elenco" msgid "Refresh game list" msgstr "Aggiorna elenco giochi" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4431,6 +4590,12 @@ msgstr "Aggiorna elenco giochi" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Rimuovi" @@ -4483,11 +4648,11 @@ msgstr "Levetta Destra" msgid "Rumble" msgstr "Vibrazione" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: 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:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russo" @@ -4495,10 +4660,11 @@ msgstr "Russo" msgid "Sa&ve State" msgstr "Sa&lva Stato di Gioco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Accurata" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4508,6 +4674,9 @@ msgstr "Accurata" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Frequenza di Campionamento:" @@ -4565,12 +4734,12 @@ msgstr "Salva Stato di Gioco nell'Ingresso 8" msgid "Save State..." msgstr "Salva Stato di Gioco..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Salva come..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Salva GCM/ISO compressi" @@ -4578,11 +4747,11 @@ msgstr "Salva GCM/ISO compressi" msgid "Save current perspective" msgstr "Salva prospettiva corrente" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Salva GCM/ISO decompressi" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..." @@ -4592,6 +4761,7 @@ msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..." msgid "Scaled EFB Copy" msgstr "Scala Copie EFB" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4601,15 +4771,18 @@ msgstr "Scala Copie EFB" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Ricerca..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Ricerca ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Ricerca..." @@ -4625,12 +4798,12 @@ msgstr "Bloc Scroll" msgid "Search Filter" msgstr "Filtro di Ricerca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Cerca nelle Sottocartelle" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: 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 "Sezione %s non trovata in SYSCONF" @@ -4640,6 +4813,7 @@ msgstr "Sezione %s non trovata in SYSCONF" msgid "Select" msgstr "Seleziona" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4664,6 +4838,14 @@ msgstr "Seleziona il File di Registrazione" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Seleziona il File di Registrazione" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleziona un file WAD Wii da installare" @@ -4689,16 +4871,21 @@ msgstr "Seleziona finestre libere/mobili" msgid "Select the file to load" msgstr "Seleziona il file da caricare" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Seleziona il file di salvataggio" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Seleziona lo stato di gioco da caricare" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4718,6 +4905,9 @@ msgstr "Seleziona lo stato di gioco da caricare" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Seleziona lo stato di gioco da salvare" @@ -4739,7 +4929,7 @@ msgstr "" "- Adatta a finestra: Estende l'immagine per adattarsi alle dimensioni della " "finestra." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Carattere selezionato" @@ -4775,11 +4965,11 @@ msgstr "Posizione della Barra a Sensori: " msgid "Separator" msgstr "Separatore" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4790,11 +4980,11 @@ msgstr "" msgid "Set" msgstr "Imposta" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Imposta come ISO &predefinita" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Imposta %c come Memcard predefinita" @@ -4806,7 +4996,7 @@ msgstr "" "SetARCode_IsActive: Indice troppo grande rispetto alla dimensione " "dell'elenco dei codici AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Impostazioni..." @@ -4818,7 +5008,7 @@ msgstr "SetupWiiMem: Impossible trovare il file per le impostazioni" msgid "Shake" msgstr "Scuoti" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Nome breve:" @@ -4847,7 +5037,7 @@ msgstr "Mostra Barra degli St&rumenti" msgid "Show Drives" msgstr "Mostra Unità a Disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 #, fuzzy msgid "Show EFB Copy Regions" msgstr "Individua Copie EFB" @@ -4864,7 +5054,7 @@ msgstr "Mostra Francia" msgid "Show GameCube" msgstr "Mostra GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Mostra Tasti di Input" @@ -4880,7 +5070,7 @@ msgstr "Mostra JAP" msgid "Show Korea" msgstr "Mostra Corea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Mostra Lingua:" @@ -4900,7 +5090,7 @@ msgstr "Mostra Piattaforme" msgid "Show Regions" msgstr "Mostra Regioni" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 #, fuzzy msgid "Show Statistics" msgstr "Statistiche" @@ -4921,11 +5111,11 @@ msgstr "Mostra Wad" 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 " @@ -4937,23 +5127,23 @@ msgstr "" "potrà accadere che Dolphin improvvisamente incorra in un crash senza nessuna " "apparente spiegazione." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Mostra primo blocco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Mostra blocchi salvati" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Mostra commento salvato" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Mostra icona salvata" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Mostra titolo salvato" @@ -4984,7 +5174,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote in posizione di traverso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Cinese Semplificato" @@ -4992,12 +5182,12 @@ msgstr "Cinese Semplificato" msgid "Size" msgstr "Dimensioni" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 #, fuzzy msgid "Skip BIOS" msgstr "Salta Caricamento BIOS GC" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "Disabilita Dest. Alpha Pass" @@ -5030,11 +5220,11 @@ msgstr "" msgid "Slot %i" msgstr "Ingresso %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Ingresso A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Ingresso B" @@ -5054,7 +5244,7 @@ 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:621 msgid "Sound Settings" msgstr "Impostazioni Audio" @@ -5072,6 +5262,7 @@ msgstr "Creazione buffer audio non riuscita: %s" msgid "Space" msgstr "Spazio" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5087,6 +5278,11 @@ msgstr "Spazio" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spagnolo" @@ -5110,7 +5306,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Seleziona un plugin video" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Aumenta la velocità di trasferimento del Disco" @@ -5118,7 +5314,7 @@ msgstr "Aumenta la velocità di trasferimento del Disco" msgid "Square Stick" msgstr "Levetta Quadrata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Controller Standard" @@ -5211,12 +5407,12 @@ msgstr "Seleziona il file di salvataggio" msgid "Swing" msgstr "Ruota/Oscilla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Lingua di Sistema:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWAN" @@ -5256,7 +5452,7 @@ msgstr "Semipiano destro" msgid "Take Screenshot" msgstr "Genera un'Istantanea di Gioco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5273,7 +5469,7 @@ msgstr "Trama" msgid "Texture Cache" msgstr "Cmd Trama" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 #, fuzzy msgid "Texture Format Overlay" msgstr "Formato Trama" @@ -5290,13 +5486,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:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "La directory scelta è già in lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5318,7 +5514,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:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Il file %s specificato non esiste" @@ -5340,7 +5536,7 @@ msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5382,7 +5578,7 @@ msgstr "il file \"%s\" specificato non esiste" msgid "The value is invalid" msgstr "Il valore non è valido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema" @@ -5390,7 +5586,7 @@ msgstr "Tema" 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:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5398,7 +5594,7 @@ msgstr "" "Un punto di ingresso in 00000001/00000002 deve essere presente. Dumping NAND " "probabilmente incompleto." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5414,7 +5610,7 @@ msgid "" msgstr "" "Questo simulatore di action replay non supporta codici automodificanti." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: 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 " @@ -5432,28 +5628,10 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -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 "" -"Questo è utilizzato per calibrare la velocità di gioco secondo " -"l'autoregolazione audio.\n" -"La disabilitazione di quest'opzione potrebbe causare una velocità di gioco " -"anomala e troppo veloce.\n" -"Ma alcune volte la sua attivazione porta a rumori e disturbi costanti " -"all'audio.\n" -"\n" -"Scorciatoia da Tastiera : Tenere premuto per disabilitare " -"istantaneamente l'Autoregolazione." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Questo è usato per riprodurre tracce e brani musicali, come BGM." -#: 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" @@ -5467,7 +5645,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:283 +#: 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" @@ -5491,7 +5669,7 @@ msgstr "Titolo" msgid "To" msgstr "a" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Seleziona/Deseleziona tutti i Tipi di Log" @@ -5511,6 +5689,7 @@ msgstr "Commuta a Schermo Intero" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5518,14 +5697,17 @@ msgstr "Commuta a Schermo Intero" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Sopra" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Cinese Tradizionale" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Tentativo di caricamento di un tipo di file sconosciuto." @@ -5533,7 +5715,7 @@ msgstr "Tentativo di caricamento di un tipo di file sconosciuto." msgid "Triggers" msgstr "Grilletti" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Tentativo di accesso da una SYSCONF non valida" @@ -5545,7 +5727,7 @@ msgstr "" "Tentativo di accesso da una SYSCONF non valida\n" "Gli identificativi Wiimote bt non sono disponibili" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turco" @@ -5566,11 +5748,11 @@ msgstr "Porta UDP:" msgid "UDP Wiimote" msgstr "Wiimote UDP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "SCONOSCIUTO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -5652,7 +5834,7 @@ msgstr "Aggiorna" msgid "Upright Wiimote" msgstr "Wiimote in posizione verticale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utilizza Modalità EuRGB60 (PAL60)" @@ -5665,7 +5847,7 @@ msgstr "&Schermo Intero" msgid "Use Hex" msgstr "Usa Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Avvisi di Errore" @@ -5686,7 +5868,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Utilità" @@ -5710,25 +5892,29 @@ msgstr "Valore: " msgid "Verbosity" msgstr "Verboso" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtuale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volume" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "Installazione WAD non riuscita: errore nella creazione di %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "Installazione WAD non riuscita: errore nella creazione di %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5743,15 +5929,15 @@ msgstr "" msgid "Warning" msgstr "Allarme/i" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Attenzione - avvio DOL in modalità console errata!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Attenzione - avvio ELF in modalità console errata!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Attenzione - avvio ISO in modalità console errata!" @@ -5781,7 +5967,7 @@ msgstr "" "la quale presenta un nome uguale ai file sulla tua memcard\n" "Continuare?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5789,7 +5975,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5797,7 +5983,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5825,7 +6011,7 @@ msgstr "WaweFileWriter - file non aperto." msgid "Whammy" msgstr "Tremolo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Hack Widescreen" @@ -5833,15 +6019,15 @@ msgstr "Hack Widescreen" msgid "Width" msgstr "Larghezza" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Console Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #, fuzzy msgid "Wii NAND Root:" msgstr "Origine DVD:" @@ -5850,6 +6036,7 @@ msgstr "Origine DVD:" msgid "Wii Save Import" msgstr "Importa Salvataggi Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5859,6 +6046,9 @@ msgstr "Importa Salvataggi Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Salva i file Wii (*.bin)|*.bin" @@ -5926,10 +6116,11 @@ msgstr "Menù Windows" msgid "Windows Right" msgstr "Windows Destro" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Adatta Testo" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5945,6 +6136,11 @@ msgstr "Adatta Testo" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Attività in corso..." @@ -5952,6 +6148,11 @@ msgstr "Attività in corso..." msgid "Write to Console" msgstr "Scrivi nella Console" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Scrivi su File" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Scrivi su File" @@ -6005,7 +6206,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:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 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." @@ -6029,7 +6230,7 @@ msgstr "" "Dovrebbe essere 0x%04x (invece di 0x%04llx)\n" "Desideri generarne uno nuovo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "Hack ZTP" @@ -6083,7 +6284,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6116,12 +6317,12 @@ msgstr "" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "cmd 0x%08x sconosciuto" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "valore wxExecute ritornato -1 su applicazione in esecuzione!" @@ -6554,6 +6755,9 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "Impostazioni di Visualizzazione dell'Emulatore" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Abilita Autoregolazione Audio" + #~ msgid "Enable CPU Access" #~ msgstr "Attiva Accesso alla CPU" @@ -7019,6 +7223,23 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "Il file" +#~ 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 "" +#~ "Questo è utilizzato per calibrare la velocità di gioco secondo " +#~ "l'autoregolazione audio.\n" +#~ "La disabilitazione di quest'opzione potrebbe causare una velocità di " +#~ "gioco anomala e troppo veloce.\n" +#~ "Ma alcune volte la sua attivazione porta a rumori e disturbi costanti " +#~ "all'audio.\n" +#~ "\n" +#~ "Scorciatoia da Tastiera : Tenere premuto per disabilitare " +#~ "istantaneamente l'Autoregolazione." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Questo solitamente è usato per riprodurre voci ed effetti sonori." diff --git a/Languages/po/ja.po b/Languages/po/ja.po index 12fee69911..eec5710d55 100644 --- a/Languages/po/ja.po +++ b/Languages/po/ja.po @@ -9,7 +9,11 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-10-12 20:45+0900\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -62,9 +66,9 @@ msgstr "\"%s\" ã¯ç„¡åŠ¹ãªãƒ•ã‚¡ã‚¤ãƒ«ã€ã¾ãŸã¯ã‚²ãƒ¼ãƒ ã‚­ãƒ¥ãƒ¼ãƒ–ï¼Wii msgid "%1$sCopy%1$s" msgstr "%1$s コピー %1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -159,7 +163,7 @@ msgstr "%s エクスãƒãƒ¼ãƒˆ GCI %s" msgid "%sImport GCI%s" msgstr "%s インãƒãƒ¼ãƒˆ GCI %s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u ブロック空ã | %u エントリ空ã" @@ -192,11 +196,11 @@ msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ç·¨é›†ãƒ„ール(&C)" msgid "&DSP Settings" msgstr "サウンド設定(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“を削除(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "é¸æŠžã—ãŸã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ã‚’å…¨ã¦å‰Šé™¤(&D)" @@ -260,7 +264,7 @@ msgstr "一時åœæ­¢(&P)" msgid "&Play" msgstr "開始(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "プロパティ(&P)" @@ -304,7 +308,7 @@ msgstr "表示(&V)" msgid "&Wiimote Settings" msgstr "Wii入力設定(&W)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "å…¬å¼Wiki(英語)ã§å‹•ä½œçŠ¶æ³ã‚’確èª(&W)" @@ -348,7 +352,7 @@ msgstr "コードåを入力ã—ã¦ãã ã•ã„" msgid "" msgstr "<対応解åƒåº¦ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "ãªã—" @@ -357,7 +361,7 @@ msgstr "ãªã—" msgid "" msgstr "入力を待機..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "＜システムã®è¨€èªžï¼ž" @@ -412,13 +416,13 @@ msgstr "" "\n" "TCPãƒãƒ¼ãƒˆã®é–‹æ”¾ã‚’忘れãšã«ï¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "Triforce基æ¿" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "アクションリプレイコード" @@ -430,11 +434,11 @@ msgstr "Dolphinã«ã¤ã„ã¦" msgid "Acceleration" msgstr "加速度" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "精度：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulation" @@ -558,11 +562,11 @@ msgstr "ビデオカード：" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "コードを追加" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "パッãƒã‚’追加" @@ -570,6 +574,7 @@ msgstr "パッãƒã‚’追加" msgid "Add new pane" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -585,6 +590,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "追加" @@ -630,11 +640,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "ボタンãŒåå¿œã™ã‚‹æ„Ÿåº¦ã‚’調整ã—ã¾ã™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "高度ãªè¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "高度ãªè¨­å®š" @@ -642,14 +652,15 @@ msgstr "高度ãªè¨­å®š" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "å…¨ã¦ã® GC/Wii ファイル (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "å…¨ã¦ã® GC/Wii イメージ (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "GC GCMファイル (gcm)|*.gcm" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -662,18 +673,22 @@ msgstr "GC GCMファイル (gcm)|*.gcm" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "å…¨ã¦ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイル (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Wii ISOファイル (iso)|*.iso" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "圧縮ã•ã‚ŒãŸGC/Wii ISOファイル (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ« (*.*)|*.*" @@ -689,6 +704,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD <<<<<<< HEAD @@ -700,6 +716,9 @@ msgid "Alternate Wiimote Timing" msgstr "Wii リモコンをエミュレート" >>>>>>> Update translation files for recent changes in the code. ======= +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Wii リモコンã®åŒæœŸèª¿æ•´" >>>>>>> Update Arabic and Japanese translations. @@ -721,7 +740,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Apploader ファイルã‹ã‚‰èª­ã¿è¾¼ã‚€ã“ã¨ãŒã§ãã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader" @@ -739,7 +758,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€ã‚ªãƒ•ã€‘ã‚’é¸æŠžã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "アラビア語" @@ -748,7 +767,7 @@ msgstr "アラビア語" msgid "Are you sure you want to delete \"%s\"?" msgstr "\"%s\" ã“ã®ãƒ—ロファイルを削除ã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -756,10 +775,11 @@ msgstr "" "ã“れら複数ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ファイルを削除ã—ã¾ã™ã‹ï¼Ÿ\n" "å…ƒã«æˆ»ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ファイルを削除ã—ã¾ã™ã‹ï¼Ÿå…ƒã«æˆ»ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“ï¼" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -769,6 +789,9 @@ msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ファイルを削除ã—ã¾ã™ã‹ï¼Ÿå…ƒã«æˆ» ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "アスペクト比：" @@ -777,18 +800,20 @@ msgstr "アスペクト比：" msgid "At least one pane must remain open." msgstr "At least one pane must remain open." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "サウンド" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "出力API (Audio Backend)" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error opening AO device.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -798,6 +823,9 @@ msgstr "AudioCommon: Error opening AO device.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" @@ -840,7 +868,7 @@ msgstr "" msgid "Back" msgstr "Back" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "出力設定" @@ -867,11 +895,11 @@ msgstr "ファイルヘッダã®ä¸è‰¯" msgid "Banner" msgstr "ãƒãƒŠãƒ¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "ãƒãƒŠãƒ¼ã®è©³ç´°" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "ãƒãƒŠãƒ¼è¡¨ç¤º" @@ -883,7 +911,7 @@ msgstr "ãƒãƒ¼" msgid "Basic" msgstr "基本設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "基本設定" @@ -914,6 +942,7 @@ msgstr "é’ - å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -921,6 +950,9 @@ msgstr "é’ - å³" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "下部" @@ -929,7 +961,7 @@ msgstr "下部" msgid "Bound Controls: %lu" msgstr "コマンド数: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "ダメダメ" @@ -945,7 +977,7 @@ msgstr "ゲームリストã«è¿½åŠ ã™ã‚‹ãƒ•ã‚©ãƒ«ãƒ€ã‚’é¸æŠžã—ã¦ãã ã•ã„ msgid "Browse for an ISO directory..." msgstr "ISOã®ã‚るフォルダをブラウズ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "出力先をé¸æŠž" @@ -975,11 +1007,11 @@ msgstr "C-スティック" msgid "C-Stick" msgstr "C-スティック" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPUエミュレーション方å¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Cache Display Lists" @@ -1029,7 +1061,7 @@ msgstr "%s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“" msgid "Cannot unregister events with events pending" msgstr "Cannot unregister events with events pending" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1040,7 +1072,7 @@ msgstr "" "%s\n" "ã“ã‚Œã¯ä¸æ­£ãªãƒ¡ãƒ¢ãƒªãƒ¼ã‚«ãƒ¼ãƒ‰ãƒ‡ãƒ¼ã‚¿ã§ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1058,8 +1090,6 @@ msgstr "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Cant find WiiMote by connection handle %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1069,7 +1099,7 @@ msgstr "DVD_Pluginã‹ã‚‰ã®èª­ã¿è¾¼ã¿ãŒä¸å¯èƒ½ - DVD-Interface: 致命的 msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "カタルーニャ語" @@ -1095,7 +1125,7 @@ msgstr "ディスクã®å…¥ã‚Œæ›¿ãˆ" msgid "Change Game" msgstr "ゲームを変更" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1113,8 +1143,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:506 #: 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 "ã“ã®è¨­å®šã¯æ¬¡å›žã®ã‚²ãƒ¼ãƒ é–‹å§‹æ™‚ã«å映ã•ã‚Œã¾ã™ï¼" @@ -1134,31 +1164,31 @@ msgstr "コードサーãƒ" msgid "Cheats Manager" msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ç·¨é›†ãƒ„ール" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "簡体字中国語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "ç¹ä½“字中国語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "DVDルートフォルダをé¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "NANDã®ã‚るルートフォルダをé¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "ディスクãƒãƒ£ãƒ³ãƒãƒ«ã«è¡¨ç¤ºã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã‚’é¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "追加ã—ãŸã„フォルダをé¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "メモリーカードをé¸æŠž" @@ -1166,7 +1196,7 @@ msgstr "メモリーカードをé¸æŠž" msgid "Choose a memory card:" msgstr "メモリーカードをé¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1174,8 +1204,8 @@ msgstr "" "apploaderã¨ã—ã¦ä½¿ç”¨ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠžï¼š(フォルダã‹ã‚‰ã®ã¿æ§‹ç¯‰ã•ã‚ŒãŸãƒ‡ã‚£ã‚¹ã‚¯ã«" "é©ç”¨ã•ã‚Œã¾ã™)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "抽出先ã®ãƒ•ã‚©ãƒ«ãƒ€ã‚’é¸æŠž" @@ -1187,14 +1217,14 @@ msgstr "丸ã¿" msgid "Classic" msgstr "クラシックコントローラ" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "全消去" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "クリアã«å¤±æ•—" @@ -1210,6 +1240,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1218,6 +1249,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "é–‰ã˜ã‚‹" @@ -1241,20 +1276,20 @@ msgstr "Command" msgid "Comment" msgstr "コメント" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "ゲーム紹介" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã‚’圧縮" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "é¸æŠžã—ãŸISOファイルを全ã¦åœ§ç¸®" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "圧縮ã—ã¦ã„ã¾ã™..." @@ -1281,13 +1316,13 @@ msgstr "パッド設定" msgid "Configure..." msgstr "Dolphin本体ã®è¨­å®šã‚’è¡Œã„ã¾ã™" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "ファイルã®ä¸Šæ›¸ãを確èª" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "動作åœæ­¢æ™‚ã«ç¢ºèª" @@ -1296,7 +1331,7 @@ msgstr "動作åœæ­¢æ™‚ã«ç¢ºèª" msgid "Connect" msgstr "接続" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "USBキーボードã®æŽ¥ç¶šã‚’エミュレート" @@ -1353,12 +1388,12 @@ msgstr "GCIファイルã«å¤‰æ›" msgid "Copy failed" msgstr "コピーã«å¤±æ•—" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "メモリーカード%cã«ã‚³ãƒ”ー" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "コア" @@ -1388,7 +1423,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "ISOファイル %s ã‚’èªè­˜ã§ãã¾ã›ã‚“ã§ã—ãŸ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "%s をセーブã§ãã¾ã›ã‚“ã§ã—ãŸ" @@ -1401,7 +1436,7 @@ msgstr "" "ç¾åœ¨ãƒ‘ッド設定を行ãˆã¾ã›ã‚“。 プレーヤーãŒæ®‹ã£ã¦ã„ã‚‹ã‹ã‚²ãƒ¼ãƒ ãŒèµ·å‹•ä¸­ã§ã™ï¼\n" "(ゲーム中ã®ãƒ‘ッド設定ã¯ç¾åœ¨ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1414,7 +1449,7 @@ msgstr "" "Dolphinã‚’CD/DVDã‹ã‚‰èµ·å‹•ã—ã¦ã„ã‚‹ã‹ã€ã‚»ãƒ¼ãƒ–ファイルãŒèª­ã¿å–り専用ã«ãªã£ã¦ã„ã¾ã›" "ã‚“ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "æ‹¡å¼µå­'ini'ã«å¯¾ã—ã¦é–¢é€£ä»˜ã‘られã¦ã„るプログラムãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ï¼" @@ -1431,7 +1466,7 @@ msgstr "" msgid "Count:" msgstr "該当：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "発売国" @@ -1445,25 +1480,25 @@ msgstr "アクションリプレイコードを作æˆ" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 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:497 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:498 msgid "Created by VistaIcons.com" msgstr "Created by VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 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:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "制作者： " @@ -1471,7 +1506,7 @@ msgstr "制作者： " msgid "Critical" msgstr "致命的ãªã‚¨ãƒ©ãƒ¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "クロッピング" @@ -1495,7 +1530,7 @@ msgstr "クロスフェーダー" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "カレントフォルダ㯠wxFileSelector ã®å¾Œã« %s ã‹ã‚‰ %s ã«å¤‰æ›´ã•ã‚Œã¾ã—ãŸï¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Custom Projection Hack" @@ -1503,11 +1538,11 @@ msgstr "Custom Projection Hack" msgid "Custom Projection Hack Settings" msgstr "Custom Projection Hack Settings" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "設定画é¢ã«å…¥ã‚Šã¾ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "ãƒã‚§ã‚³èªž" @@ -1519,10 +1554,11 @@ msgstr "å字キー" msgid "DSP" msgstr "サウンド" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "DSPエミュレーション方å¼" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1533,18 +1569,22 @@ msgstr "DSPエミュレーション方å¼" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP-HLE エミュレーション (高速)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP-LLE インタプリタ (低速)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP-LLEを別スレッドã§å®Ÿè¡Œ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP-LLE リコンパイラ" @@ -1552,15 +1592,23 @@ msgstr "DSP-LLE リコンパイラ" msgid "DSP settings" msgstr "サウンドã«é–¢ã™ã‚‹è¨­å®šã‚’è¡Œã„ã¾ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" 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 "" + +#: 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:176 msgid "Data Size" msgstr "データサイズ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "発売日" @@ -1581,7 +1629,7 @@ msgstr "'éŠã³'ã®èª¿æ•´" msgid "Debug" msgstr "デãƒãƒƒã‚°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "デãƒãƒƒã‚°ç”¨é …ç›®" @@ -1589,16 +1637,16 @@ msgstr "デãƒãƒƒã‚°ç”¨é …ç›®" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "ISOファイルを解å‡" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "é¸æŠžã—ãŸISOファイルを全ã¦è§£å‡" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "解å‡ä¸­..." @@ -1606,11 +1654,11 @@ msgstr "解å‡ä¸­..." msgid "Default" msgstr "既定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "デフォルトISO" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "既定ã®ãƒ•ã‚©ãƒ³ãƒˆ" @@ -1619,7 +1667,7 @@ msgstr "既定ã®ãƒ•ã‚©ãƒ³ãƒˆ" msgid "Delete" msgstr "削除" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "ã“ã®ã‚»ãƒ¼ãƒ–データを削除" @@ -1628,7 +1676,7 @@ msgstr "ã“ã®ã‚»ãƒ¼ãƒ–データを削除" msgid "Delete the existing file '%s'?" msgstr "既存ファイル '%s' を削除ã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "説明" @@ -1636,8 +1684,8 @@ msgstr "説明" msgid "Detect" msgstr "検出" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: 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 #, fuzzy msgid "" "Detected attempt to read more data from the DVD than fit inside the out " @@ -1651,8 +1699,8 @@ msgstr "" msgid "Device" msgstr "デãƒã‚¤ã‚¹" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "デãƒã‚¤ã‚¹è¨­å®š" @@ -1677,23 +1725,23 @@ msgstr "" "ディレクトリãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã®ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã«ã‚‚失敗" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "無効化" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Disable Fog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Disable Lighting" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Disable Per-Pixel Depth" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "テクスãƒãƒ£ç„¡åŠ¹åŒ–" @@ -1736,7 +1784,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disc" @@ -1763,6 +1811,7 @@ msgstr "" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1772,10 +1821,13 @@ msgstr "Divide" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "動作中ã®ã‚²ãƒ¼ãƒ ã‚’åœæ­¢ã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1800,6 +1852,7 @@ msgstr "Wii リモコンã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³è¨­å®š" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1824,6 +1877,14 @@ msgstr "GCコントローラ設定" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "GCコントローラ設定" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS ムービー (*.dtm)" @@ -1856,11 +1917,11 @@ msgstr "" msgid "Down" msgstr "Down" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ã‚’ダウンロード (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu個ã®ã‚³ãƒ¼ãƒ‰ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚( æ–°è¦è¿½åŠ ï¼š %lu個 )" @@ -1869,23 +1930,23 @@ msgstr "%lu個ã®ã‚³ãƒ¼ãƒ‰ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚( æ–°è¦è¿½åŠ ï¼š %lu個 )" msgid "Drums" msgstr "ドラムコントローラ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "ダミーデãƒã‚¤ã‚¹" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "サウンドã®ãƒ€ãƒ³ãƒ—" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "EFBターゲットをダンプ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "フレームをダンプ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "テクスãƒãƒ£ã‚’ダンプ" @@ -1920,6 +1981,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1935,6 +1997,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "オランダ語" @@ -1958,7 +2025,7 @@ msgstr "" "Dolphinã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’æ›´æ–°ã—ãŸå ´åˆã¯ã€ãƒ‰ãƒ©ã‚¤ãƒã‚’èªè­˜ã•ã›ã‚‹ãŸã‚ã«Windowsã®å†èµ·" "å‹•ãŒå¿…è¦ã«ãªã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "欧州" @@ -1974,7 +2041,7 @@ msgstr "編集" msgid "Edit ActionReplay Code" msgstr "コードを編集" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "iniを編集" @@ -1986,8 +2053,8 @@ msgstr "パッãƒã‚’編集" msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "編集" @@ -2038,7 +2105,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wii リモコンをエミュレート" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "動作状æ³ï¼š" @@ -2066,23 +2133,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "アクションリプレイコードã®ãƒ­ã‚°ã‚’å–å¾—ã™ã‚‹" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Enable Audio Throttle" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Enable BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Enable Block Merging" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2095,6 +2162,7 @@ msgstr "" msgid "Enable Cache" msgstr "Enable Cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2104,51 +2172,54 @@ msgstr "Enable Cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ã‚’有効化" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Enable DTK Music" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Enable Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "デュアルコア動作を行ㆠ(速度å‘上)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "ホットキーを使用" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Enable Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "アイドルスキップ処ç†ã‚’行ㆠ(速度å‘上)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Enable MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "プログレッシブ表示を有効化" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "スクリーンセーãƒãƒ¼ã‚’有効化" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Enable WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "ワイヤーフレーム有効化" @@ -2166,7 +2237,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€1x】をé¸æŠžã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2174,7 +2245,7 @@ msgstr "" "ディスクã®èª­ã¿å–り速度をå‘上ã•ã›ã¾ã™ã€‚å¿…è¦ã«ãªã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã¯ã‚ãšã‹ã§ã™ [有効ï¼" "ロード時間短縮ï¼ç„¡åŠ¹ï¼äº’æ›æ€§ãƒ»å®‰å®šæ€§é‡è¦–]" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "ページ分ã‘ã—ã¦è¡¨ç¤º" @@ -2201,7 +2272,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2209,7 +2280,7 @@ msgstr "" "トワイライトプリンセスã«ãŠã„ã¦ã€åºƒå¤§ãªã‚¨ãƒªã‚¢ã§ç™ºç”Ÿã™ã‚‹FPS低下を抑ãˆã¾ã™ã€‚ä»–ã®" "タイトルã§ã¯ç„¡åŠ¹ã«ã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: 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 = " @@ -2219,7 +2290,7 @@ msgstr "" "ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ç²¾åº¦ãŒå‘上ã—ã¾ã™[有効ï¼äº’æ›æ€§é‡è¦–,ï¼ç„¡åŠ¹ï¼å‹•ä½œ" "速度å‘上]" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Enables Custom Projection Hack" @@ -2235,7 +2306,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2257,6 +2328,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2272,6 +2344,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "英語" @@ -2302,6 +2379,7 @@ msgstr "ã«ä¸€è‡´ã™ã‚‹" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "エラー" @@ -2332,19 +2410,25 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "エラー" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "é¸æŠžã—ãŸè¨€èªžã®èª­ã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸã€‚＜システムã®è¨€èªžï¼žã«è¨­å®šã‚’戻ã—ã¾ã™" -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2378,7 +2462,7 @@ msgstr "Dolphinを終了" msgid "Export Failed" msgstr "エクスãƒãƒ¼ãƒˆã«å¤±æ•—" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "ファイルを抽出" @@ -2391,15 +2475,15 @@ msgstr "録画ファイルã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ" msgid "Export Recording..." msgstr "録画ファイルã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "セーブデータをエクスãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "セーブデータをエクスãƒãƒ¼ãƒˆ (実験的)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "å…¨ã¦ã®ã‚»ãƒ¼ãƒ–データをエクスãƒãƒ¼ãƒˆ" @@ -2415,7 +2499,7 @@ msgstr "セーブデータã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆå…ˆã‚’é¸æŠž" msgid "Extension" msgstr "拡張コントローラ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "External Frame Buffer (外部フレームãƒãƒƒãƒ•ã‚¡)" @@ -2427,44 +2511,44 @@ msgstr "特殊パラメータ" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "『メトロイド Other Mã€ã®ã¿ã«æœ‰åŠ¹ãªè¨­å®šã§ã™" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Apploaderを抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "DOLを抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "ã“ã®ãƒ•ã‚©ãƒ«ãƒ€ã‚’抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "ã“ã® Partition を抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "%s を抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’エクスãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "フォルダをエクスãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "抽出中" @@ -2476,11 +2560,11 @@ msgstr "FIFO ãƒã‚¤ãƒˆ" msgid "FIFO Player" msgstr "FIFO プレーヤー" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "フランス" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FSTサイズ" @@ -2492,11 +2576,11 @@ msgstr "接続ã«å¤±æ•—ï¼" msgid "Failed to Listen!!" msgstr "Listenã«å¤±æ•—ï¼" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "見ã¤ã‹ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "%s ã¸ã®æŠ½å‡ºã«å¤±æ•—" @@ -2613,18 +2697,28 @@ 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/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Fast" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Fast Mipmaps" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "FIFO プレーヤー" @@ -2633,7 +2727,7 @@ msgstr "FIFO プレーヤー" msgid "File Info" msgstr "ファイル情報" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "コードをå«ã¾ãªã„ファイルã§ã™" @@ -2666,16 +2760,16 @@ msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ¡ãƒ¢ãƒªãƒ¼ã‚«ãƒ¼ãƒ‰ã¨ã—ã¦èªè­˜ã•ã‚Œã¾ã›ã‚“ msgid "File not compressed" msgstr "圧縮ã•ã‚Œã¦ã„ãªã„ファイル" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Unknown open mode : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "構造" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr " 'ini' ã¯ä¸æ˜Žãªæ‹¡å¼µå­ã§ã™ã€‚é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“ï¼" @@ -2683,7 +2777,7 @@ msgstr " 'ini' ã¯ä¸æ˜Žãªæ‹¡å¼µå­ã§ã™ã€‚é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“ï¼" msgid "First Block" msgstr "ブロック開始ä½ç½®" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã‚’修正" @@ -2695,7 +2789,7 @@ msgstr "Force 16:9" msgid "Force 4:3" msgstr "Force 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "コンソールを日本å‘ã‘ (NTSC-J) ã«è¨­å®š" @@ -2729,7 +2823,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 " @@ -2766,7 +2860,7 @@ msgstr "フレーム" msgid "Frame Advance" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "FFV1を使用ã—ã¦ãƒ•ãƒ¬ãƒ¼ãƒ ã‚’ダンプ" @@ -2778,7 +2872,7 @@ msgstr "フレームã®ç¯„囲" msgid "Frame S&kipping" msgstr "フレームスキップ(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "フレームリミット：" @@ -2786,10 +2880,11 @@ msgstr "フレームリミット：" msgid "Frames To Record" msgstr "録画フレーム数設定" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "フリールック" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2805,6 +2900,11 @@ msgstr "フリールック" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "フランス語" @@ -2838,7 +2938,7 @@ msgstr "ログã®è¨­å®š" msgid "GCPad" msgstr "入力(GC)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ゲームID" @@ -2854,15 +2954,15 @@ msgstr "ゲームãŒèµ·å‹•ã—ã¦ã„ã¾ã›ã‚“ï¼" msgid "Game not found!!" msgstr "ゲームãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "固有設定" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "ゲーム設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "ゲームキューブ" @@ -2873,6 +2973,7 @@ msgstr "ゲームキューブ入力設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2880,6 +2981,9 @@ msgstr "ゲームキューブ入力設定(&P)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "メモリーカードファイル (*.raw,*.gcp)|*.raw;*.gcp" @@ -2888,15 +2992,17 @@ msgid "Gamecube Pad settings" msgstr "ゲームキューブã®å…¥åŠ›è¨­å®šã‚’è¡Œã„ã¾ã™" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Geckoコード" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, 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.)" +"(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" "(コードã«å•é¡ŒãŒã‚ã‚‹ã‹ã€ã¾ã ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„タイプã®ã‚³ãƒ¼ãƒ‰ã§ã™)" @@ -2911,8 +3017,12 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -2921,6 +3031,7 @@ msgstr "一般" msgid "General Settings" msgstr "一般" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2936,6 +3047,11 @@ msgstr "一般" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "ドイツ語" @@ -2980,7 +3096,7 @@ msgstr "" "動作速度ã¯å°‘々低下ã—ã€ã¾ã‚Œã«æç”»ãƒã‚°ã®åŽŸå› ã«ã‚‚ãªã‚‹ã“ã¨ã‚‚ã‚ã‚Šã¾ã™ã€‚\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’外ã•ãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "ギリシア語" @@ -3012,7 +3128,7 @@ msgstr "高速化(Hacks)" msgid "Header checksum failed" msgstr "ヘッダã®ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã«å¤±æ•—" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "ヘブライ語" @@ -3077,6 +3193,7 @@ msgstr "ホットキーã®è¨­å®š" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 @@ -3085,10 +3202,13 @@ msgstr "ホットキーã®è¨­å®š" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "ホットキー" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "ãƒãƒ³ã‚¬ãƒªãƒ¼èªž" @@ -3096,12 +3216,12 @@ msgstr "ãƒãƒ³ã‚¬ãƒªãƒ¼èªž" msgid "Hybrid Wiimote" msgstr "Hybrid Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3114,11 +3234,11 @@ msgstr "" "TitleID %016llx.\n" " Dolphin will likely hang now" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - bad destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL設定" @@ -3134,15 +3254,15 @@ msgstr "IR ãƒã‚¤ãƒ³ã‚¿" msgid "IR Sensitivity:" msgstr "感度" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "ゲームã®è©³ç´°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "フォルダ一覧" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "イタリア" @@ -3150,22 +3270,24 @@ msgstr "イタリア" msgid "Icon" msgstr "アイコン" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: 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:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy msgid "" -"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." +"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)より高ã„FPSã§åˆ¶é™ã‚’ã‹ã‘ã‚‹å ´åˆã€ã‚µã‚¦ãƒ³ãƒ‰è¨­å®šã§ã€ŒAudio " "Throttleã€ã‚’無効ã«ã—ãªã„ã¨åŠ¹æžœãŒç¾ã‚Œã¾ã›ã‚“" @@ -3202,7 +3324,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "セーブデータをインãƒãƒ¼ãƒˆ" @@ -3255,7 +3377,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "ソコソコ" @@ -3264,7 +3386,7 @@ msgid "In-Game" msgstr "ゲーム内" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "情報" @@ -3284,7 +3406,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "ã“ã“ã«æš—å·åŒ–or復å·åŒ–ã•ã‚ŒãŸã‚³ãƒ¼ãƒ‰ã‚’貼り付ã‘ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "SDカードã®æŒ¿å…¥ã‚’エミュレート" @@ -3296,7 +3418,7 @@ msgstr "コードåを入力ã—ã¦ãã ã•ã„" msgid "Install WAD" msgstr "Wiiメニューã«WADファイルを追加" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Wiiメニューã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«" @@ -3307,6 +3429,7 @@ msgstr "" "InstallExceptionHandler ãŒå‘¼ã³å‡ºã•ã‚Œã¾ã—ãŸãŒã€ã“ã®ãƒ—ラットフォームã¯ã¾ã ã‚µ" "ãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3316,14 +3439,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WADファイルを追加ã—ã¦ã„ã¾ã™..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "表示" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Dolphinã®è¡¨ç¤ºã«é–¢ã™ã‚‹è¨­å®š" @@ -3348,11 +3474,11 @@ msgstr "Internal LZO Error - lzo_init() failed" msgid "Internal Resolution:" msgstr "内部解åƒåº¦ã®å¤‰æ›´ï¼š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "インタプリタ (éžæŽ¨å¥¨)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "イントロ" @@ -3369,7 +3495,7 @@ msgstr "無効ãªå€¤ã§ã™ï¼" msgid "Invalid bat.map or dir entry" msgstr "Invalid bat.map or dir entry" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Invalid event type %i" @@ -3389,14 +3515,15 @@ msgstr "" "%s\n" " ã“ã®ã‚²ãƒ¼ãƒ ã‚’ダンプã—ãªãŠã—ã¦ãã ã•ã„" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "ä¸æ­£ãªéŒ²ç”»ãƒ•ã‚¡ã‚¤ãƒ«" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "ä¸æ­£ãªã‚»ãƒ¼ãƒ–ï¼ãƒ­ãƒ¼ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3412,27 +3539,32 @@ msgstr "ä¸æ­£ãªã‚»ãƒ¼ãƒ–ï¼ãƒ­ãƒ¼ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "イタリア語" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "日本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT リコンパイラ (推奨)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL リコンパイラ (実験的)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "日本語" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "韓国" @@ -3441,8 +3573,8 @@ msgstr "韓国" msgid "Key" msgstr "キー設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "韓国語" @@ -3460,7 +3592,7 @@ msgstr "Lボタン" msgid "L-Analog" msgstr "L (åŠæŠ¼ã—)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "GUI言語：" @@ -3513,7 +3645,7 @@ msgstr "" msgid "Less Than" msgstr "よりå°ã•ã„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "FPSã«ã‚ˆã‚‹åˆ¶é™ã‚’有効化" @@ -3521,7 +3653,7 @@ msgstr "FPSã«ã‚ˆã‚‹åˆ¶é™ã‚’有効化" msgid "Load" msgstr "読込" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "カスタムテクスãƒãƒ£ã‚’読ã¿è¾¼ã‚€" @@ -3569,6 +3701,7 @@ msgstr "ステートロード - スロット 8" msgid "Load State..." msgstr "ファイルã‹ã‚‰ãƒ­ãƒ¼ãƒ‰" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3590,6 +3723,13 @@ msgstr "Wiiメニューを起動" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Wiiメニューを起動" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wiiメニューを起動 ( ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š%d %c )" @@ -3617,7 +3757,7 @@ msgstr "è¦å®šã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ« (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "ローカル" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "スレッドをコア数ã«åˆã‚ã›ã¦å›ºå®š" @@ -3629,11 +3769,11 @@ msgstr "ログ" msgid "Log Configuration" msgstr "ログã®è¨­å®š" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "表示ã™ã‚‹ãƒ­ã‚°æƒ…å ±" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "ログ出力先" @@ -3663,7 +3803,7 @@ msgstr "" "MD5ã®ä¸æ•´åˆ\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" @@ -3685,11 +3825,11 @@ msgstr "MadCatz Gameshark セーブファイル(*.gcs)" msgid "Main Stick" msgstr "コントロールスティック" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "メーカーID" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "メーカー" @@ -3713,6 +3853,7 @@ msgstr "メモリãƒã‚¤ãƒˆ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3720,6 +3861,9 @@ msgstr "メモリãƒã‚¤ãƒˆ" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "メモリーカード" @@ -3754,7 +3898,7 @@ msgstr "メモリカードã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚µã‚¤ã‚ºãŒã€ãƒ˜ãƒƒãƒ€ã®ã‚µã‚¤ã‚ºã« msgid "Menu" msgstr "メニュー" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "マイク" @@ -3763,11 +3907,11 @@ msgstr "マイク" msgid "Min" msgstr "最å°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "ãã®ä»–" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "ãã®ä»–ã®è¨­å®š" @@ -3788,7 +3932,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "等幅フォント" @@ -3801,7 +3945,7 @@ msgstr "モーションプラス" msgid "Motor" msgstr "モーター" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3823,7 +3967,7 @@ msgstr "" msgid "Multiply" msgstr "Multiply" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3915,6 +4059,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3924,6 +4069,9 @@ msgstr "NP Up" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3932,7 +4080,7 @@ msgstr "åå‰" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "åå‰ï¼š " @@ -3946,7 +4094,7 @@ msgid "New Scan" msgstr "æ–°è¦æ¤œç´¢" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "次ã®ãƒšãƒ¼ã‚¸" @@ -3958,7 +4106,7 @@ msgstr "続ã‘ã¦æ¤œç´¢" msgid "Nickname :" msgstr "ニックãƒãƒ¼ãƒ ï¼š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "No Country (SDK)" @@ -3997,7 +4145,7 @@ msgstr "%s ã®ã‚»ãƒ¼ãƒ–フォルダãŒã‚ã‚Šã¾ã›ã‚“" msgid "None" msgstr "ãªã—" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "ノルウェー語" @@ -4005,8 +4153,8 @@ msgstr "ノルウェー語" msgid "Not Equal" msgstr "ã«ä¸€è‡´ã—ãªã„" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "未確èª" @@ -4026,7 +4174,7 @@ msgstr "未接続" msgid "Notes" msgstr "ノート" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "補足： " @@ -4064,7 +4212,7 @@ msgstr "オブジェクト" msgid "Object Range" msgstr "オブジェクトã®ç¯„囲" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "オフ" @@ -4090,11 +4238,11 @@ msgstr "残り %d ブロックã—ã‹ã‚ã‚Šã¾ã›ã‚“ï¼" msgid "Open" msgstr "é–‹ã" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "実体ã®ã‚るフォルダを開ã(&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "セーブデータã®ã‚るフォルダを開ã(&S)" @@ -4116,11 +4264,11 @@ msgstr "OpenAL: サウンドデãƒã‚¤ã‚¹ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" msgid "OpenAL: can't open device %s" msgstr "OpenAL: デãƒã‚¤ã‚¹ %s ãŒé–‹ã‘ã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL Texture Decoder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decoder" @@ -4152,7 +4300,7 @@ msgstr "" "æ–°ã—ã„メモリーカードã«ã‚»ãƒ¼ãƒ–データを移行ã—ã¦ãã ã•ã„\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "ãã®ä»–" @@ -4204,19 +4352,20 @@ msgstr "Paragraph" msgid "Parameters" msgstr "パラメータ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "パーティション %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "パッãƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "フォルダ" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4229,6 +4378,10 @@ msgstr "フォルダ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "一時åœæ­¢" @@ -4237,7 +4390,7 @@ msgstr "一時åœæ­¢" msgid "Per-Pixel Lighting" msgstr "Per-Pixel Lighting" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "カンペキï¼" @@ -4250,6 +4403,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4260,6 +4414,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "開始" @@ -4273,7 +4431,7 @@ msgstr "録画ファイルをå†ç”Ÿ" msgid "Play/Pause" msgstr "開始ï¼ä¸€æ™‚åœæ­¢" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "サクサク" @@ -4285,6 +4443,7 @@ msgstr "å†ç”Ÿã‚ªãƒ—ション" msgid "Players" msgstr "プレイヤー一覧" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4294,6 +4453,9 @@ msgstr "プレイヤー一覧" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "確èª" @@ -4305,23 +4467,23 @@ msgstr "" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "ãƒãƒ¼ãƒ©ãƒ³ãƒ‰èªž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "ãƒãƒ¼ãƒˆ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "ãƒãƒ¼ãƒˆ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "ãƒãƒ¼ãƒˆ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "ãƒãƒ¼ãƒˆ 4" @@ -4330,11 +4492,11 @@ msgstr "ãƒãƒ¼ãƒˆ 4" msgid "Port :" msgstr "ãƒãƒ¼ãƒˆ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "ãƒãƒ«ãƒˆã‚¬ãƒ«èªž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "ブラジル語" @@ -4342,17 +4504,17 @@ msgstr "ブラジル語" msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4365,7 +4527,7 @@ msgstr "プリセット：" msgid "Prev Page" msgstr "å‰ã®ãƒšãƒ¼ã‚¸" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "å‰ã®ãƒšãƒ¼ã‚¸" @@ -4416,7 +4578,7 @@ msgstr "R (åŠæŠ¼ã—)" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "ロシア" @@ -4429,7 +4591,7 @@ msgstr "å¼·ã•" msgid "Read-only mode" msgstr "読ã¿è¾¼ã¿å°‚用 有効ï¼ç„¡åŠ¹" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Real" @@ -4505,6 +4667,7 @@ msgstr "ゲームリストをå†æ›´æ–°" msgid "Refresh game list" msgstr "ゲームリストをå†æ›´æ–°ã—ã¾ã™" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4523,6 +4686,12 @@ msgstr "ゲームリストをå†æ›´æ–°ã—ã¾ã™" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "削除" @@ -4575,11 +4744,11 @@ msgstr "å³ã‚¹ãƒ†ã‚£ãƒƒã‚¯" msgid "Rumble" msgstr "振動" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: 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:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "ロシア語" @@ -4587,10 +4756,11 @@ msgstr "ロシア語" msgid "Sa&ve State" msgstr "ステートセーブ(&V)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Safe" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4600,6 +4770,9 @@ msgstr "Safe" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "サンプルレート" @@ -4657,12 +4830,12 @@ msgstr "ステートセーブ - スロット 8" msgid "Save State..." msgstr "ファイルã¨ã—ã¦ä¿å­˜" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "ファイルã¨ã—ã¦ä¿å­˜" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "圧縮ã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã®ä¿å­˜å…ˆã‚’é¸æŠž" @@ -4670,11 +4843,11 @@ msgstr "圧縮ã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã®ä¿å­˜å…ˆã‚’é¸æŠž" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "解å‡ã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã®ä¿å­˜å…ˆã‚’é¸æŠž" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, fuzzy, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Savestate movie %s ã®ç ´æを確èªã—ã¾ã—ãŸã€‚録画を中止ã—ã¦ã„ã¾ã™..." @@ -4683,6 +4856,7 @@ msgstr "Savestate movie %s ã®ç ´æを確èªã—ã¾ã—ãŸã€‚録画を中止㗠msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4692,15 +4866,18 @@ msgstr "Scaled EFB Copy" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "確èªä¸­... .%s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "確èªä¸­..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "確èªä¸­..." @@ -4716,12 +4893,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "フィルタリング" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "サブフォルダも検索" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: 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 "Section %s not found in SYSCONF" @@ -4731,6 +4908,7 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "é¸æŠž" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4755,6 +4933,14 @@ msgstr "録画ファイルをé¸æŠž" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "録画ファイルをé¸æŠž" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "追加ã™ã‚‹WADファイルをé¸æŠž" @@ -4780,16 +4966,21 @@ msgstr "" msgid "Select the file to load" msgstr "ロードã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "セーブファイルをé¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "ロードã™ã‚‹ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイルをé¸æŠž" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4809,6 +5000,9 @@ msgstr "ロードã™ã‚‹ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイルをé¸æŠž" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "ステートセーブã®ä¿å­˜å…ˆã‚’é¸æŠž" @@ -4830,7 +5024,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€è‡ªå‹•ã€‘ã‚’é¸æŠžã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "é¸æŠžã—ãŸãƒ•ã‚©ãƒ³ãƒˆ" @@ -4878,11 +5072,11 @@ msgstr "センサーãƒãƒ¼ã®ä½ç½®" msgid "Separator" msgstr "Separator" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "セルビア語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "シリアルãƒãƒ¼ãƒˆï¼šãƒ–ロードãƒãƒ³ãƒ‰ã‚¢ãƒ€ãƒ—ã‚¿ãªã©ã®ãƒ‡ãƒã‚¤ã‚¹ãŒæŽ¥ç¶šã§ãã¾ã™" @@ -4891,11 +5085,11 @@ msgstr "シリアルãƒãƒ¼ãƒˆï¼šãƒ–ロードãƒãƒ³ãƒ‰ã‚¢ãƒ€ãƒ—ã‚¿ãªã©ã®ãƒ‡ãƒ msgid "Set" msgstr "é©ç”¨" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Wiiメニュー(ディスクãƒãƒ£ãƒ³ãƒãƒ«)ã«è¡¨ç¤º(&D)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "メモリーカード%cを既定ã¨ã—ã¦è¨­å®š" @@ -4907,7 +5101,7 @@ msgstr "" "SetARCode_IsActive: インデックスã®ã‚µã‚¤ã‚ºãŒã‚³ãƒ¼ãƒ‰ãƒªã‚¹ãƒˆã®ã‚µã‚¤ã‚ºã‚’上回ã£ã¦ã„ã¾" "ã™ %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "設定" @@ -4919,7 +5113,7 @@ msgstr "SetupWiiMem: 設定ファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" msgid "Shake" msgstr "シェイク" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "通称" @@ -4947,7 +5141,7 @@ msgstr "ツールãƒãƒ¼(&T)" msgid "Show Drives" msgstr "DVDドライブ内ã®ã‚½ãƒ•ãƒˆã‚’表示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Show EFB Copy Regions" @@ -4963,7 +5157,7 @@ msgstr "フランス" msgid "Show GameCube" msgstr "ゲームキューブ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "キー入力を表示" @@ -4979,7 +5173,7 @@ msgstr "日本" msgid "Show Korea" msgstr "韓国" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "次ã®è¨€èªžã§è¡¨ç¤º" @@ -4999,7 +5193,7 @@ msgstr "特定機種ã®ã‚½ãƒ•ãƒˆã ã‘を表示" msgid "Show Regions" msgstr "特定リージョンã®ã‚½ãƒ•ãƒˆã ã‘を表示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "統計情報を表示" @@ -5019,11 +5213,11 @@ msgstr "WAD(Wii ウェア)" 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 " @@ -5033,23 +5227,23 @@ msgstr "" "無効ã«ã™ã‚‹ã¨è‡´å‘½çš„ã§ãªã„エラーをプレイ中ã«è¡¨ç¤ºã•ã›ãšã«ã™ã¿ã¾ã™ãŒã€ã‚¯ãƒ©ãƒƒã‚·ãƒ¥" "時ã«ã‚¨ãƒ©ãƒ¼è¡¨ç¤ºãªã—ã«çªç„¶å¼·åˆ¶çµ‚了ã•ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "ブロック開始ä½ç½®ã‚’表示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "ブロック数を表示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "コメントを表示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "アイコンを表示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "タイトルを表示" @@ -5087,7 +5281,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "横æŒã¡(Sideways)ã§ä½¿ç”¨" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "簡体字中国語" @@ -5095,11 +5289,11 @@ msgstr "簡体字中国語" msgid "Size" msgstr "サイズ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "BIOSをスキップ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Skip Dest. Alpha Pass" @@ -5142,11 +5336,11 @@ msgstr "" msgid "Slot %i" msgstr "スロット %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "スロットA" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "スロットB" @@ -5169,7 +5363,7 @@ msgstr "" "デãƒãƒƒã‚°ç”¨é€”ã¨ã—ã¦ã®ã¿ä¾¿åˆ©ãªã‚‚ã®ã§ã™ã€‚\n" "ãã‚Œã§ã‚‚使用ã—ã¾ã™ã‹ï¼Ÿã‚ˆã分ã‹ã‚‰ãªã‘ã‚Œã°ã€é¸æŠžã—ãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "サウンド設定" @@ -5187,6 +5381,7 @@ msgstr "Sound buffer creation failed: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5202,6 +5397,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "スペイン語" @@ -5233,7 +5433,7 @@ msgstr "" msgid "Specify a video backend" msgstr "ビデオ出力APIを指定" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Speed up Disc Transfer Rate" @@ -5241,7 +5441,7 @@ msgstr "Speed up Disc Transfer Rate" msgid "Square Stick" msgstr "丸ã¿" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "標準コントローラ" @@ -5339,12 +5539,12 @@ msgstr "セーブファイルã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆã«æˆåŠŸ" msgid "Swing" msgstr "å‹•ã" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "システムã®è¨€èªžï¼š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "å°æ¹¾" @@ -5383,7 +5583,7 @@ msgstr "å³ãƒ†ãƒ¼ãƒ–ル" msgid "Take Screenshot" msgstr "スクリーンショット" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5399,7 +5599,7 @@ msgstr "Texture" msgid "Texture Cache" msgstr "Texture Cache" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "テクスãƒãƒ£ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆæƒ…報表示" @@ -5415,13 +5615,13 @@ msgstr "無効ãªã‚¢ãƒ‰ãƒ¬ã‚¹ã§ã™" msgid "The checksum was successfully fixed" msgstr "ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã®ä¿®æ­£ã«æˆåŠŸã—ã¾ã—ãŸ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "é¸æŠžã—ãŸãƒ•ã‚©ãƒ«ãƒ€ã¯ã™ã§ã«ãƒªã‚¹ãƒˆã«å­˜åœ¨ã—ã¾ã™ï¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5445,7 +5645,7 @@ msgid "The file %s was already open, the file header will not be written." msgstr "" "ファイル %s ã¯æ—¢ã«é–‹ã‹ã‚Œã¦ã„ã‚‹ãŸã‚ã€ãƒ•ã‚¡ã‚¤ãƒ«ãƒ˜ãƒƒãƒ€ãƒ¼ã¯æ›¸ãè¾¼ã¾ã‚Œã¾ã›ã‚“。" -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "指定ã—ãŸãƒ•ã‚¡ã‚¤ãƒ« (%s) ã¯å­˜åœ¨ã—ã¾ã›ã‚“" @@ -5463,11 +5663,12 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "復å·åŒ–ã—ã¾ã—ãŸãŒã€ã“ã®ã‚³ãƒ¼ãƒ‰ã«ã¯ä¸€ã¤ã‚‚è¡ŒãŒå«ã¾ã‚Œã¦ã„ã¾ã›ã‚“。" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" "ã“ã®ã‚¹ãƒ©ã‚¤ãƒ€ã‚’Safeå´ã«è¨­å®šã—ã¦ãŠãã¨ã€RAMã‹ã‚‰ã®ãƒ†ã‚¯ã‚¹ãƒãƒ£æ›´æ–°ã« 失敗ã—ã«ãã" "ãªã‚Šã¾ã™ã€‚\n" @@ -5511,7 +5712,7 @@ msgstr "指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ« \"%s\" ã¯å­˜åœ¨ã—ã¾ã›ã‚“" msgid "The value is invalid" msgstr "無効ãªå€¤ã§ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "テーマ" @@ -5519,14 +5720,14 @@ msgstr "テーマ" msgid "Theme selection went wrong" msgstr "テーマã®é¸æŠžã«èª¤ã‚ŠãŒã‚ã‚Šã¾ã™" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" "00000001/00000002ã®ãƒã‚±ãƒƒãƒˆãŒå¿…è¦ã§ã™ã€‚ãŠãらãä¸å®Œå…¨ãªNANDダンプã§ã™ã€‚" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5545,7 +5746,7 @@ msgstr "" "ã“ã®ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ãƒªãƒ—レイシミュレータã¯ã€ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ãƒªãƒ—レイãã®ã‚‚ã®ã‚’変更ã™ã‚‹" "コードã¯ã‚µãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "有効ã«ã—ã¦ã„ã‚‹ã¨Wiiメニューやã„ãã¤ã‹ã®ã‚¿ã‚¤ãƒˆãƒ«ã§å‹•ä½œé€Ÿåº¦ãŒä½Žä¸‹ã™ã‚‹å ´åˆãŒã‚ã‚Š" @@ -5571,26 +5772,10 @@ msgstr "" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -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" -"ノート：ゲーム中ã€ã‚­ãƒ¼ã‚’押ã—続ã‘ã¦ã„ã‚‹é–“ã ã‘ã“ã®ã‚ªãƒ—ションを無効ã«ã™ã‚‹ã“" -"ã¨ãŒã§ãã¾ã™ã€‚" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "BGMã®ã‚ˆã†ãªéŸ³æ¥½ãƒˆãƒ©ãƒƒã‚¯ã®å†ç”Ÿã«ä½¿ç”¨ã•ã‚Œã¾ã™" -#: 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" @@ -5601,7 +5786,7 @@ msgstr "" "有効ã«ã™ã‚‹ã¨å‹•ä½œé€Ÿåº¦ãŒå¤§ããå‘上ã—ã¾ã™ãŒã€ã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã‚„ãƒã‚°ã®åŽŸå› ã«ãªã‚‹å ´åˆã‚‚" "ã‚ã‚Šã¾ã™" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "ã“ã®ã‚²ãƒ¼ãƒ ã®è¨­å®šã‚’テキストã§ç·¨é›†ã—ã¾ã™" @@ -5624,7 +5809,7 @@ msgstr "タイトル" msgid "To" msgstr "終了" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "å…¨ã¦ã®ãƒ­ã‚°æƒ…報をé¸æŠžï¼è§£é™¤" @@ -5644,6 +5829,7 @@ msgstr "フルスクリーン表示切り替ãˆ" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5651,14 +5837,17 @@ msgstr "フルスクリーン表示切り替ãˆ" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "上部" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "ç¹ä½“字中国語" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "ä¸æ˜Žãªãƒ•ã‚¡ã‚¤ãƒ«ã‚¿ã‚¤ãƒ—を読ã¿è¾¼ã‚‚ã†ã¨ã—ã¾ã—ãŸ" @@ -5666,7 +5855,7 @@ msgstr "ä¸æ˜Žãªãƒ•ã‚¡ã‚¤ãƒ«ã‚¿ã‚¤ãƒ—を読ã¿è¾¼ã‚‚ã†ã¨ã—ã¾ã—ãŸ" msgid "Triggers" msgstr "トリガー" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Trying to read from invalid SYSCONF" @@ -5678,7 +5867,7 @@ msgstr "" "Trying to read from invalid SYSCONF\n" "Wiimote bt ids are not available" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "トルコ語" @@ -5699,11 +5888,11 @@ msgstr "UDPãƒãƒ¼ãƒˆ:" msgid "UDP Wiimote" msgstr "UDPã§æŽ¥ç¶š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "ä¸æ˜Ž" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "アメリカåˆè¡†å›½" @@ -5788,7 +5977,7 @@ msgstr "å†å–å¾—" msgid "Upright Wiimote" msgstr "直立状態(Upright)ã§ä½¿ç”¨" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 (PAL60) モードを使用" @@ -5800,7 +5989,7 @@ msgstr "フルスクリーンã§è¡¨ç¤º" msgid "Use Hex" msgstr "16進" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "パニックãƒãƒ³ãƒ‰ãƒ©ã‚’使用" @@ -5831,7 +6020,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "ユーティリティ" @@ -5855,25 +6044,29 @@ msgstr "値：" msgid "Verbosity" msgstr "Verbosityモード" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "æç”»" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "音é‡" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format 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 作æˆã‚¨ãƒ©ãƒ¼" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5893,15 +6086,15 @@ msgstr "" msgid "Warning" msgstr "警告" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "警告 - 誤ã£ãŸãƒ¢ãƒ¼ãƒ‰ã§DOLãŒèµ·å‹•ã•ã‚Œã¦ã„ã¾ã™ï¼" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "警告 - 誤ã£ãŸãƒ¢ãƒ¼ãƒ‰ã§ELFãŒèµ·å‹•ã•ã‚Œã¦ã„ã¾ã™ï¼" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "警告 - 誤ã£ãŸãƒ¢ãƒ¼ãƒ‰ã§ISOãŒèµ·å‹•ã•ã‚Œã¦ã„ã¾ã™ï¼" @@ -5929,7 +6122,7 @@ msgstr "" "ファイルåã¯ãƒ¡ãƒ¢ãƒªãƒ¼ã‚«ãƒ¼ãƒ‰ä¸Šã®åå‰ã¨åŒã˜ã«ãªã‚Šã¾ã™\n" "続ã‘ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5937,7 +6130,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5945,7 +6138,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5973,7 +6166,7 @@ msgstr "WaveFileWriter - ファイルãŒé–‹ã‹ã‚Œã¦ã„ã¾ã›ã‚“" msgid "Whammy" msgstr "ワーミー" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "疑似ワイドスクリーン化" @@ -5981,15 +6174,15 @@ msgstr "疑似ワイドスクリーン化" msgid "Width" msgstr "範囲(横)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii コンソール" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NANDルート" @@ -5997,6 +6190,7 @@ msgstr "Wii NANDルート" msgid "Wii Save Import" msgstr "Wiiã®ã‚»ãƒ¼ãƒ–データをインãƒãƒ¼ãƒˆ" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -6006,6 +6200,9 @@ msgstr "Wiiã®ã‚»ãƒ¼ãƒ–データをインãƒãƒ¼ãƒˆ" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wiiセーブデータ (*.bin)|*.bin" @@ -6072,10 +6269,11 @@ msgstr "Windows Menu" msgid "Windows Right" msgstr "Windows Right" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "ワードラップ" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6091,6 +6289,11 @@ msgstr "ワードラップ" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "動作中..." @@ -6098,6 +6301,11 @@ msgstr "動作中..." msgid "Write to Console" msgstr "コンソールã«å‡ºåŠ›" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "ファイルã«å‡ºåŠ›" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "ファイルã«å‡ºåŠ›" @@ -6153,7 +6361,7 @@ msgstr "10進数・16進数・8進数ã„ãšã‚Œã‹ã®æœ‰åŠ¹ãªå€¤ã‚’入力ã—㦠msgid "You must enter a valid profile name." msgstr "有効ãªãƒ—ロファイルåを入力ã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "変更を有効ã«ã™ã‚‹ã«ã¯Dolphinã‚’å†èµ·å‹•ã—ã¦ãã ã•ã„" @@ -6176,7 +6384,7 @@ msgstr "" "æ­£ã—ã㯠0x%04x (ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ 0x%04llx)\n" "æ–°ã—ã作æˆã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP hack" @@ -6246,7 +6454,7 @@ msgstr "" msgid "^ ADD" msgstr "^ (...ã«åŠ ãˆã¦)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6278,12 +6486,12 @@ msgstr "" msgid "s" msgstr "　" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "unknown cmd 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returned -1 on application run!" @@ -6501,6 +6709,9 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Emulator Display Settings" #~ msgstr "エミュレーション画é¢ã«é–¢ã™ã‚‹è¨­å®š" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Enable Audio Throttle" + #~ msgid "Enable CPU Access" #~ msgstr "Enable CPU Access" @@ -6785,6 +6996,21 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Take Screenshot\t" #~ msgstr "スクリーンショット\t" +#~ 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 usually used to play voice and sound effects." #~ msgstr "音声や効果音ã®å†ç”Ÿã«ã‚ˆã使用ã•ã‚Œã¾ã™" <<<<<<< HEAD diff --git a/Languages/po/ko.po b/Languages/po/ko.po index f756486f36..338b22dab0 100644 --- a/Languages/po/ko.po +++ b/Languages/po/ko.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" <<<<<<< HEAD ======= @@ -19,6 +20,9 @@ msgstr "" >>>>>>> Update from master branch. "PO-Revision-Date: 2011-07-07 10:24+0900\n" ======= +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2012-01-19 11:47+0900\n" >>>>>>> Update Korean translations. "Last-Translator: \n" @@ -62,9 +66,9 @@ msgstr "\"%s\"는 비ì í•© GCM/ISO 파ì¼ìž„, í˜¹ì€ GC/Wii ISOê°€ 아님." msgid "%1$sCopy%1$s" msgstr "%1$s복사%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -158,7 +162,7 @@ msgstr "%sGCI 내보내기%s" msgid "%sImport GCI%s" msgstr "%sGCI 가져오기%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u 빈 블럭; %u 빈 디렉토리 엔트리" @@ -191,11 +195,11 @@ msgstr "치트 매니저(&C)" msgid "&DSP Settings" msgstr "오디오 설정(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "ISO ì‚­ì œ(&D)..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "ì„ íƒëœ ISO들 ì‚­ì œ(&D)..." @@ -259,7 +263,7 @@ msgstr "ì¼ì‹œì •ì§€(&P)" msgid "&Play" msgstr "실행(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "ì†ì„±(&P)" @@ -303,7 +307,7 @@ msgstr "보기(&V)" msgid "&Wiimote Settings" msgstr "위모트 설정(&W)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "위키(&W)" @@ -347,7 +351,7 @@ msgstr "<ì—¬ê¸°ì— ì´ë¦„ì„ ë„£ìœ¼ì„¸ìš”>" msgid "" msgstr "<ë°œê²¬ëœ í•´ìƒë„ê°€ ì—†ìŒ>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "<ì—†ìŒ>" @@ -356,7 +360,7 @@ msgstr "<ì—†ìŒ>" msgid "" msgstr "<키를 누르세요>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<시스템>" @@ -412,13 +416,13 @@ msgstr "" "\n" "TCP í¬íŠ¸ë¥¼ í˜¸ìŠ¤íŠ¸ì— ì „ë‹¬í•´ì•¼í•©ë‹ˆë‹¤!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-기반보드" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR 코드" @@ -430,11 +434,11 @@ msgstr "ëŒí•€ì— 대해" msgid "Acceleration" msgstr "ê°€ì†" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "정확성:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "정확한 VBeam ì—뮬레ì´ì…˜" @@ -550,11 +554,11 @@ msgstr "어댑터:" msgid "Add" msgstr "추가" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "ì•¡ì…˜ë¦¬í”Œë ˆì´ ì½”ë“œ 추가" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "패치 추가" @@ -562,6 +566,7 @@ msgstr "패치 추가" msgid "Add new pane" msgstr "새로운 ì°½ 추가" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -577,6 +582,11 @@ msgstr "새로운 ì°½ 추가" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "추가..." @@ -624,11 +634,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "버튼들 í™œì„±í™”ì— í•„ìš”í•œ 아날로그 컨트롤 ì••ë ¥ì„ ì¡°ì •í•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "고급" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "고급 설정" @@ -636,14 +646,15 @@ msgstr "고급 설정" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "모든 GC/Wii 파ì¼ë“¤ (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "모든 GC/Wii ì´ë¯¸ì§€ë“¤ (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "모든 게임í브 GCM 파ì¼ë“¤ (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -656,18 +667,22 @@ msgstr "모든 게임í브 GCM 파ì¼ë“¤ (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "모든 ìƒíƒœë“¤ 저장 (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "모든 Wii ISO 파ì¼ë“¤ (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "모든 ì••ì¶•ëœ GC/Wii ISO 파ì¼ë“¤ (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "모든 íŒŒì¼ (*.*)|*.*" @@ -683,7 +698,7 @@ msgstr "" "\n" "확신 없으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Alternate Wiimote Timing" msgstr "위모트 타ì´ë° 대안" @@ -703,7 +718,7 @@ msgstr "앱로ë”ê°€ ìž˜ëª»ëœ í¬ê¸°ìž„... ì •ë§ ì•±ë¡œë”입니까?" msgid "Apploader unable to load from file" msgstr "앱로ë”ê°€ 파ì¼ë¡œ 부터 로드할 수 ì—†ìŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "앱로ë”:" @@ -721,7 +736,7 @@ msgstr "" "\n" "확신 없으면, (ë„기)를 ì„ íƒí•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "ì•„ëžì–´" @@ -730,7 +745,7 @@ msgstr "ì•„ëžì–´" msgid "Are you sure you want to delete \"%s\"?" msgstr "\"%s\" 를 ì •ë§ë¡œ 지우고 싶습니까?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -738,10 +753,11 @@ msgstr "" "ì´ íŒŒì¼ë“¤ì„ ì •ë§ë¡œ 지우고 싶습니까?\n" "ê·¸ê²ƒë“¤ì€ ì˜ì›ížˆ 사ë¼ì§‘니다!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ì´ íŒŒì¼ì„ ì •ë§ë¡œ 지우고 싶습니까? ê·¸ê²ƒì€ ì˜ì›ížˆ 사ë¼ì§‘니다!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -751,6 +767,9 @@ msgstr "ì´ íŒŒì¼ì„ ì •ë§ë¡œ 지우고 싶습니까? ê·¸ê²ƒì€ ì˜ì›ížˆ 사 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "종횡비:" @@ -759,18 +778,20 @@ msgstr "종횡비:" msgid "At least one pane must remain open." msgstr "ì ì–´ë„ í•˜ë‚˜ì˜ ì°½ì´ ì—´ë ¤ 있어야합니다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "오디오" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "오디오 백엔드:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO 장치를 열기 ì—러.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -780,6 +801,9 @@ msgstr "AudioCommon: AO 장치를 열기 ì—러.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "ìžë™" @@ -822,7 +846,7 @@ msgstr "" msgid "Back" msgstr "뒤로" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "백엔드 설정" @@ -849,11 +873,11 @@ msgstr "ë°°ë“œ íŒŒì¼ í—¤ë”" msgid "Banner" msgstr " 배너" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "배너 세부사항" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "배너:" @@ -865,7 +889,7 @@ msgstr "ë°”" msgid "Basic" msgstr "기본" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "기본 설정" @@ -896,6 +920,7 @@ msgstr "파랑 오른쪽" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -903,6 +928,9 @@ msgstr "파랑 오른쪽" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "아래" @@ -911,7 +939,7 @@ msgstr "아래" msgid "Bound Controls: %lu" msgstr "바운드 컨트롤들: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "고장남" @@ -927,7 +955,7 @@ msgstr "추가할 디렉토리 둘러보기" msgid "Browse for an ISO directory..." msgstr "ISO 디렉토리 불러오기..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "출력 디렉토리 둘러보기" @@ -957,11 +985,11 @@ msgstr "C 스틱" msgid "C-Stick" msgstr "C-스틱" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU ì—뮬레ì´í„° 엔진" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "화면표시 ëª©ë¡ ìºì‰¬" @@ -1010,7 +1038,7 @@ msgstr "%s를 열수 ì—†ìŒ" msgid "Cannot unregister events with events pending" msgstr "ì´ë²¤íŠ¸ë“¤ ë¯¸í•´ê²°ì„ ì§€ë‹Œ ì´ë²¤íŠ¸ë“¤ì„ 등ë¡í•˜ì§€ ì•Šì„ ìˆ˜ ì—†ìŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1021,7 +1049,7 @@ msgstr "" "%s\n" "는 유효한 게임í브 메모리 ì¹´ë“œ 파ì¼ì´ 아닙니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1039,8 +1067,6 @@ msgstr "bd: %02x:%02x:%02x:%02x:%02x:%02x ì— ì˜í•´ 위모트를 ì°¾ì„ ìˆ˜ ì—† msgid "Cant find WiiMote by connection handle %02x" msgstr "%02x ì—°ê²°í•¸ë“¤ì— ì˜í•´ 위모트를 ì°¾ì„ ìˆ˜ ì—†ìŒ." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1050,7 +1076,7 @@ msgstr "DVD_플러그ì¸ì—ì„œ ì½ì„ 수 ì—†ìŒ - DVD-ì¸í„°íŽ˜ì´ìŠ¤: 치명 msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "카탈로니아어" @@ -1075,7 +1101,7 @@ msgstr "ë””ìŠ¤í¬ ë³€ê²½" msgid "Change Game" msgstr "게임 변경" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1091,8 +1117,8 @@ msgstr "표시를 zì›ê±°ë¦¬ 파ë¼ë¯¸í„°ë¡œ 변경 (ì •ì • 후ì—)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "표시를 z근거리 파ë¼ë¯¸í„°ë¡œ 변경 (ì •ì • 후ì—)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: 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 "ì—뮬레ì´í„°ê°€ ìž‘ë™í•˜ê³  있는 ë™ì•ˆì— ì´ ë³€ê²½ì€ íš¨ê³¼ê°€ ì—†ì„ ê²ë‹ˆë‹¤!" @@ -1112,31 +1138,31 @@ msgstr "치트 찾기" msgid "Cheats Manager" msgstr "치트들 관리ìž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "중국어 (간소화)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "중국어 (전통)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "DVD 루트 디렉토리 ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "NAND 루트 디렉토리 ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "ë””í´íŠ¸ ISO ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "추가할 디렉토리 ì„ íƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "열려는 íŒŒì¼ ì„ íƒ" @@ -1144,15 +1170,15 @@ msgstr "열려는 íŒŒì¼ ì„ íƒ" msgid "Choose a memory card:" msgstr "메모리 ì¹´ë“œ ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: 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:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "압축해제할 í´ë”를 ì„ íƒ" @@ -1164,14 +1190,14 @@ msgstr "ì„œí´ ìŠ¤í‹±" msgid "Classic" msgstr "í´ëž˜ì‹" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "깨ë—ì´" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "청소 실패했습니다." @@ -1187,6 +1213,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1195,6 +1222,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "닫기" @@ -1218,20 +1249,20 @@ msgstr "명령" msgid "Comment" msgstr "주ì„" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "주ì„:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "ISO 압축..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "ì„ íƒëœ ISO들 압축..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "ISO 압축하기" @@ -1258,13 +1289,13 @@ msgstr "패드들 설정" msgid "Configure..." msgstr "환경설정..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "íŒŒì¼ ë®ì–´ì“°ê¸° 확정" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "중지시 확ì¸" @@ -1273,7 +1304,7 @@ msgstr "중지시 확ì¸" msgid "Connect" msgstr "ì—°ê²°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "USB 키보드 ì—°ê²°" @@ -1330,12 +1361,12 @@ msgstr "GCI ë¡œ 변환" msgid "Copy failed" msgstr "복사 실패했습니다" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "메모리카드 %c ì— ë³µì‚¬" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "코어" @@ -1365,7 +1396,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "%s ISO 파ì¼ì„ ì¸ì‹í•  수 없었습니다" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "%s 를 저장할 수 없었습니다" @@ -1378,7 +1409,7 @@ msgstr "" "íŒ¨ë“œë“¤ì„ ì„¤ì •í•  수 없었습니다. 플레ì´ì–´ê°€ 떠났거나 ê²Œìž„ì´ í˜„ìž¬ 구ë™ì¤‘!\n" "(ê²Œìž„ì´ êµ¬ë™ì¤‘ì¼ ë•Œ íŒ¨ë“œë“¤ì„ ì„¤ì •í•˜ê¸°ëŠ” ì•„ì§ ì§€ì›ë˜ì§€ 않습니다)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1390,7 +1421,7 @@ msgstr "" "\n" "CD/DVDì—ì„œ ëŒí•€ì„ 구ë™í•˜ë‚˜ìš”, 아니면 저장 파ì¼ì´ 쓰기 보호ì¼ì§€ë„?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "í™•ìž¥ìž 'ini'ì— ëŒ€í•œ 열린 ëª…ë ¹ì„ ë°œê²¬í•  수 없었습니다!" @@ -1407,7 +1438,7 @@ msgstr "" msgid "Count:" msgstr "카운트:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "êµ­ê°€:" @@ -1421,27 +1452,27 @@ msgstr "AR 코드 ìƒì„±" msgid "Create new perspective" msgstr "새로운 ê´€ì  ìƒì„±" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "KDE-Look.orgì— ì˜í•´ 만들어ì§" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 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:498 msgid "Created by VistaIcons.com" msgstr "VistaIcons.comì— ì˜í•´ 만들어ì§" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 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:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "만든ì´:" @@ -1449,7 +1480,7 @@ msgstr "만든ì´:" msgid "Critical" msgstr "치명ì " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "ìžë¥´ê¸°" @@ -1472,7 +1503,7 @@ msgstr "í¬ë¡œìŠ¤íŽ˜ì´ë“œ" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "현재 디렉토리가 %sì—ì„œ wxFileSelectorë’¤ì— %së¡œ 변경ë¨!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "ì‚¬ìš©ìž ì§€ì • 프로ì ì…˜ 핵:" @@ -1480,11 +1511,11 @@ msgstr "ì‚¬ìš©ìž ì§€ì • 프로ì ì…˜ 핵:" msgid "Custom Projection Hack Settings" msgstr "ì‚¬ìš©ìž ì§€ì • 프로ì ì…˜ 핵 설정" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "ì¼ë¶€ ì • íˆ¬ì˜ íŒŒë¼ë¯¸í„°ë“¤ì„ 커스터마ì´ì¦ˆ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "ì²´ì½”" @@ -1496,10 +1527,11 @@ msgstr "D-패드" msgid "DSP" msgstr "오디오" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "DSP ì—뮬레ì´í„° 엔진" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1510,18 +1542,22 @@ msgstr "DSP ì—뮬레ì´í„° 엔진" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE ì—뮬레ì´ì…˜ (빠름)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE ì¸í„°í”„리터 (ëŠë¦¼)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE를 쓰레드ìƒì—" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE 리컴파ì¼ëŸ¬" @@ -1529,15 +1565,23 @@ msgstr "DSP LLE 리컴파ì¼ëŸ¬" msgid "DSP settings" msgstr "DSP 설정" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" 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 "" + +#: 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:176 msgid "Data Size" msgstr "ë°ì´í„° í¬ê¸°" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "날짜:" @@ -1558,7 +1602,7 @@ msgstr "ë°ë“œ ì¡´" msgid "Debug" msgstr "디버그" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "디버깅" @@ -1566,16 +1610,16 @@ msgstr "디버깅" msgid "Decimal" msgstr "10진수ì˜" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "ISO 압축해제..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "ì„ íƒëœ ISO들 압축해제..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "ISO 압축해제하기" @@ -1583,11 +1627,11 @@ msgstr "ISO 압축해제하기" msgid "Default" msgstr "기본" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "기본 ISO:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "기본 í°íŠ¸" @@ -1596,7 +1640,7 @@ msgstr "기본 í°íŠ¸" msgid "Delete" msgstr "ì‚­ì œ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "저장 지우기" @@ -1605,7 +1649,7 @@ msgstr "저장 지우기" msgid "Delete the existing file '%s'?" msgstr "기존 '%s'파ì¼ì„ 삭제합니까?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "설명" @@ -1613,8 +1657,8 @@ msgstr "설명" msgid "Detect" msgstr "ê°ì§€" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: 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." @@ -1627,8 +1671,8 @@ msgstr "" msgid "Device" msgstr "장비" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "장비 설정" @@ -1653,23 +1697,23 @@ msgstr "" " 그리고 디렉토리 백업 ì²´í¬ì„¬ì´ 실패했습니다" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "비활성" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "안개 ë”" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "ê´‘ì› ë”" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "픽셀 ê¹Šì´ ë¹„í™œì„±" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "í…스처들 ë”" @@ -1711,7 +1755,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "디스í¬" @@ -1738,6 +1782,7 @@ msgstr "" msgid "Divide" msgstr "나누기" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1747,10 +1792,13 @@ msgstr "나누기" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "현재 ì—뮬레ì´ì…˜ì„ 중단하고 싶습니까?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "ëŒí•€" @@ -1775,6 +1823,7 @@ msgstr "ëŒí•€ ì—ë®¬ëœ ìœ„ëª¨íŠ¸ 환경설정" msgid "Dolphin FIFO" msgstr "ëŒí•€ FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1799,6 +1848,14 @@ msgstr "ëŒí•€ GC패드 환경설정" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "ëŒí•€ GC패드 환경설정" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "ëŒí•€ TAS ë™ì˜ìƒ (*.dtm)" @@ -1831,11 +1888,11 @@ msgstr "" msgid "Down" msgstr "아래" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "코드(WiiRD ë°ì´í„°ë² ì´ìŠ¤) 다운로드" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu ì½”ë“œë“¤ì´ ë‹¤ìš´ë¡œë“œë¨. (ì¶”ê°€ëœ %lu)" @@ -1844,23 +1901,23 @@ msgstr "%lu ì½”ë“œë“¤ì´ ë‹¤ìš´ë¡œë“œë¨. (ì¶”ê°€ëœ %lu)" msgid "Drums" msgstr "드럼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "ë”미" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "오디오 ë¤í”„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "EFB 타겟 ë¤í”„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "프레임들 ë¤í”„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "í…스처들 ë¤í”„" @@ -1894,6 +1951,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1909,6 +1967,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "네ëœëž€ë“œì–´" @@ -1932,7 +1995,7 @@ msgstr "" "-- ë‹¹ì‹ ì´ ìµœê·¼ì— ë‹¹ì‹ ì˜ ëŒí•€ ë°°í¬ë¥¼ 업그레ì´ë“œí–ˆë‹¤ë©´, 윈ë„우즈가 새로운 ë“œë¼" "ì´ë²„를 알게 하려는 ì‹œì ì—ì„œ ì•„ë§ˆë„ ìž¬ë¶€íŒ…ì´ í•„ìš”í•©ë‹ˆë‹¤." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "유럽" @@ -1948,7 +2011,7 @@ msgstr "편집" msgid "Edit ActionReplay Code" msgstr "ì•¡ì…˜ë¦¬í”Œë ˆì´ ì½”ë“œ 편집" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "환경 편집" @@ -1960,8 +2023,8 @@ msgstr "패치 편집" msgid "Edit current perspective" msgstr "현재 ê´€ì  íŽ¸ì§‘" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "편집..." @@ -2011,7 +2074,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "ì—ë®¬ëœ ìœ„ëª¨íŠ¸" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "ì—뮬레ì´ì…˜ ìƒíƒœ:" @@ -2039,23 +2102,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "AR 로깅 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "오디오 병목 활성" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "BAT 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "ë¸”ë¡ í•©ì¹˜ê¸° 활성" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "바운딩 박스 계산 켜기" @@ -2068,6 +2131,7 @@ msgstr "바운딩 박스 계산 켜기" msgid "Enable Cache" msgstr "ìºì‰¬ 활성" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2077,51 +2141,54 @@ msgstr "ìºì‰¬ 활성" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "치트 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "DTK ìŒì•… 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "듀얼 코어 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "듀얼 코어 활성 (ì†ë„ìƒìŠ¹)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "단축키 활성(그래픽 컨트롤)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "ì•„ì´ë“¤ 스킵 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "ì•„ì´ë“¤ 스킵 활성 (ì†ë„ìƒìŠ¹)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "MMU 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "프로그레시브 스캔 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "스í¬ë¦° 세ì´ë²„ 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "와ì´ë“œìŠ¤í¬ë¦° 활성" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "와ì´ì–´í”„레임 활성" @@ -2139,14 +2206,14 @@ msgstr "" "\n" "모르겠으면, 1x를 ì„ íƒí•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: 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:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "페ì´ì§€ 활성" @@ -2174,7 +2241,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2182,7 +2249,7 @@ msgstr "" "The Legend of Zelda: Twilight Princess를 ì†ë„를 올리려면 켬. 다른 ê²Œìž„ì„ ìœ„í•´" "서는 ë”." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: 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 = " @@ -2191,7 +2258,7 @@ msgstr "" "블럭 주소 í•´ì„ (BAT); 메모리 관리 유닛 함수 활성. í•˜ë“œì›¨ì–´ì— ì •í™•í•´ì§„ë‹¤, 하지" "만 ì—뮬레ì´íŠ¸ëŠ” ëŠë ¤ì§„다.(켬 = 호환성, ë” = 빠름)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "ì‚¬ìš©ìž ì§€ì • 프로ì ì…˜ 핵 활성화" @@ -2207,7 +2274,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2227,6 +2294,7 @@ msgstr "" msgid "End" msgstr "ë" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2242,6 +2310,11 @@ msgstr "ë" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "ì˜ì–´" @@ -2272,6 +2345,7 @@ msgstr "ê°™ìŒ" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "ì—러" @@ -2304,11 +2378,17 @@ msgstr "" "죄송합니다, Wii 녹화가 ì¼ì‹œì ìœ¼ë¡œ 깨졌습니다." >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "ì—러" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "ì„ íƒëœ 언어 로딩 ì—러. 시스템 기본으로 ëŒì•„갑니다." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " @@ -2317,7 +2397,7 @@ msgstr "" "ì—러: \"%s\" ë’¤ì—, %d (0x%X)를 발견 %d (0x%X) 세ì´ë¸Œ 표시 대신ì—. ìƒíƒœì €ìž¥ ë¡œ" "드를 취소합니다..." -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2351,7 +2431,7 @@ msgstr "ì—뮬레ì´í„°ì™€ 함께 ëŒí•€ 종료" msgid "Export Failed" msgstr "내보내기 실패했습니다" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "íŒŒì¼ ë‚´ë³´ë‚´ê¸°" @@ -2364,15 +2444,15 @@ msgstr "(ìž…ë ¥) ê¸°ë¡ ë‚´ë³´ë‚´ê¸°" msgid "Export Recording..." msgstr "(ìž…ë ¥) ê¸°ë¡ ë‚´ë³´ë‚´ê¸°..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "저장 내보내기" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Wii 저장 내보내기 (실험ì )" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "모든 ì €ìž¥ë“¤ì„ ë‚´ë³´ë‚´ê¸°" @@ -2388,7 +2468,7 @@ msgstr "ì €ìž¥ì„ ë‹¤ë¥¸ ì´ë¦„으로 내보내기..." msgid "Extension" msgstr "확장" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "외부 프레임 버í¼" @@ -2400,44 +2480,44 @@ msgstr "추가 매개변수" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "추가 매개변수는 ''Metroid: Other M''ì—서만 유용합니다." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "모든 파ì¼ë“¤ 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "ì•±ë¡œë” ì••ì¶•í’€ê¸°..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "DOL 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "디렉토리 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "íŒŒì¼ ì••ì¶• 풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "파티션 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "%s 압축풀기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "모든 파ì¼ë“¤ 압축풀기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "디렉토리 압축풀기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "압축풀기..." @@ -2449,11 +2529,11 @@ msgstr "FIFO ë°”ì´íŠ¸" msgid "FIFO Player" msgstr "FIFO 플레ì´ì–´" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "프랑스" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FST í¬ê¸°:" @@ -2465,11 +2545,11 @@ msgstr "ì—°ê²°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤!" msgid "Failed to Listen!!" msgstr "ë“£ê¸°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "코드들 ë‹¤ìš´ë¡œë“œì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "%së¡œ 압축풀기 실패했습니다!" @@ -2586,18 +2666,28 @@ msgstr "%s ì— ëŒ€í•œ í—¤ë” ì“°ê¸°ì— ì‹¤íŒ¨" msgid "Failed to write header for file %d" msgstr "%d 파ì¼ì— 대한 í—¤ë” ì“°ê¸°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "빠름" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "빠른 밉맵" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "FIFO 플레ì´ì–´" @@ -2606,7 +2696,7 @@ msgstr "FIFO 플레ì´ì–´" msgid "File Info" msgstr "íŒŒì¼ ì •ë³´" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "파ì¼ì´ 코드를 지니지 않었습니다." @@ -2639,16 +2729,16 @@ msgstr "파ì¼ì´ 메모리카드로 ì¸ì‹ë˜ì§€ 않는다" msgid "File not compressed" msgstr "파ì¼ì´ 압축ë˜ì§€ 않었습니다" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: 알려지지 ì•Šì€ ì—´ê¸° 모드: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "파ì¼ì‹œìŠ¤í…œ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "'ini'파ì¼íƒ€ìž…ì€ ì•Œë ¤ì§€ì§€ ì•ŠìŒ! 열지 않겠습니다!" @@ -2656,7 +2746,7 @@ msgstr "'ini'파ì¼íƒ€ìž…ì€ ì•Œë ¤ì§€ì§€ ì•ŠìŒ! 열지 않겠습니다!" msgid "First Block" msgstr "첫번째 블럭" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "ì²´í¬ì„¬ë“¤ 고침" @@ -2668,7 +2758,7 @@ msgstr "ê°•ì œ 16:9" msgid "Force 4:3" msgstr "ê°•ì œ 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "ì½˜ì†”ì„ NTSC-Jë¡œ 강제시킴" @@ -2700,7 +2790,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 " @@ -2736,7 +2826,7 @@ msgstr "프레임" msgid "Frame Advance" msgstr "프레임 진행" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "프레임 ë¤í”„ê°€ FFV1를 사용" @@ -2748,7 +2838,7 @@ msgstr "프레임 범위" msgid "Frame S&kipping" msgstr "프레임 스킵(&k)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "프레임제한:" @@ -2756,10 +2846,11 @@ msgstr "프레임제한:" msgid "Frames To Record" msgstr "녹화할 프레임" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "ìžìœ ë¡œìš´ 보기" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2775,6 +2866,11 @@ msgstr "ìžìœ ë¡œìš´ 보기" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "프랑스어" @@ -2807,7 +2903,7 @@ msgstr "GCMic 환경설정" msgid "GCPad" msgstr "GC패드" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "게임 ID:" @@ -2823,15 +2919,15 @@ msgstr "ê²Œìž„ì´ êµ¬ë™ì¤‘ì´ì§€ 않습니다!" msgid "Game not found!!" msgstr "ê²Œìž„ì´ ì°¾ì„ ìˆ˜ 없습니다!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "게임-ìƒì„¸ 설정" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "게임환경" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "게임í브" @@ -2842,6 +2938,7 @@ msgstr "게임í브 패드 설정(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2849,6 +2946,9 @@ msgstr "게임í브 패드 설정(&P)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "게임í브 메모리 카드들 (*.raw,*.gcp)" @@ -2857,15 +2957,17 @@ msgid "Gamecube Pad settings" msgstr "게임í브 패드 설정" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko 코드" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, 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.)" +"(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" "(ìž˜ëª»ëœ ì½”ë“œì´ê±°ë‚˜ 코드 íƒ€ìž…ì´ ì•„ì§ ì§€ì›ì•Šëœë‹¤.)" @@ -2874,6 +2976,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2882,6 +2985,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "ì¼ë°˜" @@ -2890,6 +2996,7 @@ msgstr "ì¼ë°˜" msgid "General Settings" msgstr "ì¼ë°˜ 설정" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2905,6 +3012,11 @@ msgstr "ì¼ë°˜ 설정" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "ë…ì¼ì–´" @@ -2942,7 +3054,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "그리스어" @@ -2974,7 +3086,7 @@ msgstr "핵" msgid "Header checksum failed" msgstr "í—¤ë” ì²´í¬ì„¬ 실패했습니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "히브리어" @@ -3044,12 +3156,16 @@ msgstr "단축키 설정" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "단축키들" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "í—가리어" @@ -3057,14 +3173,14 @@ msgstr "í—가리어" msgid "Hybrid Wiimote" msgstr "하ì´ë¸Œë¦¬ë“œ 위모트" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3077,11 +3193,11 @@ msgstr "" "TitleID %016llx.\n" " ëŒí•€ì€ ì´ì œ 멈추려할 것ì´ë‹¤" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - ìž˜ëª»ëœ ëŒ€ìƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL 설정" @@ -3097,15 +3213,15 @@ msgstr "IR í¬ì¸í„°" msgid "IR Sensitivity:" msgstr "IR ê°ë„:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "ISO 세부사항" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "ISO 디렉토리들" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ì´íƒˆë¦¬ì•„" @@ -3113,7 +3229,7 @@ msgstr "ì´íƒˆë¦¬ì•„" msgid "Icon" msgstr "ì•„ì´ì½˜" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3121,17 +3237,19 @@ msgstr "" "ì²´í¬í•˜ë©´, 바운딩 박스 ë ˆì§€ìŠ¤í„°ë“¤ì´ ì—…ë°ì´íŠ¸ë  것입니다. Paper Mario 게임들ì—" "ì„œ 사용ë©ë‹ˆë‹¤." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: 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:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy msgid "" -"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." +"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ì—ì„œ " "오디오 ë³‘ëª©ë„ êº¼ì•¼ ê·¸ê²ƒì´ íš¨ê³¼ë¥¼ 냅니다." @@ -3168,7 +3286,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "ì €ìž¥ì„ ê°€ì ¸ì˜¤ê¸°" @@ -3217,7 +3335,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "게임안" @@ -3226,7 +3344,7 @@ msgid "In-Game" msgstr "게임-안" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "ì •ë³´" @@ -3246,7 +3364,7 @@ msgstr "삽입" msgid "Insert Encrypted or Decrypted code here..." msgstr "암호화ë˜ê±°ë‚˜ 암호해ë…ëœ ì½”ë“œë¥¼ ì—¬ê¸°ì— ì‚½ìž…í•˜ì„¸ìš”..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "SD ì¹´ë“œ 삽입" @@ -3258,7 +3376,7 @@ msgstr "ì´ë¦„ì„ ì—¬ê¸°ì— ë„£ìœ¼ì‹œì˜¤..." msgid "Install WAD" msgstr "WAD 설치" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Wii ë©”ë‰´ì— ì„¤ì¹˜" @@ -3269,6 +3387,7 @@ msgstr "" "InstallExceptionHandler 호출ë¨, 하지만 ì´ í”Œëž«í¼ì€ ì•„ì§ ê·¸ê²ƒì„ ì§€ì›í•˜ì§€ 않습" "니다." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3278,14 +3397,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WAD 설치하기..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "ì¸í„°íŽ˜ì´ìŠ¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "ì¸í„°íŽ˜ì´ìŠ¤ 설정" @@ -3310,11 +3432,11 @@ msgstr "내부 LZO ì—러 - lzo_init() 실패했습니다" msgid "Internal Resolution:" msgstr "내부 í•´ìƒë„:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "ì¸í„°í”„리터 (매우 ëŠë¦¼)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "소개화면" @@ -3331,7 +3453,7 @@ msgstr "비ì í•© ê°’!" msgid "Invalid bat.map or dir entry" msgstr "비ì í•© bat.map í˜¹ì€ ë””ë ‰í† ë¦¬ 엔트리" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "비ì í•© ì´ë²¤íŠ¸ 타입 %i" @@ -3351,14 +3473,15 @@ msgstr "" "%s\n" " ë‹¹ì‹ ì€ ì´ ê²Œìž„ì„ ë¦¬ë¤í”„해야할 지ë„." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "비ì í•© ê¸°ë¡ íŒŒì¼" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "비ì í•© ìƒíƒœ" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3374,27 +3497,32 @@ msgstr "비ì í•© ìƒíƒœ" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "ì´íƒˆë¦¬ì•„ì–´" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "ì¼ë³¸" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT 리컴파ì¼ëŸ¬ (권장)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL ì‹¤í—˜ì  ë¦¬ì»´íŒŒì¼ëŸ¬" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "ì¼ë³¸ì–´" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "한국" @@ -3403,8 +3531,8 @@ msgstr "한국" msgid "Key" msgstr " [ 키 ]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "한국어" @@ -3422,7 +3550,7 @@ msgstr "L 버튼" msgid "L-Analog" msgstr "L-아날로그" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "언어:" @@ -3475,7 +3603,7 @@ msgstr "" msgid "Less Than" msgstr "보다 ë” ì ì€" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "FPSë¡œ 제한" @@ -3483,7 +3611,7 @@ msgstr "FPSë¡œ 제한" msgid "Load" msgstr "로드" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "커스텀 í…스처 로드" @@ -3531,6 +3659,7 @@ msgstr "슬롯8 ìƒíƒœ 로드" msgid "Load State..." msgstr "ìƒíƒœ 로드..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3552,6 +3681,13 @@ msgstr "Wii 시스템 메뉴 로드" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Wii 시스템 메뉴 로드" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii 시스템 메뉴 %d %c 로드" @@ -3578,7 +3714,7 @@ msgstr "ëª…ì‹œëœ íŒŒì¼ (DOL,ELF,WAD,GCM,ISO,WAD) 로드" msgid "Local" msgstr "지역" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "ì½”ì–´ì— ì“°ë ˆë“œ 잠그기" @@ -3590,11 +3726,11 @@ msgstr "로그" msgid "Log Configuration" msgstr "로그 환경설정" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "로그 타입" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "로거 출력" @@ -3624,7 +3760,7 @@ msgstr "" "MD5 미스매치\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU 스피드 핵" @@ -3646,11 +3782,11 @@ msgstr "MadCatz ê²Œìž„ìƒ¤í¬ íŒŒì¼ë“¤(*.gcs)" msgid "Main Stick" msgstr "ë©”ì¸ ìŠ¤í‹±" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "제작사 ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "제작사:" @@ -3674,6 +3810,7 @@ msgstr "메모리 ë°”ì´íŠ¸" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3681,6 +3818,9 @@ msgstr "메모리 ë°”ì´íŠ¸" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "메모리 ì¹´ë“œ" @@ -3717,7 +3857,7 @@ msgstr "메모리카드 파ì¼í¬ê¸°ê°€ í—¤ë” í¬ê¸°ì™€ 불ì¼ì¹˜í•©ë‹ˆë‹¤" msgid "Menu" msgstr "메뉴" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "마ì´í¬" @@ -3726,11 +3866,11 @@ msgstr "마ì´í¬" msgid "Min" msgstr "최소값" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "기타" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "기타 설정" @@ -3751,7 +3891,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "단ì¼ë„어쓰기 í°íŠ¸" @@ -3764,7 +3904,7 @@ msgstr "모션 플러스" msgid "Motor" msgstr "모터" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3786,7 +3926,7 @@ msgstr "" msgid "Multiply" msgstr "곱하기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3878,6 +4018,7 @@ msgstr "NP 탭" msgid "NP Up" msgstr "NP 위" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3887,6 +4028,9 @@ msgstr "NP 위" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3895,7 +4039,7 @@ msgstr "ì´ë¦„:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "ì´ë¦„:" @@ -3909,7 +4053,7 @@ msgid "New Scan" msgstr "새로운 스캔" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "ë‹¤ìŒ íŽ˜ì´ì§€" @@ -3921,7 +4065,7 @@ msgstr "ë‹¤ìŒ ìŠ¤ìº”" msgid "Nickname :" msgstr "별명 :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "êµ­ê°€ ì—†ìŒ (SDK)" @@ -3960,7 +4104,7 @@ msgstr "%s 타ì´í‹€ì— 대한 저장 í´ë”ê°€ ì—†ìŒ" msgid "None" msgstr "ì—†ìŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "ë…¸ë¥´ì›¨ì´ ë¶ëª°ì–´" @@ -3968,8 +4112,8 @@ msgstr "ë…¸ë¥´ì›¨ì´ ë¶ëª°ì–´" msgid "Not Equal" msgstr "같지 ì•ŠìŒ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "설정 안함" @@ -3989,7 +4133,7 @@ msgstr "ì—°ê²°ë˜ì§€ ì•ŠìŒ" msgid "Notes" msgstr "참고 사항" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "참고:" @@ -4027,7 +4171,7 @@ msgstr "오브ì íŠ¸" msgid "Object Range" msgstr "오브ì íŠ¸ 범위" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "ë”" @@ -4053,11 +4197,11 @@ msgstr "%d 블럭들만 유용한" msgid "Open" msgstr "열기" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "ë‹´ê³  있는 í´ë” 열기(&c)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Wii 저장 í´ë” 열기(&s)" @@ -4079,11 +4223,11 @@ msgstr "OpenAL: 사운드 ìž¥ì¹˜ë“¤ì„ ì°¾ì„ ìˆ˜ ì—†ìŒ" msgid "OpenAL: can't open device %s" msgstr "OpenAL: %s 장치를 ì—´ 수 ì—†ìŒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL í…스처 디코ë”" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP í…스처 디코ë”" @@ -4112,7 +4256,7 @@ msgid "" msgstr "íŒŒì¼ ë””ë ‰í† ë¦¬ì•ˆì— íŒŒì¼ì˜ 순서가 블럭 순서와 맞지 않습니다\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "다른 것들" @@ -4164,19 +4308,20 @@ msgstr "단ë½" msgid "Parameters" msgstr "매개변수들" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "파티션 %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "패치" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "경로" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4189,6 +4334,10 @@ msgstr "경로" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "ì¼ì‹œì •ì§€" @@ -4197,7 +4346,7 @@ msgstr "ì¼ì‹œì •ì§€" msgid "Per-Pixel Lighting" msgstr "픽셀단위 ê´‘ì›" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "완벽한" @@ -4210,6 +4359,7 @@ msgstr "ê´€ì  %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4220,6 +4370,10 @@ msgstr "ê´€ì  %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr " 실행 " @@ -4233,7 +4387,7 @@ msgstr "(ìž…ë ¥) ê¸°ë¡ ìž¬ìƒ" msgid "Play/Pause" msgstr "실행/ì¼ì‹œì •ì§€" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "플레ì´ê°€ëŠ¥" @@ -4245,6 +4399,7 @@ msgstr "ìž¬ìƒ ì˜µì…˜" msgid "Players" msgstr "플레ì´ì–´" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4254,6 +4409,9 @@ msgstr "플레ì´ì–´" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "확ì¸í•´ì£¼ì„¸ìš”..." @@ -4265,23 +4423,23 @@ msgstr "ì €ìž¥í•˜ê¸°ì „ì— ê´€ì ì„ ìƒì„±í•´ 주세요." msgid "Plus-Minus" msgstr "플러스-마ì´ë„ˆìŠ¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "í´ëž€ë“œì–´" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "í¬íŠ¸ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "í¬íŠ¸ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "í¬íŠ¸ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "í¬íŠ¸ 4" @@ -4290,11 +4448,11 @@ msgstr "í¬íŠ¸ 4" msgid "Port :" msgstr "í¬íŠ¸:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "í¬ë¥´íˆ¬ê°ˆì–´" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "í¬ë¥´íˆ¬ê°ˆì–´ (브ë¼ì§ˆ)" @@ -4302,17 +4460,17 @@ msgstr "í¬ë¥´íˆ¬ê°ˆì–´ (브ë¼ì§ˆ)" msgid "Post-Processing Effect:" msgstr "후-처리 효과:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "PlayControllerì— ì˜ìƒë§ˆë¬´ë¦¬ê°€ 미완성ë˜ì—ˆìŠµë‹ˆë‹¤. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "PlayWiimoteì— ì˜ìƒ 마무리가 미완성ë˜ì—ˆìŠµë‹ˆë‹¤. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "PlayWiimoteì— ì˜ìƒ 마무리가 미완성ë˜ì—ˆìŠµë‹ˆë‹¤. %u > %u" @@ -4325,7 +4483,7 @@ msgstr "사전설정:" msgid "Prev Page" msgstr "ì´ì „ 페ì´ì§€" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "ì´ì „ 페ì´ì§€" @@ -4376,7 +4534,7 @@ msgstr "R-아날로그" msgid "RAM" msgstr "램" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "러시아" @@ -4389,7 +4547,7 @@ msgstr "범위" msgid "Read-only mode" msgstr "ì½ê¸°-ì „ìš© 모드" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "실제" @@ -4464,6 +4622,7 @@ msgstr "ëª©ë¡ ìƒˆë¡œ 고침" msgid "Refresh game list" msgstr "게임 ëª©ë¡ ìƒˆë¡œ 고침" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4482,6 +4641,12 @@ msgstr "게임 ëª©ë¡ ìƒˆë¡œ 고침" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "제거" @@ -4534,11 +4699,11 @@ msgstr "오른쪽 스틱" msgid "Rumble" msgstr "진ë™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: 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:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "러시아어" @@ -4546,10 +4711,11 @@ msgstr "러시아어" msgid "Sa&ve State" msgstr "ìƒíƒœ 저장(&v) " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "안전" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4559,6 +4725,9 @@ msgstr "안전" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "샘플율:" @@ -4616,12 +4785,12 @@ msgstr "슬롯8 ìƒíƒœ 저장" msgid "Save State..." msgstr "ìƒíƒœ 저장..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "다른 ì´ë¦„으로 저장..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "ì••ì¶•ëœ GCM/ISO를 저장" @@ -4629,11 +4798,11 @@ msgstr "ì••ì¶•ëœ GCM/ISO를 저장" msgid "Save current perspective" msgstr "현재 ê´€ì ì„ 저장" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "압축풀린 GCM/ISO를 저장" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "%s ì˜ìƒ ìƒíƒœì €ìž¥ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤, ì˜ìƒ ê¸°ë¡ ì¤‘ì§€..." @@ -4642,6 +4811,7 @@ msgstr "%s ì˜ìƒ ìƒíƒœì €ìž¥ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤, ì˜ìƒ ê¸°ë¡ ì¤‘ì§€... msgid "Scaled EFB Copy" msgstr "스케ì¼ëœ EFB 복사" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4651,15 +4821,18 @@ msgstr "스케ì¼ëœ EFB 복사" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "스ìºë‹ %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "ISOë“¤ì„ ê²€ì‚¬í•˜ê¸°" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "스ìºë‹..." @@ -4675,12 +4848,12 @@ msgstr "스í¬ë¡¤ ë½" msgid "Search Filter" msgstr "í•„í„° 찾기" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "하위í´ë”들 찾기" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: 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ì—ì„œ ì°¾ì„ ìˆ˜ ì—†ìŒ" @@ -4690,6 +4863,7 @@ msgstr "섹션 %s를 SYSCONFì—ì„œ ì°¾ì„ ìˆ˜ ì—†ìŒ" msgid "Select" msgstr "ì„ íƒ" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4714,6 +4888,14 @@ msgstr "ê¸°ë¡ íŒŒì¼ ì„ íƒ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "ê¸°ë¡ íŒŒì¼ ì„ íƒ" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "설치할 Wii WAD íŒŒì¼ ì„ íƒ" @@ -4739,6 +4921,7 @@ msgstr "유ë™ì ì¸ 윈ë„우즈 ì„ íƒ" msgid "Select the file to load" msgstr "로드할 íŒŒì¼ ì„ íƒ" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4755,19 +4938,26 @@ msgstr "로드할 ìƒíƒœ ì„ íƒ" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "저장 파ì¼ì„ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "로드할 ìƒíƒœ ì„ íƒ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "저장할 ìƒíƒœ ì„ íƒ" @@ -4789,7 +4979,7 @@ msgstr "" "\n" "모르겠으면, ìžë™ì„ ì„ íƒí•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "ì„ íƒëœ í°íŠ¸" @@ -4837,11 +5027,11 @@ msgstr "센서 ë°” 위치:" msgid "Separator" msgstr "분리ìž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "세르비아어" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: 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 - ì´ê²ƒì€ ë„· ì–´ëŒ‘í„°ê°™ì€ ë””ë°”ì´ìŠ¤ê°€ 사용하는 í¬íŠ¸ì´ë‹¤" @@ -4850,11 +5040,11 @@ msgstr "시리얼 í¬íŠ¸ 1 - ì´ê²ƒì€ ë„· ì–´ëŒ‘í„°ê°™ì€ ë””ë°”ì´ìŠ¤ê°€ 사 msgid "Set" msgstr "설정" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "ë””í´íŠ¸ ISOë¡œ 설정(&d)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "기본 메모리카드 %c ë¡œ 설정" @@ -4864,7 +5054,7 @@ 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:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "설정..." @@ -4876,7 +5066,7 @@ msgstr "SetupWiiMem: 설정 파ì¼ì„ ì°¾ì„ ìˆ˜ ì—†ìŒ" msgid "Shake" msgstr "í”들기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "단축 ì´ë¦„:" @@ -4904,7 +5094,7 @@ msgstr "툴바 표시(&T)" msgid "Show Drives" msgstr "ë“œë¼ì´ë¸Œ 표시" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "EFB 복사 ì˜ì—­" @@ -4920,7 +5110,7 @@ msgstr "프랑스" msgid "Show GameCube" msgstr "게임í브" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "ìž…ë ¥ 표시 보기" @@ -4936,7 +5126,7 @@ msgstr "JAP (ì¼ë³¸ ë°©ì‹)" msgid "Show Korea" msgstr "한국" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "언어 보기:" @@ -4956,7 +5146,7 @@ msgstr "í”Œëž«í¼ í‘œì‹œ" msgid "Show Regions" msgstr "지역 표시" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "통계들" @@ -4976,11 +5166,11 @@ msgstr "Wad" 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 " @@ -4990,23 +5180,23 @@ msgstr "" "ì´ê²ƒì„ ë„ë©´ 짜ì¦ë‚˜ê³  심ê°í•˜ì§€ ì•Šì€ ë©”ì‹œì§€ë“¤ì„ í”¼í•  ìˆ˜ë„ ìžˆë‹¤, 하지만 ê·¸ê²ƒì€ " "ëŒí•€ì´ 전혀 설명 ì—†ì´ ê°‘ìžê¸° 깨진다는 ê²ƒì„ ì˜ë¯¸í•  ìˆ˜ë„ ìžˆë‹¤." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "첫번째 블럭 보기" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "저장 블럭들 보기" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "저장 ì£¼ì„ ë³´ê¸°" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "저장 ì•„ì´ì½˜ 보기" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "저장 타ì´í‹€ 보기" @@ -5043,7 +5233,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "사ì´ë“œì›¨ì´ 위모트" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "간소화 중국어" @@ -5051,11 +5241,11 @@ msgstr "간소화 중국어" msgid "Size" msgstr "í¬ê¸°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "ë°”ì´ì˜¤ìŠ¤ 스킵" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "목ì ì§€. 알파 패스 스킵" @@ -5097,11 +5287,11 @@ msgstr "" msgid "Slot %i" msgstr "슬롯 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "슬롯 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "슬롯 B" @@ -5124,7 +5314,7 @@ msgstr "" "디버깅 목ì ìœ¼ë¡œë§Œ 유용합니다.\n" "소프트웨어 ë Œë”ë§ì„ í™œì„±ì„ ì •ë§ ì›í•©ë‹ˆê¹Œ? 모르겠으면, '아니오'를 ì„ íƒí•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "사운드 설정" @@ -5142,6 +5332,7 @@ msgstr "사운드 ë²„í¼ ìƒì„± 실패했습니다: %s" msgid "Space" msgstr "스페ì´ìŠ¤" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5157,6 +5348,11 @@ msgstr "스페ì´ìŠ¤" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "스페ì¸ì–´" @@ -5188,7 +5384,7 @@ msgstr "" msgid "Specify a video backend" msgstr "비디오 백엔드 명시" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "ë””ìŠ¤í¬ ì „ì†¡ìœ¨ ì†ë„ ìƒìŠ¹" @@ -5196,7 +5392,7 @@ msgstr "ë””ìŠ¤í¬ ì „ì†¡ìœ¨ ì†ë„ ìƒìŠ¹" msgid "Square Stick" msgstr "스퀘어 스틱" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "표준 컨트롤러" @@ -5293,12 +5489,12 @@ msgstr "세ì´ë¸Œ 파ì¼ë“¤ì„ 성공ì ìœ¼ë¡œ 가져왔ìŒ" msgid "Swing" msgstr "스윙" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "시스템 언어:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "타ì´ì™„" @@ -5337,7 +5533,7 @@ msgstr "í…Œì´ë¸” 오른쪽" msgid "Take Screenshot" msgstr "스í¬ë¦°ìƒ· ì°ê¸°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "타루콩가 (봉고스)" @@ -5353,7 +5549,7 @@ msgstr "í…스처" msgid "Texture Cache" msgstr "í…스처 ìºì‰¬" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "í…스처 í¬ë©§ 오버레ì´" @@ -5369,13 +5565,13 @@ msgstr "ê·¸ 주소는 비ì í•© 입니다" msgid "The checksum was successfully fixed" msgstr "ì²´í¬ì„¬ì´ 성공ì ìœ¼ë¡œ ê³ ì³ì¡ŒìŠµë‹ˆë‹¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "ì„ íƒëœ 디렉토리는 ì´ë¯¸ ë¦¬ìŠ¤íŠ¸ì— ìžˆë‹¤" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5398,7 +5594,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:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "ë‹¹ì‹ ì´ ê¸°ìˆ í•œ íŒŒì¼ (%s)는 존재하지 않습니다" @@ -5416,11 +5612,12 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "í•´ë…ëœ AR 코드 결과가 없습니다." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" "ì´ê²ƒì„ 안전하게 ì •í•  수ë¡, ì—뮬레ì´í„°ê°€ 램으로 부터 í…스처 ì—…ë°ì´íŠ¸ë“¤ì„ ëœ ë†“" "치는 ê²½í–¥ì´ ìžˆìŠµë‹ˆë‹¤.\n" @@ -5463,7 +5660,7 @@ msgstr "ê¸°ìˆ ëœ \"%s\" 파ì¼ì€ 존재하지 않는다" msgid "The value is invalid" msgstr "ê°’ì´ ë¹„ì í•© 합니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "테마" @@ -5471,7 +5668,7 @@ msgstr "테마" msgid "Theme selection went wrong" msgstr "테마 ì„ íƒì´ 잘못ë˜ì—ˆë‹¤" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5479,7 +5676,7 @@ msgstr "" "00000001/00000002ì— ëŒ€í•œ í‹°ì¼“ì´ ìžˆì–´ì•¼í•œë‹¤. ë‹¹ì‹ ì˜ NAND ë¤í”„는 ì•„ë§ˆë„ ë¯¸ì™„ì„±" "ì´ë‹¤." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5495,7 +5692,7 @@ msgstr "" "ì´ ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì‹œë®¬ë ˆì´í„°ëŠ” ì•¡ì…˜ ë¦¬í”Œë ˆì´ ìŠ¤ìŠ¤ë¡œ 수정한 코드를 지ì›í•˜ì§€ ì•Š" "는다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "ì´ê²ƒì€ Wii 메뉴와 ì¼ë¶€ 게임들ì—ì„œ ëŠë ¤ì§ì„ 유발할 수 있다." @@ -5518,23 +5715,10 @@ msgstr "" "모르겠으면. ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -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" -"키보드 단축키 : ë³‘ëª©ì„ ì¦‰ê° ë„려면 눌러ë¼." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "ì´ê²ƒì€ BGMê°™ì€ ìŒì•… íŠ¸ëž™ë“¤ì„ ìž¬ìƒí•˜ëŠ” ë°ì— 쓰입니다." -#: 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" @@ -5546,7 +5730,7 @@ msgstr "" "ë‘ê°œ ì´ìƒì˜ 코어를 가진 PC들 ìƒì—ì„œ 주요 ì†ë„ í–¥ìƒë“¤ì„ 유발한다, 하지만 ê°‘ìž‘" "스런 깨ì§/ê²°í•¨ë“¤ì„ ì¼ìœ¼í‚¬ ìˆ˜ë„ ìžˆë‹¤." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "ì´ê²ƒì€ 수ë™ìœ¼ë¡œ INI 환경파ì¼ì„ 수정하게 해줄ê²ë‹ˆë‹¤" @@ -5569,7 +5753,7 @@ msgstr " 제목" msgid "To" msgstr "To" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "모든 로그 타입 토글" @@ -5589,6 +5773,7 @@ msgstr "전체화면 토글" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5596,14 +5781,17 @@ msgstr "전체화면 토글" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "위" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "전통 중국어" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "알려지지 ì•Šì€ íŒŒì¼ íƒ€ìž…ì„ ë¡œë“œì‹œë„했다." @@ -5611,7 +5799,7 @@ msgstr "알려지지 ì•Šì€ íŒŒì¼ íƒ€ìž…ì„ ë¡œë“œì‹œë„했다." msgid "Triggers" msgstr "트리거" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "비ì í•© SYSCONFë¡œ 부터 ì½ê¸° ì‹œë„" @@ -5623,7 +5811,7 @@ msgstr "" "효한 SYSCONFì—ì„œ ì½ê¸° ì‹œë„\n" "위모트 bt idë“¤ì€ ìœ ìš©í•˜ì§€ 않습니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "터키어" @@ -5644,11 +5832,11 @@ msgstr "UDP í¬íŠ¸:" msgid "UDP Wiimote" msgstr "UDP 위모트" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "알려지지 ì•ŠìŒ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "미국" @@ -5734,7 +5922,7 @@ msgstr "ì—…ë°ì´íŠ¸" msgid "Upright Wiimote" msgstr "ì—…ë¼ì´íŠ¸ 위모트" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 모드 (PAL60) 사용" @@ -5746,7 +5934,7 @@ msgstr "전체화면 사용" msgid "Use Hex" msgstr "16진수 사용" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "패닉 핸들러 사용" @@ -5776,7 +5964,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "유틸리티" @@ -5800,25 +5988,29 @@ msgstr "ê°’:" msgid "Verbosity" msgstr "ìƒì„¸ì„¤ëª…" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "비디오" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "ê°€ìƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "볼륨" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format 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" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5837,15 +6029,15 @@ msgstr "" msgid "Warning" msgstr "경고" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "경고 - ìž˜ëª»ëœ ì½˜ì†” 모드ì—ì„œ DOLì„ ì‹œìž‘!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "경고 - ìž˜ëª»ëœ ì½˜ì†” 모드ì—ì„œ ELF 시작!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "경고 - ìž˜ëª»ëœ ì½˜ì†” 모드ì—ì„œ ISO 시작!" @@ -5873,7 +6065,7 @@ msgstr "" "그리고 ë‹¹ì‹ ì˜ ë©”ëª¨ë¦¬ì¹´ë“œì— íŒŒì¼ë¡œ ê°™ì€ ì´ë¦„ì„ ê°€ì§‘ë‹ˆë‹¤\n" "계ì†í•©ë‹ˆê¹Œ?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5884,7 +6076,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:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5895,7 +6087,7 @@ msgstr "" "ì „ì— ë‹¤ë¥¸ 세ì´ë¸Œë¥¼ 로드해야합니다, í˜¹ì€ ì½ê¸°-ì „ìš© 모드를 ë„ê³  로드하세요. ê·¸" "렇지 않으면 ì•„ë§ˆë„ ì‹±í¬ ì–´ê¸‹ë‚¨ì´ ìƒê¸¸ê²ë‹ˆë‹¤." -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5937,7 +6129,7 @@ msgstr "WaveFileWriter - 파ì¼ì´ 열리지 않습니다." msgid "Whammy" msgstr "훼미" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "와ì´ë“œìŠ¤í¬ë¦° 핵" @@ -5945,15 +6137,15 @@ msgstr "와ì´ë“œìŠ¤í¬ë¦° 핵" msgid "Width" msgstr "너비" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii 콘솔" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND 루트:" @@ -5961,6 +6153,7 @@ msgstr "Wii NAND 루트:" msgid "Wii Save Import" msgstr "Wii 저장 가져오기" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5970,6 +6163,9 @@ msgstr "Wii 저장 가져오기" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 저장 파ì¼ë“¤ (*.bin)|*.bin" @@ -6036,10 +6232,11 @@ msgstr "윈ë„우즈 메뉴" msgid "Windows Right" msgstr "윈ë„우즈 오른쪽" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "ìžë™ 줄바꿈" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6055,6 +6252,11 @@ msgstr "ìžë™ 줄바꿈" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "ìž‘ë™ì¤‘..." @@ -6062,6 +6264,11 @@ msgstr "ìž‘ë™ì¤‘..." msgid "Write to Console" msgstr "ì½˜ì†”ì— ì“°ê¸°" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "파ì¼ì— 쓰기" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "파ì¼ì— 쓰기" @@ -6117,7 +6324,7 @@ msgstr "ì í•©í•œ 10진수나 16진수나 8진수 ê°’ì„ ë„£ì–´ì•¼ 합니다." msgid "You must enter a valid profile name." msgstr "ì í•©í•œ í”„ë¡œíŒŒì¼ ì´ë¦„ì„ ë„£ì–´ì•¼ 합니다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "ë³€ê²½ì´ ì ìš©ë˜ë ¤ë©´ ëŒí•€ì„ 재시작 해야 합니다." @@ -6140,7 +6347,7 @@ msgstr "" "0x%04x ì´ì–´ì•¼í•©ë‹ˆë‹¤ (하지만 0x%04llx ìž„) \n" "새로 ìƒì„±í•˜ì‹œê² ìŠµë‹ˆê¹Œ?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP 핵" @@ -6210,7 +6417,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "ì•±ë¡œë” (.img)" @@ -6241,12 +6448,12 @@ msgstr "wii ì €ìž¥ì´ ì•„ë‹ˆê±°ë‚˜ íŒŒì¼ í—¤ë” í¬ê¸° %xì— ëŒ€í•œ ì½ê¸° 실 msgid "s" msgstr "들" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "알려지지 ì•Šì€ ëª…ë ¹ 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "애플리케ì´ì…˜ 구ë™ìƒì—ì„œ wxExecuteê°€ -1ì„ ë°˜í™˜í–ˆìŠµë‹ˆë‹¤!" @@ -6455,6 +6662,9 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "ì—뮬레ì´í„° 화면표시 설정" +#~ msgid "Enable Audio Throttle" +#~ msgstr "오디오 병목 활성" + #~ msgid "Enable CPU Access" #~ msgstr "CPU 엑세스 활성" @@ -6511,6 +6721,13 @@ msgstr "| OR" #~ msgid "Error allocating buffer" #~ msgstr "ë²„í¼ í• ë‹¹í•˜ê¸° ì—러" +#~ msgid "" +#~ "Error in PlayWiimote. %u != %u, byte %d.\n" +#~ "Sorry, Wii recording is temporarily broken." +#~ msgstr "" +#~ "PlayWiimoteì— ì—러발ìƒ. %u != %u, byte %d.\n" +#~ "죄송합니다, Wii 녹화가 ì¼ì‹œì ìœ¼ë¡œ 깨졌습니다." + #~ msgid "Error loading %s: can't read info" #~ msgstr "%s 로딩 ì—러: 정보를 ì½ì„ 수 ì—†ìŒ" @@ -6790,6 +7007,19 @@ msgstr "| OR" #~ msgid "The file " #~ 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" +#~ "키보드 단축키 : ë³‘ëª©ì„ ì¦‰ê° ë„려면 눌러ë¼." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "ì´ê²ƒì€ 보통 ìŒì„±ê³¼ 소리 효과들 재ìƒì— 사용ëœë‹¤." diff --git a/Languages/po/nb.po b/Languages/po/nb.po index d321d1dde5..d2fa9aa314 100644 --- a/Languages/po/nb.po +++ b/Languages/po/nb.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-06-06 20:15+0100\n" "Last-Translator: Knut \n" "Language-Team: Norwegian \n" @@ -60,9 +64,9 @@ msgstr "\"%s\" er en ugyldig GCM/ISO-fil, eller ikke en GC/Wii ISO." msgid "%1$sCopy%1$s" msgstr "%1$sKopier%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -154,7 +158,7 @@ msgstr "%sEksporter GCI%s" msgid "%sImport GCI%s" msgstr "%sImporter GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Ledige Blokker; %u Ledige Dir Entries" @@ -187,11 +191,11 @@ msgstr "Jukse&kode-manager" msgid "&DSP Settings" msgstr "Innstillinger for &DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Slett ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Slett valgte ISO-filer..." @@ -255,7 +259,7 @@ msgstr "&Pause" msgid "&Play" msgstr "&Spill" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Egenskaper" @@ -299,7 +303,7 @@ msgstr "Vi&s" msgid "&Wiimote Settings" msgstr "Innstillinger for Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -343,7 +347,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -352,7 +356,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -409,13 +413,13 @@ msgstr "" "\n" "Du mÃ¥ fremme TCP-porten til verten!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "" @@ -427,11 +431,11 @@ msgstr "Om Dolphin" msgid "Acceleration" msgstr "Aksellerasjon" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "Nøyaktighet:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Nøyaktig VBeam-emulering" @@ -551,11 +555,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Legg Til" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Legg til Action Replay Kode" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Legg til Patch" @@ -563,6 +567,7 @@ msgstr "Legg til Patch" msgid "Add new pane" msgstr "Legg til ny rute" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -578,6 +583,11 @@ msgstr "Legg til ny rute" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Legg til..." @@ -625,11 +635,11 @@ 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:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Avansert" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Avanserte Innstillinger" @@ -637,14 +647,15 @@ msgstr "Avanserte Innstillinger" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Alle GC/Wii-filer (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Alle GC/Wii-bildefiler (gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Alle GameCube GCM-filer (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -657,18 +668,22 @@ msgstr "Alle GameCube GCM-filer (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Save States (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO-filer (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle komprimerte GC/Wii-filer (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Alle filer (*.*)|*.*" @@ -684,7 +699,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Emulert Wiimote" @@ -707,7 +722,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Applikasjonlaster klarte ikke Ã¥ laste fra fil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Applikasjonslaster:" @@ -725,7 +740,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arabisk" @@ -734,7 +749,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -742,12 +757,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:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -757,6 +773,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspektforhold:" @@ -765,18 +784,20 @@ msgstr "Aspektforhold:" msgid "At least one pane must remain open." msgstr "Minst en rute mÃ¥ stÃ¥ Ã¥pen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Audio Backend:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Feil ved Ã¥pning av AO-device.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -786,6 +807,9 @@ msgstr "AudioCommon: Feil ved Ã¥pning av AO-device.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisk" @@ -828,7 +852,7 @@ msgstr "" msgid "Back" msgstr "Tilbake" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Backend-innstillinger" @@ -855,11 +879,11 @@ msgstr "DÃ¥rlig Fil-header" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Bannerdetaljer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Banner:" @@ -871,7 +895,7 @@ msgstr "Bar" msgid "Basic" msgstr "Grunnleggende" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Grunnleggende Innstillinger" @@ -902,6 +926,7 @@ msgstr "BlÃ¥ Høyre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -909,6 +934,9 @@ msgstr "BlÃ¥ Høyre" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Bunn" @@ -917,7 +945,7 @@ msgstr "Bunn" msgid "Bound Controls: %lu" msgstr "Bundede Kontroller: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Ødelagt" @@ -933,7 +961,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:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Bla etter lagringssted" @@ -964,11 +992,11 @@ msgstr "C-joystick" msgid "C-Stick" msgstr "C-joystick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU-emulatormotor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Cacher Display-lister" @@ -1017,7 +1045,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:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1027,7 +1055,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:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1045,8 +1073,6 @@ msgstr "Kan ikke finne Wiimote med bd: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Kan ikke finne Wiimote med tilkoblingshandler %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1056,7 +1082,7 @@ msgstr "Kan ikke lese fra DVD_Plugin - DVD-Interface: Fatal Feil" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Katalansk" @@ -1081,7 +1107,7 @@ msgstr "Endre Disk" msgid "Change Game" msgstr "Endre Spill" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1097,8 +1123,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:506 #: 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!" @@ -1118,31 +1144,31 @@ msgstr "Juksekodesøk" msgid "Cheats Manager" msgstr "Juksekode Manager" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Kinesisk (Simplifisert)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Kinesisk (Tradisjonell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Velg en DVD-rotmappe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Velg en NAND-rotmappe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Velg en standard-ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Velg en mappe Ã¥ legge til" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Velg en fil Ã¥ Ã¥pne" @@ -1150,7 +1176,7 @@ msgstr "Velg en fil Ã¥ Ã¥pne" msgid "Choose a memory card:" msgstr "Velg et minnekort:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1158,8 +1184,8 @@ msgstr "" "Velg fil til Ã¥ bruke som applikasjonslaster: (gjelder kun for disker laget " "fra mapper)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: 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" @@ -1171,14 +1197,14 @@ msgstr "Sirkel-joystick" msgid "Classic" msgstr "Klassisk" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Tøm" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Klarering feilet." @@ -1194,6 +1220,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1202,6 +1229,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Lukk" @@ -1225,20 +1256,20 @@ msgstr "Kommando" msgid "Comment" msgstr "Kommentar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Kommentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Komprimer ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Komprimer valgte ISO-er..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Komprimerer ISO" @@ -1265,13 +1296,13 @@ msgstr "Konfigurer Kontrollere" msgid "Configure..." msgstr "Konfigurer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Bekreft filoverskriving" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Bekreft ved Stans" @@ -1280,7 +1311,7 @@ msgstr "Bekreft ved Stans" msgid "Connect" msgstr "Koble til" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Koble til USB-tastatur" @@ -1337,12 +1368,12 @@ msgstr "Konverter til GCI" msgid "Copy failed" msgstr "Kopi feilet" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Kopier til Minnekort %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Kjerne" @@ -1372,7 +1403,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Kunne ikke gjennkjenne ISO-fil %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Kunne ikke lagre %s" @@ -1386,7 +1417,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:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1398,7 +1429,7 @@ msgstr "" "\n" "Kjører du Dolphin fra en CD/DVD, eller er lagringsfilen kanskje beskyttet?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Kunne ikke finne Ã¥pningskommandoen for utvidelsen 'ini'!" @@ -1415,7 +1446,7 @@ msgstr "" msgid "Count:" msgstr "Antall:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Land:" @@ -1429,25 +1460,25 @@ 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:500 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:497 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:498 msgid "Created by VistaIcons.com" msgstr "Laget av VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 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:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Skaper:" @@ -1455,7 +1486,7 @@ msgstr "Skaper:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Krum" @@ -1478,7 +1509,7 @@ msgstr "Kryssutfase" 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:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Selvdefinert Projeksjons-hack" @@ -1486,11 +1517,11 @@ msgstr "Selvdefinert Projeksjons-hack" msgid "Custom Projection Hack Settings" msgstr "Innstillinger for Selvdefinerte Projeksjons-hack" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Selvdefiner noen Ortografisk Projeksjons-parametere." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Tsjekkisk" @@ -1502,10 +1533,11 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "CPU Emulatormotor" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1516,18 +1548,22 @@ msgstr "CPU Emulatormotor" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE-emulering (raskt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (tregt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE pÃ¥ CPU-trÃ¥d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE re-kompilering" @@ -1535,15 +1571,23 @@ msgstr "DSP LLE re-kompilering" msgid "DSP settings" msgstr "Innstillinger for DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD-rot:" +#: 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:176 msgid "Data Size" msgstr "Datastørrelse" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Dato:" @@ -1564,7 +1608,7 @@ msgstr "Dødsone" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Debugging" @@ -1572,16 +1616,16 @@ msgstr "Debugging" msgid "Decimal" msgstr "Desimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Dekomprimer ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Dekomprimer valgte ISO-filer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Dekomprimerer ISO" @@ -1589,11 +1633,11 @@ msgstr "Dekomprimerer ISO" msgid "Default" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Standard-ISO:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Standard tekst-font" @@ -1602,7 +1646,7 @@ msgstr "Standard tekst-font" msgid "Delete" msgstr "Slett" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Slett Lagringsfil" @@ -1611,7 +1655,7 @@ msgstr "Slett Lagringsfil" msgid "Delete the existing file '%s'?" msgstr "Slett den eksiterende filen '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Beskrivelse" @@ -1619,8 +1663,8 @@ msgstr "Beskrivelse" msgid "Detect" msgstr "Finn automatisk" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: 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." @@ -1633,8 +1677,8 @@ msgstr "" msgid "Device" msgstr "Device" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Innstillinger for device" @@ -1659,23 +1703,23 @@ msgstr "" " og mappesti backup-sjekksummen mislyktes" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Deaktiver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Deaktiver tÃ¥ke (fog)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Deaktiver lyseffekter" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Deaktiver Per-Pikseldybde" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Deaktiver teksturer" @@ -1719,7 +1763,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disk" @@ -1746,6 +1790,7 @@ msgstr "" msgid "Divide" msgstr "Del" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1755,10 +1800,13 @@ msgstr "Del" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Vil du stoppe pÃ¥gÃ¥ende emulering?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1783,6 +1831,7 @@ msgstr "Dolphin Emulert Wiimote Konfigurasjon" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1807,6 +1856,14 @@ msgstr "Dolphin GC-kontroll konfigurasjon" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC-kontroll konfigurasjon" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS-Filmer (*.dtm)" @@ -1839,11 +1896,11 @@ msgstr "" msgid "Down" msgstr "Ned" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Last ned juksekoder (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Lastet ned %lu koder. (la til %lu)" @@ -1852,23 +1909,23 @@ msgstr "Lastet ned %lu koder. (la til %lu)" msgid "Drums" msgstr "Trommer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Juksedukke" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Dump Audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Dump EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Skjermdumping" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Dump teksturer" @@ -1902,6 +1959,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1917,6 +1975,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Nederlansk" @@ -1940,7 +2003,7 @@ msgstr "" "versjon %d.%d -- Hvis du nylig oppgraderte din Dolphin-distribusjon, kreves " "sannsynligvis en restart for at Windows skal se den nye driveren." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPA" @@ -1956,7 +2019,7 @@ msgstr "Endre" msgid "Edit ActionReplay Code" msgstr "Endre ActionReplay-kode" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Endre Konfigurasjon" @@ -1968,8 +2031,8 @@ msgstr "Endre Patch" msgid "Edit current perspective" msgstr "Endre nÃ¥værende perspektiv" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Endre..." @@ -2019,7 +2082,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emulert Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Emulasjonsstatus:" @@ -2047,23 +2110,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "Aktiver AR-logging" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Aktiver Audio Throttle" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Aktiver BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Aktiver Block Merging" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2076,6 +2139,7 @@ msgstr "" msgid "Enable Cache" msgstr "Aktiver cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2085,51 +2149,54 @@ msgstr "Aktiver cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Aktiver Juksekoder" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Aktiver DTK-musikk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Aktiver Dobbelkjerne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Aktiver Dobbelkjerne (for bedre ytelse)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Aktiver Snarveistaster" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Aktiver Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Aktiver Idle Skipping (for bedre ytelse)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Aktiver MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Aktiver Progressiv Skanning" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Aktiver Skjermsparer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Aktiver Widescreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Aktiver WireFrame" @@ -2146,7 +2213,7 @@ msgstr "" "\n" "Hvis usikker, velg 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2154,7 +2221,7 @@ msgstr "" "Aktiver rask disktilgang. Trengs for noen fÃ¥ spill. (PÃ… = Raskt, AV = " "Kompitabelt)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Aktiver sider" @@ -2182,7 +2249,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2190,7 +2257,7 @@ msgstr "" "Aktiver dette for Ã¥ bedre ytelsen i The Legend Of Zelda: Twillight Princess. " "Deaktiver for andre spill." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: 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 = " @@ -2200,7 +2267,7 @@ msgstr "" "Unit (MMU). Nøyaktig for maskinvaren, men treg Ã¥ emulere. (PÃ… = Kompitabelt, " "AV = Raskt)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Tillater Selvdefinerte Projeksjons-hack" @@ -2217,7 +2284,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2239,6 +2306,7 @@ msgstr "" msgid "End" msgstr "Slutt" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2254,6 +2322,11 @@ msgstr "Slutt" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Engelsk" @@ -2284,6 +2357,7 @@ msgstr "Lik" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Feil" @@ -2314,18 +2388,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Feil" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Feil ved lasting av valgt sprÃ¥k. Faller tilbake til systemstandarden." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2359,7 +2439,7 @@ msgstr "Avslutt Dolphin med emulator" msgid "Export Failed" msgstr "Eksportering mislyktes" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Eksporter Fil" @@ -2372,15 +2452,15 @@ msgstr "Eksporter Opptak" msgid "Export Recording..." msgstr "Eksporter Opptak..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Eksporter Lagringsfil" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Eksporter Wii-lagringsfil (Eksperimentiell)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Eksporter alle lagringsfiler" @@ -2396,7 +2476,7 @@ msgstr "Eksporter lagringsfil som..." msgid "Extension" msgstr "Utvidelse" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Ekstern Bildebuffer (EFB)" @@ -2408,44 +2488,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Ekstraher Alle Filer..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Ekstraher Applikasjonslaster..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Ekstraher DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Ekstraher Mappe..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Ekstraher Fil..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Ekstraher Partisjon..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Ekstraherer %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Ekstraherer Alle Filer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Ekstraherer Mappe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Ekstraherer..." @@ -2457,11 +2537,11 @@ msgstr "FIFO-Byte" msgid "FIFO Player" msgstr "FIFO-spiller" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANKRIKE" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FST-størrelse:" @@ -2473,11 +2553,11 @@ msgstr "Tilkobling Mislyktes!" msgid "Failed to Listen!!" msgstr "Lytting Mislyktes!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Nedlasting av koder mislyktes." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Ekstrahering til %s mislyktes!" @@ -2594,18 +2674,28 @@ 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/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Rask" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Raske Mipmaps" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Fifo-spiller" @@ -2614,7 +2704,7 @@ msgstr "Fifo-spiller" msgid "File Info" msgstr "Filinformasjon" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Filen inneholder ingen koder." @@ -2647,16 +2737,16 @@ msgstr "Filen kjennes ikke igjen som et minnekort" msgid "File not compressed" msgstr "Filen ikke komprimert" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Ukjent Ã¥penmodus: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Filsystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Filtypen 'ini' er ukjent! kan ikke Ã¥pnes!" @@ -2664,7 +2754,7 @@ msgstr "Filtypen 'ini' er ukjent! kan ikke Ã¥pnes!" msgid "First Block" msgstr "Første Blokk" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Fiks Sjekksummer" @@ -2676,7 +2766,7 @@ msgstr "Tving 16:9" msgid "Force 4:3" msgstr "Tving 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Tving Konsoll til NTSC-J" @@ -2709,7 +2799,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 " @@ -2745,7 +2835,7 @@ msgstr "Stillbilde" msgid "Frame Advance" msgstr "Bilde-for-bilde Modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Spillopptak bruker FFV1" @@ -2757,7 +2847,7 @@ msgstr "Bilderekkevidde" msgid "Frame S&kipping" msgstr "Frame S&kipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Framelimit:" @@ -2765,10 +2855,11 @@ msgstr "Framelimit:" msgid "Frames To Record" msgstr "Bilder Til Opptak" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Fri Utkikk" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2784,6 +2875,11 @@ msgstr "Fri Utkikk" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Fransk" @@ -2817,7 +2913,7 @@ msgstr "Konfigurer Logg" msgid "GCPad" msgstr "GC-kontroll" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "Spill-ID:" @@ -2833,15 +2929,15 @@ msgstr "Et spill kjører ikke!" msgid "Game not found!!" msgstr "Spill ikke funnet!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Spill-spesifikke Innstillinger" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "SpillKonfigurasjon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "GameCube" @@ -2852,6 +2948,7 @@ msgstr "Innstillinger for &GameCube-kontroll" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2859,6 +2956,9 @@ msgstr "Innstillinger for &GameCube-kontroll" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube-minnekort (*.raw,*.gcp)" @@ -2867,15 +2967,17 @@ msgid "Gamecube Pad settings" msgstr "Innstillinger for GameCube-kontroll" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko-juksekoder" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, 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.)" +"(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 "" "GeckoKode mislyktes i Ã¥ kjøre (CT%i CST%i) (%s)\n" "(Enten en dÃ¥rlig kode, eller sÃ¥ støttes ikke kodeformatet.)" @@ -2884,6 +2986,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2892,6 +2995,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generelt" @@ -2900,6 +3006,7 @@ msgstr "Generelt" msgid "General Settings" msgstr "Generelle Innstillinger" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2915,6 +3022,11 @@ msgstr "Generelle Innstillinger" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Tysk" @@ -2953,7 +3065,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ pÃ¥." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Gresk" @@ -2985,7 +3097,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Header-sjekksum feilet" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebraisk" @@ -3054,12 +3166,16 @@ msgstr "Konfigurer Snarveistaster" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Snarveistaster" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Ungarsk" @@ -3067,12 +3183,12 @@ msgstr "Ungarsk" msgid "Hybrid Wiimote" msgstr "Hybrid Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3085,11 +3201,11 @@ msgstr "" "TitleID %016llx.\n" "Dolphin vil sannsynligvis krasje nÃ¥" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - dÃ¥rlig destinasjon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Innstillinger for IPL" @@ -3105,15 +3221,15 @@ msgstr "IR-peker" msgid "IR Sensitivity:" msgstr "IR-sensitivitet:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "ISO-detaljer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "ISO-mapper" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITALIA" @@ -3121,23 +3237,25 @@ msgstr "ITALIA" msgid "Icon" msgstr "Ikon" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: 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:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy msgid "" -"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." +"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 "" "Hvis du setter Framelimit høyere enn spillets fulle hastighet (NTSC:60, " "PAL:50), mÃ¥ du ogsÃ¥ deaktivere Audio Throttle i DSP-innstillingene for Ã¥ " @@ -3175,7 +3293,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Importer Lagringsfil" @@ -3224,7 +3342,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "I spillet" @@ -3233,7 +3351,7 @@ msgid "In-Game" msgstr "I spillet" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3253,7 +3371,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:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Sett inn SD-kort" @@ -3265,7 +3383,7 @@ msgstr "Sett inn navn her..." msgid "Install WAD" msgstr "Installer WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Installer til Wii Meny" @@ -3274,6 +3392,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "InstallExceptionHandler kalt, men denne plattformen støtter den ikke." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3283,14 +3402,17 @@ msgstr "InstallExceptionHandler kalt, men denne plattformen støtter den ikke." ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Installer WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Kontrollpanel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Innstillinger for kontrollpanel" @@ -3315,11 +3437,11 @@ msgstr "Intern LZO-feil - lzo_init() mislyktes" msgid "Internal Resolution:" msgstr "Intern Oppløsning:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreter (VELDIG treg)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3336,7 +3458,7 @@ msgstr "Ugyldig verdi!" msgid "Invalid bat.map or dir entry" msgstr "Ugyldig bat.map eller mappesti" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Ugyldig event-type %i" @@ -3356,14 +3478,15 @@ msgstr "" "%s\n" " Det kan hende du mÃ¥ re-dumpe dette spillet." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Ugyldig opptaksfil" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Ugyldig save state" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3379,27 +3502,32 @@ msgstr "Ugyldig save state" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiensk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Rekompilerer (anbefalt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL eksperimentiell rekompilerer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japansk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KOREA" @@ -3408,8 +3536,8 @@ msgstr "KOREA" msgid "Key" msgstr "Tast" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Koreansk" @@ -3427,7 +3555,7 @@ msgstr "L-Knappen" msgid "L-Analog" msgstr "Venstre-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "SprÃ¥k:" @@ -3480,7 +3608,7 @@ msgstr "" msgid "Less Than" msgstr "Mindre Enn" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Begrens med FPS (bilder-per-sekund)" @@ -3488,7 +3616,7 @@ msgstr "Begrens med FPS (bilder-per-sekund)" msgid "Load" msgstr "Last inn" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Last inn Kustomiserte Teksturer" @@ -3536,6 +3664,7 @@ msgstr "Last Inn Save State Slot 8" msgid "Load State..." msgstr "Last Inn Save State..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3557,6 +3686,13 @@ msgstr "Last inn Wii System Meny" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Last inn Wii System Meny" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Last inn Wii System Meny %d %c" @@ -3583,7 +3719,7 @@ msgstr "Laster den spesifiserte filen (DOL,ELF,WAD,GCM,ISO)" msgid "Local" msgstr "Lokal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "LÃ¥s CPU-trÃ¥der til Kjerner" @@ -3595,11 +3731,11 @@ msgstr "Logg" msgid "Log Configuration" msgstr "Konfigurer Logg" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Loggtyper" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Logger utdata" @@ -3629,7 +3765,7 @@ msgstr "" "MD5 mismatch\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "Ytelses-hack for MMU" @@ -3651,11 +3787,11 @@ msgstr "MadCatz Gameshark-filer(*.gcs)" msgid "Main Stick" msgstr "Hoved-joystick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "Skaper-ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Skaper:" @@ -3679,6 +3815,7 @@ msgstr "Memory Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3686,6 +3823,9 @@ msgstr "Memory Byte" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Minnekort" @@ -3722,7 +3862,7 @@ msgstr "" msgid "Menu" msgstr "Meny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mic" @@ -3731,11 +3871,11 @@ msgstr "Mic" msgid "Min" msgstr "Minimum" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Diverse" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Diverse Innstillinger" @@ -3756,7 +3896,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Mono-mellomrom tekst-font" @@ -3769,7 +3909,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3791,7 +3931,7 @@ msgstr "" msgid "Multiply" msgstr "Multipliser" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3883,6 +4023,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Opp" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3892,6 +4033,9 @@ msgstr "NP Opp" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3900,7 +4044,7 @@ msgstr "Navn:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Navn:" @@ -3914,7 +4058,7 @@ msgid "New Scan" msgstr "Nytt Søk" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Neste Side" @@ -3926,7 +4070,7 @@ msgstr "Neste Søk" msgid "Nickname :" msgstr "Brukernavn :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Intet Land (SDK)" @@ -3965,7 +4109,7 @@ msgstr "Ingen lagringsmappe funnet for tittel %s" msgid "None" msgstr "Ingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norsk BokmÃ¥l" @@ -3973,8 +4117,8 @@ msgstr "Norsk BokmÃ¥l" msgid "Not Equal" msgstr "Ikke Lik" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Ikke Satt" @@ -3994,7 +4138,7 @@ msgstr "Ikke tilkoblet" msgid "Notes" msgstr "Notater" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notater:" @@ -4032,7 +4176,7 @@ msgstr "Objekt" msgid "Object Range" msgstr "Objekt Radius" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Av" @@ -4058,11 +4202,11 @@ msgstr "Kun %d blokker tilgjengelig" msgid "Open" msgstr "Ã…pne" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Ã…pne &tilholdsmappe" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Ã…pne Wii-&lagringsfil-mappe" @@ -4084,11 +4228,11 @@ 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:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL Teksturdekoder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP Teksturdekoder" @@ -4120,7 +4264,7 @@ msgstr "" "og importer lagringsfilene til et nytt minnekort\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Annet" @@ -4172,19 +4316,20 @@ msgstr "Paragraf" msgid "Parameters" msgstr "Parametere" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partisjon %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patcher" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Mappestier" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4197,6 +4342,10 @@ msgstr "Mappestier" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4205,7 +4354,7 @@ msgstr "Pause" msgid "Per-Pixel Lighting" msgstr "Per-Pikselbelysning" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfekt" @@ -4218,6 +4367,7 @@ msgstr "Perspektiv %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4228,6 +4378,10 @@ msgstr "Perspektiv %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Spill" @@ -4241,7 +4395,7 @@ msgstr "Spill Opptak" msgid "Play/Pause" msgstr "Spill/Pause" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Spillbar" @@ -4253,6 +4407,7 @@ msgstr "Avspillingsalterntiver" msgid "Players" msgstr "Spillere" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4262,6 +4417,9 @@ msgstr "Spillere" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Vennligst bekreft..." @@ -4273,23 +4431,23 @@ msgstr "Vennligst lag et persektiv før du lagrer" msgid "Plus-Minus" msgstr "Pluss-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polsk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4298,11 +4456,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugisisk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugisisk (Brasilsk)" @@ -4310,17 +4468,17 @@ msgstr "Portugisisk (Brasilsk)" msgid "Post-Processing Effect:" msgstr "postprosesseringseffekt:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4333,7 +4491,7 @@ msgstr "ForhÃ¥ndssatte:" msgid "Prev Page" msgstr "Forrige Side" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Forrige Side" @@ -4384,7 +4542,7 @@ msgstr "Høyre-analog" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSSLAND" @@ -4397,7 +4555,7 @@ msgstr "Rekkevidde" msgid "Read-only mode" msgstr "Les-kun-modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Ekte" @@ -4474,6 +4632,7 @@ msgstr "Oppdater liste" msgid "Refresh game list" msgstr "Oppdater spilliste" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4492,6 +4651,12 @@ msgstr "Oppdater spilliste" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Fjern" @@ -4544,11 +4709,11 @@ msgstr "Høyre Joystick" msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: 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:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russisk" @@ -4556,10 +4721,11 @@ msgstr "Russisk" msgid "Sa&ve State" msgstr "Lagre Sa&ve State" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Sikker" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4569,6 +4735,9 @@ msgstr "Sikker" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Samplingsratio:" @@ -4626,12 +4795,12 @@ msgstr "Lagre Save State Slot 8" msgid "Save State..." msgstr "Lagre Save State..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Lagre som..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Lagre komprimert GCM/ISO" @@ -4639,11 +4808,11 @@ msgstr "Lagre komprimert GCM/ISO" msgid "Save current perspective" msgstr "Lagre nÃ¥værende perspektiv" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Lagre dekomprimert GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Save State-film %s er korrupt, opptak avsluttes..." @@ -4652,6 +4821,7 @@ msgstr "Save State-film %s er korrupt, opptak avsluttes..." msgid "Scaled EFB Copy" msgstr "Skalert EFB-kopi" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4661,15 +4831,18 @@ msgstr "Skalert EFB-kopi" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Søker i %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Søker etter ISO-filer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Søker..." @@ -4685,12 +4858,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Søkefilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Søk i Undermapper" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: 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 "Seksjon %s ikke funnet i SYSCONF" @@ -4700,6 +4873,7 @@ msgstr "Seksjon %s ikke funnet i SYSCONF" msgid "Select" msgstr "Velg" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4724,6 +4898,14 @@ msgstr "Velg Opptaksfil" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Velg Opptaksfil" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Velg en Wii WAD-fil Ã¥ innstallere" @@ -4749,6 +4931,7 @@ msgstr "Velg flytvindu" msgid "Select the file to load" msgstr "Velg fil Ã¥ laste" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4765,19 +4948,26 @@ msgstr "Velg en save state Ã¥ laste" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Velg lagringsfil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Velg en save state Ã¥ laste" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Velg en save state Ã¥ lagre" @@ -4799,7 +4989,7 @@ msgstr "" "\n" "Hvis usikker, velg Automatisk." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Valgt font" @@ -4847,11 +5037,11 @@ msgstr "Sensorbarposisjon:" msgid "Separator" msgstr "Separatør" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbisk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: 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" @@ -4860,11 +5050,11 @@ msgstr "Serieport 1 - Dette er porten enheter som nettadapter bruker" msgid "Set" msgstr "Sett" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Sett som &standard-ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Sett som standard Minnekort %c" @@ -4874,7 +5064,7 @@ 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:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Innstillinger..." @@ -4886,7 +5076,7 @@ msgstr "SetupWiiMem: Kan ikke finne konfigurasjonsfilen" msgid "Shake" msgstr "Rist" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Kortnavn:" @@ -4915,7 +5105,7 @@ msgstr "Vis &Verktøylinje" msgid "Show Drives" msgstr "Vis DVD-stasjoner" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Vis Kopieringsregioner for EFB" @@ -4931,7 +5121,7 @@ msgstr "Vis Frankrike" msgid "Show GameCube" msgstr "Vis GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Vis Inndata" @@ -4947,7 +5137,7 @@ msgstr "Vis JAP" msgid "Show Korea" msgstr "Vis Korea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Vis SprÃ¥k:" @@ -4967,7 +5157,7 @@ msgstr "Vis Plattformer" msgid "Show Regions" msgstr "Vis Regioner" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Vis Statistikker" @@ -4987,11 +5177,11 @@ msgstr "Vis WAD" 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 " @@ -5002,23 +5192,23 @@ msgstr "" "men det kan ogsÃ¥ forÃ¥rsake\n" "at Dolphin plutselig krasjer uten noen forklaring." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Vis første blokk" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Vis lagringsblokker" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Vis lagringskommentar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Vis lagringsikon" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Vis lagringstittel" @@ -5055,7 +5245,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Sideveis-pekende Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Simplifisert Kinesisk" @@ -5063,11 +5253,11 @@ msgstr "Simplifisert Kinesisk" msgid "Size" msgstr "Størrelse" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Dropp BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Dropp Dest. Alpha Pass" @@ -5109,11 +5299,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5136,7 +5326,7 @@ 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:621 msgid "Sound Settings" msgstr "Innstillinger for Audio" @@ -5154,6 +5344,7 @@ msgstr "Laging av lydbuffer mislyktes: %s" msgid "Space" msgstr "Mellomrom" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5169,6 +5360,11 @@ msgstr "Mellomrom" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spansk" @@ -5199,7 +5395,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Spesifiser en programvareutvidelse for video" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Øk diskoverføringshatighet" @@ -5207,7 +5403,7 @@ msgstr "Øk diskoverføringshatighet" msgid "Square Stick" msgstr "Kvadrat-joystick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Standardkontroller" @@ -5305,12 +5501,12 @@ msgstr "Importering av lagringsfiler vellykket" msgid "Swing" msgstr "Sving" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "SystemsprÃ¥k:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWAN" @@ -5350,7 +5546,7 @@ msgstr "Tabell Høyre" msgid "Take Screenshot" msgstr "Ta Skjermbilde" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5366,7 +5562,7 @@ msgstr "Tekstur" msgid "Texture Cache" msgstr "Tekstur-cache" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Teksturformat Overlegg" @@ -5382,13 +5578,13 @@ msgstr "Adressen er ugyldig" msgid "The checksum was successfully fixed" msgstr "Fiksing av sjekksummen var vellykket" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "Den valgte mappen finnes allerede i listen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5411,7 +5607,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:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Filen du spesifiserte (%s) eksisterer ikke" @@ -5429,11 +5625,12 @@ 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:98 +#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" "Jo tryggere du setter denne, jo mindre sannsynlig er det at emulatoren " "mangler noen teksturoppdateringer fra RAM.\n" @@ -5476,7 +5673,7 @@ msgstr "Den spesifiserte filen \"%s\" eksisterer ikke" msgid "The value is invalid" msgstr "Verdien er ugyldig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema" @@ -5484,14 +5681,14 @@ msgstr "Tema" msgid "Theme selection went wrong" msgstr "Velging av tema gikk feil" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" "Det mÃ¥ være en billett for 00000001/00000002. Din NAND-dump er ukomplett." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5507,7 +5704,7 @@ msgstr "" "Denne Action Replay-simulatoren støtter ikke koder som modifiserer selve " "Action Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: 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." @@ -5530,25 +5727,11 @@ msgstr "" "Hvis usikker, la stÃ¥ avslÃ¥tt." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -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 "" -"Dette brukes for Ã¥ kontrollere spillets bildefrekvens via Audio Throttle.\n" -"Deaktivering av denne kan forÃ¥rsake unormal bildefrekvens, kanskje for høy.\n" -"Men Ã¥ aktivere den kan noen ganger forÃ¥sake konstant brÃ¥k.\n" -"\n" -"Tastatursnarvei : Hold nede for Ã¥ deaktivere Audio Throttle." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" "Dette formatet brukes for Ã¥ spille musikkspor, som bakgrunnsmusikk (BGM)." -#: 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" @@ -5560,7 +5743,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:283 +#: 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" @@ -5583,7 +5766,7 @@ msgstr "Tittel" msgid "To" msgstr "Til" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Vipp Alle Loggtyper" @@ -5603,6 +5786,7 @@ msgstr "Vipp Mellom Vindu/Fullskjerm" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5610,14 +5794,17 @@ msgstr "Vipp Mellom Vindu/Fullskjerm" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Topp" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Tradisjonell Kinesisk" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Forsøkte Ã¥ laste en ukjent filtype." @@ -5625,7 +5812,7 @@ msgstr "Forsøkte Ã¥ laste en ukjent filtype." msgid "Triggers" msgstr "Triggere" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Forsøker Ã¥ lese fra ugyldig SYSCONF" @@ -5637,7 +5824,7 @@ msgstr "" "Forsøker Ã¥ lese fra ugyldig SYSCONF\n" "Wiimote bt ids er ikke tilgjengelig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Tyrkisk" @@ -5658,11 +5845,11 @@ msgstr "UDP Port:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "UKJENT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -5745,7 +5932,7 @@ msgstr "Oppdater" msgid "Upright Wiimote" msgstr "Mot-skjerm-pekende Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Bruk EuRGB60-modus (PAL60)" @@ -5757,7 +5944,7 @@ msgstr "Bruk Fullskjerm" msgid "Use Hex" msgstr "Bruk Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Bruk Panikkadvarslere" @@ -5788,7 +5975,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Verktøyet" @@ -5812,25 +5999,29 @@ msgstr "Verdi:" msgid "Verbosity" msgstr "Verbøsitet" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtuell" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volum" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD-installasjon feilet: Skaper feil %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "WAD-installasjon feilet: Skaper feil %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5849,15 +6040,15 @@ msgstr "" msgid "Warning" msgstr "Advarsel" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Advarsel - starter DOL i feil konsollmodus!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Advarsel - starter ELF i feil konsollmodus!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Advarsel - starter ISO i feil konsollmodus!" @@ -5885,7 +6076,7 @@ msgstr "" "og har samme navn som en fil pÃ¥ ditt minnekort\n" "Fortsette?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5893,7 +6084,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5901,7 +6092,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5929,7 +6120,7 @@ msgstr "WaveFileWriter - fil ikke Ã¥pen." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Widescreen Hack" @@ -5937,15 +6128,15 @@ msgstr "Widescreen Hack" msgid "Width" msgstr "Bredde" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii-konsoll" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND-rot:" @@ -5953,6 +6144,7 @@ msgstr "Wii NAND-rot:" msgid "Wii Save Import" msgstr "Importer Wii-lagringsfil" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5962,6 +6154,9 @@ msgstr "Importer Wii-lagringsfil" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii-lagringsfiler (*.bin)|*.bin" @@ -6029,10 +6224,11 @@ msgstr "Windows Meny" msgid "Windows Right" msgstr "Windows Høyre" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Ordkrumning" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6048,6 +6244,11 @@ msgstr "Ordkrumning" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Arbeider..." @@ -6055,6 +6256,11 @@ msgstr "Arbeider..." msgid "Write to Console" msgstr "Skriv til Konsoll" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Skriv til Fil" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Skriv til Fil" @@ -6108,7 +6314,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:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 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." @@ -6131,7 +6337,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:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP-hack" @@ -6201,7 +6407,7 @@ msgstr "" msgid "^ ADD" msgstr "^ LEGG TIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "applikasjonslaster (.img)" @@ -6232,12 +6438,12 @@ msgstr "ikke en Wii-lagringsfil eller lesefeil for fil-header-størrelse %x" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "ukjent cmd 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returnerte -1 pÃ¥ applikasjonskjøring!" @@ -6401,6 +6607,9 @@ msgstr "| ELLER" #~ msgid "Emulator Display Settings" #~ msgstr "Innstillinger for Emulasjonsvisning" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Aktiver Audio Throttle" + #~ msgid "Enable CPU Access" #~ msgstr "Aktiver CPU Access" @@ -6714,6 +6923,21 @@ msgstr "| ELLER" #~ msgid "The file " #~ msgstr "Filen" +#~ 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 "" +#~ "Dette brukes for Ã¥ kontrollere spillets bildefrekvens via Audio " +#~ "Throttle.\n" +#~ "Deaktivering av denne kan forÃ¥rsake unormal bildefrekvens, kanskje for " +#~ "høy.\n" +#~ "Men Ã¥ aktivere den kan noen ganger forÃ¥sake konstant brÃ¥k.\n" +#~ "\n" +#~ "Tastatursnarvei : Hold nede for Ã¥ deaktivere Audio Throttle." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "" #~ "Dette formatet brukes vanligvis til Ã¥ spille stemme- og lyd- effekter." diff --git a/Languages/po/nl.po b/Languages/po/nl.po index f6c2081f53..017f33c5c1 100644 --- a/Languages/po/nl.po +++ b/Languages/po/nl.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-08-07 16:43+0100\n" "Last-Translator: Goost \n" "Language-Team: DevPro Team. \n" @@ -59,9 +63,9 @@ msgstr "\"%s\" is een onjuist GCM/ISO bestand of het is geen GC/Wii ISO." msgid "%1$sCopy%1$s" msgstr "%1$sKopieer%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -153,7 +157,7 @@ msgstr "%sExporteer GCI%s" msgid "%sImport GCI%s" msgstr "%sImporteer GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, fuzzy, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%d Vrije Blokken; %d Vrije Bestands Ingangen" @@ -186,11 +190,11 @@ msgstr "&Cheats Manager" msgid "&DSP Settings" msgstr "&DSP Instellingen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Verwijder ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Verwijder geselecteerde ISOs ..." @@ -254,7 +258,7 @@ msgstr "&Pauze" msgid "&Play" msgstr "&Speel " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Eigenschappen " @@ -298,7 +302,7 @@ msgstr "&Bekijk " msgid "&Wiimote Settings" msgstr "&Wiimote Instellingen " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "" @@ -342,7 +346,7 @@ msgstr " " msgid "" msgstr " " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -351,7 +355,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -409,13 +413,13 @@ msgstr "" "\n" "Je moet de TCP poort forwarden voor het hosten!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR Codes" @@ -427,11 +431,11 @@ msgstr "Over Dolphin" msgid "Acceleration" msgstr "Acceleratie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulatie" @@ -552,11 +556,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Voeg toe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Voeg ActionReplay Code toe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Voeg Patch toe" @@ -564,6 +568,7 @@ msgstr "Voeg Patch toe" msgid "Add new pane" msgstr "Voeg een nieuwe paneel toe" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -579,6 +584,11 @@ msgstr "Voeg een nieuwe paneel toe" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Voeg toe..." @@ -626,11 +636,11 @@ 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:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Geavanceerd" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Geavanceerde Instellingen" @@ -638,14 +648,15 @@ msgstr "Geavanceerde Instellingen" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Alle GC/Wii bestanden (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Alle GC/Wii images (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM bestanden (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -658,18 +669,22 @@ msgstr "Alle Gamecube GCM bestanden (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Opgeslagen Staten (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO Bestanden (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle gecomprimeerde GC/Wii ISO-bestanden (GCZ)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Alle Bestanden (*.*)|*.*" @@ -685,7 +700,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Geëmuleerde Wiimote" @@ -707,7 +722,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:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Applader:" @@ -725,7 +740,7 @@ msgstr "" "\n" "In geval van twijfel selecteer (uit)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arabisch" @@ -734,7 +749,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -742,12 +757,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:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -757,6 +773,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Beeldverhouding:" @@ -765,18 +784,20 @@ msgstr "Beeldverhouding:" msgid "At least one pane must remain open." msgstr "Er moet tenminste één paneel open blijven." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Geluid" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Geluid Backend:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -786,6 +807,9 @@ msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -824,7 +848,7 @@ msgstr "" msgid "Back" msgstr "Terug" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Backend Instellingen" @@ -851,11 +875,11 @@ msgstr "Verkeerde bestands header" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Banner Details" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Banner:" @@ -867,7 +891,7 @@ msgstr "Balk" msgid "Basic" msgstr "Basis" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Basis Instellingen" @@ -898,6 +922,7 @@ msgstr "Blauw Rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -905,6 +930,9 @@ msgstr "Blauw Rechts" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Onder" @@ -913,7 +941,7 @@ msgstr "Onder" msgid "Bound Controls: %lu" msgstr "Gekoppelde controls: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Defect" @@ -929,7 +957,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:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Zoek een uitvoer folder" @@ -959,11 +987,11 @@ msgstr "C Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU Emulatie Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Activeer scherm lijst caching." @@ -1015,7 +1043,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:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1025,7 +1053,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:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1043,8 +1071,6 @@ msgstr "Kan WiiMOte niet via bd vinden: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Kan WiiMote met verbinding handle %02x niet vinden" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1054,7 +1080,7 @@ msgstr "Kan niet lezen van DVD_Plugin - DVD-Interface: Fatal Error" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Catalaans" @@ -1079,7 +1105,7 @@ msgstr "Verander Schijf" msgid "Change Game" msgstr "Spel veranderen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1095,8 +1121,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:506 #: 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!" @@ -1116,31 +1142,31 @@ msgstr "Cheat Zoeken" msgid "Cheats Manager" msgstr "Cheats Manager" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinees (Vereenvoudigd)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinees (Traditioneel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Kies een DVD Station:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Kies een NAND basismap:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Kies een standaard ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Kies een folder om toe te voegen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Kies een bestand om te openen" @@ -1148,7 +1174,7 @@ msgstr "Kies een bestand om te openen" msgid "Choose a memory card:" msgstr "Kies een geheugen kaart:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1156,8 +1182,8 @@ msgstr "" "Kies Bestand te gebruiken als apploader: (geldt voor disks die alleen mappen " "uit mappen zijn opgebouwd)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: 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" @@ -1169,14 +1195,14 @@ msgstr "Cirkel Stick" msgid "Classic" msgstr "Klassiek" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Legen" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Legen mislukt." @@ -1192,6 +1218,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1200,6 +1227,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Sluit" @@ -1223,20 +1254,20 @@ msgstr "Commando" msgid "Comment" msgstr "Reactie" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Reactie:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Comprimeer ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Comprimeer geselecteerde ISO's ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "ISO wordt gecomprimeerd" @@ -1263,13 +1294,13 @@ msgstr "Configureer Besturing Pads" msgid "Configure..." msgstr "Configureer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Bevestig om bestand over te schrijven." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 #, fuzzy msgid "Confirm on Stop" msgstr "Bevestiging om te stoppen" @@ -1279,7 +1310,7 @@ msgstr "Bevestiging om te stoppen" msgid "Connect" msgstr "Verbind" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Verbind USB Toetsenbord" @@ -1336,12 +1367,12 @@ msgstr "Omzetten naar GCI" msgid "Copy failed" msgstr "Kopiëren mislukt" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Kopieer naar MemKaart %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Core" @@ -1371,7 +1402,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Kon ISO bestand %s niet herkennen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Kon %s niet opslaan" @@ -1385,7 +1416,7 @@ msgstr "" "draait nog!\n" "(pads instellen terwijl het spel draait wordt nog niet ondersteund)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1398,7 +1429,7 @@ msgstr "" "Draai je Dolphin vanaf een CD/DVD, of is het bestand misschien beveiligd " "tegen schrijven?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Kon geen open commando vinden voor extensie 'ini'!" @@ -1415,7 +1446,7 @@ msgstr "" msgid "Count:" msgstr "Tel:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Land:" @@ -1429,25 +1460,25 @@ 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:500 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:497 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:498 msgid "Created by VistaIcons.com" msgstr "Gemaakt door VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 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:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Auteur:" @@ -1455,7 +1486,7 @@ msgstr "Auteur:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Bijsnijden" @@ -1478,7 +1509,7 @@ msgstr "" 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:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Aangepaste Projectie Hack" @@ -1486,11 +1517,11 @@ msgstr "Aangepaste Projectie Hack" msgid "Custom Projection Hack Settings" msgstr "Aangepaste Projectie Instellingen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Pas sommige orthogonale projectie parameters aan." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Tsjechisch" @@ -1502,10 +1533,11 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "DSP Emulator Motor" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1516,18 +1548,22 @@ msgstr "DSP Emulator Motor" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulatie (snel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE Interpreteer (Behoorlijk langzaam)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE op Thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE hercompileerder" @@ -1535,15 +1571,23 @@ msgstr "DSP LLE hercompileerder" msgid "DSP settings" msgstr "DSP Instellingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD Station:" +#: 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:176 msgid "Data Size" msgstr "Data grootte" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Datum:" @@ -1564,7 +1608,7 @@ msgstr "Dode Zone" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 #, fuzzy msgid "Debugging" msgstr "Debug" @@ -1573,16 +1617,16 @@ msgstr "Debug" msgid "Decimal" msgstr "Decimaal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Decomprimeer ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Decomprimeer geselecteerde ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Decomprimeer ISO" @@ -1590,11 +1634,11 @@ msgstr "Decomprimeer ISO" msgid "Default" msgstr "Standaard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Standaard ISO:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Standaard font" @@ -1603,7 +1647,7 @@ msgstr "Standaard font" msgid "Delete" msgstr "Verwijder" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Verwijder Save" @@ -1612,7 +1656,7 @@ msgstr "Verwijder Save" msgid "Delete the existing file '%s'?" msgstr "Verwijder het bestaande bestand '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Beschrijving" @@ -1620,8 +1664,8 @@ msgstr "Beschrijving" msgid "Detect" msgstr "Detect" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: 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." @@ -1634,8 +1678,8 @@ msgstr "" msgid "Device" msgstr "Apparaat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Apparaat Instellingen" @@ -1660,24 +1704,24 @@ msgstr "" " en map backup checksum is mislukt" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 #, fuzzy msgid "Disable" msgstr "Schakel Fog uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Schakel Fog uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Schakel Lighting uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Schakel Pixel Diepte uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Schakel Textures uit" @@ -1721,7 +1765,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Schijf" @@ -1748,6 +1792,7 @@ msgstr "" msgid "Divide" msgstr "Verdelen" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1757,10 +1802,13 @@ msgstr "Verdelen" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Wil je de emulatie stoppen?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1785,6 +1833,7 @@ msgstr "Dolphin Geëmuleerde Wiimote configuratie" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1809,6 +1858,14 @@ msgstr "Dolphin GCPad Configuratie" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad Configuratie" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Film (*.dtm)" @@ -1840,11 +1897,11 @@ msgstr "" msgid "Down" msgstr "Omlaag" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Download Codes (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu codes gedownload. (%lu toegevoegd)" @@ -1853,23 +1910,23 @@ msgstr "%lu codes gedownload. (%lu toegevoegd)" msgid "Drums" msgstr "Drums" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Pop" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Dump Geluid" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Dump EFB Doel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Dump Frames" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Dump texturen" @@ -1903,6 +1960,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1918,6 +1976,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Nederlands" @@ -1941,7 +2004,7 @@ msgstr "" "versie %d. %d -- Als je recentelijk Dolphin hebt geupgrade is het mogelijk " "dat je Windows moet herstarten om deze de driver te laten detecteren." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPA" @@ -1957,7 +2020,7 @@ msgstr "Wijzig" msgid "Edit ActionReplay Code" msgstr "Wijzig ActionReplay Code" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Wijzig Configuratie" @@ -1969,8 +2032,8 @@ msgstr "Wijzig Patch" msgid "Edit current perspective" msgstr "Wijzig het huidige perspectief" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Wijzig..." @@ -2020,7 +2083,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Geëmuleerde Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Emulatie Staat:" @@ -2048,23 +2111,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "Activeer AR Logging" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Activeer Audio Throttle" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Activeer BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Activeer Block Merging" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2078,6 +2141,7 @@ msgstr "" msgid "Enable Cache" msgstr "Activeer Cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2087,51 +2151,54 @@ msgstr "Activeer Cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Activeer Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Activeer DTK Muziek" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Activeer Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: 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:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Activeer Sneltoetsen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Activeer Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Activeer Idle Skipping (verhoogt de snelheid)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Activeer MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Activeer Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Activeer Schermbeveiliger" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Activeer BreedBeeld" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Activeer Wireframe" @@ -2149,7 +2216,7 @@ msgstr "" "\n" "In geval van twijfel selecteer 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2157,7 +2224,7 @@ msgstr "" "Activeer snelle schijf toegang. Nodig voor een aantal spelletjes. (AAN = " "Snel, UIT = Compatibel)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Activeer Pagina's" @@ -2185,7 +2252,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2193,7 +2260,7 @@ msgstr "" "Activeer dit om The Legend of Zelda: Twilight Princess te versnellen. " "Uitschakelen voor elk ander spel." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: 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 = " @@ -2203,7 +2270,7 @@ msgstr "" "Management Unit. Nauwkeurig voor de hardware, maar langzaam te emuleren. " "(AAN = Compatibel, UIT = Snel)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Schakelt aangepaste projectie hack in" @@ -2220,7 +2287,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2242,6 +2309,7 @@ msgstr "" msgid "End" msgstr "Einde" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2257,6 +2325,11 @@ msgstr "Einde" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Engels" @@ -2287,6 +2360,7 @@ msgstr "Gelijk" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error (Fout)" @@ -2317,20 +2391,26 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Error (Fout)" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Fout bij het laden van de geselecteerde taal. Dolphin zal terugvallen op de " "systeemtaal." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2365,7 +2445,7 @@ msgstr "Sluit Dolphin met emulator" msgid "Export Failed" msgstr "Exporteren Mislukt" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Exporteer Bestand" @@ -2378,15 +2458,15 @@ msgstr "Exporteer Opname..." msgid "Export Recording..." msgstr "Exporteer Opname..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Exporteer Save" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Exporteer Wii save (Experimenteel)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Exporteer alle saves..." @@ -2402,7 +2482,7 @@ msgstr "Exporteer save als..." msgid "Extension" msgstr "Extensie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Externe Frame Buffer" @@ -2414,44 +2494,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Alle Bestanden Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Apploader Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "DOL Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Map Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Bestand Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Partitie Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "%s Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Alle Bestanden Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Uitpakken van de map" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Uitpakken..." @@ -2463,11 +2543,11 @@ msgstr "FIFO Byte" msgid "FIFO Player" msgstr "FIFO Speler" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "Frankrijk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FST Groote:" @@ -2479,11 +2559,11 @@ msgstr "Verbinden Mislukt!" msgid "Failed to Listen!!" msgstr "Luisteren Mislukt!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Mislukt om de codes te downloaden." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Mislukt om naar %s uit te pakken!" @@ -2601,19 +2681,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/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Snel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 #, fuzzy msgid "Fast Mipmaps" msgstr "Laad Native Mipmaps" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Fifo Speler" @@ -2622,7 +2712,7 @@ msgstr "Fifo Speler" msgid "File Info" msgstr "Bestands Info" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Bestand bevat geen codes." @@ -2655,16 +2745,16 @@ msgstr "Bestand is niet herkend als geheugenkaart" msgid "File not compressed" msgstr "Bestand niet gecompressed" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Onbekende open mode: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Bestand systeem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Bestandstype 'ini' is onbekend! Kan niet openen!" @@ -2672,7 +2762,7 @@ msgstr "Bestandstype 'ini' is onbekend! Kan niet openen!" msgid "First Block" msgstr "Eerste Blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Herstel Checksums" @@ -2684,7 +2774,7 @@ msgstr "Forceer 16:9" msgid "Force 4:3" msgstr "Forceer 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 #, fuzzy msgid "Force Console as NTSC-J" msgstr "Stel Console in als NTSC-J" @@ -2718,7 +2808,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 " @@ -2755,7 +2845,7 @@ msgstr "" msgid "Frame Advance" msgstr "Frame Geavanceerd" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Frame Dumps gebruiken FFV1" @@ -2767,7 +2857,7 @@ msgstr "Frame Bereik" msgid "Frame S&kipping" msgstr "Frame O&verslaan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Framelimiet:" @@ -2775,10 +2865,11 @@ msgstr "Framelimiet:" msgid "Frames To Record" msgstr "Frames om op te nemen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Vrije kijk" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2794,6 +2885,11 @@ msgstr "Vrije kijk" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Frans" @@ -2828,7 +2924,7 @@ msgstr "Logboek configuratie" msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "Spel ID:" @@ -2844,15 +2940,15 @@ msgstr "Het spel draait niet!" msgid "Game not found!!" msgstr "Spel niet gevonden!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Spel Specifieke Instellingen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Spel Config" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2863,6 +2959,7 @@ msgstr "Gamecube &Pad Instellingen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2870,6 +2967,9 @@ msgstr "Gamecube &Pad Instellingen" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Kaarten (*.raw,*.gcp)" @@ -2878,15 +2978,17 @@ msgid "Gamecube Pad settings" msgstr "Gamecube Pad Instellingen" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko Codes" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, 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.)" +"(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 "" "GeckoCode kon niet draaien (CT%i CST%i) (%s)\n" "(ofwel een onjuiste code of het type code is nog niet ondersteund.)" @@ -2901,8 +3003,12 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Algemeen" @@ -2911,6 +3017,7 @@ msgstr "Algemeen" msgid "General Settings" msgstr "Algemene Instellingen" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2926,6 +3033,11 @@ msgstr "Algemene Instellingen" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Duits" @@ -2964,7 +3076,7 @@ msgstr "" "\n" "In geval van twijfel ingevuld laten." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Grieks" @@ -2996,7 +3108,7 @@ msgstr "" msgid "Header checksum failed" msgstr "Header checksum is mislukt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebreeuws" @@ -3065,12 +3177,16 @@ msgstr "Sneltoets Configuratie" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Hotkeys" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Hongaarse" @@ -3078,14 +3194,14 @@ msgstr "Hongaarse" msgid "Hybrid Wiimote" msgstr "Hybride Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3098,11 +3214,11 @@ msgstr "" "TitleID %016llx.\n" "Dolphin zal waarschijnlijk blijven hangen." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - onjuiste bestemming" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL Instellingen" @@ -3118,15 +3234,15 @@ msgstr "IR Aanwijzer" msgid "IR Sensitivity:" msgstr "IR Gevoeligheid:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "ISO Details" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "ISO Map" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITALIË" @@ -3134,23 +3250,25 @@ msgstr "ITALIË" msgid "Icon" msgstr "Icoon" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: 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:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy msgid "" -"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." +"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 "" "Als je de Framelimiet hoger zet dan de snelheid van het spel (NTSC: 60, PAL: " "50),\n" @@ -3188,7 +3306,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Importeer Save" @@ -3239,7 +3357,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "In Game" @@ -3248,7 +3366,7 @@ msgid "In-Game" msgstr "In-Game" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3268,7 +3386,7 @@ msgstr "Toevoegen" msgid "Insert Encrypted or Decrypted code here..." msgstr "Voer Gecodeerde of Gedecodeerde code hier in..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Schakel SD Card in" @@ -3280,7 +3398,7 @@ msgstr "Voeg naam hier toe" msgid "Install WAD" msgstr "Installeer WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Installeren in Wii-menu" @@ -3291,6 +3409,7 @@ msgstr "" "InstallExceptionHandler opgeroepen, maar dit platform ondersteund dit nog " "niet." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3300,15 +3419,18 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WAD aan het installeren..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 #, fuzzy msgid "Interface" msgstr "Interface Instellingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Interface Instellingen" @@ -3333,11 +3455,11 @@ msgstr "Interne LZO fout - lzo_init() is mislukt" msgid "Internal Resolution:" msgstr "Interne Resolutie:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreteer (Behoorlijk langzaam)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3354,7 +3476,7 @@ msgstr "Onjuiste waarde!" msgid "Invalid bat.map or dir entry" msgstr "Onjuiste bat.map of map vermelding" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Onjuist event type %i" @@ -3374,14 +3496,15 @@ msgstr "" "%s\n" "Wellicht moet je dit spel opnieuw dumpen" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Onjuist opname bestand" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Onjuiste staat" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3397,27 +3520,32 @@ msgstr "Onjuiste staat" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italië" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (aanbevolen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL experimentele recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japans" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KOREA" @@ -3426,8 +3554,8 @@ msgstr "KOREA" msgid "Key" msgstr "Toets" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Koreaans" @@ -3445,7 +3573,7 @@ msgstr "L Knop" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Taal:" @@ -3498,7 +3626,7 @@ msgstr "" msgid "Less Than" msgstr "Minder dan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Limiteer met behulp van FPS" @@ -3506,7 +3634,7 @@ msgstr "Limiteer met behulp van FPS" msgid "Load" msgstr "Laad" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Laad Aangepaste Textures" @@ -3554,6 +3682,7 @@ msgstr "Laad staat 8" msgid "Load State..." msgstr "Laad staat..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3563,10 +3692,14 @@ msgstr "Laad staat..." ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Laad Wii System Menu(%d %c)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 @@ -3576,6 +3709,9 @@ msgstr "Laad Wii System Menu(%d %c)" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Laad Wii System Menu(%d %c)" @@ -3602,7 +3738,7 @@ msgstr "Laad het opgegeven bestand (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Lokaal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Vergrendel Threads aan CPU cores" @@ -3614,11 +3750,11 @@ msgstr "Logboek" msgid "Log Configuration" msgstr "Logboek configuratie" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Log Types" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Logger Uitvoer" @@ -3648,7 +3784,7 @@ msgstr "" "Verkeerde MD5\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Snelheids Hack" @@ -3670,11 +3806,11 @@ msgstr "MadCatz Gameshark bestanden(*.gcs)" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "Maker ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Maker:" @@ -3698,6 +3834,7 @@ msgstr "Geheugen Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3705,6 +3842,9 @@ msgstr "Geheugen Byte" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Geheugen Kaart" @@ -3741,7 +3881,7 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Microfoon" @@ -3750,11 +3890,11 @@ msgstr "Microfoon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Overig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Overige Instellingen" @@ -3775,7 +3915,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Niet-proportioneel (monospace) lettertype" @@ -3788,7 +3928,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3811,7 +3951,7 @@ msgstr "" msgid "Multiply" msgstr "Vermenigvuldigen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3903,6 +4043,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Omhoog" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3912,6 +4053,9 @@ msgstr "NP Omhoog" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3920,7 +4064,7 @@ msgstr "Naam:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Naam:" @@ -3934,7 +4078,7 @@ msgid "New Scan" msgstr "Nieuwe Scan" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Volgende Pagina" @@ -3946,7 +4090,7 @@ msgstr "Volgende Scan" msgid "Nickname :" msgstr "Gebruikersnaam :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Geen land (SDK)" @@ -3985,7 +4129,7 @@ msgstr "Geen save map gevonden voor titel %s" msgid "None" msgstr "Geen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Noorweegse Bokmaal" @@ -3993,8 +4137,8 @@ msgstr "Noorweegse Bokmaal" msgid "Not Equal" msgstr "Niet gelijk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Niet ingesteld" @@ -4014,7 +4158,7 @@ msgstr "Niet verbonden" msgid "Notes" msgstr "Opmerkingen" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Opmerkingen:" @@ -4052,7 +4196,7 @@ msgstr "" msgid "Object Range" msgstr "Object Bereik" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Uit" @@ -4078,11 +4222,11 @@ msgstr "Er zijn maar %d blocks beschikaarr" msgid "Open" msgstr "Open" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Open &bevattende map" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Open Wii &save map" @@ -4104,11 +4248,11 @@ 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:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL Texture Decodeerder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decodeerder" @@ -4141,7 +4285,7 @@ msgstr "" "en importeer de saves naar een nieuwe geheugenkaart\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Overige" @@ -4193,19 +4337,20 @@ msgstr "Paragraaf" msgid "Parameters" msgstr "Parameters" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partitie %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Pad" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4218,6 +4363,10 @@ msgstr "Pad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pauze" @@ -4226,7 +4375,7 @@ msgstr "Pauze" msgid "Per-Pixel Lighting" msgstr "Per-Pixel Belichting" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfect" @@ -4239,6 +4388,7 @@ msgstr "Perspectief %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4249,6 +4399,10 @@ msgstr "Perspectief %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Speel" @@ -4262,7 +4416,7 @@ msgstr "Speel Opname" msgid "Play/Pause" msgstr "Spel/Pauze" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Speelbaar" @@ -4274,6 +4428,7 @@ msgstr "Terugspeel Opties" msgid "Players" msgstr "Spelers" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4283,6 +4438,9 @@ msgstr "Spelers" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Bevestig alsjeblieft..." @@ -4294,23 +4452,23 @@ msgstr "Maak een perspectief voor het opslaan" msgid "Plus-Minus" msgstr "Ongeveer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Pools" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Poort 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Poort 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Poort 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Poort 4" @@ -4319,11 +4477,11 @@ msgstr "Poort 4" msgid "Port :" msgstr "Poort :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugees" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugees (Braziliaans)" @@ -4331,17 +4489,17 @@ msgstr "Portugees (Braziliaans)" msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4354,7 +4512,7 @@ msgstr "Presets: " msgid "Prev Page" msgstr "Vorige Pagina" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Vorige Pagina" @@ -4405,7 +4563,7 @@ msgstr "" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSLAND" @@ -4418,7 +4576,7 @@ msgstr "Afstand" msgid "Read-only mode" msgstr "Alleen-lezen modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Echt" @@ -4495,6 +4653,7 @@ msgstr "Lijst Verversen" msgid "Refresh game list" msgstr "Ververs de speellijst" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4513,6 +4672,12 @@ msgstr "Ververs de speellijst" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Verwijder" @@ -4566,11 +4731,11 @@ msgstr "Rechter Stick" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: 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:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russisch" @@ -4578,10 +4743,11 @@ msgstr "Russisch" msgid "Sa&ve State" msgstr "S&la Staat Op" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Opslaan" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4591,6 +4757,9 @@ msgstr "Opslaan" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Sample Rate:" @@ -4648,12 +4817,12 @@ msgstr "Sla Staat 8 Op" msgid "Save State..." msgstr "Sla staat op als..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Opslaan als..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Sla gecomprimeerde GCM / ISO op" @@ -4661,11 +4830,11 @@ msgstr "Sla gecomprimeerde GCM / ISO op" msgid "Save current perspective" msgstr "Sla huidige perspectief op" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Sla gedecomprimeerd GCM / ISO op" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, 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..." @@ -4675,6 +4844,7 @@ msgstr "Save staat film %s is corrupt, het opnemen van de film is gestopt..." msgid "Scaled EFB Copy" msgstr "EFB Verkleinde Kopie" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4684,15 +4854,18 @@ msgstr "EFB Verkleinde Kopie" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Scannen van %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Scannen voor ISO's" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Scannen..." @@ -4708,12 +4881,12 @@ msgstr "Scroll Slot" msgid "Search Filter" msgstr "Zoekfilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Zoeken in submappen" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: 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 "Sectie %s niet gevonden in SYSCONF" @@ -4723,6 +4896,7 @@ msgstr "Sectie %s niet gevonden in SYSCONF" msgid "Select" msgstr "Selecteer" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4747,6 +4921,14 @@ msgstr "Selecteer de opname Bestand" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Selecteer de opname Bestand" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Selecteer een Wii WAD bestand om te installeren" @@ -4772,16 +4954,21 @@ msgstr "Selecteer zwevende vensters" msgid "Select the file to load" msgstr "Selecteer het bestand om het te laden" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Selecteer het save - bestand" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Selecteer de Staat om te laden" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4801,6 +4988,9 @@ msgstr "Selecteer de Staat om te laden" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Selecteer de Staat om op te slaan" @@ -4820,7 +5010,7 @@ 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/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Geselecteerde font" @@ -4869,11 +5059,11 @@ msgstr "Sensor Bar Positie:" msgid "Separator" msgstr "Scheidingsteken" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Servisch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4883,11 +5073,11 @@ msgstr "" msgid "Set" msgstr "Stel" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Ingesteld als &standaard ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Ingesteld als standaard memcard% c" @@ -4898,7 +5088,7 @@ 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:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Instellingen..." @@ -4910,7 +5100,7 @@ msgstr "SetupWiiMem: Kan het instellingen bestand niet vinden" msgid "Shake" msgstr "Schudden" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Korte Naam:" @@ -4938,7 +5128,7 @@ msgstr "Toon &Toolbar" msgid "Show Drives" msgstr "Toon Schijven" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Weergeef EFB Kopie Regios" @@ -4954,7 +5144,7 @@ msgstr "Toon Frans" msgid "Show GameCube" msgstr "Toon Gamecube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Toon Input Venster" @@ -4970,7 +5160,7 @@ msgstr "Toon JAP" msgid "Show Korea" msgstr "Toon Korea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Toon Taal:" @@ -4990,7 +5180,7 @@ msgstr "Toon Platformen" msgid "Show Regions" msgstr "Toon Regio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Weergeef statistieken" @@ -5010,11 +5200,11 @@ msgstr "Toon Wad" 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 " @@ -5024,23 +5214,23 @@ 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:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Toon eerste blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Toon save blocks" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Toon save commentaar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Toon save icon" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Toon save titel" @@ -5078,7 +5268,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Zijdelings Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Vereenvoudigd Chinees" @@ -5086,11 +5276,11 @@ msgstr "Vereenvoudigd Chinees" msgid "Size" msgstr "Grootte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Sla BIOS Over" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "Schakel Dest. Alpha Pass uit" @@ -5127,11 +5317,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5155,7 +5345,7 @@ 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:621 msgid "Sound Settings" msgstr "Geluids Instellingen" @@ -5173,6 +5363,7 @@ msgstr "Het aanmaken van de geluids buffer is mislukt: %s" msgid "Space" msgstr "Ruimte" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5188,6 +5379,11 @@ msgstr "Ruimte" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spaans" @@ -5219,7 +5415,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Geef een video-plugin aan" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Versnel Disc Transfer Rate" @@ -5227,7 +5423,7 @@ msgstr "Versnel Disc Transfer Rate" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "" @@ -5320,12 +5516,12 @@ msgstr "Succesvol save games geimporteerd" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Systeem Taal:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWAN" @@ -5364,7 +5560,7 @@ msgstr "Rechter Tabel" msgid "Take Screenshot" msgstr "Neem een Schermafdruk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5381,7 +5577,7 @@ msgstr "Textuur" msgid "Texture Cache" msgstr "Zuiveren van de Cache" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Textuur Formaat Overlay" @@ -5397,13 +5593,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:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "De gekozen map is al in de lijst" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5427,7 +5623,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:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Het opgegeven bestand(%s) bestaat niet" @@ -5449,7 +5645,7 @@ msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5491,7 +5687,7 @@ msgstr "Het opgegeven bestand \"%s\" bestaat niet" msgid "The value is invalid" msgstr "De waarde is onjuist" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Thema" @@ -5499,7 +5695,7 @@ msgstr "Thema" msgid "Theme selection went wrong" msgstr "Thema selectie ging fout" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5507,7 +5703,7 @@ msgstr "" "Er moet een ticket zijn voor 00000001/00000002. Je NAND dump is " "waarschijnlijk incompleet." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5523,7 +5719,7 @@ msgstr "" "Deze action replay simulator ondersteund geen codes die de Action Replay " "zelf aanpassen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: 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." @@ -5546,26 +5742,10 @@ msgstr "" "In geval van twijfel leeg laten." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -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 "" -"Dit wordt gebruikt om de snelheid van het spel te bepalen via geluids " -"throttle. \n" -"Als je dit uitschakelt kan het abnormale snelheden veroorzaken, waardoor het " -"spel te snel afspeelt. \n" -"Maar soms veroorzaakt dit constante noise.\n" -"\n" -"Sneltoets : Houd ingedrukt om throttle gelijk uit te zetten." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Dit wordt gebruikt om muziek af te spelen, zoals achtergrondmuziek." -#: 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" @@ -5577,7 +5757,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:283 +#: 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" @@ -5600,7 +5780,7 @@ msgstr "Titel" msgid "To" msgstr "Naar" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Zet Alle Log Types Aan" @@ -5620,6 +5800,7 @@ msgstr "Volledig Scherm Inschakelen" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5627,14 +5808,17 @@ msgstr "Volledig Scherm Inschakelen" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Boven" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Chinees (Traditioneel)" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Poging tot het laden van een onbekend bestands type." @@ -5642,7 +5826,7 @@ msgstr "Poging tot het laden van een onbekend bestands type." msgid "Triggers" msgstr "" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Poging tot het inlezen van een ongeldige SYSCONF" @@ -5654,7 +5838,7 @@ msgstr "" "Poging tot het inlezen van een ongeldige SYSCONF\n" "Wiimote bt ids zijn niet beschikbaar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turks" @@ -5675,11 +5859,11 @@ msgstr "UDP Port:" msgid "UDP Wiimote" msgstr "UDP Wiimote " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "ONBEKEND" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -5765,7 +5949,7 @@ msgstr "Update" msgid "Upright Wiimote" msgstr "Wiimote rechtop" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Gebruik EuRGB60 Mode (PAL60)" @@ -5777,7 +5961,7 @@ msgstr "Gebruik &Volledig Scherm" msgid "Use Hex" msgstr "Gebruik Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Gebruik Panic Handlers" @@ -5808,7 +5992,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Hulpprogramma" @@ -5832,25 +6016,29 @@ msgstr "Waarde:" msgid "Verbosity" msgstr "Breedsprakigheid" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtueel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volume" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD installatie mislukt: fout bij het creëren van %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "WAD installatie mislukt: fout bij het creëren van %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5869,15 +6057,15 @@ msgstr "" msgid "Warning" msgstr "Waarschuwing" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 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:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Waarschuwing - ELF wordt in de verkeerde console mode gestart!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Waarschuwing - ISO wordt in de verkeerde console mode gestart!" @@ -5906,7 +6094,7 @@ msgstr "" "en heeft dezelfde naam als een bestand op je geheugenkaart\n" "Doorgaan?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5914,7 +6102,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5922,7 +6110,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5950,7 +6138,7 @@ msgstr "WaveFileWriter - bestand niet open." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Breedbeeld Hack" @@ -5958,15 +6146,15 @@ msgstr "Breedbeeld Hack" msgid "Width" msgstr "Breedte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii Console " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND basismap:" @@ -5974,6 +6162,7 @@ msgstr "Wii NAND basismap:" msgid "Wii Save Import" msgstr "Wii Save Importeren" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5983,6 +6172,9 @@ msgstr "Wii Save Importeren" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii save bestanden (*.bin)|*.bin" @@ -6050,10 +6242,11 @@ msgstr "Venster Menu" msgid "Windows Right" msgstr "Venster Rechts" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Regelafbreking" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6069,6 +6262,11 @@ msgstr "Regelafbreking" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Werken..." @@ -6076,6 +6274,11 @@ msgstr "Werken..." msgid "Write to Console" msgstr "Schrijf naar Console" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Schrijf naar Bestand" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Schrijf naar Bestand" @@ -6129,7 +6332,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:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Je moet Dolphin herstarten voordat deze optie effect zal hebben." @@ -6152,7 +6355,7 @@ msgstr "" "Het zou 0x%04x moet zijn, maar is 0x%04llx \n" "Wil je een nieuwe genereren?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP hack" @@ -6221,7 +6424,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ERBIJ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "applader (.img)" @@ -6253,12 +6456,12 @@ msgstr "" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "onbekend commando 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute retourneerde -1 bij het draaien van de applicatie!" @@ -6405,6 +6608,9 @@ msgstr "| OF" #~ msgid "Emulator Display Settings" #~ msgstr "Emulator Scherm Instellingen" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Activeer Audio Throttle" + #~ msgid "Enable CPU Access" #~ msgstr "Activeer CPU Toegang" @@ -6675,6 +6881,21 @@ msgstr "| OF" #~ msgid "The file " #~ msgstr "Het bestand" +#~ 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 "" +#~ "Dit wordt gebruikt om de snelheid van het spel te bepalen via geluids " +#~ "throttle. \n" +#~ "Als je dit uitschakelt kan het abnormale snelheden veroorzaken, waardoor " +#~ "het spel te snel afspeelt. \n" +#~ "Maar soms veroorzaakt dit constante noise.\n" +#~ "\n" +#~ "Sneltoets : Houd ingedrukt om throttle gelijk uit te zetten." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "" #~ "Dit wordt meestal gebruikt om spraak-en geluidseffecten af te spelen." diff --git a/Languages/po/pl.po b/Languages/po/pl.po index 1da1a68e37..b4a21374be 100644 --- a/Languages/po/pl.po +++ b/Languages/po/pl.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-08-12 17:04+0100\n" "Last-Translator: Krzysztof Baszczok \n" "Language-Team: Polish \n" @@ -57,9 +61,9 @@ msgstr "\"%s\" jest niewÅ‚aÅ›ciwym plikiem GMC/ISO lub to nie jest GC/Wii ISO" msgid "%1$sCopy%1$s" msgstr "%1$sKopiuj%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -155,7 +159,7 @@ msgstr "%sEksportuj GCI%s" msgid "%sImport GCI%s" msgstr "%sImportuj GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u wolnych bloków; %u wolnych wejść katalogowych" @@ -188,11 +192,11 @@ msgstr "&Menadżer cheatów" msgid "&DSP Settings" msgstr "&Ustawienia DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&UsuÅ„ ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&UsuÅ„ wybrane ISO..." @@ -256,7 +260,7 @@ msgstr "&Wstrzymaj" msgid "&Play" msgstr "&Play" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&WÅ‚aÅ›ciwoÅ›ci" @@ -300,7 +304,7 @@ msgstr "&Widok" msgid "&Wiimote Settings" msgstr "&Ustawienia Wiilota" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -344,7 +348,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -353,7 +357,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -408,13 +412,13 @@ msgstr "" "\n" "Wymagane jest przekierowanie portu TCP do hosta!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Kody AR" @@ -426,11 +430,11 @@ msgstr "O Dolphin" msgid "Acceleration" msgstr "Przyspieszenie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "DokÅ‚adność:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulacja Accurate VBeam" @@ -550,11 +554,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Dodaj" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Dodaj kod ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Dodaj Å‚atkÄ™" @@ -562,6 +566,7 @@ msgstr "Dodaj Å‚atkÄ™" msgid "Add new pane" msgstr "Dodaj nowy panel" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -577,6 +582,11 @@ msgstr "Dodaj nowy panel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Dodaj..." @@ -624,11 +634,11 @@ 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:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Zaawansowane" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Ustawienia zaawansowane" @@ -636,14 +646,15 @@ msgstr "Ustawienia zaawansowane" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Wszystkie pliki GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Wszystkie obrazy GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Pliki GCM" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -656,18 +667,22 @@ msgstr "Pliki GCM" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Stany zapisu (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Wszystkie obrazy Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Spakowane obrazy GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Wszystkie pliki (*.*)|*.*" @@ -683,7 +698,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Emulowany Wiilot" @@ -704,7 +719,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:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -722,7 +737,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, wybierz (wyÅ‚Ä…czone)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arabski" @@ -731,7 +746,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -739,10 +754,11 @@ msgstr "" "Czy jesteÅ› pewny by usunÄ…c te pliki?\n" "PrzepadnÄ… na zawsze!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -752,6 +768,9 @@ msgstr "Czy jesteÅ› pewny by usunÄ…c ten plik? Przepadnie na zawsze!" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporcje ekranu:" @@ -760,18 +779,20 @@ msgstr "Proporcje ekranu:" msgid "At least one pane must remain open." msgstr "Przynajmniej jeden manel musi pozostać otwarty." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Audio Backend :" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: BÅ‚Ä…d otwarcia urzÄ…dzenia AO.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -781,6 +802,9 @@ msgstr "AudioCommon: BÅ‚Ä…d otwarcia urzÄ…dzenia AO.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -823,7 +847,7 @@ msgstr "" msgid "Back" msgstr "Wstecz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Ustawienia Backend'u" @@ -850,11 +874,11 @@ msgstr "ZÅ‚y nagłówek pliku" msgid "Banner" msgstr "Baner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Szczegóły banera" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Baner:" @@ -866,7 +890,7 @@ msgstr "Wajcha" msgid "Basic" msgstr "Podstawowy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Ustawienia podstawowe" @@ -897,6 +921,7 @@ msgstr "Niebieski prawo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -904,6 +929,9 @@ msgstr "Niebieski prawo" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Dół" @@ -912,7 +940,7 @@ msgstr "Dół" msgid "Bound Controls: %lu" msgstr "Bound Controls: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Zepsuty" @@ -928,7 +956,7 @@ msgstr "Szukaj folder do dodania" msgid "Browse for an ISO directory..." msgstr "Szukaj folder ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Szukaj folderu wyjÅ›ciowego" @@ -958,11 +986,11 @@ msgstr "C Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Silnik emulacji CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Cache Display Lists" @@ -1010,7 +1038,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:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1021,7 +1049,7 @@ msgstr "" "%s\n" "nie jest wÅ‚aÅ›ciwym plikiem karty pamiÄ™ci GC" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1039,8 +1067,6 @@ msgstr "Nie można odnaleźć Wiilota po bd: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Nie można odnaleźć Wiilota przez handle poÅ‚Ä…czenia %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1050,7 +1076,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:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "KataloÅ„ski" @@ -1075,7 +1101,7 @@ msgstr "ZmieÅ„ dysk" msgid "Change Game" msgstr "ZmieÅ„ grÄ™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1091,8 +1117,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:506 #: 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!" @@ -1113,31 +1139,31 @@ msgstr "Szukaj cheatów" msgid "Cheats Manager" msgstr "Menadżer cheatów" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "ChiÅ„ski uproszczony" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinski (Tradycyjny)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: 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:762 +#: 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:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Wybierz domyÅ›lne ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Wybierz folder do dodania" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Wybierz plik do otwarcia" @@ -1145,6 +1171,7 @@ msgstr "Wybierz plik do otwarcia" msgid "Choose a memory card:" msgstr "Wybierz kartÄ™ pamiÄ™ci:" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 @@ -1154,6 +1181,9 @@ msgstr "Wybierz kartÄ™ pamiÄ™ci:" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1161,8 +1191,8 @@ msgstr "" "Wybierz plik używany jako apploader: (dotyczy dysków stworzonych tylko z " "folderów)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Wypakuj do" @@ -1174,14 +1204,14 @@ msgstr "Circle Stick" msgid "Classic" msgstr "Classic" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Wyczyść" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Czyszczenie nie powiodÅ‚o siÄ™." @@ -1197,6 +1227,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1205,6 +1236,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Zamknij" @@ -1228,20 +1263,20 @@ msgstr "Polecenie" msgid "Comment" msgstr "Komentarz" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Komentarz:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Kompresuj ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Kompresuj wybrane ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Kompresowanie ISO" @@ -1268,13 +1303,13 @@ msgstr "Konfiguracja padów" msgid "Configure..." msgstr "Konfiguruj..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Potwierdź nadpis pliku" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Potwierdź przy zatrzymaniu" @@ -1283,7 +1318,7 @@ msgstr "Potwierdź przy zatrzymaniu" msgid "Connect" msgstr "PoÅ‚Ä…cz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "PodÅ‚Ä…cz klawiaturÄ™ USB" @@ -1340,12 +1375,12 @@ msgstr "Konwertuj do GCI" msgid "Copy failed" msgstr "Kopiowanie nie powiodÅ‚o siÄ™" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Kopiuj do Memcard %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "RdzeÅ„" @@ -1375,7 +1410,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Nie rozpoznao pliku ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Nie można zapisać %s" @@ -1388,7 +1423,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:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1401,7 +1436,7 @@ msgstr "" "Uruchamiasz program z CD/DVD albo plik zapisu jest zabezpieczony przed " "zapisem?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Nie odnaleziono polecenia otwarcia dla rozszerzenia 'ini'!" @@ -1418,7 +1453,7 @@ msgstr "" msgid "Count:" msgstr "Ilość:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Kraj:" @@ -1432,10 +1467,11 @@ 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:500 msgid "Created by KDE-Look.org" msgstr "Utworzone przez KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 @@ -1445,22 +1481,25 @@ msgstr "Utworzone przez KDE-Look.org" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +>>>>>>> Update the pot file to reflect recent changes in the code. 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:498 msgid "Created by VistaIcons.com" msgstr "Utworzone przez VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 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:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Twórca:" @@ -1468,7 +1507,7 @@ msgstr "Twórca:" msgid "Critical" msgstr "Krytyczny" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "ObciÄ™cie" @@ -1491,7 +1530,7 @@ msgstr "Suwak" 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:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Custom Projection Hack" @@ -1499,11 +1538,11 @@ msgstr "Custom Projection Hack" msgid "Custom Projection Hack Settings" msgstr "Ustawienia Custom Projection Hack" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "WÅ‚asne parametry Orthographic Projection" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Czeski" @@ -1515,10 +1554,11 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1529,18 +1569,22 @@ msgstr "DSP Emulator Engine" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulacja (szybkie)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (wolne)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "WÄ…tek dla DSPLLE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE rekompilator" @@ -1548,15 +1592,23 @@ msgstr "DSP LLE rekompilator" msgid "DSP settings" msgstr "Ustawienia DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "ŹródÅ‚o DVD:" +#: 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:176 msgid "Data Size" msgstr "Rozmiar danych" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Data:" @@ -1577,7 +1629,7 @@ msgstr "Dead Zone" msgid "Debug" msgstr "Debuguj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Debugowanie" @@ -1585,16 +1637,16 @@ msgstr "Debugowanie" msgid "Decimal" msgstr "DziesiÄ™tnie" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Wypakuj ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Wypakuj wybrane ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Wypakowywanie ISO" @@ -1602,11 +1654,11 @@ msgstr "Wypakowywanie ISO" msgid "Default" msgstr "DomyÅ›lne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "DomyÅ›lne ISO:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "DomyÅ›lna czcionka" @@ -1615,7 +1667,7 @@ msgstr "DomyÅ›lna czcionka" msgid "Delete" msgstr "UsuÅ„" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "UsuÅ„ zapis" @@ -1624,7 +1676,7 @@ msgstr "UsuÅ„ zapis" msgid "Delete the existing file '%s'?" msgstr "Usunąć istniejÄ…cy plik '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Opis" @@ -1632,8 +1684,8 @@ msgstr "Opis" msgid "Detect" msgstr "Wykryj" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: 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." @@ -1646,8 +1698,8 @@ msgstr "" msgid "Device" msgstr "UrzÄ…dzenie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Ustawienia urzÄ…dzenia" @@ -1672,23 +1724,23 @@ msgstr "" "folderu zapasowego nie powiodÅ‚a siÄ™" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "WyÅ‚Ä…cz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "WyÅ‚Ä…cz mgÅ‚Ä™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "WyÅ‚Ä…cz Å›wiatÅ‚a" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "WyÅ‚Ä…cz Per-Pixel Depth" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "WyÅ‚Ä…cz tekstury" @@ -1732,7 +1784,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Dysk" @@ -1759,6 +1811,7 @@ msgstr "" msgid "Divide" msgstr "Podziel" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1768,10 +1821,13 @@ msgstr "Podziel" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Zatrzymać aktualnÄ… emulacjÄ™?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1796,6 +1852,7 @@ msgstr "Konfiguracja emulowanego Wiilota" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1820,6 +1877,14 @@ msgstr "Konfiguracja GCPad'a" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Konfiguracja GCPad'a" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmy TAS (*.dtm)" @@ -1868,11 +1933,11 @@ msgstr "" msgid "Down" msgstr "Dół" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "ÅšciÄ…gnij kody (baza WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Pobrano %lu kodów. (dodano %lu)" @@ -1881,23 +1946,23 @@ msgstr "Pobrano %lu kodów. (dodano %lu)" msgid "Drums" msgstr "Perkusja" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Atrapa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Zrzut Audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Zrzut EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Zrzut ramek" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Zrzut tekstur" @@ -1931,6 +1996,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1946,6 +2012,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holenderski" @@ -1969,7 +2040,7 @@ msgstr "" "%d -- JeÅ›li ostatnio aktualizowaÅ‚eÅ› program, ponowne uruchomienie systemu " "jest wymagane by sterownik zaczÄ…Å‚ dziaÅ‚ać." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "Europa" @@ -1985,7 +2056,7 @@ msgstr "Edycja" msgid "Edit ActionReplay Code" msgstr "Edytuj kody ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Edytuj konfiguracjÄ™" @@ -1997,8 +2068,8 @@ msgstr "Edytuj patch" msgid "Edit current perspective" msgstr "Edytuj bierzÄ…cÄ… perspektywÄ™" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Edytuj..." @@ -2049,7 +2120,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emulowany Wiilot" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Stan emulacji:" @@ -2077,23 +2148,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "WÅ‚Ä…cz log AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "WÅ‚Ä…cz Audio Throttle" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "WÅ‚Ä…cz BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "WÅ‚Ä…cz Å‚Ä…czenie bloków" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2106,6 +2177,7 @@ msgstr "" msgid "Enable Cache" msgstr "WÅ‚Ä…cz cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2115,51 +2187,54 @@ msgstr "WÅ‚Ä…cz cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "WÅ‚Ä…cz kody" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "WÅ‚Ä…cz muzykÄ™ DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "WÅ‚Ä…cz 2 rdzenie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "WÅ‚Ä…cz 2 rdzenie (przyspieszenie)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "WÅ‚Ä…cz skróty klawiszowe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "WÅ‚Ä…cz Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "WÅ‚Ä…cz Idle Skipping (przyspieszenie)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "WÅ‚Ä…cz MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "WÅ‚Ä…cz Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "WÅ‚Ä…cz wygaszacz ekranu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "WÅ‚Ä…cz WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "WÅ‚Ä…cz Wireframe" @@ -2177,7 +2252,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, wybierz 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2185,7 +2260,7 @@ msgstr "" "WÅ‚Ä…cz szybki dostÄ™p do dysku. Wymagane dla kilku gier. (ON = szybko, OFF = " "kompatybilne)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "WÅ‚Ä…cz strony" @@ -2213,6 +2288,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 @@ -2222,6 +2298,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2229,7 +2308,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:311 +#: 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 = " @@ -2239,7 +2318,7 @@ msgstr "" "DokÅ‚adne dla sprzetu, lecz powolne do emulacji. (ON = kompatybilne, OFF = " "szybko)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "WÅ‚Ä…cza Custom Projection Hack" @@ -2255,7 +2334,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2277,6 +2356,7 @@ msgstr "" msgid "End" msgstr "Koniec" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2292,6 +2372,11 @@ msgstr "Koniec" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Angielski" @@ -2322,6 +2407,7 @@ msgstr "Równy" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "BÅ‚Ä…d" @@ -2352,11 +2438,17 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "BÅ‚Ä…d" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "BÅ‚Ä…d wczytywania wybranego jÄ™zyka. Ustawienia domyÅ›lne." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" <<<<<<< HEAD @@ -2367,7 +2459,7 @@ msgid "" "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" ======= @@ -2403,7 +2495,7 @@ msgstr "WyjÅ›cie z Dolphina" msgid "Export Failed" msgstr "Eksportuj nieudany" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Eksportuj plik" @@ -2416,15 +2508,15 @@ msgstr "Eksportuj nagranie" msgid "Export Recording..." msgstr "Eksportuj nagranie..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Eksportuj zapis" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Eksportuj zapis Wii (eksperymentalne)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Eksportuj wszystkie zapisy" @@ -2440,7 +2532,7 @@ msgstr "Eksportuj zapis jako..." msgid "Extension" msgstr "Rozszerzenie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "External Frame Buffer" @@ -2452,44 +2544,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Wypakuj wszystkie pliki..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Wypakuj Apploader'a..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Wypakuj DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Wypakuj folder..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Wypakuj plik..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Wypakuj partycjÄ™..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Wypakowywanie %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Wypakowywanie wszystkich plików" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Wypakowywanie folderu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Wypakowywanie..." @@ -2501,11 +2593,11 @@ msgstr "Bajt FIFO" msgid "FIFO Player" msgstr "FIFO Player" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "Francja" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Rozmiar FST:" @@ -2517,11 +2609,11 @@ msgstr "PoÅ‚Ä…czenie nieudane!" msgid "Failed to Listen!!" msgstr "NasÅ‚uchiwanie nieudane!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Pobieranie kodów nieudane!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Wypakowanie do %s nie udaÅ‚o siÄ™!" @@ -2638,18 +2730,28 @@ 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/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Szybki" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Fast Mipmaps" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Fifo Player" @@ -2658,7 +2760,7 @@ msgstr "Fifo Player" msgid "File Info" msgstr "Informacja o pliku" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Plik nie zawiera kodów." @@ -2691,16 +2793,16 @@ msgstr "Plik nierozpoznany jako karta pamiÄ™ci" msgid "File not compressed" msgstr "Plik nie skompresowany" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Nieznany tryb otwarcia: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "System plików" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Nieznany plik typu 'ini'! Nie otworzy siÄ™!" @@ -2708,7 +2810,7 @@ msgstr "Nieznany plik typu 'ini'! Nie otworzy siÄ™!" msgid "First Block" msgstr "Blok pierwszy" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Napraw sumy kontrolne" @@ -2720,7 +2822,7 @@ msgstr "WymuÅ› 16:9" msgid "Force 4:3" msgstr "WymuÅ› 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "WymuÅ› konsolÄ™ jako NTSC-J" @@ -2752,7 +2854,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 " @@ -2788,7 +2890,7 @@ msgstr "Ramka" msgid "Frame Advance" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Zrzuty ramek używajÄ… FFV1" @@ -2800,7 +2902,7 @@ msgstr "ZasiÄ™g ramki" msgid "Frame S&kipping" msgstr "Frame S&kipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Limit ramek:" @@ -2808,10 +2910,11 @@ msgstr "Limit ramek:" msgid "Frames To Record" msgstr "Ramki do nagrania" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Free Look" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2827,6 +2930,11 @@ msgstr "Free Look" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francuski" @@ -2860,7 +2968,7 @@ msgstr "Konfiguracja Logu" msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID gry:" @@ -2876,15 +2984,15 @@ msgstr "Gra nie jest uruchomiona!" msgid "Game not found!!" msgstr "Gry nie odnaleziono!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Specyficzne ustawienia gry" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Konfiguracja gry" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2895,6 +3003,7 @@ msgstr "Ustawienia &pada GC" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2902,6 +3011,9 @@ msgstr "Ustawienia &pada GC" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Karty pamiÄ™ci GC (*.raw,*.gcp)" @@ -2910,15 +3022,17 @@ msgid "Gamecube Pad settings" msgstr "Ustawienia pada GC" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Kody Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, 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.)" +"(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 "" "BÅ‚Ä…d uruchomienia GeckoCode (CT%i CST%i) (%s)\n" "(zÅ‚y kod albo typ kodu nie jest jeszcze wspierany)" @@ -2927,6 +3041,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2935,6 +3050,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Główne" @@ -2943,6 +3061,7 @@ msgstr "Główne" msgid "General Settings" msgstr "Ustawienia ogólne" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2958,6 +3077,11 @@ msgstr "Ustawienia ogólne" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Niemiecki" @@ -2995,7 +3119,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Grecki" @@ -3027,7 +3151,7 @@ msgstr "Hacki" msgid "Header checksum failed" msgstr "Suma kontrolna nagłówka nie powiodÅ‚a siÄ™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebrajski" @@ -3095,12 +3219,16 @@ msgstr "Konfiguracja skrótów klawiszowych" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Skróty klawiszowe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "WÄ™gierski" @@ -3108,13 +3236,13 @@ msgstr "WÄ™gierski" msgid "Hybrid Wiimote" msgstr "Hybrydowy Wiilot" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3127,11 +3255,11 @@ msgstr "" "TitleID %016llx.\n" "Program teraz chyba siÄ™ zawiesi :C" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - zÅ‚a Å›cieżka" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Ustawienia IPL" @@ -3147,15 +3275,15 @@ msgstr "Wskaźnik IR" msgid "IR Sensitivity:" msgstr "CzuÅ‚ość IR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Szczegóły ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Foldery ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "WÅ‚ochy" @@ -3163,19 +3291,20 @@ msgstr "WÅ‚ochy" msgid "Icon" msgstr "Ikona" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: 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)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 @@ -3185,9 +3314,14 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" -"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." +"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 "" "JeÅ›li ustawisz limit ramek wiÄ™kszy niż peÅ‚na szybkość gry (NTSC:60, PAL:50), " "musisz także wyÅ‚Ä…czyc Audio Throttle w DSP dla peÅ‚nego efektu." @@ -3224,7 +3358,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Importuj zapis" @@ -3274,7 +3408,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "W grze" @@ -3283,7 +3417,7 @@ msgid "In-Game" msgstr "W grze" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3303,7 +3437,7 @@ msgstr "Wstaw" msgid "Insert Encrypted or Decrypted code here..." msgstr "Wprowadź zaszyfrowany/zdeszyfrowany kod tutaj..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Włóż kartÄ™ SD" @@ -3315,7 +3449,7 @@ msgstr "Wprowadź nazwÄ™ tutaj..." msgid "Install WAD" msgstr "Zainstaluj WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Zainstaluj do Wii Menu" @@ -3325,6 +3459,7 @@ msgid "" msgstr "" "InstallExceptionHandler wywoÅ‚any, ale ta platforma nie wspiera go jeszcze." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3334,14 +3469,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instalacja WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Interfejs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Ustawienia interfejsu" @@ -3366,11 +3504,11 @@ msgstr "WewnÄ™trzny bÅ‚Ä…d LZO - lzo_init() nie powiodÅ‚o siÄ™" msgid "Internal Resolution:" msgstr "WewnÄ™trzna rozdzielczość:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreter (BARDZO wolny)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3387,7 +3525,7 @@ msgstr "NiewÅ‚aÅ›ciwa wartość!" msgid "Invalid bat.map or dir entry" msgstr "NiewÅ‚aÅ›ciwe bat.map lub wejÅ›cie folderu" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "NiewÅ‚aÅ›ciwy typ zdarzenia %i" @@ -3407,14 +3545,15 @@ msgstr "" "%s\n" "BÄ™dziesz musiaÅ‚ ponownie zrzucić grÄ™." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "NewÅ‚aÅ›ciwy plik nagrania" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "NiewÅ‚aÅ›ciwy stan" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3430,27 +3569,32 @@ msgstr "NiewÅ‚aÅ›ciwy stan" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "WÅ‚oski" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "Japonia" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "Rekompilator JIT (zalecany)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "Eksperymentalny rekompilator JITIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "JapoÅ„ski" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "Korea" @@ -3459,8 +3603,8 @@ msgstr "Korea" msgid "Key" msgstr "Klawisz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "KoreaÅ„ski" @@ -3478,7 +3622,7 @@ msgstr "L Button" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "JÄ™zyk:" @@ -3531,7 +3675,7 @@ msgstr "" msgid "Less Than" msgstr "Mniej niż" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Limit FPS" @@ -3539,7 +3683,7 @@ msgstr "Limit FPS" msgid "Load" msgstr "Wczytaj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Wczytaj wÅ‚asne tekstury" @@ -3587,6 +3731,7 @@ msgstr "Wczytaj stan Slot 8" msgid "Load State..." msgstr "Wczytaj stan..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3608,6 +3753,13 @@ msgstr "Wczytaj Wii System Menu" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Wczytaj Wii System Menu" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wczytaj Wii System Menu %d %c" @@ -3634,7 +3786,7 @@ msgstr "Wczytuje okreÅ›lony plik (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Lokalny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Przypisz wÄ…tki do rdzeni" @@ -3646,11 +3798,11 @@ msgstr "Log" msgid "Log Configuration" msgstr "Konfiguracja Logu" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Typy logów" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Logger Outputs" @@ -3680,7 +3832,7 @@ msgstr "" "MD5 niepoprawne\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" @@ -3702,11 +3854,11 @@ msgstr "Pliki MadCatz Gameshark(*.gcs)" msgid "Main Stick" msgstr "Główna gaÅ‚ka" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID twórcy:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Twórca:" @@ -3730,6 +3882,7 @@ msgstr "Bajt pamiÄ™ci" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3737,6 +3890,9 @@ msgstr "Bajt pamiÄ™ci" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Karta pamiÄ™ci" @@ -3773,7 +3929,7 @@ msgstr "Wielkość pliku karty pamiÄ™ci nie odpowiada wielkoÅ›ci nagłówka" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mikrofon" @@ -3782,11 +3938,11 @@ msgstr "Mikrofon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Różne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Ustawienia różne" @@ -3807,7 +3963,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Nieproporcjonalna czcionka" @@ -3820,7 +3976,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3842,7 +3998,7 @@ msgstr "" msgid "Multiply" msgstr "Pomnóż" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3934,6 +4090,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3943,6 +4100,9 @@ msgstr "NP Up" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3951,7 +4111,7 @@ msgstr "Nazwa:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nazwa:" @@ -3965,7 +4125,7 @@ msgid "New Scan" msgstr "Nowe skanowanie" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "NastÄ™pna strona" @@ -3977,7 +4137,7 @@ msgstr "NastÄ™pne skanowanie" msgid "Nickname :" msgstr "Ksywa:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "No Country (SDK)" @@ -4016,7 +4176,7 @@ msgstr "Nie odnaleziono folderu zapisu dla tytuÅ‚u %s" msgid "None" msgstr "Å»adne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norweski" @@ -4024,8 +4184,8 @@ msgstr "Norweski" msgid "Not Equal" msgstr "Nie równe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Nie ustawiono" @@ -4045,7 +4205,7 @@ msgstr "Nie poÅ‚Ä…czono" msgid "Notes" msgstr "Notatki" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notatki:" @@ -4083,7 +4243,7 @@ msgstr "Objekt" 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" @@ -4109,11 +4269,11 @@ msgstr "DostÄ™pnych tylko %d bloków" msgid "Open" msgstr "Otwórz" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Otwórz &folder zawartoÅ›ci" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Otwórz folder &zapisów Wii" @@ -4135,11 +4295,11 @@ 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:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL Texture Decoder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decoder" @@ -4171,7 +4331,7 @@ msgstr "" "nastÄ™pnie zaimportuj te zapisy do nowej karty pamiÄ™ci\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "PozostaÅ‚e" @@ -4223,19 +4383,20 @@ msgstr "Paragraf" msgid "Parameters" msgstr "Paramerty" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partycja %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Åšcieżki" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4248,6 +4409,10 @@ msgstr "Åšcieżki" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4256,7 +4421,7 @@ msgstr "Pause" msgid "Per-Pixel Lighting" msgstr "Per-Pixel Lighting" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfekcyjny" @@ -4269,6 +4434,7 @@ msgstr "Perspekrtywa %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4279,6 +4445,10 @@ msgstr "Perspekrtywa %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Play" @@ -4292,7 +4462,7 @@ msgstr "Odtwórz nagranie" msgid "Play/Pause" msgstr "Play/Pause" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Grywalny" @@ -4304,6 +4474,7 @@ msgstr "Opcje playback'u" msgid "Players" msgstr "Gracze" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4313,6 +4484,9 @@ msgstr "Gracze" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Potwierdź..." @@ -4324,23 +4498,23 @@ msgstr "ProszÄ™ utworzyć perspektywÄ™ przed zapisem" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polski" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4349,11 +4523,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugalski" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugalski (Brazylijski)" @@ -4361,17 +4535,17 @@ msgstr "Portugalski (Brazylijski)" msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4384,7 +4558,7 @@ msgstr "Presets: " msgid "Prev Page" msgstr "Poprzednia strona" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Poprzednia strona" @@ -4435,7 +4609,7 @@ msgstr "R-Analog" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "Rosja" @@ -4448,7 +4622,7 @@ msgstr "ZasiÄ™g" msgid "Read-only mode" msgstr "Tryb tylko do odczytu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Prawdziwy" @@ -4523,6 +4697,7 @@ msgstr "OdÅ›wież listÄ™" msgid "Refresh game list" msgstr "OdÅ›wież listÄ™ gier" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4541,6 +4716,12 @@ msgstr "OdÅ›wież listÄ™ gier" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "UsuÅ„" @@ -4593,11 +4774,11 @@ msgstr "GaÅ‚ka prawa" msgid "Rumble" msgstr "Wibracje" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: 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:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Rosyjski" @@ -4605,10 +4786,11 @@ msgstr "Rosyjski" msgid "Sa&ve State" msgstr "Zapisz &stan" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Bezpieczny" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4618,6 +4800,9 @@ msgstr "Bezpieczny" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Wskaźnik próbkowania:" @@ -4675,12 +4860,12 @@ msgstr "Zapisz stan Slot 9" msgid "Save State..." msgstr "Zapisz stan..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Zapisz jako..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Zapisz spakowany GCM/ISO" @@ -4688,11 +4873,11 @@ msgstr "Zapisz spakowany GCM/ISO" msgid "Save current perspective" msgstr "Zapisz bierzÄ…cÄ… perspektywÄ™" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Zapisz wypakowany GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..." @@ -4701,6 +4886,7 @@ msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..." msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4710,15 +4896,18 @@ msgstr "Scaled EFB Copy" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "SknaujÄ™ %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "PrzeszukujÄ™ obrazy ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "PrzeszukujÄ™" @@ -4734,12 +4923,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Filtr wyszukiwania" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Przeszukuj podfoldery" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: 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 "Nie odnaleziono sekcji %s w SYSCONF" @@ -4749,6 +4938,7 @@ msgstr "Nie odnaleziono sekcji %s w SYSCONF" msgid "Select" msgstr "Select" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4773,6 +4963,14 @@ msgstr "Wybierz plik nagrania" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Wybierz plik nagrania" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Wybierz plik Wii WAD do zainstalowania" @@ -4798,16 +4996,21 @@ msgstr "Select floating windows" msgid "Select the file to load" msgstr "Wybierz plik do wczytania" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Wybierz plik do zapisu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Wybierz stan do wczytania" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4827,6 +5030,9 @@ msgstr "Wybierz stan do wczytania" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Wybierz stan do zapisu" @@ -4848,7 +5054,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, wybierz Auto." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Wybrana czcionka" @@ -4895,10 +5101,11 @@ msgstr "Pozycja Sensor Bar'a" msgid "Separator" msgstr "Separator" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbski" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 @@ -4908,6 +5115,9 @@ msgstr "Serbski" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +>>>>>>> Update the pot file to reflect recent changes in the code. 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" @@ -4916,11 +5126,11 @@ msgstr "Serial Port 1 - Port używany przez urzÄ…dzenia takie jak net adapter" msgid "Set" msgstr "Ustaw" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Ustaw jako domyÅ›lne ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Ustaw jako domyÅ›lnÄ… kartÄ™ pamiÄ™ci %c" @@ -4930,7 +5140,7 @@ 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:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Ustawienia..." @@ -4942,7 +5152,7 @@ msgstr "SetupWiiMem: Nie można odnaleźć pliku konfiguracyjnego" msgid "Shake" msgstr "WstrzÄ…s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Krótka nazwa:" @@ -4970,7 +5180,7 @@ msgstr "Pokaż pasek &narzÄ™dzi" msgid "Show Drives" msgstr "Pokaż napÄ™dy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Pokaż EFB Copy Regions" @@ -4986,7 +5196,7 @@ msgstr "Pokaż FrancjÄ™" msgid "Show GameCube" msgstr "Pokaż GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Pokaż Input Display" @@ -5002,7 +5212,7 @@ msgstr "Pokaż JaponiÄ™" msgid "Show Korea" msgstr "Pokaż KoreÄ™" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Pokaż jÄ™zyk:" @@ -5022,7 +5232,7 @@ msgstr "Pokaż platformy" msgid "Show Regions" msgstr "Pokaż regiony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Pokaż statystyki" @@ -5042,11 +5252,11 @@ msgstr "Pokaż WAD" 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 " @@ -5056,23 +5266,23 @@ 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:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Pokaż pierwszy blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Pokaż bloki zapisu" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Pokaż komentarz zapisu" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Pokaż ikonÄ™ zapisu" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Pokaż tytuÅ‚ zapisu" @@ -5109,7 +5319,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Willot bokiem" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "ChiÅ„ski uproszczony" @@ -5117,11 +5327,11 @@ msgstr "ChiÅ„ski uproszczony" msgid "Size" msgstr "Rozmiar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "PomiÅ„ BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "PomiÅ„ Dest. Alpha Pass" @@ -5163,11 +5373,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5191,7 +5401,7 @@ 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:621 msgid "Sound Settings" msgstr "Ustawienia dźwiÄ™ku" @@ -5209,6 +5419,7 @@ msgstr "Utworzenie bufora dźwiÄ™ku nie powiodÅ‚o siÄ™: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5224,6 +5435,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "HiszpaÅ„ski" @@ -5255,7 +5471,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Wybierz video backend" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Przyspiesz Disc Transfer Rate" @@ -5263,7 +5479,7 @@ msgstr "Przyspiesz Disc Transfer Rate" msgid "Square Stick" msgstr "Square Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Standard Controller" @@ -5361,12 +5577,12 @@ msgstr "Importowanie zapisów zakoÅ„czone powodzeniem" msgid "Swing" msgstr "Zamach" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "JÄ™zyk systemu:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "Taiwan" @@ -5405,7 +5621,7 @@ msgstr "Talerz prawo" msgid "Take Screenshot" msgstr "Zrób zdjÄ™cie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5421,7 +5637,7 @@ msgstr "Tekstura" msgid "Texture Cache" msgstr "Cache tekstur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Format pokrycia tekstur" @@ -5437,13 +5653,13 @@ msgstr "NieprawidÅ‚owy adres" msgid "The checksum was successfully fixed" msgstr "Suma kontrolna poprawnie naprawiona" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "Wybrany folder jest już na liÅ›cie" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5466,7 +5682,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:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Plik, który wybraÅ‚eÅ› (%s) nie istnieje" @@ -5484,11 +5700,12 @@ 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:98 +#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" "Im bezpieczniejsze dasz ustawienia, tym mniej prawdopodobne, że emulator " "pominie aktualizacje tekstur z RAMu.\n" @@ -5531,7 +5748,7 @@ msgstr "Wskazany plik \"%s\" nie istnieje." msgid "The value is invalid" msgstr "NiewÅ‚aÅ›ciwa wartość" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Styl" @@ -5539,7 +5756,7 @@ msgstr "Styl" msgid "Theme selection went wrong" msgstr "Wybór stylu nieudany" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5547,7 +5764,7 @@ msgstr "" "Tutaj musi być ticket dla 00000001/00000002. Twój zrzut NAND jes " "prawdopodobnie niekompletny." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5563,7 +5780,7 @@ msgstr "" "Ten symulator action replay nie wspiera kodów, które modyfikujÄ… Action " "Replay'a." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: 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." @@ -5586,27 +5803,10 @@ msgstr "" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -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." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Jest to używane do odtwarzania muzyki, BGM." -#: 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" @@ -5617,7 +5817,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:283 +#: 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." @@ -5640,7 +5840,7 @@ msgstr "TytuÅ‚" msgid "To" msgstr "Do" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "PrzeÅ‚Ä…cz wszystkie typy logów" @@ -5660,6 +5860,7 @@ msgstr "PrzeÅ‚Ä…cz na peÅ‚ny ekran" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5667,14 +5868,17 @@ msgstr "PrzeÅ‚Ä…cz na peÅ‚ny ekran" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Góra" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "ChiÅ„ski tradycyjny" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Próbowano odczytać nieznany typ pliku." @@ -5682,7 +5886,7 @@ msgstr "Próbowano odczytać nieznany typ pliku." msgid "Triggers" msgstr "Spusty" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Próba odczytu z niewÅ‚aÅ›ciwego SYSCONF" @@ -5694,7 +5898,7 @@ msgstr "" "Próba odczytu z niewÅ‚aÅ›ciwego SYSCONF\n" "bt id Wiilota niedostÄ™pne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turecki" @@ -5715,11 +5919,11 @@ msgstr "Port UDP:" msgid "UDP Wiimote" msgstr "UDP Wiilot" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "Nieznany" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -5804,7 +6008,7 @@ msgstr "Aktualizuj" msgid "Upright Wiimote" msgstr "Willot pionowo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Użyj trybu EuRGB60 (PAL60)" @@ -5816,7 +6020,7 @@ msgstr "Użyj trybu peÅ‚noekranowego" msgid "Use Hex" msgstr "Użyj HEX" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Użyj Panic Handlers" @@ -5847,7 +6051,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "NarzÄ™dzie" @@ -5871,25 +6075,29 @@ msgstr "Wartość:" msgid "Verbosity" msgstr "Verbosity" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Wideo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Wirtualny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Poziom" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "Instalacja WAD nie powiodÅ‚a siÄ™: bÅ‚Ä…d tworzenia %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "Instalacja WAD nie powiodÅ‚a siÄ™: bÅ‚Ä…d tworzenia %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5908,15 +6116,15 @@ msgstr "" msgid "Warning" msgstr "Ostrzeżenie" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 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:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Ostrzeżenie - uruchomienie ELF w zÅ‚ym trybie konsoli!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Ostrzeżenie - uruchomienie ISO w zÅ‚ym trybie konsoli!" @@ -5944,7 +6152,7 @@ msgstr "" "i majÄ… takÄ… samÄ… nazwÄ™ jak plik na Twojej karcie pamiÄ™ci\n" "Kontynuować?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5952,7 +6160,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5960,7 +6168,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5988,7 +6196,7 @@ msgstr "WaveFileWriter - plik nie jest otwarty." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Widescreen Hack" @@ -5996,15 +6204,15 @@ msgstr "Widescreen Hack" msgid "Width" msgstr "Szerokość" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Konsola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "ŹródÅ‚o Wii NAND:" @@ -6012,6 +6220,7 @@ msgstr "ŹródÅ‚o Wii NAND:" msgid "Wii Save Import" msgstr "Import zapisów Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -6021,6 +6230,9 @@ msgstr "Import zapisów Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Pliki zapisu Wii (*.bin)|*.bin" @@ -6087,10 +6299,11 @@ msgstr "Windows Menu" msgid "Windows Right" msgstr "Windows Right" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Zawijanie wierszy" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6106,6 +6319,11 @@ msgstr "Zawijanie wierszy" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "PracujÄ™..." @@ -6113,6 +6331,11 @@ msgstr "PracujÄ™..." msgid "Write to Console" msgstr "Wpisz do konsoli" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Wpisz do pliku" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Wpisz do pliku" @@ -6169,7 +6392,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "Musisz wprowadzić poprawnÄ… nazwÄ™ profilu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Musisz ponownie uruchomić program w celu zaaplikowania zmian." @@ -6192,7 +6415,7 @@ msgstr "" "Powinno być 0x%04x (jest 0x%04llx)\n" "Czy chcesz wygenerować nowy?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP hack" @@ -6263,7 +6486,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6294,12 +6517,12 @@ msgstr "to nie jest zapis Wii lub bÅ‚Ä…d odczytu rozmiaru nagłówka pliku %x" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "nieznane polecenie 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute zwróciÅ‚ -1 przy uruchamianiu programu!" @@ -6508,6 +6731,9 @@ 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" @@ -6830,6 +7056,22 @@ 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 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." diff --git a/Languages/po/pt.po b/Languages/po/pt.po index 89c344c8b5..1cee620d50 100644 --- a/Languages/po/pt.po +++ b/Languages/po/pt.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-07-23 15:53-0000\n" "Last-Translator: Zilaan \n" "Language-Team: Zilaan \n" @@ -59,9 +63,9 @@ msgstr "\"%s\" Ficheiro GCM/ISO inválido, ou não é um ISO de GC/Wii." msgid "%1$sCopy%1$s" msgstr "%1$sCopiar%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -154,7 +158,7 @@ msgstr "%sExportar GCI%s" msgid "%sImport GCI%s" msgstr "%sImportar GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Blocos livres; %u Entradas de directórios livres" @@ -187,11 +191,11 @@ msgstr "&Gestor de Cheats" msgid "&DSP Settings" msgstr "&Definições de DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Eliminar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Eliminar ISOs seleccionados..." @@ -255,7 +259,7 @@ msgstr "&Pausa" msgid "&Play" msgstr "&Começar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Propriedades" @@ -299,7 +303,7 @@ msgstr "&Ver" msgid "&Wiimote Settings" msgstr "&Definições Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -343,7 +347,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -352,7 +356,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -409,13 +413,13 @@ msgstr "" "\n" "Tem que fazer forward TCP para ser host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Códigos AR" @@ -427,11 +431,11 @@ msgstr "Sobre o Dolphin" msgid "Acceleration" msgstr "Aceleração" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "Precisão:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulação VBeam precisa" @@ -552,11 +556,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Adicionar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Adicionar Código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Adicionar Patch" @@ -564,6 +568,7 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painel" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -579,6 +584,11 @@ msgstr "Adicionar novo painel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Adicionar..." @@ -627,11 +637,11 @@ 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:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Avançadas" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Definições avançadas" @@ -639,14 +649,15 @@ msgstr "Definições avançadas" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Todos os ficheiros GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Todas as imagens GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Todos os ficheiros Gamecube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -659,18 +670,22 @@ msgstr "Todos os ficheiros Gamecube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos os Estados Guardados (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Todos os ficheiros Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos os ficheiros GC/Wii ISO comprimidos (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Todos os ficheiros (*.*)|*.*" @@ -686,7 +701,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Wiimote Emulado" @@ -707,7 +722,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:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -725,7 +740,7 @@ msgstr "" "\n" "Em caso de dúvida, seleccione (off)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Ãrabe" @@ -734,7 +749,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -742,12 +757,13 @@ msgstr "" "Tem a certeza que quer apagar estes ficheiros?\n" "Serão eliminados permanentemente!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -757,6 +773,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção de ecrã:" @@ -765,18 +784,20 @@ 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:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Ãudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Ãudio Backend :" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -786,6 +807,9 @@ msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -829,7 +853,7 @@ msgstr "" msgid "Back" msgstr "Trás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Definições Backend" @@ -856,11 +880,11 @@ msgstr "Cabeçalho de ficheiro inválido" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Detalhes de Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Banner:" @@ -872,7 +896,7 @@ msgstr "Barra" msgid "Basic" msgstr "Básico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Definições Básicas" @@ -903,6 +927,7 @@ msgstr "Azul Direita" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -910,6 +935,9 @@ msgstr "Azul Direita" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Inferior" @@ -918,7 +946,7 @@ msgstr "Inferior" msgid "Bound Controls: %lu" msgstr "Controlos agregados: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Inactivo" @@ -934,7 +962,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:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Procurar por pasta de destino" @@ -964,11 +992,11 @@ msgstr "C Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Motor de emulador de CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Cache de listas de Visualização" @@ -1021,7 +1049,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:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1031,7 +1059,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:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1050,8 +1078,6 @@ msgstr "" 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/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1061,7 +1087,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:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Catalão" @@ -1086,7 +1112,7 @@ msgstr "Mudar Disco" msgid "Change Game" msgstr "Mudar de Jogo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1102,8 +1128,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:506 #: 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!" @@ -1124,31 +1150,31 @@ msgstr "Procura de Cheats" msgid "Cheats Manager" msgstr "Gestor de Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinês (Simplificado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinês (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: 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:762 +#: 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:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Escolha um ISO padrão:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Escolha uma pasta para adicionar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Escolha um ficheiro para abrir" @@ -1156,7 +1182,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:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1164,8 +1190,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:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: 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" @@ -1177,14 +1203,14 @@ msgstr "Stick circular" msgid "Classic" msgstr "Clássico" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Limpar" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Limpeza falhou" @@ -1200,6 +1226,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1208,6 +1235,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Fechar" @@ -1231,20 +1262,20 @@ msgstr "Comando" msgid "Comment" msgstr "Comentário" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Comentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Comprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Comprimir ISOs seleccionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "A comprimir ISO" @@ -1271,13 +1302,13 @@ msgstr "Configuração de Comandos" msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Confirmar Substituição de Ficheiro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Confirmar Ao Parar" @@ -1286,7 +1317,7 @@ msgstr "Confirmar Ao Parar" msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Conectar Teclado USB" @@ -1343,12 +1374,12 @@ msgstr "Converter para GCI" msgid "Copy failed" msgstr "Cópia Falhou" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Copiar para o Cartão de memória %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Core" @@ -1378,7 +1409,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Não foi possível reconhecer ficheiro ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Não foi possível guardar %s" @@ -1392,7 +1423,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:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1405,7 +1436,7 @@ 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:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Não foi possível encontrar comando aberto para a extensão 'ini'!" @@ -1422,7 +1453,7 @@ msgstr "" msgid "Count:" msgstr "Contador:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "País" @@ -1436,25 +1467,25 @@ 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:500 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:497 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:498 msgid "Created by VistaIcons.com" msgstr "Criado por VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 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:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Criador:" @@ -1462,7 +1493,7 @@ msgstr "Criador:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Recortar" @@ -1485,7 +1516,7 @@ msgstr "Desvanecimento cruzado" 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:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Hack de projecção personalizada" @@ -1493,11 +1524,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:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Personalizar alguns parâmetros de Projecção Ortogonal." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Checo" @@ -1509,10 +1540,11 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Motor de Emulador DSP" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1523,18 +1555,22 @@ msgstr "Motor de Emulador DSP" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulação de DSP HLE (rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "Interpretador DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE em thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "Recompilador de DSP LLE" @@ -1542,15 +1578,23 @@ msgstr "Recompilador de DSP LLE" msgid "DSP settings" msgstr "Definições de DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Raiz de DVD:" +#: 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:176 msgid "Data Size" msgstr "Dimensão de Dados" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Data:" @@ -1571,7 +1615,7 @@ msgstr "Zona morta" msgid "Debug" msgstr "Depuração" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Depuração" @@ -1579,16 +1623,16 @@ msgstr "Depuração" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Descomprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISOs seleccionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "A descomprimir ISO" @@ -1596,11 +1640,11 @@ msgstr "A descomprimir ISO" msgid "Default" msgstr "Padrão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ISO Padrão:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Tipo de letra Padrão" @@ -1609,7 +1653,7 @@ msgstr "Tipo de letra Padrão" msgid "Delete" msgstr "Apagar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Apagar Jogo Guardado" @@ -1618,7 +1662,7 @@ msgstr "Apagar Jogo Guardado" msgid "Delete the existing file '%s'?" msgstr "Apagar o ficheiro existente '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Descrição" @@ -1626,8 +1670,8 @@ msgstr "Descrição" msgid "Detect" msgstr "Detectar" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: 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." @@ -1640,8 +1684,8 @@ msgstr "" msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Definições de Dispositivo" @@ -1666,23 +1710,23 @@ msgstr "" " e verificação da cópia de segurança de pasta falhou" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Desactivar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Desactivar Nevoeiro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Desactivar Luminosidade" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Desactivar Profundidade por Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Desactivar Texturas" @@ -1726,7 +1770,7 @@ msgstr "" "\n" "Em caso de duvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disco" @@ -1753,6 +1797,7 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1762,10 +1807,13 @@ msgstr "Dividir" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Deseja parar a emulação actual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1790,6 +1838,7 @@ msgstr "Configuração da emulação de Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1814,6 +1863,14 @@ msgstr "Configuração de GCPad " #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Configuração de GCPad " + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS filmes (*.dtm)" @@ -1846,11 +1903,11 @@ msgstr "" msgid "Down" msgstr "Baixo" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Download de Códigos (Base de dados WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Descarregados %lu códigos. (adicionados %lu)" @@ -1859,23 +1916,23 @@ msgstr "Descarregados %lu códigos. (adicionados %lu)" msgid "Drums" msgstr "Tambores" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Depositar Ãudio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Depositar Alvo EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Depositar Quadros" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Depositar Texturas" @@ -1910,6 +1967,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1925,6 +1983,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holandês" @@ -1949,7 +2012,7 @@ msgstr "" "reiniciar o computador para que o Windows possa reconhecer o novo " "controlador." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPA" @@ -1965,7 +2028,7 @@ msgstr "Editar" msgid "Edit ActionReplay Code" msgstr "Editar Código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Editar Configuração" @@ -1977,8 +2040,8 @@ msgstr "Editar Patch" msgid "Edit current perspective" msgstr "Editar perspectiva actual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Editar..." @@ -2028,7 +2091,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wiimote Emulado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Estado da Emulação:" @@ -2056,23 +2119,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "Activar Execução de relatórios AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Activar Regulador Ãudio" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Activar BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Activar Fusão de blocos" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2085,6 +2148,7 @@ msgstr "" msgid "Enable Cache" msgstr "Activar Cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2094,51 +2158,54 @@ msgstr "Activar Cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Activar Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Activar Música DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Activar Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: 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:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Activar Teclas de Atalho" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Activar Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Activar Idle Skipping (aumento de desempenho)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Activar MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Activar Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Activar Protector de Ecrã" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Activar Ecrã Panorâmico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Activar Wireframe" @@ -2156,7 +2223,7 @@ msgstr "" "\n" "Em caso de dúvida, seleccione 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2164,7 +2231,7 @@ msgstr "" "Activar acesso rápido ao disco. Necessário para alguns jogos. (ON = Rápido, " "OFF = Compatível)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Activar Páginas" @@ -2193,7 +2260,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2201,7 +2268,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:311 +#: 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 = " @@ -2211,7 +2278,7 @@ 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:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Hack de projecção customizada" @@ -2227,7 +2294,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2249,6 +2316,7 @@ msgstr "" msgid "End" msgstr "Fim" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2264,6 +2332,11 @@ msgstr "Fim" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Inglês" @@ -2294,6 +2367,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erro" @@ -2324,20 +2398,26 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Erro" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Erro ao carregar o idioma seleccionado. Será revertido para o idioma padrão " "do sistema." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2372,7 +2452,7 @@ msgstr "Sair do Dolphin com emulador" msgid "Export Failed" msgstr "A Exportação Falhou" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Exportar Ficheiro" @@ -2385,15 +2465,15 @@ msgstr "Exportar Gravação" msgid "Export Recording..." msgstr "Exportar Gravação..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Exportar Jogo Guardado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Exportar jogo guardado Wii (Experimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Exportar todos os jogos guardados" @@ -2409,7 +2489,7 @@ msgstr "Exportar guardar como..." msgid "Extension" msgstr "Extensão" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Frame Buffer externo" @@ -2421,44 +2501,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Extrair Todos os Ficheiros..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Extrair Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Extrair DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Extrair Pasta..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Extrair Ficheiro..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Extrair Partição..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "A Extrair %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "A Extrair Todos os Ficheiros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "A Extrair Pasta" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "A Extrair..." @@ -2470,11 +2550,11 @@ msgstr "FIFO Byte" msgid "FIFO Player" msgstr "Reprodutor FIFO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANÇA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Tamanho FST:" @@ -2486,11 +2566,11 @@ msgstr "A Conexão Falhou!" msgid "Failed to Listen!!" msgstr "A Escuta Falhou!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Falha ao descarregar códigos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Falha ao extrair para %s!" @@ -2609,18 +2689,28 @@ 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/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Rápido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Mipmaps rápidos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Reprodutor Fifo" @@ -2629,7 +2719,7 @@ msgstr "Reprodutor Fifo" msgid "File Info" msgstr "Informação de Ficheiro" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "O ficheiro não continha códigos." @@ -2662,16 +2752,16 @@ msgstr "Ficheiros não são reconhecidos como sendo de cartão de memória" msgid "File not compressed" msgstr "Ficheiro não comprimido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Modo aberto desconhecido : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Sistema de ficheiros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Tipo de ficheiro 'ini' é desconhecido! Não será aberto!" @@ -2679,7 +2769,7 @@ msgstr "Tipo de ficheiro 'ini' é desconhecido! Não será aberto!" msgid "First Block" msgstr "Primeiro Bloco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Corrigir Checksums" @@ -2691,7 +2781,7 @@ msgstr "Forçar 16:9" msgid "Force 4:3" msgstr "Forçar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Definir a consola como NTSC-J" @@ -2724,7 +2814,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 " @@ -2760,7 +2850,7 @@ msgstr "Quadro" msgid "Frame Advance" msgstr "Avançar Quadro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Depósitos de Quadros usam FFV1" @@ -2772,7 +2862,7 @@ msgstr "Alcance de Quadros" msgid "Frame S&kipping" msgstr "S&altar Quadros" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Limite de Quadros:" @@ -2780,10 +2870,11 @@ msgstr "Limite de Quadros:" msgid "Frames To Record" msgstr "Quadros para Gravar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Vista Livre" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2799,6 +2890,11 @@ msgstr "Vista Livre" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francês" @@ -2832,7 +2928,7 @@ msgstr "Configuração de Relatório" msgid "GCPad" msgstr "ComandoGC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID do Jogo:" @@ -2848,15 +2944,15 @@ msgstr "O jogo não está a correr!" msgid "Game not found!!" msgstr "Jogo não encontrado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Definições específicas por jogo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Configuração de Jogo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2867,6 +2963,7 @@ msgstr "Definições de Comando &Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2874,6 +2971,9 @@ msgstr "Definições de Comando &Gamecube" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Cartões de memória Gamecube (*.raw,*.gcp)" @@ -2882,15 +2982,17 @@ msgid "Gamecube Pad settings" msgstr "Definições de Comando Gamecube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Códigos Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, 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.)" +"(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 "" "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.)" @@ -2899,6 +3001,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2907,6 +3010,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -2915,6 +3021,7 @@ msgstr "Geral" msgid "General Settings" msgstr "Definições Gerais" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2930,6 +3037,11 @@ msgstr "Definições Gerais" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Alemão" @@ -2967,7 +3079,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção activada." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Grego" @@ -2999,7 +3111,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Verificação de Cabeçalho falhou" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebraico" @@ -3068,12 +3180,16 @@ msgstr "Configuração de Teclas de atalho" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Teclas de Atalho" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Húngaro" @@ -3081,14 +3197,14 @@ msgstr "Húngaro" msgid "Hybrid Wiimote" msgstr "Wiimote Hibrido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3101,11 +3217,11 @@ msgstr "" "TitleID %016llx.\n" " O Dolphin irá provavelmente bloquear agora" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destino inválido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Definições IPL" @@ -3121,15 +3237,15 @@ msgstr "Ponteiro Infra Vermelho" msgid "IR Sensitivity:" msgstr "Sensibilidade de Infra Vermelhos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Detalhes ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Pastas ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "Itália" @@ -3137,23 +3253,25 @@ msgstr "Itália" msgid "Icon" msgstr "Ãcone" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: 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:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy msgid "" -"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." +"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 "" "Se definir o limite de Quadros, superior à velocidade completa do jogo " "(NTSC:60, PAL:50), também terá que desactivar o Regulador Ãudio em DSP para " @@ -3191,7 +3309,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Importar Jogo Guardado" @@ -3242,7 +3360,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Em Jogo" @@ -3251,7 +3369,7 @@ msgid "In-Game" msgstr "Em-Jogo" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Informação" @@ -3271,7 +3389,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:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Inserir Cartão SD" @@ -3283,7 +3401,7 @@ msgstr "Introduza o nome aqui..." msgid "Install WAD" msgstr "Instalar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Instalar para o Menu Wii" @@ -3293,6 +3411,7 @@ msgid "" msgstr "" "InstallExceptionHandler chamado, mas esta plataforma ainda não a suporta." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3302,14 +3421,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "A Instalar WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Iinterface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Definições de interface" @@ -3334,11 +3456,11 @@ msgstr "Erro interno de LZO - lzo_init() falhou" msgid "Internal Resolution:" msgstr "Resolução Interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpretador (Muito lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3355,7 +3477,7 @@ msgstr "Valor inválido!" msgid "Invalid bat.map or dir entry" msgstr "bat.map inválido ou entrada de pasta" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Tipo de evento inválido %i" @@ -3375,14 +3497,15 @@ msgstr "" "%s\n" " Poderá ter que refazer o depósito deste jogo." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Ficheiro de Gravação inválido" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Estado Inválido" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3398,27 +3521,32 @@ msgstr "Estado Inválido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiano" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPÃO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "Recompilador JIT (recomendado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "Recompilador experimental JITIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japonês" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "COREIA" @@ -3427,8 +3555,8 @@ msgstr "COREIA" msgid "Key" msgstr "Tecla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Coreano" @@ -3446,7 +3574,7 @@ msgstr "Botão L" msgid "L-Analog" msgstr "L-Analógico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Idioma:" @@ -3499,7 +3627,7 @@ msgstr "" msgid "Less Than" msgstr "Inferior que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Limitar por FPS" @@ -3507,7 +3635,7 @@ msgstr "Limitar por FPS" msgid "Load" msgstr "Carregar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Carregar Texturas Personalizadas" @@ -3555,6 +3683,7 @@ msgstr "Carregar Estado Slot 8" msgid "Load State..." msgstr "Carregar Estado..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3576,6 +3705,13 @@ msgstr "Carregar Sistema de Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Carregar Sistema de Menu Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Sistema de Menu Wii %d%c" @@ -3602,7 +3738,7 @@ msgstr "Carrega o ficheiro especifico (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Bloqueia as threads aos núcleos" @@ -3614,11 +3750,11 @@ msgstr "Relatório" msgid "Log Configuration" msgstr "Configuração de Relatório" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Tipos de Relatório" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Saídas de Gerador de Relatórios" @@ -3648,7 +3784,7 @@ msgstr "" "MD5 não combina\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Hack de velocidade" @@ -3670,11 +3806,11 @@ msgstr "ficheiros MadCatz Gameshark(*.gcs)" msgid "Main Stick" msgstr "Stick Principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID do autor:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Fabricante:" @@ -3698,6 +3834,7 @@ msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3705,6 +3842,9 @@ msgstr "Byte de Memória" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Cartão de memória" @@ -3741,7 +3881,7 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mic" @@ -3750,11 +3890,11 @@ msgstr "Mic" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Diversos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Configurações Diversas" @@ -3775,7 +3915,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Tipo de letra monoespaçada" @@ -3788,7 +3928,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3811,7 +3951,7 @@ msgstr "" msgid "Multiply" msgstr "Multiplicar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3903,6 +4043,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3912,6 +4053,9 @@ msgstr "NP Cima" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3920,7 +4064,7 @@ msgstr "Nome:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nome:" @@ -3934,7 +4078,7 @@ msgid "New Scan" msgstr "Nova procura" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Próxima Página" @@ -3946,7 +4090,7 @@ msgstr "Próxima Procura" msgid "Nickname :" msgstr "Alcunha :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Sem País (SDK)" @@ -3985,7 +4129,7 @@ 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:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Bokmaal Norueguês" @@ -3993,8 +4137,8 @@ msgstr "Bokmaal Norueguês" msgid "Not Equal" msgstr "Não igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Não definido" @@ -4014,7 +4158,7 @@ msgstr "Não conectado" msgid "Notes" msgstr "Notas" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notas:" @@ -4052,7 +4196,7 @@ msgstr "Objecto" 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" @@ -4078,11 +4222,11 @@ msgstr "Apenas %d blocos disponíveis" msgid "Open" msgstr "Abrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Abrir &Pasta" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Abrir Pasta de &Jogo guardado Wii " @@ -4104,11 +4248,11 @@ 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:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "Descodificador de Textura OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "Descodificador de Textura OpenMP" @@ -4140,7 +4284,7 @@ msgstr "" "e importe os jogos guardados para um novo cartão de memória\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Outro" @@ -4192,19 +4336,20 @@ msgstr "Parágrafo" msgid "Parameters" msgstr "Parâmetros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partição %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Caminhos" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4217,6 +4362,10 @@ msgstr "Caminhos" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4225,7 +4374,7 @@ msgstr "Pausa" msgid "Per-Pixel Lighting" msgstr "Iluminação por Pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfeito" @@ -4238,6 +4387,7 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4248,6 +4398,10 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Começar" @@ -4261,7 +4415,7 @@ msgstr "Tocar Gravação" msgid "Play/Pause" msgstr "Começar/Pausar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Jogável" @@ -4273,6 +4427,7 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4282,6 +4437,9 @@ msgstr "Jogadores" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Por favor confirme..." @@ -4293,23 +4451,23 @@ msgstr "Por favor crie uma perspectiva antes de guardar" msgid "Plus-Minus" msgstr "Mais-Menos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polaco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4318,11 +4476,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Português" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Português (Brasileiro)" @@ -4330,17 +4488,17 @@ msgstr "Português (Brasileiro)" msgid "Post-Processing Effect:" msgstr "Efeito de Pós-Processamento" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4353,7 +4511,7 @@ msgstr "Predefinições:" msgid "Prev Page" msgstr "Pág Anterior" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Página Anterior" @@ -4404,7 +4562,7 @@ msgstr "R-Analógico" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSSIA" @@ -4417,7 +4575,7 @@ msgstr "Alcance" msgid "Read-only mode" msgstr "Modo só de leitura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Real" @@ -4494,6 +4652,7 @@ msgstr "Actualizar Lista" msgid "Refresh game list" msgstr "Actualizar lista de Jogos" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4512,6 +4671,12 @@ msgstr "Actualizar lista de Jogos" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Remover" @@ -4564,11 +4729,11 @@ msgstr "Stick Direito" msgid "Rumble" msgstr "Vibração" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: 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:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russo" @@ -4576,10 +4741,11 @@ msgstr "Russo" msgid "Sa&ve State" msgstr "Gua&rdar Estado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4589,6 +4755,9 @@ msgstr "Seguro" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Taxa de Amostragem:" @@ -4646,12 +4815,12 @@ msgstr "Guardar Estado Slot 8" msgid "Save State..." msgstr "Guardar Estado..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Guardar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Guardar GCM/ISO comprimido" @@ -4659,11 +4828,11 @@ msgstr "Guardar GCM/ISO comprimido" msgid "Save current perspective" msgstr "Guardar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Jogo guardado descomprimido GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, 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..." @@ -4672,6 +4841,7 @@ msgstr "O filme de Savestate %s está corrupto, gravação de filme a parar..." msgid "Scaled EFB Copy" msgstr "Cópia EFB Escalada" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4681,15 +4851,18 @@ msgstr "Cópia EFB Escalada" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "A procurar %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "A procurar ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Em Analise..." @@ -4705,12 +4878,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Filtro de Pesquisa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Procurar em Sub-Pastas" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: 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 "Selecção %s não encontrada em SYSCONF" @@ -4720,6 +4893,7 @@ msgstr "Selecção %s não encontrada em SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4744,6 +4918,14 @@ msgstr "Seleccione o Ficheiro de Gravação" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Seleccione o Ficheiro de Gravação" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleccione um ficheiro Wii WAD para instalar" @@ -4769,6 +4951,7 @@ msgstr "Seleccionar janelas flutuantes" msgid "Select the file to load" msgstr "Seleccione o ficheiro para carregar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4785,19 +4968,26 @@ msgstr "Seleccione o estado para carregar" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Seleccione o ficheiro de jogo guardado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Seleccione o estado para carregar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Seleccione o estado para gravar" @@ -4819,7 +5009,7 @@ msgstr "" "da sua proporção.\n" "Em caso de dúvida, seleccione Automático." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Tipo de letra seleccionado" @@ -4867,11 +5057,11 @@ msgstr "Posição da Barra de Sensor:" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Sérvio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4882,11 +5072,11 @@ msgstr "" msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Definir como ISO &padrão" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Definir como cartão de memória padrão %c" @@ -4896,7 +5086,7 @@ 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:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Definições..." @@ -4908,7 +5098,7 @@ msgstr "SetupWiiMem: Não consegue encontrar o ficheiro de definições" msgid "Shake" msgstr "Abanar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Abreviatura:" @@ -4936,7 +5126,7 @@ msgstr "Mostrar Barra de Ferramen&tas" msgid "Show Drives" msgstr "Mostrar Unidades" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Mostrar Regiões de Cópia EFB" @@ -4952,7 +5142,7 @@ msgstr "Mostrar França" msgid "Show GameCube" msgstr "Mostrar GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Mostrar visualização de Entradas" @@ -4968,7 +5158,7 @@ msgstr "Mostrar Japão" msgid "Show Korea" msgstr "Mostrar Coreia" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Mostrar Idioma:" @@ -4988,7 +5178,7 @@ msgstr "Mostrar Plataformas" msgid "Show Regions" msgstr "Mostrar Regiões" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Mostrar Estatísticas" @@ -5008,11 +5198,11 @@ msgstr "Mostrar Wad" 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 " @@ -5022,23 +5212,23 @@ 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:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Mostrar primeiro bloco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Mostrar blocos de guardar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Mostrar guardar comentário" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Mostrar ícone de guardar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Mostrar o título de jogo guardado" @@ -5076,7 +5266,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote na horizontal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Chinês Simplificado" @@ -5084,11 +5274,11 @@ msgstr "Chinês Simplificado" msgid "Size" msgstr "Dimensão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Saltar Bios" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Saltar Dest. Alpha Pass" @@ -5131,11 +5321,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5160,7 +5350,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:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Definições de Som" @@ -5178,6 +5368,7 @@ msgstr "Criação do buffer de som falhou: %s" msgid "Space" msgstr "Espaço" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5193,6 +5384,11 @@ msgstr "Espaço" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Espanhol" @@ -5224,7 +5420,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Especifique um plugin de vídeo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Aumente a taxa de transferência do disco" @@ -5232,7 +5428,7 @@ msgstr "Aumente a taxa de transferência do disco" msgid "Square Stick" msgstr "Stick quadrado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Comando padrão" @@ -5330,12 +5526,12 @@ msgstr "Sucesso na importação de ficheiros de jogo guardado" msgid "Swing" msgstr "Balanço" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Idioma do sistema:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWAN" @@ -5374,7 +5570,7 @@ msgstr "Table Direita" msgid "Take Screenshot" msgstr "Tirar Screenshot" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5390,7 +5586,7 @@ msgstr "Textura" msgid "Texture Cache" msgstr "Cache de Textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Formato da textura" @@ -5406,13 +5602,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:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "A pasta escolhida já está na lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5437,7 +5633,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:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "O ficheiro que especificou (%s) não existe" @@ -5455,11 +5651,12 @@ 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:98 +#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" "Quanto mais seguro o ajuste, menos o emulador irá falhar actualizações de " "texturas através da RAM.\n" @@ -5504,7 +5701,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:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema" @@ -5512,7 +5709,7 @@ msgstr "Tema" msgid "Theme selection went wrong" msgstr "Selecção de tema correu mal" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5520,7 +5717,7 @@ msgstr "" "Tem que existir um ticket para 00000001/00000002. O seu NAND depositado está " "provavelmente incompleto." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5536,7 +5733,7 @@ msgstr "" "Este simulador de Action Replay não suporta códigos que modifiquem o próprio " "Action Replay" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: 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." @@ -5561,26 +5758,10 @@ msgstr "" "Em caso de dúvida, mantenha esta opção desactivada." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -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 "" -"Isto é usado para controlar a velocidade do jogo através da regulação por " -"áudio.\n" -"Desactivar isto poderá causar velocidades excessivas nos jogos.\n" -"Mas por vezes activar isto poderá causar ruído constante.\n" -"\n" -"Tecla de Atalho : Pressione continuamente para desactivar " -"instantaneamente o Regulador Ãudio." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Isto é usado para tocar faixas de música, como BGM (Música de fundo)" -#: 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" @@ -5592,7 +5773,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:283 +#: 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" @@ -5615,7 +5796,7 @@ msgstr "Título" msgid "To" msgstr "Para" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Alternar Todos os Tipos de Relatório" @@ -5635,6 +5816,7 @@ msgstr "Alternar Ecrã Inteiro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5642,14 +5824,17 @@ msgstr "Alternar Ecrã Inteiro" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Topo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Chinês Tradicional" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Tentou carregar um tipo de ficheiro desconhecido." @@ -5657,7 +5842,7 @@ msgstr "Tentou carregar um tipo de ficheiro desconhecido." msgid "Triggers" msgstr "Gatilhos" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Tentativa de leitura inválida de SYSCONF" @@ -5669,7 +5854,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:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turco" @@ -5690,11 +5875,11 @@ msgstr "Porta UDP:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "DESCONHECIDO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "EUA" @@ -5779,7 +5964,7 @@ msgstr "Actualizar" msgid "Upright Wiimote" msgstr "Wiimote na vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar modo EuRGB60 (PAL60)" @@ -5791,7 +5976,7 @@ msgstr "Utilizar Ecrã Inteiro" msgid "Use Hex" msgstr "Usar Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Usar Manipuladores de Pânico" @@ -5823,7 +6008,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Utilidade" @@ -5847,25 +6032,29 @@ msgstr "Valor: " msgid "Verbosity" msgstr "Verbosidade" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Vídeo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volume" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "Instalação WAD falhou: erro ao criar %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "Instalação WAD falhou: erro ao criar %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5885,15 +6074,15 @@ msgstr "" msgid "Warning" msgstr "Aviso" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 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:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Aviso - A iniciar um ELF em modo errado de consola!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Aviso - A iniciar um ISO em modo errado de consola!" @@ -5922,7 +6111,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:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5930,7 +6119,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5938,7 +6127,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5966,7 +6155,7 @@ msgstr "WaveFileWriter - ficheiro não aberto." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Hack de Ecrã Panorâmico" @@ -5974,15 +6163,15 @@ msgstr "Hack de Ecrã Panorâmico" msgid "Width" msgstr "Largura" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Raiz de NAND Wii:" @@ -5990,6 +6179,7 @@ msgstr "Raiz de NAND Wii:" msgid "Wii Save Import" msgstr "Importação de Jogo Guardado Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5999,6 +6189,9 @@ msgstr "Importação de Jogo Guardado Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin" @@ -6067,10 +6260,11 @@ msgstr "Menu de Janelas" msgid "Windows Right" msgstr "Janelas Direita" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Moldar o texto" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6086,6 +6280,11 @@ msgstr "Moldar o texto" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "A trabalhar..." @@ -6093,6 +6292,11 @@ msgstr "A trabalhar..." msgid "Write to Console" msgstr "Escrever para Consola" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Escrever para Ficheiro" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Escrever para Ficheiro" @@ -6146,7 +6350,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:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 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" @@ -6169,7 +6373,7 @@ msgstr "" "Deveria ser 0x%04x (mas é 0x%04llx)\n" "Pretende gerar um novo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP hack" @@ -6241,7 +6445,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6273,12 +6477,12 @@ msgstr "" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "cmd desconhecido 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute devolveu -1 quando a aplicação executou!" @@ -6432,6 +6636,9 @@ msgstr "| OU" #~ msgid "Emulator Display Settings" #~ msgstr "Definições de Visualização do Emulador" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Activar Regulador Ãudio" + #~ msgid "Enable CPU Access" #~ msgstr "Activar acesso ao CPU" @@ -6702,6 +6909,21 @@ msgstr "| OU" <<<<<<< HEAD ======= >>>>>>> Update from master branch. +#~ 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 "" +#~ "Isto é usado para controlar a velocidade do jogo através da regulação por " +#~ "áudio.\n" +#~ "Desactivar isto poderá causar velocidades excessivas nos jogos.\n" +#~ "Mas por vezes activar isto poderá causar ruído constante.\n" +#~ "\n" +#~ "Tecla de Atalho : Pressione continuamente para desactivar " +#~ "instantaneamente o Regulador Ãudio." + #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index 6dc3dd9b7b..d12775657f 100644 --- a/Languages/po/pt_BR.po +++ b/Languages/po/pt_BR.po @@ -9,7 +9,11 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-18 13:38-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -60,9 +64,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:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -157,7 +161,7 @@ msgstr "%sExportar GCI%s" msgid "%sImport GCI%s" msgstr "%sImportar GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Blocos Livres; %u Entradas de Diretórios Livres" @@ -190,11 +194,11 @@ msgstr "Gerenciador de &Cheats" msgid "&DSP Settings" msgstr "Configurações do &DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Deletar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Deletar ISOs selecionadas..." @@ -258,7 +262,7 @@ msgstr "&Pausar" msgid "&Play" msgstr "&Jogar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Propriedades" @@ -302,7 +306,7 @@ msgstr "&Ver" msgid "&Wiimote Settings" msgstr "Configurações de &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -346,7 +350,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -355,7 +359,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -413,13 +417,13 @@ msgstr "" "\n" "Você deve redirecionar as portas TCP para ser o Host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Códigos AR" @@ -431,11 +435,11 @@ msgstr "Sobre o Dolphin" msgid "Acceleration" msgstr "Aceleração" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "Precisão:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulção precisa de VBeam" @@ -556,11 +560,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Adicionar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Adicionar Código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Adicionar Patch" @@ -568,6 +572,7 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painél" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -583,6 +588,11 @@ msgstr "Adicionar novo painél" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Adicionar..." @@ -630,11 +640,11 @@ 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:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Avançado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Configurações Avançadas" @@ -642,14 +652,15 @@ msgstr "Configurações Avançadas" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Todos os arquivos de GC/WII (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Todas as imagens CG/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Todos os arquivos Gamecube CGM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -662,18 +673,22 @@ msgstr "Todos os arquivos Gamecube CGM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos os Pontos de Jogo Salvos (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Todos os Arquivos ISO Wii" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos os arquivos ISO GC/Wii comprimidos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Todos os arquivos (*.*)|*.*" @@ -689,7 +704,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Emular Wiimote" @@ -710,7 +725,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:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -728,7 +743,7 @@ msgstr "" "\n" "Se estiver em dúvida, selecione (desligado)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Ãrabe" @@ -737,7 +752,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -745,12 +760,13 @@ msgstr "" "Você tem certeza que deseja apagar estes arquivos?\n" "Eles estarão perdidos para sempre!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -760,6 +776,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção:" @@ -768,18 +787,20 @@ 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:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Ãudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Backend de Audio" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -789,6 +810,9 @@ msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -832,7 +856,7 @@ msgstr "" msgid "Back" msgstr "Voltar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Configurações do Backend" @@ -859,11 +883,11 @@ msgstr "Header de Arquivo Ruim" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Detalhes de Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Banner:" @@ -875,7 +899,7 @@ msgstr "Alavanca" msgid "Basic" msgstr "Básico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Configurações Básicas" @@ -906,6 +930,7 @@ msgstr "Azul Direito" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -913,6 +938,9 @@ msgstr "Azul Direito" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Embaixo" @@ -921,7 +949,7 @@ msgstr "Embaixo" msgid "Bound Controls: %lu" msgstr "Controles Acoplados: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Quebrado" @@ -937,7 +965,7 @@ msgstr "Procurar por um diretório para adicionar" msgid "Browse for an ISO directory..." msgstr "Procurar por um diretório ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Procurar por um diretório de saída" @@ -967,11 +995,11 @@ msgstr "C Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Engine de Emulação do CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Cache das Listas de Display" @@ -1022,7 +1050,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:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1033,7 +1061,7 @@ msgstr "" "%s\n" "não é um arquivo de Memory Card válido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1053,8 +1081,6 @@ 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/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1064,7 +1090,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:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Catalão" @@ -1089,7 +1115,7 @@ msgstr "Mudar o Disco" msgid "Change Game" msgstr "Mudar Jogo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1105,8 +1131,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:506 #: 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!" @@ -1126,31 +1152,31 @@ msgstr "Procura de Cheat" msgid "Cheats Manager" msgstr "Gerenciador de Cheat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinês (Simplificado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinês (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: 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:762 +#: 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:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Escolher uma ISO padrão:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Escolher um diretório para adicionar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Escolher um arquivo para abrir" @@ -1158,6 +1184,7 @@ msgstr "Escolher um arquivo para abrir" msgid "Choose a memory card:" msgstr "Escolher um cartão de memória:" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 @@ -1167,6 +1194,9 @@ msgstr "Escolher um cartão de memória:" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1174,8 +1204,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:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: 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" @@ -1187,14 +1217,14 @@ msgstr "Analógico Circular" msgid "Classic" msgstr "Clássico" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Limpar" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Falha na liberação." @@ -1210,6 +1240,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1218,6 +1249,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Fechar" @@ -1241,20 +1276,20 @@ msgstr "Comandos" msgid "Comment" msgstr "Comentar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Comentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Comprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Comprimir ISOs selecionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Comprimindo ISO" @@ -1281,13 +1316,13 @@ msgstr "Configurar Controles" msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Confirmar sobrescrição de arquivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Confirmar ao Parar" @@ -1296,7 +1331,7 @@ msgstr "Confirmar ao Parar" msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Conectar Teclado USB" @@ -1353,12 +1388,12 @@ msgstr "Converter para GCI" msgid "Copy failed" msgstr "Falha na Cópia" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Copiar para Cartão de Memória %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Núcleo" @@ -1388,7 +1423,7 @@ 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:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Não foi possível salvar %s" @@ -1402,7 +1437,7 @@ msgstr "" "no momento!\n" "(Definir os controles durante o jogo ainda não é suportado)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1415,7 +1450,7 @@ 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:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Não foi possível encontrar comando de abertura para a extensão 'ini'!" @@ -1432,7 +1467,7 @@ msgstr "" msgid "Count:" msgstr "Contagem:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "País:" @@ -1446,10 +1481,11 @@ 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:500 msgid "Created by KDE-Look.org" msgstr "Criado por KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 @@ -1459,20 +1495,23 @@ msgstr "Criado por KDE-Look.org" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +>>>>>>> Update the pot file to reflect recent changes in the code. 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:498 msgid "Created by VistaIcons.com" msgstr "Criado por VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 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:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Criador:" @@ -1480,7 +1519,7 @@ msgstr "Criador:" msgid "Critical" msgstr "Crítico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Cortar" @@ -1503,7 +1542,7 @@ msgstr "Crossfade" 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:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Hack de Projeção Customizado" @@ -1511,11 +1550,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:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Cuztomize alguns parâmetros de Projeção Ortográfica." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Tcheco" @@ -1527,10 +1566,11 @@ msgstr "Direcional Digital" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Engine de Emulação do DSP" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1541,18 +1581,22 @@ msgstr "Engine de Emulação do DSP" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulação HLE do DSP (rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "Interpretador LLE do DSP (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE em Segmento" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "Recompilador LLE do DSP" @@ -1560,15 +1604,23 @@ msgstr "Recompilador LLE do DSP" msgid "DSP settings" msgstr "Configurações de Ãudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Raiz do DVD:" +#: 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:176 msgid "Data Size" msgstr "Tamanho de Arquivo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Data:" @@ -1589,7 +1641,7 @@ msgstr "Zona Morta" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Debugging" @@ -1597,16 +1649,16 @@ msgstr "Debugging" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Descomprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISOs selecionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Descomprimindo ISO" @@ -1614,11 +1666,11 @@ msgstr "Descomprimindo ISO" msgid "Default" msgstr "Padrão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ISO Padrão:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Fonte Padrão" @@ -1627,7 +1679,7 @@ msgstr "Fonte Padrão" msgid "Delete" msgstr "Excluir" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Deletar Save" @@ -1636,7 +1688,7 @@ msgstr "Deletar Save" msgid "Delete the existing file '%s'?" msgstr "Apagar o arquivo existente '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Descrição" @@ -1644,8 +1696,8 @@ msgstr "Descrição" msgid "Detect" msgstr "Detectar" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: 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." @@ -1658,8 +1710,8 @@ msgstr "" msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Configurações de Dispositivo" @@ -1684,23 +1736,23 @@ msgstr "" " e a checagem de Backup de Diretório falhou" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Desativar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Desativar Neblina" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Desativar Iluminação" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Desativar Profundidade por Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Desativar Texturas" @@ -1744,7 +1796,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disco" @@ -1771,6 +1823,7 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1780,10 +1833,13 @@ msgstr "Dividir" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Você quer parar a emulação atual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1808,6 +1864,7 @@ msgstr "Configuração de Wiimote Emulado do Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1832,6 +1889,14 @@ msgstr "Configuração do GCPad do Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Configuração do GCPad do Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmes TAS Dolphin (*.dtm)" @@ -1880,11 +1945,11 @@ msgstr "" msgid "Down" msgstr "Para Baixo" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Download de Códigos (Banco de Dados WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Códigos %lu baixados. (Adicionados %lu)" @@ -1893,23 +1958,23 @@ msgstr "Códigos %lu baixados. (Adicionados %lu)" msgid "Drums" msgstr "Bateria" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Extrair Ãudio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Extrair Código EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Extrair Quadros" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Extrair Texturas" @@ -1943,6 +2008,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1958,6 +2024,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holandês" @@ -1982,7 +2053,7 @@ msgstr "" "PC é provavelmente necessário no momento para que o Windows veja o novo " "driver." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPA" @@ -1998,7 +2069,7 @@ msgstr "Editar" msgid "Edit ActionReplay Code" msgstr "Editar Código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Editar Configuração" @@ -2010,8 +2081,8 @@ msgstr "Editar Patch" msgid "Edit current perspective" msgstr "Editar perspectiva atual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Editar..." @@ -2061,7 +2132,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emular Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Estado de Emulação" @@ -2089,23 +2160,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "Ativar Registro AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Ativar Throttle de Ãudio" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Ativar BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Ativar Block Merging" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2118,6 +2189,7 @@ msgstr "" msgid "Enable Cache" msgstr "Ativar Cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2127,51 +2199,54 @@ msgstr "Ativar Cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Ativar Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Ativar Música DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Ativar Núcleo Duplo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Ativar Núcleo Duplo (Aumento na velocidade)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Ativar Hotkeys" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Ativar Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Ativar Idle Skipping (Aumento na velocidade)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Ativar MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Ativar Varredura Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Ativar Salva-Tela" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Ativar WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Ativar Wireframe" @@ -2190,7 +2265,7 @@ msgstr "" "\n" "Se estiver em dúvida, selecione 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2198,7 +2273,7 @@ msgstr "" "Ativar acesso rápido de disco. Necessário para alguns jogos.(ON = Rapido, " "OFF = Compativel)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Ativar Paginas" @@ -2226,6 +2301,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 @@ -2235,6 +2311,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2242,7 +2321,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:311 +#: 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 = " @@ -2252,7 +2331,7 @@ msgstr "" "gerenciamento de memoria. Precisão para o hardware, mas devagar para ser " "emulado (ON = Compativel, OFF = Rapido)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Ativa Hack de Projeção Personalizado" @@ -2268,7 +2347,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2290,6 +2369,7 @@ msgstr "" msgid "End" msgstr "Fim" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2305,6 +2385,11 @@ msgstr "Fim" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Inglês" @@ -2335,6 +2420,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erro" @@ -2365,21 +2451,35 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Erro" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema." +<<<<<<< HEAD #: Source/Core/Common/Src/ChunkFile.h:180 <<<<<<< HEAD ======= +======= +#: Source/Core/Common/Src/ChunkFile.h:194 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 >>>>>>> Update from master branch. +======= +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" <<<<<<< HEAD @@ -2424,7 +2524,7 @@ msgstr "Sair do Dolphin com o emulador" msgid "Export Failed" msgstr "Falha na Exportação" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Exportar Arquivo" @@ -2437,15 +2537,15 @@ msgstr "Exportar Gravação" msgid "Export Recording..." msgstr "Exportar Gravação..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Exportar Save" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Exportar save do Wii (Experimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Exportar todos os saves" @@ -2461,7 +2561,7 @@ msgstr "Exportar Salvar como..." msgid "Extension" msgstr "Extensão" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Frame Buffer Externo" @@ -2473,44 +2573,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Extrair Todos os arquivos..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Extrair Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Extrair DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Extrair diretorio..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Extrair Arquivo..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Extrair Partição..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Extraindo %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Extraindo todos os arquivos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Extraindo diretorio" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Extraindo..." @@ -2522,11 +2622,11 @@ msgstr "Byte do FIFO" msgid "FIFO Player" msgstr "FIFO Player" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANÇA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Tamanho FST:" @@ -2538,11 +2638,11 @@ msgstr "Falha ao Conectar\"" msgid "Failed to Listen!!" msgstr "Não foi possível Ouvir!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Falha ao dazer o download de códigos." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Falha ao extrair %s!" @@ -2659,18 +2759,28 @@ 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/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Rápido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Mipmaps Rápidos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Fifo Player" @@ -2679,7 +2789,7 @@ msgstr "Fifo Player" msgid "File Info" msgstr "Informações do Arquivo" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "O arquivo não contém códigos." @@ -2712,16 +2822,16 @@ msgstr "Arquivo não reconhecido como Memory Card" msgid "File not compressed" msgstr "Arquivo não comprimido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Modo de abertura desconhecido : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Arquivo de sistema" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Tipo do arquivo 'ini' desconhecido! Não vai abrir!" @@ -2729,7 +2839,7 @@ msgstr "Tipo do arquivo 'ini' desconhecido! Não vai abrir!" msgid "First Block" msgstr "Primeiro Bloco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Corrigir Checksums" @@ -2741,7 +2851,7 @@ msgstr "Forçar 16:9" msgid "Force 4:3" msgstr "Forçar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Forçar Console para NTSC-J" @@ -2774,7 +2884,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 " @@ -2810,7 +2920,7 @@ msgstr "Quadro" msgid "Frame Advance" msgstr "Avançar Quadro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Extração de Quadros usam FFV1" @@ -2822,7 +2932,7 @@ msgstr "Alcanço do Quadro" msgid "Frame S&kipping" msgstr "Frame S&kipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Limitador de FPS:" @@ -2830,10 +2940,11 @@ msgstr "Limitador de FPS:" msgid "Frames To Record" msgstr "QUadros para Capturar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Olhar Livre" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2849,6 +2960,11 @@ msgstr "Olhar Livre" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francês" @@ -2882,7 +2998,7 @@ msgstr "Configuração do Log" msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID do jogo:" @@ -2898,15 +3014,15 @@ msgstr "O jogo não está rodando!" msgid "Game not found!!" msgstr "Jogo não encontrado!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Opções especificas do jogo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Opçõesdojogo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2917,6 +3033,7 @@ msgstr "Configurações de &Controle de Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2924,6 +3041,9 @@ msgstr "Configurações de &Controle de Gamecube" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Memory Cards do Gamecube (*.raw,*.gcp)" @@ -2932,15 +3052,17 @@ msgid "Gamecube Pad settings" msgstr "Configurações do controle de Gamecube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Códigos Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, 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.)" +"(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 "" "Falha ao rodar o GeckoCode (CT%i CST%i) (%s)\n" "(É um código ruim ou um tipo de código não suportado.)" @@ -2955,8 +3077,12 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -2965,6 +3091,7 @@ msgstr "Geral" msgid "General Settings" msgstr "Configurações Gerais" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2980,6 +3107,11 @@ msgstr "Configurações Gerais" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Alemão" @@ -3017,7 +3149,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto ativado." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Grego" @@ -3049,7 +3181,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "A checagem do header falhou" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebreu" @@ -3119,12 +3251,16 @@ msgstr "Configuração de hotkey" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Hotkeys" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Húngaro" @@ -3132,13 +3268,13 @@ msgstr "Húngaro" msgid "Hybrid Wiimote" msgstr "Wiimote Hibrido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3151,11 +3287,11 @@ msgstr "" "TitleID %016llx.\n" " O Dolphin vai provavelmente travar agora" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - Destino ruim" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Definições de IPL" @@ -3171,15 +3307,15 @@ msgstr "Ponteiro IR" msgid "IR Sensitivity:" msgstr "Sensibilidade IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Detalhes da ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Diretórios de ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITÃLIA" @@ -3187,19 +3323,20 @@ msgstr "ITÃLIA" msgid "Icon" msgstr "Icone" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: 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)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 @@ -3209,9 +3346,14 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" -"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." +"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 "" "Se você colocar o Limitador de FPS em um valor maior que a velocidade máxima " "do jogo (NTSC:60, PAL:50), você também vai precisar desativar o Throttle de " @@ -3249,7 +3391,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Importar Save" @@ -3300,7 +3442,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe esta opção desativada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Funciona" @@ -3309,7 +3451,7 @@ msgid "In-Game" msgstr "In-Game" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3329,7 +3471,7 @@ msgstr "Inserir" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inserir Código Encryptado ou Decriptado aqui..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Insira cartão SD" @@ -3341,7 +3483,7 @@ msgstr "Insira nome aqui.." msgid "Install WAD" msgstr "Instalar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Instalar para o menu do WII" @@ -3352,6 +3494,7 @@ msgstr "" "InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem " "suporte a ele." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3361,14 +3504,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instalando WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Interface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Opções de interface" @@ -3393,11 +3539,11 @@ msgstr "Erro Interno do LZO - lzo_init() falhou" msgid "Internal Resolution:" msgstr "Resolução Interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpretador (MUITO lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3414,7 +3560,7 @@ msgstr "Valor Inválido!" msgid "Invalid bat.map or dir entry" msgstr "Bat.map ou entrada de Diretório inválidas" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Tipo de evento %i inválido" @@ -3434,14 +3580,15 @@ msgstr "" "%s\n" "Você pode precisar refazer o dump deste jogo." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Arquivo de gravação inválido" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Estado Salvo Inválido" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3457,27 +3604,32 @@ msgstr "Estado Salvo Inválido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiano" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPÃO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT recompilador (recomendado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL recompilador experimental" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japonês" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "CORÉIA" @@ -3486,8 +3638,8 @@ msgstr "CORÉIA" msgid "Key" msgstr "Chave" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Coreano" @@ -3505,7 +3657,7 @@ msgstr "Botão L" msgid "L-Analog" msgstr "L-Analógico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Linguagem:" @@ -3558,7 +3710,7 @@ msgstr "" msgid "Less Than" msgstr "Menor que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Limitar por FPS" @@ -3566,7 +3718,7 @@ msgstr "Limitar por FPS" msgid "Load" msgstr "Carregar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Carregar Texturas Personalizadas" @@ -3614,6 +3766,7 @@ msgstr "Carregar Estado do Slot 8" msgid "Load State..." msgstr "Carregar State..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3635,6 +3788,13 @@ msgstr "Carregar Menu de Sistema do Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Carregar Menu de Sistema do Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Menu de Sistema do Wii %d %c" @@ -3662,7 +3822,7 @@ msgstr "Carrega o arquivo especificado (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Separar tarefas em núcleos" @@ -3674,11 +3834,11 @@ msgstr "Log" msgid "Log Configuration" msgstr "Configuração do Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Tipo de Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Resposta do Logger" @@ -3708,7 +3868,7 @@ msgstr "" "Incompatibilidade do MD5\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "Hack de velocidade MMU" @@ -3730,11 +3890,11 @@ msgstr "Arquivos de Gameshark MadCatz(*.gcs)" msgid "Main Stick" msgstr "Analógico Principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID da fabricante:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Fabricante:" @@ -3758,6 +3918,7 @@ msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3765,6 +3926,9 @@ msgstr "Byte de Memória" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Cartão de memoria" @@ -3801,7 +3965,7 @@ msgstr "O tamanho do arquivo do Memory Card é diferente do tamanho do header" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Microfone" @@ -3810,11 +3974,11 @@ msgstr "Microfone" msgid "Min" msgstr "Mínimo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Diversas" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Opções diversas" @@ -3836,7 +4000,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Fonte Monospaced" @@ -3849,7 +4013,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3871,7 +4035,7 @@ msgstr "" msgid "Multiply" msgstr "Multiplicar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3963,6 +4127,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3972,6 +4137,9 @@ msgstr "NP Cima" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3980,7 +4148,7 @@ msgstr "Nome:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nome:" @@ -3994,7 +4162,7 @@ msgid "New Scan" msgstr "Nova Busca" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Próxima Página" @@ -4006,7 +4174,7 @@ msgstr "Próxima Busca" msgid "Nickname :" msgstr "Nick:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Sem região (SDK)" @@ -4045,7 +4213,7 @@ msgstr "Nenhuma pasta de salva encontrada para o título %s" msgid "None" msgstr "Nenhum" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norueguês Bokmaal" @@ -4053,8 +4221,8 @@ msgstr "Norueguês Bokmaal" msgid "Not Equal" msgstr "Não igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Indefinido" @@ -4074,7 +4242,7 @@ msgstr "Não conectado" msgid "Notes" msgstr "Notas" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notas:" @@ -4112,7 +4280,7 @@ msgstr "Objeto" 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" @@ -4138,11 +4306,11 @@ msgstr "Apenas %d blocos disponíveis" msgid "Open" msgstr "Abrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Abrir &conteúdo da pasta" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Abrir pasta do &save do WII" @@ -4164,11 +4332,11 @@ 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:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "Decodificador de Texturas OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "Decodificador de Texturas OpenMP" @@ -4200,7 +4368,7 @@ msgstr "" "e importe-os para um novo Memory Card\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Outros" @@ -4252,19 +4420,20 @@ msgstr "Parágrafo" msgid "Parameters" msgstr "Parâmetros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partição %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Diretórios" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4277,6 +4446,10 @@ msgstr "Diretórios" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausar" @@ -4285,7 +4458,7 @@ msgstr "Pausar" msgid "Per-Pixel Lighting" msgstr "Iluminação Por Pixels" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfeito" @@ -4298,6 +4471,7 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4308,6 +4482,10 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Executar" @@ -4321,7 +4499,7 @@ msgstr "Reproduzir Gravação" msgid "Play/Pause" msgstr "Executar/Pausar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Jogável" @@ -4333,6 +4511,7 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4342,6 +4521,9 @@ msgstr "Jogadores" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Favor confirmar..." @@ -4353,23 +4535,23 @@ msgstr "Favor criar uma perspectiva antes de salvar" msgid "Plus-Minus" msgstr "Positivo-Negativo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polonês" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Porta 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Porta 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Porta 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Porta 4" @@ -4378,11 +4560,11 @@ msgstr "Porta 4" msgid "Port :" msgstr "Porta:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Português" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Português (Brasil)" @@ -4390,17 +4572,17 @@ msgstr "Português (Brasil)" msgid "Post-Processing Effect:" msgstr "Efeito Pós-Processamento" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4413,7 +4595,7 @@ msgstr "Predefinidos:" msgid "Prev Page" msgstr "Pág. Anterior" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Página Anterior" @@ -4464,7 +4646,7 @@ msgstr "R-Analógico" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "Russia" @@ -4477,7 +4659,7 @@ msgstr "Alcance" msgid "Read-only mode" msgstr "Modo Somente Leitura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Real" @@ -4552,6 +4734,7 @@ msgstr "Atualizar Lista" msgid "Refresh game list" msgstr "Atualizar a lista de jogos" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4570,6 +4753,12 @@ msgstr "Atualizar a lista de jogos" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Remover" @@ -4622,11 +4811,11 @@ msgstr "Analógico Direito" msgid "Rumble" msgstr "Vibração" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: 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:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russo" @@ -4634,10 +4823,11 @@ msgstr "Russo" msgid "Sa&ve State" msgstr "Sal&var estado atual" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4647,6 +4837,9 @@ msgstr "Seguro" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Taxa de Amostragem:" @@ -4704,12 +4897,12 @@ msgstr "Salvar Estado Atual no Slot 8" msgid "Save State..." msgstr "Salvar estado atual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Salvar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Salvar GCM/ISO comprimido" @@ -4717,11 +4910,11 @@ msgstr "Salvar GCM/ISO comprimido" msgid "Save current perspective" msgstr "Salvar perspectiva atual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Salvar GCM/ISO descomprimido" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "O Estado Salvo capturado %s está corrompido, parando captura..." @@ -4730,6 +4923,7 @@ msgstr "O Estado Salvo capturado %s está corrompido, parando captura..." msgid "Scaled EFB Copy" msgstr "Cópia Escalada do EFB" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4739,15 +4933,18 @@ msgstr "Cópia Escalada do EFB" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Escaneando %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Procurando por ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Escaneando..." @@ -4763,12 +4960,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Filtro de Busca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Procurar em sub-pastas" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: 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 "A seção %s não foi encontrada no SYSCONF" @@ -4778,6 +4975,7 @@ msgstr "A seção %s não foi encontrada no SYSCONF" msgid "Select" msgstr "Selecionar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4802,6 +5000,14 @@ msgstr "Selecione o arquivo de Gravação" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Selecione o arquivo de Gravação" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Selecione um arquivo WAD de Wii para instalar" @@ -4826,6 +5032,7 @@ msgstr "Selecionar Janelas flutuantes" msgid "Select the file to load" msgstr "Selecione um arquivo para carregar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4842,19 +5049,26 @@ msgstr "Selecione um estado para carregar" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Selecione o arquivo de salva" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Selecione um estado para carregar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Selecione um estado para salvar" @@ -4876,7 +5090,7 @@ msgstr "" "\n" "Se estiver em dúvida, selecione Automático." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Fonte Selecionada" @@ -4924,10 +5138,11 @@ msgstr "Posição da Sensor Bar:" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Sérvio" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 @@ -4937,6 +5152,9 @@ msgstr "Sérvio" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4947,11 +5165,11 @@ msgstr "" msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Definir como ISO &padrão" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Definir como Memory Card padrão%c" @@ -4962,7 +5180,7 @@ 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:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Configurações..." @@ -4974,7 +5192,7 @@ msgstr "SetupWiiMem: Arquivo de configuração não encontrado" msgid "Shake" msgstr "Sacudir" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Nome Curto:" @@ -5002,7 +5220,7 @@ msgstr "Show Barra de &Ferramentas" msgid "Show Drives" msgstr "Mostrar Drives" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Mostrar Regiões de Cópia do EFB" @@ -5018,7 +5236,7 @@ msgstr "Mostrar França" msgid "Show GameCube" msgstr "Mostrar GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Mostrar" @@ -5034,7 +5252,7 @@ msgstr "Mostrar JAP" msgid "Show Korea" msgstr "Mostrar Coréia" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Mostrar Idioma:" @@ -5054,7 +5272,7 @@ msgstr "Mostrar Plataformas" msgid "Show Regions" msgstr "Mostrar Regiões" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Mostrar Estatísticas" @@ -5074,11 +5292,11 @@ msgstr "Mostrar Wad" 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 " @@ -5088,23 +5306,23 @@ 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:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Mostrar o primeiro bloco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Mostrar blocos de save" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Mostar comentário do save" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Mostrar ícone do salva" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Mostrar título do salva" @@ -5142,7 +5360,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote na Horizontal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Chinês Simplificado" @@ -5150,11 +5368,11 @@ msgstr "Chinês Simplificado" msgid "Size" msgstr "Tamanho" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Pular a BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Não fazer o Dest. Alpha Pass" @@ -5197,11 +5415,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5225,7 +5443,7 @@ 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:621 msgid "Sound Settings" msgstr "Configurações de Som" @@ -5243,6 +5461,7 @@ msgstr "Falha na criação do buffer de som: %s" msgid "Space" msgstr "Barra de Espaço" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5258,6 +5477,11 @@ msgstr "Barra de Espaço" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Espanhol" @@ -5289,7 +5513,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Especifique um Backend de Vídeo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Aumentar a velocidade de transferência do disco" @@ -5297,7 +5521,7 @@ msgstr "Aumentar a velocidade de transferência do disco" msgid "Square Stick" msgstr "Analógico Quadrado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Controle Padrão" @@ -5395,12 +5619,12 @@ msgstr "Arquivos de salva importados com sucesso" msgid "Swing" msgstr "Balançar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Idioma do Systema:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWAN" @@ -5439,7 +5663,7 @@ msgstr "Direita da Mesa" msgid "Take Screenshot" msgstr "Capturar Tela" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5455,7 +5679,7 @@ msgstr "Textura" msgid "Texture Cache" msgstr "Cache de Texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Sobreposição Formato das Texturas" @@ -5471,13 +5695,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:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "O diretório escolhido já está na lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5500,7 +5724,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:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "O arquivo que você especificou (%s) não existe" @@ -5518,11 +5742,12 @@ 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:98 +#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" "Quanto mais Seguro, menor será a probabilidade do emulador perder alguma " "atualização de textura da RAM.\n" @@ -5567,7 +5792,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:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema" @@ -5575,7 +5800,7 @@ msgstr "Tema" 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:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5583,7 +5808,7 @@ msgstr "" "É necessário um ticket para 00000001/00000002. O seu Dump do NAND está " "provavelmente incompleto." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5599,7 +5824,7 @@ msgstr "" "Este simulador de Action Replay não suporta códigos que modifiquem o Action " "Replay em si." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: 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." @@ -5624,25 +5849,10 @@ msgstr "" "Se estiver em dúvida, deixe isto desativado." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -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 "" -"Isto é usado para controlar a velocidade do jogo por throttle de som.\n" -"Desativar isso pode causar velocidade de jogo anormal, ás vezes muito " -"rápido.\n" -"Mas algumas vezes ativar isso pode causar ruído constante.\n" -"\n" -"Atalho de Teclado : Segure para instantaneamente desativar o Throttle." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Isto é usado para tocar trilhas sonoras de jogos, como BGM" -#: 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" @@ -5654,7 +5864,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:283 +#: 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" @@ -5677,7 +5887,7 @@ msgstr "Título" msgid "To" msgstr "Para" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Ligar/Desligar Todos os Logs" @@ -5697,6 +5907,7 @@ msgstr "Ir para Tela Cheia" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5704,14 +5915,17 @@ msgstr "Ir para Tela Cheia" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Topo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Chinês Tradicional" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Houve a tentativa de carregar um tipo de arquivo desconhecido." @@ -5719,7 +5933,7 @@ msgstr "Houve a tentativa de carregar um tipo de arquivo desconhecido." msgid "Triggers" msgstr "Gatilhos" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Tentando ler de um SYSCONF inválido" @@ -5731,7 +5945,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:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turco" @@ -5752,11 +5966,11 @@ msgstr "Porta UDP:" msgid "UDP Wiimote" msgstr "Wiimote UDP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "DESCONHECIDO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "EUA" @@ -5842,7 +6056,7 @@ msgstr "Atualizar" msgid "Upright Wiimote" msgstr "Wiimote na Vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar modo EuRGB60 (PAL60)" @@ -5854,7 +6068,7 @@ msgstr "Usar Tela Cheia" msgid "Use Hex" msgstr "Usar Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Usar Panic Handlers" @@ -5886,7 +6100,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Utilitário" @@ -5910,25 +6124,29 @@ msgstr "Valor:" msgid "Verbosity" msgstr "Verbosidade" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Vídeo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volume" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "Falha na instalação da WAD: Erro na criação de %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "Falha na instalação da WAD: Erro na criação de %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5947,15 +6165,15 @@ msgstr "" msgid "Warning" msgstr "Aviso" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Aviso - Inicializando DOL no modo de console errado!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Aviso - Inicializando ELF no modo de console errado!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Aviso - Inicializando ISO no modo de console errado!" @@ -5985,7 +6203,7 @@ msgstr "" "que tenham o mesmo nome de um arquivo do Memory Card\n" "Continuar?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5993,7 +6211,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -6001,7 +6219,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -6029,7 +6247,7 @@ msgstr "WaveFileWriter - Arquivo não aberto." msgid "Whammy" msgstr "Distorção" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Hack de Widescreen" @@ -6037,15 +6255,15 @@ msgstr "Hack de Widescreen" msgid "Width" msgstr "Largura" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Console do Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Raiz do Wii NAND" @@ -6053,6 +6271,7 @@ msgstr "Raiz do Wii NAND" msgid "Wii Save Import" msgstr "Importar Save de Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -6062,6 +6281,9 @@ msgstr "Importar Save de Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Arquivos de Salva do Wii (*.bin)|*.bin" @@ -6128,10 +6350,11 @@ msgstr "Menu de Janelas" msgid "Windows Right" msgstr "Janelas da Direita" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6147,6 +6370,11 @@ msgstr "Word Wrap" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Funcionando..." @@ -6154,6 +6382,11 @@ msgstr "Funcionando..." msgid "Write to Console" msgstr "Escrever no Console" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Escrever para o Arquivo" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Escrever para o Arquivo" @@ -6210,7 +6443,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:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 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." @@ -6233,7 +6466,7 @@ msgstr "" "Ele deveria ter 0x%04x (mas tem 0x%04llx)\n" "Você gostaria de gerar um novo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "Hack do ZTB" @@ -6305,7 +6538,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6338,12 +6571,12 @@ msgstr "" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "Cmd 0x%08x desconhecido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute devolveu -1 ao rodar o aplicativo!" @@ -6503,6 +6736,9 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "Configurações de Display do Emulador" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Ativar Throttle de Ãudio" + #~ msgid "Enable CPU Access" #~ msgstr "Ativar Acesso da CPU" @@ -6803,6 +7039,21 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "O arquivo" +#~ 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 "" +#~ "Isto é usado para controlar a velocidade do jogo por throttle de som.\n" +#~ "Desativar isso pode causar velocidade de jogo anormal, ás vezes muito " +#~ "rápido.\n" +#~ "Mas algumas vezes ativar isso pode causar ruído constante.\n" +#~ "\n" +#~ "Atalho de Teclado : Segure para instantaneamente desativar o " +#~ "Throttle." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Isto é geralmente usado para efeitos de som e voz." diff --git a/Languages/po/ru.po b/Languages/po/ru.po index 31745e4349..c882cf9f5b 100644 --- a/Languages/po/ru.po +++ b/Languages/po/ru.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-01-20 14:40+0300\n" "Last-Translator: firnis \n" "Language-Team: Russian <>\n" @@ -59,9 +63,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:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Гц" @@ -153,7 +157,7 @@ msgstr "%sЭкÑпоритровать GCI%s" msgid "%sImport GCI%s" msgstr "%sИмпортировать GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, fuzzy, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%d Ñвободных блоков; %d Ñвободных запиÑей каталогов" @@ -187,11 +191,11 @@ msgstr "Менеджер &читов" msgid "&DSP Settings" msgstr "&Опции аудио" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Удалить ISO-файл..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Удалить выбранные ISO-файлы..." @@ -257,7 +261,7 @@ msgstr "&Пауза" msgid "&Play" msgstr "&ЗапуÑтить" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&СвойÑтва" @@ -301,7 +305,7 @@ msgstr "&Вид" msgid "&Wiimote Settings" msgstr "Опц&ии Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "" @@ -346,7 +350,7 @@ msgstr "<Введите название>" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "<Ðичего>" @@ -355,7 +359,7 @@ msgstr "<Ðичего>" msgid "" msgstr "<Ðажмите кнопку>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<СиÑтемный>" @@ -411,13 +415,13 @@ msgstr "" "\n" "Ð”Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¸Ð³Ñ€Ñ‹ вам необходимо открыть указанный порт на вашем роутере!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR-коды" @@ -429,11 +433,11 @@ msgstr "Об ÑмулÑторе Dolphin" msgid "Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "" @@ -535,11 +539,11 @@ msgstr "Ðдаптер:" msgid "Add" msgstr "Добавить" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Добавление ActionReplay-кода" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Добавление патча" @@ -547,6 +551,7 @@ msgstr "Добавление патча" msgid "Add new pane" msgstr "Добавить панель" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -562,6 +567,11 @@ msgstr "Добавить панель" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Добавить..." @@ -595,11 +605,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "РаÑширенные" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "РаÑширенные наÑтройки" @@ -608,14 +618,15 @@ msgstr "РаÑширенные наÑтройки" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Ð’Ñе GC/Wii-файлы (elf, dol, gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Ð’Ñе образа от GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Ð’Ñе GCM-файлы Gamecube (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -628,18 +639,22 @@ msgstr "Ð’Ñе GCM-файлы Gamecube (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Файлы быÑтрых Ñохранений (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Файлы образов Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Сжатые образа диÑков GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Ð’Ñе файлы (*.*)|*.*" @@ -651,7 +666,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Эмулируемый Wiimote" @@ -672,7 +687,7 @@ msgstr "Загрузчик неверноего размера... Ñто точ msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Загрузчик:" @@ -687,7 +702,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -696,7 +711,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "Ð’Ñ‹ уверены, что хотите удалить \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -704,10 +719,11 @@ msgstr "" "Ð’Ñ‹ уверены, что хотите удалить Ñти файлы?\n" "Они иÑчезнут навÑегда!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Ð’Ñ‹ уверены, что хотите удалить Ñтот файл? Он иÑчезнет навÑегда!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -717,6 +733,9 @@ msgstr "Ð’Ñ‹ уверены, что хотите удалить Ñтот фай ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Соотношение Ñторон:" @@ -725,19 +744,21 @@ msgstr "Соотношение Ñторон:" msgid "At least one pane must remain open." msgstr "Ð¥Ð¾Ñ‚Ñ Ð±Ñ‹ одна панель должна быть открыта." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 #, fuzzy msgid "Audio Backend:" msgstr "СиÑтема вывода" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ ÑƒÑтройÑтва вывода звука.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -747,6 +768,9 @@ msgstr "AudioCommon: Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ ÑƒÑтройÑтва выво ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Ðвто" @@ -787,7 +811,7 @@ msgstr "" msgid "Back" msgstr "Ðазад" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 #, fuzzy msgid "Backend Settings" msgstr "ОÑновные наÑтройки" @@ -816,11 +840,11 @@ msgstr "Ðеверный заголовок файла" msgid "Banner" msgstr "Логотип" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Данные логотипа" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Логотип:" @@ -832,7 +856,7 @@ msgstr "Панель" msgid "Basic" msgstr "ОÑновные" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "ОÑновные наÑтройки" @@ -863,6 +887,7 @@ msgstr "СинÑÑ Ñправа" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -870,6 +895,9 @@ msgstr "СинÑÑ Ñправа" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Ñнизу" @@ -878,7 +906,7 @@ msgstr "Ñнизу" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Ðе работает" @@ -894,7 +922,7 @@ msgstr "Выберите папку Ñ Ð¾Ð±Ñ€Ð°Ð·Ð°Ð¼Ð¸ игр" msgid "Browse for an ISO directory..." msgstr "Выбор папки Ñ ISO-файлами..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Укажите папку Ð´Ð»Ñ ÑохранениÑ" @@ -924,11 +952,11 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Режим ÑмулÑции CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "" @@ -967,7 +995,7 @@ msgstr "Ðе удалоÑÑŒ открыть %s" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -977,7 +1005,7 @@ msgstr "" "ÐÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать Ñтот файл, как карту памÑти\n" "Ð’Ñ‹ пытаетеÑÑŒ иÑпользовать один файл в обоих Ñлотах?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -995,8 +1023,6 @@ msgstr "Ðе получаетÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ WiiMote по адреÑу: %02x:%02 msgid "Cant find WiiMote by connection handle %02x" msgstr "Ðе получаетÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ WiiMote по деÑкриптору %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1006,7 +1032,7 @@ msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸Ð· DVD_Plugin - DVD-Interface: Критич msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -1032,7 +1058,7 @@ msgstr "Сменить &диÑк..." msgid "Change Game" msgstr "Сменить игру" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1048,8 +1074,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: 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 "" "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ опции вÑтупÑÑ‚ в Ñилу только поÑле перезапуÑка ÑмулÑтора." @@ -1070,33 +1096,33 @@ msgstr "ПоиÑк кодов" msgid "Cheats Manager" msgstr "Менеджер чит-кодов" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 #, fuzzy msgid "Chinese (Simplified)" msgstr "Chinese (Simplified)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Выберите оÑновной DVD-диÑк:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Choose a NAND root directory:" msgstr "Выберите оÑновной DVD-диÑк:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Выберите файл образа:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Выберите папку Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð² ÑпиÑок" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Выберите файл карты памÑти" @@ -1104,14 +1130,14 @@ msgstr "Выберите файл карты памÑти" msgid "Choose a memory card:" msgstr "Выберите карту памÑти:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: 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:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Выберите папку Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²" @@ -1123,14 +1149,14 @@ msgstr "" msgid "Classic" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "ОчиÑтить" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "" @@ -1146,6 +1172,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1154,6 +1181,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Закрыть" @@ -1177,20 +1208,20 @@ msgstr "" msgid "Comment" msgstr "Комментарий" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Комментарий:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Сжать ISO-файл..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Сжать выбранные ISO-файлы..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Сжатие образа" @@ -1217,13 +1248,13 @@ msgstr "ÐаÑтроить контроллеры" msgid "Configure..." msgstr "ÐаÑтройка ÑмулÑтора..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 #, fuzzy msgid "Confirm on Stop" msgstr "Потверждение при оÑтановке ÑмулÑции" @@ -1233,7 +1264,7 @@ msgstr "Потверждение при оÑтановке ÑмулÑции" msgid "Connect" msgstr "ПодключитьÑÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Подключить USB-клавиатуру" @@ -1290,12 +1321,12 @@ msgstr "Конвертировать в GCI" msgid "Copy failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Копировать на карту памÑти %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Ядро" @@ -1325,7 +1356,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Ðе удалоÑÑŒ определить ISO образ %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Ðе удалоÑÑŒ Ñохранить %s" @@ -1336,7 +1367,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1348,7 +1379,7 @@ msgstr "" "\n" "Ð’Ñ‹ запуÑтили Dolphin Ñ CD/DVD, или файл защищен от запиÑи?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "" @@ -1363,7 +1394,7 @@ msgstr "" msgid "Count:" msgstr "Счетчик:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Страна:" @@ -1377,26 +1408,26 @@ msgstr "Создать новый AR-код" msgid "Create new perspective" msgstr "Создать новую точку обозрениÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Стиль от KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 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:498 msgid "Created by VistaIcons.com" msgstr "Стиль от VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 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:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Создатель:" @@ -1404,7 +1435,7 @@ msgstr "Создатель:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "обрезать" @@ -1424,7 +1455,7 @@ msgstr "" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Ð¢ÐµÐºÑƒÑ‰Ð°Ñ Ð¿Ð°Ð¿ÐºÐ° ÑменилаÑÑŒ Ñ %s на %s поÑле wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 #, fuzzy msgid "Custom Projection Hack" msgstr "Projection-хак: " @@ -1434,11 +1465,11 @@ msgstr "Projection-хак: " msgid "Custom Projection Hack Settings" msgstr "Projection-хак: " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "" @@ -1450,11 +1481,12 @@ msgstr "" msgid "DSP" msgstr "Ðудио" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 #, fuzzy msgid "DSP Emulator Engine" msgstr "Режим ÑмулÑции CPU" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1465,20 +1497,24 @@ msgstr "Режим ÑмулÑции CPU" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 #, fuzzy msgid "DSP LLE interpreter (slow)" msgstr "Интерпретатор (ОЧЕÐЬ медленный)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 #, fuzzy msgid "DSP LLE on Thread" msgstr "Обрабатывать DSP LLE отдельным потоком" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "" @@ -1486,15 +1522,23 @@ msgstr "" msgid "DSP settings" msgstr "ÐаÑтройка аудио (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" 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 "" + +#: 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:176 msgid "Data Size" msgstr "Размер данных" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Дата:" @@ -1515,7 +1559,7 @@ msgstr "ÐœÐµÑ€Ñ‚Ð²Ð°Ñ Ð·Ð¾Ð½Ð°" msgid "Debug" msgstr "Отладка" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 #, fuzzy msgid "Debugging" msgstr "Отладка" @@ -1524,16 +1568,16 @@ msgstr "Отладка" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "СнÑÑ‚ÑŒ Ñжатие Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ñ… ISO-файлов..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "" @@ -1541,11 +1585,11 @@ msgstr "" msgid "Default" msgstr "СброÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Образ по умолчанию:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Шрифт по умолчанию" @@ -1554,7 +1598,7 @@ msgstr "Шрифт по умолчанию" msgid "Delete" msgstr "Удалить" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Удалить Ñохранение" @@ -1563,7 +1607,7 @@ msgstr "Удалить Ñохранение" msgid "Delete the existing file '%s'?" msgstr "Удалить ÑущеÑтвующий файл '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 #, fuzzy msgid "Description" msgstr "ВопроÑ" @@ -1572,8 +1616,8 @@ msgstr "ВопроÑ" msgid "Detect" msgstr "Определить" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: 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." @@ -1584,8 +1628,8 @@ msgstr "" msgid "Device" msgstr "УÑтройÑтво" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "ÐаÑтройки уÑтройÑтв" @@ -1608,25 +1652,25 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 #, fuzzy msgid "Disable" msgstr "Отключить туман" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Отключить туман" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Отключить оÑвещение" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 #, fuzzy msgid "Disable Per-Pixel Depth" msgstr "Глубина пикÑелÑ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Отключить текÑтуры" @@ -1656,7 +1700,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "ДиÑк" @@ -1680,6 +1724,7 @@ msgstr "" msgid "Divide" msgstr "/" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1689,10 +1734,13 @@ msgstr "/" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Ð’Ñ‹ хотите оÑтановить ÑмулÑцию?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1718,6 +1766,7 @@ msgstr "ÐаÑтройки Ñмулируемого Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1742,6 +1791,14 @@ msgstr "ÐаÑтройки Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "ÐаÑтройки Dolphin GCPad" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1774,11 +1831,11 @@ msgstr "" msgid "Down" msgstr "Вниз" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Скачать готовые коды (база WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Скачано %lu кодов. (добавлено %lu)" @@ -1787,23 +1844,23 @@ msgstr "Скачано %lu кодов. (добавлено %lu)" msgid "Drums" msgstr "Барабаны" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "" @@ -1829,6 +1886,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1844,6 +1902,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Dutch" msgstr "Dutch" @@ -1869,7 +1932,7 @@ msgstr "" "%d -- ЕÑли вы недавно обновили Dolphin , то Ñкорее вÑего необходимо " "перегрузить компьютер, чтобы Windows обнаружил новыйдрайвер." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "ЕВРОПÐ" @@ -1885,7 +1948,7 @@ msgstr "Изменить" msgid "Edit ActionReplay Code" msgstr "Изменить код ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Править вручную" @@ -1897,8 +1960,8 @@ msgstr "" msgid "Edit current perspective" msgstr "Изменить точку" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Изменить..." @@ -1937,7 +2000,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Эмулируемый Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "КачеÑтво ÑмулÑции:" @@ -1959,23 +2022,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "Включить логирование AR-Ñобытий" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Включить аудиотроттлинг" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Включить BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Включить Ñовмещение блоков" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -1989,6 +2052,7 @@ msgstr "" msgid "Enable Cache" msgstr "кÑшировать" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -1998,52 +2062,55 @@ msgstr "кÑшировать" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Включить чит-коды" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Включить DTK-музыку" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Включить DualCore-режим" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Включить DualCore-режим (уÑкорение)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Включить горÑчие клавиши" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Включить IdleSkipping-режим" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Включить IdleSkipping-режим (уÑкорение)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Включить MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Включить прогреÑÑивную развертку" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 #, fuzzy msgid "Enable Screen Saver" msgstr "Включить широкий Ñкран" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Включить широкий Ñкран" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Включить ÐºÐ°Ñ€ÐºÐ°Ñ Ð¼Ð¾Ð´ÐµÐ»ÐµÐ¹" @@ -2060,7 +2127,7 @@ msgstr "" "Повышает визуальное качеÑтво текÑтур, находÑщихÑÑ Ð¿Ð¾Ð´ наклоном\n" "к углу обзора." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2068,7 +2135,7 @@ msgstr "" "Ðктивирует режим быÑтрого доÑтуп к диÑку, необходим Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… игр " "(отключите Ð´Ð»Ñ Ð¿Ð¾Ð²Ñ‹ÑˆÐµÐ½Ð¸Ñ ÑовмеÑтимоÑти)." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "" @@ -2088,7 +2155,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2096,7 +2163,7 @@ msgstr "" "УÑкорÑет игру The Legend of Zelda: Twilight Princess. Ð”Ð»Ñ Ð»ÑŽÐ±Ð¾Ð¹ ДРУГОЙ игры " "данный хак должен быть ОТКЛЮЧЕÐ." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: 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 = " @@ -2105,7 +2172,7 @@ msgstr "" "Ðктивирует Ñмещение адреÑа блока (Block Address Translation, BAT), одну из " "функций MMU. Повышает точноÑÑ‚ÑŒ ÑмулÑции ценой ÑÐ½Ð¸Ð¶ÐµÐ½Ð¸Ñ ÑкороÑти." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 #, fuzzy msgid "Enables Custom Projection Hack" msgstr "Projection-хак: " @@ -2118,7 +2185,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2138,6 +2205,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2153,6 +2221,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "English" msgstr "English" @@ -2184,6 +2257,7 @@ msgstr "Равно" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Ошибки" @@ -2214,18 +2288,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Ошибки" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Ошибка загрузки выбранного Ñзыка. ВозвращаемÑÑ Ðº Ñтандартному." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2261,7 +2341,7 @@ msgstr "Закрыть Dolphin Ñ ÑмулÑтором" msgid "Export Failed" msgstr "ЭкÑпортирование файла" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "ЭкÑпортирование файла" @@ -2275,15 +2355,15 @@ msgstr "&ЭкÑпортировать запиÑÑŒ процеÑÑа" msgid "Export Recording..." msgstr "&ЭкÑпортировать запиÑÑŒ процеÑÑа" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "ЭкÑпортировать Ñохранение" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "ЭкÑпортировать Ñохранение Wii (ÑкÑперемент)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "ЭкÑпортировать вÑе ÑохранениÑ" @@ -2300,7 +2380,7 @@ msgstr "&ЭкÑпортировать Ñохранение как..." msgid "Extension" msgstr "РаÑширение" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "" @@ -2312,44 +2392,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Извлечь вÑе файлы..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Извлечь apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Извлечь DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "ИзвлеÑÑŒ папку..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Извлечь файл..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Извлечь раздел..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Извлечение %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Извлечение вÑех файлов" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Извлечение папки" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Подождите..." @@ -2361,11 +2441,11 @@ msgstr "" msgid "FIFO Player" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "ФРÐÐЦИЯ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Размер ТФС:" @@ -2377,11 +2457,11 @@ msgstr "Ошибка подключаниÑ!" msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Ошибка ÑÐºÐ°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð´Ð¾Ð²." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Ошибка Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ Ð² %s!" @@ -2478,18 +2558,28 @@ msgstr "Ошибка запиÑи заголовка Ð´Ð»Ñ %s" msgid "Failed to write header for file %d" msgstr "Ошибка запиÑи заголовка Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "быÑтрое" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "" @@ -2499,7 +2589,7 @@ msgstr "" msgid "File Info" msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ коде" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Файл не Ñодержит кодов." @@ -2532,16 +2622,16 @@ msgstr "" msgid "File not compressed" msgstr "Файл не Ñжат" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: неизвеÑтный режим Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2549,7 +2639,7 @@ msgstr "" msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "ИÑправить контрольную Ñумму" @@ -2561,7 +2651,7 @@ msgstr "16:9" msgid "Force 4:3" msgstr "4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 #, fuzzy msgid "Force Console as NTSC-J" msgstr "УÑтановить регион конÑоли как NTSC-J" @@ -2587,7 +2677,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 " @@ -2623,7 +2713,7 @@ msgstr "РаÑширенные" msgid "Frame Advance" msgstr "РаÑширенные" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "" @@ -2636,7 +2726,7 @@ msgstr "РаÑширенные" msgid "Frame S&kipping" msgstr "&ПропуÑк кадров" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Лимит кадров:" @@ -2644,10 +2734,11 @@ msgstr "Лимит кадров:" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Свободный обзор" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2663,6 +2754,11 @@ msgstr "Свободный обзор" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "French" msgstr "French" @@ -2698,7 +2794,7 @@ msgstr "ÐаÑтройка \"горÑчих\" клавиш" msgid "GCPad" msgstr "ДжойÑтик" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID игры:" @@ -2714,15 +2810,15 @@ msgstr "Игра не запущена!" msgid "Game not found!!" msgstr "Игра не найдена!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "ПерÑональные наÑтройки игр" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "ÐаÑтройки игры" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2734,6 +2830,7 @@ msgstr "Опции &контроллера Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2741,6 +2838,9 @@ msgstr "Опции &контроллера Gamecube" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Файлы карт памÑти Gamecube (*.raw,*.gcp)" @@ -2749,15 +2849,17 @@ msgid "Gamecube Pad settings" msgstr "ÐаÑтройка контроллера GameCube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko-коды" -#: Source/Core/Core/Src/GeckoCode.cpp:139 +#: Source/Core/Core/Src/GeckoCode.cpp:222 #, 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.)" +"(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 "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 @@ -2770,8 +2872,12 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Общие" @@ -2781,6 +2887,7 @@ msgstr "Общие" msgid "General Settings" msgstr "ÐаÑтройки интерфейÑа" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2796,6 +2903,11 @@ msgstr "ÐаÑтройки интерфейÑа" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "German" msgstr "German" @@ -2828,7 +2940,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 #, fuzzy msgid "Greek" msgstr "Greek" @@ -2861,7 +2973,7 @@ msgstr "" msgid "Header checksum failed" msgstr "Ошибка контрольной Ñуммы заголовка" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 #, fuzzy msgid "Hebrew" msgstr "Hebrew" @@ -2932,12 +3044,16 @@ msgstr "ÐаÑтройка \"горÑчих\" клавиш" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Клавиши" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 #, fuzzy msgid "Hungarian" msgstr "Hungarian" @@ -2946,12 +3062,12 @@ msgstr "Hungarian" msgid "Hybrid Wiimote" msgstr "Гибридный Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2964,11 +3080,11 @@ msgstr "" "TitleID %016llx.\n" " Dolphin cкорее вÑего завиÑнет" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "ÐаÑтройки конÑоли (IPL)" @@ -2984,15 +3100,15 @@ msgstr "ИК указатель" msgid "IR Sensitivity:" msgstr "ЧувÑтвительноÑÑ‚ÑŒ IR-Ñигнала:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Данные образа" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Папки Ñ Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸ образов" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ИТÐЛИЯ" @@ -3000,13 +3116,13 @@ msgstr "ИТÐЛИЯ" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 #, fuzzy msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" @@ -3014,11 +3130,12 @@ 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), you " -"also have to disable Audio Throttle in DSP to make it effective." +"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)\n" @@ -3049,7 +3166,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Импортировать Ñохранение" @@ -3098,7 +3215,7 @@ msgstr "" "Отключение оÑÐ²ÐµÑ‰ÐµÐ½Ð¸Ñ ÑƒÐ»ÑƒÑ‡ÑˆÐ°ÐµÑ‚ производительноÑÑ‚ÑŒ, но оÑвещение полноÑтью " "пропадет в играх, которые его иÑпользуют." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Почти играбельна" @@ -3107,7 +3224,7 @@ msgid "In-Game" msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "ИнформациÑ" @@ -3127,7 +3244,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "Ð’Ñтавьте Ñюда Ñам код (шифрованный или нешифрованный)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Ð’Ñтавить SD-карту" @@ -3140,7 +3257,7 @@ msgstr "Введите Ð¸Ð¼Ñ ÐºÐ¾Ð´Ð°..." msgid "Install WAD" msgstr "УÑтановка Wii-меню" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "УÑтановить в меню Wii" @@ -3150,6 +3267,7 @@ msgid "" msgstr "" "Вызван InstallExceptionHandler, но ваша платформа его еще не поддерживает." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3159,16 +3277,19 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "УÑтанавливаетÑÑ WAD в меню Wii..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 #, fuzzy msgid "Interface" msgstr "ÐаÑтройки интерфейÑа" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "ÐаÑтройки интерфейÑа" @@ -3194,11 +3315,11 @@ msgstr "ВнутренÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ° LZO - ошибка в lzo_init()" msgid "Internal Resolution:" msgstr "Разрешение полноÑкранного режима:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Интерпретатор (ОЧЕÐЬ медленный)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "ЗаÑтавка" @@ -3215,7 +3336,7 @@ msgstr "Ðеверное значение!" msgid "Invalid bat.map or dir entry" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Ðеверный тип ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ %i" @@ -3235,14 +3356,15 @@ msgstr "" "%s\n" " Лучше Ñделать новую копию игры." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Ðеверный файл запиÑи" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Ðеверное Ñохранение" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3258,29 +3380,34 @@ msgstr "Ðеверное Ñохранение" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Italian" msgstr "Italian" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "ЯПОÐИЯ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT-рекомпилÑтор (рекомендуетÑÑ)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL-рекомпилÑтор (ÑкÑпериментальный)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 #, fuzzy msgid "Japanese" msgstr "Japanese" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "КОРЕЯ" @@ -3289,8 +3416,8 @@ msgstr "КОРЕЯ" msgid "Key" msgstr "КомбинациÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 #, fuzzy msgid "Korean" msgstr "Korean" @@ -3310,7 +3437,7 @@ msgstr "" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Язык" @@ -3358,7 +3485,7 @@ msgstr "" msgid "Less Than" msgstr "Меньше чем" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3366,7 +3493,7 @@ msgstr "" msgid "Load" msgstr "Загр." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 #, fuzzy msgid "Load Custom Textures" msgstr "Load Hi-Res Textures" @@ -3423,6 +3550,7 @@ msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" msgid "Load State..." msgstr "Загрузить игру..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3432,10 +3560,14 @@ msgstr "Загрузить игру..." ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Загрузить Wii System Menu (%d %c)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 @@ -3445,6 +3577,9 @@ msgstr "Загрузить Wii System Menu (%d %c)" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Загрузить Wii System Menu (%d %c)" @@ -3470,7 +3605,7 @@ msgstr "Загружает указанный файл (DOL, ELF, WAD, GCM, ISO) msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 #, fuzzy msgid "Lock Threads to Cores" msgstr "\"ПривÑзать\" потоки данных к Ñдрам" @@ -3484,12 +3619,12 @@ msgstr "Лог" msgid "Log Configuration" msgstr "ÐаÑтройка \"горÑчих\" клавиш" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 #, fuzzy msgid "Log Types" msgstr "Тип:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "" @@ -3519,7 +3654,7 @@ msgstr "" "MD5 не Ñовпадает\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "УÑкорить MMU (Ñпидхак)" @@ -3541,11 +3676,11 @@ msgstr "Файлы Gameshark MadCatz (*.gcs)" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID ÑоздателÑ:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Создатель:" @@ -3570,6 +3705,7 @@ msgstr "Па&мÑÑ‚ÑŒ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3577,6 +3713,9 @@ msgstr "Па&мÑÑ‚ÑŒ" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Карта памÑти" @@ -3605,7 +3744,7 @@ msgstr "" msgid "Menu" msgstr "Меню" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Мик." @@ -3615,11 +3754,11 @@ msgstr "Мик." msgid "Min" msgstr "Мик." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Разное" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Разное" @@ -3636,7 +3775,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Моноширный шрифт" @@ -3649,7 +3788,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3664,7 +3803,7 @@ msgstr "" msgid "Multiply" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3754,6 +3893,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Вверх" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3763,6 +3903,9 @@ msgstr "NP Вверх" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3771,7 +3914,7 @@ msgstr "ИмÑ:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "ИмÑ:" @@ -3785,7 +3928,7 @@ msgid "New Scan" msgstr "Ðовый поиÑк" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "След. Ñтраница" @@ -3797,7 +3940,7 @@ msgstr "ИÑкать далее" msgid "Nickname :" msgstr "Ðик :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "" @@ -3837,7 +3980,7 @@ msgstr "Ðе найдена папка Ñ ÑохранениÑми Ð´Ð»Ñ %s" msgid "None" msgstr "ОтÑутÑтвует" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 #, fuzzy msgid "Norwegian Bokmaal" msgstr "Norwegian Bokmaal" @@ -3846,8 +3989,8 @@ msgstr "Norwegian Bokmaal" msgid "Not Equal" msgstr "Ðе равно" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "ÐеизвеÑтно" @@ -3867,7 +4010,7 @@ msgstr "Ðе подключено" msgid "Notes" msgstr "ПримечаниÑ" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "ПримечаниÑ:" @@ -3905,7 +4048,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Выкл" @@ -3931,11 +4074,11 @@ msgstr "ДоÑтупно только %d блоков" msgid "Open" msgstr "Открыть" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Открыть &папку Ñ Ð¾Ð±Ñ€Ð°Ð·Ð¾Ð¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Открыть папку Ñ &ÑохранениÑми Wii" @@ -3957,11 +4100,11 @@ msgstr "OpenAL: не найдена аудио-карта" msgid "OpenAL: can't open device %s" msgstr "OpenAL: ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ ÑƒÑтройÑтва %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -3990,7 +4133,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -4040,19 +4183,20 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Раздел %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Патчи" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Папки" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4065,6 +4209,10 @@ msgstr "Папки" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Пауза" @@ -4074,7 +4222,7 @@ msgstr "Пауза" msgid "Per-Pixel Lighting" msgstr "ОÑвещение пикÑелÑ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Отлично" @@ -4087,6 +4235,7 @@ msgstr "Точка %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4097,6 +4246,10 @@ msgstr "Точка %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "ЗапуÑк" @@ -4111,7 +4264,7 @@ msgstr "Про&играть запиÑÑŒ процеÑÑа" msgid "Play/Pause" msgstr "Старт/Пауза" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Играбельна" @@ -4124,6 +4277,7 @@ msgstr "Опции" msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4133,6 +4287,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -4144,27 +4301,27 @@ msgstr "ПожалуйÑта, Ñоздайте точку обозрениÑ, п msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 #, fuzzy msgid "Polish" msgstr "Polish" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 #, fuzzy msgid "Port 1" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 #, fuzzy msgid "Port 2" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 #, fuzzy msgid "Port 3" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 #, fuzzy msgid "Port 4" msgstr "Порт :" @@ -4174,12 +4331,12 @@ msgstr "Порт :" msgid "Port :" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 #, fuzzy msgid "Portuguese" msgstr "Portuguese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 #, fuzzy msgid "Portuguese (Brazilian)" msgstr "Portuguese (Brazilian)" @@ -4189,17 +4346,17 @@ msgstr "Portuguese (Brazilian)" msgid "Post-Processing Effect:" msgstr "Шейдер поÑÑ‚-обработки:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4213,7 +4370,7 @@ msgstr "<Ðажмите кнопку>" msgid "Prev Page" msgstr "Пред. Ñтраница" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Пред. Ñтраница" @@ -4265,7 +4422,7 @@ msgstr "R-Analog" msgid "RAM" msgstr "ПамÑÑ‚ÑŒ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "РОССИЯ" @@ -4278,7 +4435,7 @@ msgstr "" msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "ÐаÑтоÑщий" @@ -4357,6 +4514,7 @@ msgstr "&Обновить ÑпиÑок игр" msgid "Refresh game list" msgstr "Обновление ÑпиÑка игр" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4375,6 +4533,12 @@ msgstr "Обновление ÑпиÑка игр" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Удалить" @@ -4427,11 +4591,11 @@ msgstr "" msgid "Rumble" msgstr "ВидбрациÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: 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:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "РуÑÑкий" @@ -4439,10 +4603,11 @@ msgstr "РуÑÑкий" msgid "Sa&ve State" msgstr "БыÑтрое &Ñохранение" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "безопаÑное" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4452,6 +4617,9 @@ msgstr "безопаÑное" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Sample Rate:" msgstr "ЧаÑтота" @@ -4518,12 +4686,12 @@ msgstr "БыÑтрое &Ñохранение" msgid "Save State..." msgstr "Сохранить игру как..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Сохранить как..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Выберите меÑто Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñжатого GCM/ISO-образа" @@ -4531,11 +4699,11 @@ msgstr "Выберите меÑто Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñжатого G msgid "Save current perspective" msgstr "Сохранить точку" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Выберите меÑто Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð½ÐµÑжатого GCM/ISO-образа" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4544,6 +4712,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4553,15 +4722,18 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "ПоиÑк..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "ПоиÑк образов диÑков" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "ПоиÑк..." @@ -4577,12 +4749,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Фильтр поиÑка" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "ИÑкать в подпапках" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: 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" @@ -4592,6 +4764,7 @@ msgstr "Ð¡ÐµÐºÑ†Ð¸Ñ %s не найдена в SYSCONF" msgid "Select" msgstr "Выбрать" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4616,6 +4789,14 @@ msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи игрового проц #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи игрового процеÑÑа" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð°" @@ -4642,16 +4823,21 @@ msgstr "" msgid "Select the file to load" msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Выберите файл Ñохранений Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4671,6 +4857,9 @@ msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Выберите или укажите файл Ð´Ð»Ñ Ð±Ñ‹Ñтрого ÑохранениÑ" @@ -4691,7 +4880,7 @@ msgstr "" "4:3: ПодравнÑÑ‚ÑŒ картинку к Ñоотношению 4:3.\n" "РаÑÑ‚Ñнуть по окну: Размер картинки ÑоответÑтвует размеру окна." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Выбранный шрифт" @@ -4727,11 +4916,11 @@ msgstr "МеÑтораÑположение ÑенÑора:" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4742,11 +4931,11 @@ msgstr "" msgid "Set" msgstr "Выбрать" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Сделать &игрой по умолчанию" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "УÑтановить картой памÑти по умолчанию %c" @@ -4756,7 +4945,7 @@ msgstr "УÑтановить картой памÑти по умолчанию % msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 #, fuzzy msgid "Settings..." msgstr "ÐаÑтройки конÑоли (IPL)" @@ -4769,7 +4958,7 @@ msgstr "SetupWiiMem: Файл наÑтроек не найден" msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Короткое имÑ:" @@ -4799,7 +4988,7 @@ msgstr "Отображать панель &инÑтрументов" msgid "Show Drives" msgstr "Отображать игры на DVD" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 #, fuzzy msgid "Show EFB Copy Regions" msgstr "Регионы копии EFB" @@ -4816,7 +5005,7 @@ msgstr "Франции" msgid "Show GameCube" msgstr "GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 #, fuzzy msgid "Show Input Display" msgstr "Италии" @@ -4833,7 +5022,7 @@ msgstr "JAP" msgid "Show Korea" msgstr "Кореи" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Отображать Ñзык:" @@ -4854,7 +5043,7 @@ msgstr "Отображать игры платформ..." msgid "Show Regions" msgstr "Отображать игры регионов..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 #, fuzzy msgid "Show Statistics" msgstr "Ð Ð°Ð·Ð»Ð¸Ñ‡Ð½Ð°Ñ ÑтатиÑтика" @@ -4875,11 +5064,11 @@ msgstr "WAD-файлы" 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" @@ -4892,24 +5081,24 @@ msgstr "" "во Ð²Ñ€ÐµÐ¼Ñ Ð¸Ð³Ñ€Ñ‹, однако в Ñлучае вылета ÑмулÑтора вы не увидите никакой " "информации." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 #, fuzzy msgid "Show first block" msgstr "Показать блоки" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Показать блоки" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Показать комментарий" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Показать иконку" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Показать заголовок" @@ -4941,7 +5130,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Реальный Wimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 #, fuzzy msgid "Simplified Chinese" msgstr "Simplified Chinese" @@ -4950,12 +5139,12 @@ msgstr "Simplified Chinese" msgid "Size" msgstr "Размер" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 #, fuzzy msgid "Skip BIOS" msgstr "Пропуcтить загрузку BIOS'а GC" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -4987,12 +5176,12 @@ msgstr "" msgid "Slot %i" msgstr "Слот" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 #, fuzzy msgid "Slot A" msgstr "Слот" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 #, fuzzy msgid "Slot B" msgstr "Слот" @@ -5013,7 +5202,7 @@ 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:621 msgid "Sound Settings" msgstr "ÐаÑтройки ÑмулÑции звука" @@ -5031,6 +5220,7 @@ msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð°ÑƒÐ´Ð¸Ð¾-буфера %s." msgid "Space" msgstr "Пробел" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5046,6 +5236,11 @@ msgstr "Пробел" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Spanish" msgstr "Spanish" @@ -5071,7 +5266,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Ðазначает видео-плагин" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "УÑкорить чтение Ñ Ð´Ð¸Ñка" @@ -5079,7 +5274,7 @@ msgstr "УÑкорить чтение Ñ Ð´Ð¸Ñка" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "" @@ -5174,12 +5369,12 @@ msgstr "Сохранение уÑпешно импортировано" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Язык ÑиÑтемы:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "ТÐЙВÐÐЬ" @@ -5218,7 +5413,7 @@ msgstr "ÐŸÑ€Ð°Ð²Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ" msgid "Take Screenshot" msgstr "Сделать Ñкриншот" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5235,7 +5430,7 @@ msgstr "ТекÑтура" msgid "Texture Cache" msgstr "ОчиÑтить кÑш" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 #, fuzzy msgid "Texture Format Overlay" msgstr "Формат текÑтур" @@ -5252,13 +5447,13 @@ msgstr "Ðеверный адреÑ" msgid "The checksum was successfully fixed" msgstr "ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ð°Ñ Ñумма уÑпешно иÑправлена" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "Ð’Ñ‹Ð±Ð¿Ð²Ð½Ð½Ð°Ñ Ð¿Ð°Ð¿ÐºÐ° уже в ÑпиÑке" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, fuzzy, c-format msgid "" "The file %s already exists.\n" @@ -5281,7 +5476,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:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Указанный файл (%s) не ÑущеÑтвует" @@ -5303,7 +5498,7 @@ msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5342,7 +5537,7 @@ msgstr "Указанный файл \"%s\" не ÑущеÑтвует" msgid "The value is invalid" msgstr "Ðеверное значение" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Стиль" @@ -5350,7 +5545,7 @@ msgstr "Стиль" msgid "Theme selection went wrong" msgstr "Ошибка выбора темы" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5358,7 +5553,7 @@ msgstr "" "Ðе найден билет Ð´Ð»Ñ 00000001/00000002. Ваша ÐºÐ¾Ð¿Ð¸Ñ NAND Ñкорее вÑего не " "полнаÑ." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5378,7 +5573,7 @@ msgstr "" "СимулÑтор action replay не поддерживает коды, которые менÑÑŽÑ‚ Ñам Action " "Replay. " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "ÐÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ опции может привеÑти к замедлению ÑмулÑции в Wii-меню и " @@ -5396,26 +5591,11 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -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" -"\n" -"Удерживайте клавишу Ð´Ð»Ñ Ð±Ñ‹Ñтрого Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ опции в игре." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" "Ð”Ð°Ð½Ð½Ð°Ñ Ð¾Ñ†Ð¿Ð¸Ñ Ð²ÐºÐ»ÑŽÑ‡Ð°ÐµÑ‚ обработку музыкальных Ñ‚Ñ€Ñков (BGM, Ñ„Ð¾Ð½Ð¾Ð²Ð°Ñ Ð¼ÑƒÐ·Ñ‹ÐºÐ°)." -#: 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 " @@ -5428,7 +5608,7 @@ msgstr "" "ÑмулÑтора на многоÑдерных ÑиÑтемах. Побочным Ñффектом данной опции\n" "ÑвлÑетÑÑ Ð¿Ð¾ÑÐ²Ð»ÐµÐ½Ð¸Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… багов и/или ошибок в ÑмулÑции." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Это позволит вам вручную править INI файл Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸ÐµÐ¹" @@ -5452,7 +5632,7 @@ msgstr "Ðазвание" msgid "To" msgstr "Ñверху" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 #, fuzzy msgid "Toggle All Log Types" msgstr "Включить вÑе" @@ -5473,6 +5653,7 @@ msgstr "Включение полноÑкранного режима" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5480,15 +5661,18 @@ msgstr "Включение полноÑкранного режима" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Ñверху" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 #, fuzzy msgid "Traditional Chinese" msgstr "Traditional Chinese" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Попытка загрузить неизвеÑтный тип файла." @@ -5496,7 +5680,7 @@ msgstr "Попытка загрузить неизвеÑтный тип файл msgid "Triggers" msgstr "" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Попытка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸Ð· неверного SYSCONF" @@ -5506,7 +5690,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 #, fuzzy msgid "Turkish" msgstr "Turkish" @@ -5528,11 +5712,11 @@ msgstr "Порт UDP:" msgid "UDP Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "ÐЕИЗВЕСТÐО" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "СШÐ" @@ -5613,7 +5797,7 @@ msgstr "Обновить" msgid "Upright Wiimote" msgstr "Гибридный Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "ИÑпользовать EuRGB60-режим (PAL60)" @@ -5626,7 +5810,7 @@ msgstr "&ПолноÑкранный режим" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Показывать panic-ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ (ошибки)" @@ -5647,7 +5831,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Утилиты" @@ -5671,25 +5855,29 @@ msgstr "" msgid "Verbosity" msgstr "Глубина анализа" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Видео" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Виртуальный" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "ГромкоÑÑ‚ÑŒ" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format 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" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5704,15 +5892,15 @@ msgstr "" msgid "Warning" msgstr "Предупреждение" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Предупреждение: запуÑк DOL в неправильном режиме!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Предупреждение: запуÑк ELF в неправильном режиме!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Предупреждение: запуÑк ISO в неправильном режиме!" @@ -5739,7 +5927,7 @@ msgstr "" "Ñ Ñовпадающими именами будут перепиÑаны\n" "Продолжить?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5747,7 +5935,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5755,7 +5943,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5783,7 +5971,7 @@ msgstr "WaveFileWriter - файл не открыт." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "" @@ -5791,15 +5979,15 @@ msgstr "" msgid "Width" msgstr "Ширина" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD-диÑк:" @@ -5808,6 +5996,7 @@ msgstr "DVD-диÑк:" msgid "Wii Save Import" msgstr "Импорт Ñохранений Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5817,6 +6006,9 @@ msgstr "Импорт Ñохранений Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Файлы Ñохранений Wii (*.bin)|*.bin" @@ -5883,10 +6075,11 @@ msgstr "Windows Menu" msgid "Windows Right" msgstr "Windows Right" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ñтрок" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5902,6 +6095,11 @@ msgstr "ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ñтрок" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Подождите..." @@ -5909,6 +6107,11 @@ msgstr "Подождите..." msgid "Write to Console" msgstr "Выводить в конÑоль" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "СохранÑÑ‚ÑŒ в файл" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "СохранÑÑ‚ÑŒ в файл" @@ -5963,7 +6166,7 @@ msgstr "Ðужно ввеÑти деÑÑтичное или шеÑтнадцат msgid "You must enter a valid profile name." msgstr "Введите правильное Ð¸Ð¼Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Ðеобходимо перезапуÑтить Dolphin, чтобы Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²Ñтупили в Ñилу." @@ -5984,7 +6187,7 @@ msgid "" msgstr "" "Ваш файл SYSCONF неверного размера (0x%2$04llx), а должен быть 0x%1$04x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "Включить ZTP-хак" @@ -6039,7 +6242,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "загрузчик (.img)" @@ -6070,12 +6273,12 @@ msgstr "Ñто Ñохранение не от Wii или ошибка чтени msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "неизвеÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute вернул -1 при запуÑке приложениÑ!" @@ -6245,6 +6448,9 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "ÐаÑтройки изображениÑ" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Включить аудиотроттлинг" + #~ msgid "Enable CPU Access" #~ msgstr "Включить доÑтуп CPU к EFB" @@ -6450,6 +6656,20 @@ msgstr "| OR" #~ msgid "Take Screenshot\t" #~ msgstr "Сделать Ñкриншот\t" +#~ 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" +#~ "\n" +#~ "Удерживайте клавишу Ð´Ð»Ñ Ð±Ñ‹Ñтрого Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ опции в игре." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "" #~ "Ð”Ð°Ð½Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ Ð²ÐºÐ»ÑŽÑ‡Ð°ÐµÑ‚ обработку голоÑовых и SFX-Ñффектов (проÑтые звуки)." diff --git a/Languages/po/sr.po b/Languages/po/sr.po index c90b7828e7..62ec55ce59 100644 --- a/Languages/po/sr.po +++ b/Languages/po/sr.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-03-02 21:58+0100\n" "Last-Translator: nikolassj\n" "Language-Team: \n" @@ -58,9 +62,9 @@ msgstr "\"%s\"je GCM/ISO fajl, ili nije GC/Wii ISO." msgid "%1$sCopy%1$s" msgstr "%1$sKopiraj%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "" @@ -145,7 +149,7 @@ msgstr "%sExportuj GCI%s" msgid "%sImport GCI%s" msgstr "%sImportuj GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" @@ -178,11 +182,11 @@ msgstr "&Chit Meneger " msgid "&DSP Settings" msgstr "&DSP Opcije" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Obrisi ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Obrisi oznacene ISO fajlove..." @@ -246,7 +250,7 @@ msgstr "&Pauza" msgid "&Play" msgstr "&Pokreni" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Pribor/Opcije" @@ -290,7 +294,7 @@ msgstr "&Pogledaj" msgid "&Wiimote Settings" msgstr "&Wiimote Opcije" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "" @@ -334,7 +338,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -343,7 +347,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -382,13 +386,13 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR Kodovi" @@ -400,11 +404,11 @@ msgstr "O Dolphin-u" msgid "Acceleration" msgstr "Ubrzanje" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Tacna VBeam emulacija" @@ -504,11 +508,11 @@ msgstr "Adapter" msgid "Add" msgstr "Dodaj" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Dodaj ActionReplay kod" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Dodaj Patch " @@ -516,6 +520,7 @@ msgstr "Dodaj Patch " msgid "Add new pane" msgstr "Dodaj nova okna" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -531,6 +536,11 @@ msgstr "Dodaj nova okna" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Dodaj..." @@ -564,11 +574,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "" @@ -576,14 +586,15 @@ msgstr "" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -596,18 +607,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "" @@ -619,7 +634,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Alternate Wiimote Timing" msgstr "" @@ -639,7 +654,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "" @@ -654,7 +669,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -663,7 +678,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -671,10 +686,11 @@ msgstr "" "Jeste li sigurni da zelite da obrisete ove fajlove?\n" "Nestace zauvek!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -684,6 +700,9 @@ msgstr "Jesi li siguran da zelis da obrises ovaj fajl? Nestace zauvek!" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -692,18 +711,20 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Zvuk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -713,6 +734,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -750,7 +774,7 @@ msgstr "" msgid "Back" msgstr "Nazad " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "" @@ -778,11 +802,11 @@ msgstr "" msgid "Banner" msgstr "Baner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Detalji o Baneru" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Baner:" @@ -794,7 +818,7 @@ msgstr "Bar" msgid "Basic" msgstr "Osnovno/ni/ne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Osnovne opcije" @@ -825,6 +849,7 @@ msgstr "Blue right " #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -832,6 +857,9 @@ msgstr "Blue right " ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Donji deo/dno" @@ -840,7 +868,7 @@ msgstr "Donji deo/dno" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Ostecen/a/nje..." @@ -856,7 +884,7 @@ msgstr "" msgid "Browse for an ISO directory..." msgstr "Trazi ISO direktoriju" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "" @@ -887,11 +915,11 @@ msgstr "C-Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU Emulacije \"Engine\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "" @@ -930,7 +958,7 @@ msgstr "Nemoze otvoriti %s" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -938,7 +966,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -954,8 +982,6 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -965,7 +991,7 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -990,7 +1016,7 @@ msgstr "Promeni Disk" msgid "Change Game" msgstr "Promeni Igru" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1006,8 +1032,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: 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 "" @@ -1027,31 +1053,31 @@ msgstr "Trazi Chit" msgid "Cheats Manager" msgstr "Chit Meneger" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Kineski (pojednostavljen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Kineski (tradicionalan)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Biraj fajl da otvoris " @@ -1059,14 +1085,14 @@ msgstr "Biraj fajl da otvoris " msgid "Choose a memory card:" msgstr "Biraj memorisku karticu:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: 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:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: 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 " @@ -1078,14 +1104,14 @@ msgstr "" msgid "Classic" msgstr "Klasik/a" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Ocisti" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "\"Clear\" nije uspeo " @@ -1101,6 +1127,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1109,6 +1136,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Zatvori" @@ -1132,20 +1163,20 @@ msgstr "Komanda" msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Koment:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Kompresuj ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Kompresuj oznaceni ISO fajlovi..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Kompresivanje ISO fajla u toku" @@ -1172,13 +1203,13 @@ msgstr "" msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "" @@ -1187,7 +1218,7 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "" @@ -1244,12 +1275,12 @@ msgstr "Konvertuj u GCI" msgid "Copy failed" msgstr "Kopiranje neuspesno " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Kopiraj na memorisku karticu %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "" @@ -1276,7 +1307,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "" @@ -1287,7 +1318,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1296,7 +1327,7 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "" @@ -1311,7 +1342,7 @@ msgstr "" msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Zemlja:" @@ -1325,24 +1356,24 @@ msgstr "Kreiraj AR Kod" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 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:498 msgid "Created by VistaIcons.com" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Kreator " @@ -1350,7 +1381,7 @@ msgstr "Kreator " msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Izseci" @@ -1370,7 +1401,7 @@ msgstr "" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "" @@ -1378,11 +1409,11 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "" @@ -1394,10 +1425,11 @@ msgstr "" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1408,18 +1440,22 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "" @@ -1427,15 +1463,23 @@ msgstr "" msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" 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:176 msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "" @@ -1456,7 +1500,7 @@ msgstr "Mrtva Zona " msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "" @@ -1464,16 +1508,16 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "" @@ -1481,11 +1525,11 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "" @@ -1494,7 +1538,7 @@ msgstr "" msgid "Delete" msgstr "Obrisi" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Obrisi save" @@ -1503,7 +1547,7 @@ msgstr "Obrisi save" msgid "Delete the existing file '%s'?" msgstr "Obrisi postojeci fajl '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 #, fuzzy msgid "Description" msgstr "Pitanje " @@ -1512,8 +1556,8 @@ msgstr "Pitanje " msgid "Detect" msgstr "Detekuj" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: 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." @@ -1524,8 +1568,8 @@ msgstr "" msgid "Device" msgstr "Uredjaj " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Opcije Uredjaja " @@ -1548,24 +1592,24 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 #, fuzzy msgid "Disable" msgstr "Onemoguci \"Fog\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Onemoguci \"Fog\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Onemoguci \"Lighting\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Onemoguci \"Textures\" " @@ -1595,7 +1639,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disk" @@ -1619,6 +1663,7 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1628,10 +1673,13 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1657,6 +1705,7 @@ msgstr "" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1681,6 +1730,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1709,11 +1766,11 @@ msgstr "" msgid "Down" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "" @@ -1722,23 +1779,23 @@ msgstr "" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "" @@ -1763,6 +1820,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1778,6 +1836,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "" @@ -1798,7 +1861,7 @@ msgid "" "driver." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "" @@ -1814,7 +1877,7 @@ msgstr "" msgid "Edit ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "" @@ -1826,8 +1889,8 @@ msgstr "" msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "" @@ -1866,7 +1929,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "" @@ -1888,23 +1951,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -1917,6 +1980,7 @@ msgstr "" msgid "Enable Cache" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -1926,51 +1990,54 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "" @@ -1983,13 +2050,13 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: 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:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "" @@ -2009,20 +2076,20 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: 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:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "" @@ -2034,7 +2101,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2051,6 +2118,7 @@ msgstr "" msgid "End" msgstr "Kraj" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2066,6 +2134,11 @@ msgstr "Kraj" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "" @@ -2096,6 +2169,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -2126,18 +2200,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Error" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2169,7 +2249,7 @@ msgstr "" msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "" @@ -2182,15 +2262,15 @@ msgstr "" msgid "Export Recording..." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "" @@ -2206,7 +2286,7 @@ msgstr "" msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "" @@ -2218,44 +2298,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "" @@ -2267,11 +2347,11 @@ msgstr "" msgid "FIFO Player" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "" @@ -2283,11 +2363,11 @@ msgstr "" msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2383,19 +2463,29 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Brzo " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 #, fuzzy msgid "Fast Mipmaps" msgstr "Ucitaj Native Mipmaps" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "" @@ -2405,7 +2495,7 @@ msgstr "" msgid "File Info" msgstr "Informacija o kodu " -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "" @@ -2434,16 +2524,16 @@ msgstr "" msgid "File not compressed" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2451,7 +2541,7 @@ msgstr "" msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "" @@ -2463,7 +2553,7 @@ msgstr "" msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "" @@ -2487,7 +2577,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 " @@ -2518,7 +2608,7 @@ msgstr "" msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "" @@ -2530,7 +2620,7 @@ msgstr "" msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "" @@ -2538,10 +2628,11 @@ msgstr "" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2557,6 +2648,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "" @@ -2591,7 +2687,7 @@ msgstr "Dolphin podesavanja/konfiguracija" msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "" @@ -2607,15 +2703,15 @@ msgstr "Igra nije pokrenuta!" msgid "Game not found!!" msgstr "Igra nije pronadjena " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube " @@ -2626,6 +2722,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2633,6 +2730,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2641,21 +2741,24 @@ msgid "Gamecube Pad settings" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "" -#: Source/Core/Core/Src/GeckoCode.cpp:139 +#: Source/Core/Core/Src/GeckoCode.cpp:222 #, 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.)" +"(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 "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2664,6 +2767,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2673,6 +2779,7 @@ msgstr "" msgid "General Settings" msgstr "Opcije Uredjaja " +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2688,6 +2795,11 @@ msgstr "Opcije Uredjaja " #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Nemacki " @@ -2719,7 +2831,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "" @@ -2751,7 +2863,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "" @@ -2813,12 +2925,16 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "" @@ -2826,12 +2942,12 @@ msgstr "" msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2840,11 +2956,11 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "" @@ -2860,15 +2976,15 @@ msgstr "" msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "ISO Detalji " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "" @@ -2876,21 +2992,22 @@ msgstr "" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: 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:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 msgid "" -"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." +"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:432 @@ -2915,7 +3032,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "" @@ -2959,7 +3076,7 @@ msgstr "" "Onemoguci \"lighting\". Poboljsava performans/brzinu ali uzrokuje da " "\"lightning\" nestane u igrama koje ga koriste." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "" @@ -2968,7 +3085,7 @@ msgid "In-Game" msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info " @@ -2988,7 +3105,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "" @@ -3001,7 +3118,7 @@ msgstr "Ubaci ime ovde..." msgid "Install WAD" msgstr "Instaliraj Wii Meni " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "" @@ -3010,6 +3127,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3019,14 +3137,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "" @@ -3050,11 +3171,11 @@ msgstr "" msgid "Internal Resolution:" msgstr "Rezolucija punog ekrana " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Uvod" @@ -3071,7 +3192,7 @@ msgstr "" msgid "Invalid bat.map or dir entry" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "" @@ -3088,14 +3209,15 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3111,27 +3233,32 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italianski " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (preporucljivo)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japanski " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KOREA " @@ -3140,8 +3267,8 @@ msgstr "KOREA " msgid "Key" msgstr "Taster " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Korejski " @@ -3159,7 +3286,7 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "" @@ -3205,7 +3332,7 @@ msgstr "" msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3213,7 +3340,7 @@ msgstr "" msgid "Load" msgstr "Ucitaj " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 #, fuzzy msgid "Load Custom Textures" msgstr "Ucitaj Hi-Res Textures " @@ -3262,6 +3389,7 @@ msgstr "Ucitaj State Slot 8" msgid "Load State..." msgstr "Ucitaj State" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3271,10 +3399,14 @@ msgstr "Ucitaj State" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Ucitaj Wii Sistem Meni (%d %c)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 @@ -3284,6 +3416,9 @@ msgstr "Ucitaj Wii Sistem Meni (%d %c)" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Ucitaj Wii Sistem Meni (%d %c)" @@ -3307,7 +3442,7 @@ msgstr "" msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "" @@ -3319,11 +3454,11 @@ msgstr "" msgid "Log Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "" @@ -3351,7 +3486,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "" @@ -3373,11 +3508,11 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "" @@ -3402,6 +3537,7 @@ msgstr "&Memorija" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3409,6 +3545,9 @@ msgstr "&Memorija" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "" @@ -3437,7 +3576,7 @@ msgstr "" msgid "Menu" msgstr "Meni" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "" @@ -3446,11 +3585,11 @@ msgstr "" msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "" @@ -3467,7 +3606,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "" @@ -3480,7 +3619,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3495,7 +3634,7 @@ msgstr "" msgid "Multiply" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3585,6 +3724,7 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3594,6 +3734,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3602,7 +3745,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "" @@ -3616,7 +3759,7 @@ msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "" @@ -3628,7 +3771,7 @@ msgstr "" msgid "Nickname :" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "" @@ -3667,7 +3810,7 @@ msgstr "" msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "" @@ -3675,8 +3818,8 @@ msgstr "" msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "" @@ -3696,7 +3839,7 @@ msgstr "" msgid "Notes" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "" @@ -3734,7 +3877,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Izskljucen/o" @@ -3760,11 +3903,11 @@ msgstr "" msgid "Open" msgstr "Otvori " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "" @@ -3786,11 +3929,11 @@ msgstr "" msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -3819,7 +3962,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -3869,19 +4012,20 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -3894,6 +4038,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pauza " @@ -3903,7 +4051,7 @@ msgstr "Pauza " msgid "Per-Pixel Lighting" msgstr "Onemoguci \"Lighting\"" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfektno " @@ -3916,6 +4064,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -3926,6 +4075,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Pokreni " @@ -3939,7 +4092,7 @@ msgstr "Pokreni snimanje " msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "" @@ -3952,6 +4105,7 @@ msgstr "Opcije " msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -3961,6 +4115,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -3972,23 +4129,23 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polski " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -3997,11 +4154,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugalski " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "" @@ -4009,17 +4166,17 @@ msgstr "" msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4032,7 +4189,7 @@ msgstr "" msgid "Prev Page" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "" @@ -4083,7 +4240,7 @@ msgstr "" msgid "RAM" msgstr "RAM " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "Rusija" @@ -4096,7 +4253,7 @@ msgstr "" msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "" @@ -4168,6 +4325,7 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4186,6 +4344,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "" @@ -4235,11 +4399,11 @@ msgstr "" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "" @@ -4247,10 +4411,11 @@ msgstr "" msgid "Sa&ve State" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Siguran " +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4260,6 +4425,9 @@ msgstr "Siguran " ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -4317,12 +4485,12 @@ msgstr "Snimaj State Slot 8" msgid "Save State..." msgstr "Snimaj state..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Snimaj kao..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Snimaj kompresovani GCM/ISO" @@ -4330,11 +4498,11 @@ msgstr "Snimaj kompresovani GCM/ISO" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4343,6 +4511,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4352,15 +4521,18 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Skeniranje..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Skeniranje za ISO fajlove " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Skeniranje..." @@ -4376,12 +4548,12 @@ msgstr "" msgid "Search Filter" msgstr "Trazi Filter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Trazi Subfoldere " -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: 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 "" @@ -4391,6 +4563,7 @@ msgstr "" msgid "Select" msgstr "Izaberi " +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4415,6 +4588,14 @@ msgstr "Izaberi Snimani fajl" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Izaberi Snimani fajl" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje " @@ -4441,16 +4622,21 @@ msgstr "" msgid "Select the file to load" msgstr "Izaberi fajl za ucitavanje " +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Izaberi \"snimani fajl/the save state\"" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Izaberi state za ucitavanje " +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4470,6 +4656,9 @@ msgstr "Izaberi state za ucitavanje " ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Izaberi state za snimanje/save" @@ -4484,7 +4673,7 @@ msgid "" "If unsure, select Auto." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Odabrani font" @@ -4520,11 +4709,11 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4533,11 +4722,11 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "" @@ -4547,7 +4736,7 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "" @@ -4559,7 +4748,7 @@ msgstr "" msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "" @@ -4588,7 +4777,7 @@ msgstr "" msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "" @@ -4604,7 +4793,7 @@ msgstr "" msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "" @@ -4620,7 +4809,7 @@ msgstr "" msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "" @@ -4640,7 +4829,7 @@ msgstr "" msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "" @@ -4660,34 +4849,34 @@ msgstr "" 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:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "" @@ -4718,7 +4907,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "" @@ -4726,12 +4915,12 @@ msgstr "" msgid "Size" msgstr "Velicina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 #, fuzzy msgid "Skip BIOS" msgstr "Preskoci GC BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -4763,11 +4952,11 @@ msgstr "" msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "" @@ -4787,7 +4976,7 @@ 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:621 msgid "Sound Settings" msgstr "" @@ -4805,6 +4994,7 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -4820,6 +5010,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "" @@ -4843,7 +5038,7 @@ msgstr "" msgid "Specify a video backend" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4851,7 +5046,7 @@ msgstr "" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "" @@ -4944,12 +5139,12 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "" @@ -4988,7 +5183,7 @@ msgstr "" msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5006,7 +5201,7 @@ msgstr "Tacan \"Texture Cache\"" msgid "Texture Cache" msgstr "Tacan \"Texture Cache\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "" @@ -5022,13 +5217,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5047,7 +5242,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -5069,7 +5264,7 @@ msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5107,7 +5302,7 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "" @@ -5115,13 +5310,13 @@ msgstr "" msgid "Theme selection went wrong" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5133,7 +5328,7 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" @@ -5149,19 +5344,10 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -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 "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." 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" @@ -5169,7 +5355,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" @@ -5192,7 +5378,7 @@ msgstr "" msgid "To" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "" @@ -5212,6 +5398,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5219,14 +5406,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "" @@ -5234,7 +5424,7 @@ msgstr "" msgid "Triggers" msgstr "" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "" @@ -5244,7 +5434,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "" @@ -5265,11 +5455,11 @@ msgstr "" msgid "UDP Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "" @@ -5347,7 +5537,7 @@ msgstr "Updejt " msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -5360,7 +5550,7 @@ msgstr "&Pun Ekran" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "" @@ -5381,7 +5571,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "" @@ -5405,25 +5595,28 @@ msgstr "" msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Video " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Jacina zvuka " -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +msgid "WAD installation failed: error creating ticket" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5438,15 +5631,15 @@ msgstr "" msgid "Warning" msgstr "Upozorenje " -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Upozorenje - pokrece se DOL u pogresan konzol mod!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Upozorenje - pokrece se ELF u pogresan konzol mod!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Upozorenje - pogretanje ISO fajla u pogresan konzol mod!" @@ -5472,7 +5665,7 @@ msgstr "" "koji imaju isto ime kao i fajlovi na vasoj memoriskoj kartici\n" " Nastavi?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5480,7 +5673,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5488,7 +5681,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5516,7 +5709,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "" @@ -5524,15 +5717,15 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "" @@ -5540,6 +5733,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5549,6 +5743,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5612,10 +5809,11 @@ msgstr "" msgid "Windows Right" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5631,6 +5829,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Radi..." @@ -5638,6 +5841,10 @@ msgstr "Radi..." msgid "Write to Console" msgstr "" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +msgid "Write to Debugger" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "" @@ -5691,7 +5898,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5709,7 +5916,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "" @@ -5763,7 +5970,7 @@ msgstr "" msgid "^ ADD" msgstr "^ DODAJ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "" @@ -5794,12 +6001,12 @@ msgstr "" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/tr.po b/Languages/po/tr.po index a3e5d84924..890dd90043 100644 --- a/Languages/po/tr.po +++ b/Languages/po/tr.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -19,6 +20,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Clean up Turkish translation file. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-20 19:22+0200\n" >>>>>>> Update Hungarian and Turkish translations. "Last-Translator: nlgzrgn \n" @@ -65,9 +69,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sKopyala%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -161,7 +165,7 @@ msgstr "%sGCI Ver%s" msgid "%sImport GCI%s" msgstr "%sGCI Al%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u BoÅŸ Blok; %u BoÅŸ Dizin GiriÅŸi" @@ -194,11 +198,11 @@ msgstr "Hile Yöneti&cisi" msgid "&DSP Settings" msgstr "Ses Ayarları (&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "Kalıbı Sil... (&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "Seçilen Kalıpları Sil... (&D)" @@ -262,7 +266,7 @@ msgstr "Duraklat (&P)" msgid "&Play" msgstr "Oynat (&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "Özellikler (&P)" @@ -306,7 +310,7 @@ msgstr "Görünüm (&V)" msgid "&Wiimote Settings" msgstr "&Wiimote Ayarları" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -350,7 +354,7 @@ msgstr "" msgid "" msgstr "<Çözünürlük bulunamadı>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -359,7 +363,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -415,13 +419,13 @@ msgstr "" "\n" "TCP baÄŸlantı noktanızı barındırıcıya yönlendirmelisiniz!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR Kodları" @@ -433,11 +437,11 @@ msgstr "Dolphin Hakkında" msgid "Acceleration" msgstr "Hızlandırma" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "DoÄŸruluk:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "DoÄŸru VBeam Emülasyonu" @@ -553,11 +557,11 @@ msgstr "Dönüştürücü:" msgid "Add" msgstr "Ekle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Action Replay Kodu Ekle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Yama Ekle" @@ -565,6 +569,7 @@ msgstr "Yama Ekle" msgid "Add new pane" msgstr "Bölme ekle" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -580,6 +585,11 @@ msgstr "Bölme ekle" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Ekle..." @@ -629,11 +639,11 @@ msgstr "" "Düğmeleri etkinleÅŸtirmek için gerekli olan analog denetim basıncını " "ayarlayın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "GeliÅŸmiÅŸ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "GeliÅŸmiÅŸ Ayarlar" @@ -641,14 +651,15 @@ msgstr "GeliÅŸmiÅŸ Ayarlar" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Tüm GC/Wii dosyaları (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Tüm GC/Wii kalıpları (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Tüm GameCube GCM Dosyaları (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -661,18 +672,22 @@ msgstr "Tüm GameCube GCM Dosyaları (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tüm Kayıtlı Oyunlar (sav,s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Tüm Wii kalıpları (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 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:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Tüm dosyalar (*.*)|*.*" @@ -688,7 +703,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Alternate Wiimote Timing" msgstr "Alternatif Wiimote Zamanlaması" @@ -708,7 +723,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:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -726,7 +741,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, kapalı seçin." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arapça" @@ -735,7 +750,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -743,12 +758,13 @@ msgstr "" "Bu dosyaları gerçekten silmek istiyor musunuz?\n" "Silindikten sonra bu dosyaları geri döndüremezsiniz!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -758,6 +774,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "En-boy Oranı:" @@ -766,18 +785,20 @@ 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:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Ses" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Ses Çözücüsü:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO sürücüyü açarken hata.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -787,6 +808,9 @@ msgstr "AudioCommon: AO sürücüyü açarken hata.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Otomatik" @@ -829,7 +853,7 @@ msgstr "" msgid "Back" msgstr "Geri" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Çözücü Ayarları" @@ -856,11 +880,11 @@ msgstr "Kötü Dosya Başı" msgid "Banner" msgstr "AfiÅŸ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "AfiÅŸ Ayrıntıları" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "AfiÅŸ:" @@ -872,7 +896,7 @@ msgstr "Çubuk" msgid "Basic" msgstr "Temel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Temel Ayarlar" @@ -903,6 +927,7 @@ msgstr "Mavi SaÄŸ" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -910,6 +935,9 @@ msgstr "Mavi SaÄŸ" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Alt" @@ -918,7 +946,7 @@ msgstr "Alt" msgid "Bound Controls: %lu" msgstr "BaÄŸlı Denetimler: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Bozuk" @@ -934,7 +962,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:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Çıkış klasörü için gözat" @@ -964,11 +992,11 @@ msgstr "C ÇubuÄŸu" msgid "C-Stick" msgstr "C ÇubuÄŸu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU Emülatör Motoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Görüntü Listelerini Önbellekle" @@ -1019,7 +1047,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:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1030,7 +1058,7 @@ msgstr "" "%s\n" "Geçerli bir Gamecube hafıza kartı dosyası deÄŸil." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1048,8 +1076,6 @@ msgstr "BD ile WiiMote bulunamadı: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Sap baÄŸlantısı ile Wiimote bulunamadı: %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1059,7 +1085,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:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Katalanca" @@ -1084,7 +1110,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:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1100,8 +1126,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:506 #: 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!" @@ -1122,31 +1148,31 @@ msgstr "Hile Arama" msgid "Cheats Manager" msgstr "Hile Yöneticisi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Çince (Basit)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Çince (Geleneksel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: 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:762 +#: 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:755 +#: 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:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Eklemek için bir konum seçin" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Açmak için bir dosya seçin" @@ -1154,7 +1180,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:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1162,8 +1188,8 @@ msgstr "" "Apploader olarak bir dosya seçin: (Sadece konumlardan yapılan disklere " "uygulanır)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: 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" @@ -1175,14 +1201,14 @@ msgstr "Çember Çubuk" msgid "Classic" msgstr "Klasik" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Temizle" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Temizleme baÅŸarısız." @@ -1198,6 +1224,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1206,6 +1233,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Kapat" @@ -1229,20 +1260,20 @@ msgstr "Komut" msgid "Comment" msgstr "Yorum" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Yorum:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Kalıbı sıkıştır..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Seçili kalıpları sıkıştır..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Kalıp sıkıştırılıyor..." @@ -1269,13 +1300,13 @@ msgstr "Kolları Yapılandır" msgid "Configure..." msgstr "Yapılandır..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Dosyanın Ãœzerine Yazmaya Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Durdurma Onayı Ä°ste" @@ -1284,7 +1315,7 @@ msgstr "Durdurma Onayı Ä°ste" msgid "Connect" msgstr "BaÄŸlan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "USB Klavye BaÄŸla" @@ -1341,12 +1372,12 @@ msgstr "GCI'ya dönüştür" msgid "Copy failed" msgstr "Kopyalama baÅŸarısız." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Hafıza kartı %c 'ye kopyala" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Çekirdek" @@ -1376,7 +1407,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Kalıp dosyası %s tanınamadı." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "%s kaydedilemedi." @@ -1389,7 +1420,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:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1401,7 +1432,7 @@ msgstr "" "\n" "Dolphin'i bir CD/DVD'den çalıştırıyorsunuz veya kayıt dosyası yazma korumalı." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Uzantı 'ini' için açma komutu bulunamadı." @@ -1418,7 +1449,7 @@ msgstr "" msgid "Count:" msgstr "Sayı:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Ãœlke:" @@ -1432,28 +1463,28 @@ 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:500 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:497 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:498 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:499 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:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "OluÅŸturan:" @@ -1461,7 +1492,7 @@ msgstr "OluÅŸturan:" msgid "Critical" msgstr "Önemli" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Kırp" @@ -1485,7 +1516,7 @@ 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:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Özel Görüntüleme Hilesi" @@ -1493,11 +1524,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:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Bazı ortografik projeksiyon parametrelerini özelleÅŸtir." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Çekçe" @@ -1509,10 +1540,11 @@ msgstr "Yön TuÅŸları" msgid "DSP" msgstr "Ses" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Ses Emülatörü Motoru" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1523,18 +1555,22 @@ msgstr "Ses Emülatörü Motoru" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emülasyonu (Hızlı)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: 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:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "Ä°ÅŸlem Birimi Ãœzerinde DSP LLE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE Yeniden Derleyici" @@ -1542,15 +1578,23 @@ msgstr "DSP LLE Yeniden Derleyici" msgid "DSP settings" msgstr "Ses ayarları" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD Kök Dizini:" +#: 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:176 msgid "Data Size" msgstr "Veri Boyutu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Tarih:" @@ -1571,7 +1615,7 @@ msgstr "Ölü Bölge" msgid "Debug" msgstr "Hata ayıklama" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Hata ayıklama" @@ -1579,16 +1623,16 @@ msgstr "Hata ayıklama" msgid "Decimal" msgstr "Onluk taban" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Kalıbı geniÅŸlet..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Seçili kalıpları geniÅŸlet..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Kalıp geniÅŸletiliyor..." @@ -1596,11 +1640,11 @@ msgstr "Kalıp geniÅŸletiliyor..." msgid "Default" msgstr "Varsayılan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Varsayılan kalıp:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Varsayılan yazı tipi" @@ -1609,7 +1653,7 @@ msgstr "Varsayılan yazı tipi" msgid "Delete" msgstr "Sil" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Kaydı sil" @@ -1618,7 +1662,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:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Açıklama" @@ -1626,8 +1670,8 @@ msgstr "Açıklama" msgid "Detect" msgstr "Belirle" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: 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." @@ -1639,8 +1683,8 @@ msgstr "" msgid "Device" msgstr "Sürücü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Sürücü Ayarları" @@ -1665,23 +1709,23 @@ msgstr "" "ve konum yedeÄŸi doÄŸrulama da baÅŸarısız." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Ä°ptal et" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Sisi Ä°ptal Et" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Işıklandırmayı Ä°ptal Et" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Piksel DerinliÄŸini Ä°ptal Et" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Dokuları Ä°ptal Et" @@ -1725,7 +1769,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disk" @@ -1752,6 +1796,7 @@ msgstr "" msgid "Divide" msgstr "Böl" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1761,10 +1806,13 @@ msgstr "Böl" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Emülasyonu durdurmak istiyor musunuz?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1789,6 +1837,7 @@ msgstr "Dolphin Taklit Wiimote Yapılandırması" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1813,6 +1862,14 @@ msgstr "Dolphin GC Kolu Yapılandırması" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC Kolu Yapılandırması" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filmleri (*.dtm)" @@ -1845,11 +1902,11 @@ msgstr "" msgid "Down" msgstr "AÅŸağı" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Kodları Ä°ndir (WiiRD Veritabanı)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu kod indirildi. (%lu eklendi.)" @@ -1858,23 +1915,23 @@ msgstr "%lu kod indirildi. (%lu eklendi.)" msgid "Drums" msgstr "Davullar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Kukla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Sesi Dök" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "EFB Hedef Dökümü" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Kareleri Dök" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Dokuları Dök" @@ -1909,6 +1966,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1924,6 +1982,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Flemenkçe" @@ -1947,7 +2010,7 @@ msgstr "" "azından %d.%d sürümü olmalıdır. --- EÄŸer Dolphin'i sürekli güncelliyorsanız, " "Windows'un sürücüyü görmesi için yeniden baÅŸlatma gerekebilir." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "AVRUPA" @@ -1963,7 +2026,7 @@ msgstr "Düzen" msgid "Edit ActionReplay Code" msgstr "Action Replay Kodunu Düzenle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Yapılandırmayı Düzenle" @@ -1975,8 +2038,8 @@ msgstr "Yamayı Düzenle" msgid "Edit current perspective" msgstr "Åžu anki perspektifi düzenle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Düzenle..." @@ -2026,7 +2089,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Taklit Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Emülasyon Durumu:" @@ -2054,18 +2117,15 @@ msgstr "" msgid "Enable AR Logging" msgstr "AR GeçmiÅŸine Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Ses Hızlandırmasına Ä°zin Ver" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "BAT'a Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Blok BirleÅŸimine Ä°zin Ver" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 @@ -2076,6 +2136,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "Sınırlayıcı Kutu Hesaplama'yı EtkinleÅŸtir" @@ -2084,6 +2147,7 @@ msgstr "Sınırlayıcı Kutu Hesaplama'yı EtkinleÅŸtir" msgid "Enable Cache" msgstr "Ön BelleÄŸe Ä°zin Ver" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2093,51 +2157,54 @@ msgstr "Ön BelleÄŸe Ä°zin Ver" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Hilelere Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "DTK MüziÄŸine Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Çift ÇekirdeÄŸe Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: 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:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Kısayol TuÅŸlarına Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "BoÅŸta Atlamaya Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "BoÅŸta Atlamaya Ä°zin Ver (hızı artırır)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "MMU'ya Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Progresif Taramaya Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Ekran Koruyucusuna Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "GeniÅŸ Ekrana Ä°zin Ver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "GeniÅŸ Çerçeveye Ä°zin Ver" @@ -2155,7 +2222,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, 1x seçin." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2163,7 +2230,7 @@ msgstr "" "Disk eriÅŸimini hızlandırır. Bazı oyunlarda gereklidir. (Açık = Hızlı, Kapalı " "= Uyumlu)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Sayfalara izin ver" @@ -2193,7 +2260,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2201,7 +2268,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:311 +#: 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 = " @@ -2211,7 +2278,7 @@ 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:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Özel Gösterim Hilesini EtkinleÅŸtirir" @@ -2227,7 +2294,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2249,6 +2316,7 @@ msgstr "" msgid "End" msgstr "Son" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2264,6 +2332,11 @@ msgstr "Son" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Ä°ngilizce" @@ -2294,6 +2367,7 @@ msgstr "EÅŸit" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Hata" @@ -2326,11 +2400,17 @@ msgstr "" "Ãœzgünüz, Wii kaydında geçici hasar var." >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Hata" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 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." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " @@ -2342,7 +2422,7 @@ msgstr "" "yüklemesinden vazgeçiliyor..." >>>>>>> Clean up Turkish translation file. -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2376,7 +2456,7 @@ msgstr "Dolphin Emülatöründen Çık" msgid "Export Failed" msgstr "Verme baÅŸarısız." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Dosya Ver" @@ -2389,15 +2469,15 @@ msgstr "Çekimi Ver" msgid "Export Recording..." msgstr "Çekimi Ver..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Kaydı Ver" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Wii Kayıtlı Oyununu Ver (Deneme Amaçlı)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Tüm Kayıtları Ver" @@ -2413,7 +2493,7 @@ msgstr "Kaydı farklı ver..." msgid "Extension" msgstr "Uzantı" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Harici Çerçeve Tamponu" @@ -2425,44 +2505,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Tüm Dosyaları GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Apploader'i GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "DOL'ü GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Konumu GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Dosyayı GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Bölüntüyü GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "%s GeniÅŸletiliyor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Tüm Dosyalar GeniÅŸletiliyor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Konum GeniÅŸletiliyor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "GeniÅŸletiliyor..." @@ -2474,11 +2554,11 @@ msgstr "FIFO Bayt'ı" msgid "FIFO Player" msgstr "FIFO Oynatıcısı" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANSA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FST Boyutu:" @@ -2490,11 +2570,11 @@ msgstr "BaÄŸlantı baÅŸarısız!" msgid "Failed to Listen!!" msgstr "Dinleme baÅŸarısız!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Kod indirme baÅŸarısız." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "%s 'ye geniÅŸletme baÅŸarısız!" @@ -2611,18 +2691,28 @@ 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/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Hızlı" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Hızlı MipMap'ler" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Fifo Oynatıcısı" @@ -2631,7 +2721,7 @@ msgstr "Fifo Oynatıcısı" msgid "File Info" msgstr "Dosya Bilgisi" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Dosya kod içermemektedir." @@ -2664,16 +2754,16 @@ msgstr "Dosya bir hafıza kartı olarak tanınamadı." msgid "File not compressed" msgstr "Dosya sıkıştırılmadı." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Bilinmeyen açma modu : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Dosya sistemi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Dosya türü 'ini' bilinmiyor! Açılmayacaktır!" @@ -2681,7 +2771,7 @@ msgstr "Dosya türü 'ini' bilinmiyor! Açılmayacaktır!" msgid "First Block" msgstr "Ä°lk Blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "SaÄŸlamayı Düzelt" @@ -2693,7 +2783,7 @@ msgstr "16:9 'a zorla" msgid "Force 4:3" msgstr "4:3 'e zorla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Konsolu NTSC-J Olmaya Zorla" @@ -2725,7 +2815,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 " @@ -2761,7 +2851,7 @@ msgstr "Çerçeve" msgid "Frame Advance" msgstr "GeliÅŸmiÅŸ Çerçeveleme" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Çerçeve dökümünde FFV1 kullan" @@ -2773,7 +2863,7 @@ msgstr "Çerçeve Aralığı" msgid "Frame S&kipping" msgstr "Çerçeve Atlama(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Çerçeve Sınırı:" @@ -2781,10 +2871,11 @@ msgstr "Çerçeve Sınırı:" msgid "Frames To Record" msgstr "Çekilecek Çerçeveler" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Serbest Bakış" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2800,6 +2891,11 @@ msgstr "Serbest Bakış" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Fransızca" @@ -2838,7 +2934,7 @@ msgstr "GCMic Yapılandırması" msgid "GCPad" msgstr "GC Kolu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "Oyun ID'si:" @@ -2854,15 +2950,15 @@ msgstr "Oyun çalışmıyor!" msgid "Game not found!!" msgstr "Oyun bulunamadı!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Oyuna Özel Ayarlar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Oyun Yapılandırması" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "GameCube" @@ -2873,6 +2969,7 @@ msgstr "Gamecube Kolu Ayarları (&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2880,6 +2977,9 @@ msgstr "Gamecube Kolu Ayarları (&P)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube Hafıza Kartları (*.raw,*.gcp)" @@ -2888,15 +2988,17 @@ msgid "Gamecube Pad settings" msgstr "GameCube Kolu Ayarları" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko Kodları" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, 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.)" +"(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 Kodu çalışmadı: (CT%i CST%i) (%s)\n" "(kötü bir kod veya türü henüz desteklenmiyor.)" @@ -2911,8 +3013,12 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Genel" @@ -2921,6 +3027,7 @@ msgstr "Genel" msgid "General Settings" msgstr "Genel Ayarlar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2936,6 +3043,11 @@ msgstr "Genel Ayarlar" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Almanca" @@ -2972,7 +3084,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Yunanca" @@ -3004,7 +3116,7 @@ msgstr "Hack'ler" msgid "Header checksum failed" msgstr "BaÅŸlık saÄŸlama hatası" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Ä°branice" @@ -3073,12 +3185,16 @@ msgstr "Kısayol TuÅŸu Yapılandırması" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "TuÅŸlar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Macarca" @@ -3086,12 +3202,12 @@ msgstr "Macarca" msgid "Hybrid Wiimote" msgstr "Karışık Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3104,11 +3220,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:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - kötü durak" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL Ayarları" @@ -3124,15 +3240,15 @@ msgstr "Kızılötesi Ä°ÅŸaretleyici" msgid "IR Sensitivity:" msgstr "Kızılötesi Hassasiyeti:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Kalıp Ayrıntıları" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Kalıp Konumları" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "Ä°TALYA" @@ -3140,7 +3256,7 @@ msgstr "Ä°TALYA" msgid "Icon" msgstr "Simge" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3151,17 +3267,19 @@ msgstr "" "Mario oyunları tarafından kullanılır." >>>>>>> Clean up Turkish translation file. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: 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:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy msgid "" -"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." +"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 "" "EÄŸer çerçeve sınırını oyun hızından yüksek seçerseniz (NTSC:60, PAL:50), ses " "ayarlarında Ses hızlandırmasını da iptal ederek bunu daha etkili " @@ -3199,7 +3317,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Kayıt Al" @@ -3250,7 +3368,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Oyun İçi" @@ -3259,7 +3377,7 @@ msgid "In-Game" msgstr "Oyun-İçi" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Bilgi" @@ -3279,7 +3397,7 @@ msgstr "Ekle" msgid "Insert Encrypted or Decrypted code here..." msgstr "Åžifreli veya ÅŸifresiz kodu buraya ekleyin..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "SD Kart Ekle" @@ -3291,7 +3409,7 @@ msgstr "Adı buraya yazın..." msgid "Install WAD" msgstr "WAD Kur" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Wii Menüsüne kur" @@ -3302,6 +3420,7 @@ msgstr "" "Kurulum Özel Durum Ä°ÅŸleyici çaÄŸrıldı, ama bu platform henüz bunu " "desteklemiyor." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3311,14 +3430,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WAD kuruluyor..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Arabirim" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Arabirim Ayarları" @@ -3343,11 +3465,11 @@ msgstr "İç LZO Hatası - lzo_init() baÅŸarısız." msgid "Internal Resolution:" msgstr "İç Çözünürlük:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Yorumlayıcı (Çok YavaÅŸ)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Ä°ntro" @@ -3364,7 +3486,7 @@ msgstr "Hatalı DeÄŸer!" msgid "Invalid bat.map or dir entry" msgstr "Hatalı bat.map veya konum giriÅŸi" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Hatalı olay türü: %i" @@ -3384,14 +3506,15 @@ msgstr "" "%s\n" "Oyunu yeniden dökmeniz gerekebilir." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Hatalı çekim dosyası" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Hatalı durum" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3407,27 +3530,32 @@ msgstr "Hatalı durum" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Ä°talyanca" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPONYA" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Yeniden Derleyici (önerilen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL Deneysel Yeniden Derleyici" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japonca" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KORE" @@ -3436,8 +3564,8 @@ msgstr "KORE" msgid "Key" msgstr "TuÅŸ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Korece" @@ -3455,7 +3583,7 @@ msgstr "L Düğmesi" msgid "L-Analog" msgstr "L Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Dil:" @@ -3508,7 +3636,7 @@ msgstr "" msgid "Less Than" msgstr "Daha Az" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "FPS Sınırlaması" @@ -3516,7 +3644,7 @@ msgstr "FPS Sınırlaması" msgid "Load" msgstr "Yükle" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Özel Dokuları Yükle" @@ -3564,6 +3692,7 @@ msgstr "Durumu Yükle : 8" msgid "Load State..." msgstr "Durumu Yükle..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3585,6 +3714,13 @@ msgstr "Wii Sistem Menüsünü Yükle" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Wii Sistem Menüsünü Yükle" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii Sistem Menüsünü Yükle %d%c" @@ -3611,7 +3747,7 @@ msgstr "Belirtilen dosyayı yükler (DOL,ELF,WAD,GCM,ISO)" msgid "Local" msgstr "Yerel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Ä°ÅŸlem Birimlerini Çekirdeklere Kilitle" @@ -3623,11 +3759,11 @@ msgstr "GeçmiÅŸ" msgid "Log Configuration" msgstr "GeçmiÅŸ Yapılandırması" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "GeçmiÅŸ Türü" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "GeçmiÅŸ Çıkışı" @@ -3657,7 +3793,7 @@ msgstr "" "MD5 eÅŸleÅŸmiyor\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Hız Hilesi" @@ -3679,11 +3815,11 @@ msgstr "MadCatz Gameshark dosyaları(*.gcs)" msgid "Main Stick" msgstr "Ana Çubuk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "Yapımcı ID'si:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Yapımcı:" @@ -3707,6 +3843,7 @@ msgstr "Hafıza Baytı" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3714,6 +3851,9 @@ msgstr "Hafıza Baytı" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Hafıza Kartı" @@ -3750,7 +3890,7 @@ msgstr "Hafıza kartı dosya boyutu baÅŸlık boyutuyla eÅŸleÅŸmiyor" msgid "Menu" msgstr "Menü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mikrofon" @@ -3759,11 +3899,11 @@ msgstr "Mikrofon" msgid "Min" msgstr "En az" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "ÇeÅŸitli" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "ÇeÅŸitli Ayarlar" @@ -3784,7 +3924,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "BoÅŸluklu yazı" @@ -3797,7 +3937,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3819,7 +3959,7 @@ msgstr "" msgid "Multiply" msgstr "Çarp" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3911,6 +4051,7 @@ msgstr "NP Sekme" msgid "NP Up" msgstr "NP Yukarı" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3920,6 +4061,9 @@ msgstr "NP Yukarı" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3928,7 +4072,7 @@ msgstr "Ä°sim:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Ä°sim:" @@ -3942,7 +4086,7 @@ msgid "New Scan" msgstr "Yeni Tarama" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Sonraki Sayfa" @@ -3954,7 +4098,7 @@ msgstr "Sonraki Tarama" msgid "Nickname :" msgstr "Takma Ad :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Ãœlke Yok (SDK)" @@ -3993,7 +4137,7 @@ msgstr "BaÅŸlık %s için kayıt klasörü bulunamadı" msgid "None" msgstr "Hiçbiri" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norveççe (Bokmaal Lehçesi)" @@ -4001,8 +4145,8 @@ msgstr "Norveççe (Bokmaal Lehçesi)" msgid "Not Equal" msgstr "EÅŸit DeÄŸil" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Ayarlanmamış" @@ -4022,7 +4166,7 @@ msgstr "BaÄŸlı deÄŸil" msgid "Notes" msgstr "Notlar" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notlar:" @@ -4060,7 +4204,7 @@ msgstr "Nesne" msgid "Object Range" msgstr "Nesne Aralığı" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Kapalı" @@ -4086,11 +4230,11 @@ msgstr "Sadece %d blok kullanılabilir" msgid "Open" msgstr "Aç" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Dosya konumunu aç (&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Wii kayıt kla&sörünü aç" @@ -4112,11 +4256,11 @@ 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:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL Doku Çözücü" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP Doku Çözücü" @@ -4148,7 +4292,7 @@ msgstr "" "ve kayıtları yeni bir hafıza kartına alın.\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "DiÄŸer" @@ -4200,19 +4344,20 @@ msgstr "Paragraf" msgid "Parameters" msgstr "Parametreler" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Bölüntü %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Yamalar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Yollar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4225,6 +4370,10 @@ msgstr "Yollar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Duraklat" @@ -4233,7 +4382,7 @@ msgstr "Duraklat" msgid "Per-Pixel Lighting" msgstr "Piksel Aydınlatması" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Mükemmel" @@ -4246,6 +4395,7 @@ msgstr "Perspektif %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4256,6 +4406,10 @@ msgstr "Perspektif %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Oynat" @@ -4269,7 +4423,7 @@ msgstr "Çekimi Oynat" msgid "Play/Pause" msgstr "Oynat/Duraklat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Oynanabilir" @@ -4281,6 +4435,7 @@ msgstr "Oynatma Seçenekleri" msgid "Players" msgstr "Oyuncular" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4290,6 +4445,9 @@ msgstr "Oyuncular" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Lütfen onaylayın..." @@ -4301,23 +4459,23 @@ msgstr "Kaydetmeden önce lütfen bir perspektif oluÅŸturun" msgid "Plus-Minus" msgstr "Artı-Eksi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Lehçe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "BaÄŸ. Nok. 1:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "BaÄŸ. Nok. 2:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "BaÄŸ. Nok. 3:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "BaÄŸ. Nok. 4:" @@ -4326,11 +4484,11 @@ msgstr "BaÄŸ. Nok. 4:" msgid "Port :" msgstr "BaÄŸ. Nok. :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portekizce" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portekizce (Brezilya)" @@ -4338,7 +4496,7 @@ msgstr "Portekizce (Brezilya)" msgid "Post-Processing Effect:" msgstr "Geç Ä°ÅŸleme Etkisi:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" <<<<<<< HEAD @@ -4347,7 +4505,7 @@ msgstr "" msgstr "PlayController'da erken kayıt bitiÅŸi. %u + 8 > %u" >>>>>>> Clean up Turkish translation file. -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" <<<<<<< HEAD @@ -4356,7 +4514,7 @@ msgstr "" msgstr "PlayWiimote'da erken kayıt bitiÅŸi. %u + %d > %u" >>>>>>> Clean up Turkish translation file. -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" <<<<<<< HEAD @@ -4373,7 +4531,7 @@ msgstr "Önayarlar:" msgid "Prev Page" msgstr "Önceki Sayfa" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Önceki Sayfa" @@ -4424,7 +4582,7 @@ msgstr "R Analog" msgid "RAM" msgstr "Anabellek" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSYA" @@ -4437,7 +4595,7 @@ msgstr "Aralık" msgid "Read-only mode" msgstr "Salt Okunur Mod" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Gerçek" @@ -4512,6 +4670,7 @@ msgstr "Listeyi Yenile" msgid "Refresh game list" msgstr "Oyun Listesini Yenile" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4530,6 +4689,12 @@ msgstr "Oyun Listesini Yenile" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Kaldır" @@ -4582,11 +4747,11 @@ msgstr "SaÄŸ Çubuk" msgid "Rumble" msgstr "Gümbürtü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: 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:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Rusça" @@ -4594,10 +4759,11 @@ msgstr "Rusça" msgid "Sa&ve State" msgstr "Durumu Kaydet (&V)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Güvenli" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4607,6 +4773,9 @@ msgstr "Güvenli" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Örnek Oran:" @@ -4664,12 +4833,12 @@ msgstr "Durumu Kaydet : 8" msgid "Save State..." msgstr "Durumu Kaydet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Farklı kaydet..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Sıkıştırılan GCM/ISO'yu kaydet" @@ -4677,11 +4846,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:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "GeniÅŸletilen GCM/ISO'yu kaydet" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Kayıtlı durum filmi %s bozuk, film çekimi duruyor..." @@ -4690,6 +4859,7 @@ msgstr "Kayıtlı durum filmi %s bozuk, film çekimi duruyor..." msgid "Scaled EFB Copy" msgstr "Boyutlandırılmış EFB Kopyası" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4699,15 +4869,18 @@ msgstr "Boyutlandırılmış EFB Kopyası" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Taranıyor %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Kalıplar taranıyor" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Taranıyor..." @@ -4723,12 +4896,12 @@ msgstr "Kaydırma Kilidi" msgid "Search Filter" msgstr "Arama Filtresi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Alt Klasörleri Ara" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: 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 "SYSCONF içinde %s bölümü bulunamadı" @@ -4738,6 +4911,7 @@ msgstr "SYSCONF içinde %s bölümü bulunamadı" msgid "Select" msgstr "Seç" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4762,6 +4936,14 @@ msgstr "Çekim Dosyasını Seç" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Çekim Dosyasını Seç" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Kurmak için bir Wii WAD dosyası seçin" @@ -4787,6 +4969,7 @@ msgstr "Sabit olmayan pencereyi seçin" msgid "Select the file to load" msgstr "Yüklemek için dosyayı seçin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4803,19 +4986,26 @@ msgstr "Yüklemek için durum seçin" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Kayıt dosyasını seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Yüklemek için durum seçin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Kaydetmek için durum seçin" @@ -4837,7 +5027,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, otomatik seçin." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Seçilen yazı tipi" @@ -4885,11 +5075,11 @@ msgstr "Sensör Çubuk Konumu:" msgid "Separator" msgstr "Bölücü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Sırpça" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4899,11 +5089,11 @@ msgstr "" msgid "Set" msgstr "Ayarla" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Varsayılan Kalıp Olarak Ayarla (&D)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Varsayılan Hafıza Kartı %c olarak ayarla" @@ -4913,7 +5103,7 @@ 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:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Ayarlar..." @@ -4925,7 +5115,7 @@ msgstr "SetupWiiMem: Ayar dosyası bulunamadı" msgid "Shake" msgstr "Sallama" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Kısa Ä°sim:" @@ -4953,7 +5143,7 @@ msgstr "Araç ÇubuÄŸunu Gös&ter" msgid "Show Drives" msgstr "Aygıtları Göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "EFB Bölge Kopyalamasını Göster" @@ -4969,7 +5159,7 @@ msgstr "Fransızları Göster" msgid "Show GameCube" msgstr "GameCube'leri Göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Görüntü GiriÅŸini Göster" @@ -4985,7 +5175,7 @@ msgstr "Japonları Göster" msgid "Show Korea" msgstr "Korelileri Göster" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Gösterme Dili:" @@ -5005,7 +5195,7 @@ msgstr "Platformları Göster" msgid "Show Regions" msgstr "Bölgeleri Göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Ä°statistikleri Göster" @@ -5025,11 +5215,11 @@ msgstr "WAD'ları Göster" 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 " @@ -5039,23 +5229,23 @@ 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:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Ä°lk bloÄŸu göster" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Kayıt bloklarını göster" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Kayıt yorumunu göster" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Kayıt simgesini göster" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Kayıt baÅŸlığını göster" @@ -5093,7 +5283,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Yatay Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "BasitleÅŸtirilmiÅŸ Çince" @@ -5101,11 +5291,11 @@ msgstr "BasitleÅŸtirilmiÅŸ Çince" msgid "Size" msgstr "Boyut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "BIOS'u Geç" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Hedef Alpha GeçiÅŸini Atla" @@ -5145,11 +5335,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5173,7 +5363,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:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Ses Ayarları" @@ -5191,6 +5381,7 @@ msgstr "Ses tamponu oluÅŸturulamadı: %s" msgid "Space" msgstr "BoÅŸluk" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5206,6 +5397,11 @@ msgstr "BoÅŸluk" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Ä°spanyolca" @@ -5237,7 +5433,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Bir görüntü arka ucu belirtin" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Disk Aktarım Oranını Hızlandır" @@ -5245,7 +5441,7 @@ msgstr "Disk Aktarım Oranını Hızlandır" msgid "Square Stick" msgstr "Kare Çubuk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Varsayılan Denetim Aygıtı" @@ -5343,12 +5539,12 @@ msgstr "Kayıt dosyaları baÅŸarıyla alındı" msgid "Swing" msgstr "Hareket" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Sistem Dili:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAYVAN" @@ -5387,7 +5583,7 @@ msgstr "Tablo SaÄŸ" msgid "Take Screenshot" msgstr "Ekran Görüntüsü Al" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" <<<<<<< HEAD msgstr "" @@ -5407,7 +5603,7 @@ msgstr "Doku" msgid "Texture Cache" msgstr "Doku Ön BelleÄŸi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Doku Biçimi Kaplaması" @@ -5423,13 +5619,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:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "Seçilen konum zaten listede" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5452,7 +5648,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:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Belirtilen dosya (%s) bulunamadı" @@ -5470,11 +5666,12 @@ 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:98 +#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" "Bunu güvenli bir ÅŸekilde ayarlamanız, emülatörün RAM'den doku güncellemesi " "kaybetme oranını azaltacaktır. \n" @@ -5518,7 +5715,7 @@ msgstr "Belirtilen dosya \"%s\" bulunamadı" msgid "The value is invalid" msgstr "DeÄŸer hatalı" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema" @@ -5526,7 +5723,7 @@ msgstr "Tema" msgid "Theme selection went wrong" msgstr "Tema seçiminde hata" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5534,7 +5731,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:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5549,7 +5746,7 @@ msgid "" msgstr "" "Bu Action Replay simülatörü, kodların kendisini düzenlemesini desteklemiyor." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: 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." @@ -5572,25 +5769,10 @@ msgstr "" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -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 "" -"Bu seçenek oyun hızının sesle denetlenmesini saÄŸlar. \n" -"Ä°ptal ederseniz oyun hızında anormallik olabilir,mesela oyun çok hızlı " -"çalışabilir. \n" -"Ama bazen bunu iÅŸaretlemek gürültüye neden olabilir. \n" -"\n" -"Klavye Kısayolu : Hızlandırmayı anında iptal etmek için basılı tutun." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Arka plan müziklerini oynatmak için kullanılır." -#: 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" @@ -5602,7 +5784,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:283 +#: 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." @@ -5625,7 +5807,7 @@ msgstr "BaÅŸlık" msgid "To" msgstr "Buraya" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Tüm GeçmiÅŸ Türlerini Seç" @@ -5645,6 +5827,7 @@ msgstr "Tam Ekran Moduna Geç" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5652,14 +5835,17 @@ msgstr "Tam Ekran Moduna Geç" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Ãœst" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Geleneksel Çince" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Bilinmeyen bir dosya türünü yüklemeyi denedi." @@ -5667,7 +5853,7 @@ msgstr "Bilinmeyen bir dosya türünü yüklemeyi denedi." msgid "Triggers" msgstr "Tetikler" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Geçersiz SYSCONF'tan okumayı deniyor" @@ -5679,7 +5865,7 @@ msgstr "" "Geçersiz SYSCONF'tan okumayı deniyor\n" "Wiimote BT ID'leri mevcut deÄŸil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Türkçe" @@ -5700,11 +5886,11 @@ msgstr "UDP BaÄŸ.Nok.:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "BÄ°LÄ°NMEYEN" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "AMERÄ°KA" @@ -5789,7 +5975,7 @@ msgstr "Güncelle" msgid "Upright Wiimote" msgstr "Dik Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 Modunu Kullan (PAL60)" @@ -5801,7 +5987,7 @@ msgstr "Tam Ekran Kullan" msgid "Use Hex" msgstr "HEX Kullan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Önemli Hataları Bildir" @@ -5831,7 +6017,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Gereçler" @@ -5855,25 +6041,29 @@ msgstr "DeÄŸer:" msgid "Verbosity" msgstr "Duyuru/Hata/Uyarı" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Görüntü" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Sanal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Ses" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD kurulumu baÅŸarısız: %s oluÅŸturmada hata" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "WAD kurulumu baÅŸarısız: %s oluÅŸturmada hata" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5892,15 +6082,15 @@ msgstr "" msgid "Warning" msgstr "Uyarı" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 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:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Uyarı - ELF yanlış konsol modunda baÅŸlatılıyor!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Uyarı - Kalıp yanlış konsol modunda baÅŸlatılıyor!" @@ -5929,7 +6119,7 @@ msgstr "" "ve hafıza kartınızdaki dosyayla aynı adda olacak.\n" "Devam?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5944,7 +6134,7 @@ msgstr "" "taktirde, büyük bir ihtimalle, senkronizasyon sorunu yaÅŸayacaksınız." >>>>>>> Clean up Turkish translation file. -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5959,7 +6149,7 @@ msgstr "" "senkronizasyon sorunu yaÅŸayacaksınız." >>>>>>> Clean up Turkish translation file. -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -6005,7 +6195,7 @@ msgstr "WaveFileWriter - dosya açılamadı." msgid "Whammy" msgstr "Darbe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "GeniÅŸ Ekran Hilesi" @@ -6013,15 +6203,15 @@ msgstr "GeniÅŸ Ekran Hilesi" msgid "Width" msgstr "GeniÅŸlik" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii Konsolu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND Kök Dizini:" @@ -6029,6 +6219,7 @@ msgstr "Wii NAND Kök Dizini:" msgid "Wii Save Import" msgstr "Wii Kaydı Al" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -6038,6 +6229,9 @@ msgstr "Wii Kaydı Al" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii kayıt dosyaları (*.bin)|*.bin" @@ -6104,10 +6298,11 @@ msgstr "Pencere Menüsü" msgid "Windows Right" msgstr "Pencereleri SaÄŸa Döşe" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Heceleme" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6123,6 +6318,11 @@ msgstr "Heceleme" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Çalışıyor..." @@ -6130,6 +6330,11 @@ msgstr "Çalışıyor..." msgid "Write to Console" msgstr "Konsola Yaz" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Dosyaya Yaz" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Dosyaya Yaz" @@ -6185,7 +6390,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:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 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." @@ -6208,7 +6413,7 @@ msgstr "" "0x%04x olmalıdır (sizinki: 0x%04llx) \n" "Yenisini oluÅŸturmak ister misiniz?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP Hilesi" @@ -6278,7 +6483,7 @@ msgstr "" msgid "^ ADD" msgstr "^ EKLE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6309,12 +6514,12 @@ msgstr "Bir Wii kaydı deÄŸil veya bu baÅŸlık boyutu için okuma hatası: %x" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "Bilinmeyen komut 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute uygulama çalışırken -1'e düştü!" @@ -6551,6 +6756,9 @@ msgstr "| VEYA" #~ msgid "Emulator Display Settings" #~ msgstr "Emülatör Görüntü Ayarları" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Ses Hızlandırmasına Ä°zin Ver" + #, fuzzy #~ msgid "Enable CPU Access" #~ msgstr "Ön BelleÄŸe Ä°zin Ver" @@ -6614,6 +6822,13 @@ msgstr "| VEYA" #~ msgid "Error allocating buffer" #~ msgstr "Tampon ayırma hatası" +#~ msgid "" +#~ "Error in PlayWiimote. %u != %u, byte %d.\n" +#~ "Sorry, Wii recording is temporarily broken." +#~ msgstr "" +#~ "PlayWiimote'da hata. %u != %u, byte %d.\n" +#~ "Ãœzgünüz, Wii kaydında geçici hasar var." + #~ msgid "Error loading %s: can't read info" #~ msgstr "%s yüklenirken hata: Bilgi okunamıyor." @@ -6912,6 +7127,20 @@ msgstr "| VEYA" #~ msgid "The file " #~ msgstr "Dosya" +#~ 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 "" +#~ "Bu seçenek oyun hızının sesle denetlenmesini saÄŸlar. \n" +#~ "Ä°ptal ederseniz oyun hızında anormallik olabilir,mesela oyun çok hızlı " +#~ "çalışabilir. \n" +#~ "Ama bazen bunu iÅŸaretlemek gürültüye neden olabilir. \n" +#~ "\n" +#~ "Klavye Kısayolu : Hızlandırmayı anında iptal etmek için basılı tutun." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Ses efektlerini oynatmak için kullanılır." diff --git a/Languages/po/zh_CN.po b/Languages/po/zh_CN.po index 4a55b8ea04..f7bb9c4575 100644 --- a/Languages/po/zh_CN.po +++ b/Languages/po/zh_CN.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-01-09 13:55-0800\n" "Last-Translator: thegfw \n" "Language-Team: \n" @@ -57,9 +61,9 @@ msgstr "\"%s\" ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ GCM/ISO 文件, 或者ä¸æ˜¯ä¸€ä¸ª GC/Wii msgid "%1$sCopy%1$s" msgstr "%1$så¤åˆ¶%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -151,7 +155,7 @@ msgstr "%s导出 GCI%s" msgid "%sImport GCI%s" msgstr "%s导入 GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u 空闲区å—; %u 空闲目录项目" @@ -184,11 +188,11 @@ msgstr "作弊ç ç®¡ç†å™¨(&C)" msgid "&DSP Settings" msgstr "音频设置(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "删除镜åƒ(&D)..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "删除所选镜åƒ(&D)" @@ -252,7 +256,7 @@ msgstr "æš‚åœæ¸¸æˆ(&P)" msgid "&Play" msgstr "开始游æˆ(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "属性(&P)" @@ -296,7 +300,7 @@ msgstr "视图(&V)" msgid "&Wiimote Settings" msgstr "&Wiimote 设置" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "百科(&W)" @@ -340,7 +344,7 @@ msgstr "<在这里æ’å…¥å称>" msgid "" msgstr "<未找到分辨率>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "<æ— >" @@ -349,7 +353,7 @@ msgstr "<æ— >" msgid "" msgstr "<按任æ„é”®>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<系统>" @@ -405,13 +409,13 @@ msgstr "" "\n" "You must forward TCP port to host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-基æ¿" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "动作回放代ç " @@ -423,11 +427,11 @@ msgstr "关于 Dolphin" msgid "Acceleration" msgstr "加速器" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "精确脉冲染料激光模拟" @@ -532,11 +536,11 @@ msgstr "适é…器:" msgid "Add" msgstr "添加" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "添加动作回放代ç " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "添加补ä¸" @@ -544,6 +548,7 @@ msgstr "添加补ä¸" msgid "Add new pane" msgstr "添加新é¢æ¿" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -559,6 +564,11 @@ msgstr "添加新é¢æ¿" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "添加..." @@ -592,11 +602,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "调整摇æ†æŽ§åˆ¶éœ€è¦æ´»åŠ¨çš„按钮." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "高级" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "高级设置" @@ -604,14 +614,15 @@ msgstr "高级设置" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "所有 GC/Wii 文件 (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "所有 GC/Wii é•œåƒ (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 文件 (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -624,18 +635,22 @@ msgstr "所有 Gamecube GCM 文件 (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "æ‰€æœ‰å­˜æ¡£çŠ¶æ€ (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "所有 Wii é•œåƒæ–‡ä»¶ (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "所有压缩的 GC/Wii é•œåƒæ–‡ä»¶ (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "所有文件 (*.*)|*.*" @@ -647,7 +662,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "模拟 Wiimote" @@ -668,7 +683,7 @@ msgstr "应用程åºè½½å…¥å™¨å¤§å°é”™è¯¯...这真是一个应用程åºè½½å…¥å™¨ msgid "Apploader unable to load from file" msgstr "应用程åºè½½å…¥å™¨ä¸èƒ½ä»Žæ–‡ä»¶è½½å…¥" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "应用载入器:" @@ -683,7 +698,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -692,7 +707,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "您确定è¦åˆ é™¤ \"%s\" ?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -700,10 +715,11 @@ msgstr "" "请确认真的è¦åˆ é™¤è¿™äº›æ–‡ä»¶?\n" "这将是永久性的删除!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "请确认真的è¦åˆ é™¤è¿™äº›æ–‡ä»¶?这将是永久性的删除!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -713,6 +729,9 @@ msgstr "请确认真的è¦åˆ é™¤è¿™äº›æ–‡ä»¶?这将是永久性的删除!" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "高宽比:" @@ -721,18 +740,20 @@ msgstr "高宽比:" msgid "At least one pane must remain open." msgstr "必须有一个窗å£ä¿æŒæ‰“å¼€" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "音频" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "音频åŽç«¯:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: 打开 AO 设备错误.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -742,6 +763,9 @@ msgstr "AudioCommon: 打开 AO 设备错误.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自动" @@ -780,7 +804,7 @@ msgstr "" msgid "Back" msgstr "Back" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "åŽç«¯è®¾ç½®" @@ -808,11 +832,11 @@ msgstr "无效文件头" msgid "Banner" msgstr "标志" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "标志详细信æ¯" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "标志:" @@ -824,7 +848,7 @@ msgstr "Bar" msgid "Basic" msgstr "基本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "基本 设置" @@ -855,6 +879,7 @@ msgstr "è“ å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -862,6 +887,9 @@ msgstr "è“ å³" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "底部" @@ -870,7 +898,7 @@ msgstr "底部" msgid "Bound Controls: %lu" msgstr "绑定控制器: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "æŸå" @@ -886,7 +914,7 @@ msgstr "æµè§ˆè¦æ·»åŠ çš„目录" msgid "Browse for an ISO directory..." msgstr "æµè§ˆé•œåƒç›®å½•" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "æµè§ˆè¾“出目录" @@ -917,11 +945,11 @@ msgstr "C-摇æ†" msgid "C-Stick" msgstr "C-摇æ†" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU 模拟引擎" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 #, fuzzy msgid "Cache Display Lists" msgstr "å¯ç”¨æ˜¾ç¤ºåˆ—表缓存" @@ -961,7 +989,7 @@ msgstr "ä¸èƒ½æ‰“å¼€ %s" msgid "Cannot unregister events with events pending" msgstr "事件未决时ä¸èƒ½å注册事件" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -971,7 +999,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:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -989,8 +1017,6 @@ msgstr "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "ä¸èƒ½æŒ‰ç…§è¿žæŽ¥å¥æŸ„ %02x 找到 WiiMote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1000,7 +1026,7 @@ msgstr "ä¸èƒ½ä»Ž DVDæ’件 - DVD接å£è¯»å–æ•°æ®: 严é‡é”™è¯¯" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -1025,7 +1051,7 @@ msgstr "切æ¢å…‰ç›˜" msgid "Change Game" msgstr "切æ¢æ¸¸æˆ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1041,8 +1067,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: 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!" @@ -1062,32 +1088,32 @@ msgstr "作弊ç æœç´¢" msgid "Cheats Manager" msgstr "金手指管ç†" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "简体中文" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "ç¹ä½“中文" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "选择一个DVD根目录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Choose a NAND root directory:" msgstr "选择一个DVD根目录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "选择一个默认镜åƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "选择一个è¦æ·»åŠ çš„目录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "选择è¦æ‰“开的文件" @@ -1095,7 +1121,7 @@ msgstr "选择è¦æ‰“开的文件" msgid "Choose a memory card:" msgstr "选择一个内存å¡" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1103,8 +1129,8 @@ msgstr "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "选择解压缩到的文件夹" @@ -1116,14 +1142,14 @@ msgstr "Circle Stick" msgid "Classic" msgstr "ç»å…¸" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "清除" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "清除失败" @@ -1139,6 +1165,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1147,6 +1174,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "关闭" @@ -1170,20 +1201,20 @@ msgstr "命令" msgid "Comment" msgstr "注释" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "注释:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "压缩镜åƒ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "压缩所选镜åƒ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "压缩镜åƒä¸­" @@ -1210,13 +1241,13 @@ msgstr "设置手柄" msgid "Configure..." msgstr "设置..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "确认文件覆盖" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 #, fuzzy msgid "Confirm on Stop" msgstr "åœæ­¢æ—¶ç¡®è®¤" @@ -1226,7 +1257,7 @@ msgstr "åœæ­¢æ—¶ç¡®è®¤" msgid "Connect" msgstr "连接" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "连接 USB 键盘" @@ -1283,12 +1314,12 @@ msgstr "转æ¢åˆ° GCI" msgid "Copy failed" msgstr "å¤åˆ¶å¤±è´¥" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "å¤åˆ¶åˆ°å†…å­˜å¡ %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "核心" @@ -1318,7 +1349,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "ä¸èƒ½è¯†åˆ« ISO 文件 %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "ä¸èƒ½ä¿å­˜ %s" @@ -1331,7 +1362,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:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1343,7 +1374,7 @@ msgstr "" "\n" "您是ä¸æ˜¯åœ¨CD/DVD上è¿è¡Œçš„Dolphin?或者存档文件带有写入ä¿æŠ¤?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Couldn't find open command for extension 'ini'!" @@ -1360,7 +1391,7 @@ msgstr "" msgid "Count:" msgstr "æ•°é‡:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "国家:" @@ -1374,25 +1405,25 @@ msgstr "创建动作回放代ç " msgid "Create new perspective" msgstr "创建新布局" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 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:497 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:498 msgid "Created by VistaIcons.com" msgstr "Created by VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 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:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "创建者:" @@ -1400,7 +1431,7 @@ msgstr "创建者:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "è£åˆ‡" @@ -1420,7 +1451,7 @@ msgstr "淡入淡出" 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:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "自定义投影修正" @@ -1428,11 +1459,11 @@ msgstr "自定义投影修正" msgid "Custom Projection Hack Settings" msgstr "自定义投影修正设置" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "自定义一些正交投影å‚æ•°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "æ·å…‹è¯­" @@ -1444,10 +1475,11 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP音频" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "音频模拟引擎" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1458,19 +1490,23 @@ msgstr "音频模拟引擎" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "音频 HLE 模拟(很快)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "音频 LLE 解释(很慢)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 #, fuzzy msgid "DSP LLE on Thread" msgstr "DSP LLE 于线程" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "音频 LLE é‡ç¼–译器" @@ -1478,15 +1514,23 @@ msgstr "音频 LLE é‡ç¼–译器" msgid "DSP settings" msgstr "音频设置" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" 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 "" + +#: 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:176 msgid "Data Size" msgstr "æ•°æ®å¤§å°" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "日期:" @@ -1507,7 +1551,7 @@ msgstr "死区" msgid "Debug" msgstr "调试" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 #, fuzzy msgid "Debugging" msgstr "调试" @@ -1516,16 +1560,16 @@ msgstr "调试" msgid "Decimal" msgstr "å进制" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "解压缩镜åƒä¸­..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "解压缩所选镜åƒ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "解压缩镜åƒä¸­" @@ -1533,11 +1577,11 @@ msgstr "解压缩镜åƒä¸­" msgid "Default" msgstr "默认" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "默认镜åƒ:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "默认字体" @@ -1546,7 +1590,7 @@ msgstr "默认字体" msgid "Delete" msgstr "删除" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "删除存档" @@ -1555,7 +1599,7 @@ msgstr "删除存档" msgid "Delete the existing file '%s'?" msgstr "删除已ç»å­˜åœ¨çš„文件 '%s' 么?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 #, fuzzy msgid "Description" msgstr "询问" @@ -1564,8 +1608,8 @@ msgstr "询问" msgid "Detect" msgstr "检测" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: 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." @@ -1578,8 +1622,8 @@ msgstr "" msgid "Device" msgstr "设备" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "设备设置" @@ -1604,25 +1648,25 @@ msgstr "" "和目录备份校检失败" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 #, fuzzy msgid "Disable" msgstr "ç¦ç”¨é›¾åŒ–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "ç¦ç”¨é›¾åŒ–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "ç¦ç”¨å…‰çº¿" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 #, fuzzy msgid "Disable Per-Pixel Depth" msgstr "åƒç´ æ·±åº¦" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "ç¦ç”¨æè´¨" @@ -1652,7 +1696,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "光盘" @@ -1677,6 +1721,7 @@ msgstr "按模拟器显示输入读å–" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1686,10 +1731,13 @@ msgstr "Divide" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "您确定是å¦åœæ­¢å½“å‰æ¨¡æ‹Ÿ?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1715,6 +1763,7 @@ msgstr "Dolphin 模拟 Wiimote 设置" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1739,6 +1788,14 @@ msgstr "Dolphin GC 手柄设置" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC 手柄设置" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 电影 (*.dtm)" @@ -1767,11 +1824,11 @@ msgstr "Dolphin 当å‰è®¾ç½®äº†éšè—所有游æˆ. åŒå‡»è¿™é‡Œæ˜¾ç¤ºæ‰€æœ‰æ¸¸ msgid "Down" msgstr "下" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "ä¸‹è½½ä»£ç  (WiiRD æ•°æ®åº“)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "已下载 %lu 代ç (已添加 %lu)" @@ -1780,23 +1837,23 @@ msgstr "已下载 %lu 代ç (已添加 %lu)" msgid "Drums" msgstr "鼓" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "虚拟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "转储音频" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "转储 EFB 目标" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "转储框架" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "转储æè´¨" @@ -1822,6 +1879,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1837,6 +1895,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "è·å…°è¯­" @@ -1862,7 +1925,7 @@ msgstr "" "reboot is probably required at this point to get Windows to see the new " "driver." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "欧版" @@ -1878,7 +1941,7 @@ msgstr "编辑" msgid "Edit ActionReplay Code" msgstr "编辑动作回放代ç " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "编辑设置" @@ -1890,8 +1953,8 @@ msgstr "编辑补ä¸" msgid "Edit current perspective" msgstr "编辑当å‰å¤–观" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "编辑..." @@ -1930,7 +1993,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "模拟 Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "模拟器状æ€: " @@ -1952,23 +2015,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "å¯ç”¨åŠ¨ä½œå›žæ”¾è®°å½•" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "å¯ç”¨éŸ³é¢‘调节" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "å¯ç”¨ BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "å¯ç”¨åŒºå—åˆå¹¶" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -1982,6 +2045,7 @@ msgstr "" msgid "Enable Cache" msgstr "å¯ç”¨ç¼“å­˜" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -1991,52 +2055,55 @@ msgstr "å¯ç”¨ç¼“å­˜" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "å¯ç”¨ä½œå¼Š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "å¯ç”¨ DTK 音ä¹" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "å¯ç”¨å¤šæ ¸å¤„ç†" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "å¯ç”¨å¤šæ ¸å¤„ç†(加速)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "å¯ç”¨çƒ­é”®" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "å¯ç”¨ç©ºé—²æ­¥è¿›" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "å¯ç”¨ç©ºé—²æ­¥è¿›(加速)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "å¯ç”¨ MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "å¯ç”¨é€è¡Œæ‰«æ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 #, fuzzy msgid "Enable Screen Saver" msgstr "å¯ç”¨å®½å±" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "å¯ç”¨å®½å±" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "å¯ç”¨çº¿æ¡†" @@ -2052,13 +2119,13 @@ msgstr "" "Enables anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: 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:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Enable pages" @@ -2078,7 +2145,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2086,7 +2153,7 @@ msgstr "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: 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 = " @@ -2096,7 +2163,7 @@ msgstr "" "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " "Fast)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "å¯ç”¨è‡ªå®šä¹‰æŠ•å½±ä¿®æ­£" @@ -2108,7 +2175,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2125,6 +2192,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2140,6 +2208,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "英语" @@ -2170,6 +2243,7 @@ msgstr "等于" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "错误" @@ -2200,18 +2274,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "错误" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Error loading selected language. Falling back to system default." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2245,7 +2325,7 @@ msgstr "Exit Dolphin with emulator" msgid "Export Failed" msgstr "导出失败" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "导出文件" @@ -2258,15 +2338,15 @@ msgstr "导出录制" msgid "Export Recording..." msgstr "导出录制..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "导出存档" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "导出 Wii 存档 (实验性)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "导出所有存档" @@ -2282,7 +2362,7 @@ msgstr "导出存档为..." msgid "Extension" msgstr "扩展" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 #, fuzzy msgid "External Frame Buffer" msgstr "外部å‚æ•°" @@ -2295,44 +2375,44 @@ msgstr "外部å‚æ•°" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "解压缩所有文件..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "解压缩 Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "解压缩 DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "解压缩目录..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "解压缩文件..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "解压缩分区..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "解压缩 %s 中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "解压缩所有文件中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "解压缩目录中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "解压缩中..." @@ -2345,11 +2425,11 @@ msgstr "" msgid "FIFO Player" msgstr "玩家" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "法国" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FST 大å°:" @@ -2361,11 +2441,11 @@ msgstr "连接失败!" msgid "Failed to Listen!!" msgstr "监å¬å¤±è´¥!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "下载代ç å¤±è´¥." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "解压缩到 %s 失败!" @@ -2475,19 +2555,29 @@ msgstr "写入文件头到 %s 失败" msgid "Failed to write header for file %d" msgstr "写入文件头失败 %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "快速" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 #, fuzzy msgid "Fast Mipmaps" msgstr "载人原始纹ç†" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 #, fuzzy msgid "Fifo Player" @@ -2498,7 +2588,7 @@ msgstr "玩家" msgid "File Info" msgstr "代ç ä¿¡æ¯" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "文件未包å«ä»£ç ." @@ -2531,16 +2621,16 @@ msgstr "文件ä¸èƒ½è¢«è¯†åˆ«æˆå†…å­˜å¡" msgid "File not compressed" msgstr "文件ä¸æ˜¯å·²åŽ‹ç¼©æ–‡ä»¶" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: æœªçŸ¥æ‰“å¼€æ¨¡å¼ : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "文件系统" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "文件类型 'ini' 未知! ä¸èƒ½æ‰“å¼€!" @@ -2548,7 +2638,7 @@ msgstr "文件类型 'ini' 未知! ä¸èƒ½æ‰“å¼€!" msgid "First Block" msgstr "第一个区å—" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "修正校检和" @@ -2560,7 +2650,7 @@ msgstr "强制 16:9" msgid "Force 4:3" msgstr "强制 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 #, fuzzy msgid "Force Console as NTSC-J" msgstr "设置终端为 NTSC-J" @@ -2593,7 +2683,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 " @@ -2628,7 +2718,7 @@ msgstr "Frame Advance" msgid "Frame Advance" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "帧转储使用 FFV1" @@ -2642,7 +2732,7 @@ msgstr "Frame Advance" msgid "Frame S&kipping" msgstr "帧数跳跃(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "帧数é™åˆ¶:" @@ -2650,10 +2740,11 @@ msgstr "帧数é™åˆ¶:" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "自由视点" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2669,6 +2760,11 @@ msgstr "自由视点" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "法语" @@ -2703,7 +2799,7 @@ msgstr "记录设置" msgid "GCPad" msgstr "手柄" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "æ¸¸æˆ ID:" @@ -2719,15 +2815,15 @@ msgstr "游æˆæ²¡æœ‰è¿è¡Œ!" msgid "Game not found!!" msgstr "游æˆæ²¡æ‰¾åˆ°!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "游æˆç‰¹æ®Šè®¾ç½®" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "游æˆé…ç½®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2738,6 +2834,7 @@ msgstr "Gamecube 手柄设置(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2745,6 +2842,9 @@ msgstr "Gamecube 手柄设置(&P)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube å†…å­˜å¡ (*.raw,*.gcp)" @@ -2753,15 +2853,17 @@ msgid "Gamecube Pad settings" msgstr "Gamecube 手柄设置" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko 代ç " -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, 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.)" +"(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 "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" "(either a bad code or the code type is not yet supported.)" @@ -2770,6 +2872,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2778,6 +2881,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "常规" @@ -2787,6 +2893,7 @@ msgstr "常规" msgid "General Settings" msgstr "ç•Œé¢è®¾ç½®" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2802,6 +2909,11 @@ msgstr "ç•Œé¢è®¾ç½®" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "德语" @@ -2833,7 +2945,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "希腊语" @@ -2865,7 +2977,7 @@ msgstr "" msgid "Header checksum failed" msgstr "头部校检失败" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "希伯æ¥è¯­" @@ -2932,12 +3044,16 @@ msgstr "热键设置" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "热键" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "匈牙利语" @@ -2945,12 +3061,12 @@ msgstr "匈牙利语" msgid "Hybrid Wiimote" msgstr "æ··åˆ Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2963,11 +3079,11 @@ msgstr "" "TitleID %016llx.\n" " Dolphin will likely hang now" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - bad destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL 设置" @@ -2983,15 +3099,15 @@ msgstr "IR 指针" msgid "IR Sensitivity:" msgstr "红外çµæ•åº¦:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "é•œåƒè¯¦ç»†ä¿¡æ¯" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "é•œåƒç›®å½•" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "æ„大利" @@ -2999,22 +3115,24 @@ msgstr "æ„大利" msgid "Icon" msgstr "图标" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: 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:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy msgid "" -"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." +"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 "" "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." @@ -3042,7 +3160,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "导入存档" @@ -3091,7 +3209,7 @@ msgstr "" "Disable lighting. Improves performance but causes lighting to disappear in " "games which use it." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "进游æˆ" @@ -3100,7 +3218,7 @@ msgid "In-Game" msgstr "进游æˆ" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "ä¿¡æ¯" @@ -3120,7 +3238,7 @@ msgstr "æ’å…¥" msgid "Insert Encrypted or Decrypted code here..." msgstr "在这里æ’入加密的或者解密的代ç ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "æ’å…¥SDå¡" @@ -3133,7 +3251,7 @@ msgstr "在这里æ’å…¥å称..." msgid "Install WAD" msgstr "安装 Wii èœå•" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "安装到Wiièœå•" @@ -3143,6 +3261,7 @@ msgid "" msgstr "" "InstallExceptionHandler called, but this platform does not yet support it." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3152,16 +3271,19 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "安装 WAD 到 Wii èœå•ä¸­..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 #, fuzzy msgid "Interface" msgstr "ç•Œé¢è®¾ç½®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "ç•Œé¢è®¾ç½®" @@ -3187,11 +3309,11 @@ msgstr "内部 LZO 错误 - lzo_init() 失败" msgid "Internal Resolution:" msgstr "å…¨å±åˆ†è¾¨çŽ‡:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "解释器 (éžå¸¸æ…¢)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "片头" @@ -3208,7 +3330,7 @@ msgstr "无效值!" msgid "Invalid bat.map or dir entry" msgstr "无效 bat.map 或 目录项目" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "无效事件类型 %i" @@ -3228,14 +3350,15 @@ msgstr "" "%s\n" " You may need to redump this game." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "无效录制文件" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Invalid state" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3251,27 +3374,32 @@ msgstr "Invalid state" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "æ„大利语" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "日本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT é‡ç¼–译器 (推è)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL 实验性é‡ç¼–译器" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "日语" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "韩国" @@ -3280,8 +3408,8 @@ msgstr "韩国" msgid "Key" msgstr "按键" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "韩语" @@ -3299,7 +3427,7 @@ msgstr "L é”®" msgid "L-Analog" msgstr "L-摇æ†" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "语言:" @@ -3352,7 +3480,7 @@ msgstr "" msgid "Less Than" msgstr "å°äºŽ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3360,7 +3488,7 @@ msgstr "" msgid "Load" msgstr "载入" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 #, fuzzy msgid "Load Custom Textures" msgstr "载入精细æè´¨" @@ -3409,6 +3537,7 @@ msgstr "载入存档æ’槽 8" msgid "Load State..." msgstr "载入状æ€..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3418,10 +3547,14 @@ msgstr "载入状æ€..." ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "载入 Wii 系统èœå•(%d %c)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 @@ -3431,6 +3564,9 @@ msgstr "载入 Wii 系统èœå•(%d %c)" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "载入 Wii 系统èœå•(%d %c)" @@ -3455,7 +3591,7 @@ msgstr "载入指定文件 (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "本地" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 #, fuzzy msgid "Lock Threads to Cores" msgstr "é”定线程到核心" @@ -3468,11 +3604,11 @@ msgstr "日志" msgid "Log Configuration" msgstr "记录设置" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "记录类型" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "记录输出" @@ -3502,7 +3638,7 @@ msgstr "" "MD5 ä¸åŒ¹é…\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU 速度破解" @@ -3524,11 +3660,11 @@ msgstr "MadCatz Gameshark 文件(*.gcs)" msgid "Main Stick" msgstr "主摇æ†" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "制作者ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "制作者:" @@ -3553,6 +3689,7 @@ msgstr "内存(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3560,6 +3697,9 @@ msgstr "内存(&M)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "内存å¡" @@ -3594,7 +3734,7 @@ msgstr "" msgid "Menu" msgstr "èœå•" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mic" @@ -3604,11 +3744,11 @@ msgstr "Mic" msgid "Min" msgstr "Mic" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "其它" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "其它设置" @@ -3625,7 +3765,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "等宽字体" @@ -3638,7 +3778,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "马达" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3653,7 +3793,7 @@ msgstr "" msgid "Multiply" msgstr "多人游æˆ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3743,6 +3883,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3752,6 +3893,9 @@ msgstr "NP Up" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3760,7 +3904,7 @@ msgstr "å称:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "å称:" @@ -3774,7 +3918,7 @@ msgid "New Scan" msgstr "新建扫æ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "下一页" @@ -3786,7 +3930,7 @@ msgstr "下一扫æ" msgid "Nickname :" msgstr "昵称 :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "无国家 (SDK)" @@ -3826,7 +3970,7 @@ msgstr "No save folder found for title %s" msgid "None" msgstr "æ— " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "挪å¨è¯­" @@ -3834,8 +3978,8 @@ msgstr "挪å¨è¯­" msgid "Not Equal" msgstr "ä¸ç­‰äºŽ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "未设置" @@ -3855,7 +3999,7 @@ msgstr "未连接" msgid "Notes" msgstr "说明" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "说明: " @@ -3893,7 +4037,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "关闭" @@ -3919,11 +4063,11 @@ msgstr "åªæœ‰ %d 区å—有效" msgid "Open" msgstr "打开" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "打开包å«æ–‡ä»¶å¤¹(&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "打开 Wii 存档目录(&S)" @@ -3945,11 +4089,11 @@ msgstr "OpenAL: ä¸èƒ½æ‰¾åˆ°éŸ³é¢‘设备" msgid "OpenAL: can't open device %s" msgstr "OpenAL: ä¸èƒ½æ‰“开设备 %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -3981,7 +4125,7 @@ msgstr "" "and import the the saves to a new memcard\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -4033,19 +4177,20 @@ msgstr "Paragraph" msgid "Parameters" msgstr "å‚æ•°" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "分区 %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "è¡¥ä¸" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "路径" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4058,6 +4203,10 @@ msgstr "路径" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "æš‚åœ" @@ -4067,7 +4216,7 @@ msgstr "æš‚åœ" msgid "Per-Pixel Lighting" msgstr "åƒç´ å…‰çº¿" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "完美" @@ -4080,6 +4229,7 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4090,6 +4240,10 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "开始" @@ -4103,7 +4257,7 @@ msgstr "播放录制" msgid "Play/Pause" msgstr "开始/æš‚åœ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "å¯ä»¥çŽ©" @@ -4116,6 +4270,7 @@ msgstr "选项" msgid "Players" msgstr "玩家" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4125,6 +4280,9 @@ msgstr "玩家" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "请确认..." @@ -4136,23 +4294,23 @@ msgstr "Please create a perspective before saving" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "波兰语" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "ç«¯å£ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "ç«¯å£ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "ç«¯å£ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "ç«¯å£ 4" @@ -4161,11 +4319,11 @@ msgstr "ç«¯å£ 4" msgid "Port :" msgstr "ç«¯å£ :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "è‘¡è„牙语" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "è‘¡è„牙语(巴西)" @@ -4174,17 +4332,17 @@ msgstr "è‘¡è„牙语(巴西)" msgid "Post-Processing Effect:" msgstr "Post-Processing Shader:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4197,7 +4355,7 @@ msgstr "预置: " msgid "Prev Page" msgstr "上一页" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "上一页" @@ -4248,7 +4406,7 @@ msgstr "R-摇æ†" msgid "RAM" msgstr "内存" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "俄语" @@ -4261,7 +4419,7 @@ msgstr "范围" msgid "Read-only mode" msgstr "åªè¯»æ¨¡å¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "真实" @@ -4339,6 +4497,7 @@ msgstr "刷新列表" msgid "Refresh game list" msgstr "刷新游æˆåˆ—表" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4357,6 +4516,12 @@ msgstr "刷新游æˆåˆ—表" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "移除" @@ -4409,11 +4574,11 @@ msgstr "å³æ‘‡æ†" msgid "Rumble" msgstr "震动" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: 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:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "俄语" @@ -4421,10 +4586,11 @@ msgstr "俄语" msgid "Sa&ve State" msgstr "ä¿å­˜çŠ¶æ€(&V)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "安全" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4434,6 +4600,9 @@ msgstr "安全" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "采样率:" @@ -4491,12 +4660,12 @@ msgstr "存档æ’槽 8" msgid "Save State..." msgstr "ä¿å­˜çŠ¶æ€..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "å¦å­˜ä¸º..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "ä¿å­˜åŽ‹ç¼©çš„GCM/é•œåƒ" @@ -4504,11 +4673,11 @@ msgstr "ä¿å­˜åŽ‹ç¼©çš„GCM/é•œåƒ" msgid "Save current perspective" msgstr "ä¿å­˜å½“å‰è§†è§’" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "ä¿å­˜è§£åŽ‹ç¼©çš„GCM/é•œåƒ" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Savestate movie %s is corrupted, movie recording stopping..." @@ -4518,6 +4687,7 @@ msgstr "Savestate movie %s is corrupted, movie recording stopping..." msgid "Scaled EFB Copy" msgstr "EFB 比例å¤åˆ¶" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4527,15 +4697,18 @@ msgstr "EFB 比例å¤åˆ¶" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "扫æ中..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "扫æé•œåƒä¸­" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "扫æ中..." @@ -4551,12 +4724,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "æœç´¢è¿‡æ»¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "æœç´¢å­ç›®å½•" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: 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 "Section %s not found in SYSCONF" @@ -4566,6 +4739,7 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "选择" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4590,6 +4764,14 @@ msgstr "选择录制文件" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "选择录制文件" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "选择è¦å¯¼å…¥çš„存档" @@ -4616,16 +4798,21 @@ msgstr "选择浮动窗å£" msgid "Select the file to load" msgstr "选择è¦è½½å…¥çš„文件" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "选择一个存档文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "选择è¦è½½å…¥çš„状æ€" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4645,6 +4832,9 @@ msgstr "选择è¦è½½å…¥çš„状æ€" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "选择è¦ä¿å­˜çš„状æ€" @@ -4665,7 +4855,7 @@ 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/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "所选字体" @@ -4701,11 +4891,11 @@ msgstr "传感器æ ä½ç½®" msgid "Separator" msgstr "分割" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "塞尔维亚语" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4715,11 +4905,11 @@ msgstr "" msgid "Set" msgstr "设置" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "设置为默认镜åƒ(&D)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "è®¾ç½®ä¸ºé»˜è®¤å†…å­˜å¡ %c" @@ -4729,7 +4919,7 @@ 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:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "设置..." @@ -4741,7 +4931,7 @@ msgstr "安装Wii内存: ä¸èƒ½æ‰¾åˆ°è®¾ç½®æ–‡ä»¶" msgid "Shake" msgstr "震动" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "短å称:" @@ -4770,7 +4960,7 @@ msgstr "显示工具æ (&T)" msgid "Show Drives" msgstr "显示驱动器" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 #, fuzzy msgid "Show EFB Copy Regions" msgstr "EFB å¤åˆ¶èŒƒå›´" @@ -4787,7 +4977,7 @@ msgstr "显示法国" msgid "Show GameCube" msgstr "显示 GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "显示输入显示" @@ -4803,7 +4993,7 @@ msgstr "显示日本" msgid "Show Korea" msgstr "显示韩国" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "显示语言:" @@ -4823,7 +5013,7 @@ msgstr "显示平å°" msgid "Show Regions" msgstr "显示国家" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 #, fuzzy msgid "Show Statistics" msgstr "å„ç§ç»Ÿè®¡æ•°æ®" @@ -4844,11 +5034,11 @@ msgstr "显示 Wad" 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 " @@ -4858,23 +5048,23 @@ 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:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "显示第一区å—" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "显示存档区å—" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "显示存档注释" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "显示存档图标" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "显示存档标题" @@ -4905,7 +5095,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Sideways Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "简体中文" @@ -4913,12 +5103,12 @@ msgstr "简体中文" msgid "Size" msgstr "大å°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 #, fuzzy msgid "Skip BIOS" msgstr "跳过 GC BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "ç¦ç”¨ç›®æ ‡é€æ˜Žé€šé“" @@ -4951,11 +5141,11 @@ msgstr "" msgid "Slot %i" msgstr "æ’槽 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "æ’槽 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "æ’槽 B" @@ -4975,7 +5165,7 @@ 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:621 msgid "Sound Settings" msgstr "声音设置" @@ -4993,6 +5183,7 @@ msgstr "声音缓冲区创建失败: %s" msgid "Space" msgstr "空格" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5008,6 +5199,11 @@ msgstr "空格" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "西ç­ç‰™è¯­" @@ -5031,7 +5227,7 @@ msgstr "" msgid "Specify a video backend" msgstr "指定一个视频åŽç«¯" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "æå‡å…‰ç›˜ä¼ è¾“率" @@ -5039,7 +5235,7 @@ msgstr "æå‡å…‰ç›˜ä¼ è¾“率" msgid "Square Stick" msgstr "æ–¹å—é”®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "标准控制器" @@ -5132,12 +5328,12 @@ msgstr "æˆåŠŸå¯¼å…¥å­˜æ¡£æ–‡ä»¶" msgid "Swing" msgstr "Swing" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "系统语言" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "å°æ¹¾" @@ -5177,7 +5373,7 @@ msgstr "Table Right" msgid "Take Screenshot" msgstr "å±å¹•æˆªå›¾(&T)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5194,7 +5390,7 @@ msgstr "æè´¨" msgid "Texture Cache" msgstr "清除缓存" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 #, fuzzy msgid "Texture Format Overlay" msgstr "æ质格å¼" @@ -5211,13 +5407,13 @@ msgstr "地å€æ— æ•ˆ" msgid "The checksum was successfully fixed" msgstr "校检和æˆåŠŸä¿®å¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "选择的目录已ç»å­˜åœ¨äºŽåˆ—表" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5240,7 +5436,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:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "您指定的文件 %s ä¸å­˜åœ¨" @@ -5262,7 +5458,7 @@ msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5302,7 +5498,7 @@ msgstr "指定的文件 \"%s\" ä¸å­˜åœ¨" msgid "The value is invalid" msgstr "这个值无效" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "主题" @@ -5310,7 +5506,7 @@ msgstr "主题" msgid "Theme selection went wrong" msgstr "选择主题出现错误" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5318,7 +5514,7 @@ msgstr "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5334,7 +5530,7 @@ msgstr "" "This action replay simulator does not support codes that modify Action " "Replay itself." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: 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." @@ -5350,24 +5546,10 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -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 "" -"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." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." 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" @@ -5379,7 +5561,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:283 +#: 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" @@ -5403,7 +5585,7 @@ msgstr "标题" msgid "To" msgstr "顶部" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "切æ¢æ‰€æœ‰æ—¥å¿—类型" @@ -5423,6 +5605,7 @@ msgstr "切æ¢å…¨å±" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5430,14 +5613,17 @@ msgstr "切æ¢å…¨å±" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "顶部" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "ç¹ä½“中文" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "å·²ç»å°è¯•è½½å…¥æœªçŸ¥æ–‡ä»¶ç±»åž‹." @@ -5445,7 +5631,7 @@ msgstr "å·²ç»å°è¯•è½½å…¥æœªçŸ¥æ–‡ä»¶ç±»åž‹." msgid "Triggers" msgstr "扳机" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Trying to read from invalid SYSCONF" @@ -5457,7 +5643,7 @@ msgstr "" "Trying to read from invalid SYSCONF\n" "Wiimote bt ids are not available" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "土耳其语" @@ -5478,11 +5664,11 @@ msgstr "UDP 端å£:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "未知" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "美国" @@ -5562,7 +5748,7 @@ msgstr "æ›´æ–°" msgid "Upright Wiimote" msgstr "ç›´æ¡ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "使用 EuRGB60 æ¨¡å¼ (PAL60)" @@ -5575,7 +5761,7 @@ msgstr "切æ¢å…¨å±(&F)" msgid "Use Hex" msgstr "使用å六进制" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "使用警告程åº" @@ -5596,7 +5782,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "实用扩展" @@ -5620,25 +5806,29 @@ msgstr "值: " msgid "Verbosity" msgstr "详细" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "视频" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "虚拟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "音é‡" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format 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 错误" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5653,15 +5843,15 @@ msgstr "" msgid "Warning" msgstr "警告" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Warning - starting DOL in wrong console mode!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Warning - starting ELF in wrong console mode!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Warning - starting ISO in wrong console mode!" @@ -5689,7 +5879,7 @@ msgstr "" "and have the same name as a file on your memcard\n" "Continue?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5697,7 +5887,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5705,7 +5895,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5733,7 +5923,7 @@ msgstr "波形文件写入器 - 文件未打开." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "宽å±ç ´è§£" @@ -5741,15 +5931,15 @@ msgstr "宽å±ç ´è§£" msgid "Width" msgstr "宽度" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii控制å°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD 根目录:" @@ -5758,6 +5948,7 @@ msgstr "DVD 根目录:" msgid "Wii Save Import" msgstr "导入 Wii 存档" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5767,6 +5958,9 @@ msgstr "导入 Wii 存档" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存档文件 (*.bin)|*.bin" @@ -5834,10 +6028,11 @@ msgstr "窗å£èœå•" msgid "Windows Right" msgstr "窗å£å³ä¾§" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "自动æ¢è¡Œ" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5853,6 +6048,11 @@ msgstr "自动æ¢è¡Œ" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "工作中..." @@ -5860,6 +6060,11 @@ msgstr "工作中..." msgid "Write to Console" msgstr "写入到控制å°" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "写入到文件" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "写入到文件" @@ -5913,7 +6118,7 @@ msgstr "您必须输入一个å进制或者å六进制值." msgid "You must enter a valid profile name." msgstr "您必须输入一个有效的é…置文件å称." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 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." @@ -5934,7 +6139,7 @@ msgid "" msgstr "" "Your SYSCONF file is the wrong size - should be 0x%04x (but is 0x%04llx)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP 破解" @@ -5988,7 +6193,7 @@ msgstr "" msgid "^ ADD" msgstr "^ 加" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "应用程åºè½½å…¥å™¨ (.img)" @@ -6019,12 +6224,12 @@ msgstr "not a wii save or read failure for file header size %x" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "未知命令 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returned -1 on application run!" @@ -6223,6 +6428,9 @@ msgstr "| 或" #~ msgid "Emulator Display Settings" #~ msgstr "模拟器显示设置" +#~ msgid "Enable Audio Throttle" +#~ msgstr "å¯ç”¨éŸ³é¢‘调节" + #~ msgid "Enable CPU Access" #~ msgstr "å¯ç”¨CPU访问" @@ -6558,6 +6766,19 @@ msgstr "| 或" #~ msgid "The file " #~ msgstr "The file " +#~ 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 "" +#~ "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." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "This is usually used to play voice and sound effects." diff --git a/Languages/po/zh_TW.po b/Languages/po/zh_TW.po index d171170136..e0384728e6 100644 --- a/Languages/po/zh_TW.po +++ b/Languages/po/zh_TW.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-03-15 02:51+0800\n" "Last-Translator: khiav \n" "Language-Team: khiav&yrbn \n" @@ -57,9 +61,9 @@ msgstr "\"%s\" 為無效的 GCM/ISO æª”æ¡ˆï¼Œæˆ–éž GC/Wii ISO。" msgid "%1$sCopy%1$s" msgstr "%1$s複製%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -151,7 +155,7 @@ msgstr "%s匯出 GCI%s" msgid "%sImport GCI%s" msgstr "%s匯入 GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "剩餘 %u 個å€å¡Šï¼›å‰©é¤˜ %u 個目錄項目" @@ -184,11 +188,11 @@ msgstr "作弊檔管ç†å™¨(&C)" msgid "&DSP Settings" msgstr "DSP 設定(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "刪除 ISO 檔(&D)..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "刪除已é¸å–çš„ ISO 檔(&D)..." @@ -252,7 +256,7 @@ msgstr "æš«åœ(&P)" msgid "&Play" msgstr "執行(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "屬性(&P)" @@ -296,7 +300,7 @@ msgstr "檢視(&V)" msgid "&Wiimote Settings" msgstr "Wiimote 設定(&W)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -340,7 +344,7 @@ msgstr "<æ’å…¥å稱>" msgid "" msgstr "<無解æžåº¦è¨­å®š>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "<ç„¡>" @@ -349,7 +353,7 @@ msgstr "<ç„¡>" msgid "" msgstr "<按任æ„éµ>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<系統>" @@ -403,13 +407,13 @@ msgstr "" "\n" "您必須至主機的 TCP 埠å£é€²è¡Œè¨­å®šï¼ï¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR 代碼" @@ -421,11 +425,11 @@ msgstr "關於 Dolphin" msgid "Acceleration" msgstr "加速" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "精確的 VBeam 模擬" @@ -532,11 +536,11 @@ msgstr "é…接器：" msgid "Add" msgstr "新增" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "新增 ActionReplay 代碼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "新增修正" @@ -544,6 +548,7 @@ msgstr "新增修正" msgid "Add new pane" msgstr "新增é¢ç‰ˆ" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -559,6 +564,11 @@ msgstr "新增é¢ç‰ˆ" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "新增..." @@ -605,11 +615,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "調整模擬æ–桿控制壓力需è¦æ´»å‹•çš„按鈕。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "進階" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "進階設定" @@ -617,14 +627,15 @@ msgstr "進階設定" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "所有 GC/Wii 檔案 (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "所有 GC/Wii 映åƒæª” (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 檔案 (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -637,18 +648,22 @@ msgstr "所有 Gamecube GCM 檔案 (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "所有å³æ™‚存檔 (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "所有 Wii ISO 檔案 (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "所有已壓縮的 GC/Wii ISO 檔案 (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "所有檔案 (*.*)|*.*" @@ -660,7 +675,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "模擬 Wiimote" @@ -681,7 +696,7 @@ msgstr "程å¼è®€å–器為錯誤的大å°...它是程å¼è®€å–器嗎？" msgid "Apploader unable to load from file" msgstr "程å¼è®€å–器無法從檔案中讀å–" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "程å¼è®€å–器：" @@ -696,7 +711,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -705,7 +720,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "是å¦ç¢ºèªåˆªé™¤ \"%s\" ？" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -713,10 +728,11 @@ msgstr "" "是å¦çœŸçš„è¦åˆªé™¤é€™äº›æª”案？\n" "刪了之後就回ä¸ä¾†äº†å“¦ï¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "是å¦çœŸçš„è¦åˆªé™¤é€™äº›æª”案？刪了之後就回ä¸ä¾†äº†å“¦ï¼" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -726,6 +742,9 @@ msgstr "是å¦çœŸçš„è¦åˆªé™¤é€™äº›æª”案？刪了之後就回ä¸ä¾†äº†å“¦ï¼" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "ç•«é¢æ¯”例：" @@ -734,18 +753,20 @@ msgstr "ç•«é¢æ¯”例：" msgid "At least one pane must remain open." msgstr "必須剩餘至少一個é¢æ¿ã€‚" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "è²éŸ³" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "è²éŸ³è£ç½®ï¼š" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon：開啟 AO è£ç½®å‡ºéŒ¯ã€‚\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -755,6 +776,9 @@ msgstr "AudioCommon：開啟 AO è£ç½®å‡ºéŒ¯ã€‚\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" @@ -793,7 +817,7 @@ msgstr "" msgid "Back" msgstr "返回" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "è£ç½®è¨­å®š" @@ -821,11 +845,11 @@ msgstr "æ壞的檔頭" msgid "Banner" msgstr "æ©«å¹…" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "圖示明細" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "橫幅：" @@ -837,7 +861,7 @@ msgstr "Bar" msgid "Basic" msgstr "基本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "基本設定" @@ -868,6 +892,7 @@ msgstr "è— å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -875,6 +900,9 @@ msgstr "è— å³" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "下方" @@ -883,7 +911,7 @@ msgstr "下方" msgid "Bound Controls: %lu" msgstr "ç¶å®šæŽ§åˆ¶å™¨ï¼š%lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "ç ´æ" @@ -899,7 +927,7 @@ msgstr "ç€è¦½è¦æ–°å¢žçš„資料夾" msgid "Browse for an ISO directory..." msgstr "ç€è¦½ ISO 資料夾..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "ç€è¦½è¼¸å‡ºçš„資料夾" @@ -930,11 +958,11 @@ msgstr "C-æ–æ¡¿" msgid "C-Stick" msgstr "C-æ–æ¡¿" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU 模擬引擎" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 #, fuzzy msgid "Cache Display Lists" msgstr "開啟顯示列表快å–" @@ -974,7 +1002,7 @@ msgstr "無法開啟 %s" msgid "Cannot unregister events with events pending" msgstr "事件未決定時無法註銷事件" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -984,7 +1012,7 @@ msgstr "" "無法使用此檔案作為記憶å¡ã€‚\n" "您è¦åœ¨ç›¸åŒçš„æ’槽中使用相åŒçš„檔案嗎？" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1002,8 +1030,6 @@ msgstr "找ä¸åˆ° WiiMote ä¾ bd： %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "找ä¸åˆ° WiiMote ä¾é€£æŽ¥é … %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1013,7 +1039,7 @@ msgstr "無法讀å–從 DVD_Plugin - DVD-ç•Œé¢ï¼šåš´é‡éŒ¯èª¤" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -1038,7 +1064,7 @@ msgstr "æ›´æ›å…‰ç¢Ÿ" msgid "Change Game" msgstr "æ›´æ›éŠæˆ²" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1054,8 +1080,8 @@ msgstr "更改 zFar åƒæ•¸ç¬¦è™Ÿ (在修正後)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "更改 zNear åƒæ•¸çš„符號 (在修正後)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: 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 "更改此é¸é …在模擬器執行時沒有效果ï¼" @@ -1075,32 +1101,32 @@ msgstr "尋找作弊代碼" msgid "Cheats Manager" msgstr "作弊代碼管ç†å™¨" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinese (Simplified)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinese (Traditional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "é¸æ“‡ä¸€å€‹ DVD 根目錄：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Choose a NAND root directory:" msgstr "é¸æ“‡ä¸€å€‹ DVD 根目錄：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "é¸æ“‡ä¸€å€‹é è¨­ ISO：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "é¸æ“‡ä¸€å€‹è¦æ·»åŠ çš„資料夾" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "é¸æ“‡ä¸€å€‹è¦é–‹å•Ÿçš„檔案" @@ -1108,14 +1134,14 @@ msgstr "é¸æ“‡ä¸€å€‹è¦é–‹å•Ÿçš„檔案" msgid "Choose a memory card:" msgstr "é¸æ“‡ä¸€å€‹è¨˜æ†¶å¡ï¼š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: 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:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "é¸æ“‡æå–的資料夾存放ä½ç½®" @@ -1127,14 +1153,14 @@ msgstr "Circle Stick" msgid "Classic" msgstr "Classic" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "清除" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "清除失敗。" @@ -1148,6 +1174,7 @@ msgstr "在éŠæˆ²åŸ·è¡Œæ™‚客戶端斷開連接ï¼ï¼ç¶²è·¯å°æˆ°å·²ç¶“被關閉 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1156,6 +1183,10 @@ msgstr "在éŠæˆ²åŸ·è¡Œæ™‚客戶端斷開連接ï¼ï¼ç¶²è·¯å°æˆ°å·²ç¶“被關閉 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "關閉" @@ -1179,20 +1210,20 @@ msgstr "命令" msgid "Comment" msgstr "註釋" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "註釋：" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "壓縮 ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "壓縮é¸æ“‡çš„ ISO 檔..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "正在壓縮 ISO" @@ -1219,13 +1250,13 @@ msgstr "設定控制器" msgid "Configure..." msgstr "模擬器設定..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "確èªæª”案覆蓋" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 #, fuzzy msgid "Confirm on Stop" msgstr "確èªåœæ­¢" @@ -1235,7 +1266,7 @@ msgstr "確èªåœæ­¢" msgid "Connect" msgstr "連接" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "連接 USB éµç›¤" @@ -1292,12 +1323,12 @@ msgstr "轉æ›ç‚º GCI" msgid "Copy failed" msgstr "複製失敗" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "è¤‡è£½è‡³è¨˜æ†¶å¡ %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "核心" @@ -1327,7 +1358,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "無法識別 ISO 檔案 %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "無法儲存 %s" @@ -1340,7 +1371,7 @@ msgstr "" "無法設置控制器。有玩家存留或者éŠæˆ²æ­£åœ¨åŸ·è¡Œï¼\n" "(é‚„ä¸æ”¯æ´åœ¨éŠæˆ²åŸ·è¡Œæ™‚設定控制器)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1352,7 +1383,7 @@ msgstr "" "\n" "請確èªæ˜¯å¦ç¶“ç”± CD/DVD 執行 Dolphin，或者是檔案具有唯讀的屬性？" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "找ä¸åˆ°å‰¯æª”å 'ini' 的開啟命令ï¼" @@ -1369,7 +1400,7 @@ msgstr "" msgid "Count:" msgstr "數é‡ï¼š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "國別：" @@ -1383,24 +1414,24 @@ msgstr "建立 AR 代碼" msgid "Create new perspective" msgstr "建立一個新的é€æª¢è¦–" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "ç”± KDE-Look.org 製åš" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 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:498 msgid "Created by VistaIcons.com" msgstr "ç”± VistaIcons.com 製åš" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 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:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "作者：" @@ -1408,7 +1439,7 @@ msgstr "作者：" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "剪è£" @@ -1428,7 +1459,7 @@ msgstr "Crossfade" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "ç›®å‰çš„目錄在 wxFileSelector 後從 %s 更改至 %s ï¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "自訂投影修正" @@ -1436,11 +1467,11 @@ msgstr "自訂投影修正" msgid "Custom Projection Hack Settings" msgstr "自訂投影修正設定" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "自訂一些直線投影åƒæ•¸ã€‚" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Czech" @@ -1452,10 +1483,11 @@ msgstr "åå­—æ–¹å‘éµ" msgid "DSP" msgstr "è²éŸ³" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "DSP 模擬引擎" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1466,19 +1498,23 @@ msgstr "DSP 模擬引擎" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE 模擬器 (å¿«)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE 解釋器 (æ…¢)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 #, fuzzy msgid "DSP LLE on Thread" msgstr "DSP LLE å–®ç¨ç·šç¨‹" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE é‡ç·¨è­¯å™¨ (æ…¢)" @@ -1486,15 +1522,23 @@ msgstr "DSP LLE é‡ç·¨è­¯å™¨ (æ…¢)" msgid "DSP settings" msgstr "è²éŸ³è¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" 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 "" + +#: 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:176 msgid "Data Size" msgstr "資料大å°" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "日期：" @@ -1515,7 +1559,7 @@ msgstr "éžä½œç”¨å€" msgid "Debug" msgstr "除錯" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 #, fuzzy msgid "Debugging" msgstr "除錯" @@ -1524,16 +1568,16 @@ msgstr "除錯" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "解壓 ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "解壓é¸æ“‡çš„ ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "ISO 解壓中" @@ -1541,11 +1585,11 @@ msgstr "ISO 解壓中" msgid "Default" msgstr "é è¨­å€¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "é è¨­çš„ ISO：" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "é è¨­çš„å­—åž‹" @@ -1554,7 +1598,7 @@ msgstr "é è¨­çš„å­—åž‹" msgid "Delete" msgstr "刪除" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "刪除存檔" @@ -1563,7 +1607,7 @@ msgstr "刪除存檔" msgid "Delete the existing file '%s'?" msgstr "刪除已存在的檔案 '%s' ？" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 #, fuzzy msgid "Description" msgstr "å•é¡Œ" @@ -1572,8 +1616,8 @@ msgstr "å•é¡Œ" msgid "Detect" msgstr "檢測" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:230 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:325 +#: 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." @@ -1586,8 +1630,8 @@ msgstr "" msgid "Device" msgstr "è£ç½®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "è£ç½®è¨­å®š" @@ -1612,25 +1656,25 @@ msgstr "" " 並且目錄備份校驗失敗" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 #, fuzzy msgid "Disable" msgstr "關閉霧化" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "關閉霧化" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "關閉光æº" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 #, fuzzy msgid "Disable Per-Pixel Depth" msgstr "åƒç´ æ·±åº¦" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "關閉紋ç†" @@ -1660,7 +1704,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "光碟" @@ -1685,6 +1729,7 @@ msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1694,10 +1739,13 @@ msgstr "Divide" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "您è¦åœæ­¢ç›®å‰çš„模擬嗎？" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1723,6 +1771,7 @@ msgstr "Dolphin 模擬 Wiimote 設定" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1747,6 +1796,14 @@ msgstr "Dolphin GC 控制器設定" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC 控制器設定" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 影片 (*.dtm)" @@ -1775,11 +1832,11 @@ msgstr "Dolphin ç›®å‰è¢«è¨­å®šç‚ºéš±è—所有éŠæˆ²ã€‚按兩下這裡顯示所 msgid "Down" msgstr "下" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "下載代碼 (WiiRD 數據庫)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "已下載 %lu æ¢ä»£ç¢¼ã€‚ (已添加 %lu æ¢)" @@ -1788,23 +1845,23 @@ msgstr "已下載 %lu æ¢ä»£ç¢¼ã€‚ (已添加 %lu æ¢)" msgid "Drums" msgstr "Drums" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "空" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "轉儲è²éŸ³" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "轉儲 EFB 目標" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "轉儲畫格" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "轉儲紋ç†" @@ -1830,6 +1887,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1845,6 +1903,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Dutch" @@ -1868,7 +1931,7 @@ msgstr "" "錯誤：這個版本 Dolphin 需è¦çš„ TAP-Win32 驅動至少為 版本 %d.%d -- 如果最近曾更" "改 Dolphin 組件，é‡æ–°å•Ÿå‹•å¾Œä¹Ÿè¨±å¯ä»¥çœ‹åˆ° Windows 新增驅動。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPE" @@ -1884,7 +1947,7 @@ msgstr "編輯" msgid "Edit ActionReplay Code" msgstr "編輯 ActionReplay 代碼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "編輯 ini 設定檔" @@ -1896,8 +1959,8 @@ msgstr "編輯修正" msgid "Edit current perspective" msgstr "編輯目å‰ç‰ˆå¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "編輯..." @@ -1936,7 +1999,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "模擬 Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "模擬狀態：" @@ -1958,23 +2021,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "é–‹å•Ÿ AR 日誌" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "é–‹å•Ÿè²éŸ³ç¯€æµé–¥" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "é–‹å•Ÿ BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "é–‹å•Ÿå¡Šåˆä½µ" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -1988,6 +2051,7 @@ msgstr "" msgid "Enable Cache" msgstr "é–‹å•Ÿå¿«å–" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -1997,52 +2061,55 @@ msgstr "é–‹å•Ÿå¿«å–" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "開啟作弊" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "é–‹å•Ÿ DTK 音樂" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "開啟雙核心" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "開啟雙核心 (加速)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "é–‹å•Ÿå¿«æ·éµ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "é–‹å•Ÿç•¥éŽç©ºé–’" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "é–‹å•Ÿç•¥éŽç©ºé–’ (加速)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "é–‹å•Ÿ MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "é–‹å•Ÿé€è¡ŒæŽƒçž„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 #, fuzzy msgid "Enable Screen Saver" msgstr "開啟寬螢幕" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "開啟寬螢幕" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "開啟線框" @@ -2058,13 +2125,13 @@ msgstr "" "é–‹å•Ÿå„ç•°å‘性éŽæ¿¾ã€‚\n" "通éŽæŸ”化å¯è¦‹çš„多邊形增強紋ç†çš„視覺å“質。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: 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:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "開啟分é ç€è¦½" @@ -2084,13 +2151,13 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "é–‹å•Ÿæ­¤é¸é …將加速塞爾é”傳說：曙光公主，請勿在其它éŠæˆ²ä¸­ä½¿ç”¨ã€‚" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: 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 = " @@ -2099,7 +2166,7 @@ msgstr "" "é–‹å•Ÿå¡Šä½å€è½‰æ› (BAT)：一個記憶體管ç†å–®å…ƒçš„函數。用來更精確的執行，相å°çš„模擬" "速度會變慢。(ON = 兼容ã€OFF = 快速)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "開啟自訂投影修正" @@ -2111,7 +2178,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2128,6 +2195,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2143,6 +2211,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "English" @@ -2173,6 +2246,7 @@ msgstr "等於" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "錯誤" @@ -2203,18 +2277,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "錯誤" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "讀å–é¸æ“‡çš„語系出錯。返回使用系統é è¨­å€¼ã€‚" -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2247,7 +2327,7 @@ msgstr "離開 Dolphin" msgid "Export Failed" msgstr "匯出失敗" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "匯出檔案" @@ -2260,15 +2340,15 @@ msgstr "匯出錄åƒ" msgid "Export Recording..." msgstr "匯出錄åƒ..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "匯出存檔" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "匯出 Wii 存檔 (實驗性)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "匯出所有存檔" @@ -2284,7 +2364,7 @@ msgstr "匯出存檔為..." msgid "Extension" msgstr "æ“´å……" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 #, fuzzy msgid "External Frame Buffer" msgstr "é¡å¤–åƒæ•¸" @@ -2297,44 +2377,44 @@ msgstr "é¡å¤–åƒæ•¸" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "僅在 ''銀河戰士：å¦ä¸€å€‹ M'' 中有效的é¡å¤–åƒæ•¸ã€‚" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "æå–所有檔案..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "æå–程å¼è®€å–器..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "æå– DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "æå–資料夾..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "æå–檔案..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "æå–分割å€..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "%s æå–中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "所有檔案æå–中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "資料夾æå–中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "æå–中..." @@ -2347,11 +2427,11 @@ msgstr "" msgid "FIFO Player" msgstr "玩家" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANCE" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FST 大å°" @@ -2363,11 +2443,11 @@ msgstr "連接失敗ï¼" msgid "Failed to Listen!!" msgstr "監è½å¤±æ•—ï¼ï¼" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "下載代碼失敗。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "æå–至 %s 失敗ï¼" @@ -2477,19 +2557,29 @@ msgstr "檔案 %s 寫入檔頭失敗" msgid "Failed to write header for file %d" msgstr "檔案 %d 寫入檔頭失敗" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "快速" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 #, fuzzy msgid "Fast Mipmaps" msgstr "讀å–原始紋ç†" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: 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:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 #, fuzzy msgid "Fifo Player" @@ -2500,7 +2590,7 @@ msgstr "玩家" msgid "File Info" msgstr "代碼訊æ¯" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "檔案未å«æœ‰ä»£ç¢¼ã€‚" @@ -2533,16 +2623,16 @@ msgstr "檔案未被識別為一張記憶å¡" msgid "File not compressed" msgstr "檔案未壓縮" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO：未知開啟模å¼ï¼š 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "檔案系統" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "檔案類型 'ini' æœªçŸ¥ï¼ ç„¡æ³•é–‹å•Ÿï¼" @@ -2550,7 +2640,7 @@ msgstr "檔案類型 'ini' æœªçŸ¥ï¼ ç„¡æ³•é–‹å•Ÿï¼" msgid "First Block" msgstr "首數據å€å¡Š" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "修正校驗" @@ -2562,7 +2652,7 @@ msgstr "強制 16:9" msgid "Force 4:3" msgstr "強制 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 #, fuzzy msgid "Force Console as NTSC-J" msgstr "設定主機為 NTSC-J" @@ -2594,7 +2684,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 " @@ -2629,7 +2719,7 @@ msgstr "畫格步進" msgid "Frame Advance" msgstr "畫格步進" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "FFV1 畫格轉儲" @@ -2643,7 +2733,7 @@ msgstr "畫格步進" msgid "Frame S&kipping" msgstr "ç•«æ ¼çœç•¥(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "畫格速é™åˆ¶ï¼š" @@ -2651,10 +2741,11 @@ msgstr "畫格速é™åˆ¶ï¼š" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "自由視點" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2670,6 +2761,11 @@ msgstr "自由視點" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "French" @@ -2704,7 +2800,7 @@ msgstr "記錄設定" msgid "GCPad" msgstr "GC 控制器" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "éŠæˆ² ID ：" @@ -2720,15 +2816,15 @@ msgstr "éŠæˆ²æœªåŸ·è¡Œï¼" msgid "Game not found!!" msgstr "找ä¸åˆ°éŠæˆ²ï¼ï¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "éŠæˆ²è¦æ ¼è¨­å®š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "éŠæˆ²è¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2739,6 +2835,7 @@ msgstr "Gamecube 控制器設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2746,6 +2843,9 @@ msgstr "Gamecube 控制器設定(&P)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube è¨˜æ†¶å¡ (*.raw,*.gcp)" @@ -2754,15 +2854,17 @@ msgid "Gamecube Pad settings" msgstr "Gamecube 控制器設定" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko 代碼" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, 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.)" +"(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 "" "GeckoCode 無法執行 (CT%i CST%i) (%s)\n" "(一個æ毀的代碼或ä¸æ”¯æ´çš„代碼類型。)" @@ -2771,6 +2873,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2779,6 +2882,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -2788,6 +2894,7 @@ msgstr "一般" msgid "General Settings" msgstr "ç•Œé¢è¨­å®š" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2803,6 +2910,11 @@ msgstr "ç•Œé¢è¨­å®š" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "German" @@ -2834,7 +2946,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Greek" @@ -2866,7 +2978,7 @@ msgstr "" msgid "Header checksum failed" msgstr "檔頭校驗失敗" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebrew" @@ -2933,12 +3045,16 @@ msgstr "å¿«æ·éµè¨­å®š" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "å¿«æ·éµ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Hungarian" @@ -2946,12 +3062,12 @@ msgstr "Hungarian" msgid "Hybrid Wiimote" msgstr "æ··åˆ Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, 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:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2963,11 +3079,11 @@ msgstr "" "標題 ID %016llx.\n" " Dolphin å¯èƒ½æœƒç•¶" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - æ毀的目標" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL 設定" @@ -2983,15 +3099,15 @@ msgstr "IR 指示器" msgid "IR Sensitivity:" msgstr "IR éˆæ•åº¦ï¼š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "ISO 明細" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "ISO 資料夾" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITALY" @@ -2999,21 +3115,23 @@ msgstr "ITALY" msgid "Icon" msgstr "圖示" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: 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:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy msgid "" -"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." +"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 " "中的è²éŸ³ç¯€æµé–¥æ‰èƒ½ä½¿å…¶ç”Ÿæ•ˆã€‚" @@ -3041,7 +3159,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "匯入存檔" @@ -3086,7 +3204,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "關閉光æºã€‚改善效能，但是如果在éŠæˆ²ä¸­éœ€è¦ä½¿ç”¨å…‰ç…§æ•ˆæžœå‰‡æœƒç„¡æ³•ä½œç”¨ã€‚" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "éŠæˆ²ä¸­" @@ -3095,7 +3213,7 @@ msgid "In-Game" msgstr "éŠæˆ²ä¸­" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "訊æ¯" @@ -3115,7 +3233,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "在這裡æ’入被加密或已解密的代碼..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "æ’å…¥ SD å¡" @@ -3127,7 +3245,7 @@ msgstr "在這裡æ’å…¥å稱.." msgid "Install WAD" msgstr "å®‰è£ WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "安è£è‡³ Wii é¸å–®" @@ -3136,6 +3254,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "調用 InstallExceptionHandler，但是這個平å°å°šæœªæ”¯æ´æ­¤åŠŸèƒ½ã€‚" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3145,15 +3264,18 @@ msgstr "調用 InstallExceptionHandler，但是這個平å°å°šæœªæ”¯æ´æ­¤åŠŸèƒ½ ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "æ­£åœ¨å®‰è£ WAD 至 Wii é¸å–®..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 #, fuzzy msgid "Interface" msgstr "ç•Œé¢è¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "ç•Œé¢è¨­å®š" @@ -3179,11 +3301,11 @@ msgstr "內部 LZO 錯誤 - lzo_init() 失敗" msgid "Internal Resolution:" msgstr "全螢幕顯示解æžåº¦ï¼š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "解釋器 (éžå¸¸ç·©æ…¢)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "標題" @@ -3200,7 +3322,7 @@ msgstr "無效的數值ï¼" msgid "Invalid bat.map or dir entry" msgstr "無效的 bat.map 或目錄項目" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "無效的事件類型 %i" @@ -3220,14 +3342,15 @@ msgstr "" "%s\n" " å¯èƒ½éœ€è¦é‡æ–°è½‰å„²é€™å€‹éŠæˆ²ã€‚" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "無效的錄åƒæª”" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "無效的狀態" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3243,27 +3366,32 @@ msgstr "無效的狀態" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italian" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT é‡ç·¨è­¯å™¨ (推薦)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL 實驗性é‡ç·¨è­¯å™¨" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japanese" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KOREA" @@ -3272,8 +3400,8 @@ msgstr "KOREA" msgid "Key" msgstr "éµ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Korean" @@ -3291,7 +3419,7 @@ msgstr "L 鈕" msgid "L-Analog" msgstr "L-類比" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "語系：" @@ -3344,7 +3472,7 @@ msgstr "" msgid "Less Than" msgstr "å°æ–¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3352,7 +3480,7 @@ msgstr "" msgid "Load" msgstr "讀å–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 #, fuzzy msgid "Load Custom Textures" msgstr "讀å–高解æžåº¦ç´‹ç†" @@ -3401,6 +3529,7 @@ msgstr "讀å–儲存格 8" msgid "Load State..." msgstr "讀å–進度檔..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3410,10 +3539,14 @@ msgstr "讀å–進度檔..." ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 @@ -3423,6 +3556,9 @@ msgstr "è®€å– Wii 系統é¸å–® (%d%c)" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" @@ -3447,7 +3583,7 @@ msgstr "讀å–指定檔案 (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "本地" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 #, fuzzy msgid "Lock Threads to Cores" msgstr "鎖定線程至內核" @@ -3460,11 +3596,11 @@ msgstr "記錄" msgid "Log Configuration" msgstr "記錄設定" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "記錄類型" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "記錄輸出" @@ -3494,7 +3630,7 @@ msgstr "" "MD5 ä¸ç¬¦åˆ\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU 速度修正" @@ -3516,11 +3652,11 @@ msgstr "MadCatz Gameshark 檔案(*.gcs)" msgid "Main Stick" msgstr "主æ–æ¡¿" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "廠商 ID：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "廠商：" @@ -3545,6 +3681,7 @@ msgstr "記憶å¡(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3552,6 +3689,9 @@ msgstr "記憶å¡(&M)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "記憶å¡" @@ -3586,7 +3726,7 @@ msgstr "" msgid "Menu" msgstr "é¸å–®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "麥克風" @@ -3596,11 +3736,11 @@ msgstr "麥克風" msgid "Min" msgstr "麥克風" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "雜項" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "其它設定" @@ -3617,7 +3757,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "等寬字型" @@ -3630,7 +3770,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "馬é”" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3645,7 +3785,7 @@ msgstr "" msgid "Multiply" msgstr "多é‡åˆ†æ’" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3735,6 +3875,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3744,6 +3885,9 @@ msgstr "NP Up" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3752,7 +3896,7 @@ msgstr "å稱：" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "å稱：" @@ -3766,7 +3910,7 @@ msgid "New Scan" msgstr "æ–°çš„æœå°‹" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "下一é " @@ -3778,7 +3922,7 @@ msgstr "尋找下一個" msgid "Nickname :" msgstr "暱稱：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "無國家 (SDK)" @@ -3818,7 +3962,7 @@ msgstr "找ä¸åˆ°æ¨™é¡Œ %s 的存檔資料夾" msgid "None" msgstr "ç„¡" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norwegian Bokmaal" @@ -3826,8 +3970,8 @@ msgstr "Norwegian Bokmaal" msgid "Not Equal" msgstr "ä¸ç›¸ç­‰" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "未設定" @@ -3847,7 +3991,7 @@ msgstr "未連接" msgid "Notes" msgstr "註釋" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "注æ„：" @@ -3885,7 +4029,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "關閉" @@ -3911,11 +4055,11 @@ msgstr "僅 %d 個å€å¡Šå¯ç”¨" msgid "Open" msgstr "é–‹å•Ÿ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "開啟內容資料夾(&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "é–‹å•Ÿ Wii 存檔資料夾(&S)" @@ -3937,11 +4081,11 @@ msgstr "OpenAL：找ä¸åˆ°è²éŸ³è£ç½®" msgid "OpenAL: can't open device %s" msgstr "OpenAL：無法開啟è£ç½® %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -3973,7 +4117,7 @@ msgstr "" "並匯入存檔至一張新的記憶å¡ä¸­\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -4023,19 +4167,20 @@ msgstr "段è½" msgid "Parameters" msgstr "åƒæ•¸" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "åˆ†å‰²å€ %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "修正" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "路徑" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4048,6 +4193,10 @@ msgstr "路徑" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "æš«åœ" @@ -4057,7 +4206,7 @@ msgstr "æš«åœ" msgid "Per-Pixel Lighting" msgstr "åƒç´ å…‰æº" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "完美" @@ -4070,6 +4219,7 @@ msgstr "ç‰ˆå¼ %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4080,6 +4230,10 @@ msgstr "ç‰ˆå¼ %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "執行" @@ -4093,7 +4247,7 @@ msgstr "播放錄åƒ" msgid "Play/Pause" msgstr "執行/æš«åœ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "å¯çŽ©" @@ -4106,6 +4260,7 @@ msgstr "é¸é …" msgid "Players" msgstr "玩家" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4115,6 +4270,9 @@ msgstr "玩家" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "請確èª..." @@ -4126,23 +4284,23 @@ msgstr "請在儲存å‰å»ºç«‹ä¸€å€‹æ–°çš„é€æª¢è¦–" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polish" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "åŸ å£ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "åŸ å£ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "åŸ å£ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "åŸ å£ 4" @@ -4151,11 +4309,11 @@ msgstr "åŸ å£ 4" msgid "Port :" msgstr "埠å£ï¼š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portuguese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portuguese (Brazilian)" @@ -4164,17 +4322,17 @@ msgstr "Portuguese (Brazilian)" msgid "Post-Processing Effect:" msgstr "後期處ç†è‘—色器：" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4187,7 +4345,7 @@ msgstr "é è¨­ï¼š" msgid "Prev Page" msgstr "上一é " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "上一é " @@ -4238,7 +4396,7 @@ msgstr "R-類比" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSSIA" @@ -4251,7 +4409,7 @@ msgstr "範åœ" msgid "Read-only mode" msgstr "唯讀模å¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "實體" @@ -4328,6 +4486,7 @@ msgstr "更新列表" msgid "Refresh game list" msgstr "æ›´æ–°éŠæˆ²åˆ—表" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4346,6 +4505,12 @@ msgstr "æ›´æ–°éŠæˆ²åˆ—表" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "移除" @@ -4398,11 +4563,11 @@ msgstr "å³ æ–æ¡¿" msgid "Rumble" msgstr "震動" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: 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:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russian" @@ -4410,10 +4575,11 @@ msgstr "Russian" msgid "Sa&ve State" msgstr "儲存進度(&V)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "安全" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4423,6 +4589,9 @@ msgstr "安全" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "å–樣率：" @@ -4480,12 +4649,12 @@ msgstr "儲存至儲存格 8" msgid "Save State..." msgstr "å¦å­˜é€²åº¦..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "å¦å­˜ç‚º..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "儲存已壓縮的 GCM/ISO" @@ -4493,11 +4662,11 @@ msgstr "儲存已壓縮的 GCM/ISO" msgid "Save current perspective" msgstr "儲存目å‰ç‰ˆå¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "儲存已解壓縮的 GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "儲存的影片 %s 是æ毀的，影片錄製åœæ­¢..." @@ -4507,6 +4676,7 @@ msgstr "儲存的影片 %s 是æ毀的，影片錄製åœæ­¢..." msgid "Scaled EFB Copy" msgstr "EFB 縮放複製" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4516,15 +4686,18 @@ msgstr "EFB 縮放複製" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "正在掃瞄..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "正在掃瞄 ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "正在掃瞄..." @@ -4540,12 +4713,12 @@ msgstr "滾動鎖定" msgid "Search Filter" msgstr "æœç´¢ç¯©é¸" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "æœå°‹å­è³‡æ–™å¤¾" -#: Source/Core/Common/Src/SysConf.h:104 Source/Core/Common/Src/SysConf.h:127 -#: Source/Core/Common/Src/SysConf.h:147 Source/Core/Common/Src/SysConf.h:168 +#: 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 中找ä¸åˆ°" @@ -4555,6 +4728,7 @@ msgstr "é …ç›® %s 在 SYSCONF 中找ä¸åˆ°" msgid "Select" msgstr "é¸æ“‡" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4579,6 +4753,14 @@ msgstr "é¸æ“‡å·²éŒ„製的檔案" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "é¸æ“‡å·²éŒ„製的檔案" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "é¸æ“‡è¦å®‰è£çš„ Wii WAD" @@ -4604,16 +4786,21 @@ msgstr "é¸æ“‡æµ®å‹•è¦–窗" msgid "Select the file to load" msgstr "é¸æ“‡è¦è®€å–的檔案" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "é¸æ“‡å­˜æª”" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "é¸æ“‡è¦è®€å–的進度" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4633,6 +4820,9 @@ msgstr "é¸æ“‡è¦è®€å–的進度" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "é¸æ“‡è¦å„²å­˜çš„進度" @@ -4653,7 +4843,7 @@ msgstr "" "強制 4:3：拉伸畫é¢è‡³ 4:3。\n" "拉伸至視窗：拉伸畫é¢å……滿視窗。" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "é¸æ“‡å­—åž‹" @@ -4689,11 +4879,11 @@ msgstr "傳感器ä½ç½®ï¼š" msgid "Separator" msgstr "分離器" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbian" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: 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 - 這是類似於網å¡ç­‰è£ç½®ä½¿ç”¨çš„埠å£ã€‚" @@ -4702,11 +4892,11 @@ msgstr "åŸ å£ 1 - 這是類似於網å¡ç­‰è£ç½®ä½¿ç”¨çš„埠å£ã€‚" msgid "Set" msgstr "設定" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "設為é è¨­ ISO (&D)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "設定為é è¨­è¨˜æ†¶å¡ %c" @@ -4716,7 +4906,7 @@ 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:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "設定..." @@ -4728,7 +4918,7 @@ msgstr "SetupWiiMem：無法找到設定檔" msgid "Shake" msgstr "æ–晃" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "短å：" @@ -4757,7 +4947,7 @@ msgstr "顯示工具列(&T)" msgid "Show Drives" msgstr "顯示è£ç½®" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 #, fuzzy msgid "Show EFB Copy Regions" msgstr "EFB 複製範åœ" @@ -4774,7 +4964,7 @@ msgstr "顯示 France" msgid "Show GameCube" msgstr "顯示 GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "輸入顯示" @@ -4790,7 +4980,7 @@ msgstr "顯示 JAP" msgid "Show Korea" msgstr "顯示 Korea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "顯示語系：" @@ -4810,7 +5000,7 @@ msgstr "顯示平å°" msgid "Show Regions" msgstr "顯示å€åŸŸ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 #, fuzzy msgid "Show Statistics" msgstr "å„種統計數據" @@ -4831,11 +5021,11 @@ msgstr "顯示 Wad" 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 " @@ -4845,23 +5035,23 @@ msgstr "" "關閉此é¸é …å¯ä»¥é˜»æ­¢å…¨éƒ¨éžé—œéµçš„錯誤訊æ¯ï¼Œä½†æ˜¯å®ƒå¯èƒ½å°Žè‡´ Dolphin 在沒有任何徵兆" "的情æ³ä¸‹å´©æ½°ã€‚" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "顯示第一個å€å¡Š" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "顯示存檔å€å¡Š" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "顯示存檔æè¿°" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "顯示存檔圖示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "顯示存檔標題" @@ -4892,7 +5082,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "æ©«æ¡ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Simplified Chinese" @@ -4900,12 +5090,12 @@ msgstr "Simplified Chinese" msgid "Size" msgstr "大å°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 #, fuzzy msgid "Skip BIOS" msgstr "ç•¥éŽ GC BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "關閉 Dest. Alpha 通é“" @@ -4938,11 +5128,11 @@ msgstr "" msgid "Slot %i" msgstr "儲存格 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "æ’槽 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "æ’槽 B" @@ -4962,7 +5152,7 @@ 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:621 msgid "Sound Settings" msgstr "è²éŸ³è¨­å®š" @@ -4980,6 +5170,7 @@ msgstr "è²éŸ³ç·©è¡å»ºç«‹å¤±æ•—：%s" msgid "Space" msgstr "Space" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -4995,6 +5186,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spanish" @@ -5018,7 +5214,7 @@ msgstr "" msgid "Specify a video backend" msgstr "指定影åƒæ’件" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "加速光碟傳輸率" @@ -5026,7 +5222,7 @@ msgstr "加速光碟傳輸率" msgid "Square Stick" msgstr "Square Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "標準控制器" @@ -5119,12 +5315,12 @@ msgstr "æˆåŠŸåŒ¯å…¥å­˜æª”" msgid "Swing" msgstr "æ®èˆž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "系統語系：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWAN" @@ -5164,7 +5360,7 @@ msgstr "Table å³" msgid "Take Screenshot" msgstr "截å–ç•«é¢" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5181,7 +5377,7 @@ msgstr "ç´‹ç†" msgid "Texture Cache" msgstr "清ç†å¿«å–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 #, fuzzy msgid "Texture Format Overlay" msgstr "ç´‹ç†æ ¼å¼" @@ -5198,13 +5394,13 @@ msgstr "ä½å€ç„¡æ•ˆ" msgid "The checksum was successfully fixed" msgstr "校驗已經被æˆåŠŸä¿®å¾©" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "é¸å–的資料夾已經在列表中" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5225,7 +5421,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:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "指定的檔案 (%s) ä¸å­˜åœ¨" @@ -5247,7 +5443,7 @@ msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" "\n" -"If unsure, use the second-fastest value from the right." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5285,7 +5481,7 @@ msgstr "指定的檔案 \"%s\" ä¸å­˜åœ¨" msgid "The value is invalid" msgstr "這個數值無效" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "佈景主題" @@ -5293,13 +5489,13 @@ msgstr "佈景主題" msgid "Theme selection went wrong" msgstr "佈景主題é¸æ“‡éŒ¯èª¤" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 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:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5313,7 +5509,7 @@ msgid "" "Replay itself." msgstr "Action replay 模擬器ä¸æ”¯æ´è¢« Action Replay 自身修改的代碼。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "這å¯èƒ½æœƒä½¿ Wii Menu 和部分éŠæˆ²é™é€Ÿã€‚" @@ -5329,24 +5525,10 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 -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" -"éµç›¤å¿«æ·éµ ：按ä½å¯ä»¥ç«‹å³é—œé–‰ç¯€æµé–¥ã€‚" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "這是用來播放音樂曲目，如背景音樂 (BGM) 。" -#: 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" @@ -5356,7 +5538,7 @@ msgstr "" "這將分離影åƒå’Œ CPU 線程，所以它們å¯ä»¥åŸ·è¡Œæ–¼ç¨ç«‹çš„內核中。\n" "å¯ä»¥åœ¨å¤šæ ¸å¿ƒçš„ PC 上å–å¾—éžå¸¸å¤§çš„加速，但是也å¯èƒ½å°Žè‡´å¶çˆ¾å´©æ½°æˆ–圖片å•é¡Œã€‚" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "這將å…許您手工編輯 INI 設定檔案" @@ -5380,7 +5562,7 @@ msgstr "標題" msgid "To" msgstr "上方" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "å…¨é¸/全部å–消" @@ -5400,6 +5582,7 @@ msgstr "切æ›å…¨èž¢å¹•" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5407,14 +5590,17 @@ msgstr "切æ›å…¨èž¢å¹•" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "上方" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Traditional Chinese" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "已嘗試讀å–從未知的檔案類型。" @@ -5422,7 +5608,7 @@ msgstr "已嘗試讀å–從未知的檔案類型。" msgid "Triggers" msgstr "扳機" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "嘗試讀å–從無效的 SYSCONF" @@ -5434,7 +5620,7 @@ msgstr "" "嘗試讀å–從無效的 SYSCONF\n" "Wiimote bt ids 是無效的" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turkish" @@ -5455,11 +5641,11 @@ msgstr "UDP 埠å£ï¼š" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "未知" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -5539,7 +5725,7 @@ msgstr "æ›´æ–°" msgid "Upright Wiimote" msgstr "ç›´æ¡ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "使用 EuRGB60 æ¨¡å¼ (PAL60)" @@ -5552,7 +5738,7 @@ msgstr "全螢幕(&F)" msgid "Use Hex" msgstr "使用 Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "顯示錯誤æ示" @@ -5573,7 +5759,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "工具" @@ -5597,25 +5783,29 @@ msgstr "數值：" msgid "Verbosity" msgstr "事件" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "å½±åƒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "虛擬" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "音é‡" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD installation 失敗：錯誤於建立 %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "WAD installation 失敗：錯誤於建立 %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5630,15 +5820,15 @@ msgstr "" msgid "Warning" msgstr "警告" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "警告 - DOL 啟動於錯誤的主機模å¼ï¼" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "警告 - ELF 啟動於錯誤的主機模å¼ï¼" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "警告 - ISO 啟動於錯誤的主機模å¼ï¼" @@ -5666,7 +5856,7 @@ msgstr "" "以åŠåœ¨æ‚¨è¨˜æ†¶å¡ä¸­ 相åŒæª”案å的檔案\n" "è¦ç¹¼çºŒå—Žï¼Ÿ" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5674,7 +5864,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5682,7 +5872,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5710,7 +5900,7 @@ msgstr "WaveFileWriter - 檔案無法開啟。" msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "寬螢幕修正" @@ -5718,15 +5908,15 @@ msgstr "寬螢幕修正" msgid "Width" msgstr "寬度" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii 主機" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD 根：" @@ -5735,6 +5925,7 @@ msgstr "DVD 根：" msgid "Wii Save Import" msgstr "匯入 Wii 存檔" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5744,6 +5935,9 @@ msgstr "匯入 Wii 存檔" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存檔 (*.bin)|*.bin" @@ -5811,10 +6005,11 @@ msgstr "視窗 é¸å–®" msgid "Windows Right" msgstr "視窗 å³" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "自動æ›è¡Œ" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5830,6 +6025,11 @@ msgstr "自動æ›è¡Œ" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "執行中..." @@ -5837,6 +6037,11 @@ msgstr "執行中..." msgid "Write to Console" msgstr "寫入至控制å°" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "寫入至檔案" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "寫入至檔案" @@ -5890,7 +6095,7 @@ msgstr "您必須輸入一個有效的å進制，å六進制或八進制的數 msgid "You must enter a valid profile name." msgstr "您必須輸入一個有效的設定檔å稱。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 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." @@ -5913,7 +6118,7 @@ msgstr "" "應該是 0x%04x (è€Œéž 0x%04llx)\n" "是å¦è¦å»ºç«‹æ–°çš„檔案？" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP 修正" @@ -5967,7 +6172,7 @@ msgstr "" msgid "^ ADD" msgstr "^ 新增" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "程å¼è®€å–器 (.img)" @@ -5998,12 +6203,12 @@ msgstr "ä¸æ˜¯ä¸€å€‹ wii 存檔或讀å–檔案頭部大å°å¤±æ•— %x" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "未知的 cmd 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute 返回 -1 在應用程å¼åŸ·è¡Œæ™‚ï¼" @@ -6188,6 +6393,9 @@ msgstr "| 或" #~ msgid "Emulator Display Settings" #~ msgstr "模擬器顯示設定" +#~ msgid "Enable Audio Throttle" +#~ msgstr "é–‹å•Ÿè²éŸ³ç¯€æµé–¥" + #~ msgid "Enable CPU Access" #~ msgstr "é–‹å•Ÿ CPU å­˜å–" @@ -6497,6 +6705,19 @@ msgstr "| 或" #~ msgid "The file " #~ 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 usually used to play voice and sound effects." #~ msgstr "這通常是用來播放è²éŸ³å’Œè²éŸ³æ•ˆæžœã€‚" From a7d142bed976166a157d1913a73cf882f03d8e17 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Fri, 9 Mar 2012 17:46:58 -0600 Subject: [PATCH 356/381] Rebase in preparation for merge. --- Languages/po/ar.po | 908 ------------------- Languages/po/ca.po | 703 --------------- Languages/po/cs.po | 1260 -------------------------- Languages/po/de.po | 694 -------------- Languages/po/dolphin-emu.pot | 692 -------------- Languages/po/el.po | 1649 ---------------------------------- Languages/po/en.po | 692 -------------- Languages/po/es.po | 898 ------------------ Languages/po/fr.po | 1248 ------------------------- Languages/po/he.po | 692 -------------- Languages/po/hu.po | 895 ------------------ Languages/po/it.po | 694 -------------- Languages/po/ja.po | 738 --------------- Languages/po/ko.po | 700 --------------- Languages/po/nb.po | 694 -------------- Languages/po/nl.po | 694 -------------- Languages/po/pl.po | 776 ---------------- Languages/po/pt.po | 703 --------------- Languages/po/pt_BR.po | 792 ---------------- Languages/po/ru.po | 694 -------------- Languages/po/sr.po | 692 -------------- Languages/po/tr.po | 747 --------------- Languages/po/zh_CN.po | 694 -------------- Languages/po/zh_TW.po | 694 -------------- 24 files changed, 19643 deletions(-) diff --git a/Languages/po/ar.po b/Languages/po/ar.po index 08cfb17be9..38454acd02 100644 --- a/Languages/po/ar.po +++ b/Languages/po/ar.po @@ -7,29 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -"PO-Revision-Date: 2011-10-16 11:25-0500\n" -"Last-Translator: mansoor\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -<<<<<<< HEAD -"PO-Revision-Date: 2011-07-20 13:33+0300\n" -"Last-Translator: \n" ->>>>>>> Update translation files for recent changes in the code. -======= -"PO-Revision-Date: 2011-10-16 11:25-0500\n" -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-27 08:27-0600\n" ->>>>>>> Update from master branch. "Last-Translator: mansoor\n" ->>>>>>> Update Arabic and Japanese translations. "Language-Team: \n" "Language: \n" "MIME-Version: 1.0\n" @@ -440,13 +420,6 @@ msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulation" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -558,27 +531,9 @@ msgstr "أض٠باتش" msgid "Add new pane" msgstr "إضاÙØ© جزء جديد" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "أضÙ" @@ -632,23 +587,8 @@ msgstr "All GC/Wii images (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "جميع ملÙات الجيم كيوب (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Ø­Ùظ جميع الحالات (sav, s##)" @@ -676,24 +616,9 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -<<<<<<< HEAD -<<<<<<< HEAD -msgid "Alternate Wiimote Timing" -msgstr "بديل ويموت" -======= -#, fuzzy -msgid "Alternate Wiimote Timing" -msgstr "محاكاة ويموت" ->>>>>>> Update translation files for recent changes in the code. -======= -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "بديل ويموت" ->>>>>>> Update Arabic and Japanese translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -748,19 +673,7 @@ msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙØŸ " msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙات؟" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "نسبة العرض :" @@ -782,19 +695,7 @@ msgstr "صوت الخلÙية :" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "تلقائي" @@ -909,19 +810,7 @@ msgid "Blue Right" msgstr "اليمين أزرق" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "أسÙÙ„" @@ -954,15 +843,7 @@ msgstr "لاستعراض الدليل الإخراج" msgid "Buffer:" msgstr "العازلة :" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1026,33 +907,11 @@ msgstr "إلغاء" msgid "Cannot open %s" msgstr "لا يمكن Ùتح %s" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "لا يمكن تسجيل الأÙلام ÙÙŠ وضع للقراءة Ùقط." - ->>>>>>> Update Arabic and Japanese translations. -======= ->>>>>>> Update from master branch. #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "لا يمكن إلغاء تسجيل الأحداث مع الأحداث المعلقة" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 ->>>>>>> Update Arabic and Japanese translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1225,21 +1084,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "إغلاق" @@ -1347,15 +1193,7 @@ msgstr "توصيل ويموت 3" msgid "Connect Wiimote 4" msgstr "توصيل ويموت 4" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "توصيل" @@ -1547,21 +1385,8 @@ msgstr "الصوت" msgid "DSP Emulator Engine" msgstr "محرك محاكي الصوت" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulation (سريع)" @@ -1798,19 +1623,7 @@ msgstr "" msgid "Divide" msgstr "انقسام" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "هل تريد اغلق اللعبة الحالية؟" @@ -1839,39 +1652,12 @@ msgstr "إعدادات تحكم الوي" msgid "Dolphin FIFO" msgstr "دولÙين" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "إعدادات تحكم الجيم كيوب" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "إعدادات تحكم الجيم كيوب" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "إعدادات تحكم الجيم كيوب" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "إعدادات تحكم الجيم كيوب" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1965,27 +1751,9 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Dutch" @@ -2117,41 +1885,15 @@ msgstr "BAT تمكين" msgid "Enable Block Merging" msgstr "تمكين منع الدمج" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -msgid "Enable Bounding Box Calculation" -msgstr "" - -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "تمكين تنظيم حساب الإطار" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "تمكين التخزين المؤقت" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "تمكين الاسرار " @@ -2299,27 +2041,9 @@ msgstr "" msgid "End" msgstr "نهاية" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "English" @@ -2348,45 +2072,10 @@ msgstr "المساواة" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "خطأ" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "خطأ" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "خطأ" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "خطأ" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "خطأ ÙÙŠ تحميل اللغة المختارة. يتراجع إلى النظام الاÙتراضية." @@ -2831,27 +2520,9 @@ msgstr "إطارات لتسجيل" msgid "Free Look" msgstr "تحكم بكاميرا اللعبة" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "French" @@ -2880,11 +2551,6 @@ msgstr "GCI File(*.gci)" msgid "GCMic Configuration" msgstr "GCMic اعدادات" -#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 -#, fuzzy -msgid "GCMic Configuration" -msgstr "سجل الإعدادات" - #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "تحكم الجيم كيوب" @@ -2922,19 +2588,7 @@ msgid "Gamecube &Pad Settings" msgstr "إعدادات تحكم جيم كيوب" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "بطاقه ذاكره الجيم كيوب (*.raw,*.gcp) " @@ -2959,21 +2613,8 @@ msgstr "" "(إما غير رمز سيئة أو نوع رمز غير مدعومة حتى الآن.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "عام" @@ -2982,27 +2623,9 @@ msgstr "عام" msgid "General Settings" msgstr "الإعدادات العامة" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "German" @@ -3024,13 +2647,6 @@ msgid "Greater Than" msgstr "أكبر من" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -3139,21 +2755,8 @@ msgid "Hotkey Configuration" msgstr "إعدادات الاختصارات" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "الاختصارات" @@ -3220,11 +2823,8 @@ msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -<<<<<<< HEAD -======= "إذا كانت محددة، سيتم تحديث سجلات المربع المحيط. المستخدمة من قبل لعبه بابير " "ماريو" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" @@ -3369,19 +2969,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "wad تثبيت" @@ -3460,27 +3048,9 @@ msgstr "تسجيل المل٠غير صالح" msgid "Invalid state" msgstr "غير صالح حالة" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italian" @@ -3633,35 +3203,11 @@ msgstr "8 تحميل حالة" msgid "Load State..." msgstr "تحميل حالة" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "تحميل قائمة نظام الوي" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "تحميل قائمة نظام الوي" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "تحميل قائمة نظام الوي" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "تحميل قائمة نظام الوي" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "تحميل قائمة نظام الوي %d%c" @@ -3741,15 +3287,7 @@ msgstr "MMU سرعة هاك" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "العصا الأيسر" @@ -3780,19 +3318,7 @@ msgid "Memory Byte" msgstr "ذاكرة بايت" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "بطاقة الذاكرة" @@ -3988,19 +3514,7 @@ msgstr "التبويب" msgid "NP Up" msgstr "Ùوق" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4087,15 +3601,7 @@ msgstr "لا يساوي" msgid "Not Set" msgstr "غير مجموعة" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "غير متصل" @@ -4156,14 +3662,7 @@ msgstr "Ùقط %d كتل متاحة" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Ùتح" @@ -4294,23 +3793,8 @@ msgstr "باتش" msgid "Paths" msgstr "مسارات" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "وقÙØ©" @@ -4330,23 +3814,8 @@ msgstr "مشهد %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "بدأ اللعبه" @@ -4372,19 +3841,7 @@ msgstr "خيارات التشغيل" msgid "Players" msgstr "لاعبين" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "يرجى تأكيد" @@ -4595,31 +4052,10 @@ msgstr "تحديث قائمة" msgid "Refresh game list" msgstr "تحديث القائمة" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "إزالة" @@ -4638,14 +4074,7 @@ msgid "Render to Main Window" msgstr "تقدم إلى الشاشة الرئيسية" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "إعادة ضبط" @@ -4688,19 +4117,7 @@ msgstr "Ø­Ùظ الحالة" msgid "Safe" msgstr "آمنة" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "معدل العينة :" @@ -4782,26 +4199,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" -<<<<<<< HEAD -<<<<<<< HEAD msgstr "EFB Copia a escala" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -<<<<<<< HEAD -======= -msgstr "" -======= -msgstr "EFB Copia a escala" ->>>>>>> Update Arabic and Japanese translations. - -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Ùحص %s" @@ -4841,39 +4241,12 @@ msgstr "" msgid "Select" msgstr "حدد" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "اختر مل٠تسجيل" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "اختر مل٠تسجيل" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "اختر مل٠تسجيل" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "اختر مل٠تسجيل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "لتثبيت wad حدد ملÙ" @@ -4899,13 +4272,7 @@ msgstr "اختر النواÙØ° العائمة" msgid "Select the file to load" msgstr "حدد المل٠لتحميل" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "حدد Ø­Ùظ الملÙ" @@ -4913,29 +4280,7 @@ msgstr "حدد Ø­Ùظ الملÙ" msgid "Select the state to load" msgstr "حدد حالة التحميل" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -msgid "Select the save file" -msgstr "حدد Ø­Ùظ الملÙ" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "حدد حالة التحميل" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "حدد حالة الحÙظ" @@ -5309,27 +4654,9 @@ msgstr "Ùشل إنشاء المخزن المؤقت الصوت : %s" msgid "Space" msgstr "مجال" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spanish" @@ -5373,15 +4700,7 @@ msgstr "مربع العصا" msgid "Standard Controller" msgstr "وحدة تحكم القياسية" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5416,14 +4735,7 @@ msgstr "عصا" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "اغلق اللعبه" @@ -5500,57 +4812,25 @@ msgstr "الجدول الأيمن" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "اخذ لقطه من الشاشه" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" -<<<<<<< HEAD -msgstr "" -======= msgstr "TaruKonga (Bongos)" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "اختبار" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 -<<<<<<< HEAD -<<<<<<< HEAD msgid "Texture" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 msgid "Texture Cache" -<<<<<<< HEAD -msgstr "" -======= -#, fuzzy -======= ->>>>>>> Update Arabic and Japanese translations. -msgid "Texture" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 -msgid "Texture Cache" -<<<<<<< HEAD -msgstr "إزالة التخزين المؤقت" ->>>>>>> Update translation files for recent changes in the code. -======= -msgstr "" ->>>>>>> Update Arabic and Japanese translations. -======= msgstr "Texture Cache" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" @@ -5752,31 +5032,12 @@ msgstr "تبديل جميع أنواع السجل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "اللعب بالشاشة كاملة" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "أعلى" @@ -5883,21 +5144,6 @@ msgstr "تلقى رسالة مجهولة مع معر٠: %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"مؤشر غير معرو٠%#08x\n" -"مواصلة?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6055,44 +5301,6 @@ msgstr "" "%s\n" "ولها Ù†Ùس اسم المل٠على بطاقة ذاكرة الخاصة بك\n" "تستمر?" -<<<<<<< HEAD - -#: Source/Core/Core/Src/Movie.cpp:629 -#, 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 "" - -#: Source/Core/Core/Src/Movie.cpp:646 -#, 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 "" - -#: Source/Core/Core/Src/Movie.cpp:655 -#, 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" -"\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" -"\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" -msgstr "" -======= ->>>>>>> Update Arabic and Japanese translations. #: Source/Core/Core/Src/Movie.cpp:667 #, c-format @@ -6162,19 +5370,7 @@ msgstr "Wii NAND Root:" msgid "Wii Save Import" msgstr "استيراد Ø­Ùظ الوي" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "ملÙات Ø­Ùظ الوي (*.bin)|*.bin" @@ -6205,15 +5401,7 @@ msgstr "" "أو ربما هو بسبب الخمول وقت مستقطع أو لسبب آخر.\n" "هل تريد إعادة الاتصال على الÙور?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "ويموت متصل" @@ -6245,27 +5433,9 @@ msgstr "نواÙØ° اليمين" msgid "Word Wrap" msgstr "كلمة ختامية" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "العمل" @@ -6501,19 +5671,10 @@ msgstr "أو" #~ msgid "< as Default Profile >" #~ msgstr "< الوضع الاÙتراضي >" -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Arabic and Japanese translations. #, fuzzy #~ msgid "AOSound" #~ msgstr "&الصوت" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Accurate Texture Cache" #~ msgstr "دقة المظهر السطحي المؤقت" @@ -6551,10 +5712,6 @@ msgstr "أو" #~ "the EFB scale.\n" #~ "ومن الأÙضل Ù„ تعيين نسبة العرض إلى الارتÙاع لتمتد عند استخدامه." -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Bad gameini filename" #~ msgstr "Nombre de archivo gameini incorrecto" @@ -6582,27 +5739,13 @@ msgstr "أو" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "No se puede abrir %s, no tiene una función" -<<<<<<< HEAD -<<<<<<< HEAD #~ msgid "Cannot record movies in read-only mode." #~ msgstr "لا يمكن تسجيل الأÙلام ÙÙŠ وضع للقراءة Ùقط." -======= ->>>>>>> Update Arabic and Japanese translations. -======= -#~ msgid "Cannot record movies in read-only mode." -#~ msgstr "لا يمكن تسجيل الأÙلام ÙÙŠ وضع للقراءة Ùقط." - ->>>>>>> Update from master branch. #, fuzzy #~ msgid "Config..." #~ msgstr "إعدادات" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Configuration profile" #~ msgstr "التكوين الشخصي" @@ -6706,10 +5849,6 @@ msgstr "أو" #~ msgid "Enable CPU Access" #~ msgstr "CPU Access تمكين" -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Enable Copy to EFB" #~ msgstr "Habilitar Copiado al EFB" @@ -6725,21 +5864,12 @@ msgstr "أو" #~ msgid "Enable JIT Dynarec" #~ msgstr "تمكين صÙحات" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Enable OpenCL" #~ msgstr "OpenCL تمكين " #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "تمكين شاشة التوقÙ" -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Arabic and Japanese translations. #, fuzzy #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" @@ -6813,11 +5943,6 @@ msgstr "أو" #~ msgid "Force Bi/Trilinear Filtering" #~ msgstr "Forzar Filtro Bi/Tri-linear" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Fractional" #~ msgstr "جزئي" @@ -6960,10 +6085,6 @@ msgstr "أو" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "اللازمة لاستعمال الخط القرص اليابانية." -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Arabic and Japanese translations. #, fuzzy #~ msgid "Run" #~ msgstr "Enter" @@ -6971,11 +6092,6 @@ msgstr "أو" #~ msgid "Running script...\n" #~ msgstr "Ejecutando script...\n" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Scale:" #~ msgstr "النطاق :" @@ -7033,10 +6149,6 @@ msgstr "أو" #~ "عرض إحصاءات مختلÙØ©.\n" #~ "وهذا Ù…Ùيد Ùقط لأغراض التصحيح." -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Skies of Arcadia" #~ msgstr "Skies of Arcadia" @@ -7076,21 +6188,12 @@ msgstr "أو" #~ msgid "Specify an audio plugin" #~ msgstr "حدد الخلÙية مل٠Ùيديو" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Start Renderer in Fullscreen" #~ msgstr "بدء ÙÙŠ كمال ملء الشاشة" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "بدء التقديم ÙÙŠ إطار وضع ملء الشاشة." -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "The file " #~ msgstr "El archivo " @@ -7117,10 +6220,6 @@ msgstr "أو" #~ msgid "Type %d config not supported in plugin %s" #~ msgstr "Configuración de tipo %d no soportado en el plugin %s" -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -7128,13 +6227,6 @@ msgstr "أو" #~ "مؤشر غير معرو٠%#08x\n" #~ "مواصلة?" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. -======= ->>>>>>> Update from master branch. #~ msgid "Use FPS For Limiting" #~ msgstr "لحد عدد الاطارات" diff --git a/Languages/po/ca.po b/Languages/po/ca.po index 2cdcaf6800..25d8f756a8 100644 --- a/Languages/po/ca.po +++ b/Languages/po/ca.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-08-19 08:36-0500\n" "Last-Translator: Jordi Coma \n" "Language-Team: Catalan \n" @@ -576,27 +564,9 @@ msgstr "Afegeix Pegat" msgid "Add new pane" msgstr "Afegeix un nou panell" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Afegir ..." @@ -664,23 +634,8 @@ msgstr "Totes les imatges GC / Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tots els fitxers GameCube GCM (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tots els Estats (savi, s##\")" @@ -769,19 +724,7 @@ 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!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relació d'aspecte:" @@ -803,19 +746,7 @@ msgstr "Suport d'àudio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error en obrir el dispositiu AO \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -931,19 +862,7 @@ msgid "Blue Right" msgstr "Blau dret" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Abaix" @@ -976,15 +895,7 @@ msgstr "Examineu el directori de sortida" msgid "Buffer:" msgstr "Buffer:" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1239,21 +1150,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Tancar" @@ -1361,15 +1259,7 @@ msgstr "Connectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Connectar Wiimote 4" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "Connectant ..." @@ -1559,21 +1449,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Motor d'emulació DSP" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulació DSP HLE (ràpid)" @@ -1812,19 +1689,7 @@ msgstr "" msgid "Divide" msgstr "Divideix" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Voleu aturar l'emulació actual?" @@ -1853,39 +1718,12 @@ msgstr "Configuració de Wiimote emulat" msgid "Dolphin FIFO" msgstr "FIFO Dolphin" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Configuració del control GC Dolphin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Configuració del control GC Dolphin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Configuració del control GC Dolphin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Configuració del control GC Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin Pel·lícules TAS (*.dtm)" @@ -1982,27 +1820,9 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holandès" @@ -2143,40 +1963,15 @@ msgstr "Habilitar les millors tècniques disponibles" msgid "Enable Block Merging" msgstr "Habilitar fusió de Bloc" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Habilitar memòria cau" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Activar Trucs" @@ -2329,27 +2124,9 @@ msgstr "" msgid "End" msgstr "Fi" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Anglès" @@ -2378,45 +2155,10 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Error" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Error" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Error" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Error" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2885,27 +2627,9 @@ msgstr "Imatges a Enregistrar" msgid "Free Look" msgstr "Visió lliure" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francès" @@ -2972,19 +2696,7 @@ msgid "Gamecube &Pad Settings" msgstr "Configuració control «&Gamecube»" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Targetes de memòria per GameCube (*.raw, *.gcp)" @@ -3009,21 +2721,8 @@ msgstr "" "(Pot ser un codi incorrecte o el tipus de codi encara no està suportat.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -3032,27 +2731,9 @@ msgstr "General" msgid "General Settings" msgstr "Configuració General" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Alemany" @@ -3186,21 +2867,8 @@ msgid "Hotkey Configuration" msgstr "Tecla d'accés de configuració" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Tecles d'accés" @@ -3427,19 +3095,7 @@ msgstr "" "InstallExceptionHandler cridat, però aquesta plataforma no està suportada " "encara." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instal·lant WAD ..." @@ -3521,27 +3177,9 @@ msgstr "Enregistrament de fitxer invàlid" msgid "Invalid state" msgstr "Estat invàlid" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italià" @@ -3699,35 +3337,11 @@ msgstr "Carregar ranura d'estat 8" msgid "Load State..." msgstr "Carregar Estat..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Carregar el menú del sistema Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Carregar el menú del sistema Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Carregar el menú del sistema Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Carregar el menú del sistema Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar menú del sistema Wii %d%c" @@ -3809,15 +3423,7 @@ msgstr "Modificació de velocitat MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Arxius MadCatz Gameshark (*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Palanca principal" @@ -3848,19 +3454,7 @@ msgid "Memory Byte" msgstr "Byte de memòria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Targeta de memòria" @@ -4060,19 +3654,7 @@ msgstr "NP Tabulador" msgid "NP Up" msgstr "NP Amunt" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4159,15 +3741,7 @@ msgstr "No igual" msgid "Not Set" msgstr "Sense establir" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "No està connectat" @@ -4228,14 +3802,7 @@ msgstr "Només queden %d blocs disponibles" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Obrir" @@ -4366,23 +3933,8 @@ msgstr "Pegats" msgid "Paths" msgstr "Camins" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4402,23 +3954,8 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Executar" @@ -4444,19 +3981,7 @@ msgstr "Opcions de reproducció" msgid "Players" msgstr "Jugadors" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Confirmeu ..." @@ -4668,31 +4193,10 @@ msgstr "Actualitzar llista" msgid "Refresh game list" msgstr "Actualitza la llista de jocs" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Treure" @@ -4711,14 +4215,7 @@ msgid "Render to Main Window" msgstr "Renderitzar a la finestra principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -4761,19 +4258,7 @@ msgstr "&Desa l'estat" msgid "Safe" msgstr "Segur" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Freqüència de mostreig:" @@ -4857,19 +4342,7 @@ msgstr "La pal·lícula guardada %s és corrupta, s'atura la gravació..." msgid "Scaled EFB Copy" msgstr "Copia EFB escalada" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Escanejant %s" @@ -4909,39 +4382,12 @@ msgstr "La secció %s no trobada a SYSCONF" msgid "Select" msgstr "Seleccionar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Seleccionar el fitxer de gravació" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Seleccionar el fitxer de gravació" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Seleccionar el fitxer de gravació" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Seleccionar el fitxer de gravació" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleccionar un fitxer WAD de Wii per instal·lar" @@ -4966,26 +4412,7 @@ msgstr "Seleccioneu finestres flotants" msgid "Select the file to load" msgstr "Seleccioneu el fitxer a carregar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "Seleccioneu el fitxer de partida desada" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Seleccioneu l'estat a carregar" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Seleccioneu el fitxer de partida desada" @@ -4993,16 +4420,7 @@ msgstr "Seleccioneu el fitxer de partida desada" msgid "Select the state to load" msgstr "Seleccioneu l'estat a carregar" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Seleccioneu l'estat a desar" @@ -5385,27 +4803,9 @@ msgstr "Ha fallat la creació del buffer de so: %s" msgid "Space" msgstr "Espai" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Espanyol" @@ -5450,15 +4850,7 @@ msgstr "Palanca quadrada" msgid "Standard Controller" msgstr "Control estàndard" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5493,14 +4885,7 @@ msgstr "Palanca" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Aturar" @@ -5577,14 +4962,7 @@ msgstr "Taula dreta" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Capturar pantalla" @@ -5817,31 +5195,12 @@ msgstr "Activar tots els tipus de registre de Log" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Activar pantalla completa" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Dalt" @@ -5951,21 +5310,6 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "Missatge desconegut amb id: %d rebut des del jugador: Expulsant jugador %d!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Punter desconegud %#08x\n" -"Voleu continuar?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6195,19 +5539,7 @@ msgstr "Arrel de la NAND:" msgid "Wii Save Import" msgstr "Importar partida guardada Wii" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Arxius de partida guardada Wii (*.bin)|*.bin" @@ -6238,15 +5570,7 @@ msgstr "" "o potser és perquè l'esteu fent servir fora de temps o una altra raó. \n" "Vols tornar a connectar-lo immediatament?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote connectat" @@ -6278,27 +5602,9 @@ msgstr "Finestra dreta" msgid "Word Wrap" msgstr "Envoltant de paraula" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Treballant ..." @@ -6878,10 +6184,6 @@ msgstr "| O" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Iniciar la finestra de renderitzat a pantalla completa." -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -6902,11 +6204,6 @@ msgstr "| O" #~ "Punter desconegud %#08x\n" #~ "Voleu continuar?" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #~ msgid "Use FPS For Limiting" #~ msgstr "Limitar imatges/s (FPS)" diff --git a/Languages/po/cs.po b/Languages/po/cs.po index d9d24e6b40..597af6dc22 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -7,35 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -<<<<<<< HEAD -"PO-Revision-Date: 2011-10-15 14:50+0100\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -"PO-Revision-Date: 2011-08-10 20:37+0100\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-08-10 08:30-0500\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> The actual update of the Greek and Czech translations. The last commit -"PO-Revision-Date: 2011-10-15 14:50+0100\n" ->>>>>>> Update Greek and Czech translations -======= -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-19 07:39+0100\n" ->>>>>>> Update Czeck translation. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -"PO-Revision-Date: 2011-12-19 07:39+0100\n" ->>>>>>> Update from master branch. "Last-Translator: ZbynÄ›k Schwarz \n" "Language-Team: \n" "Language: Czech\n" @@ -453,19 +426,7 @@ msgstr "PÅ™esnost:" msgid "Accurate VBeam emulation" msgstr "Precizní emulace VBeam" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -<<<<<<< HEAD -======= -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 ->>>>>>> Update Greek and Czech translations -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -591,39 +552,9 @@ msgstr "PÅ™idat Záplatu" msgid "Add new pane" msgstr "PÅ™idat nový panel" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "PÅ™idat..." @@ -691,33 +622,8 @@ msgstr "VÅ¡echny obrazy GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "VÅ¡echny Uložené Stavy (sav, s##)" @@ -745,33 +651,11 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -<<<<<<< HEAD -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update the pot file to reflect recent changes in the code. -msgid "Alternate Wiimote Timing" -msgstr "Střídat Äasování Wiimote" -======= -#, fuzzy -msgid "Alternate Wiimote Timing" -msgstr "Emulovaný Wiimote" ->>>>>>> Update translation files for recent changes in the code. - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Alternate Wiimote Timing" msgstr "Střídat Äasování Wiimote" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Anisotropic Filtering:" msgstr "Anizotropní Filtrování:" @@ -826,28 +710,8 @@ msgstr "" 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!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 ->>>>>>> Update Greek and Czech translations -======= -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Aspect Ratio:" msgstr "PomÄ›r Stran:" @@ -868,28 +732,8 @@ 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" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 ->>>>>>> Update Greek and Czech translations -======= -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Auto" msgstr "Auto" @@ -1002,30 +846,8 @@ msgstr "Modrá vlevo" msgid "Blue Right" msgstr "Modrá vpravo" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Dole" @@ -1058,25 +880,7 @@ msgstr "Procházet pro výstupní adresář" msgid "Buffer:" msgstr "Vyrovnávací paměť:" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 -======= ->>>>>>> Update Greek and Czech translations -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1317,29 +1121,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 ->>>>>>> Update Greek and Czech translations -======= -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Zavřít" @@ -1447,23 +1230,7 @@ msgstr "PÅ™ipojit Wiimote 3" msgid "Connect Wiimote 4" msgstr "PÅ™ipojit Wiimote 4" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:608 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "PÅ™ipojuji..." @@ -1652,31 +1419,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Jádro Emulátoru DSP" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulace (rychlé)" @@ -1915,27 +1659,7 @@ msgstr "" msgid "Divide" msgstr "RozdÄ›lit" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Chcete souÄasnou emulaci zastavit?" @@ -1964,55 +1688,12 @@ msgstr "Nastavení Emulovaného Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GCPad Nastavení" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GCPad Nastavení" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GCPad Nastavení" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Nastavení" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" @@ -2108,39 +1789,9 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "NizozemÅ¡tina" @@ -2279,49 +1930,15 @@ msgstr "Zapnout BAT" msgid "Enable Block Merging" msgstr "Zapnout SluÄování Bloků" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "Povolit výpoÄet ohraniÄujícího rámeÄku" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Povolit vyrovnávací paměť" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -======= ->>>>>>> Update Greek and Czech translations -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Povolit Cheaty" @@ -2477,39 +2094,9 @@ msgstr "" msgid "End" msgstr "End" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "AngliÄtina" @@ -2536,66 +2123,13 @@ msgstr "Záznam 1/%d" msgid "Equal" msgstr "Rovná se" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Chyba" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" -"Chyba v PlayWiimote. %u != %u, bajt %d.\n" -"Je nám líto, nahrávání Wii je doÄasnÄ› nefunkÄní." - -======= -======= ->>>>>>> Update Greek and Czech translations -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Chyba" - -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" -"Chyba v PlayWiimote. %u != %u, bajt %d.\n" -"Je nám líto, nahrávání Wii je doÄasnÄ› nefunkÄní." - ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/Main.cpp:346 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:356 ->>>>>>> Update Greek and Czech translations -======= -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Chyba" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 ->>>>>>> The actual update of the Greek and Czech translations. The last commit 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." @@ -3063,39 +2597,9 @@ msgstr "Snímky k Nahrání" msgid "Free Look" msgstr "Rozhlížení pomocí myÅ¡i" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "FrancouzÅ¡tina" @@ -3160,30 +2664,8 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Nastavení Gamecube &Pad" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" @@ -3207,31 +2689,10 @@ msgstr "" "Nelze spustit GeckoKód (CT%i CST%i) (%s)\n" "(buÄ Å¡patný kód, nebo typ kódu není jeÅ¡tÄ› podporován.)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "General" msgstr "Obecné" @@ -3239,39 +2700,9 @@ msgstr "Obecné" msgid "General Settings" msgstr "Obecná Nastavení" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "NÄ›mÄina" @@ -3292,19 +2723,7 @@ msgstr "Grafická nastavení" msgid "Greater Than" msgstr "VÄ›tší než" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -<<<<<<< HEAD -======= -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 ->>>>>>> Update Greek and Czech translations -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -3412,32 +2831,9 @@ msgstr "Hostovat" msgid "Hotkey Configuration" msgstr "Nastavení klávesových zkratek" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Klávesové zkratky" @@ -3662,27 +3058,7 @@ msgstr "" "Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› " "nepodporuje." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instaluji WAD..." @@ -3764,39 +3140,9 @@ msgstr "Neplatný soubor s nahrávkou" msgid "Invalid state" msgstr "Neplatný stav" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "ItalÅ¡tina" @@ -3954,51 +3300,11 @@ msgstr "Nahrát Slot Stavu 8" msgid "Load State..." msgstr "Nahrát Stav..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Nahrát Systémové Menu Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Nahrát Systémové Menu Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 -msgid "Load Wii System Menu" -msgstr "Nahrát Systémové Menu Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Nahrát Systémové Menu Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Nahrát Systémové Menu Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Nahrát Systémové Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Nahrát Systémové Menu Wii %d%c" @@ -4080,23 +3386,7 @@ msgstr "MMU Hack Rychlosti" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Soubory MadCatz Gameshark (*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Hlavní Stick" @@ -4126,30 +3416,8 @@ msgstr "Pam. karta již otevÅ™ena" msgid "Memory Byte" msgstr "Bajt PamÄ›ti" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Paměťová karta" @@ -4347,26 +3615,7 @@ msgstr "NK Tab" msgid "NP Up" msgstr "NK Nahoru" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4453,23 +3702,7 @@ msgstr "Nerovná se" msgid "Not Set" msgstr "Nenastaven" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:607 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "NepÅ™ipojen" @@ -4528,24 +3761,9 @@ msgstr "Logická Adresa:" msgid "Only %d blocks available" msgstr "Pouze bloky %d jsou dostupné" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 ->>>>>>> Update Greek and Czech translations -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Otevřít" @@ -4675,31 +3893,8 @@ msgstr "Záplaty" msgid "Paths" msgstr "Cesty" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pozastavit" @@ -4717,37 +3912,10 @@ msgstr "Dokonalá" msgid "Perspective %d" msgstr "Perspektiva %d" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 ->>>>>>> Update Greek and Czech translations -======= #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Spustit" @@ -4773,27 +3941,7 @@ msgstr "Možnosti PÅ™ehrávání" msgid "Players" msgstr "HráÄi" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Prosím potvrÄte..." @@ -5004,45 +4152,10 @@ msgstr "Obnovit Seznam" msgid "Refresh game list" msgstr "Obnovit seznam her" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Odstranit" @@ -5060,18 +4173,6 @@ msgstr "" msgid "Render to Main Window" msgstr "Vykreslit do Hlavního okna" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 @@ -5112,36 +4213,11 @@ msgstr "RuÅ¡tina" msgid "Sa&ve State" msgstr "Uložit Sta&v" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 -msgid "Safe" -msgstr "BezpeÄná" - -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -======= ->>>>>>> Update Greek and Czech translations -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "BezpeÄná" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Vzorkovací frekvence:" @@ -5221,32 +4297,11 @@ msgstr "Uložit dekomprimované GCM/ISO" msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Uložený stav filmu %s je poÅ¡kozen, nahrávání filmu je zastaveno..." -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -======= ->>>>>>> Update Greek and Czech translations -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Skenuji %s" @@ -5286,47 +4341,12 @@ msgstr "Sekce %s nebyla v SYSCONF nalezena" msgid "Select" msgstr "Vybrat" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Vyberte Soubor s Nahrávkou" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Vyberte Soubor s Nahrávkou" - -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Vyberte Soubor s Nahrávkou" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Vyberte Soubor s Nahrávkou" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" @@ -5352,34 +4372,7 @@ msgstr "Vybrat plovoucí okna" msgid "Select the file to load" msgstr "Vyberte soubor k nahrání" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "Vyberte soubor s uloženou hrou" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Vyberte stav k nahrání" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" @@ -5387,24 +4380,7 @@ msgstr "Vyberte soubor s uloženou hrou" msgid "Select the state to load" msgstr "Vyberte stav k nahrání" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Vyberte stav k uložení" @@ -5783,39 +4759,9 @@ msgstr "VytvoÅ™ení vyrovnávací pamÄ›ti zvuku selhalo: %s" msgid "Space" msgstr "Mezerník" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Å panÄ›lÅ¡tina" @@ -5859,22 +4805,7 @@ msgstr "ÄŒtvercový Stick" msgid "Standard Controller" msgstr "Standardní OvladaÄ" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5906,26 +4837,10 @@ msgstr "Ukládání stavu" msgid "Stick" msgstr "Stick" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 ->>>>>>> Update Greek and Czech translations -======= #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Zastavit" @@ -6001,22 +4916,8 @@ msgstr "Deska vpravo" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "VytvoÅ™it Snímek Obrazovky" @@ -6245,25 +5146,6 @@ msgstr "Do" msgid "Toggle All Log Types" msgstr "Zapnout VÅ¡echny Typy Záznamů" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -msgid "Toggle Fullscreen" -msgstr "PÅ™epnout na Celou Obrazovku" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 @@ -6271,19 +5153,7 @@ msgid "Toggle Fullscreen" msgstr "PÅ™epnout na Celou Obrazovku" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "NahoÅ™e" @@ -6392,29 +5262,6 @@ msgstr "PÅ™ijata neznámá zpráva s id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Neznámá zpráva s id:%d pÅ™ijata od hráÄe:%d Vyhazuji hráÄe!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Neznámý ukazatel %#08x\n" -"PokraÄovat?" - -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 -======= ->>>>>>> Update Greek and Czech translations -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6663,27 +5510,7 @@ msgstr "Wii KoÅ™en NAND:" msgid "Wii Save Import" msgstr "Import uložených pozic Wii" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -6714,23 +5541,7 @@ msgstr "" "nebo je to vyprÅ¡ení limitu neaktivity, nebo z jiného důvodu.\n" "Chcete ho hned znovu pÅ™ipojit?" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:609 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote PÅ™ipojen" @@ -6762,35 +5573,9 @@ msgstr "Klávesa Windows Vpravo" msgid "Word Wrap" msgstr "Zalamování textu" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Pracuji..." @@ -7419,12 +6204,6 @@ msgstr "| NEBO" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Spustí vykreslovací okno v režimu celé obrazovky." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -7446,45 +6225,6 @@ msgstr "| NEBO" #~ "Neznámý ukazatel %#08x\n" #~ "PokraÄovat?" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#~ 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" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "Ukládat EFB kopie do objektů textury grafického procesoru.\n" -#~ "Toto není pÅ™esné, ale pro vÄ›tÅ¡inu her funguje dostateÄnÄ› dobÅ™e a dává " -#~ "vÄ›tší zrychlení než EFB do RAM.\n" -#~ "\n" -#~ "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." - -#~ msgid "Texture" -#~ msgstr "Textura" - -#~ msgid "Texture Cache" -#~ msgstr "Vyrovnávací Paměť Textur" - -#~ msgid "" -#~ "The safer you adjust this, the less likely the emulator will be missing " -#~ "any texture updates from RAM.\n" -#~ "\n" -#~ "If unsure, use the second-fastest value from the right." -#~ 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." - ->>>>>>> Update Greek and Czech translations -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= ->>>>>>> Update from master branch. #~ msgid "Use FPS For Limiting" #~ msgstr "Použít SzS pro Omezení" diff --git a/Languages/po/de.po b/Languages/po/de.po index 6ed4fa1ca7..c37a4a9f10 100644 --- a/Languages/po/de.po +++ b/Languages/po/de.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-02-17 01:23+0100\n" "Last-Translator: LucasX \n" "Language-Team: \n" @@ -563,27 +551,9 @@ msgstr "Patch hinzufügen" msgid "Add new pane" msgstr "Neue Palette hinzufügen" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Hinzufügen..." @@ -652,23 +622,8 @@ msgstr "Alle GC/Wii Images (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM Dateien (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Speicherstände (sav, s##)" @@ -751,19 +706,7 @@ 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." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Seitenverhältnis:" @@ -785,19 +728,7 @@ msgstr "Audio Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisch" @@ -911,19 +842,7 @@ msgid "Blue Right" msgstr "Blau rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Unten" @@ -956,15 +875,7 @@ msgstr "Ausgabeverzeichnis auswählen" msgid "Buffer:" msgstr "Buffer:" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1201,21 +1112,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Schließen" @@ -1324,15 +1222,7 @@ msgstr "Wiimote 3 verbinden" msgid "Connect Wiimote 4" msgstr "Wiimote 4 verbinden" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "Verbinden..." @@ -1523,21 +1413,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emulation (schnell)" @@ -1762,19 +1639,7 @@ msgstr "" msgid "Divide" msgstr "Dividieren" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Laufende Emulation stoppen?" @@ -1804,39 +1669,12 @@ msgstr "Dolphin Emulierte-Wiimote Einstellungen" msgid "Dolphin FIFO" msgstr "Dolphin" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GCPad Konfiguration" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GCPad Konfiguration" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GCPad Konfiguration" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Konfiguration" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filme (*.dtm)" @@ -1924,27 +1762,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holländisch" @@ -2068,41 +1888,16 @@ msgstr "BAT aktivieren" msgid "Enable Block Merging" msgstr "Blockvereinigung aktivieren" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Cache verwenden" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Cheats aktivieren" @@ -2241,27 +2036,9 @@ msgstr "" msgid "End" msgstr "Ende" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Englisch" @@ -2290,45 +2067,10 @@ msgstr "Gleich" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Fehler" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Fehler" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Fehler" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Fehler" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2799,27 +2541,9 @@ msgstr "" msgid "Free Look" msgstr "Frei Umsehen" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Französisch" @@ -2888,19 +2612,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube-&Pad Einstellungen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Cards (*.raw,*.gcp)" @@ -2926,21 +2638,8 @@ msgstr "" "unterstützt.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Allgemein" @@ -2950,27 +2649,9 @@ msgstr "Allgemein" msgid "General Settings" msgstr "Interface Einstellungen" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Deutsch" @@ -3095,21 +2776,8 @@ msgid "Hotkey Configuration" msgstr "Tastenkürzel Einstellungen" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Tastenkürzel" @@ -3326,19 +2994,7 @@ msgstr "" "InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesn " "noch nicht." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "WAD ins Wii-Menü installieren..." @@ -3424,27 +3080,9 @@ msgstr "Ungültige Aufnahmedatei" msgid "Invalid state" msgstr "Ungültiger Status" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italienisch" @@ -3603,36 +3241,12 @@ msgstr "Status aus Slot 8 laden" msgid "Load State..." msgstr "Status laden..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Wii-Menü laden (%d %c)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii-Menü laden (%d %c)" @@ -3717,15 +3331,7 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark Dateien(*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Main Stick" @@ -3757,19 +3363,7 @@ msgid "Memory Byte" msgstr "Speicher" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Memory Card" @@ -3956,19 +3550,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Hoch" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4056,15 +3638,7 @@ msgstr "Ungleich" msgid "Not Set" msgstr "Nicht Festgelegt" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "Nicht Verbunden" @@ -4125,14 +3699,7 @@ msgstr "Nur %d Blöcke verfügbar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Öffnen" @@ -4264,23 +3831,8 @@ msgstr "Patches" msgid "Paths" msgstr "Pfade" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4301,23 +3853,8 @@ msgstr "Perspektive %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Start" @@ -4344,19 +3881,7 @@ msgstr "Optionen" msgid "Players" msgstr "Spieler" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Bitte Bestätigen..." @@ -4572,31 +4097,10 @@ msgstr "Liste aktualisieren" msgid "Refresh game list" msgstr "Spieleliste aktualisieren" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Entfernen" @@ -4615,14 +4119,7 @@ msgid "Render to Main Window" msgstr "Im Hauptfenster Rendern" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Zurücksetzen" @@ -4665,19 +4162,7 @@ msgstr "S&tatus speichern" msgid "Safe" msgstr "Sicher" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Abtastrate:" @@ -4762,19 +4247,7 @@ msgstr "Film-Status %s ist fehlerhaft, breche die Filmaufnahme ab..." msgid "Scaled EFB Copy" msgstr "EFB Scaled Copy" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Suche..." @@ -4814,39 +4287,12 @@ msgstr "Ausgewähltes %s nicht gefunden in SYSCONF" msgid "Select" msgstr "Auswählen" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Aufnahmedatei auswählen" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Aufnahmedatei auswählen" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Aufnahmedatei auswählen" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Aufnahmedatei auswählen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Speicherdatei zum Importieren auswählen" @@ -4873,13 +4319,7 @@ msgstr "Wähle unverankerte Fenster" msgid "Select the file to load" msgstr "Datei zum Laden auswählen" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Wii-Spielstand auswählen" @@ -4887,29 +4327,7 @@ msgstr "Wii-Spielstand auswählen" msgid "Select the state to load" msgstr "Status zum Laden auswählen" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -msgid "Select the save file" -msgstr "Wii-Spielstand auswählen" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Status zum Laden auswählen" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Status zum Speichern auswählen" @@ -5265,27 +4683,9 @@ msgstr "Erstellen des Sound-Buffer fehlgeschlagen: %s" msgid "Space" msgstr "Leertaste" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spanisch" @@ -5321,15 +4721,7 @@ msgstr "" msgid "Standard Controller" msgstr "Standard-Controller" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5364,14 +4756,7 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stopp" @@ -5444,14 +4829,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Screenshot erstellen" @@ -5681,31 +5059,12 @@ msgstr "Alle umschalten" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Vollbildmodus wechseln" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Oben" @@ -5810,21 +5169,6 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "Unbekannte Meldung mit ID %d erhalten von Spieler %d, Spieler herausgeworfen!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Unbekanter Pointer %#08x\n" -"Fortfahren?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6039,19 +5383,7 @@ msgstr "DVD Laufwerk:" msgid "Wii Save Import" msgstr "Wii Spielstand importieren" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii Speicherdateien (*.bin)|*.bin" @@ -6082,15 +5414,7 @@ msgstr "" "oder die Wiimote war zulange inaktiv oder andere Ursachen.\n" "Soll die Wiimote jetzt wieder verbunden werden?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Verbunden" @@ -6123,27 +5447,9 @@ msgstr "Windows Rechts" msgid "Word Wrap" msgstr "Zeilenumbruch" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Arbeite..." diff --git a/Languages/po/dolphin-emu.pot b/Languages/po/dolphin-emu.pot index 0f5636c238..3bfb569233 100644 --- a/Languages/po/dolphin-emu.pot +++ b/Languages/po/dolphin-emu.pot @@ -8,19 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:56-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -518,27 +506,9 @@ msgstr "" msgid "Add new pane" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "" @@ -592,23 +562,8 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" @@ -686,19 +641,7 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -720,19 +663,7 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -840,19 +771,7 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "" @@ -885,15 +804,7 @@ msgstr "" msgid "Buffer:" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1113,21 +1024,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "" @@ -1235,15 +1133,7 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "" @@ -1417,21 +1307,8 @@ msgstr "" msgid "DSP Emulator Engine" msgstr "" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1649,19 +1526,7 @@ msgstr "" msgid "Divide" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1690,39 +1555,12 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1805,27 +1643,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "" @@ -1944,40 +1764,15 @@ msgstr "" msgid "Enable Block Merging" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "" @@ -2103,27 +1898,9 @@ msgstr "" msgid "End" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "" @@ -2152,45 +1929,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2615,27 +2357,9 @@ msgstr "" msgid "Free Look" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "" @@ -2701,19 +2425,7 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2736,21 +2448,8 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2759,27 +2458,9 @@ msgstr "" msgid "General Settings" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "" @@ -2894,21 +2575,8 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "" @@ -3099,19 +2767,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "" @@ -3188,27 +2844,9 @@ msgstr "" msgid "Invalid state" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "" @@ -3359,35 +2997,11 @@ msgstr "" msgid "Load State..." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3464,15 +3078,7 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3503,19 +3109,7 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "" @@ -3692,19 +3286,7 @@ msgstr "" msgid "NP Up" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3791,15 +3373,7 @@ msgstr "" msgid "Not Set" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "" @@ -3860,14 +3434,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "" @@ -3993,23 +3560,8 @@ msgstr "" msgid "Paths" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -4029,23 +3581,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "" @@ -4071,19 +3608,7 @@ msgstr "" msgid "Players" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -4289,31 +3814,10 @@ msgstr "" msgid "Refresh game list" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "" @@ -4329,14 +3833,7 @@ msgid "Render to Main Window" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -4379,19 +3876,7 @@ msgstr "" msgid "Safe" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -4475,19 +3960,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" @@ -4527,39 +4000,12 @@ msgstr "" msgid "Select" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4582,26 +4028,7 @@ msgstr "" msgid "Select the file to load" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "" @@ -4609,16 +4036,7 @@ msgstr "" msgid "Select the state to load" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4952,27 +4370,9 @@ msgstr "" msgid "Space" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "" @@ -5008,15 +4408,7 @@ msgstr "" msgid "Standard Controller" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5051,14 +4443,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -5130,14 +4515,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "" @@ -5340,31 +4718,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "" @@ -5466,19 +4825,6 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5683,19 +5029,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5722,15 +5056,7 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "" @@ -5762,27 +5088,9 @@ msgstr "" msgid "Word Wrap" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "" diff --git a/Languages/po/el.po b/Languages/po/el.po index 74d89374e1..2f7ef538fc 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -7,31 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -"PO-Revision-Date: 2011-09-13 17:28+0200\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-08-10 08:30-0500\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> The actual update of the Greek and Czech translations. The last commit -"PO-Revision-Date: 2011-10-15 11:16+0200\n" ->>>>>>> Update Greek and Czech translations -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -"PO-Revision-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. "Last-Translator: Linktothepast \n" "Language-Team: Gpower2 \n" "Language: Greek\n" @@ -447,49 +424,15 @@ msgstr "Σχετικά με το Dolphin" msgid "Acceleration" msgstr "Επιτάχυνση" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 -msgid "Accuracy:" -<<<<<<< HEAD -msgstr "ΑκÏίβεια:" -======= -msgstr "" ->>>>>>> Update translation files for recent changes in the code. - -======= ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 -msgid "Accuracy:" -msgstr "ΑκÏίβεια:" - ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 -======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "ΑκÏίβεια:" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Accurate VBeam emulation" msgstr "ΑκÏιβής VBeam εξομοίωση" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -<<<<<<< HEAD -======= -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 ->>>>>>> Update Greek and Czech translations -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -617,39 +560,9 @@ msgstr "ΠÏοσθήκη Patch" msgid "Add new pane" msgstr "ΠÏοσθήκη νέου pane" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "ΠÏοσθήκη..." @@ -705,33 +618,8 @@ msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" @@ -759,33 +647,11 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -<<<<<<< HEAD -msgid "Alternate Wiimote Timing" -msgstr "Εναλλακτικός ΧÏονισμός Wiimote" -======= -#, fuzzy -msgid "Alternate Wiimote Timing" -msgstr "Εξομοιωμένο Wiimote" ->>>>>>> Update translation files for recent changes in the code. - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Εναλλακτικός ΧÏονισμός Wiimote" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Anisotropic Filtering:" msgstr "ΑνισοτÏοπικό ΦιλτÏάÏισμα:" @@ -842,28 +708,8 @@ msgstr "" "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για " "πάντα!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 ->>>>>>> Update Greek and Czech translations -======= -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Aspect Ratio:" msgstr "Αναλογία Οθόνης:" @@ -884,28 +730,8 @@ msgstr "Backend Ήχου:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 ->>>>>>> Update Greek and Czech translations -======= -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Auto" msgstr "Αυτόματα" @@ -932,10 +758,6 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Automatically generate mipmaps rather than decoding them from memory.\n" @@ -943,26 +765,12 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -"ΔημιουÏγεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" -"Αυξάνει λίγο τις επιδόσεις, αλλά μποÏεί να Ï€Ïοκαλέσει μικÏά ελαττώματα στις " -"υφές.\n" -"\n" -"Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -======= ->>>>>>> Update translation files for recent changes in the code. - -======= ->>>>>>> Update Greek and Czech translations -======= "ΔημιουÏγεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" "Αυξάνει λίγο τις επιδόσεις, αλλά μποÏεί να Ï€Ïοκαλέσει μικÏά ελαττώματα στις " "υφές.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." ->>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" msgstr "Πίσω" @@ -1038,30 +846,8 @@ msgstr "ΑÏιστεÏÏŒ Μπλε" msgid "Blue Right" msgstr "Δεξί Μπλε" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Βάση" @@ -1094,25 +880,7 @@ msgstr "ΕÏÏεση φακέλου Ï€ÏοοÏισμοÏ" msgid "Buffer:" msgstr "Buffer:" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 -======= ->>>>>>> Update Greek and Czech translations -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1313,33 +1081,13 @@ msgstr "Επιλέξτε ένα αÏχείο για άνοιγμα" msgid "Choose a memory card:" msgstr "Επιλέξτε μια κάÏτα μνήμης:" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" "Επιλέξτε ένα αÏχείο για χÏήση ως apploader: (έχει εφαÏμογή σε δίσκους που " "απαÏτίζονται μόνο από φακέλους)" -<<<<<<< HEAD -======= -msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" -msgstr "Επιλέξτε ένα αÏχείο για χÏήση ως apploader: (έχει εφαÏμογή σε δίσκους που απαÏτίζονται μόνο από φακέλους)" ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 @@ -1375,29 +1123,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 ->>>>>>> Update Greek and Czech translations -======= -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Κλείσιμο" @@ -1505,23 +1232,7 @@ msgstr "ΣÏνδεση Wiimote 3" msgid "Connect Wiimote 4" msgstr "ΣÏνδεση Wiimote 4" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:608 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "Γίνεται ΣÏνδεση..." @@ -1640,32 +1351,12 @@ msgstr "ΔημιουÏγία νέας οπτικής" msgid "Created by KDE-Look.org" msgstr "ΔημιουÏγήθηκε από KDE-Look.org" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "ΔημιουÏγήθηκε από Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart." "com]" -<<<<<<< HEAD -======= -msgid "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "ΔημιουÏγήθηκε από Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" @@ -1736,31 +1427,8 @@ msgstr "Ήχος (DSP)" msgid "DSP Emulator Engine" msgstr "Μηχανή Εξομοίωσης DSP" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE εξομοίωση (γÏήγοÏη)" @@ -1999,27 +1667,7 @@ msgstr "" msgid "Divide" msgstr "Divide" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξομοίωση;" @@ -2048,55 +1696,12 @@ msgstr "Ρυθμίσεις Εξοιμοιωμένου Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Ρυθμίσεις Dolphin GCPad" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -msgid "Dolphin GCPad Configuration" -msgstr "Ρυθμίσεις Dolphin GCPad" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Ρυθμίσεις Dolphin GCPad" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Ρυθμίσεις Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" @@ -2108,51 +1713,21 @@ msgstr "Ρυθμίσεις Dolphin Wiimote" msgid "Dolphin at &Google Code" msgstr "Dolphin στο &Google Code" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ->>>>>>> Update from master branch. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" "Το Dolphin δεν μπόÏεσε να βÏει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εÏÏεση " "αÏχείων..." -<<<<<<< HEAD -======= -msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." -msgstr "Το Dolphin δεν μπόÏεσε να βÏει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εÏÏεση αÏχείων..." ->>>>>>> The actual update of the Greek and Czech translations. The last commit - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 ->>>>>>> Update from master branch. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "" "Το Dolphin είναι Ïυθμισμένο να αποκÏÏπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ " "εδώ για να εμφανιστοÏν όλα τα παιχνίδια..." -<<<<<<< HEAD -======= -msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." -msgstr "Το Dolphin είναι Ïυθμισμένο να αποκÏÏπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ εδώ για να εμφανιστοÏν όλα τα παιχνίδια..." ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -2224,39 +1799,9 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Ολλανδικά" @@ -2397,51 +1942,15 @@ msgstr "ΕνεÏγοποίηση BAT" msgid "Enable Block Merging" msgstr "ΕνεÏγοποίηση Block Merging" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "ΕνεÏγοποίηση Cache" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 -#, fuzzy -msgid "Enable Cache" -msgstr "ΕνεÏγοποίηση Cheat" - -======= ->>>>>>> Update Greek and Czech translations -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "ΕνεÏγοποίηση Cheat" @@ -2542,33 +2051,13 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" "ΕνεÏγοποιήστε το για να επιταχÏνετε το The Legend of Zelda: Twilight " "Princess. ΑπενεÏγοποιήστε το για τα υπόλοιπα παιχνίδια." -<<<<<<< HEAD -======= -msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." -msgstr "ΕνεÏγοποιήστε το για να επιταχÏνετε το The Legend of Zelda: Twilight Princess. ΑπενεÏγοποιήστε το για τα υπόλοιπα παιχνίδια." ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" @@ -2618,39 +2107,9 @@ msgstr "" msgid "End" msgstr "Τέλος" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Αγγλικά" @@ -2677,91 +2136,19 @@ msgstr "ΕγγÏαφή 1/%d" msgid "Equal" msgstr "Ίσο" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Σφάλμα" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -======= ->>>>>>> Update Greek and Czech translations -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Σφάλμα" - -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/DolphinWX/Src/Main.cpp:346 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:356 ->>>>>>> Update Greek and Czech translations -msgid "Error loading selected language. Falling back to system default." -msgstr "" -"Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή " -"συστήματος." -<<<<<<< HEAD -======= -#: Source/Core/DolphinWX/Src/Main.cpp:346 -msgid "Error loading selected language. Falling back to system default." -msgstr "Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή συστήματος." ->>>>>>> The actual update of the Greek and Czech translations. The last commit - -#: Source/Core/Common/Src/ChunkFile.h:180 -#, c-format -msgid "" -"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " -"Aborting savestate load..." -msgstr "" -======= ->>>>>>> Update translation files for recent changes in the code. - -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 -======= -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Σφάλμα" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή " "συστήματος." -<<<<<<< HEAD -#: Source/Core/Common/Src/ChunkFile.h:180 ->>>>>>> Update from master branch. -======= #: Source/Core/Common/Src/ChunkFile.h:194 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " @@ -3038,47 +2425,19 @@ msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το msgid "Failed to write header for file %d" msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το αÏχείο %d" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 -msgid "Fast" -<<<<<<< HEAD -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Fast" ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgstr "ΓÏήγοÏη" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "ΓÏήγοÏα Mipmaps" -<<<<<<< HEAD -======= -msgstr "" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Fast Mipmaps" -msgstr "" ->>>>>>> Update translation files for recent changes in the code. - -======= ->>>>>>> Update Greek and Czech translations -======= - ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Fast version of the MMU. Does not work for every game." msgstr "ΓÏήγοÏη έκδοση του MMU. Δε δουλεÏει για όλα τα παιχνίδια." @@ -3252,39 +2611,9 @@ msgstr "ΚαÏέ ΠÏος ΕγγÏαφή" msgid "Free Look" msgstr "ΕλεÏθεÏη Ματιά" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Γαλλικά" @@ -3350,30 +2679,8 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Ρυθμίσεις Gamecube &Pad" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "ΚάÏτες Μνήμης Gamecube (*.raw,*.gcp)" @@ -3397,31 +2704,10 @@ msgstr "" "Ο Κωδικός Gecko απέτυχε να εκτελεστεί (CT%i CST%i) (%s)\n" "(ή είναι ένας κακός κωδικός ή ο Ï„Ïπος του ÎºÏ‰Î´Î¹ÎºÎ¿Ï Î´ÎµÎ½ υποστηÏίζεται.)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "General" msgstr "Γενικά" @@ -3429,39 +2715,9 @@ msgstr "Γενικά" msgid "General Settings" msgstr "Γενικές Ρυθμίσεις" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "ΓεÏμανικά" @@ -3484,19 +2740,7 @@ msgstr "Ρυθμίσεις ΓÏαφικών" msgid "Greater Than" msgstr "ΜεγαλÏτεÏο από" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -<<<<<<< HEAD -======= -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 ->>>>>>> Update Greek and Czech translations -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -3606,32 +2850,9 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Ρυθμίσεις ΠλήκτÏων Συντόμευσης" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "ΠλήκτÏα Συντόμευσης" @@ -3712,34 +2933,12 @@ msgstr "" "Αν τα FPS διακυμαίνονται, αυτή η επιλογή μποÏείο να βοηθήσει. (ΕνεÏγό = " "Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -msgid "" -"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." -======= -msgid "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." ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 -msgid "" -"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." ->>>>>>> Update from master branch. -======= #: 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)." ->>>>>>> Update the pot file to reflect recent changes in the code. msgstr "" "Αν θέσετε τιμή υψηλότεÏη από την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, " "PAL:50),\n" @@ -3882,27 +3081,7 @@ msgstr "" "InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόÏμα δεν το υποστηÏίζει " "ακόμα." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." @@ -3984,39 +3163,9 @@ msgstr "Μη έγκυÏο αÏχείο εγγÏαφής" msgid "Invalid state" msgstr "Μη έγκυÏο κατάσταση" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Ιταλικά" @@ -4174,51 +3323,11 @@ msgstr "ΦόÏτωση Σημείου Αποθήκευσης 8" msgid "Load State..." msgstr "ΦόÏτωση Σημείου Αποθήκευσης..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 -msgid "Load Wii System Menu" -msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii %d%c" @@ -4300,23 +3409,7 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "ΑÏχεία MadCatz Gameshark (*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "ΚÏÏιο Stick" @@ -4346,30 +3439,8 @@ msgstr "Η κάÏτα μνήμης είναι ήδη ανοιχτή" msgid "Memory Byte" msgstr "Memory Byte" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "ΚάÏτα Μνήμης" @@ -4569,26 +3640,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4675,23 +3727,7 @@ msgstr "Όχι ίσο" msgid "Not Set" msgstr "Μη ΟÏισμένο" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:607 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "Μη Συνδεδεμένο" @@ -4750,24 +3786,9 @@ msgstr "Offset:" msgid "Only %d blocks available" msgstr "Διαθέσιμα μόνο %d μπλοκ" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 ->>>>>>> Update Greek and Czech translations -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Άνοιγμα" @@ -4899,31 +3920,8 @@ msgstr "Patches" msgid "Paths" msgstr "Φάκελοι" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "ΠαÏση" @@ -4941,37 +3939,10 @@ msgstr "Τέλειο" msgid "Perspective %d" msgstr "Οπτική %d" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 ->>>>>>> Update Greek and Czech translations -======= #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "ΑναπαÏαγωγή" @@ -4997,27 +3968,7 @@ msgstr "Ρυθμίσεις ΑναπαÏαγωγής" msgid "Players" msgstr "Παίχτες" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "ΠαÏακαλώ επιβεβαιώστε..." @@ -5228,45 +4179,10 @@ msgstr "Ανανέωση Λίστας" msgid "Refresh game list" msgstr "Ανανέωση λίστας παιχνιδιών" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "ΑφαίÏεση" @@ -5284,18 +4200,6 @@ msgstr "" msgid "Render to Main Window" msgstr "ΑναπαÏαγωγή στο ΚεντÏικό ΠαÏάθυÏο" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 @@ -5336,38 +4240,11 @@ msgstr "Ρώσικα" msgid "Sa&ve State" msgstr "Απ&οθήκευση Σημείου Αποθήκευσης" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 -======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 ->>>>>>> Update the pot file to reflect recent changes in the code. -msgid "Safe" -<<<<<<< HEAD -msgstr "Ασφαλής" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -<<<<<<< HEAD -======= -msgstr "" - -======= ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 msgid "Safe" msgstr "Ασφαλής" ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Ρυθμός Δειγματοληψίας:" @@ -5453,27 +4330,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "ΚλιμακοÏμενα EFB ΑντίγÏαφα" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 -msgid "Scaled EFB Copy" -<<<<<<< HEAD -msgstr "ΚλιμακοÏμενα EFB ΑντίγÏαφα" -======= -msgstr "" ->>>>>>> Update translation files for recent changes in the code. - -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Ανίχνευση %s" @@ -5513,47 +4370,12 @@ msgstr "Η ενότητα %s δε βÏέθηκε στο SYSCONF" msgid "Select" msgstr "Επιλογή" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" - -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αÏχείο για εγκατάσταση" @@ -5579,15 +4401,7 @@ msgstr "Επιλέξτε αιωÏοÏμενα παÏάθυÏα" msgid "Select the file to load" msgstr "Επιλέξτε το αÏχείο για φόÏτωση" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Επιλέξτε αÏχείο αποθήκευσης" @@ -5595,43 +4409,7 @@ msgstr "Επιλέξτε αÏχείο αποθήκευσης" msgid "Select the state to load" msgstr "Επιλέξτε το σημείο φόÏτωσης" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -msgid "Select the save file" -msgstr "Επιλέξτε αÏχείο αποθήκευσης" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Επιλέξτε το σημείο φόÏτωσης" - -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" @@ -5707,32 +4485,12 @@ msgstr "ΔιαχωÏιστής" msgid "Serbian" msgstr "ΣεÏβικά" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "ΣειÏιακή ΘÏÏα 1 - Αυτή είναι η θÏÏα που χÏησιμοποιοÏν οι συσκευές όπως ο " "Ï€ÏοσαÏμογέας δικτÏου" -<<<<<<< HEAD -======= -msgid "Serial Port 1 - This is the port which devices such as the net adapter use" -msgstr "ΣειÏιακή ΘÏÏα 1 - Αυτή είναι η θÏÏα που χÏησιμοποιοÏν οι συσκευές όπως ο Ï€ÏοσαÏμογέας δικτÏου" ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" @@ -5955,16 +4713,7 @@ msgstr "ΠαÏάλειψη Dest. Alpha Pass" msgid "Skip EFB Access from CPU" msgstr "ΠαÏάλειψη EFB ΠÏόσβασης από τη CPU" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 -<<<<<<< HEAD -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -5993,46 +4742,6 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 -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" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"ΕπιταχÏνει ελαφÏÏŽÏ‚ τα EFB σε RAM αντίγÏαφα θυσιάζοντας την ακÏίβεια της " -"εξομοίωσης.\n" -"ΜεÏικές φοÏές μποÏεί να βελτιώσει την οπτική ποιότητα.\n" -"Αν αντιμετωπίζετε Ï€Ïοβλήματα, δοκιμάστε να αυξήσετε την ακÏίβεια της cache " -"υφών ή απενεÏγοποιήστε αυτήν την επιλογή.\n" -======= -msgid "" -"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" ->>>>>>> Update translation files for recent changes in the code. -"\n" -"Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 -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" -"\n" -"If unsure, leave this unchecked." -msgstr "" - -======= ->>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -6086,39 +4795,9 @@ msgstr "Αποτυχία δημιουÏγίας buffer ήχου: %s" msgid "Space" msgstr "Space" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Ισπανικά" @@ -6163,22 +4842,7 @@ msgstr "ΤετÏάγωνο Stick" msgid "Standard Controller" msgstr "Τυπικός Controller" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -6210,54 +4874,14 @@ msgstr "Σημεία Αποθήκευσης" msgid "Stick" msgstr "Stick" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 ->>>>>>> Update Greek and Czech translations -======= #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Διακοπή" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 -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" -"\n" -"If unsure, leave this checked." -msgstr "" -<<<<<<< HEAD -"Αποθήκευση των EFB αντιγÏάφων σε GPU αντικείμενα υφών.\n" -"Αυτό δεν είναι τόσο ακÏιβές, αλλά δουλεÏει αÏκετά καλά για τα πεÏισσότεÏα " -"παιχνίδια και Ï€ÏοσφέÏει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n" -"\n" -"Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -======= ->>>>>>> Update translation files for recent changes in the code. - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 ->>>>>>> Update Greek and Czech translations -======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Store EFB copies in GPU texture objects.\n" @@ -6273,7 +4897,6 @@ msgstr "" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Stretch to Window" msgstr "ΠÏοσαÏμογή στο ΠαÏάθυÏο" @@ -6330,22 +4953,8 @@ msgstr "Δεξί Table" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "ΔημιουÏγία Στιγμιότυπου" @@ -6357,43 +4966,15 @@ msgstr "" msgid "Test" msgstr "Τέστ" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 -<<<<<<< HEAD -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Texture" msgstr "Υφή" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 msgid "Texture Cache" msgstr "Cache Υφών" -<<<<<<< HEAD -======= -#, fuzzy -msgid "Texture" -msgstr "Εξαγωγή Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 -#, fuzzy -msgid "Texture Cache" -msgstr "ΚαθαÏισμός Cache" ->>>>>>> Update translation files for recent changes in the code. - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 ->>>>>>> Update Greek and Czech translations -======= - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Texture Format Overlay" msgstr "Επικάλυψη Του Format Υφών" @@ -6469,24 +5050,6 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την δεÏτεÏη γÏηγοÏότεÏη τιμή από δεξιά." -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 -msgid "" -"The safer you adjust this, the less likely the emulator will be missing any " -"texture updates from RAM.\n" -"\n" -"If unsure, use the second-fastest value from the right." -msgstr "" -<<<<<<< HEAD -"Όσο πιο ασφαλής είναι αυτή η ÏÏθμιση, τόσο λιγότεÏο πιθανό ο εξομοιωτής να " -"χάσει ανανεώσεις των υφών από την RAM.\n" -"\n" -"Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την δεÏτεÏη γÏηγοÏότεÏη τιμή από δεξιά." -======= ->>>>>>> Update translation files for recent changes in the code. - -======= ->>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" msgstr "" @@ -6628,25 +5191,6 @@ msgstr "Εώς" msgid "Toggle All Log Types" msgstr "Εναλλαγή Όλων ΤÏπων ΚαταγÏαφής " -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -msgid "Toggle Fullscreen" -msgstr "Εναλλαγή ΠλήÏους Οθόνης" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 @@ -6654,19 +5198,7 @@ msgid "Toggle Fullscreen" msgstr "Εναλλαγή ΠλήÏους Οθόνης" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "ΚοÏυφή" @@ -6776,29 +5308,6 @@ msgstr "Ελήφθη άγνωστο μήνυμα με id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Ελήφθη άγνωστο μήνυμα με:%d από τον παίκτη:%d ΑποσÏνδεση παίκτη!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Άγνωστος δείκτης %#08x\n" -"Συνέχεια;" - -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 -======= ->>>>>>> Update Greek and Czech translations -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -7029,27 +5538,7 @@ msgstr "Wii NAND Ρίζα:" msgid "Wii Save Import" msgstr "Εισαγωγή Αποθήκευσης Wii" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -7080,23 +5569,7 @@ msgstr "" "ή πιθανόν να οφείλεται σε χÏόνο αδÏάνειας ή κάποιον άλλο λόγο.\n" "Θέλετε να γίνει άμεση επανασÏνδεση;" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:609 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Συνδεδεμένο Wiimote" @@ -7128,35 +5601,9 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Αναδίπλωση Λέξεων" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Σε εÏγασία..." @@ -7373,12 +5820,6 @@ msgstr "zNear ΔιόÏθωση: " msgid "| OR" msgstr "| OR" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. #~ msgid "Cannot record movies in read-only mode." #~ msgstr "" #~ "Δεν μποÏεί να γίνει εγγÏαφή ταινιών σε λειτουÏγία μόνο για ανάγνωση." @@ -7409,93 +5850,3 @@ msgstr "| OR" #~ msgstr "" #~ "Άγνωστος δείκτης %#08x\n" #~ "Συνέχεια;" -<<<<<<< HEAD -======= -#~ msgid "Disable Wiimote Speaker" -#~ msgstr "ΑπενεÏγοποίηση Ηχείου Wiimote" ->>>>>>> Update translation files for recent changes in the code. -======= -#~ msgid "Accuracy:" -#~ msgstr "ΑκÏίβεια:" - -#~ msgid "Alternate Wiimote Timing" -#~ msgstr "Εναλλακτικός ΧÏονισμός Wiimote" - -#~ 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 "Enable Cache" -#~ msgstr "ΕνεÏγοποίηση Cache" - -#~ msgid "Fast" -#~ msgstr "ΓÏήγοÏη" - -#~ msgid "Fast Mipmaps" -#~ msgstr "ΓÏήγοÏα Mipmaps" - -#~ msgid "Safe" -#~ msgstr "Ασφαλής" - -#~ msgid "Scaled EFB Copy" -#~ msgstr "ΚλιμακοÏμενα EFB ΑντίγÏαφα" - -#~ 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" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "ΕπιταχÏνει ελαφÏÏŽÏ‚ τα EFB σε RAM αντίγÏαφα θυσιάζοντας την ακÏίβεια της " -#~ "εξομοίωσης.\n" -#~ "ΜεÏικές φοÏές μποÏεί να βελτιώσει την οπτική ποιότητα.\n" -#~ "Αν αντιμετωπίζετε Ï€Ïοβλήματα, δοκιμάστε να αυξήσετε την ακÏίβεια της " -#~ "cache υφών ή απενεÏγοποιήστε αυτήν την επιλογή.\n" -#~ "\n" -#~ "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." - -#~ 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" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "Αποθήκευση των EFB αντιγÏάφων σε GPU αντικείμενα υφών.\n" -#~ "Αυτό δεν είναι τόσο ακÏιβές, αλλά δουλεÏει αÏκετά καλά για τα πεÏισσότεÏα " -#~ "παιχνίδια και Ï€ÏοσφέÏει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n" -#~ "\n" -#~ "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." - -#~ msgid "Texture" -#~ msgstr "Υφή" - -#~ msgid "Texture Cache" -#~ msgstr "Cache Υφών" - -#~ msgid "" -#~ "The safer you adjust this, the less likely the emulator will be missing " -#~ "any texture updates from RAM.\n" -#~ "\n" -#~ "If unsure, use the second-fastest value from the right." -#~ msgstr "" -#~ "Όσο πιο ασφαλής είναι αυτή η ÏÏθμιση, τόσο λιγότεÏο πιθανό ο εξομοιωτής " -#~ "να χάσει ανανεώσεις των υφών από την RAM.\n" -#~ "\n" -#~ "Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την δεÏτεÏη γÏηγοÏότεÏη τιμή από " -#~ "δεξιά." ->>>>>>> Update Greek and Czech translations -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= ->>>>>>> Update from master branch. diff --git a/Languages/po/en.po b/Languages/po/en.po index a5b3cab7a4..aa648c3fc8 100644 --- a/Languages/po/en.po +++ b/Languages/po/en.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-01-06 14:53+0100\n" "Last-Translator: BhaaL \n" "Language-Team: \n" @@ -517,27 +505,9 @@ msgstr "" msgid "Add new pane" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "" @@ -591,23 +561,8 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" @@ -685,19 +640,7 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -719,19 +662,7 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -839,19 +770,7 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "" @@ -884,15 +803,7 @@ msgstr "" msgid "Buffer:" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1112,21 +1023,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "" @@ -1234,15 +1132,7 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "" @@ -1416,21 +1306,8 @@ msgstr "" msgid "DSP Emulator Engine" msgstr "" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1648,19 +1525,7 @@ msgstr "" msgid "Divide" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1689,39 +1554,12 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1804,27 +1642,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "" @@ -1943,40 +1763,15 @@ msgstr "" msgid "Enable Block Merging" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "" @@ -2102,27 +1897,9 @@ msgstr "" msgid "End" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "" @@ -2151,45 +1928,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2614,27 +2356,9 @@ msgstr "" msgid "Free Look" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "" @@ -2700,19 +2424,7 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2735,21 +2447,8 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2758,27 +2457,9 @@ msgstr "" msgid "General Settings" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "" @@ -2893,21 +2574,8 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "" @@ -3098,19 +2766,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "" @@ -3187,27 +2843,9 @@ msgstr "" msgid "Invalid state" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "" @@ -3358,35 +2996,11 @@ msgstr "" msgid "Load State..." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3463,15 +3077,7 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3502,19 +3108,7 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "" @@ -3691,19 +3285,7 @@ msgstr "" msgid "NP Up" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3790,15 +3372,7 @@ msgstr "" msgid "Not Set" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "" @@ -3859,14 +3433,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "" @@ -3992,23 +3559,8 @@ msgstr "" msgid "Paths" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -4028,23 +3580,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "" @@ -4070,19 +3607,7 @@ msgstr "" msgid "Players" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -4288,31 +3813,10 @@ msgstr "" msgid "Refresh game list" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "" @@ -4328,14 +3832,7 @@ msgid "Render to Main Window" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -4378,19 +3875,7 @@ msgstr "" msgid "Safe" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -4474,19 +3959,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" @@ -4526,39 +3999,12 @@ msgstr "" msgid "Select" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4581,26 +4027,7 @@ msgstr "" msgid "Select the file to load" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "" @@ -4608,16 +4035,7 @@ msgstr "" msgid "Select the state to load" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4951,27 +4369,9 @@ msgstr "" msgid "Space" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "" @@ -5007,15 +4407,7 @@ msgstr "" msgid "Standard Controller" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5050,14 +4442,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -5129,14 +4514,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "" @@ -5339,31 +4717,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "" @@ -5465,19 +4824,6 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5682,19 +5028,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5721,15 +5055,7 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "" @@ -5761,27 +5087,9 @@ msgstr "" msgid "Word Wrap" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "" diff --git a/Languages/po/es.po b/Languages/po/es.po index 3e31ea03ed..6e2a488d32 100644 --- a/Languages/po/es.po +++ b/Languages/po/es.po @@ -7,26 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -"PO-Revision-Date: 2011-12-09 00:28+0100\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -<<<<<<< HEAD -"PO-Revision-Date: 2011-08-11 15:30+0100\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"PO-Revision-Date: 2011-10-15 23:23+0100\n" ->>>>>>> Updated Spanish translation -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-23 16:03+0100\n" ->>>>>>> Update from master branch. "Last-Translator: Petiso Carambanal \n" "Language-Team: DARIO_FF \n" "Language: Spanish\n" @@ -449,13 +431,6 @@ msgid "Accurate VBeam emulation" msgstr "Emulación de VBeam Precisa" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Updated Spanish translation msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -584,27 +559,9 @@ msgstr "Añadir Parche" msgid "Add new pane" msgstr "Añadir nueva ventana" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Añadir..." @@ -673,23 +630,8 @@ msgstr "Todas las imágenes GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Todos los archivos Gamecube GCM (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos los estados guardados (sav, s##)" @@ -717,24 +659,9 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -<<<<<<< HEAD -<<<<<<< HEAD -msgid "Alternate Wiimote Timing" -msgstr "Sincronización alternativa del Wiimote" -======= -#, fuzzy -msgid "Alternate Wiimote Timing" -msgstr "Wiimote emulado" ->>>>>>> Update translation files for recent changes in the code. -======= -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Sincronización alternativa del Wiimote" ->>>>>>> Updated Spanish translation #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -791,19 +718,7 @@ msgstr "" 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!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relación de aspecto:" @@ -825,19 +740,7 @@ msgstr "Motor de Audio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error al abrir dispositivo AO.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -953,19 +856,7 @@ msgid "Blue Right" msgstr "Azul derecha" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Inferior" @@ -998,15 +889,7 @@ msgstr "Busca un directorio de salida" msgid "Buffer:" msgstr "Búfer" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1211,19 +1094,7 @@ msgstr "Escoge un archivo a abrir" msgid "Choose a memory card:" msgstr "Escoge una tarjeta de memoria:" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1265,21 +1136,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Cerrar" @@ -1387,15 +1245,7 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "Conectando..." @@ -1513,19 +1363,7 @@ msgstr "Crear nueva perspectiva" msgid "Created by KDE-Look.org" msgstr "Creado por KDE-Look.org" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1598,21 +1436,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Motor de emulación DSP" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulación DSP HLE (rápido)" @@ -1851,19 +1676,7 @@ msgstr "" msgid "Divide" msgstr "Dividir" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "¿Quieres detener la emulación actual?" @@ -1892,39 +1705,12 @@ msgstr "Configuración de wiimote emulado de Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Configuración de GCPad Dolphin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Configuración de GCPad Dolphin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Configuración de GCPad Dolphin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Configuración de GCPad Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Películas TAS de Dolphin (*.dtm)" @@ -1936,15 +1722,7 @@ msgstr "Configuración de wiimote de Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin en &Google Code" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ->>>>>>> Update from master branch. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1952,15 +1730,7 @@ msgstr "" "Dolphin no pudo encontrar ninguna ISO de GC/Wii. Haz doble clic aquí para " "buscar..." -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 ->>>>>>> Update from master branch. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -2036,27 +1806,9 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holandés" @@ -2191,41 +1943,15 @@ msgstr "Habilitar BAT" msgid "Enable Block Merging" msgstr "Habilitar asociación de bloques" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -msgid "Enable Bounding Box Calculation" -msgstr "" - -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "Permitir el cálculo del cuadro delimitador" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Habilitar caché" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Habilitar trucos" @@ -2325,19 +2051,7 @@ msgstr "" "\n" "Si no estás seguro, déjalo sin marcar." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2393,27 +2107,9 @@ msgstr "" msgid "End" msgstr "Fin" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Inglés" @@ -2442,59 +2138,16 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Error" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Error" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Error" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" -"Error en PlayWiimote. %u != %u, byte %d.\n" -"Disculpa, la grabación de Wii no funciona temporalmente." - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Error" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Error al cargar el idioma seleccionado. Volviendo al defecto del sistema." -<<<<<<< HEAD -#: Source/Core/Common/Src/ChunkFile.h:180 -<<<<<<< HEAD -======= -======= #: Source/Core/Common/Src/ChunkFile.h:194 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " @@ -2503,24 +2156,9 @@ msgstr "" "Error: Después de \"%s\", se ha encontrado %d (0x%X) en vezde la marca de " "guardado %d (0x%X). Cancelando carga del guardado..." -<<<<<<< HEAD -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 ->>>>>>> Update from master branch. -======= #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" -<<<<<<< HEAD -"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " -"Aborting savestate load..." -msgstr "" - -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 -#, c-format -msgid "" -======= ->>>>>>> Update translation files for recent changes in the code. "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" @@ -2974,27 +2612,9 @@ msgstr "Frames a grabar" msgid "Free Look" msgstr "Cámara libre" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francés" @@ -3020,14 +2640,8 @@ msgid "GCI File(*.gci)" msgstr "Archivo GCI (*.gci)" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 -<<<<<<< HEAD -#, fuzzy -msgid "GCMic Configuration" -msgstr "Configuración de registro" -======= msgid "GCMic Configuration" msgstr "Configuración del micro de GC" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" @@ -3066,19 +2680,7 @@ msgid "Gamecube &Pad Settings" msgstr "&Configuración del mando Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Tarjetas de memoria de Gamecube (*.raw,*.gcp)" @@ -3103,21 +2705,8 @@ msgstr "" "(puede ser un código incorrecto o su tipo no es soportado todavía.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -3126,27 +2715,9 @@ msgstr "General" msgid "General Settings" msgstr "Ajustes generales" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Alemán" @@ -3169,13 +2740,6 @@ msgid "Greater Than" msgstr "Mayor que" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Updated Spanish translation msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -3185,29 +2749,10 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD "Mejora bastante la calidad de las texturas generadas usando los efectos de " "renderización para la textura.\n" "Aumentar la resolución interna va a mejorar el efecto de este ajuste.\n" "Reduce ligeramente el desempeño y posiblemente cause fallos (altamente " -======= -"Aumenta bastante la calidad de las texturas generadas utilizando los efectos " -"de renderización para la textura.\n" -<<<<<<< HEAD -"Aumentar la resolución interna va a mejorar el efecto de esta definición.\n" -"Diminuye ligeramente el desempenño y probablemente provoca fallos (aunque es " ->>>>>>> Update translation files for recent changes in the code. -======= -"Aumentar la resolución interna va a mejorar el efecto de este ajuste.\n" -"Diminuye ligeramente el desempeño y probablemente provoca fallos (aunque es " ->>>>>>> Updated Spanish translation -======= -"Mejora bastante la calidad de las texturas generadas usando los efectos de " -"renderización para la textura.\n" -"Aumentar la resolución interna va a mejorar el efecto de este ajuste.\n" -"Reduce ligeramente el desempeño y posiblemente cause fallos (altamente " ->>>>>>> Update from master branch. "improbable).\n" "\n" "Si está inseguro, déjelo marcado." @@ -3305,21 +2850,8 @@ msgid "Hotkey Configuration" msgstr "Configuración de atajos" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Atajos" @@ -3392,11 +2924,8 @@ msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -<<<<<<< HEAD -======= "Si se elige, los registros del cuadro delimitador serán actualizados. Es " "usado por los juegos de Paper Mario." ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" @@ -3405,20 +2934,8 @@ msgstr "" "Si los FPS son erróneos, esta opción puede ayudar. (ON = Compatible, OFF = " "Rápido)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy ->>>>>>> Update the pot file to reflect recent changes in the code. 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 " @@ -3563,19 +3080,7 @@ msgstr "" "Se ha llamado InstallExceptionHandler, pero esta plataforma no lo soporta " "todavía." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instalando WAD..." @@ -3657,27 +3162,9 @@ msgstr "Archivo de grabación no válido" msgid "Invalid state" msgstr "Estado no válido" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiano" @@ -3835,35 +3322,11 @@ msgstr "&Cargar estado 8" msgid "Load State..." msgstr "Cargar estado..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Cargar Menú de sistema Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Cargar Menú de sistema Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Cargar Menú de sistema Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Cargar Menú de sistema Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Cargar Menú de sistema Wii %d %c" @@ -3945,15 +3408,7 @@ msgstr "Hack de velocidad MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Archivos MadCatz Gameshark (*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick principal" @@ -3984,19 +3439,7 @@ msgid "Memory Byte" msgstr "Byte de memoria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Tarjeta de memoria" @@ -4094,12 +3537,6 @@ msgid "" msgstr "" "Mueva el puntero del ratón sobre una opción para obtener una descripción " "detallada.\n" -<<<<<<< HEAD -"\n" -"\n" -"\n" -======= ->>>>>>> Update translation files for recent changes in the code. "\n" "\n" "\n" @@ -4203,19 +3640,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Arriba" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4302,15 +3727,7 @@ msgstr "No igual" msgid "Not Set" msgstr "No definido" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "Sin conectar" @@ -4371,14 +3788,7 @@ msgstr "Solo %d bloques disponibles" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Abrir" @@ -4510,23 +3920,8 @@ msgstr "Parches" msgid "Paths" msgstr "Directorios" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4546,23 +3941,8 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Reproducir" @@ -4588,19 +3968,7 @@ msgstr "Opciones de reproducción" msgid "Players" msgstr "Jugadores" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Confirma, por favor..." @@ -4652,29 +4020,17 @@ msgstr "Efecto de posprocesado:" #: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" -<<<<<<< HEAD -msgstr "" -======= msgstr "Final prematuro de la película en PlayController. %u + 8 > %u" ->>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" -<<<<<<< HEAD -msgstr "" -======= msgstr "Final prematuro de la película en PlayWiimote. %u + %d > %u" ->>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" -<<<<<<< HEAD -msgstr "" -======= msgstr "Final prematuro de la película en PlayWiimote. %u > %u" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " @@ -4823,31 +4179,10 @@ msgstr "Actualizar lista" msgid "Refresh game list" msgstr "Actualizar lista de juegos" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Eliminar" @@ -4866,14 +4201,7 @@ msgid "Render to Main Window" msgstr "Renderizar a ventana principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -4916,19 +4244,7 @@ msgstr "Guardar estado" msgid "Safe" msgstr "Seguro" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Frecuencia del sonido:" @@ -5054,39 +4370,12 @@ msgstr "No se ha encontrado la sección %s en SYSCONF" msgid "Select" msgstr "Seleccionar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Seleccionar archivo de grabación" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Seleccionar archivo de grabación" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Seleccionar archivo de grabación" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Seleccionar archivo de grabación" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Elige un WAD de Wii para instalar" @@ -5112,13 +4401,7 @@ msgstr "Selecciona las ventanas flotantes" msgid "Select the file to load" msgstr "Selecciona el archivo para cargar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Selecciona el archivo de guardado" @@ -5126,29 +4409,7 @@ msgstr "Selecciona el archivo de guardado" msgid "Select the state to load" msgstr "Selecciona el estado para cargar" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -msgid "Select the save file" -msgstr "Selecciona el archivo de guardado" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Selecciona el estado para cargar" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Selecciona el estado para guardar" @@ -5223,19 +4484,7 @@ msgstr "Separador" msgid "Serbian" msgstr "Serbio" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -5464,7 +4713,6 @@ msgid "Skip EFB Access from CPU" msgstr "Saltar el acceso al EFB desde la CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 -<<<<<<< HEAD msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -5485,28 +4733,6 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -======= -msgid "" -"Skip the destination alpha pass used in many games for various graphical " -"effects.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Salta el destino del pase alfa usado en muchos juegos para varios efectos " -"gráficos.\n" -"\n" -"Si está inseguro, déjelo sin marcar." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 -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" -"\n" -"If unsure, leave this unchecked." -msgstr "" ->>>>>>> Update translation files for recent changes in the code. "Aumenta ligeramente las copias de EFB a la RAM al sacrificar exactitud de " "emulación.\n" "A veces también aumenta la calidad visual.\n" @@ -5567,27 +4793,9 @@ msgstr "Falló la creación del búfer de sonido: %s" msgid "Space" msgstr "Espacio" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Español" @@ -5631,15 +4839,7 @@ msgstr "Stick cuadrado" msgid "Standard Controller" msgstr "Control estándar" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5674,14 +4874,7 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Detener" @@ -5761,24 +4954,13 @@ msgstr "Tabla derecha" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Captura de pantalla" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" -<<<<<<< HEAD -msgstr "" -======= msgstr "TaruKonga (Bongos)" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -6009,31 +5191,12 @@ msgstr "Alternar todos los tipos de registro" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Cambiar a pantalla completa" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Superior" @@ -6140,23 +5303,9 @@ msgstr "Se recibió un mensaje desconocido de id: %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" -<<<<<<< HEAD -======= msgstr "" "Mensaje desconocido con id:%d recibido del jugador:%d ¡Echando al jugador!" -<<<<<<< HEAD -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" ->>>>>>> Update translation files for recent changes in the code. -msgstr "" -"Mensaje desconocido con id:%d recibido del jugador:%d ¡Echando al jugador!" - -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6326,12 +5475,9 @@ msgid "" "%u > %u) (frame %u > %u). You should load another save before continuing, or " "load this state with read-only mode off." msgstr "" -<<<<<<< HEAD -======= "Advertencia: Has cargado un guardado de después del final de la película " "actual.(Byte %u > %u) (frame %u > %u). Deberías cargar otor guardado antes " "de continuar, o cargar éste sin el modo de solo lectura." ->>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:684 #, c-format @@ -6340,13 +5486,10 @@ msgid "" "should load another save before continuing, or load this state with read-" "only mode off. Otherwise you'll probably get a desync." msgstr "" -<<<<<<< HEAD -======= "Advertencia: has cargado una partida guardada con desjustes en %d bytes (0x" "%X). Debe de cargar otro guardado antes de continuar, o cargar este guardado " "con el modo de solo lectura desactivado. De lo contrario probablemente " "obtenga una desincronización." ->>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:693 #, c-format @@ -6366,8 +5509,6 @@ 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 "" -<<<<<<< HEAD -======= "Advertencia: has cargado una partida guardada con desajustes en %d bytes. " "Debes cargar otro guardado antes de continuar, o cargar este guardado con el " "modo de solo lectura desactivado. De lo contrario, probablemente obtengas " @@ -6383,7 +5524,6 @@ msgstr "" "En el fotograma %d, el guardado de la película presiona:\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" ->>>>>>> Update from master branch. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -6418,19 +5558,7 @@ msgstr "Raíz de la NAND de Wii:" msgid "Wii Save Import" msgstr "Importar guardado de Wii" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Archivos de guardado Wii (*.bin)|*.bin" @@ -6461,15 +5589,7 @@ msgstr "" "o mucho tiempo de espera, o alguna otra razón.\n" "¿Desea reconectarlo inmediatamente?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote conectado" @@ -6501,27 +5621,9 @@ msgstr "Windows Derecha" msgid "Word Wrap" msgstr "Word Wrap" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Trabajando..." diff --git a/Languages/po/fr.po b/Languages/po/fr.po index f50163bd39..73410c8858 100644 --- a/Languages/po/fr.po +++ b/Languages/po/fr.po @@ -7,31 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-10-28 23:40+0100\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -<<<<<<< HEAD -"PO-Revision-Date: 2011-08-10 17:42+0100\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"PO-Revision-Date: 2011-10-28 23:40+0100\n" ->>>>>>> Update french translation. -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -"PO-Revision-Date: 2011-12-20 18:42+0100\n" ->>>>>>> Update Hungarian and Turkish translations. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -"PO-Revision-Date: 2011-10-28 23:40+0100\n" ->>>>>>> Update from master branch. "Last-Translator: Pascal\n" "Language-Team: \n" "Language: French\n" @@ -452,13 +429,6 @@ msgid "Accurate VBeam emulation" msgstr "Emulation fidèle VBeam" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update french translation. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -586,33 +556,9 @@ msgstr "Ajouter un patch" msgid "Add new pane" msgstr "Ajouter un nouveau panneau" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Ajouter..." @@ -681,28 +627,8 @@ msgstr "Toutes les images GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tous les fichiers GameCube GCM (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tous les états sauvegardés (sav, s##)" @@ -730,24 +656,9 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -<<<<<<< HEAD -<<<<<<< HEAD -msgid "Alternate Wiimote Timing" -msgstr "Délai alternatif de communication avec la Wiimote" -======= -#, fuzzy -msgid "Alternate Wiimote Timing" -msgstr "Wiimote émulée" ->>>>>>> Update translation files for recent changes in the code. -======= -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Délai alternatif de communication avec la Wiimote" ->>>>>>> Update french translation. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -807,23 +718,7 @@ msgstr "" "Êtes-vous sûr de vouloir supprimer ce fichier ? Il sera supprimé " "définitivement !" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Format d'écran :" @@ -845,23 +740,7 @@ msgstr "Moteur audio :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -980,23 +859,7 @@ msgid "Blue Right" msgstr "Bleu Droite" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Bas" @@ -1029,19 +892,7 @@ msgstr "Parcourir un dossier de destination" msgid "Buffer:" msgstr "Buffer :" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1247,37 +1098,13 @@ msgstr "Choisir un fichier à ouvrir" msgid "Choose a memory card:" msgstr "Choisir une carte mémoire :" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 ->>>>>>> Update the pot file to reflect recent changes in the code. 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)" -<<<<<<< HEAD -======= -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)" ->>>>>>> Update french translation. -======= ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 @@ -1313,25 +1140,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Fermer" @@ -1439,19 +1249,7 @@ msgstr "Connecter la 3è Wiimote" msgid "Connect Wiimote 4" msgstr "Connecter la 4è Wiimote" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "Connexion..." @@ -1570,35 +1368,11 @@ msgstr "Créer une nouvelle perspective" msgid "Created by KDE-Look.org" msgstr "Créé par KDE-Look.org" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -<<<<<<< HEAD -======= -msgid "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" ->>>>>>> Update french translation. -======= ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" @@ -1667,25 +1441,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Moteur d'émulation du DSP (Audio)" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulation du DSP en HLE (rapide)" @@ -1924,23 +1681,7 @@ msgstr "" msgid "Divide" msgstr "Diviser" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Voulez-vous arrêter l'émulation en cours ?" @@ -1969,48 +1710,12 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Configuration de la manette GC pour Dolphin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Configuration de la manette GC pour Dolphin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Configuration de la manette GC pour Dolphin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Configuration de la manette GC pour Dolphin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 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:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Films TAS Dolphin (*.dtm)" @@ -2022,59 +1727,21 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin dans &Google Code" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ->>>>>>> Update from master branch. 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..." -<<<<<<< HEAD -======= -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..." ->>>>>>> Update french translation. -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 ->>>>>>> Update from master branch. 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..." -<<<<<<< HEAD -======= -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..." ->>>>>>> Update french translation. -======= ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -2145,33 +1812,9 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Néerlandais" @@ -2311,47 +1954,15 @@ msgstr "Activer BAT" msgid "Enable Block Merging" msgstr "Activer l'assemblage de blocs" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Hungarian and Turkish translations. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Activer le cache" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Activer les Cheats" @@ -2452,37 +2063,13 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 ->>>>>>> Update the pot file to reflect recent changes in the code. 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." -<<<<<<< HEAD -======= -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." ->>>>>>> Update french translation. -======= ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" @@ -2532,33 +2119,9 @@ msgstr "" msgid "End" msgstr "Fin" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Anglais" @@ -2587,65 +2150,15 @@ msgstr "Egal" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Erreur" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Erreur" - ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/DolphinWX/Src/Main.cpp:346 -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." - -#: Source/Core/Common/Src/ChunkFile.h:180 -#, c-format -msgid "" -<<<<<<< HEAD -"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " -"Aborting savestate load..." -msgstr "" -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 ->>>>>>> Update from master branch. -msgid "Error" -msgstr "Erreur" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Erreur" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 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." ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/Common/Src/ChunkFile.h:194 #, c-format @@ -2656,26 +2169,12 @@ msgstr "" #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format -<<<<<<< HEAD -<<<<<<< HEAD msgid "" -======= ->>>>>>> Update translation files for recent changes in the code. -======= -msgid "" ->>>>>>> Update Hungarian and Turkish translations. "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." -<<<<<<< HEAD -======= -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." ->>>>>>> Update french translation. -======= ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -3126,33 +2625,9 @@ msgstr "Images à enregistrer :" msgid "Free Look" msgstr "Vue libre" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Français" @@ -3177,20 +2652,11 @@ msgstr "Résolution en Plein écran :" msgid "GCI File(*.gci)" msgstr "Fichier GCI (*.gci)" -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 #, fuzzy msgid "GCMic Configuration" msgstr "Configuration de la journalisation" -<<<<<<< HEAD -======= ->>>>>>> Update Hungarian and Turkish translations. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "Manette GC" @@ -3228,23 +2694,7 @@ msgid "Gamecube &Pad Settings" msgstr "Paramètres de la &manette GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Carte mémoires de GameCube (*.raw,*.gcp)" @@ -3269,25 +2719,8 @@ msgstr "" "(ou c'est un mauvais code, ou il n'est pas encore pris en charge.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Général" @@ -3296,33 +2729,9 @@ msgstr "Général" msgid "General Settings" msgstr "Paramètres généraux" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Allemand" @@ -3345,13 +2754,6 @@ msgid "Greater Than" msgstr "Plus grand que" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update french translation. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -3361,29 +2763,12 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Hungarian and Turkish translations. "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" -<<<<<<< HEAD -<<<<<<< HEAD "Baisse légèrement les performances et peut provoquer quelques pépins (mais " "peu probable).\n" -======= ->>>>>>> Update translation files for recent changes in the code. -======= -"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" ->>>>>>> Update french translation. -======= -"Baisse légèrement les performances et peut provoquer quelques pépins (mais " -"peu probable).\n" ->>>>>>> Update Hungarian and Turkish translations. "\n" "Dans le doute, cochez cette case." @@ -3482,25 +2867,8 @@ msgid "Hotkey Configuration" msgstr "Configuration des raccourcis clavier" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Raccourcis clavier" @@ -3568,55 +2936,21 @@ msgstr "Italie" msgid "Icon" msgstr "Icône" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Hungarian and Turkish translations. -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 ->>>>>>> Update the pot file to reflect recent changes in the code. 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)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy ->>>>>>> Update the pot file to reflect recent changes in the code. 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 " @@ -3625,13 +2959,6 @@ 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), vous devez aussi désactiver " "le contrôle audio dans le DSP pour que cela fonctionne." -<<<<<<< HEAD -======= -msgid "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." -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), vous devez aussi désactiver le contrôle audio dans le DSP pour que cela fonctionne." ->>>>>>> Update french translation. -======= ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" @@ -3768,23 +3095,7 @@ msgstr "" "InstallExceptionHandler a été appelé, mais cette plateforme ne le prend pas " "encore en charge." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Installation du WAD..." @@ -3866,33 +3177,9 @@ msgstr "Fichier d'enregitrement non valide" msgid "Invalid state" msgstr "Etat non valide" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italien" @@ -4050,43 +3337,11 @@ msgstr "Charger l'état du Slot 8" msgid "Load State..." msgstr "Charger un état..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Charger le Menu Système Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Charger le Menu Système Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Charger le Menu Système Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Charger le Menu Système Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Charger le Menu Système Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Charger le Menu Système Wii %d%c" @@ -4170,19 +3425,7 @@ msgstr "Hack de vitesse pour le MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Fichiers MadCatz Gameshark (*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick principal" @@ -4213,23 +3456,7 @@ msgid "Memory Byte" msgstr "Octet mémoire" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Carte mémoire" @@ -4430,23 +3657,7 @@ msgstr "NP Tabulation" msgid "NP Up" msgstr "NP Haut" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4533,19 +3744,7 @@ msgstr "Différent" msgid "Not Set" msgstr "Non défini" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "Non connectée" @@ -4606,17 +3805,7 @@ msgstr "%d blocs disponibles seulement" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Ouvrir" @@ -4748,28 +3937,8 @@ msgstr "Patchs" msgid "Paths" msgstr "Chemins" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4789,28 +3958,8 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Démarrer" @@ -4836,23 +3985,7 @@ msgstr "Options de lecture" msgid "Players" msgstr "Joueurs" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Veuillez confirmer..." @@ -4901,15 +4034,7 @@ msgstr "Portugais (brésilien)" msgid "Post-Processing Effect:" msgstr "Effet de Post-processing :" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/Core/Src/Movie.cpp:735 -======= #: Source/Core/Core/Src/Movie.cpp:759 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" @@ -4924,11 +4049,6 @@ msgstr "" msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update Hungarian and Turkish translations. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "Pré-réglages :" @@ -5077,38 +4197,10 @@ msgstr "Rafraîchir la liste" msgid "Refresh game list" msgstr "Rafraîchir la liste des jeux" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Retirer" @@ -5127,17 +4219,7 @@ msgid "Render to Main Window" msgstr "Rendu dans la fenêtre principale" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -5180,23 +4262,7 @@ msgstr "Sau&vegarder l'état" msgid "Safe" msgstr "Sûr " -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Echantillonnage :" @@ -5322,48 +4388,12 @@ msgstr "La section %s n'a pas été trouvée dans SYSCONF" msgid "Select" msgstr "Select" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Sélectionner le fichier d'enregistrement" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Sélectionner le fichier d'enregistrement" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Sélectionner le fichier d'enregistrement" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Sélectionner le fichier d'enregistrement" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Sélectionner le fichier d'enregistrement" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Sélectionner un fichier WAD de Wii à installer" @@ -5389,31 +4419,7 @@ msgstr "Sélectionner les fenêtres flottantes" msgid "Select the file to load" msgstr "Sélectionner le fichier à charger" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 ->>>>>>> Update Hungarian and Turkish translations. -msgid "Select the save file" -msgstr "Sélectionner le fichier à enregistrer" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -msgid "Select the state to load" -msgstr "Sélectionner l'état à charger" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Sélectionner le fichier à enregistrer" @@ -5421,19 +4427,7 @@ msgstr "Sélectionner le fichier à enregistrer" msgid "Select the state to load" msgstr "Sélectionner l'état à charger" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Sélectionner l'état à enregistrer" @@ -5509,36 +4503,12 @@ msgstr "Séparateur" msgid "Serbian" msgstr "Serbe" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 ->>>>>>> Update the pot file to reflect recent changes in the code. 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" -<<<<<<< HEAD -======= -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" ->>>>>>> Update french translation. -======= ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" @@ -5762,7 +4732,6 @@ msgid "Skip EFB Access from CPU" msgstr "Ignorer l'accès à l'EFB depuis le CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 -<<<<<<< HEAD msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -5783,39 +4752,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -======= -msgid "" -"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" -"\n" -"Dans le doute, décochez cette case." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 -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" -"\n" -"If unsure, leave this unchecked." -msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. "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" ->>>>>>> Update french translation. -======= -"Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision " -"de l'émulation.\n" ->>>>>>> Update Hungarian and Turkish translations. "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" @@ -5875,33 +4813,9 @@ msgstr "Echec de la création du buffer audio : %s" msgid "Space" msgstr "Espace" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Espagnol" @@ -5945,19 +4859,7 @@ msgstr "Stick carré" msgid "Standard Controller" msgstr "Contrôleur standard" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5992,17 +4894,7 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Arrêter" @@ -6079,12 +4971,7 @@ msgstr "Table Droite" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Capture d'écran" @@ -6092,21 +4979,6 @@ msgstr "Capture d'écran" msgid "TaruKonga (Bongos)" msgstr "" -======= -msgid "Take Screenshot" -msgstr "Capture d'écran" - ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -msgid "Take Screenshot" -msgstr "Capture d'écran" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 -msgid "TaruKonga (Bongos)" -msgstr "" - ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "Test" @@ -6334,38 +5206,12 @@ msgstr "Activer tous les types de journaux" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Activer le plein écran" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Haut" @@ -6472,38 +5318,9 @@ 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!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= 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 !" ->>>>>>> Update french translation. -======= -msgstr "" -"Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" ->>>>>>> Update Hungarian and Turkish translations. -<<<<<<< HEAD -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -msgstr "" -"Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" -======= -msgstr "" -"Pointeur inconnu %#08x\n" -"Continuer ?" ->>>>>>> Update Hungarian and Turkish translations. - -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6665,15 +5482,7 @@ msgstr "" "et vont avoir le même nom que le fichier sur votre carte mémoire\n" "Continuer ?" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/Core/Src/Movie.cpp:629 -======= #: Source/Core/Core/Src/Movie.cpp:667 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -6708,11 +5517,6 @@ msgid "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update Hungarian and Turkish translations. -======= ->>>>>>> Update from master branch. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -6746,23 +5550,7 @@ msgstr "Racine de la NAND (Wii) :" msgid "Wii Save Import" msgstr "Importer une sauvegarde Wii" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin" @@ -6793,19 +5581,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 ?" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote connectée" @@ -6837,33 +5613,9 @@ msgstr "Windows Droit" msgid "Word Wrap" msgstr "Casse" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Travail..." diff --git a/Languages/po/he.po b/Languages/po/he.po index 51453ebfe0..e1252b7c89 100644 --- a/Languages/po/he.po +++ b/Languages/po/he.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-01-08 20:50+0200\n" "Last-Translator: Ely \n" "Language-Team: \n" @@ -518,27 +506,9 @@ msgstr "" msgid "Add new pane" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "" @@ -592,23 +562,8 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" @@ -686,19 +641,7 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -720,19 +663,7 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -841,19 +772,7 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "" @@ -886,15 +805,7 @@ msgstr "" msgid "Buffer:" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1114,21 +1025,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "" @@ -1236,15 +1134,7 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "" @@ -1418,21 +1308,8 @@ msgstr "קול" msgid "DSP Emulator Engine" msgstr "" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1650,19 +1527,7 @@ msgstr "" msgid "Divide" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1691,40 +1556,13 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Dolphin GCPad Configuration" msgstr "הגדרות גרפיקה" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1807,27 +1645,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "" @@ -1946,40 +1766,15 @@ msgstr "" msgid "Enable Block Merging" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "" @@ -2105,27 +1900,9 @@ msgstr "" msgid "End" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "" @@ -2154,45 +1931,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2617,27 +2359,9 @@ msgstr "" msgid "Free Look" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "" @@ -2706,19 +2430,7 @@ msgid "Gamecube &Pad Settings" msgstr "הגדרות קול" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2741,21 +2453,8 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2765,27 +2464,9 @@ msgstr "" msgid "General Settings" msgstr "הגדרות קול" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "" @@ -2900,21 +2581,8 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "" @@ -3105,19 +2773,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "" @@ -3194,27 +2850,9 @@ msgstr "" msgid "Invalid state" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "" @@ -3365,35 +3003,11 @@ msgstr "" msgid "Load State..." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3471,15 +3085,7 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3510,19 +3116,7 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "" @@ -3699,19 +3293,7 @@ msgstr "" msgid "NP Up" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3798,15 +3380,7 @@ msgstr "" msgid "Not Set" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "" @@ -3867,14 +3441,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "" @@ -4000,23 +3567,8 @@ msgstr "" msgid "Paths" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -4036,23 +3588,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "" @@ -4078,19 +3615,7 @@ msgstr "" msgid "Players" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -4296,31 +3821,10 @@ msgstr "" msgid "Refresh game list" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "" @@ -4336,14 +3840,7 @@ msgid "Render to Main Window" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -4386,19 +3883,7 @@ msgstr "" msgid "Safe" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -4482,19 +3967,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" @@ -4534,39 +4007,12 @@ msgstr "" msgid "Select" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4589,13 +4035,7 @@ msgstr "" msgid "Select the file to load" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "" @@ -4603,29 +4043,7 @@ msgstr "" msgid "Select the state to load" msgstr "" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -msgid "Select the save file" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4961,27 +4379,9 @@ msgstr "" msgid "Space" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "" @@ -5017,15 +4417,7 @@ msgstr "" msgid "Standard Controller" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5060,14 +4452,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -5139,14 +4524,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "" @@ -5349,31 +4727,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "" @@ -5475,19 +4834,6 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5693,19 +5039,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5732,15 +5066,7 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "" @@ -5772,27 +5098,9 @@ msgstr "" msgid "Word Wrap" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "" diff --git a/Languages/po/hu.po b/Languages/po/hu.po index fb426b13e9..f4ed971576 100644 --- a/Languages/po/hu.po +++ b/Languages/po/hu.po @@ -7,30 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -"PO-Revision-Date: 2011-12-18 13:41-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -<<<<<<< HEAD -"PO-Revision-Date: 2011-06-04 14:29+0100\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"PO-Revision-Date: 2011-12-20 17:22-0600\n" ->>>>>>> Update Hungarian and Turkish translations. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -<<<<<<< HEAD -"PO-Revision-Date: 2011-12-27 08:22-0600\n" ->>>>>>> Update from master branch. -======= -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-28 09:44+0100\n" ->>>>>>> Update Hungarian translation. "Last-Translator: Delirious \n" "Language-Team: Delirious \n" "Language: Hungarian\n" @@ -96,15 +74,7 @@ msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s tisztítása sikertelen. Valószínűleg a képfájl sérült." #: Source/Core/Core/Src/HW/GCMemcard.cpp:97 -<<<<<<< HEAD -<<<<<<< HEAD #, c-format -======= -#, fuzzy, c-format ->>>>>>> Update translation files for recent changes in the code. -======= -#, c-format ->>>>>>> Update Hungarian and Turkish translations. msgid "" "%s failed to load as a memorycard \n" " Card file size is invalid (0x%x bytes)" @@ -113,15 +83,7 @@ msgstr "" " A kártya fájlmérete nem megfelelÅ‘ (0x%x bájt)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:112 -<<<<<<< HEAD -<<<<<<< HEAD #, c-format -======= -#, fuzzy, c-format ->>>>>>> Update translation files for recent changes in the code. -======= -#, c-format ->>>>>>> Update Hungarian and Turkish translations. msgid "" "%s failed to load as a memorycard \n" " Card size is invalid (0x%x bytes)" @@ -467,13 +429,6 @@ msgid "Accurate VBeam emulation" msgstr "Pontos VBeam emuláció" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Hungarian and Turkish translations. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -599,27 +554,9 @@ msgstr "Patch hozzáadása" msgid "Add new pane" msgstr "Új mezÅ‘ hozzáadása" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Hozzáadás..." @@ -689,23 +626,8 @@ msgstr "Minden GC/Wii képfájl (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Minden Gamecube GCM fájl (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Minden állásmentés (sav, s##)" @@ -733,24 +655,9 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -<<<<<<< HEAD -<<<<<<< HEAD -msgid "Alternate Wiimote Timing" -msgstr "Változtatható Wiimote idÅ‘zítés" -======= -#, fuzzy -msgid "Alternate Wiimote Timing" -msgstr "Emulált Wiimote" ->>>>>>> Update translation files for recent changes in the code. -======= -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Változtatható Wiimote idÅ‘zítés" ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -808,19 +715,7 @@ msgstr "" 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!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Képarány:" @@ -842,19 +737,7 @@ msgstr "Hang feldolgozó:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Hiba az AO eszköz megnyitásakor.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatikus" @@ -971,19 +854,7 @@ msgid "Blue Right" msgstr "Kék jobbra" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Gomb" @@ -1016,15 +887,7 @@ msgstr "Kimeneti könyvtár tallózása" msgid "Buffer:" msgstr "Puffer:" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1090,33 +953,11 @@ msgstr "Mégse" msgid "Cannot open %s" msgstr "%s nem nyitható meg" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -msgid "Cannot record movies in read-only mode." -msgstr "A mozgások rögzítése nem lehetséges írásvédett módban." - ->>>>>>> Update Hungarian and Turkish translations. -======= ->>>>>>> Update from master branch. #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "Nem lehet esemény bejegyzéseket törölni függÅ‘ben lévÅ‘ eseményekkel" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1290,21 +1131,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Bezárás" @@ -1412,15 +1240,7 @@ msgstr "Wiimote 3 csatlakoztatása" msgid "Connect Wiimote 4" msgstr "Wiimote 4 csatlakoztatása" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "Csatlakozás..." @@ -1609,21 +1429,8 @@ msgstr "Hang" msgid "DSP Emulator Engine" msgstr "DSP emulátor motor" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emuláció (gyors)" @@ -1864,19 +1671,7 @@ msgstr "" msgid "Divide" msgstr "Megosztás" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Le akarod állítani az éppen működÅ‘ emulációt?" @@ -1905,39 +1700,12 @@ msgstr "Dolphin emulált Wiimote beállítások" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GCPad beállítások" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GCPad beállítások" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GCPad beállítások" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad beállítások" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS videók (*.dtm)" @@ -2034,27 +1802,9 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holland" @@ -2194,41 +1944,15 @@ msgstr "BAT használata" msgid "Enable Block Merging" msgstr "Blokk csatlakozás használata" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -msgid "Enable Bounding Box Calculation" -msgstr "" - -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "Bounding Box kalkuláció használata" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Gyorsítótár használata" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Csalások használata" @@ -2384,27 +2108,9 @@ msgstr "" msgid "End" msgstr "Vége" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Angol" @@ -2433,47 +2139,10 @@ msgstr "EgyenlÅ‘" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Hiba" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Hiba" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Hiba" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" -"PlayWiimote hiba. %u != %u, bájt %d.\n" -"Sajnos a Wii videó rögzítés egyenlÅ‘re nem működik." - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Hiba" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2482,28 +2151,12 @@ msgstr "" #: Source/Core/Common/Src/ChunkFile.h:194 #, c-format -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= "Hiba: \"%s\" után, %d (0x%X) található a mentési jelölÅ‘ helyett %d (0x%X). " "Mentés betöltésének leállítása..." ->>>>>>> Update from master branch. -======= -msgid "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). Aborting savestate load..." -msgstr "Hiba: \"%s\" után, %d (0x%X) található a mentési jelölÅ‘ helyett %d (0x%X). Mentés betöltésének leállítása..." ->>>>>>> Update Hungarian translation. -======= -"Hiba: \"%s\" után, %d (0x%X) található a mentési jelölÅ‘ helyett %d (0x%X). " -"Mentés betöltésének leállítása..." ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format @@ -2961,27 +2614,9 @@ msgstr "RögzítendÅ‘ képkockák" msgid "Free Look" msgstr "Szabad nézet" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francia" @@ -3007,14 +2642,8 @@ msgid "GCI File(*.gci)" msgstr "GCI fájl(*.gci)" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 -<<<<<<< HEAD -#, fuzzy -msgid "GCMic Configuration" -msgstr "Napló beállítások" -======= msgid "GCMic Configuration" msgstr "GCMic beállítások" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" @@ -3053,19 +2682,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube &irányító beállítások" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube memóriakártyák (*.raw,*.gcp)" @@ -3090,21 +2707,8 @@ msgstr "" "(vagy rossz a kód vagy a kód típus még nem támogatott.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Ãltalános" @@ -3113,27 +2717,9 @@ msgstr "Ãltalános" msgid "General Settings" msgstr "Ãltalános beállítások" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Német" @@ -3155,13 +2741,6 @@ msgid "Greater Than" msgstr "Nagyobb mint" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Hungarian and Turkish translations. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -3272,21 +2851,8 @@ msgid "Hotkey Configuration" msgstr "Gyorsbillentyű beállítások" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Gyorsbill." @@ -3354,30 +2920,13 @@ msgstr "OLASZORSZÃG" msgid "Icon" msgstr "Ikon" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 -<<<<<<< HEAD -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= "Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper Mario " "játékok használják." ->>>>>>> Update from master branch. -======= -msgid "If checked, the bounding box registers will be updated. Used by the Paper Mario games." -msgstr "Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper Mario játékok használják." ->>>>>>> Update Hungarian translation. -======= -"Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper Mario " -"játékok használják." ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" @@ -3532,19 +3081,7 @@ msgid "" msgstr "" "InstallExceptionHandler elÅ‘idézve, de ez a platform még nem támogatja azt." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WAD telepítése..." @@ -3626,27 +3163,9 @@ msgstr "Nem megfelelÅ‘ rögzített fájl" msgid "Invalid state" msgstr "Nem megfelelÅ‘ mentés" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Olasz" @@ -3804,35 +3323,11 @@ msgstr "Ãllás betöltése a 8. helyrÅ‘l" msgid "Load State..." msgstr "Ãllás betöltése..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Wii rendszer menü betöltése" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Wii rendszer menü betöltése" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Wii rendszer menü betöltése" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Wii rendszer menü betöltése" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii rendszer menü betöltése %d%c" @@ -3914,15 +3409,7 @@ msgstr "MMU sebesség növelÅ‘ hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark fájlok (*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "FÅ‘kar" @@ -3953,19 +3440,7 @@ msgid "Memory Byte" msgstr "Memória bájt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Memóriakártya" @@ -4163,19 +3638,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4262,15 +3725,7 @@ msgstr "Nem egyenlÅ‘" msgid "Not Set" msgstr "Nincs beállítva" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "Nincs csatlakoztatva" @@ -4331,14 +3786,7 @@ msgstr "Csak %d blokk szabad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Megnyitás" @@ -4469,23 +3917,8 @@ msgstr "Javítások" msgid "Paths" msgstr "Mappák" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Szünet" @@ -4505,23 +3938,8 @@ msgstr "%d perspektíva" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Indítás" @@ -4547,19 +3965,7 @@ msgstr "Visszajátszási lehetÅ‘ségek" msgid "Players" msgstr "Játékosok" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Változtatás jóváhagyása..." @@ -4611,29 +4017,17 @@ msgstr "Utófeldolgozási effektus:" #: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" -<<<<<<< HEAD -msgstr "" -======= msgstr "Túl korai PlayController videó befejezés. %u + 8 > %u" ->>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" -<<<<<<< HEAD -msgstr "" -======= msgstr "Túl korai PlayWiimote videó befejezés. %u + %d > %u" ->>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" -<<<<<<< HEAD -msgstr "" -======= msgstr "Túl korai PlayWiimote videó befejezés. %u > %u" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " @@ -4782,31 +4176,10 @@ msgstr "A lista frissítése" msgid "Refresh game list" msgstr "Játéklista frissítése" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Törlés" @@ -4825,14 +4198,7 @@ msgid "Render to Main Window" msgstr "Megjelenítés a fÅ‘ablakban" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Alapra állítás" @@ -4875,19 +4241,7 @@ msgstr "Ãl&lás mentése" msgid "Safe" msgstr "Biztonságos" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Mintavételezési frekvencia:" @@ -4971,19 +4325,7 @@ 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" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Keresés %s" @@ -5023,39 +4365,12 @@ msgstr "%s rész nem található a SYSCONF fájlban" msgid "Select" msgstr "Választás" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Válassz rögzítendÅ‘ fájlt" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Válassz rögzítendÅ‘ fájlt" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Válassz rögzítendÅ‘ fájlt" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Válassz rögzítendÅ‘ fájlt" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Válassz telepítendÅ‘ Wii WAD fájlt" @@ -5081,26 +4396,7 @@ msgstr "Válassz lebegÅ‘ ablakokat" msgid "Select the file to load" msgstr "BetöltendÅ‘ fájl kiválasztása" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "Válassz mentési fájlt" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Válassz betöltendÅ‘ állásmentést" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Válassz mentési fájlt" @@ -5108,16 +4404,7 @@ msgstr "Válassz mentési fájlt" msgid "Select the state to load" msgstr "Válassz betöltendÅ‘ állásmentést" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Válassz mentendÅ‘ állást" @@ -5499,27 +4786,9 @@ msgstr "Hang puffer létrehozása sikertelen: %s" msgid "Space" msgstr "Szóköz" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spanyol" @@ -5563,15 +4832,7 @@ msgstr "Négyzetes kar" msgid "Standard Controller" msgstr "Normál irányító" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5606,14 +4867,7 @@ msgstr "Kar" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Leállítás" @@ -5669,13 +4923,6 @@ msgstr "TAJVAN" #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Hungarian and Turkish translations. msgid "TAS Input" msgstr "TAS bemenet" @@ -5698,24 +4945,13 @@ msgstr "Tábla jobbra" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Pillanatkép készítése" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" -<<<<<<< HEAD -msgstr "" -======= msgstr "TaruKonga (Bongos)" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -5941,31 +5177,12 @@ msgstr "Minden napló típus kijelölése" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Váltás teljes nézetre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Fent" @@ -6076,21 +5293,6 @@ msgstr "" "Ismeretlen üzenet érkezett ezzel az azonosítóval:%d ettÅ‘l a játékostól:%d " "Játékos kirúgása!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Ismeretlen mutató %#08x\n" -"Folytatod?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6252,54 +5454,18 @@ msgstr "" #: Source/Core/Core/Src/Movie.cpp:667 #, c-format -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update the pot file to reflect recent changes in the code. 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 "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -======= ->>>>>>> Update the pot file to reflect recent changes in the code. "Figyelem: Olyan mentést töltöttél be, ami a választott videó befejezése " "utáni. (%u > %u bájt) (%u > %u képkocka). Folytatás elÅ‘tt betölthetsz egy " "másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása " "után." -<<<<<<< HEAD ->>>>>>> Update from master branch. - -#: Source/Core/Core/Src/Movie.cpp:646 -#, 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 "" -<<<<<<< HEAD -======= -"Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d (0x%X) bájt " -"eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy " -"betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ " -"esetben szinkronizációs hibák jelentkezhetnek." ->>>>>>> Update from master branch. -======= -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 "Figyelem: Olyan mentést töltöttél be, ami a választott videó befejezése utáni. (%u > %u bájt) (%u > %u képkocka). Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása után." -======= ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/Core/Src/Movie.cpp:684 #, c-format -<<<<<<< HEAD -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 "Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d (0x%X) bájt eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ esetben szinkronizációs hibák jelentkezhetnek." ->>>>>>> Update Hungarian translation. -======= 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-" @@ -6309,7 +5475,6 @@ msgstr "" "eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy " "betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ " "esetben szinkronizációs hibák jelentkezhetnek." ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/Core/Src/Movie.cpp:693 #, c-format @@ -6329,22 +5494,10 @@ 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 "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= -======= ->>>>>>> Update the pot file to reflect recent changes in the code. "Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d képkocka eltérés " "mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy betöltheted " "ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ esetben " "szinkronizációs hibák jelentkezhetnek.\n" -<<<<<<< HEAD -======= -"Figyelem: Olyan mentést töltöttél be, amelyik videójánál %d képkocka eltérés mutatkozik. Folytatás elÅ‘tt betölthetsz egy másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ esetben szinkronizációs hibák jelentkezhetnek.\n" ->>>>>>> Update Hungarian translation. -======= ->>>>>>> Update the pot file to reflect recent changes in the code. "\n" "BÅ‘vebb információk: A választott videó %d képkocka hosszú, a mentett állás " "videója pedig %d képkocka hosszú.\n" @@ -6354,18 +5507,8 @@ msgstr "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n" "\n" "%d képkockánál a mentett állás videója tömörítve lesz:\n" -<<<<<<< HEAD -<<<<<<< HEAD "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" ->>>>>>> Update from master branch. -======= -"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" ->>>>>>> Update Hungarian translation. -======= -"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" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -6400,19 +5543,7 @@ msgstr "Wii NAND gyökér könyvtár:" msgid "Wii Save Import" msgstr "Wii mentés importálása" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii mentés fájlok (*.bin)|*.bin" @@ -6443,15 +5574,7 @@ msgstr "" "esetleg az üresjárati idÅ‘korlát letelt vagy egyéb ok miatt történt.\n" "Újra akarod csatlakoztatni most?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote csatlakoztatva" @@ -6483,27 +5606,9 @@ msgstr "Jobb Windows" msgid "Word Wrap" msgstr "Word Wrap" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Folyamatban..." diff --git a/Languages/po/it.po b/Languages/po/it.po index bc89c73efc..dc19d18fea 100644 --- a/Languages/po/it.po +++ b/Languages/po/it.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-04-08 20:40+0100\n" "Last-Translator: RebuMan, Dolphin Team\n" "Language-Team: \n" @@ -564,27 +552,9 @@ msgstr "Aggiungi Patch" msgid "Add new pane" msgstr "Aggiungi nuovo riquadro" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Aggiungi..." @@ -656,23 +626,8 @@ msgstr "Tutti i file di immagine GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tutti i file GCM GameCube (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tutti gli Stati di Gioco Salvati (sav, s##)" @@ -756,19 +711,7 @@ 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!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspetto:" @@ -790,19 +733,7 @@ msgstr "Interfaccia Audio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "Audiocommon: Errore nell'apertura della periferica AO.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -915,19 +846,7 @@ msgid "Blue Right" msgstr "Blu Destro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Sotto" @@ -960,15 +879,7 @@ msgstr "Cerca una directory di destinazione" msgid "Buffer:" msgstr "Buffer:" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1204,21 +1115,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Chiudi" @@ -1327,15 +1225,7 @@ msgstr "Collega Wiimote 3" msgid "Connect Wiimote 4" msgstr "Collega Wiimote 4" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "Connessione in corso..." @@ -1523,21 +1413,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Motore di Emulazione DSP" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulazione DSP HLE (veloce)" @@ -1765,19 +1642,7 @@ msgstr "Visualizza i tasti di input letti dall'emulatore." msgid "Divide" msgstr "/" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Vuoi interrompere l'emulazione in corso?" @@ -1806,39 +1671,12 @@ msgstr "Dolphin - Configurazione Wiimote Emulato" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin - Configurazione Controlli GC" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin - Configurazione Controlli GC" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin - Configurazione Controlli GC" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin - Configurazione Controlli GC" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmati TAS Dolphin (*.dtm)" @@ -1927,27 +1765,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Olandese" @@ -2072,41 +1892,16 @@ msgstr "Attiva BAT" msgid "Enable Block Merging" msgstr "Attiva Unione Blocchi" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Attiva Cache" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Abilita Trucchi" @@ -2247,27 +2042,9 @@ msgstr "" msgid "End" msgstr "Fine" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Inglese" @@ -2296,45 +2073,10 @@ msgstr "Uguale" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Errore/i" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Errore/i" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Errore/i" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Errore/i" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2809,27 +2551,9 @@ msgstr "Fotogrammi da Registrare:" msgid "Free Look" msgstr "Visuale Libera" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francese" @@ -2897,19 +2621,7 @@ msgid "Gamecube &Pad Settings" msgstr "Impostazioni &Controlli GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Schede di Memoria GameCube (*.raw,*.gcp)" @@ -2934,21 +2646,8 @@ msgstr "" "(codice corrotto oppure tipo di codice non ancora supportato.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generale" @@ -2958,27 +2657,9 @@ msgstr "Generale" msgid "General Settings" msgstr "Impostazioni Interfaccia" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Tedesco" @@ -3103,21 +2784,8 @@ msgid "Hotkey Configuration" msgstr "Configurazione Tasti di Scelta Rapida" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Tasti di Scelta Rapida" @@ -3333,19 +3001,7 @@ msgstr "" "E' stata sollevata un'Eccezione all'Installazione, tuttavia questa " "piattaforma non la supporta ancora." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Installazione WAD..." @@ -3429,27 +3085,9 @@ msgstr "File di registrazione non valido" msgid "Invalid state" msgstr "Stato non valido" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiano" @@ -3608,36 +3246,12 @@ msgstr "Carica Stato di Gioco dall'Ingresso 8" msgid "Load State..." msgstr "Carica Stato di Gioco..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Carica il Menu di Sistema Wii %d%c" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carica il Menu di Sistema Wii %d%c" @@ -3720,15 +3334,7 @@ msgstr "Hack Velocità MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "File MadCatz Gameshark(*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Levetta Principale" @@ -3759,19 +3365,7 @@ msgid "Memory Byte" msgstr "Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Scheda di Memoria" @@ -3957,19 +3551,7 @@ msgstr "TN Tab" msgid "NP Up" msgstr "TN Su" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4056,15 +3638,7 @@ msgstr "Diverso" msgid "Not Set" msgstr "Non Impostato" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "Non collegato" @@ -4125,14 +3699,7 @@ msgstr "Solo %d blocchi disponibili" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Apri" @@ -4266,23 +3833,8 @@ msgstr "Patches" msgid "Paths" msgstr "Percorsi" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4303,23 +3855,8 @@ msgstr "Prospettiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Gioca" @@ -4345,19 +3882,7 @@ msgstr "Opzioni di Riproduzione" msgid "Players" msgstr "Giocatori" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Per favore confermare..." @@ -4571,31 +4096,10 @@ msgstr "Aggiorna Elenco" msgid "Refresh game list" msgstr "Aggiorna elenco giochi" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Rimuovi" @@ -4614,14 +4118,7 @@ msgid "Render to Main Window" msgstr "Rendering nella finestra Principale" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Resetta" @@ -4664,19 +4161,7 @@ msgstr "Sa&lva Stato di Gioco" msgid "Safe" msgstr "Accurata" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Frequenza di Campionamento:" @@ -4761,19 +4246,7 @@ msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..." msgid "Scaled EFB Copy" msgstr "Scala Copie EFB" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Ricerca..." @@ -4813,39 +4286,12 @@ msgstr "Sezione %s non trovata in SYSCONF" msgid "Select" msgstr "Seleziona" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Seleziona il File di Registrazione" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Seleziona il File di Registrazione" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Seleziona il File di Registrazione" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Seleziona il File di Registrazione" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleziona un file WAD Wii da installare" @@ -4871,13 +4317,7 @@ msgstr "Seleziona finestre libere/mobili" msgid "Select the file to load" msgstr "Seleziona il file da caricare" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Seleziona il file di salvataggio" @@ -4885,29 +4325,7 @@ msgstr "Seleziona il file di salvataggio" msgid "Select the state to load" msgstr "Seleziona lo stato di gioco da caricare" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -msgid "Select the save file" -msgstr "Seleziona il file di salvataggio" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Seleziona lo stato di gioco da caricare" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Seleziona lo stato di gioco da salvare" @@ -5262,27 +4680,9 @@ msgstr "Creazione buffer audio non riuscita: %s" msgid "Space" msgstr "Spazio" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spagnolo" @@ -5318,15 +4718,7 @@ msgstr "Levetta Quadrata" msgid "Standard Controller" msgstr "Controller Standard" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5361,14 +4753,7 @@ msgstr "Levetta" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Arresta" @@ -5441,14 +4826,7 @@ msgstr "Semipiano destro" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Genera un'Istantanea di Gioco" @@ -5675,31 +5053,12 @@ msgstr "Seleziona/Deseleziona tutti i Tipi di Log" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Commuta a Schermo Intero" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Sopra" @@ -5805,21 +5164,6 @@ msgstr "" "Messaggio sconosciuto avente id:%d ricevuto dal giocatore:%d Giocatore " "espluso!!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Puntatore %#08x sconosciuto\n" -"Continuare?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6036,19 +5380,7 @@ msgstr "Origine DVD:" msgid "Wii Save Import" msgstr "Importa Salvataggi Wii" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Salva i file Wii (*.bin)|*.bin" @@ -6079,15 +5411,7 @@ msgstr "" " o forse è dovuto ad altri motivi. \n" "Vuoi riconnettersi immediatamente?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Collegato" @@ -6120,27 +5444,9 @@ msgstr "Windows Destro" msgid "Word Wrap" msgstr "Adatta Testo" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Attività in corso..." diff --git a/Languages/po/ja.po b/Languages/po/ja.po index eec5710d55..f69337fcf9 100644 --- a/Languages/po/ja.po +++ b/Languages/po/ja.po @@ -7,25 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-10-12 20:45+0900\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -<<<<<<< HEAD -"PO-Revision-Date: 2011-08-19 08:37-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -"PO-Revision-Date: 2011-10-12 20:45+0900\n" ->>>>>>> Update Arabic and Japanese translations. "Last-Translator: DanbSky\n" "Language-Team: \n" "Language: Japanese\n" @@ -443,13 +426,6 @@ msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulation" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -574,27 +550,9 @@ msgstr "パッãƒã‚’追加" msgid "Add new pane" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "追加" @@ -660,23 +618,8 @@ msgstr "å…¨ã¦ã® GC/Wii イメージ (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "GC GCMファイル (gcm)|*.gcm" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "å…¨ã¦ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイル (sav, s##)" @@ -704,24 +647,9 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -<<<<<<< HEAD -<<<<<<< HEAD -msgid "Alternate Wiimote Timing" -msgstr "Wii リモコンã®åŒæœŸèª¿æ•´" -======= -#, fuzzy -msgid "Alternate Wiimote Timing" -msgstr "Wii リモコンをエミュレート" ->>>>>>> Update translation files for recent changes in the code. -======= -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Wii リモコンã®åŒæœŸèª¿æ•´" ->>>>>>> Update Arabic and Japanese translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -779,19 +707,7 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ファイルを削除ã—ã¾ã™ã‹ï¼Ÿå…ƒã«æˆ»ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“ï¼" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "アスペクト比：" @@ -813,19 +729,7 @@ msgstr "出力API (Audio Backend)" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error opening AO device.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" @@ -940,19 +844,7 @@ msgid "Blue Right" msgstr "é’ - å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "下部" @@ -985,15 +877,7 @@ msgstr "出力先をé¸æŠž" msgid "Buffer:" msgstr "ãƒãƒƒãƒ•ã‚¡ï¼š" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1238,21 +1122,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "é–‰ã˜ã‚‹" @@ -1360,15 +1231,7 @@ msgstr "3Pã®Wii リモコンを接続ï¼åˆ‡æ–­" msgid "Connect Wiimote 4" msgstr "4Pã®Wii リモコンを接続ï¼åˆ‡æ–­" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "接続中..." @@ -1558,21 +1421,8 @@ msgstr "サウンド" msgid "DSP Emulator Engine" msgstr "DSPエミュレーション方å¼" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP-HLE エミュレーション (高速)" @@ -1811,19 +1661,7 @@ msgstr "" msgid "Divide" msgstr "Divide" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "動作中ã®ã‚²ãƒ¼ãƒ ã‚’åœæ­¢ã—ã¾ã™ã‹ï¼Ÿ" @@ -1852,39 +1690,12 @@ msgstr "Wii リモコンã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³è¨­å®š" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "GCコントローラ設定" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "GCコントローラ設定" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "GCコントローラ設定" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "GCコントローラ設定" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS ムービー (*.dtm)" @@ -1981,27 +1792,9 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "オランダ語" @@ -2141,40 +1934,15 @@ msgstr "Enable BAT" msgid "Enable Block Merging" msgstr "Enable Block Merging" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Enable Cache" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ã‚’有効化" @@ -2328,27 +2096,9 @@ msgstr "" msgid "End" msgstr "End" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "英語" @@ -2377,45 +2127,10 @@ msgstr "ã«ä¸€è‡´ã™ã‚‹" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "エラー" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "エラー" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "エラー" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "エラー" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2884,27 +2599,9 @@ msgstr "録画フレーム数設定" msgid "Free Look" msgstr "フリールック" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "フランス語" @@ -2971,19 +2668,7 @@ msgid "Gamecube &Pad Settings" msgstr "ゲームキューブ入力設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "メモリーカードファイル (*.raw,*.gcp)|*.raw;*.gcp" @@ -3008,21 +2693,8 @@ msgstr "" "(コードã«å•é¡ŒãŒã‚ã‚‹ã‹ã€ã¾ã ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„タイプã®ã‚³ãƒ¼ãƒ‰ã§ã™)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -3031,27 +2703,9 @@ msgstr "一般" msgid "General Settings" msgstr "一般" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "ドイツ語" @@ -3074,13 +2728,6 @@ msgid "Greater Than" msgstr "より大ãã„" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -3190,21 +2837,8 @@ msgid "Hotkey Configuration" msgstr "ホットキーã®è¨­å®š" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "ホットキー" @@ -3429,19 +3063,7 @@ msgstr "" "InstallExceptionHandler ãŒå‘¼ã³å‡ºã•ã‚Œã¾ã—ãŸãŒã€ã“ã®ãƒ—ラットフォームã¯ã¾ã ã‚µ" "ãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WADファイルを追加ã—ã¦ã„ã¾ã™..." @@ -3523,27 +3145,9 @@ msgstr "ä¸æ­£ãªéŒ²ç”»ãƒ•ã‚¡ã‚¤ãƒ«" msgid "Invalid state" msgstr "ä¸æ­£ãªã‚»ãƒ¼ãƒ–ï¼ãƒ­ãƒ¼ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "イタリア語" @@ -3701,35 +3305,11 @@ msgstr "ステートロード - スロット 8" msgid "Load State..." msgstr "ファイルã‹ã‚‰ãƒ­ãƒ¼ãƒ‰" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Wiiメニューを起動" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Wiiメニューを起動" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Wiiメニューを起動" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Wiiメニューを起動" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wiiメニューを起動 ( ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š%d %c )" @@ -3812,15 +3392,7 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark セーブファイル(*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "コントロールスティック" @@ -3851,19 +3423,7 @@ msgid "Memory Byte" msgstr "メモリãƒã‚¤ãƒˆ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "メモリーカード" @@ -4059,19 +3619,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4158,15 +3706,7 @@ msgstr "ã«ä¸€è‡´ã—ãªã„" msgid "Not Set" msgstr "未確èª" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "未接続" @@ -4227,14 +3767,7 @@ msgstr "残り %d ブロックã—ã‹ã‚ã‚Šã¾ã›ã‚“ï¼" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "é–‹ã" @@ -4365,23 +3898,8 @@ msgstr "パッãƒ" msgid "Paths" msgstr "フォルダ" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "一時åœæ­¢" @@ -4401,23 +3919,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "開始" @@ -4443,19 +3946,7 @@ msgstr "å†ç”Ÿã‚ªãƒ—ション" msgid "Players" msgstr "プレイヤー一覧" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "確èª" @@ -4667,31 +4158,10 @@ msgstr "ゲームリストをå†æ›´æ–°" msgid "Refresh game list" msgstr "ゲームリストをå†æ›´æ–°ã—ã¾ã™" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "削除" @@ -4710,14 +4180,7 @@ msgid "Render to Main Window" msgstr "メインウィンドウ部分ã«æç”»" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "åˆæœŸåŒ–" @@ -4760,19 +4223,7 @@ msgstr "ステートセーブ(&V)" msgid "Safe" msgstr "Safe" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "サンプルレート" @@ -4856,19 +4307,7 @@ msgstr "Savestate movie %s ã®ç ´æを確èªã—ã¾ã—ãŸã€‚録画を中止㗠msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "確èªä¸­... .%s" @@ -4908,39 +4347,12 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "é¸æŠž" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "録画ファイルをé¸æŠž" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "録画ファイルをé¸æŠž" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "録画ファイルをé¸æŠž" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "録画ファイルをé¸æŠž" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "追加ã™ã‚‹WADファイルをé¸æŠž" @@ -4966,13 +4378,7 @@ msgstr "" msgid "Select the file to load" msgstr "ロードã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "セーブファイルをé¸æŠž" @@ -4980,29 +4386,7 @@ msgstr "セーブファイルをé¸æŠž" msgid "Select the state to load" msgstr "ロードã™ã‚‹ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイルをé¸æŠž" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -msgid "Select the save file" -msgstr "セーブファイルをé¸æŠž" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "ロードã™ã‚‹ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイルをé¸æŠž" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "ステートセーブã®ä¿å­˜å…ˆã‚’é¸æŠž" @@ -5381,27 +4765,9 @@ msgstr "Sound buffer creation failed: %s" msgid "Space" msgstr "Space" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "スペイン語" @@ -5445,15 +4811,7 @@ msgstr "丸ã¿" msgid "Standard Controller" msgstr "標準コントローラ" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5488,14 +4846,7 @@ msgstr "スティック" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "åœæ­¢" @@ -5572,14 +4923,7 @@ msgstr "å³ãƒ†ãƒ¼ãƒ–ル" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "スクリーンショット" @@ -5815,31 +5159,12 @@ msgstr "å…¨ã¦ã®ãƒ­ã‚°æƒ…報をé¸æŠžï¼è§£é™¤" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "フルスクリーン表示切り替ãˆ" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "上部" @@ -5948,21 +5273,6 @@ msgstr "次ã®IDã‹ã‚‰ä¸æ˜Žãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’å—ä¿¡ : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Unknown message with id:%d received from player:%d Kicking player!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Unknown pointer %#08x\n" -"Continue?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6190,19 +5500,7 @@ msgstr "Wii NANDルート" msgid "Wii Save Import" msgstr "Wiiã®ã‚»ãƒ¼ãƒ–データをインãƒãƒ¼ãƒˆ" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wiiセーブデータ (*.bin)|*.bin" @@ -6233,15 +5531,7 @@ msgstr "" "ã¾ãŸã¯ã—ã°ã‚‰ã入力ãŒãªã‹ã£ãŸãŸã‚çœé›»åŠ›ãƒ¢ãƒ¼ãƒ‰ã«å…¥ã£ãŸã®ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“\n" "å†æŽ¥ç¶šã—ã¾ã™ã‹ï¼Ÿ" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wii リモコン接続中" @@ -6273,27 +5563,9 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ワードラップ" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "動作中..." @@ -7013,16 +6285,6 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "音声や効果音ã®å†ç”Ÿã«ã‚ˆã使用ã•ã‚Œã¾ã™" -<<<<<<< HEAD - -#~ msgid "" -#~ "Unknown pointer %#08x\n" -#~ "Continue?" -#~ msgstr "" -#~ "Unknown pointer %#08x\n" -#~ "Continue?" -======= ->>>>>>> Update translation files for recent changes in the code. #~ msgid "" #~ "Unknown pointer %#08x\n" diff --git a/Languages/po/ko.po b/Languages/po/ko.po index 338b22dab0..41813f2e85 100644 --- a/Languages/po/ko.po +++ b/Languages/po/ko.po @@ -7,24 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -<<<<<<< HEAD -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -"PO-Revision-Date: 2011-07-07 10:24+0900\n" -======= -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2012-01-19 11:47+0900\n" ->>>>>>> Update Korean translations. "Last-Translator: \n" "Language-Team: \n" "Language: Korean\n" @@ -566,27 +550,9 @@ msgstr "패치 추가" msgid "Add new pane" msgstr "새로운 ì°½ 추가" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "추가..." @@ -654,23 +620,8 @@ msgstr "모든 GC/Wii ì´ë¯¸ì§€ë“¤ (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "모든 게임í브 GCM 파ì¼ë“¤ (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "모든 ìƒíƒœë“¤ 저장 (sav, s##)" @@ -757,19 +708,7 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ì´ íŒŒì¼ì„ ì •ë§ë¡œ 지우고 싶습니까? ê·¸ê²ƒì€ ì˜ì›ížˆ 사ë¼ì§‘니다!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "종횡비:" @@ -791,19 +730,7 @@ msgstr "오디오 백엔드:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO 장치를 열기 ì—러.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "ìžë™" @@ -918,19 +845,7 @@ msgid "Blue Right" msgstr "파랑 오른쪽" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "아래" @@ -963,15 +878,7 @@ msgstr "출력 디렉토리 둘러보기" msgid "Buffer:" msgstr "버í¼:" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1211,21 +1118,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "닫기" @@ -1333,15 +1227,7 @@ msgstr "위모트 3 ì—°ê²°" msgid "Connect Wiimote 4" msgstr "위모트 4 ì—°ê²°" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "연결중..." @@ -1531,21 +1417,8 @@ msgstr "오디오" msgid "DSP Emulator Engine" msgstr "DSP ì—뮬레ì´í„° 엔진" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE ì—뮬레ì´ì…˜ (빠름)" @@ -1782,19 +1655,7 @@ msgstr "" msgid "Divide" msgstr "나누기" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "현재 ì—뮬레ì´ì…˜ì„ 중단하고 싶습니까?" @@ -1823,39 +1684,12 @@ msgstr "ëŒí•€ ì—ë®¬ëœ ìœ„ëª¨íŠ¸ 환경설정" msgid "Dolphin FIFO" msgstr "ëŒí•€ FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "ëŒí•€ GC패드 환경설정" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "ëŒí•€ GC패드 환경설정" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "ëŒí•€ GC패드 환경설정" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "ëŒí•€ GC패드 환경설정" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "ëŒí•€ TAS ë™ì˜ìƒ (*.dtm)" @@ -1951,27 +1785,9 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "네ëœëž€ë“œì–´" @@ -2110,40 +1926,15 @@ msgstr "BAT 활성" msgid "Enable Block Merging" msgstr "ë¸”ë¡ í•©ì¹˜ê¸° 활성" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "바운딩 박스 계산 켜기" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "ìºì‰¬ 활성" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "치트 활성" @@ -2294,27 +2085,9 @@ msgstr "" msgid "End" msgstr "ë" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "ì˜ì–´" @@ -2343,47 +2116,10 @@ msgstr "ê°™ìŒ" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "ì—러" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "ì—러" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "ì—러" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" -"PlayWiimoteì— ì—러발ìƒ. %u != %u, byte %d.\n" -"죄송합니다, Wii 녹화가 ì¼ì‹œì ìœ¼ë¡œ 깨졌습니다." - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "ì—러" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "ì„ íƒëœ 언어 로딩 ì—러. 시스템 기본으로 ëŒì•„갑니다." @@ -2850,27 +2586,9 @@ msgstr "녹화할 프레임" msgid "Free Look" msgstr "ìžìœ ë¡œìš´ 보기" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "프랑스어" @@ -2936,19 +2654,7 @@ msgid "Gamecube &Pad Settings" msgstr "게임í브 패드 설정(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "게임í브 메모리 카드들 (*.raw,*.gcp)" @@ -2973,21 +2679,8 @@ msgstr "" "(ìž˜ëª»ëœ ì½”ë“œì´ê±°ë‚˜ 코드 íƒ€ìž…ì´ ì•„ì§ ì§€ì›ì•Šëœë‹¤.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "ì¼ë°˜" @@ -2996,27 +2689,9 @@ msgstr "ì¼ë°˜" msgid "General Settings" msgstr "ì¼ë°˜ 설정" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "ë…ì¼ì–´" @@ -3147,21 +2822,8 @@ msgid "Hotkey Configuration" msgstr "단축키 설정" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "단축키들" @@ -3387,19 +3049,7 @@ msgstr "" "InstallExceptionHandler 호출ë¨, 하지만 ì´ í”Œëž«í¼ì€ ì•„ì§ ê·¸ê²ƒì„ ì§€ì›í•˜ì§€ 않습" "니다." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WAD 설치하기..." @@ -3481,27 +3131,9 @@ msgstr "비ì í•© ê¸°ë¡ íŒŒì¼" msgid "Invalid state" msgstr "비ì í•© ìƒíƒœ" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "ì´íƒˆë¦¬ì•„ì–´" @@ -3659,35 +3291,11 @@ msgstr "슬롯8 ìƒíƒœ 로드" msgid "Load State..." msgstr "ìƒíƒœ 로드..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Wii 시스템 메뉴 로드" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Wii 시스템 메뉴 로드" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Wii 시스템 메뉴 로드" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Wii 시스템 메뉴 로드" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii 시스템 메뉴 %d %c 로드" @@ -3769,15 +3377,7 @@ msgstr "MMU 스피드 핵" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz ê²Œìž„ìƒ¤í¬ íŒŒì¼ë“¤(*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "ë©”ì¸ ìŠ¤í‹±" @@ -3808,19 +3408,7 @@ msgid "Memory Byte" msgstr "메모리 ë°”ì´íŠ¸" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "메모리 ì¹´ë“œ" @@ -4018,19 +3606,7 @@ msgstr "NP 탭" msgid "NP Up" msgstr "NP 위" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4117,15 +3693,7 @@ msgstr "같지 ì•ŠìŒ" msgid "Not Set" msgstr "설정 안함" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "ì—°ê²°ë˜ì§€ ì•ŠìŒ" @@ -4186,14 +3754,7 @@ msgstr "%d 블럭들만 유용한" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "열기" @@ -4321,23 +3882,8 @@ msgstr "패치" msgid "Paths" msgstr "경로" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "ì¼ì‹œì •ì§€" @@ -4357,23 +3903,8 @@ msgstr "ê´€ì  %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr " 실행 " @@ -4399,19 +3930,7 @@ msgstr "ìž¬ìƒ ì˜µì…˜" msgid "Players" msgstr "플레ì´ì–´" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "확ì¸í•´ì£¼ì„¸ìš”..." @@ -4622,31 +4141,10 @@ msgstr "ëª©ë¡ ìƒˆë¡œ 고침" msgid "Refresh game list" msgstr "게임 ëª©ë¡ ìƒˆë¡œ 고침" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "제거" @@ -4665,14 +4163,7 @@ msgid "Render to Main Window" msgstr "ë©”ì¸ ìœˆë„ìš°ì— ë Œë”" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "리셋" @@ -4715,19 +4206,7 @@ msgstr "ìƒíƒœ 저장(&v) " msgid "Safe" msgstr "안전" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "샘플율:" @@ -4811,19 +4290,7 @@ msgstr "%s ì˜ìƒ ìƒíƒœì €ìž¥ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤, ì˜ìƒ ê¸°ë¡ ì¤‘ì§€... msgid "Scaled EFB Copy" msgstr "스케ì¼ëœ EFB 복사" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "스ìºë‹ %s" @@ -4863,39 +4330,12 @@ msgstr "섹션 %s를 SYSCONFì—ì„œ ì°¾ì„ ìˆ˜ ì—†ìŒ" msgid "Select" msgstr "ì„ íƒ" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "ê¸°ë¡ íŒŒì¼ ì„ íƒ" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "ê¸°ë¡ íŒŒì¼ ì„ íƒ" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "ê¸°ë¡ íŒŒì¼ ì„ íƒ" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "ê¸°ë¡ íŒŒì¼ ì„ íƒ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "설치할 Wii WAD íŒŒì¼ ì„ íƒ" @@ -4921,26 +4361,7 @@ msgstr "유ë™ì ì¸ 윈ë„우즈 ì„ íƒ" msgid "Select the file to load" msgstr "로드할 íŒŒì¼ ì„ íƒ" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "저장 파ì¼ì„ ì„ íƒ" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "로드할 ìƒíƒœ ì„ íƒ" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "저장 파ì¼ì„ ì„ íƒ" @@ -4948,16 +4369,7 @@ msgstr "저장 파ì¼ì„ ì„ íƒ" msgid "Select the state to load" msgstr "로드할 ìƒíƒœ ì„ íƒ" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "저장할 ìƒíƒœ ì„ íƒ" @@ -5332,27 +4744,9 @@ msgstr "사운드 ë²„í¼ ìƒì„± 실패했습니다: %s" msgid "Space" msgstr "스페ì´ìŠ¤" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "스페ì¸ì–´" @@ -5396,15 +4790,7 @@ msgstr "스퀘어 스틱" msgid "Standard Controller" msgstr "표준 컨트롤러" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5439,14 +4825,7 @@ msgstr "스틱" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "중지" @@ -5522,14 +4901,7 @@ msgstr "í…Œì´ë¸” 오른쪽" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "스í¬ë¦°ìƒ· ì°ê¸°" @@ -5759,31 +5131,12 @@ msgstr "모든 로그 타입 토글" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "전체화면 토글" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "위" @@ -5893,21 +5246,6 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "id:%dì˜ ì•Œë ¤ì§€ì§€ ì•Šì€ ë©”ì‹œì§€, 플레ì´ì–´:%d 플레ì´ì–´ 킥킹으로 부터 전달ëœ!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"알려지지 ì•Šì€ í¬ì¸í„° %#08x\n" -"계ì†í•©ë‹ˆê¹Œ?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6153,19 +5491,7 @@ msgstr "Wii NAND 루트:" msgid "Wii Save Import" msgstr "Wii 저장 가져오기" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 저장 파ì¼ë“¤ (*.bin)|*.bin" @@ -6196,15 +5522,7 @@ msgstr "" "í˜¹ì€ ì•„ë§ˆë„ ì•„ì´ë“¤ 타임 아웃ì´ê±°ë‚˜ 다른 ì›ì¸ ë•Œë¬¸ì¸ ê²ƒ 같습니다.\n" "ë‹¹ì‹ ì€ ì¦‰ì‹œ 재연결 하고 싶습니까?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "위모트가 ì—°ê²°ë¨" @@ -6236,27 +5554,9 @@ msgstr "윈ë„우즈 오른쪽" msgid "Word Wrap" msgstr "ìžë™ 줄바꿈" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "ìž‘ë™ì¤‘..." diff --git a/Languages/po/nb.po b/Languages/po/nb.po index d2fa9aa314..aa491a3b56 100644 --- a/Languages/po/nb.po +++ b/Languages/po/nb.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-06-06 20:15+0100\n" "Last-Translator: Knut \n" "Language-Team: Norwegian \n" @@ -567,27 +555,9 @@ msgstr "Legg til Patch" msgid "Add new pane" msgstr "Legg til ny rute" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Legg til..." @@ -655,23 +625,8 @@ msgstr "Alle GC/Wii-bildefiler (gcm, iso, ciso, wad)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle GameCube GCM-filer (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Save States (sav, s##)" @@ -763,19 +718,7 @@ msgstr "" "Er du sikker pÃ¥ at du vil slette denne filen?\n" "Den vil bli borte for alltid!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspektforhold:" @@ -797,19 +740,7 @@ msgstr "Audio Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Feil ved Ã¥pning av AO-device.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisk" @@ -924,19 +855,7 @@ msgid "Blue Right" msgstr "BlÃ¥ Høyre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Bunn" @@ -969,15 +888,7 @@ msgstr "Bla etter lagringssted" msgid "Buffer:" msgstr "Buffer:" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1218,21 +1129,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Lukk" @@ -1340,15 +1238,7 @@ msgstr "Koble til Wiimote 3" msgid "Connect Wiimote 4" msgstr "Koble til Wiimote 4" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "Kobler til..." @@ -1537,21 +1427,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "CPU Emulatormotor" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE-emulering (raskt)" @@ -1790,19 +1667,7 @@ msgstr "" msgid "Divide" msgstr "Del" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Vil du stoppe pÃ¥gÃ¥ende emulering?" @@ -1831,39 +1696,12 @@ msgstr "Dolphin Emulert Wiimote Konfigurasjon" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC-kontroll konfigurasjon" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC-kontroll konfigurasjon" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC-kontroll konfigurasjon" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC-kontroll konfigurasjon" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS-Filmer (*.dtm)" @@ -1959,27 +1797,9 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Nederlansk" @@ -2118,40 +1938,15 @@ msgstr "Aktiver BAT" msgid "Enable Block Merging" msgstr "Aktiver Block Merging" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Aktiver cache" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Aktiver Juksekoder" @@ -2306,27 +2101,9 @@ msgstr "" msgid "End" msgstr "Slutt" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Engelsk" @@ -2355,45 +2132,10 @@ msgstr "Lik" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Feil" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Feil" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Feil" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Feil" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Feil ved lasting av valgt sprÃ¥k. Faller tilbake til systemstandarden." @@ -2859,27 +2601,9 @@ msgstr "Bilder Til Opptak" msgid "Free Look" msgstr "Fri Utkikk" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Fransk" @@ -2946,19 +2670,7 @@ msgid "Gamecube &Pad Settings" msgstr "Innstillinger for &GameCube-kontroll" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube-minnekort (*.raw,*.gcp)" @@ -2983,21 +2695,8 @@ msgstr "" "(Enten en dÃ¥rlig kode, eller sÃ¥ støttes ikke kodeformatet.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generelt" @@ -3006,27 +2705,9 @@ msgstr "Generelt" msgid "General Settings" msgstr "Generelle Innstillinger" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Tysk" @@ -3157,21 +2838,8 @@ msgid "Hotkey Configuration" msgstr "Konfigurer Snarveistaster" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Snarveistaster" @@ -3392,19 +3060,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "InstallExceptionHandler kalt, men denne plattformen støtter den ikke." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Installer WAD..." @@ -3486,27 +3142,9 @@ msgstr "Ugyldig opptaksfil" msgid "Invalid state" msgstr "Ugyldig save state" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiensk" @@ -3664,35 +3302,11 @@ msgstr "Last Inn Save State Slot 8" msgid "Load State..." msgstr "Last Inn Save State..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Last inn Wii System Meny" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Last inn Wii System Meny" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Last inn Wii System Meny" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Last inn Wii System Meny" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Last inn Wii System Meny %d %c" @@ -3774,15 +3388,7 @@ msgstr "Ytelses-hack for MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark-filer(*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Hoved-joystick" @@ -3813,19 +3419,7 @@ msgid "Memory Byte" msgstr "Memory Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Minnekort" @@ -4023,19 +3617,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Opp" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4122,15 +3704,7 @@ msgstr "Ikke Lik" msgid "Not Set" msgstr "Ikke Satt" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "Ikke tilkoblet" @@ -4191,14 +3765,7 @@ msgstr "Kun %d blokker tilgjengelig" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Ã…pne" @@ -4329,23 +3896,8 @@ msgstr "Patcher" msgid "Paths" msgstr "Mappestier" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4365,23 +3917,8 @@ msgstr "Perspektiv %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Spill" @@ -4407,19 +3944,7 @@ msgstr "Avspillingsalterntiver" msgid "Players" msgstr "Spillere" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Vennligst bekreft..." @@ -4632,31 +4157,10 @@ msgstr "Oppdater liste" msgid "Refresh game list" msgstr "Oppdater spilliste" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Fjern" @@ -4675,14 +4179,7 @@ msgid "Render to Main Window" msgstr "Render til Hovedvindu" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Restart" @@ -4725,19 +4222,7 @@ msgstr "Lagre Sa&ve State" msgid "Safe" msgstr "Sikker" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Samplingsratio:" @@ -4821,19 +4306,7 @@ msgstr "Save State-film %s er korrupt, opptak avsluttes..." msgid "Scaled EFB Copy" msgstr "Skalert EFB-kopi" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Søker i %s" @@ -4873,39 +4346,12 @@ msgstr "Seksjon %s ikke funnet i SYSCONF" msgid "Select" msgstr "Velg" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Velg Opptaksfil" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Velg Opptaksfil" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Velg Opptaksfil" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Velg Opptaksfil" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Velg en Wii WAD-fil Ã¥ innstallere" @@ -4931,26 +4377,7 @@ msgstr "Velg flytvindu" msgid "Select the file to load" msgstr "Velg fil Ã¥ laste" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "Velg lagringsfil" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Velg en save state Ã¥ laste" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Velg lagringsfil" @@ -4958,16 +4385,7 @@ msgstr "Velg lagringsfil" msgid "Select the state to load" msgstr "Velg en save state Ã¥ laste" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Velg en save state Ã¥ lagre" @@ -5344,27 +4762,9 @@ msgstr "Laging av lydbuffer mislyktes: %s" msgid "Space" msgstr "Mellomrom" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spansk" @@ -5407,15 +4807,7 @@ msgstr "Kvadrat-joystick" msgid "Standard Controller" msgstr "Standardkontroller" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5450,14 +4842,7 @@ msgstr "Joystick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stopp" @@ -5535,14 +4920,7 @@ msgstr "Tabell Høyre" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Ta Skjermbilde" @@ -5772,31 +5150,12 @@ msgstr "Vipp Alle Loggtyper" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Vipp Mellom Vindu/Fullskjerm" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Topp" @@ -5903,21 +5262,6 @@ msgstr "Ukjent melding mottatt med ID: %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Ukjent melding mottatt med ID: %d fra spiller: %d Sparker spiller!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Ukjent peker %#08x\n" -"Fortsett?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6144,19 +5488,7 @@ msgstr "Wii NAND-rot:" msgid "Wii Save Import" msgstr "Importer Wii-lagringsfil" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii-lagringsfiler (*.bin)|*.bin" @@ -6187,15 +5519,7 @@ msgstr "" "eller kanskje den koblet seg fra pga. inaktivitet.\n" "Vil du koble til igjen øyeblikkelig?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Tilkoblet" @@ -6228,27 +5552,9 @@ msgstr "Windows Høyre" msgid "Word Wrap" msgstr "Ordkrumning" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Arbeider..." diff --git a/Languages/po/nl.po b/Languages/po/nl.po index 017f33c5c1..6462e84f3c 100644 --- a/Languages/po/nl.po +++ b/Languages/po/nl.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-08-07 16:43+0100\n" "Last-Translator: Goost \n" "Language-Team: DevPro Team. \n" @@ -568,27 +556,9 @@ msgstr "Voeg Patch toe" msgid "Add new pane" msgstr "Voeg een nieuwe paneel toe" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Voeg toe..." @@ -656,23 +626,8 @@ msgstr "Alle GC/Wii images (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM bestanden (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Opgeslagen Staten (sav, s##)" @@ -763,19 +718,7 @@ msgstr "" "Weet je zeker dat je dit bestand wilt verwijderen? Deze gegevens zijn niet " "terug te halen!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Beeldverhouding:" @@ -797,19 +740,7 @@ msgstr "Geluid Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -920,19 +851,7 @@ msgid "Blue Right" msgstr "Blauw Rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Onder" @@ -965,15 +884,7 @@ msgstr "Zoek een uitvoer folder" msgid "Buffer:" msgstr "Buffer:" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1216,21 +1127,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Sluit" @@ -1339,15 +1237,7 @@ msgstr "Verbind Wiimote 3" msgid "Connect Wiimote 4" msgstr "Verbind Wiimote 4" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "Verbinden..." @@ -1537,21 +1427,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "DSP Emulator Motor" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulatie (snel)" @@ -1792,19 +1669,7 @@ msgstr "" msgid "Divide" msgstr "Verdelen" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Wil je de emulatie stoppen?" @@ -1833,39 +1698,12 @@ msgstr "Dolphin Geëmuleerde Wiimote configuratie" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GCPad Configuratie" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GCPad Configuratie" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GCPad Configuratie" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Configuratie" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Film (*.dtm)" @@ -1960,27 +1798,9 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Nederlands" @@ -2119,41 +1939,16 @@ msgstr "Activeer BAT" msgid "Enable Block Merging" msgstr "Activeer Block Merging" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Activeer Cache" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Activeer Cheats" @@ -2309,27 +2104,9 @@ msgstr "" msgid "End" msgstr "Einde" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Engels" @@ -2358,45 +2135,10 @@ msgstr "Gelijk" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Error (Fout)" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Error (Fout)" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Error (Fout)" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Error (Fout)" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2869,27 +2611,9 @@ msgstr "Frames om op te nemen" msgid "Free Look" msgstr "Vrije kijk" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Frans" @@ -2957,19 +2681,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube &Pad Instellingen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Kaarten (*.raw,*.gcp)" @@ -2994,21 +2706,8 @@ msgstr "" "(ofwel een onjuiste code of het type code is nog niet ondersteund.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Algemeen" @@ -3017,27 +2716,9 @@ msgstr "Algemeen" msgid "General Settings" msgstr "Algemene Instellingen" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Duits" @@ -3168,21 +2849,8 @@ msgid "Hotkey Configuration" msgstr "Sneltoets Configuratie" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Hotkeys" @@ -3409,19 +3077,7 @@ msgstr "" "InstallExceptionHandler opgeroepen, maar dit platform ondersteund dit nog " "niet." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WAD aan het installeren..." @@ -3504,27 +3160,9 @@ msgstr "Onjuist opname bestand" msgid "Invalid state" msgstr "Onjuiste staat" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italië" @@ -3682,36 +3320,12 @@ msgstr "Laad staat 8" msgid "Load State..." msgstr "Laad staat..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Laad Wii System Menu(%d %c)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Laad Wii System Menu(%d %c)" @@ -3793,15 +3407,7 @@ msgstr "MMU Snelheids Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark bestanden(*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3832,19 +3438,7 @@ msgid "Memory Byte" msgstr "Geheugen Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Geheugen Kaart" @@ -4043,19 +3637,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Omhoog" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4142,15 +3724,7 @@ msgstr "Niet gelijk" msgid "Not Set" msgstr "Niet ingesteld" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "Niet verbonden" @@ -4211,14 +3785,7 @@ msgstr "Er zijn maar %d blocks beschikaarr" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Open" @@ -4350,23 +3917,8 @@ msgstr "Patches" msgid "Paths" msgstr "Pad" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pauze" @@ -4386,23 +3938,8 @@ msgstr "Perspectief %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Speel" @@ -4428,19 +3965,7 @@ msgstr "Terugspeel Opties" msgid "Players" msgstr "Spelers" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Bevestig alsjeblieft..." @@ -4653,31 +4178,10 @@ msgstr "Lijst Verversen" msgid "Refresh game list" msgstr "Ververs de speellijst" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Verwijder" @@ -4697,14 +4201,7 @@ msgid "Render to Main Window" msgstr "Geef weer op hoofdscherm" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Opnieuw" @@ -4747,19 +4244,7 @@ msgstr "S&la Staat Op" msgid "Safe" msgstr "Opslaan" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Sample Rate:" @@ -4844,19 +4329,7 @@ msgstr "Save staat film %s is corrupt, het opnemen van de film is gestopt..." msgid "Scaled EFB Copy" msgstr "EFB Verkleinde Kopie" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Scannen van %s" @@ -4896,39 +4369,12 @@ msgstr "Sectie %s niet gevonden in SYSCONF" msgid "Select" msgstr "Selecteer" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Selecteer de opname Bestand" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Selecteer de opname Bestand" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Selecteer de opname Bestand" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Selecteer de opname Bestand" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Selecteer een Wii WAD bestand om te installeren" @@ -4954,13 +4400,7 @@ msgstr "Selecteer zwevende vensters" msgid "Select the file to load" msgstr "Selecteer het bestand om het te laden" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Selecteer het save - bestand" @@ -4968,29 +4408,7 @@ msgstr "Selecteer het save - bestand" msgid "Select the state to load" msgstr "Selecteer de Staat om te laden" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -msgid "Select the save file" -msgstr "Selecteer het save - bestand" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Selecteer de Staat om te laden" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Selecteer de Staat om op te slaan" @@ -5363,27 +4781,9 @@ msgstr "Het aanmaken van de geluids buffer is mislukt: %s" msgid "Space" msgstr "Ruimte" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spaans" @@ -5427,15 +4827,7 @@ msgstr "" msgid "Standard Controller" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5470,14 +4862,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stop" @@ -5549,14 +4934,7 @@ msgstr "Rechter Tabel" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Neem een Schermafdruk" @@ -5786,31 +5164,12 @@ msgstr "Zet Alle Log Types Aan" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Volledig Scherm Inschakelen" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Boven" @@ -5920,21 +5279,6 @@ msgstr "" "Onbekend bericht ontvagen met id : %d ontvangen van speler: %d Speler " "eruitgeschopt!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Onbekende pointer %#08x\n" -"Doorgaan?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6162,19 +5506,7 @@ msgstr "Wii NAND basismap:" msgid "Wii Save Import" msgstr "Wii Save Importeren" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii save bestanden (*.bin)|*.bin" @@ -6205,15 +5537,7 @@ msgstr "" "of misschien is het te wijten aan een time-out of een andere reden.\n" "Wilt u meteen opnieuw verbinden?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Connected" @@ -6246,27 +5570,9 @@ msgstr "Venster Rechts" msgid "Word Wrap" msgstr "Regelafbreking" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Werken..." diff --git a/Languages/po/pl.po b/Languages/po/pl.po index b4a21374be..ef05f0c54c 100644 --- a/Languages/po/pl.po +++ b/Languages/po/pl.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-08-12 17:04+0100\n" "Last-Translator: Krzysztof Baszczok \n" "Language-Team: Polish \n" @@ -566,27 +554,9 @@ msgstr "Dodaj Å‚atkÄ™" msgid "Add new pane" msgstr "Dodaj nowy panel" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Dodaj..." @@ -654,23 +624,8 @@ msgstr "Wszystkie obrazy GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Pliki GCM" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Stany zapisu (sav, s##)" @@ -758,19 +713,7 @@ msgstr "" 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!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporcje ekranu:" @@ -792,19 +735,7 @@ msgstr "Audio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: BÅ‚Ä…d otwarcia urzÄ…dzenia AO.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -919,19 +850,7 @@ msgid "Blue Right" msgstr "Niebieski prawo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Dół" @@ -964,15 +883,7 @@ msgstr "Szukaj folderu wyjÅ›ciowego" msgid "Buffer:" msgstr "Bufor:" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1171,19 +1082,7 @@ msgstr "Wybierz plik do otwarcia" msgid "Choose a memory card:" msgstr "Wybierz kartÄ™ pamiÄ™ci:" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1225,21 +1124,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Zamknij" @@ -1347,15 +1233,7 @@ msgstr "PoÅ‚Ä…cz Wiilot 3" msgid "Connect Wiimote 4" msgstr "PoÅ‚Ä…cz Wiilot 4" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "ÅÄ…czÄ™..." @@ -1471,19 +1349,7 @@ msgstr "Utwórz nowÄ… perspektywÄ™" msgid "Created by KDE-Look.org" msgstr "Utworzone przez KDE-Look.org" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1558,21 +1424,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulacja (szybkie)" @@ -1811,19 +1664,7 @@ msgstr "" msgid "Divide" msgstr "Podziel" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Zatrzymać aktualnÄ… emulacjÄ™?" @@ -1852,39 +1693,12 @@ msgstr "Konfiguracja emulowanego Wiilota" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Konfiguracja GCPad'a" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Konfiguracja GCPad'a" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Konfiguracja GCPad'a" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Konfiguracja GCPad'a" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmy TAS (*.dtm)" @@ -1896,15 +1710,7 @@ msgstr "Konfiguracja Wiilot'a" msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ->>>>>>> Update from master branch. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1912,15 +1718,7 @@ msgstr "" "Program nie mógÅ‚ znaleść żadnych obrazów GC/Wii ISO. Kliknij tutaj by " "przeglÄ…dać pliki..." -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 ->>>>>>> Update from master branch. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1996,27 +1794,9 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holenderski" @@ -2156,40 +1936,15 @@ msgstr "WÅ‚Ä…cz BAT" msgid "Enable Block Merging" msgstr "WÅ‚Ä…cz Å‚Ä…czenie bloków" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "WÅ‚Ä…cz cache" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "WÅ‚Ä…cz kody" @@ -2288,19 +2043,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2356,27 +2099,9 @@ msgstr "" msgid "End" msgstr "Koniec" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Angielski" @@ -2405,45 +2130,10 @@ msgstr "Równy" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "BÅ‚Ä…d" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "BÅ‚Ä…d" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "BÅ‚Ä…d" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "BÅ‚Ä…d" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "BÅ‚Ä…d wczytywania wybranego jÄ™zyka. Ustawienia domyÅ›lne." @@ -2451,10 +2141,6 @@ msgstr "BÅ‚Ä…d wczytywania wybranego jÄ™zyka. Ustawienia domyÅ›lne." #: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" @@ -2462,8 +2148,6 @@ msgstr "" #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" -======= ->>>>>>> Update translation files for recent changes in the code. "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" @@ -2914,27 +2598,9 @@ msgstr "Ramki do nagrania" msgid "Free Look" msgstr "Free Look" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francuski" @@ -3001,19 +2667,7 @@ msgid "Gamecube &Pad Settings" msgstr "Ustawienia &pada GC" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Karty pamiÄ™ci GC (*.raw,*.gcp)" @@ -3038,21 +2692,8 @@ msgstr "" "(zÅ‚y kod albo typ kodu nie jest jeszcze wspierany)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Główne" @@ -3061,27 +2702,9 @@ msgstr "Główne" msgid "General Settings" msgstr "Ustawienia ogólne" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Niemiecki" @@ -3210,21 +2833,8 @@ msgid "Hotkey Configuration" msgstr "Konfiguracja skrótów klawiszowych" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Skróty klawiszowe" @@ -3304,20 +2914,8 @@ msgstr "" "JeÅ›li FPS jest niezrównoważony, ta opcja może pomóc. (ON = kompatybilny, OFF " "= szybko)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy ->>>>>>> Update the pot file to reflect recent changes in the code. 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 " @@ -3459,19 +3057,7 @@ msgid "" msgstr "" "InstallExceptionHandler wywoÅ‚any, ale ta platforma nie wspiera go jeszcze." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instalacja WAD..." @@ -3553,27 +3139,9 @@ msgstr "NewÅ‚aÅ›ciwy plik nagrania" msgid "Invalid state" msgstr "NiewÅ‚aÅ›ciwy stan" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "WÅ‚oski" @@ -3731,35 +3299,11 @@ msgstr "Wczytaj stan Slot 8" msgid "Load State..." msgstr "Wczytaj stan..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Wczytaj Wii System Menu" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Wczytaj Wii System Menu" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Wczytaj Wii System Menu" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Wczytaj Wii System Menu" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wczytaj Wii System Menu %d %c" @@ -3841,15 +3385,7 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Pliki MadCatz Gameshark(*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Główna gaÅ‚ka" @@ -3880,19 +3416,7 @@ msgid "Memory Byte" msgstr "Bajt pamiÄ™ci" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Karta pamiÄ™ci" @@ -4090,19 +3614,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4189,15 +3701,7 @@ msgstr "Nie równe" msgid "Not Set" msgstr "Nie ustawiono" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "Nie poÅ‚Ä…czono" @@ -4258,14 +3762,7 @@ msgstr "DostÄ™pnych tylko %d bloków" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Otwórz" @@ -4396,23 +3893,8 @@ msgstr "Patche" msgid "Paths" msgstr "Åšcieżki" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4432,23 +3914,8 @@ msgstr "Perspekrtywa %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Play" @@ -4474,19 +3941,7 @@ msgstr "Opcje playback'u" msgid "Players" msgstr "Gracze" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Potwierdź..." @@ -4697,31 +4152,10 @@ msgstr "OdÅ›wież listÄ™" msgid "Refresh game list" msgstr "OdÅ›wież listÄ™ gier" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "UsuÅ„" @@ -4740,14 +4174,7 @@ msgid "Render to Main Window" msgstr "Generuj w oknie głównym" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -4790,19 +4217,7 @@ msgstr "Zapisz &stan" msgid "Safe" msgstr "Bezpieczny" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Wskaźnik próbkowania:" @@ -4886,19 +4301,7 @@ msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..." msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "SknaujÄ™ %s" @@ -4938,39 +4341,12 @@ msgstr "Nie odnaleziono sekcji %s w SYSCONF" msgid "Select" msgstr "Select" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Wybierz plik nagrania" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Wybierz plik nagrania" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Wybierz plik nagrania" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Wybierz plik nagrania" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Wybierz plik Wii WAD do zainstalowania" @@ -4996,13 +4372,7 @@ msgstr "Select floating windows" msgid "Select the file to load" msgstr "Wybierz plik do wczytania" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Wybierz plik do zapisu" @@ -5010,29 +4380,7 @@ msgstr "Wybierz plik do zapisu" msgid "Select the state to load" msgstr "Wybierz stan do wczytania" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -msgid "Select the save file" -msgstr "Wybierz plik do zapisu" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Wybierz stan do wczytania" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Wybierz stan do zapisu" @@ -5105,19 +4453,7 @@ msgstr "Separator" msgid "Serbian" msgstr "Serbski" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 ->>>>>>> Update the pot file to reflect recent changes in the code. 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" @@ -5419,27 +4755,9 @@ msgstr "Utworzenie bufora dźwiÄ™ku nie powiodÅ‚o siÄ™: %s" msgid "Space" msgstr "Space" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "HiszpaÅ„ski" @@ -5483,15 +4801,7 @@ msgstr "Square Stick" msgid "Standard Controller" msgstr "Standard Controller" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5526,14 +4836,7 @@ msgstr "GaÅ‚ka" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stop" @@ -5610,14 +4913,7 @@ msgstr "Talerz prawo" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Zrób zdjÄ™cie" @@ -5846,31 +5142,12 @@ msgstr "PrzeÅ‚Ä…cz wszystkie typy logów" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "PrzeÅ‚Ä…cz na peÅ‚ny ekran" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Góra" @@ -5979,21 +5256,6 @@ msgstr "Nieznana wiadomość o ID: %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Nieznana wiadomość o ID: %d od gracza: %d Gracz wylatuje!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Nieznany wskaźnik %#08x\n" -"Kontynuować?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6220,19 +5482,7 @@ msgstr "ŹródÅ‚o Wii NAND:" msgid "Wii Save Import" msgstr "Import zapisów Wii" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Pliki zapisu Wii (*.bin)|*.bin" @@ -6263,15 +5513,7 @@ msgstr "" "lub zbyt dÅ‚ugi czas nieobecnoÅ›ci lub coÅ› innego.\n" "PoÅ‚Ä…czyć ponownie?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiilot poÅ‚Ä…czony" @@ -6303,27 +5545,9 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Zawijanie wierszy" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "PracujÄ™..." diff --git a/Languages/po/pt.po b/Languages/po/pt.po index 1cee620d50..60d895f98c 100644 --- a/Languages/po/pt.po +++ b/Languages/po/pt.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-07-23 15:53-0000\n" "Last-Translator: Zilaan \n" "Language-Team: Zilaan \n" @@ -568,27 +556,9 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painel" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Adicionar..." @@ -657,23 +627,8 @@ msgstr "Todas as imagens GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Todos os ficheiros Gamecube GCM (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos os Estados Guardados (sav, s##)" @@ -763,19 +718,7 @@ msgstr "" "Tem a certeza que quer eliminar este ficheiro? Será eliminado " "permanentemente!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção de ecrã:" @@ -797,19 +740,7 @@ msgstr "Ãudio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -925,19 +856,7 @@ msgid "Blue Right" msgstr "Azul Direita" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Inferior" @@ -970,15 +889,7 @@ msgstr "Procurar por pasta de destino" msgid "Buffer:" msgstr "Buffer:" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1224,21 +1135,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Fechar" @@ -1346,15 +1244,7 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "A conectar..." @@ -1544,21 +1434,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Motor de Emulador DSP" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulação de DSP HLE (rápido)" @@ -1797,19 +1674,7 @@ msgstr "" msgid "Divide" msgstr "Dividir" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Deseja parar a emulação actual?" @@ -1838,39 +1703,12 @@ msgstr "Configuração da emulação de Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Configuração de GCPad " - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Configuração de GCPad " - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Configuração de GCPad " - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Configuração de GCPad " #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS filmes (*.dtm)" @@ -1967,27 +1805,9 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holandês" @@ -2127,40 +1947,15 @@ msgstr "Activar BAT" msgid "Enable Block Merging" msgstr "Activar Fusão de blocos" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Activar Cache" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Activar Cheats" @@ -2316,27 +2111,9 @@ msgstr "" msgid "End" msgstr "Fim" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Inglês" @@ -2365,45 +2142,10 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Erro" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Erro" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Erro" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Erro" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2874,27 +2616,9 @@ msgstr "Quadros para Gravar" msgid "Free Look" msgstr "Vista Livre" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francês" @@ -2961,19 +2685,7 @@ msgid "Gamecube &Pad Settings" msgstr "Definições de Comando &Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Cartões de memória Gamecube (*.raw,*.gcp)" @@ -2998,21 +2710,8 @@ msgstr "" "(Ou é um código com erros ou o tipo de código não é suportado.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -3021,27 +2720,9 @@ msgstr "Geral" msgid "General Settings" msgstr "Definições Gerais" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Alemão" @@ -3171,21 +2852,8 @@ msgid "Hotkey Configuration" msgstr "Configuração de Teclas de atalho" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Teclas de Atalho" @@ -3411,19 +3079,7 @@ msgid "" msgstr "" "InstallExceptionHandler chamado, mas esta plataforma ainda não a suporta." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "A Instalar WAD..." @@ -3505,27 +3161,9 @@ msgstr "Ficheiro de Gravação inválido" msgid "Invalid state" msgstr "Estado Inválido" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiano" @@ -3683,35 +3321,11 @@ msgstr "Carregar Estado Slot 8" msgid "Load State..." msgstr "Carregar Estado..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Carregar Sistema de Menu Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Carregar Sistema de Menu Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Carregar Sistema de Menu Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Carregar Sistema de Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Sistema de Menu Wii %d%c" @@ -3793,15 +3407,7 @@ msgstr "MMU Hack de velocidade" msgid "MadCatz Gameshark files(*.gcs)" msgstr "ficheiros MadCatz Gameshark(*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick Principal" @@ -3832,19 +3438,7 @@ msgid "Memory Byte" msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Cartão de memória" @@ -4043,19 +3637,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4142,15 +3724,7 @@ msgstr "Não igual" msgid "Not Set" msgstr "Não definido" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "Não conectado" @@ -4211,14 +3785,7 @@ msgstr "Apenas %d blocos disponíveis" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Abrir" @@ -4349,23 +3916,8 @@ msgstr "Patches" msgid "Paths" msgstr "Caminhos" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4385,23 +3937,8 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Começar" @@ -4427,19 +3964,7 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Por favor confirme..." @@ -4652,31 +4177,10 @@ msgstr "Actualizar Lista" msgid "Refresh game list" msgstr "Actualizar lista de Jogos" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Remover" @@ -4695,14 +4199,7 @@ msgid "Render to Main Window" msgstr "Renderizar para a Janela Principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -4745,19 +4242,7 @@ msgstr "Gua&rdar Estado" msgid "Safe" msgstr "Seguro" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Taxa de Amostragem:" @@ -4841,19 +4326,7 @@ msgstr "O filme de Savestate %s está corrupto, gravação de filme a parar..." msgid "Scaled EFB Copy" msgstr "Cópia EFB Escalada" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "A procurar %s" @@ -4893,39 +4366,12 @@ msgstr "Selecção %s não encontrada em SYSCONF" msgid "Select" msgstr "Seleccionar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Seleccione o Ficheiro de Gravação" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Seleccione o Ficheiro de Gravação" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Seleccione o Ficheiro de Gravação" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Seleccione o Ficheiro de Gravação" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleccione um ficheiro Wii WAD para instalar" @@ -4951,26 +4397,7 @@ msgstr "Seleccionar janelas flutuantes" msgid "Select the file to load" msgstr "Seleccione o ficheiro para carregar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "Seleccione o ficheiro de jogo guardado" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Seleccione o estado para carregar" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Seleccione o ficheiro de jogo guardado" @@ -4978,16 +4405,7 @@ msgstr "Seleccione o ficheiro de jogo guardado" msgid "Select the state to load" msgstr "Seleccione o estado para carregar" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Seleccione o estado para gravar" @@ -5368,27 +4786,9 @@ msgstr "Criação do buffer de som falhou: %s" msgid "Space" msgstr "Espaço" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Espanhol" @@ -5432,15 +4832,7 @@ msgstr "Stick quadrado" msgid "Standard Controller" msgstr "Comando padrão" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5475,14 +4867,7 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Parar" @@ -5559,14 +4944,7 @@ msgstr "Table Direita" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Tirar Screenshot" @@ -5802,31 +5180,12 @@ msgstr "Alternar Todos os Tipos de Relatório" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Alternar Ecrã Inteiro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Topo" @@ -5935,21 +5294,6 @@ msgstr "" "Mensagem desconhecida com a id:%d recebida pelo jogador:%d Excluindo o " "jogador!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Apontador desconhecido %#08x\n" -"Continuar?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6179,19 +5523,7 @@ msgstr "Raiz de NAND Wii:" msgid "Wii Save Import" msgstr "Importação de Jogo Guardado Wii" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin" @@ -6223,15 +5555,7 @@ msgstr "" "razão.\n" "Quer reconectar imediatamente?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Conectado" @@ -6264,27 +5588,9 @@ msgstr "Janelas Direita" msgid "Word Wrap" msgstr "Moldar o texto" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "A trabalhar..." @@ -6905,10 +6211,6 @@ msgstr "| OU" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Começar a janela renderizada em ecrã inteiro" -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -6931,11 +6233,6 @@ msgstr "| OU" #~ "Apontador desconhecido %#08x\n" #~ "Continuar?" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #~ msgid "Use FPS For Limiting" #~ msgstr "Usar FPS como limitador" diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index d12775657f..45cab5d3a0 100644 --- a/Languages/po/pt_BR.po +++ b/Languages/po/pt_BR.po @@ -7,22 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-18 13:38-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -"PO-Revision-Date: 2011-09-11 23:35-0300\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -"PO-Revision-Date: 2011-12-18 13:38-0600\n" ->>>>>>> Update from master branch. "Last-Translator: Runo \n" "Language-Team: Portuguese (BR) \n" "Language: \n" @@ -572,27 +558,9 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painél" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Adicionar..." @@ -660,23 +628,8 @@ msgstr "Todas as imagens CG/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Todos os arquivos Gamecube CGM (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos os Pontos de Jogo Salvos (sav, s##)" @@ -766,19 +719,7 @@ msgstr "" "Você tem certeza que quer deletar este arquivo? Ele ficará perdido para " "sempre!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção:" @@ -800,19 +741,7 @@ msgstr "Backend de Audio" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -928,19 +857,7 @@ msgid "Blue Right" msgstr "Azul Direito" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Embaixo" @@ -973,15 +890,7 @@ msgstr "Procurar por um diretório de saída" msgid "Buffer:" msgstr "Buffer:" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1184,19 +1093,7 @@ msgstr "Escolher um arquivo para abrir" msgid "Choose a memory card:" msgstr "Escolher um cartão de memória:" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1238,21 +1135,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Fechar" @@ -1360,15 +1244,7 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "Conectando..." @@ -1485,19 +1361,7 @@ msgstr "Criar nova perspectiva" msgid "Created by KDE-Look.org" msgstr "Criado por KDE-Look.org" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1570,21 +1434,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Engine de Emulação do DSP" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulação HLE do DSP (rápido)" @@ -1823,19 +1674,7 @@ msgstr "" msgid "Divide" msgstr "Dividir" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Você quer parar a emulação atual?" @@ -1864,39 +1703,12 @@ msgstr "Configuração de Wiimote Emulado do Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Configuração do GCPad do Dolphin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Configuração do GCPad do Dolphin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Configuração do GCPad do Dolphin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Configuração do GCPad do Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmes TAS Dolphin (*.dtm)" @@ -1908,15 +1720,7 @@ msgstr "Configuração de Wiimote Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin no &Google Code" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ->>>>>>> Update from master branch. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1924,15 +1728,7 @@ msgstr "" "Dolphin não pôde encontrar ISOs GC/Wii. Duplo-clique aqui para procurar por " "arquivos..." -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 ->>>>>>> Update from master branch. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -2008,27 +1804,9 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holandês" @@ -2168,40 +1946,15 @@ msgstr "Ativar BAT" msgid "Enable Block Merging" msgstr "Ativar Block Merging" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Ativar Cache" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Ativar Cheats" @@ -2301,19 +2054,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2369,27 +2110,9 @@ msgstr "" msgid "End" msgstr "Fim" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Inglês" @@ -2418,80 +2141,24 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Erro" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Erro" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Erro" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Erro" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema." -<<<<<<< HEAD -#: Source/Core/Common/Src/ChunkFile.h:180 -<<<<<<< HEAD -======= -======= #: Source/Core/Common/Src/ChunkFile.h:194 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -<<<<<<< HEAD -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 ->>>>>>> Update from master branch. -======= #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" -<<<<<<< HEAD -"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " -"Aborting savestate load..." -msgstr "" - -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 -#, c-format -msgid "" -======= ->>>>>>> Update translation files for recent changes in the code. "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" @@ -2944,27 +2611,9 @@ msgstr "QUadros para Capturar" msgid "Free Look" msgstr "Olhar Livre" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francês" @@ -3031,19 +2680,7 @@ msgid "Gamecube &Pad Settings" msgstr "Configurações de &Controle de Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Memory Cards do Gamecube (*.raw,*.gcp)" @@ -3068,21 +2705,8 @@ msgstr "" "(É um código ruim ou um tipo de código não suportado.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -3091,27 +2715,9 @@ msgstr "Geral" msgid "General Settings" msgstr "Configurações Gerais" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Alemão" @@ -3242,21 +2848,8 @@ msgid "Hotkey Configuration" msgstr "Configuração de hotkey" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Hotkeys" @@ -3336,20 +2929,8 @@ msgstr "" "Se a taxa de FPS estiver instável, esta opção pode ajudar. (ON = Compatível, " "OFF = Rápido)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy ->>>>>>> Update the pot file to reflect recent changes in the code. 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 " @@ -3494,19 +3075,7 @@ msgstr "" "InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem " "suporte a ele." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instalando WAD..." @@ -3588,27 +3157,9 @@ msgstr "Arquivo de gravação inválido" msgid "Invalid state" msgstr "Estado Salvo Inválido" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiano" @@ -3766,35 +3317,11 @@ msgstr "Carregar Estado do Slot 8" msgid "Load State..." msgstr "Carregar State..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Carregar Menu de Sistema do Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Carregar Menu de Sistema do Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Carregar Menu de Sistema do Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Carregar Menu de Sistema do Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Menu de Sistema do Wii %d %c" @@ -3877,15 +3404,7 @@ msgstr "Hack de velocidade MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Arquivos de Gameshark MadCatz(*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Analógico Principal" @@ -3916,19 +3435,7 @@ msgid "Memory Byte" msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Cartão de memoria" @@ -4127,19 +3634,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4226,15 +3721,7 @@ msgstr "Não igual" msgid "Not Set" msgstr "Indefinido" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "Não conectado" @@ -4295,14 +3782,7 @@ msgstr "Apenas %d blocos disponíveis" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Abrir" @@ -4433,23 +3913,8 @@ msgstr "Patches" msgid "Paths" msgstr "Diretórios" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausar" @@ -4469,23 +3934,8 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Executar" @@ -4511,19 +3961,7 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Favor confirmar..." @@ -4734,31 +4172,10 @@ msgstr "Atualizar Lista" msgid "Refresh game list" msgstr "Atualizar a lista de jogos" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Remover" @@ -4777,14 +4194,7 @@ msgid "Render to Main Window" msgstr "Renderizar na Janela Principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -4827,19 +4237,7 @@ msgstr "Sal&var estado atual" msgid "Safe" msgstr "Seguro" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Taxa de Amostragem:" @@ -4923,19 +4321,7 @@ msgstr "O Estado Salvo capturado %s está corrompido, parando captura..." msgid "Scaled EFB Copy" msgstr "Cópia Escalada do EFB" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Escaneando %s" @@ -4975,39 +4361,12 @@ msgstr "A seção %s não foi encontrada no SYSCONF" msgid "Select" msgstr "Selecionar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Selecione o arquivo de Gravação" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Selecione o arquivo de Gravação" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Selecione o arquivo de Gravação" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Selecione o arquivo de Gravação" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Selecione um arquivo WAD de Wii para instalar" @@ -5032,26 +4391,7 @@ msgstr "Selecionar Janelas flutuantes" msgid "Select the file to load" msgstr "Selecione um arquivo para carregar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "Selecione o arquivo de salva" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Selecione um estado para carregar" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Selecione o arquivo de salva" @@ -5059,16 +4399,7 @@ msgstr "Selecione o arquivo de salva" msgid "Select the state to load" msgstr "Selecione um estado para carregar" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Selecione um estado para salvar" @@ -5142,19 +4473,7 @@ msgstr "Separador" msgid "Serbian" msgstr "Sérvio" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -5461,27 +4780,9 @@ msgstr "Falha na criação do buffer de som: %s" msgid "Space" msgstr "Barra de Espaço" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Espanhol" @@ -5525,15 +4826,7 @@ msgstr "Analógico Quadrado" msgid "Standard Controller" msgstr "Controle Padrão" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5568,14 +4861,7 @@ msgstr "Analógico" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Parar" @@ -5652,14 +4938,7 @@ msgstr "Direita da Mesa" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Capturar Tela" @@ -5893,31 +5172,12 @@ msgstr "Ligar/Desligar Todos os Logs" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Ir para Tela Cheia" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Topo" @@ -6025,23 +5285,9 @@ msgstr "Menssagem desconhecida recebida com identificação: %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" -<<<<<<< HEAD -======= msgstr "" "Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!" -<<<<<<< HEAD -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" ->>>>>>> Update translation files for recent changes in the code. -msgstr "" -"Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!" - -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6271,19 +5517,7 @@ msgstr "Raiz do Wii NAND" msgid "Wii Save Import" msgstr "Importar Save de Wii" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Arquivos de Salva do Wii (*.bin)|*.bin" @@ -6314,15 +5548,7 @@ msgstr "" "ou talvez tenha sido pelo tempo parado ou por outra razão.\n" "Você quer reconectar imediatamente?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote Conectado" @@ -6354,27 +5580,9 @@ msgstr "Janelas da Direita" msgid "Word Wrap" msgstr "Word Wrap" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Funcionando..." diff --git a/Languages/po/ru.po b/Languages/po/ru.po index c882cf9f5b..6fd46df066 100644 --- a/Languages/po/ru.po +++ b/Languages/po/ru.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-01-20 14:40+0300\n" "Last-Translator: firnis \n" "Language-Team: Russian <>\n" @@ -551,27 +539,9 @@ msgstr "Добавление патча" msgid "Add new pane" msgstr "Добавить панель" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Добавить..." @@ -626,23 +596,8 @@ msgstr "Ð’Ñе образа от GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Ð’Ñе GCM-файлы Gamecube (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Файлы быÑтрых Ñохранений (sav, s##)" @@ -723,19 +678,7 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Ð’Ñ‹ уверены, что хотите удалить Ñтот файл? Он иÑчезнет навÑегда!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Соотношение Ñторон:" @@ -758,19 +701,7 @@ msgstr "СиÑтема вывода" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ ÑƒÑтройÑтва вывода звука.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Ðвто" @@ -885,19 +816,7 @@ msgid "Blue Right" msgstr "СинÑÑ Ñправа" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Ñнизу" @@ -930,15 +849,7 @@ msgstr "Укажите папку Ð´Ð»Ñ ÑохранениÑ" msgid "Buffer:" msgstr "Буфер:" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1170,21 +1081,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Закрыть" @@ -1293,15 +1191,7 @@ msgstr "Подключить Wiimote 3" msgid "Connect Wiimote 4" msgstr "Подключить Wiimote 4" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "Подключение..." @@ -1486,21 +1376,8 @@ msgstr "Ðудио" msgid "DSP Emulator Engine" msgstr "Режим ÑмулÑции CPU" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1724,19 +1601,7 @@ msgstr "" msgid "Divide" msgstr "/" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Ð’Ñ‹ хотите оÑтановить ÑмулÑцию?" @@ -1766,39 +1631,12 @@ msgstr "ÐаÑтройки Ñмулируемого Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "ÐаÑтройки Dolphin GCPad" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "ÐаÑтройки Dolphin GCPad" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "ÐаÑтройки Dolphin GCPad" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "ÐаÑтройки Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1886,27 +1724,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Dutch" msgstr "Dutch" @@ -2030,41 +1850,16 @@ msgstr "Включить BAT" msgid "Enable Block Merging" msgstr "Включить Ñовмещение блоков" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "кÑшировать" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Включить чит-коды" @@ -2205,27 +2000,9 @@ msgstr "" msgid "End" msgstr "End" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "English" msgstr "English" @@ -2255,45 +2032,10 @@ msgstr "Равно" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Ошибки" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Ошибки" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Ошибки" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Ошибки" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Ошибка загрузки выбранного Ñзыка. ВозвращаемÑÑ Ðº Ñтандартному." @@ -2738,27 +2480,9 @@ msgstr "" msgid "Free Look" msgstr "Свободный обзор" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "French" msgstr "French" @@ -2828,19 +2552,7 @@ msgid "Gamecube &Pad Settings" msgstr "Опции &контроллера Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Файлы карт памÑти Gamecube (*.raw,*.gcp)" @@ -2863,21 +2575,8 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Общие" @@ -2887,27 +2586,9 @@ msgstr "Общие" msgid "General Settings" msgstr "ÐаÑтройки интерфейÑа" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "German" msgstr "German" @@ -3035,21 +2716,8 @@ msgid "Hotkey Configuration" msgstr "ÐаÑтройка \"горÑчих\" клавиш" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Клавиши" @@ -3267,19 +2935,7 @@ msgid "" msgstr "" "Вызван InstallExceptionHandler, но ваша платформа его еще не поддерживает." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "УÑтанавливаетÑÑ WAD в меню Wii..." @@ -3364,27 +3020,9 @@ msgstr "Ðеверный файл запиÑи" msgid "Invalid state" msgstr "Ðеверное Ñохранение" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Italian" msgstr "Italian" @@ -3550,36 +3188,12 @@ msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" msgid "Load State..." msgstr "Загрузить игру..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Загрузить Wii System Menu (%d %c)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Загрузить Wii System Menu (%d %c)" @@ -3663,15 +3277,7 @@ msgstr "УÑкорить MMU (Ñпидхак)" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Файлы Gameshark MadCatz (*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3703,19 +3309,7 @@ msgid "Memory Byte" msgstr "Па&мÑÑ‚ÑŒ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Карта памÑти" @@ -3893,19 +3487,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Вверх" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3994,15 +3576,7 @@ msgstr "Ðе равно" msgid "Not Set" msgstr "ÐеизвеÑтно" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "Ðе подключено" @@ -4063,14 +3637,7 @@ msgstr "ДоÑтупно только %d блоков" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Открыть" @@ -4196,23 +3763,8 @@ msgstr "Патчи" msgid "Paths" msgstr "Папки" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Пауза" @@ -4233,23 +3785,8 @@ msgstr "Точка %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "ЗапуÑк" @@ -4277,19 +3814,7 @@ msgstr "Опции" msgid "Players" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -4514,31 +4039,10 @@ msgstr "&Обновить ÑпиÑок игр" msgid "Refresh game list" msgstr "Обновление ÑпиÑка игр" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Удалить" @@ -4557,14 +4061,7 @@ msgid "Render to Main Window" msgstr "Выводить изображение в главное окно" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð½Ð°Ñтроек" @@ -4607,19 +4104,7 @@ msgstr "БыÑтрое &Ñохранение" msgid "Safe" msgstr "безопаÑное" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Sample Rate:" msgstr "ЧаÑтота" @@ -4712,19 +4197,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "ПоиÑк..." @@ -4764,39 +4237,12 @@ msgstr "Ð¡ÐµÐºÑ†Ð¸Ñ %s не найдена в SYSCONF" msgid "Select" msgstr "Выбрать" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи игрового процеÑÑа" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи игрового процеÑÑа" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи игрового процеÑÑа" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи игрового процеÑÑа" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð°" @@ -4823,13 +4269,7 @@ msgstr "" msgid "Select the file to load" msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Выберите файл Ñохранений Wii" @@ -4837,29 +4277,7 @@ msgstr "Выберите файл Ñохранений Wii" msgid "Select the state to load" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -msgid "Select the save file" -msgstr "Выберите файл Ñохранений Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Выберите или укажите файл Ð´Ð»Ñ Ð±Ñ‹Ñтрого ÑохранениÑ" @@ -5220,27 +4638,9 @@ msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð°ÑƒÐ´Ð¸Ð¾-буфера %s." msgid "Space" msgstr "Пробел" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Spanish" msgstr "Spanish" @@ -5278,15 +4678,7 @@ msgstr "" msgid "Standard Controller" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5323,14 +4715,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Стоп" @@ -5402,14 +4787,7 @@ msgstr "ÐŸÑ€Ð°Ð²Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "Сделать Ñкриншот" @@ -5639,31 +5017,12 @@ msgstr "Включить вÑе" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "Включение полноÑкранного режима" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Ñверху" @@ -5767,21 +5126,6 @@ msgstr "Получено неизвеÑтное Ñообщение Ñ id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Получено неизвеÑтное Ñообщение Ñ id : %d от игрока:%d Игрок выкинут!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"ÐеизвеÑтный указатель %#08x\n" -"Продолжить?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5996,19 +5340,7 @@ msgstr "DVD-диÑк:" msgid "Wii Save Import" msgstr "Импорт Ñохранений Wii" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Файлы Ñохранений Wii (*.bin)|*.bin" @@ -6035,15 +5367,7 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote подключен" @@ -6079,27 +5403,9 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ñтрок" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Подождите..." diff --git a/Languages/po/sr.po b/Languages/po/sr.po index 62ec55ce59..6f8def3659 100644 --- a/Languages/po/sr.po +++ b/Languages/po/sr.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-03-02 21:58+0100\n" "Last-Translator: nikolassj\n" "Language-Team: \n" @@ -520,27 +508,9 @@ msgstr "Dodaj Patch " msgid "Add new pane" msgstr "Dodaj nova okna" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Dodaj..." @@ -594,23 +564,8 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" @@ -690,19 +645,7 @@ msgstr "" 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!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -724,19 +667,7 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -847,19 +778,7 @@ msgid "Blue Right" msgstr "Blue right " #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Donji deo/dno" @@ -892,15 +811,7 @@ msgstr "" msgid "Buffer:" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1125,21 +1036,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Zatvori" @@ -1247,15 +1145,7 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "Povezivanje..." @@ -1429,21 +1319,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1663,19 +1540,7 @@ msgstr "" msgid "Divide" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1705,39 +1570,12 @@ msgstr "" msgid "Dolphin FIFO" msgstr "Dolphin" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1820,27 +1658,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "" @@ -1959,40 +1779,15 @@ msgstr "" msgid "Enable Block Merging" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "" @@ -2118,27 +1913,9 @@ msgstr "" msgid "End" msgstr "Kraj" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "" @@ -2167,45 +1944,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Error" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Error" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Error" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Error" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2632,27 +2374,9 @@ msgstr "" msgid "Free Look" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "" @@ -2720,19 +2444,7 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2755,21 +2467,8 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2779,27 +2478,9 @@ msgstr "" msgid "General Settings" msgstr "Opcije Uredjaja " -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Nemacki " @@ -2916,21 +2597,8 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "" @@ -3127,19 +2795,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "" @@ -3217,27 +2873,9 @@ msgstr "" msgid "Invalid state" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italianski " @@ -3389,36 +3027,12 @@ msgstr "Ucitaj State Slot 8" msgid "Load State..." msgstr "Ucitaj State" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Ucitaj Wii Sistem Meni (%d %c)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Ucitaj Wii Sistem Meni (%d %c)" @@ -3495,15 +3109,7 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3535,19 +3141,7 @@ msgid "Memory Byte" msgstr "&Memorija" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "" @@ -3724,19 +3318,7 @@ msgstr "" msgid "NP Up" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3823,15 +3405,7 @@ msgstr "" msgid "Not Set" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "" @@ -3892,14 +3466,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "Otvori " @@ -4025,23 +3592,8 @@ msgstr "" msgid "Paths" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pauza " @@ -4062,23 +3614,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Pokreni " @@ -4105,19 +3642,7 @@ msgstr "Opcije " msgid "Players" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -4325,31 +3850,10 @@ msgstr "" msgid "Refresh game list" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "" @@ -4365,14 +3869,7 @@ msgid "Render to Main Window" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset/Restart " @@ -4415,19 +3912,7 @@ msgstr "" msgid "Safe" msgstr "Siguran " -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -4511,19 +3996,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Skeniranje..." @@ -4563,39 +4036,12 @@ msgstr "" msgid "Select" msgstr "Izaberi " -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Izaberi Snimani fajl" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Izaberi Snimani fajl" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Izaberi Snimani fajl" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Izaberi Snimani fajl" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje " @@ -4622,13 +4068,7 @@ msgstr "" msgid "Select the file to load" msgstr "Izaberi fajl za ucitavanje " -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Izaberi \"snimani fajl/the save state\"" @@ -4636,29 +4076,7 @@ msgstr "Izaberi \"snimani fajl/the save state\"" msgid "Select the state to load" msgstr "Izaberi state za ucitavanje " -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -msgid "Select the save file" -msgstr "Izaberi \"snimani fajl/the save state\"" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Izaberi state za ucitavanje " - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Izaberi state za snimanje/save" @@ -4994,27 +4412,9 @@ msgstr "" msgid "Space" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "" @@ -5050,15 +4450,7 @@ msgstr "" msgid "Standard Controller" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5093,14 +4485,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr " Zaustavi" @@ -5172,14 +4557,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "" @@ -5384,31 +4762,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "" @@ -5510,19 +4869,6 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5733,19 +5079,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5772,15 +5106,7 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "" @@ -5813,27 +5139,9 @@ msgstr "" msgid "Word Wrap" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Radi..." diff --git a/Languages/po/tr.po b/Languages/po/tr.po index 890dd90043..4860e77e7c 100644 --- a/Languages/po/tr.po +++ b/Languages/po/tr.po @@ -7,24 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -"PO-Revision-Date: 2011-08-19 08:38-0500\n" -======= -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Clean up Turkish translation file. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-20 19:22+0200\n" ->>>>>>> Update Hungarian and Turkish translations. "Last-Translator: nlgzrgn \n" "Language-Team: nlgzrgn \n" "Language: Turkish\n" @@ -569,27 +553,9 @@ msgstr "Yama Ekle" msgid "Add new pane" msgstr "Bölme ekle" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Ekle..." @@ -659,23 +625,8 @@ msgstr "Tüm GC/Wii kalıpları (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tüm GameCube GCM Dosyaları (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tüm Kayıtlı Oyunlar (sav,s##)" @@ -764,19 +715,7 @@ msgstr "" "Bu dosyayı gerçekten silmek istiyor musunuz? Silindikten sonra bu dosyaları " "geri döndüremezsiniz!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "En-boy Oranı:" @@ -798,19 +737,7 @@ msgstr "Ses Çözücüsü:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO sürücüyü açarken hata.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Otomatik" @@ -925,19 +852,7 @@ msgid "Blue Right" msgstr "Mavi SaÄŸ" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Alt" @@ -970,15 +885,7 @@ msgstr "Çıkış klasörü için gözat" msgid "Buffer:" msgstr "Tampon:" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1222,21 +1129,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Clean up Turkish translation file. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Kapat" @@ -1344,15 +1238,7 @@ msgstr "Wiimote 3'ü BaÄŸla" msgid "Connect Wiimote 4" msgstr "Wiimote 4'ü BaÄŸla" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Clean up Turkish translation file. msgid "Connecting..." msgstr "BaÄŸlanıyor..." @@ -1544,21 +1430,8 @@ msgstr "Ses" msgid "DSP Emulator Engine" msgstr "Ses Emülatörü Motoru" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emülasyonu (Hızlı)" @@ -1796,19 +1669,7 @@ msgstr "" msgid "Divide" msgstr "Böl" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Emülasyonu durdurmak istiyor musunuz?" @@ -1837,39 +1698,12 @@ msgstr "Dolphin Taklit Wiimote Yapılandırması" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC Kolu Yapılandırması" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC Kolu Yapılandırması" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC Kolu Yapılandırması" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC Kolu Yapılandırması" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filmleri (*.dtm)" @@ -1966,27 +1800,9 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Flemenkçe" @@ -2125,41 +1941,15 @@ msgstr "BAT'a Ä°zin Ver" msgid "Enable Block Merging" msgstr "Blok BirleÅŸimine Ä°zin Ver" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -msgid "Enable Bounding Box Calculation" -msgstr "" - -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "Sınırlayıcı Kutu Hesaplama'yı EtkinleÅŸtir" ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Ön BelleÄŸe Ä°zin Ver" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Hilelere Ä°zin Ver" @@ -2316,27 +2106,9 @@ msgstr "" msgid "End" msgstr "Son" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Ä°ngilizce" @@ -2365,47 +2137,10 @@ msgstr "EÅŸit" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Hata" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Hata" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Hata" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" -"PlayWiimote'da hata. %u != %u, byte %d.\n" -"Ãœzgünüz, Wii kaydında geçici hasar var." - ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Hata" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 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." @@ -2416,11 +2151,8 @@ msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -<<<<<<< HEAD -======= "Hata: \"%s\" 'dan sonra, %d (0x%X) bulundu ( %d (0x%X) yerine). Durum kaydı " "yüklemesinden vazgeçiliyor..." ->>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format @@ -2875,27 +2607,9 @@ msgstr "Çekilecek Çerçeveler" msgid "Free Look" msgstr "Serbest Bakış" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Fransızca" @@ -2921,14 +2635,8 @@ msgid "GCI File(*.gci)" msgstr "GCI Dosyası (*.gci)" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 -<<<<<<< HEAD -#, fuzzy -msgid "GCMic Configuration" -msgstr "GeçmiÅŸ Yapılandırması" -======= msgid "GCMic Configuration" msgstr "GCMic Yapılandırması" ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" @@ -2967,19 +2675,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube Kolu Ayarları (&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube Hafıza Kartları (*.raw,*.gcp)" @@ -3004,21 +2700,8 @@ msgstr "" "(kötü bir kod veya türü henüz desteklenmiyor.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Genel" @@ -3027,27 +2710,9 @@ msgstr "Genel" msgid "General Settings" msgstr "Genel Ayarlar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Almanca" @@ -3176,21 +2841,8 @@ msgid "Hotkey Configuration" msgstr "Kısayol TuÅŸu Yapılandırması" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "TuÅŸlar" @@ -3261,11 +2913,8 @@ msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -<<<<<<< HEAD -======= "EÄŸer iÅŸaretlenmiÅŸse, sınırlayıcı kutu kayıtları güncellenecektir. Paper " "Mario oyunları tarafından kullanılır." ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" @@ -3420,19 +3069,7 @@ msgstr "" "Kurulum Özel Durum Ä°ÅŸleyici çaÄŸrıldı, ama bu platform henüz bunu " "desteklemiyor." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WAD kuruluyor..." @@ -3514,27 +3151,9 @@ msgstr "Hatalı çekim dosyası" msgid "Invalid state" msgstr "Hatalı durum" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Ä°talyanca" @@ -3692,35 +3311,11 @@ msgstr "Durumu Yükle : 8" msgid "Load State..." msgstr "Durumu Yükle..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Wii Sistem Menüsünü Yükle" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Wii Sistem Menüsünü Yükle" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Wii Sistem Menüsünü Yükle" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Wii Sistem Menüsünü Yükle" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii Sistem Menüsünü Yükle %d%c" @@ -3802,15 +3397,7 @@ msgstr "MMU Hız Hilesi" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark dosyaları(*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Ana Çubuk" @@ -3841,19 +3428,7 @@ msgid "Memory Byte" msgstr "Hafıza Baytı" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Hafıza Kartı" @@ -4051,19 +3626,7 @@ msgstr "NP Sekme" msgid "NP Up" msgstr "NP Yukarı" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4150,15 +3713,7 @@ msgstr "EÅŸit DeÄŸil" msgid "Not Set" msgstr "Ayarlanmamış" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Clean up Turkish translation file. msgid "Not connected" msgstr "BaÄŸlı deÄŸil" @@ -4219,14 +3774,7 @@ msgstr "Sadece %d blok kullanılabilir" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Clean up Turkish translation file. msgid "Open" msgstr "Aç" @@ -4357,23 +3905,8 @@ msgstr "Yamalar" msgid "Paths" msgstr "Yollar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Duraklat" @@ -4393,23 +3926,8 @@ msgstr "Perspektif %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Oynat" @@ -4435,19 +3953,7 @@ msgstr "Oynatma Seçenekleri" msgid "Players" msgstr "Oyuncular" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Lütfen onaylayın..." @@ -4499,29 +4005,17 @@ msgstr "Geç Ä°ÅŸleme Etkisi:" #: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" -<<<<<<< HEAD -msgstr "" -======= msgstr "PlayController'da erken kayıt bitiÅŸi. %u + 8 > %u" ->>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" -<<<<<<< HEAD -msgstr "" -======= msgstr "PlayWiimote'da erken kayıt bitiÅŸi. %u + %d > %u" ->>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" -<<<<<<< HEAD -msgstr "" -======= msgstr "PlayWiimote'da erken kayıt bitiÅŸi. %u > %u" ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " @@ -4670,31 +4164,10 @@ msgstr "Listeyi Yenile" msgid "Refresh game list" msgstr "Oyun Listesini Yenile" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Kaldır" @@ -4713,14 +4186,7 @@ msgid "Render to Main Window" msgstr "Ana pencerede yorumla" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Sıfırla" @@ -4763,19 +4229,7 @@ msgstr "Durumu Kaydet (&V)" msgid "Safe" msgstr "Güvenli" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Örnek Oran:" @@ -4859,19 +4313,7 @@ msgstr "Kayıtlı durum filmi %s bozuk, film çekimi duruyor..." msgid "Scaled EFB Copy" msgstr "Boyutlandırılmış EFB Kopyası" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Taranıyor %s" @@ -4911,39 +4353,12 @@ msgstr "SYSCONF içinde %s bölümü bulunamadı" msgid "Select" msgstr "Seç" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Çekim Dosyasını Seç" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Çekim Dosyasını Seç" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Çekim Dosyasını Seç" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Çekim Dosyasını Seç" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Kurmak için bir Wii WAD dosyası seçin" @@ -4969,26 +4384,7 @@ msgstr "Sabit olmayan pencereyi seçin" msgid "Select the file to load" msgstr "Yüklemek için dosyayı seçin" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "Kayıt dosyasını seçin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Yüklemek için durum seçin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Kayıt dosyasını seçin" @@ -4996,16 +4392,7 @@ msgstr "Kayıt dosyasını seçin" msgid "Select the state to load" msgstr "Yüklemek için durum seçin" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Kaydetmek için durum seçin" @@ -5381,27 +4768,9 @@ msgstr "Ses tamponu oluÅŸturulamadı: %s" msgid "Space" msgstr "BoÅŸluk" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Ä°spanyolca" @@ -5445,15 +4814,7 @@ msgstr "Kare Çubuk" msgid "Standard Controller" msgstr "Varsayılan Denetim Aygıtı" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5488,14 +4849,7 @@ msgstr "Çubuk" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Durdur" @@ -5572,24 +4926,13 @@ msgstr "Tablo SaÄŸ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Clean up Turkish translation file. msgid "Take Screenshot" msgstr "Ekran Görüntüsü Al" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" -<<<<<<< HEAD -msgstr "" -======= msgstr "TaruKonga (Bongos)" ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -5813,31 +5156,12 @@ msgstr "Tüm GeçmiÅŸ Türlerini Seç" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Clean up Turkish translation file. msgid "Toggle Fullscreen" msgstr "Tam Ekran Moduna Geç" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Ãœst" @@ -5946,21 +5270,6 @@ msgstr "Åžu ID ile bilinmeyen mesaj alındı : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "ID %d ile %d oyuncusundan bilinmeyen mesaj alındı. Oyuncu atılıyor!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Bilinmeyen iÅŸaretleyici %#08x\n" -"Devam?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Clean up Turkish translation file. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6126,13 +5435,10 @@ msgid "" "%u > %u) (frame %u > %u). You should load another save before continuing, or " "load this state with read-only mode off." msgstr "" -<<<<<<< HEAD -======= "Dikkat: Åžu anki kaydın bitiÅŸinden sonra yer alan bir kayıt yüklediniz. (Bayt " "%u > %u) (Çerçeve %u > %u). Devam etmeden önce baÅŸka bir kayıt yüklemeniz, " "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." ->>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/Movie.cpp:684 #, c-format @@ -6141,13 +5447,10 @@ msgid "" "should load another save before continuing, or load this state with read-" "only mode off. Otherwise you'll probably get a desync." msgstr "" -<<<<<<< HEAD -======= "Dikkat: Bayt %d (0x%X) ile eÅŸleÅŸmeyen bir kayıt yüklediniz. Devam etmeden " "önce baÅŸka bir kayıt yüklemeniz, 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." ->>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/Movie.cpp:693 #, c-format @@ -6167,8 +5470,6 @@ 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 "" -<<<<<<< HEAD -======= "Dikkat: Çerçeve %d ile eÅŸleÅŸmeyen bir kayıt yüklediniz. Devam etmeden önce " "baÅŸka bir kayıt yüklemeniz, veya bu kaydı Salt Okunur mod kapalıyken " "yüklemeniz daha iyi olacaktır. Aksi taktirde, büyük bir ihtimalle, " @@ -6184,7 +5485,6 @@ msgstr "" "Çerçeve %d 'de, durum kaydı bunları basıyor:\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" ->>>>>>> Clean up Turkish translation file. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -6219,19 +5519,7 @@ msgstr "Wii NAND Kök Dizini:" msgid "Wii Save Import" msgstr "Wii Kaydı Al" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii kayıt dosyaları (*.bin)|*.bin" @@ -6262,15 +5550,7 @@ msgstr "" "bir zaman aşımı olabilir veya baÅŸka bir ÅŸey olabilir. \n" "Tekrar baÄŸlamak istiyor musunuz?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Clean up Turkish translation file. msgid "Wiimote Connected" msgstr "Wiimote BaÄŸlandı" @@ -6302,27 +5582,9 @@ msgstr "Pencereleri SaÄŸa Döşe" msgid "Word Wrap" msgstr "Heceleme" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Çalışıyor..." @@ -6632,19 +5894,10 @@ msgstr "| VEYA" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "%s açılamıyor, kayıp bir iÅŸleve sahip." -<<<<<<< HEAD -<<<<<<< HEAD #~ msgid "Cannot record movies in read-only mode." #~ msgstr "Salt-okunur modda film çekilemez." -======= -======= -#~ msgid "Cannot record movies in read-only mode." -#~ msgstr "Salt-okunur modda film çekilemez." - ->>>>>>> Clean up Turkish translation file. #, fuzzy ->>>>>>> Update Hungarian and Turkish translations. #~ msgid "Config..." #~ msgstr "Yapılandır..." diff --git a/Languages/po/zh_CN.po b/Languages/po/zh_CN.po index f7bb9c4575..ee2e7c5bcd 100644 --- a/Languages/po/zh_CN.po +++ b/Languages/po/zh_CN.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-01-09 13:55-0800\n" "Last-Translator: thegfw \n" "Language-Team: \n" @@ -548,27 +536,9 @@ msgstr "添加补ä¸" msgid "Add new pane" msgstr "添加新é¢æ¿" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "添加..." @@ -622,23 +592,8 @@ msgstr "所有 GC/Wii é•œåƒ (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 文件 (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "æ‰€æœ‰å­˜æ¡£çŠ¶æ€ (sav, s##)" @@ -719,19 +674,7 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "请确认真的è¦åˆ é™¤è¿™äº›æ–‡ä»¶?这将是永久性的删除!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "高宽比:" @@ -753,19 +696,7 @@ msgstr "音频åŽç«¯:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: 打开 AO 设备错误.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自动" @@ -877,19 +808,7 @@ msgid "Blue Right" msgstr "è“ å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "底部" @@ -922,15 +841,7 @@ msgstr "æµè§ˆè¾“出目录" msgid "Buffer:" msgstr "缓冲区:" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1163,21 +1074,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "关闭" @@ -1286,15 +1184,7 @@ msgstr "连接 Wiimote 3" msgid "Connect Wiimote 4" msgstr "连接 Wiimote 4" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "连接中..." @@ -1479,21 +1369,8 @@ msgstr "DSP音频" msgid "DSP Emulator Engine" msgstr "音频模拟引擎" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "音频 HLE 模拟(很快)" @@ -1721,19 +1598,7 @@ msgstr "按模拟器显示输入读å–" msgid "Divide" msgstr "Divide" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "您确定是å¦åœæ­¢å½“å‰æ¨¡æ‹Ÿ?" @@ -1763,39 +1628,12 @@ msgstr "Dolphin 模拟 Wiimote 设置" msgid "Dolphin FIFO" msgstr "Dolphin" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC 手柄设置" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC 手柄设置" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC 手柄设置" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC 手柄设置" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 电影 (*.dtm)" @@ -1879,27 +1717,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "è·å…°è¯­" @@ -2023,41 +1843,16 @@ msgstr "å¯ç”¨ BAT" msgid "Enable Block Merging" msgstr "å¯ç”¨åŒºå—åˆå¹¶" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "å¯ç”¨ç¼“å­˜" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "å¯ç”¨ä½œå¼Š" @@ -2192,27 +1987,9 @@ msgstr "" msgid "End" msgstr "End" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "英语" @@ -2241,45 +2018,10 @@ msgstr "等于" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "错误" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "错误" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "错误" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "错误" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Error loading selected language. Falling back to system default." @@ -2744,27 +2486,9 @@ msgstr "" msgid "Free Look" msgstr "自由视点" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "法语" @@ -2832,19 +2556,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube 手柄设置(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube å†…å­˜å¡ (*.raw,*.gcp)" @@ -2869,21 +2581,8 @@ msgstr "" "(either a bad code or the code type is not yet supported.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "常规" @@ -2893,27 +2592,9 @@ msgstr "常规" msgid "General Settings" msgstr "ç•Œé¢è®¾ç½®" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "德语" @@ -3035,21 +2716,8 @@ msgid "Hotkey Configuration" msgstr "热键设置" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "热键" @@ -3261,19 +2929,7 @@ msgid "" msgstr "" "InstallExceptionHandler called, but this platform does not yet support it." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "安装 WAD 到 Wii èœå•ä¸­..." @@ -3358,27 +3014,9 @@ msgstr "无效录制文件" msgid "Invalid state" msgstr "Invalid state" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "æ„大利语" @@ -3537,36 +3175,12 @@ msgstr "载入存档æ’槽 8" msgid "Load State..." msgstr "载入状æ€..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "载入 Wii 系统èœå•(%d %c)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "载入 Wii 系统èœå•(%d %c)" @@ -3647,15 +3261,7 @@ msgstr "MMU 速度破解" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark 文件(*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "主摇æ†" @@ -3687,19 +3293,7 @@ msgid "Memory Byte" msgstr "内存(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "内存å¡" @@ -3883,19 +3477,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3983,15 +3565,7 @@ msgstr "ä¸ç­‰äºŽ" msgid "Not Set" msgstr "未设置" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "未连接" @@ -4052,14 +3626,7 @@ msgstr "åªæœ‰ %d 区å—有效" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "打开" @@ -4190,23 +3757,8 @@ msgstr "è¡¥ä¸" msgid "Paths" msgstr "路径" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "æš‚åœ" @@ -4227,23 +3779,8 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "开始" @@ -4270,19 +3807,7 @@ msgstr "选项" msgid "Players" msgstr "玩家" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "请确认..." @@ -4497,31 +4022,10 @@ msgstr "刷新列表" msgid "Refresh game list" msgstr "刷新游æˆåˆ—表" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "移除" @@ -4540,14 +4044,7 @@ msgid "Render to Main Window" msgstr "附加到主窗å£" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "é‡ç½®" @@ -4590,19 +4087,7 @@ msgstr "ä¿å­˜çŠ¶æ€(&V)" msgid "Safe" msgstr "安全" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "采样率:" @@ -4687,19 +4172,7 @@ msgstr "Savestate movie %s is corrupted, movie recording stopping..." msgid "Scaled EFB Copy" msgstr "EFB 比例å¤åˆ¶" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "扫æ中..." @@ -4739,39 +4212,12 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "选择" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "选择录制文件" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "选择录制文件" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "选择录制文件" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "选择录制文件" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "选择è¦å¯¼å…¥çš„存档" @@ -4798,13 +4244,7 @@ msgstr "选择浮动窗å£" msgid "Select the file to load" msgstr "选择è¦è½½å…¥çš„文件" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "选择一个存档文件" @@ -4812,29 +4252,7 @@ msgstr "选择一个存档文件" msgid "Select the state to load" msgstr "选择è¦è½½å…¥çš„状æ€" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -msgid "Select the save file" -msgstr "选择一个存档文件" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "选择è¦è½½å…¥çš„状æ€" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "选择è¦ä¿å­˜çš„状æ€" @@ -5183,27 +4601,9 @@ msgstr "声音缓冲区创建失败: %s" msgid "Space" msgstr "空格" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "西ç­ç‰™è¯­" @@ -5239,15 +4639,7 @@ msgstr "æ–¹å—é”®" msgid "Standard Controller" msgstr "标准控制器" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5282,14 +4674,7 @@ msgstr "摇æ†" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "åœæ­¢" @@ -5362,14 +4747,7 @@ msgstr "Table Right" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "å±å¹•æˆªå›¾(&T)" @@ -5591,31 +4969,12 @@ msgstr "切æ¢æ‰€æœ‰æ—¥å¿—类型" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "切æ¢å…¨å±" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "顶部" @@ -5719,21 +5078,6 @@ msgstr "Unknown message received with id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Unknown message with id:%d received from player:%d Kicking player!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"未知指针 %#08x\n" -"继续?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5948,19 +5292,7 @@ msgstr "DVD 根目录:" msgid "Wii Save Import" msgstr "导入 Wii 存档" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存档文件 (*.bin)|*.bin" @@ -5991,15 +5323,7 @@ msgstr "" "or maybe it is due to idle time out or other reason.\n" "Do you want to reconnect immediately?" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote 已连接" @@ -6032,27 +5356,9 @@ msgstr "窗å£å³ä¾§" msgid "Word Wrap" msgstr "自动æ¢è¡Œ" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "工作中..." diff --git a/Languages/po/zh_TW.po b/Languages/po/zh_TW.po index e0384728e6..8d0fcc4799 100644 --- a/Languages/po/zh_TW.po +++ b/Languages/po/zh_TW.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Update from master branch. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-03-15 02:51+0800\n" "Last-Translator: khiav \n" "Language-Team: khiav&yrbn \n" @@ -548,27 +536,9 @@ msgstr "新增修正" msgid "Add new pane" msgstr "新增é¢ç‰ˆ" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "新增..." @@ -635,23 +605,8 @@ msgstr "所有 GC/Wii 映åƒæª” (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 檔案 (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "所有å³æ™‚存檔 (sav, s##)" @@ -732,19 +687,7 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "是å¦çœŸçš„è¦åˆªé™¤é€™äº›æª”案？刪了之後就回ä¸ä¾†äº†å“¦ï¼" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "ç•«é¢æ¯”例：" @@ -766,19 +709,7 @@ msgstr "è²éŸ³è£ç½®ï¼š" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon：開啟 AO è£ç½®å‡ºéŒ¯ã€‚\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" @@ -890,19 +821,7 @@ msgid "Blue Right" msgstr "è— å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "下方" @@ -935,15 +854,7 @@ msgstr "ç€è¦½è¼¸å‡ºçš„資料夾" msgid "Buffer:" msgstr "ç·©è¡ï¼š" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1172,21 +1083,8 @@ msgstr "在éŠæˆ²åŸ·è¡Œæ™‚客戶端斷開連接ï¼ï¼ç¶²è·¯å°æˆ°å·²ç¶“被關閉 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "關閉" @@ -1295,15 +1193,7 @@ msgstr "連接 Wiimote 3" msgid "Connect Wiimote 4" msgstr "連接 Wiimote 4" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "正在連接..." @@ -1487,21 +1377,8 @@ msgstr "è²éŸ³" msgid "DSP Emulator Engine" msgstr "DSP 模擬引擎" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE 模擬器 (å¿«)" @@ -1729,19 +1606,7 @@ msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" msgid "Divide" msgstr "Divide" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "您è¦åœæ­¢ç›®å‰çš„模擬嗎？" @@ -1771,39 +1636,12 @@ msgstr "Dolphin 模擬 Wiimote 設定" msgid "Dolphin FIFO" msgstr "Dolphin" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC 控制器設定" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC 控制器設定" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC 控制器設定" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC 控制器設定" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 影片 (*.dtm)" @@ -1887,27 +1725,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Dutch" @@ -2029,41 +1849,16 @@ msgstr "é–‹å•Ÿ BAT" msgid "Enable Block Merging" msgstr "é–‹å•Ÿå¡Šåˆä½µ" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "é–‹å•Ÿå¿«å–" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "開啟作弊" @@ -2195,27 +1990,9 @@ msgstr "" msgid "End" msgstr "End" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "English" @@ -2244,45 +2021,10 @@ msgstr "等於" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "錯誤" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -msgid "Error" -msgstr "錯誤" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "錯誤" - -#: Source/Core/Core/Src/Movie.cpp:820 -#, c-format -msgid "" -"Error in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "錯誤" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "讀å–é¸æ“‡çš„語系出錯。返回使用系統é è¨­å€¼ã€‚" @@ -2745,27 +2487,9 @@ msgstr "" msgid "Free Look" msgstr "自由視點" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "French" @@ -2833,19 +2557,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube 控制器設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube è¨˜æ†¶å¡ (*.raw,*.gcp)" @@ -2870,21 +2582,8 @@ msgstr "" "(一個æ毀的代碼或ä¸æ”¯æ´çš„代碼類型。)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -2894,27 +2593,9 @@ msgstr "一般" msgid "General Settings" msgstr "ç•Œé¢è¨­å®š" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "German" @@ -3036,21 +2717,8 @@ msgid "Hotkey Configuration" msgstr "å¿«æ·éµè¨­å®š" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "å¿«æ·éµ" @@ -3254,19 +2922,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "調用 InstallExceptionHandler，但是這個平å°å°šæœªæ”¯æ´æ­¤åŠŸèƒ½ã€‚" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "æ­£åœ¨å®‰è£ WAD 至 Wii é¸å–®..." @@ -3350,27 +3006,9 @@ msgstr "無效的錄åƒæª”" msgid "Invalid state" msgstr "無效的狀態" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italian" @@ -3529,36 +3167,12 @@ msgstr "讀å–儲存格 8" msgid "Load State..." msgstr "讀å–進度檔..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" @@ -3639,15 +3253,7 @@ msgstr "MMU 速度修正" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark 檔案(*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "主æ–æ¡¿" @@ -3679,19 +3285,7 @@ msgid "Memory Byte" msgstr "記憶å¡(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "記憶å¡" @@ -3875,19 +3469,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3975,15 +3557,7 @@ msgstr "ä¸ç›¸ç­‰" msgid "Not Set" msgstr "未設定" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "未連接" @@ -4044,14 +3618,7 @@ msgstr "僅 %d 個å€å¡Šå¯ç”¨" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 ->>>>>>> Update from master branch. msgid "Open" msgstr "é–‹å•Ÿ" @@ -4180,23 +3747,8 @@ msgstr "修正" msgid "Paths" msgstr "路徑" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "æš«åœ" @@ -4217,23 +3769,8 @@ msgstr "ç‰ˆå¼ %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "執行" @@ -4260,19 +3797,7 @@ msgstr "é¸é …" msgid "Players" msgstr "玩家" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "請確èª..." @@ -4486,31 +4011,10 @@ msgstr "更新列表" msgid "Refresh game list" msgstr "æ›´æ–°éŠæˆ²åˆ—表" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "移除" @@ -4529,14 +4033,7 @@ msgid "Render to Main Window" msgstr "渲染至主視窗" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "é‡ç½®" @@ -4579,19 +4076,7 @@ msgstr "儲存進度(&V)" msgid "Safe" msgstr "安全" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "å–樣率：" @@ -4676,19 +4161,7 @@ msgstr "儲存的影片 %s 是æ毀的，影片錄製åœæ­¢..." msgid "Scaled EFB Copy" msgstr "EFB 縮放複製" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "正在掃瞄..." @@ -4728,39 +4201,12 @@ msgstr "é …ç›® %s 在 SYSCONF 中找ä¸åˆ°" msgid "Select" msgstr "é¸æ“‡" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "é¸æ“‡å·²éŒ„製的檔案" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "é¸æ“‡å·²éŒ„製的檔案" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "é¸æ“‡å·²éŒ„製的檔案" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "é¸æ“‡å·²éŒ„製的檔案" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "é¸æ“‡è¦å®‰è£çš„ Wii WAD" @@ -4786,13 +4232,7 @@ msgstr "é¸æ“‡æµ®å‹•è¦–窗" msgid "Select the file to load" msgstr "é¸æ“‡è¦è®€å–的檔案" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "é¸æ“‡å­˜æª”" @@ -4800,29 +4240,7 @@ msgstr "é¸æ“‡å­˜æª”" msgid "Select the state to load" msgstr "é¸æ“‡è¦è®€å–的進度" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Update from master branch. -msgid "Select the save file" -msgstr "é¸æ“‡å­˜æª”" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "é¸æ“‡è¦è®€å–的進度" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "é¸æ“‡è¦å„²å­˜çš„進度" @@ -5170,27 +4588,9 @@ msgstr "è²éŸ³ç·©è¡å»ºç«‹å¤±æ•—：%s" msgid "Space" msgstr "Space" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spanish" @@ -5226,15 +4626,7 @@ msgstr "Square Stick" msgid "Standard Controller" msgstr "標準控制器" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5269,14 +4661,7 @@ msgstr "æ–æ¡¿" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "åœæ­¢" @@ -5349,14 +4734,7 @@ msgstr "Table å³" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ->>>>>>> Update from master branch. msgid "Take Screenshot" msgstr "截å–ç•«é¢" @@ -5568,31 +4946,12 @@ msgstr "å…¨é¸/全部å–消" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 ->>>>>>> Update from master branch. msgid "Toggle Fullscreen" msgstr "切æ›å…¨èž¢å¹•" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "上方" @@ -5696,21 +5055,6 @@ msgstr "接收到帶有未知 id 的錯誤訊æ¯ï¼š%d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "知訊æ¯å¸¶æœ‰ id:%d 接收於玩家:%d 正在æ出玩家ï¼" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"未知的指示器 %#08x\n" -"是å¦ç¹¼çºŒï¼Ÿ" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5925,19 +5269,7 @@ msgstr "DVD 根：" msgid "Wii Save Import" msgstr "匯入 Wii 存檔" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存檔 (*.bin)|*.bin" @@ -5968,15 +5300,7 @@ msgstr "" "或閒置的時間太久。\n" "是å¦è¦é‡æ–°é€£æŽ¥ï¼Ÿ" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:598 ->>>>>>> Update from master branch. msgid "Wiimote Connected" msgstr "Wiimote 已連接" @@ -6009,27 +5333,9 @@ msgstr "視窗 å³" msgid "Word Wrap" msgstr "自動æ›è¡Œ" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "執行中..." From bf76b802a7b619369349ac95de1850ce89091e63 Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 10 Mar 2012 16:24:13 +1100 Subject: [PATCH 357/381] Fixed the in-built Dolphin profiler. --- Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 9 ++-- .../Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp | 7 ++- Source/Core/Core/Src/PowerPC/Profiler.cpp | 27 ++++++----- .../Src/Debugger/CodeWindowFunctions.cpp | 45 ++++++++++--------- 4 files changed, 51 insertions(+), 37 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index 0d31893b53..df1fd0f589 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -412,9 +412,12 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc if (Core::g_CoreStartupParameter.bEnableDebugging) { // Comment out the following to disable breakpoints (speed-up) - blockSize = 1; - broken_block = true; - Trace(); + if (!Profiler::g_ProfileBlocks) + { + blockSize = 1; + broken_block = true; + Trace(); + } } if (em_address == 0) diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp index 75755de5cb..77c7fb6169 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp @@ -524,8 +524,11 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc if (Core::g_CoreStartupParameter.bEnableDebugging) { // Comment out the following to disable breakpoints (speed-up) - blockSize = 1; - Trace(); + if (!Profiler::g_ProfileBlocks) + { + blockSize = 1; + Trace(); + } } if (em_address == 0) diff --git a/Source/Core/Core/Src/PowerPC/Profiler.cpp b/Source/Core/Core/Src/PowerPC/Profiler.cpp index 2874705d4b..3636b00717 100644 --- a/Source/Core/Core/Src/PowerPC/Profiler.cpp +++ b/Source/Core/Core/Src/PowerPC/Profiler.cpp @@ -56,18 +56,21 @@ void WriteProfileResults(const char *filename) 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); + if (block && !block->invalid) + { + // Rough heuristic. Mem instructions should cost more. + u64 cost = block->originalSize * (block->runCount / 4); #ifdef _WIN32 - u64 timecost = block->ticCounter; + u64 timecost = block->ticCounter; #endif - // Todo: tweak. - if (block->runCount >= 1) - stats.push_back(BlockStat(i, cost)); - cost_sum += cost; + // Todo: tweak. + if (block->runCount >= 1) + stats.push_back(BlockStat(i, cost)); + cost_sum += cost; #ifdef _WIN32 - timecost_sum += timecost; + timecost_sum += timecost; #endif + } } sort(stats.begin(), stats.end()); @@ -77,18 +80,18 @@ void WriteProfileResults(const char *filename) PanicAlert("failed to open %s", filename); return; } - fprintf(f.GetHandle(), "origAddr\tblkName\tcost\ttimeCost\tpercent\ttimePercent\tOvAllinBlkTime(ms)\tblkCodeSize\n"); + 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) + 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%.2lf\t%llf\t%lf\t%i\n", - block->originalAddress, name.c_str(), stats[i].cost, + 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 diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp index a3dd9a9ab8..05915ecd20 100644 --- a/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp @@ -187,35 +187,40 @@ void CCodeWindow::CreateMenuSymbols(wxMenuBar *pMenuBar) void CCodeWindow::OnProfilerMenu(wxCommandEvent& event) { - if (Core::GetState() == Core::CORE_RUN) { - event.Skip(); - return; - } switch (event.GetId()) { case IDM_PROFILEBLOCKS: - if (jit != NULL) jit->ClearCache(); + Core::SetState(Core::CORE_PAUSE); + if (jit != NULL) + jit->ClearCache(); Profiler::g_ProfileBlocks = GetMenuBar()->IsChecked(IDM_PROFILEBLOCKS); + Core::SetState(Core::CORE_RUN); break; case IDM_WRITEPROFILE: - if (jit != NULL) - { - std::string filename = File::GetUserPath(D_DUMP_IDX) + "Debug/profiler.txt"; - File::CreateFullPath(filename); - Profiler::WriteProfileResults(filename.c_str()); + if (Core::GetState() == Core::CORE_RUN) + Core::SetState(Core::CORE_PAUSE); - wxFileType* filetype = NULL; - if (!(filetype = wxTheMimeTypesManager->GetFileTypeFromExtension(_T("txt")))) + if (Core::GetState() == Core::CORE_PAUSE && PowerPC::GetMode() == PowerPC::MODE_JIT) + { + if (jit != NULL) { - // From extension failed, trying with MIME type now - if (!(filetype = wxTheMimeTypesManager->GetFileTypeFromMimeType(_T("text/plain")))) - // MIME type failed, aborting mission - break; + std::string filename = File::GetUserPath(D_DUMP_IDX) + "Debug/profiler.txt"; + File::CreateFullPath(filename); + Profiler::WriteProfileResults(filename.c_str()); + + wxFileType* filetype = NULL; + if (!(filetype = wxTheMimeTypesManager->GetFileTypeFromExtension(_T("txt")))) + { + // From extension failed, trying with MIME type now + if (!(filetype = wxTheMimeTypesManager->GetFileTypeFromMimeType(_T("text/plain")))) + // MIME type failed, aborting mission + break; + } + wxString OpenCommand; + OpenCommand = filetype->GetOpenCommand(wxString::From8BitData(filename.c_str())); + if(!OpenCommand.IsEmpty()) + wxExecute(OpenCommand, wxEXEC_SYNC); } - wxString OpenCommand; - OpenCommand = filetype->GetOpenCommand(wxString::From8BitData(filename.c_str())); - if(!OpenCommand.IsEmpty()) - wxExecute(OpenCommand, wxEXEC_SYNC); } break; } From fedf6055ce2d1ac9862eac8c2c112160b8d7fbe8 Mon Sep 17 00:00:00 2001 From: marcosvitali Date: Sun, 11 Mar 2012 12:40:39 -0300 Subject: [PATCH 358/381] I've fixed Super Monkey Ball in some cases when the game write the WriteReadDistance need to be safe like the SafeCPRead. This fix is not related with the previous commits, but the previous commits help me to see that because in the new scenery SMB was hanging. May be in the past also doesn't boot some times because of that. Please Test FZero boot also. Thanks. --- .../Core/VideoCommon/Src/CommandProcessor.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp index 77c02d1692..dbf4907160 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp @@ -171,11 +171,23 @@ void Read16(u16& _rReturnValue, const u32 _Address) case FIFO_LO_WATERMARK_HI: _rReturnValue = ReadHigh(fifo.CPLoWatermark); return; case FIFO_RW_DISTANCE_LO: + if (IsOnThread()) + if(fifo.CPWritePointer >= fifo.SafeCPReadPointer) + _rReturnValue = ReadLow (fifo.CPWritePointer - fifo.SafeCPReadPointer); + else + _rReturnValue = ReadLow (fifo.CPEnd - fifo.CPWritePointer + fifo.SafeCPReadPointer); + else _rReturnValue = ReadLow (fifo.CPReadWriteDistance); DEBUG_LOG(COMMANDPROCESSOR, "read FIFO_RW_DISTANCE_LO : %04x", _rReturnValue); return; case FIFO_RW_DISTANCE_HI: - _rReturnValue = ReadHigh(fifo.CPReadWriteDistance); + if (IsOnThread()) + if(fifo.CPWritePointer >= fifo.SafeCPReadPointer) + _rReturnValue = ReadHigh (fifo.CPWritePointer - fifo.SafeCPReadPointer); + else + _rReturnValue = ReadHigh (fifo.CPEnd - fifo.CPWritePointer + fifo.SafeCPReadPointer); + else + _rReturnValue = ReadHigh(fifo.CPReadWriteDistance); DEBUG_LOG(COMMANDPROCESSOR, "read FIFO_RW_DISTANCE_HI : %04x", _rReturnValue); return; case FIFO_WRITE_POINTER_LO: @@ -356,6 +368,7 @@ void Write16(const u16 _Value, const u32 _Address) break; case FIFO_READ_POINTER_HI: WriteHigh((u32 &)fifo.CPReadPointer, _Value); + fifo.SafeCPReadPointer = fifo.CPReadPointer; DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_READ_POINTER_HI : %04x", _Value); break; @@ -596,7 +609,7 @@ void SetCpStatusRegister() // Here always there is one fifo attached to the GPU m_CPStatusReg.Breakpoint = fifo.bFF_Breakpoint; - m_CPStatusReg.ReadIdle = (fifo.CPReadPointer == fifo.CPWritePointer) || (fifo.CPReadPointer == fifo.CPBreakpoint) ; + m_CPStatusReg.ReadIdle = !fifo.CPReadWriteDistance || (fifo.CPReadPointer == fifo.CPWritePointer) || (fifo.CPReadPointer == fifo.CPBreakpoint) ; m_CPStatusReg.CommandIdle = !fifo.CPReadWriteDistance; m_CPStatusReg.UnderflowLoWatermark = fifo.bFF_LoWatermark; m_CPStatusReg.OverflowHiWatermark = fifo.bFF_HiWatermark; From 352ab2ba4394180739d7315c0c505aab83ffe211 Mon Sep 17 00:00:00 2001 From: marcosvitali Date: Tue, 13 Mar 2012 01:44:10 -0300 Subject: [PATCH 359/381] Improved the CheckException for the GatherPipe writes in JIT, now only the External Exceptions are processed. We Didn't Check 0x0008000 in PowerPC::ppcState.msr this was killing the performance, this also fix a hang when this check is performed. SMG for example. Deleted the HiWatermark condition from GPFifo. Please test games affected in this Revision 9e649ce79850, and games affected in this Revision b0f75f17ae19. I do not want to excite the game players of 'The Las Story', but Could test again the random hangs with this rev? Thanks --- Source/Core/Core/Src/HW/GPFifo.cpp | 2 +- Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/HW/GPFifo.cpp b/Source/Core/Core/Src/HW/GPFifo.cpp index 9bae7bb621..77fdbf5933 100644 --- a/Source/Core/Core/Src/HW/GPFifo.cpp +++ b/Source/Core/Core/Src/HW/GPFifo.cpp @@ -99,7 +99,7 @@ void STACKALIGN CheckGatherPipe() // Profile where the FIFO writes are occurring. - if (g_video_backend->Video_IsHiWatermarkActive() && jit && (jit->js.fifoWriteAddresses.find(PC)) == (jit->js.fifoWriteAddresses.end())) + if (jit && (jit->js.fifoWriteAddresses.find(PC)) == (jit->js.fifoWriteAddresses.end())) { jit->js.fifoWriteAddresses.insert(PC); diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index 417d1159da..b23964b071 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -576,14 +576,21 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc gpr.Flush(FLUSH_ALL); fpr.Flush(FLUSH_ALL); + + TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_ISI | EXCEPTION_PROGRAM | EXCEPTION_SYSCALL | EXCEPTION_FPU_UNAVAILABLE | EXCEPTION_DSI | EXCEPTION_ALIGNMENT | EXCEPTION_DECREMENTER)); + FixupBranch clearInt = J_CC(CC_NZ); TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_EXTERNAL_INT)); FixupBranch noExtException = J_CC(CC_Z); - TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); + TEST(32, M((void *)&PowerPC::ppcState.msr), Imm32(0x0008000)); FixupBranch noCPInt = J_CC(CC_Z); - + TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); + FixupBranch noCPInt2 = J_CC(CC_Z); + MOV(32, M(&PC), Imm32(ops[i].address)); WriteExceptionExit(); + SetJumpTarget(clearInt); + SetJumpTarget(noCPInt2); SetJumpTarget(noCPInt); SetJumpTarget(noExtException); } From b37c468039b944de7b40ef6e67ae07c3e59f44f6 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Tue, 13 Mar 2012 23:42:30 +1300 Subject: [PATCH 360/381] Fixes issue 5269 Sorry guys but I needed to disable stfs so that Pokepark 2 would not freeze(?). Feel free to put some effort in to finding out why, I do not understand Jit sorry. --- Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp | 4 ++-- .../Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp index 93963513ee..5b7baa28c0 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp @@ -100,8 +100,8 @@ static GekkoOPTemplate primarytable[] = {50, &Jit64::lfd}, //"lfd", OPTYPE_LOADFP, FL_IN_A}}, {51, &Jit64::Default}, //"lfdu", OPTYPE_LOADFP, FL_OUT_A | FL_IN_A}}, - {52, &Jit64::stfs}, //"stfs", OPTYPE_STOREFP, FL_IN_A}}, - {53, &Jit64::stfs}, //"stfsu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}}, + {52, &Jit64::Default}, //"stfs", OPTYPE_STOREFP, FL_IN_A}}, + {53, &Jit64::Default}, //"stfsu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}}, {54, &Jit64::stfd}, //"stfd", OPTYPE_STOREFP, FL_IN_A}}, {55, &Jit64::Default}, //"stfdu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}}, diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp index 41c9a3ceb7..25ad18acf5 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp @@ -240,7 +240,14 @@ void Jit64::stfd(UGeckoInstruction inst) fpr.UnlockAll(); } - +// In Release on 32bit build, +// this seemed to cause a problem with PokePark2 +// at start after talking to first pokemon, +// you run and smash a box, then he goes on about +// following him and then you cant do anything. +// I have enabled interpreter for this function +// in the mean time. +// Parlane void Jit64::stfs(UGeckoInstruction inst) { INSTRUCTION_START From dc79d68e72f04f60366484f60bff1e39d7e6babe Mon Sep 17 00:00:00 2001 From: skidau Date: Tue, 13 Mar 2012 22:35:11 +1100 Subject: [PATCH 361/381] Added the corresponding change from r352ab2ba4394 into JITIL. Tidied some code. --- Source/Core/Core/Src/HW/GPFifo.cpp | 1 - Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 16 +++++---- .../Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp | 7 +++- .../Core/Src/PowerPC/JitCommon/JitBase.cpp | 2 ++ .../Core/Core/Src/PowerPC/JitCommon/JitBase.h | 3 -- .../Core/VideoCommon/Src/CommandProcessor.cpp | 34 ++++++------------- .../Core/VideoCommon/Src/CommandProcessor.h | 1 - Source/Core/VideoCommon/Src/PixelEngine.cpp | 3 -- 8 files changed, 28 insertions(+), 39 deletions(-) diff --git a/Source/Core/Core/Src/HW/GPFifo.cpp b/Source/Core/Core/Src/HW/GPFifo.cpp index 77fdbf5933..3af387792f 100644 --- a/Source/Core/Core/Src/HW/GPFifo.cpp +++ b/Source/Core/Core/Src/HW/GPFifo.cpp @@ -98,7 +98,6 @@ void STACKALIGN CheckGatherPipe() memmove(m_gatherPipe, m_gatherPipe + cnt, m_gatherPipeCount); // Profile where the FIFO writes are occurring. - if (jit && (jit->js.fifoWriteAddresses.find(PC)) == (jit->js.fifoWriteAddresses.end())) { jit->js.fifoWriteAddresses.insert(PC); diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index b23964b071..1506170b2b 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -42,6 +42,9 @@ #include "JitRegCache.h" #include "Jit64_Tables.h" #include "HW/ProcessorInterface.h" +#if defined(_DEBUG) || defined(DEBUGFAST) +#include "PowerPCDisasm.h" +#endif using namespace Gen; using namespace PowerPC; @@ -576,23 +579,22 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc gpr.Flush(FLUSH_ALL); fpr.Flush(FLUSH_ALL); - TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_ISI | EXCEPTION_PROGRAM | EXCEPTION_SYSCALL | EXCEPTION_FPU_UNAVAILABLE | EXCEPTION_DSI | EXCEPTION_ALIGNMENT | EXCEPTION_DECREMENTER)); FixupBranch clearInt = J_CC(CC_NZ); TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_EXTERNAL_INT)); FixupBranch noExtException = J_CC(CC_Z); TEST(32, M((void *)&PowerPC::ppcState.msr), Imm32(0x0008000)); - FixupBranch noCPInt = J_CC(CC_Z); + FixupBranch noExtIntEnable = J_CC(CC_Z); TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); - FixupBranch noCPInt2 = J_CC(CC_Z); - + FixupBranch noCPInt = J_CC(CC_Z); + MOV(32, M(&PC), Imm32(ops[i].address)); WriteExceptionExit(); - SetJumpTarget(clearInt); - SetJumpTarget(noCPInt2); SetJumpTarget(noCPInt); + SetJumpTarget(noExtIntEnable); SetJumpTarget(noExtException); + SetJumpTarget(clearInt); } Jit64Tables::CompileInstruction(ops[i]); @@ -619,7 +621,7 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc { char ppcInst[256]; DisassembleGekko(ops[i].inst.hex, em_address, ppcInst, 256); - NOTICE_LOG(DYNA_REC, "Unflushed reg: %s", ppcInst); + DEBUG_LOG(DYNA_REC, "Unflushed reg: %s", ppcInst); } #endif diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp index 811440d098..f82e34b5b1 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp @@ -1925,17 +1925,22 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, bool UseProfile, bool Mak case ExtExceptionCheck: { unsigned InstLoc = ibuild->GetImmValue(getOp1(I)); + Jit->TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_ISI | EXCEPTION_PROGRAM | EXCEPTION_SYSCALL | EXCEPTION_FPU_UNAVAILABLE | EXCEPTION_DSI | EXCEPTION_ALIGNMENT | EXCEPTION_DECREMENTER)); + FixupBranch clearInt = Jit->J_CC(CC_NZ); Jit->TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_EXTERNAL_INT)); FixupBranch noExtException = Jit->J_CC(CC_Z); + Jit->TEST(32, M((void *)&PowerPC::ppcState.msr), Imm32(0x0008000)); + FixupBranch noExtIntEnable = Jit->J_CC(CC_Z); Jit->TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); FixupBranch noCPInt = Jit->J_CC(CC_Z); Jit->MOV(32, M(&PC), Imm32(InstLoc)); Jit->WriteExceptionExit(); - Jit->SetJumpTarget(noCPInt); + Jit->SetJumpTarget(noExtIntEnable); Jit->SetJumpTarget(noExtException); + Jit->SetJumpTarget(clearInt); break; } case Int3: { diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.cpp index 7f6cac8dd3..6203a81e15 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.cpp @@ -13,6 +13,8 @@ // If not, see http://www.gnu.org/licenses/ #include "JitBase.h" +#include "PowerPCDisasm.h" +#include "disasm.h" JitBase *jit; diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h index be80754bdc..c2febde722 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h @@ -28,9 +28,6 @@ #include "JitBackpatch.h" // for EmuCodeBlock #include "JitAsmCommon.h" -#include "PowerPCDisasm.h" -#include "disasm.h" - #include #define JIT_OPCODE 0 diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp index dbf4907160..3744acd200 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp @@ -141,7 +141,6 @@ void Init() void Read16(u16& _rReturnValue, const u32 _Address) { - INFO_LOG(COMMANDPROCESSOR, "(r): 0x%08x", _Address); switch (_Address & 0xFFF) { @@ -177,7 +176,7 @@ void Read16(u16& _rReturnValue, const u32 _Address) else _rReturnValue = ReadLow (fifo.CPEnd - fifo.CPWritePointer + fifo.SafeCPReadPointer); else - _rReturnValue = ReadLow (fifo.CPReadWriteDistance); + _rReturnValue = ReadLow (fifo.CPReadWriteDistance); DEBUG_LOG(COMMANDPROCESSOR, "read FIFO_RW_DISTANCE_LO : %04x", _rReturnValue); return; case FIFO_RW_DISTANCE_HI: @@ -187,7 +186,7 @@ void Read16(u16& _rReturnValue, const u32 _Address) else _rReturnValue = ReadHigh (fifo.CPEnd - fifo.CPWritePointer + fifo.SafeCPReadPointer); else - _rReturnValue = ReadHigh(fifo.CPReadWriteDistance); + _rReturnValue = ReadHigh(fifo.CPReadWriteDistance); DEBUG_LOG(COMMANDPROCESSOR, "read FIFO_RW_DISTANCE_HI : %04x", _rReturnValue); return; case FIFO_WRITE_POINTER_LO: @@ -499,18 +498,15 @@ void AbortFrame() void SetOverflowStatusFromGatherPipe() { - - fifo.bFF_HiWatermark = (fifo.CPReadWriteDistance > fifo.CPHiWatermark); isHiWatermarkActive = fifo.bFF_HiWatermark && fifo.bFF_HiWatermarkInt && m_CPCtrlReg.GPReadEnable; - + if (isHiWatermarkActive) { interruptSet = true; INFO_LOG(COMMANDPROCESSOR,"Interrupt set"); - ProcessorInterface::SetInterrupt(INT_CAUSE_CP, true); + ProcessorInterface::SetInterrupt(INT_CAUSE_CP, true); } - } void SetCpStatus() @@ -520,12 +516,10 @@ void SetCpStatus() fifo.bFF_LoWatermark = (fifo.CPReadWriteDistance < fifo.CPLoWatermark); // breakpoint - if (fifo.bFF_BPEnable) { if (fifo.CPBreakpoint == fifo.CPReadPointer) - { - + { if (!fifo.bFF_Breakpoint) { INFO_LOG(COMMANDPROCESSOR, "Hit breakpoint at %i", fifo.CPReadPointer); @@ -607,15 +601,16 @@ void Shutdown() void SetCpStatusRegister() { // Here always there is one fifo attached to the GPU - m_CPStatusReg.Breakpoint = fifo.bFF_Breakpoint; m_CPStatusReg.ReadIdle = !fifo.CPReadWriteDistance || (fifo.CPReadPointer == fifo.CPWritePointer) || (fifo.CPReadPointer == fifo.CPBreakpoint) ; m_CPStatusReg.CommandIdle = !fifo.CPReadWriteDistance; m_CPStatusReg.UnderflowLoWatermark = fifo.bFF_LoWatermark; m_CPStatusReg.OverflowHiWatermark = fifo.bFF_HiWatermark; - - PixelEngine::ResumeWaitingForPEInterrupt(); - + + // HACK to compensate for slow response to PE interrupts in Time Splitters: Future Perfect + if (IsOnThread()) + PixelEngine::ResumeWaitingForPEInterrupt(); + INFO_LOG(COMMANDPROCESSOR,"\t Read from STATUS_REGISTER : %04x", m_CPStatusReg.Hex); DEBUG_LOG(COMMANDPROCESSOR, "(r) status: iBP %s | fReadIdle %s | fCmdIdle %s | iOvF %s | iUndF %s" , m_CPStatusReg.Breakpoint ? "ON" : "OFF" @@ -624,13 +619,10 @@ void SetCpStatusRegister() , m_CPStatusReg.OverflowHiWatermark ? "ON" : "OFF" , m_CPStatusReg.UnderflowLoWatermark ? "ON" : "OFF" ); - - } void SetCpControlRegister() { - // If the new fifo is being attached We make sure there wont be SetFinish event pending. // This protection fix eternal darkness booting, because the second SetFinish event when it is booting // seems invalid or has a bug and hang the game. @@ -638,7 +630,7 @@ void SetCpControlRegister() if (!fifo.bFF_GPReadEnable && m_CPCtrlReg.GPReadEnable && !m_CPCtrlReg.BPEnable) { ProcessFifoEvents(); - PixelEngine::ResetSetFinish(); + PixelEngine::ResetSetFinish(); } fifo.bFF_BPInt = m_CPCtrlReg.BPInt; @@ -653,9 +645,6 @@ void SetCpControlRegister() ProcessorInterface::Fifo_CPUBase = fifo.CPBase; ProcessorInterface::Fifo_CPUEnd = fifo.CPEnd; } - // If overflown happens process the fifo to LoWatemark - //if (bProcessFifoToLoWatermark) - // ProcessFifoToLoWatermark(); if(fifo.bFF_GPReadEnable && !m_CPCtrlReg.GPReadEnable) { @@ -667,7 +656,6 @@ void SetCpControlRegister() fifo.bFF_GPReadEnable = m_CPCtrlReg.GPReadEnable; } - DEBUG_LOG(COMMANDPROCESSOR, "\t GPREAD %s | BP %s | Int %s | OvF %s | UndF %s | LINK %s" , fifo.bFF_GPReadEnable ? "ON" : "OFF" , fifo.bFF_BPEnable ? "ON" : "OFF" diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.h b/Source/Core/VideoCommon/Src/CommandProcessor.h index 2bf965a3ba..440c900dc3 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.h +++ b/Source/Core/VideoCommon/Src/CommandProcessor.h @@ -25,7 +25,6 @@ class PointerWrap; extern bool MT; - namespace CommandProcessor { diff --git a/Source/Core/VideoCommon/Src/PixelEngine.cpp b/Source/Core/VideoCommon/Src/PixelEngine.cpp index 750e8fbb40..38c85cc10c 100644 --- a/Source/Core/VideoCommon/Src/PixelEngine.cpp +++ b/Source/Core/VideoCommon/Src/PixelEngine.cpp @@ -322,7 +322,6 @@ void Write16(const u16 _iValue, const u32 _iAddress) break; case PE_TOKEN_REG: - //LOG(PIXELENGINE,"WEIRD: program wrote token: %i",_iValue); PanicAlert("(w16) WTF? PowerPC program wrote token: %i", _iValue); //only the gx pipeline is supposed to be able to write here //g_token = _iValue; @@ -384,8 +383,6 @@ void SetToken_OnMainThread(u64 userdata, int cyclesLate) CommandProcessor::interruptTokenWaiting = false; IncrementCheckContextId(); //} - //else - // LOGV(PIXELENGINE, 1, "VIDEO Backend wrote token: %i", CommandProcessor::fifo.PEToken); } void SetFinish_OnMainThread(u64 userdata, int cyclesLate) From 0ed8af2287bdca2a7cf1ff1ec57781d45d852551 Mon Sep 17 00:00:00 2001 From: skidau Date: Tue, 13 Mar 2012 23:41:40 +1100 Subject: [PATCH 362/381] Forced reload of the native Gecko Code handler if the game overwrites it. Fixes issue 5225. --- Source/Core/Core/Src/GeckoCode.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/GeckoCode.cpp b/Source/Core/Core/Src/GeckoCode.cpp index c0b7af3779..11b1ef2580 100644 --- a/Source/Core/Core/Src/GeckoCode.cpp +++ b/Source/Core/Core/Src/GeckoCode.cpp @@ -255,7 +255,10 @@ void RunCodeHandler() { if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats) { - if (!code_handler_installed) + u8 *gameId = Memory::GetPointer(0x80000000); + u8 *wiirdId = Memory::GetPointer(0x80001800); + + if (!code_handler_installed || memcmp(gameId, wiirdId, 6)) code_handler_installed = InstallCodeHandler(); if (code_handler_installed) From 8ed6ea3b076a3d1aec2a170d0c71dc1a12122371 Mon Sep 17 00:00:00 2001 From: skidau Date: Thu, 15 Mar 2012 21:48:19 +1100 Subject: [PATCH 363/381] Sped up the Dolphin debugger in JIT mode by splitting a block only while stepping or when it contains a breakpoint. The block is invalidated when a breakpoint is set or cleared. Fixed a bug in the JitCache where the JIT icache was not being invalidated when a block containing the instruction was destroyed. --- Source/Core/Common/Src/BreakPoints.cpp | 23 +++++++++++++++++-- Source/Core/Common/Src/BreakPoints.h | 2 +- Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 19 ++++++++++++--- Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp | 3 ++- Source/Core/Core/Src/PowerPC/Jit64IL/IR.h | 5 +++- .../Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp | 12 ++++++++++ .../Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp | 9 ++++++-- .../Core/Src/PowerPC/JitCommon/JitCache.cpp | 18 +++++++++++++++ 8 files changed, 81 insertions(+), 10 deletions(-) diff --git a/Source/Core/Common/Src/BreakPoints.cpp b/Source/Core/Common/Src/BreakPoints.cpp index 45a0b52daf..9164312f82 100644 --- a/Source/Core/Common/Src/BreakPoints.cpp +++ b/Source/Core/Common/Src/BreakPoints.cpp @@ -19,6 +19,7 @@ #include "DebugInterface.h" #include "BreakPoints.h" #include +#include "..\..\Core\Src\PowerPC\JitCommon\JitBase.h" bool BreakPoints::IsAddressBreakPoint(u32 _iAddress) { @@ -70,7 +71,11 @@ void BreakPoints::AddFromStrings(const TBreakPointsStr& bps) void BreakPoints::Add(const TBreakPoint& bp) { if (!IsAddressBreakPoint(bp.iAddress)) + { m_BreakPoints.push_back(bp); + if (jit) + jit->GetBlockCache()->InvalidateICache(bp.iAddress, 4); + } } void BreakPoints::Add(u32 em_address, bool temp) @@ -83,21 +88,35 @@ void BreakPoints::Add(u32 em_address, bool temp) pt.iAddress = em_address; m_BreakPoints.push_back(pt); + + if (jit) + jit->GetBlockCache()->InvalidateICache(em_address, 4); } } -void BreakPoints::Remove(u32 _iAddress) +void BreakPoints::Remove(u32 em_address) { for (TBreakPoints::iterator i = m_BreakPoints.begin(); i != m_BreakPoints.end(); ++i) { - if (i->iAddress == _iAddress) + if (i->iAddress == em_address) { m_BreakPoints.erase(i); + if (jit) + jit->GetBlockCache()->InvalidateICache(em_address, 4); return; } } } +void BreakPoints::Clear() +{ + for (TBreakPoints::iterator i = m_BreakPoints.begin(); i != m_BreakPoints.end(); ++i) + { + if (jit) + jit->GetBlockCache()->InvalidateICache(i->iAddress, 4); + m_BreakPoints.erase(i); + } +} MemChecks::TMemChecksStr MemChecks::GetStrings() const { diff --git a/Source/Core/Common/Src/BreakPoints.h b/Source/Core/Common/Src/BreakPoints.h index a97452cde6..c742f812a7 100644 --- a/Source/Core/Common/Src/BreakPoints.h +++ b/Source/Core/Common/Src/BreakPoints.h @@ -78,7 +78,7 @@ public: // Remove Breakpoint void Remove(u32 _iAddress); - void Clear() { m_BreakPoints.clear(); }; + void Clear(); void DeleteByAddress(u32 _Address); diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index 1506170b2b..cb9f66b7d4 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -415,9 +415,8 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc if (Core::g_CoreStartupParameter.bEnableDebugging) { - // Comment out the following to disable breakpoints (speed-up) - blockSize = 1; - broken_block = true; + if (GetState() == CPU_STEPPING) + blockSize = 1; Trace(); } @@ -597,6 +596,20 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc SetJumpTarget(clearInt); } + if (Core::g_CoreStartupParameter.bEnableDebugging && breakpoints.IsAddressBreakPoint(ops[i].address) && GetState() != CPU_STEPPING) + { + MOV(32, M(&PC), Imm32(ops[i].address)); + ABI_CallFunction(reinterpret_cast(&PowerPC::CheckBreakPoints)); + TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF)); + + FixupBranch noBreakpoint = J_CC(CC_Z); + gpr.Flush(FLUSH_ALL); + fpr.Flush(FLUSH_ALL); + + WriteExit(ops[i].address, 0); + SetJumpTarget(noBreakpoint); + } + Jit64Tables::CompileInstruction(ops[i]); if (js.memcheck && (opinfo->flags & FL_LOADSTORE)) diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp index afab21b30e..7c3e7f0810 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp @@ -1269,7 +1269,8 @@ static const unsigned alwaysUsedList[] = { Store16, Store32, StoreSingle, StoreDouble, StorePaired, StoreFReg, FDCmpCR, BlockStart, BlockEnd, IdleBranch, BranchCond, BranchUncond, ShortIdleLoop, SystemCall, InterpreterBranch, RFIExit, FPExceptionCheckStart, - FPExceptionCheckEnd, ISIException, ExtExceptionCheck, Int3, Tramp, Nop + FPExceptionCheckEnd, ISIException, ExtExceptionCheck, BreakPointCheck, + Int3, Tramp, Nop }; static const unsigned extra8RegList[] = { LoadGReg, LoadCR, LoadGQR, LoadFReg, LoadFRegDENToZero, diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h index 284cbe6538..f41742b01c 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h @@ -168,7 +168,7 @@ enum Opcode { // used for exception checking, at least until someone // has a better idea of integrating it FPExceptionCheckStart, FPExceptionCheckEnd, - ISIException,ExtExceptionCheck, + ISIException, ExtExceptionCheck, BreakPointCheck, // "Opcode" representing a register too far away to // reference directly; this is a size optimization Tramp, @@ -414,6 +414,9 @@ public: InstLoc EmitExtExceptionCheck(InstLoc pc) { return EmitUOp(ExtExceptionCheck, pc); } + InstLoc EmitBreakPointCheck(InstLoc pc) { + return EmitUOp(BreakPointCheck, pc); + } InstLoc EmitRFIExit() { return FoldZeroOp(RFIExit, 0); } diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp index f82e34b5b1..743eaf2030 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp @@ -763,6 +763,7 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, bool UseProfile, bool Mak case FPExceptionCheckEnd: case ISIException: case ExtExceptionCheck: + case BreakPointCheck: case Int3: case Tramp: // No liveness effects @@ -1943,6 +1944,17 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, bool UseProfile, bool Mak Jit->SetJumpTarget(clearInt); break; } + case BreakPointCheck: { + unsigned InstLoc = ibuild->GetImmValue(getOp1(I)); + + Jit->MOV(32, M(&PC), Imm32(InstLoc)); + Jit->ABI_CallFunction(reinterpret_cast(&PowerPC::CheckBreakPoints)); + Jit->TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF)); + FixupBranch noBreakpoint = Jit->J_CC(CC_Z); + Jit->WriteExit(InstLoc, 0); + Jit->SetJumpTarget(noBreakpoint); + break; + } case Int3: { Jit->INT3(); break; diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp index 96afff1613..7694722bb5 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp @@ -523,8 +523,8 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc if (Core::g_CoreStartupParameter.bEnableDebugging) { - // Comment out the following to disable breakpoints (speed-up) - blockSize = 1; + if (GetState() == CPU_STEPPING) + blockSize = 1; Trace(); } @@ -653,6 +653,11 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc { ibuild.EmitExtExceptionCheck(ibuild.EmitIntConst(ops[i].address)); } + + if (Core::g_CoreStartupParameter.bEnableDebugging && breakpoints.IsAddressBreakPoint(ops[i].address) && GetState() != CPU_STEPPING) + { + ibuild.EmitBreakPointCheck(ibuild.EmitIntConst(ops[i].address)); + } JitILTables::CompileInstruction(ops[i]); diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp index bccb218fd9..46096450e7 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp @@ -417,6 +417,24 @@ bool JitBlock::ContainsAddress(u32 em_address) std::map, u32>::iterator it1 = block_map.lower_bound(std::make_pair(address, 0)), it2 = it1, it; while (it2 != block_map.end() && it2->first.second < address + 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, length); + } + else if (b.originalAddress & JIT_ICACHE_EXRAM_BIT) + { + u32 cacheaddr = b.originalAddress & JIT_ICACHEEX_MASK; + memset(iCacheEx + cacheaddr, JIT_ICACHE_INVALID_BYTE, length); + } + else + { + u32 cacheaddr = b.originalAddress & JIT_ICACHE_MASK; + memset(iCache + cacheaddr, JIT_ICACHE_INVALID_BYTE, length); + } +#endif DestroyBlock(it2->second, true); it2++; } From 05692b1e7e88d19d6045cc42464cc8ef11760c62 Mon Sep 17 00:00:00 2001 From: skidau Date: Fri, 16 Mar 2012 20:08:05 +1100 Subject: [PATCH 364/381] Sped up to the Dolphin debugger by not checking for breakpoints when stepping. Fixed the JIT cache, invalidating one instruction length at a time. Fixed a bug where the JIT cache did not get invalidated when stepping. Disabled fused instructions in the debugger. --- Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 2 +- Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp | 3 +++ Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 2 +- Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp | 3 +++ Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp | 6 +++--- Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp | 2 ++ 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index cb9f66b7d4..8140a075a2 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -601,8 +601,8 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc MOV(32, M(&PC), Imm32(ops[i].address)); ABI_CallFunction(reinterpret_cast(&PowerPC::CheckBreakPoints)); TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF)); - FixupBranch noBreakpoint = J_CC(CC_Z); + gpr.Flush(FLUSH_ALL); fpr.Flush(FLUSH_ALL); diff --git a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp b/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp index b9aaa2df6a..04462872e6 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp @@ -81,12 +81,15 @@ void Jit64AsmRoutineManager::Generate() if (Core::g_CoreStartupParameter.bEnableDebugging) { + TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(PowerPC::CPU_STEPPING)); + FixupBranch notStepping = J_CC(CC_Z); ABI_CallFunction(reinterpret_cast(&PowerPC::CheckBreakPoints)); TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF)); FixupBranch noBreakpoint = J_CC(CC_Z); ABI_PopAllCalleeSavedRegsAndAdjustStack(); RET(); SetJumpTarget(noBreakpoint); + SetJumpTarget(notStepping); } SetJumpTarget(skipToRealDispatch); diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index 4980b4d7a4..5aaf4b99f1 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -266,7 +266,7 @@ void Jit64::reg_imm(UGeckoInstruction inst) case 15: if (a == 0) { // lis // Merge with next instruction if loading a 32-bits immediate value (lis + addi, lis + ori) - if (!js.isLastInstruction) { + if (!js.isLastInstruction && !Core::g_CoreStartupParameter.bEnableDebugging) { if ((js.next_inst.OPCD == 14) && (js.next_inst.RD == d) && (js.next_inst.RA == d)) { // addi gpr.SetImmediate32(d, ((u32)inst.SIMM_16 << 16) + (u32)(s32)js.next_inst.SIMM_16); js.downcountAmount++; diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp index da94c881e3..ac533dd473 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp @@ -83,12 +83,15 @@ void JitILAsmRoutineManager::Generate() if (Core::g_CoreStartupParameter.bEnableDebugging) { + TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(PowerPC::CPU_STEPPING)); + FixupBranch notStepping = J_CC(CC_Z); ABI_CallFunction(reinterpret_cast(&PowerPC::CheckBreakPoints)); TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF)); FixupBranch noBreakpoint = J_CC(CC_Z); ABI_PopAllCalleeSavedRegsAndAdjustStack(); RET(); SetJumpTarget(noBreakpoint); + SetJumpTarget(notStepping); } SetJumpTarget(skipToRealDispatch); diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp index 46096450e7..8cc85e3284 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp @@ -422,17 +422,17 @@ bool JitBlock::ContainsAddress(u32 em_address) if (b.originalAddress & JIT_ICACHE_VMEM_BIT) { u32 cacheaddr = b.originalAddress & JIT_ICACHE_MASK; - memset(iCacheVMEM + cacheaddr, JIT_ICACHE_INVALID_BYTE, length); + 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, length); + memset(iCacheEx + cacheaddr, JIT_ICACHE_INVALID_BYTE, 4); } else { u32 cacheaddr = b.originalAddress & JIT_ICACHE_MASK; - memset(iCache + cacheaddr, JIT_ICACHE_INVALID_BYTE, length); + memset(iCache + cacheaddr, JIT_ICACHE_INVALID_BYTE, 4); } #endif DestroyBlock(it2->second, true); diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp index 37ff81772a..0b6b366c88 100644 --- a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp @@ -263,6 +263,8 @@ void CCodeWindow::SingleStep() { if (CCPU::IsStepping()) { + if (jit) + jit->GetBlockCache()->InvalidateICache(PC, 4); CCPU::StepOpcode(&sync_event); wxThread::Sleep(20); // need a short wait here From 6fe495e1aa77730b7d26ee64a89c6ecb2ec20449 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Sun, 18 Mar 2012 21:00:23 +1300 Subject: [PATCH 365/381] Fixed Pokepark 2! Maybe... :D Don't trust save states, although I think they are correct. File fd's were too large. Let me know if file related loading stops working in some games. fds are many to 1, not 1 to 1. ES has two instances available at a time. Sadly a clean up requires changing IWII_IPC_HLE_Device Constructor, as a deviceID doesn't make much sense per device. I won't do this until we have less branches :| --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 370 +++++++++++------- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h | 15 +- .../Core/Src/IPC_HLE/WII_IPC_HLE_Device.h | 3 +- .../Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp | 50 ++- .../Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h | 2 +- 5 files changed, 268 insertions(+), 172 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 38baf7f43e..756e59305d 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -68,8 +68,13 @@ TDeviceMap g_DeviceMap; // STATE_TO_SAVE typedef std::map TFileNameMap; -TFileNameMap g_FileNameMap; -u32 g_LastDeviceID; + +#define IPC_MAX_FDS 0x18 +#define ES_MAX_COUNT 2 +IWII_IPC_HLE_Device* g_FdMap[IPC_MAX_FDS]; +bool es_inuse[ES_MAX_COUNT]; +IWII_IPC_HLE_Device* es_handles[ES_MAX_COUNT]; + typedef std::deque ipc_msg_queue; static ipc_msg_queue request_queue; // ppc -> arm @@ -78,14 +83,27 @@ static ipc_msg_queue reply_queue; // arm -> ppc void Init() { _dbg_assert_msg_(WII_IPC_HLE, g_DeviceMap.empty(), "DeviceMap isnt empty on init"); + + u32 i; + for(i=0; iIsHardware()) + { + // close all files and delete their resources + g_FdMap[i]->Close(0, true); + delete g_FdMap[i]; + } + g_FdMap[i] = NULL; + } + TDeviceMap::iterator itr = g_DeviceMap.begin(); while (itr != g_DeviceMap.end()) { @@ -111,21 +139,17 @@ void Reset(bool _bHard) // Force close itr->second->Close(0, true); // Hardware should not be deleted unless it is a hard reset - if (_bHard || !itr->second->IsHardware()) + if (_bHard) delete itr->second; } ++itr; } - // Skip hardware devices if not a hard reset - itr = (_bHard) ? g_DeviceMap.begin() : g_DeviceMap.lower_bound(IPC_FIRST_FILEIO_ID); - // Erase devices - g_DeviceMap.erase(itr, g_DeviceMap.end()); - g_FileNameMap.clear(); - + if (_bHard) + { + g_DeviceMap.erase(g_DeviceMap.begin(), g_DeviceMap.end()); + } request_queue.clear(); reply_queue.clear(); - - g_LastDeviceID = IPC_FIRST_FILEIO_ID; } void Shutdown() @@ -135,41 +159,52 @@ void Shutdown() void SetDefaultContentFile(const std::string& _rFilename) { - CWII_IPC_HLE_Device_es* pDevice = - (CWII_IPC_HLE_Device_es*)AccessDeviceByID(GetDeviceIDByName(std::string("/dev/es"))); - if (pDevice) - pDevice->LoadWAD(_rFilename); + TDeviceMap::const_iterator itr = g_DeviceMap.begin(); + while(itr != g_DeviceMap.end()) + { + if (itr->second && itr->second->GetDeviceName().find(std::string("/dev/es")) == 0) + { + ((CWII_IPC_HLE_Device_es*)itr->second)->LoadWAD(_rFilename); + } + ++itr; + } } void ES_DIVerify(u8 *_pTMD, u32 _sz) { - CWII_IPC_HLE_Device_es* pDevice = - (CWII_IPC_HLE_Device_es*)AccessDeviceByID(GetDeviceIDByName(std::string("/dev/es"))); - if (pDevice) - pDevice->ES_DIVerify(_pTMD, _sz); - else - ERROR_LOG(WII_IPC_ES, "DIVerify called but /dev/es is not available"); + CWII_IPC_HLE_Device_es::ES_DIVerify(_pTMD, _sz); } void SDIO_EventNotify() { CWII_IPC_HLE_Device_sdio_slot0 *pDevice = - (CWII_IPC_HLE_Device_sdio_slot0*)AccessDeviceByID(GetDeviceIDByName(std::string("/dev/sdio/slot0"))); + (CWII_IPC_HLE_Device_sdio_slot0*)GetDeviceByName(std::string("/dev/sdio/slot0")); if (pDevice) pDevice->EventNotify(); } +int getFreeDeviceId() +{ + u32 i; + for(i=0; isecond->GetDeviceName() == _rDeviceName) - return itr->first; + if (itr->second && itr->second->GetDeviceName() == _rDeviceName) + return itr->second; ++itr; } - return -1; + return NULL; } IWII_IPC_HLE_Device* AccessDeviceByID(u32 _ID) @@ -177,17 +212,7 @@ IWII_IPC_HLE_Device* AccessDeviceByID(u32 _ID) if (g_DeviceMap.find(_ID) != g_DeviceMap.end()) return g_DeviceMap[_ID]; - return NULL; -} - -void DeleteDeviceByID(u32 ID) -{ - IWII_IPC_HLE_Device* pDevice = AccessDeviceByID(ID); - if (pDevice) - delete pDevice; - - g_DeviceMap.erase(ID); - g_FileNameMap.erase(ID); + return NULL; } // This is called from ExecuteCommand() COMMAND_OPEN_DEVICE @@ -205,60 +230,82 @@ IWII_IPC_HLE_Device* CreateFileIO(u32 _DeviceID, const std::string& _rDeviceName void DoState(PointerWrap &p) { - p.Do(g_LastDeviceID); + p.Do(request_queue); + p.Do(reply_queue); - if (p.GetMode() == PointerWrap::MODE_READ) - { - TFileNameMap::const_iterator itr; - // Delete file Handles - itr = g_FileNameMap.begin(); - while (itr != g_FileNameMap.end()) - { - TDeviceMap::const_iterator devitr = g_DeviceMap.find(itr->first); - if (devitr != g_DeviceMap.end()) + TDeviceMap::const_iterator itr; + + itr = g_DeviceMap.begin(); + while (itr != g_DeviceMap.end()) + { + if (itr->second->IsHardware()) { - if (devitr->second) - delete devitr->second; - g_DeviceMap.erase(itr->first); + itr->second->DoState(p); } ++itr; + } + + if (p.GetMode() == PointerWrap::MODE_READ) + { + u32 i; + for (i=0; iDoState(p); + } + } + else + { + g_FdMap[i] = NULL; + } } - // Load file names - p.Do(g_FileNameMap); - // Rebuild file handles - itr = g_FileNameMap.begin(); - while (itr != g_FileNameMap.end()) + for (i=0; ifirst] = new CWII_IPC_HLE_Device_FileIO(itr->first, itr->second); - ++itr; + p.Do(es_inuse[i]); + u32 handleID = es_handles[i]->GetDeviceID(); + p.Do(handleID); + + es_handles[i] = AccessDeviceByID(handleID); } } else { - p.Do(g_FileNameMap); - } - - p.Do(request_queue); - p.Do(reply_queue); - - - TDeviceMap::const_iterator itr; - //first, all the real devices - //(because we need fs to be deserialized first) - itr = g_DeviceMap.begin(); - while (itr != g_DeviceMap.end()) - { - if (itr->second->IsHardware()) - itr->second->DoState(p); - ++itr; - } - //then all the files - itr = g_DeviceMap.begin(); - while (itr != g_DeviceMap.end()) - { - if (!itr->second->IsHardware()) - itr->second->DoState(p); - ++itr; + u32 i; + for (i=0; iIsHardware() ? 1 : 0; + p.Do(isHw); + if (isHw) + { + u32 hwId = g_FdMap[i]->GetDeviceID(); + p.Do(hwId); + } + else + { + g_FdMap[i]->DoState(p); + } + } + } + for (i=0; iGetDeviceID(); + p.Do(handleID); + } } } @@ -267,67 +314,106 @@ void ExecuteCommand(u32 _Address) bool CmdSuccess = false; ECommandType Command = static_cast(Memory::Read_U32(_Address)); - int DeviceID = Memory::Read_U32(_Address + 8); - IWII_IPC_HLE_Device* pDevice = AccessDeviceByID(DeviceID); + volatile int DeviceID = Memory::Read_U32(_Address + 8); - INFO_LOG(WII_IPC_HLE, "-->> Execute Command Address: 0x%08x (code: %x, device: %x) ", _Address, Command, DeviceID); + IWII_IPC_HLE_Device* pDevice = (DeviceID >= 0 && DeviceID < IPC_MAX_FDS) ? g_FdMap[DeviceID] : NULL; + + INFO_LOG(WII_IPC_HLE, "-->> Execute Command Address: 0x%08x (code: %x, device: %x) %p", _Address, Command, DeviceID, pDevice); switch (Command) { case COMMAND_OPEN_DEVICE: - { - // Create a new HLE device. The Mode and DeviceName is given to us but we - // generate a DeviceID to be used for access to this device until it is Closed. - std::string DeviceName; - Memory::GetString(DeviceName, Memory::Read_U32(_Address + 0xC)); + { + u32 Mode = Memory::Read_U32(_Address + 0x10); + DeviceID = getFreeDeviceId(); + + std::string DeviceName; + Memory::GetString(DeviceName, Memory::Read_U32(_Address + 0xC)); - u32 Mode = Memory::Read_U32(_Address + 0x10); - DeviceID = GetDeviceIDByName(DeviceName); - - // check if a device with this name has been created already - if (DeviceName.find("/dev/") == std::string::npos || DeviceID == -1) - { - if (DeviceName.find("/dev/") == 0) + + WARN_LOG(WII_IPC_HLE, "Tried to open %s as %d", DeviceName.c_str(), DeviceID); + if (DeviceID >= 0) + { + if (DeviceName.find("/dev/es") == 0) + { + u32 j; + for (j=0; jOpen(_Address, Mode); + Memory::Write_U32(DeviceID, _Address+4); + break; + } + } + if(j == ES_MAX_COUNT) + { + Memory::Write_U32(FS_EESEXHAUSTED, _Address + 4); + CmdSuccess = true; + } - pDevice = AccessDeviceByID(GetDeviceIDByName(std::string("_Unimplemented_Device_"))); + } + else if (DeviceName.find("/dev/") == 0) + { + pDevice = GetDeviceByName(DeviceName); + if (pDevice) + { + g_FdMap[DeviceID] = pDevice; CmdSuccess = pDevice->Open(_Address, Mode); + INFO_LOG(WII_IPC_FILEIO, "IOP: ReOpen (Device=%s, DeviceID=%08x, Mode=%i)", + pDevice->GetDeviceName().c_str(), DeviceID, Mode); + Memory::Write_U32(DeviceID, _Address+4); } else { - // create new file handle - u32 CurrentDeviceID = g_LastDeviceID; - pDevice = CreateFileIO(CurrentDeviceID, DeviceName); - g_DeviceMap[CurrentDeviceID] = pDevice; - g_FileNameMap[CurrentDeviceID] = DeviceName; - g_LastDeviceID++; - + WARN_LOG(WII_IPC_HLE, "Unimplemented device: %s", DeviceName.c_str()); + pDevice = GetDeviceByName(std::string("_Unimplemented_Device_")); CmdSuccess = pDevice->Open(_Address, Mode); - - INFO_LOG(WII_IPC_FILEIO, "IOP: Open File (Device=%s, ID=%08x, Mode=%i)", - pDevice->GetDeviceName().c_str(), CurrentDeviceID, Mode); + g_FdMap[DeviceID] = pDevice; + Memory::Write_U32(DeviceID, _Address+4); } - } - else - { - // F|RES: prolly the re-open is just a mode change - pDevice = AccessDeviceByID(DeviceID); + } + else + { + IWII_IPC_HLE_Device* pDevice = CreateFileIO(DeviceID, DeviceName); CmdSuccess = pDevice->Open(_Address, Mode); - INFO_LOG(WII_IPC_FILEIO, "IOP: ReOpen (Device=%s, DeviceID=%08x, Mode=%i)", - pDevice->GetDeviceName().c_str(), DeviceID, Mode); - } - } - break; + 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) + g_FdMap[DeviceID] = pDevice; + } + } + else + { + Memory::Write_U32(FS_EFDEXHAUSTED, _Address + 4); + CmdSuccess = true; + } + break; + } case COMMAND_CLOSE_DEVICE: - if (pDevice) + { + if (pDevice) { CmdSuccess = pDevice->Close(_Address); + + u32 j; + for (j=0; jIsHardware()) - DeleteDeviceByID(DeviceID); + delete pDevice; } else { @@ -335,50 +421,67 @@ void ExecuteCommand(u32 _Address) CmdSuccess = true; } break; - + } case COMMAND_READ: + { if (pDevice) + { CmdSuccess = pDevice->Read(_Address); + } else { Memory::Write_U32(FS_EINVAL, _Address + 4); CmdSuccess = true; } break; - + } case COMMAND_WRITE: + { if (pDevice) + { CmdSuccess = pDevice->Write(_Address); + } else { Memory::Write_U32(FS_EINVAL, _Address + 4); CmdSuccess = true; } break; - + } case COMMAND_SEEK: + { if (pDevice) + { CmdSuccess = pDevice->Seek(_Address); + } else { Memory::Write_U32(FS_EINVAL, _Address + 4); CmdSuccess = true; } break; - + } case COMMAND_IOCTL: + { if (pDevice) + { CmdSuccess = pDevice->IOCtl(_Address); + } break; - + } case COMMAND_IOCTLV: + { if (pDevice) + { CmdSuccess = pDevice->IOCtlV(_Address); + } break; - + } default: + { _dbg_assert_msg_(WII_IPC_HLE, 0, "Unknown IPC Command %i (0x%08x)", Command, _Address); break; + } } // It seems that the original hardware overwrites the command after it has been @@ -450,8 +553,7 @@ void Update() void UpdateDevices() { // Check if a hardware device must be updated - TDeviceMap::const_iterator itrEnd = g_DeviceMap.lower_bound(IPC_FIRST_FILEIO_ID); - for (TDeviceMap::const_iterator itr = g_DeviceMap.begin(); itr != itrEnd; ++itr) { + for (TDeviceMap::const_iterator itr = g_DeviceMap.begin(); itr != g_DeviceMap.end(); ++itr) { if (itr->second->IsOpened() && itr->second->Update()) { break; } 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 11420d1cdd..2e056b5bec 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h @@ -25,9 +25,9 @@ class IWII_IPC_HLE_Device; namespace WII_IPC_HLE_Interface { -#define IPC_FIRST_HARDWARE_ID 0 // first IPC device ID -#define IPC_FIRST_FILEIO_ID 33 // first IPC file ID - +#define IPC_FIRST_ID 0x00 // first IPC device ID +#define IPC_MAX_FILES 0x10 // first IPC file ID + // Init void Init(); @@ -46,14 +46,13 @@ void ES_DIVerify(u8 *_pTMD, u32 _sz); void SDIO_EventNotify(); -int GetDeviceIDByName(const std::string& _rDeviceName); - -IWII_IPC_HLE_Device* AccessDeviceByID(u32 _ID); - -void DeleteDeviceByID(u32 _ID); IWII_IPC_HLE_Device* CreateFileIO(u32 _DeviceID, const std::string& _rDeviceName); +IWII_IPC_HLE_Device* GetDeviceByName(const std::string& _rDeviceName); +IWII_IPC_HLE_Device* AccessDeviceByID(u32 _ID); +int getFreeDeviceId(); + // Update void Update(); 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 36709a084f..113b14cffb 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 @@ -39,7 +39,7 @@ class PointerWrap; #define FS_ENOENT2 (u32)-106 // File not found #define FS_ENFILE (u32)-107 // Too many fds open #define FS_EFBIG (u32)-108 // max block count reached? -#define FS_ENFILE2 (u32)-109 // Too many fds open +#define FS_EFDEXHAUSTED (u32)-109 // Too many fds open #define FS_ENAMELEN (u32)-110 // pathname is too long #define FS_EFDOPEN (u32)-111 // FD is already open #define FS_EIO2 (u32)-114 // returned on ECC error @@ -47,6 +47,7 @@ class PointerWrap; #define FS_EDIRDEPTH (u32)-116 // max directory depth exceeded #define FS_EBUSY2 (u32)-118 // Resource busy //#define FS_EFATAL (u32)-119 // fatal error not used by IOS as fatal ERROR +#define FS_EESEXHAUSTED (u32)-1016 // Max of 2 ES handles at a time class IWII_IPC_HLE_Device { 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 98a85d25ca..f5a893012a 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,7 +28,7 @@ static Common::replace_v replacements; -// This is used by several of the FileIO and /dev/fs/ functions +// This is used by several of the FileIO and /dev/fs functions std::string HLE_IPC_BuildFilename(const char* _pFilename, int _size) { std::string path_full = File::GetUserPath(D_WIIROOT_IDX); @@ -128,7 +128,7 @@ bool CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode) // The file must exist before we can open it // It should be created by ISFS_CreateFile, not here - if(File::Exists(m_Filename)) + if (File::Exists(m_Filename)) { INFO_LOG(WII_IPC_FILEIO, "FileIO: Open %s (%s == %08X)", m_Name.c_str(), Modes[_Mode], _Mode); ReturnValue = m_DeviceID; @@ -149,21 +149,22 @@ bool CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode) bool CWII_IPC_HLE_Device_FileIO::OpenFile() { - switch(m_Mode) + switch (m_Mode) { case ISFS_OPEN_READ: + { m_pFileHandle.Open(m_Filename, "rb"); break; - - // "r+b" is technically wrong, but OPEN_WRITE should not truncate the file as "wb" does. + } case ISFS_OPEN_WRITE: m_pFileHandle.Open(m_Filename, "r+b"); break; case ISFS_OPEN_RW: + { m_pFileHandle.Open(m_Filename, "r+b"); break; - + } default: PanicAlertT("FileIO: Unknown open mode : 0x%02x", m_Mode); break; @@ -178,21 +179,21 @@ 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); + u32 ReturnValue = FS_RESULT_FATAL; + const s32 SeekPosition = Memory::Read_U32(_CommandAddress + 0xC); + const s32 Mode = Memory::Read_U32(_CommandAddress + 0x10); - if(OpenFile()) + if (OpenFile()) { ReturnValue = FS_RESULT_FATAL; - const u64 fileSize = m_pFileHandle.GetSize(); + const u64 fileSize = m_pFileHandle.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 >=0 && SeekPosition <= fileSize) + if (SeekPosition >=0 && SeekPosition <= fileSize) { m_SeekPos = SeekPosition; ReturnValue = m_SeekPos; @@ -202,7 +203,7 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) case 1: { s32 wantedPos = SeekPosition+m_SeekPos; - if(wantedPos >=0 && wantedPos <= fileSize) + if (wantedPos >=0 && wantedPos <= fileSize) { m_SeekPos = wantedPos; ReturnValue = m_SeekPos; @@ -212,7 +213,7 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) case 2: { s32 wantedPos = fileSize+m_SeekPos; - if(wantedPos >=0 && wantedPos <= fileSize) + if (wantedPos >=0 && wantedPos <= fileSize) { m_SeekPos = wantedPos; ReturnValue = m_SeekPos; @@ -244,7 +245,7 @@ bool CWII_IPC_HLE_Device_FileIO::Read(u32 _CommandAddress) const u32 Size = Memory::Read_U32(_CommandAddress + 0x10); - if(OpenFile()) + if (OpenFile()) { if (m_Mode == ISFS_OPEN_WRITE) { @@ -284,7 +285,7 @@ bool CWII_IPC_HLE_Device_FileIO::Write(u32 _CommandAddress) const u32 Size = Memory::Read_U32(_CommandAddress + 0x10); - if(OpenFile()) + if (OpenFile()) { if (m_Mode == ISFS_OPEN_READ) { @@ -318,21 +319,14 @@ bool CWII_IPC_HLE_Device_FileIO::IOCtl(u32 _CommandAddress) #if defined(_DEBUG) || defined(DEBUGFAST) DumpCommands(_CommandAddress); #endif - const u32 Parameter = Memory::Read_U32(_CommandAddress + 0xC); + const u32 Parameter = Memory::Read_U32(_CommandAddress + 0xC); + u32 ReturnValue = 0; - //u32 BufferIn = Memory::Read_U32(_CommandAddress + 0x10); - //u32 BufferInSize = Memory::Read_U32(_CommandAddress + 0x14); - //u32 BufferOut = Memory::Read_U32(_CommandAddress + 0x18); - //u32 BufferOutSize = Memory::Read_U32(_CommandAddress + 0x1C); - - // Return Value - u32 ReturnValue = 0; // no error - - switch(Parameter) + switch (Parameter) { case ISFS_IOCTL_GETFILESTATS: { - if(OpenFile()) + if (OpenFile()) { u32 m_FileLength = (u32)m_pFileHandle.GetSize(); diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h index 6c31e7be31..681baeebe6 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h @@ -37,7 +37,7 @@ public: virtual bool Close(u32 _CommandAddress, bool _bForce); virtual bool IOCtlV(u32 _CommandAddress); - u32 ES_DIVerify(u8 *_pTMD, u32 _sz); + static u32 ES_DIVerify(u8 *_pTMD, u32 _sz); private: enum From 8479d5bdf7eac446271288611f749776a1510e84 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Sun, 18 Mar 2012 21:50:07 +1300 Subject: [PATCH 366/381] Some code clean up. I am terrible at coding styles... --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 33 +++++++++++++------- 1 file changed, 21 insertions(+), 12 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 756e59305d..6c1ab5baef 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -85,7 +85,8 @@ void Init() _dbg_assert_msg_(WII_IPC_HLE, g_DeviceMap.empty(), "DeviceMap isnt empty on init"); u32 i; - for(i=0; iIsHardware()) { // close all files and delete their resources @@ -160,7 +162,7 @@ void Shutdown() void SetDefaultContentFile(const std::string& _rFilename) { TDeviceMap::const_iterator itr = g_DeviceMap.begin(); - while(itr != g_DeviceMap.end()) + while (itr != g_DeviceMap.end()) { if (itr->second && itr->second->GetDeviceName().find(std::string("/dev/es")) == 0) { @@ -185,7 +187,8 @@ void SDIO_EventNotify() int getFreeDeviceId() { u32 i; - for(i=0; iIsHardware() ? 1 : 0; p.Do(isHw); if (isHw) @@ -348,7 +355,7 @@ void ExecuteCommand(u32 _Address) break; } } - if(j == ES_MAX_COUNT) + if (j == ES_MAX_COUNT) { Memory::Write_U32(FS_EESEXHAUSTED, _Address + 4); CmdSuccess = true; @@ -382,7 +389,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) == DeviceID) g_FdMap[DeviceID] = pDevice; } @@ -553,8 +560,10 @@ void Update() void UpdateDevices() { // Check if a hardware device must be updated - for (TDeviceMap::const_iterator itr = g_DeviceMap.begin(); itr != g_DeviceMap.end(); ++itr) { - if (itr->second->IsOpened() && itr->second->Update()) { + for (TDeviceMap::const_iterator itr = g_DeviceMap.begin(); itr != g_DeviceMap.end(); ++itr) + { + if (itr->second->IsOpened() && itr->second->Update()) + { break; } } From cfbcaa2cc6d2c990b907747298ad012aa1c6c2fd Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 18 Mar 2012 23:37:38 +1100 Subject: [PATCH 367/381] Linux build fix --- Source/Core/Common/Src/BreakPoints.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Common/Src/BreakPoints.cpp b/Source/Core/Common/Src/BreakPoints.cpp index 9164312f82..1700276d85 100644 --- a/Source/Core/Common/Src/BreakPoints.cpp +++ b/Source/Core/Common/Src/BreakPoints.cpp @@ -18,8 +18,8 @@ #include "Common.h" #include "DebugInterface.h" #include "BreakPoints.h" +#include "../../Core/Src/PowerPC/JitCommon/JitBase.h" #include -#include "..\..\Core\Src\PowerPC\JitCommon\JitBase.h" bool BreakPoints::IsAddressBreakPoint(u32 _iAddress) { From ed3f9ce288ba3a74b263d2267e5bba96da3f0829 Mon Sep 17 00:00:00 2001 From: Andrew de los Reyes Date: Tue, 13 Mar 2012 17:14:00 -0700 Subject: [PATCH 368/381] Switch Mac compiler to Clang. Specifically: - Look for clang and clang++ in the new (Xcode 4.3) location first, then the old (Xcode 4.2) location. - Look for sysroot in the new (Xcode 4.3) location first, then the old (Xcode 4.2) location. --- CMakeLists.txt | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b64c5b6f61..c6fbad069d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,17 @@ # General setup # 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() +endif() project(dolphin-emu) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests) set(DOLPHIN_IS_STABLE FALSE) @@ -135,7 +146,11 @@ if (APPLE) # features can be used, not the minimum required version to run. set(OSX_MIN_VERSION "10.5.4") set(TARGET_FLAGS "${TARGET_FLAGS} -mmacosx-version-min=${OSX_MIN_VERSION}") - set(TARGET_FLAGS "${TARGET_FLAGS} -isysroot /Developer/SDKs/MacOSX10.6.sdk") + set(TARGET_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk") + if (NOT EXISTS "${TARGET_SYSROOT}/") + set(TARGET_SYSROOT "/Developer/SDKs/MacOSX10.6.sdk") + endif() + set(TARGET_FLAGS "${TARGET_FLAGS} -isysroot ${TARGET_SYSROOT}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-syslibroot,/Developer/SDKs/MacOSX10.6.sdk") # Do not warn about frameworks that are not available on all architectures. # This avoids a warning when linking with QuickTime. From d6d52920ec2f8c5d2ae74a219d16d211ecf45af9 Mon Sep 17 00:00:00 2001 From: Andrew de los Reyes Date: Fri, 16 Mar 2012 21:08:27 -0700 Subject: [PATCH 369/381] Fix segfault in LogWindow on Mac Commit 9ddb67d4a96a53698a71a7f3c8936c2437dd81de seems to have introduced a segfault on Mac. The issue is that it this change casts wxConvCurrent (which is a wxMBConvLibc) to a wxCSConv. This is an unsafe cast because wxCSConv has member variables, but wxMBConvLibc does not. In LogWindow.cpp, the constructor for m_SJISConv is dereferencing one of those member variables, which is a dereference of uninitialized memory! This CL reverts to the older (non-crashing) constructor, but keeps the behavior the same. --- Source/Core/DolphinWX/Src/LogWindow.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/LogWindow.cpp b/Source/Core/DolphinWX/Src/LogWindow.cpp index 0d11ef0142..4c9c495713 100644 --- a/Source/Core/DolphinWX/Src/LogWindow.cpp +++ b/Source/Core/DolphinWX/Src/LogWindow.cpp @@ -41,7 +41,7 @@ CLogWindow::CLogWindow(CFrame *parent, wxWindowID id, const wxPoint& pos, , x(0), y(0), winpos(0) , Parent(parent), m_ignoreLogTimer(false), m_LogAccess(true) , m_Log(NULL), m_cmdline(NULL), m_FontChoice(NULL) - , m_SJISConv(*(wxCSConv*)wxConvCurrent) + , m_SJISConv(wxT("")) { #ifdef _WIN32 static bool validCP932 = ::IsValidCodePage(932) != 0; @@ -52,6 +52,7 @@ CLogWindow::CLogWindow(CFrame *parent, wxWindowID id, const wxPoint& pos, else { WARN_LOG(COMMON, "Cannot Convert from Charset Windows Japanese cp 932"); + m_SJISConv = *(wxCSConv*)wxConvCurrent; } #else // on linux the wrong string is returned from wxFontMapper::GetEncodingName(wxFONTENCODING_SHIFT_JIS) From 20eca1bf7e2e02dd18229dc2b6b83935ce0d4047 Mon Sep 17 00:00:00 2001 From: marcosvitali Date: Sun, 18 Mar 2012 22:54:58 -0300 Subject: [PATCH 370/381] Ive fixed definitely Pokemon XD in dual core mode. This game is doing something not allowed. It attach to CPU the same fifo attached to the GPU in multibuffer mode. I added a check to prevent overwrite the GPU FIFO with the CPU FIFO. If the game do that on breakpoint the solution can fail. Fixed ReadWriteDistance calc when CPRead > CPWrite. Added Token and Finish cause to GP Jit checking. --- Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 2 +- .../Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp | 2 +- .../Core/VideoCommon/Src/CommandProcessor.cpp | 19 +++++++++++++++++-- .../Core/VideoCommon/Src/CommandProcessor.h | 3 ++- Source/Core/VideoCommon/Src/PixelEngine.cpp | 2 +- 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index 8140a075a2..fe090d1b50 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -584,7 +584,7 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc FixupBranch noExtException = J_CC(CC_Z); TEST(32, M((void *)&PowerPC::ppcState.msr), Imm32(0x0008000)); FixupBranch noExtIntEnable = J_CC(CC_Z); - TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); + TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP | ProcessorInterface::INT_CAUSE_PE_TOKEN | ProcessorInterface::INT_CAUSE_PE_FINISH)); FixupBranch noCPInt = J_CC(CC_Z); MOV(32, M(&PC), Imm32(ops[i].address)); diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp index 743eaf2030..7579c69a03 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp @@ -1932,7 +1932,7 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, bool UseProfile, bool Mak FixupBranch noExtException = Jit->J_CC(CC_Z); Jit->TEST(32, M((void *)&PowerPC::ppcState.msr), Imm32(0x0008000)); FixupBranch noExtIntEnable = Jit->J_CC(CC_Z); - Jit->TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP)); + Jit->TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP || ProcessorInterface::INT_CAUSE_PE_TOKEN || ProcessorInterface::INT_CAUSE_PE_FINISH)); FixupBranch noCPInt = Jit->J_CC(CC_Z); Jit->MOV(32, M(&PC), Imm32(InstLoc)); diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp index 3744acd200..a4dddf537f 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp @@ -61,6 +61,7 @@ volatile bool interruptSet= false; volatile bool interruptWaiting= false; volatile bool interruptTokenWaiting = false; volatile bool interruptFinishWaiting = false; +volatile bool waitingForPEInterruptDisable = false; bool IsOnThread() { @@ -174,7 +175,7 @@ void Read16(u16& _rReturnValue, const u32 _Address) if(fifo.CPWritePointer >= fifo.SafeCPReadPointer) _rReturnValue = ReadLow (fifo.CPWritePointer - fifo.SafeCPReadPointer); else - _rReturnValue = ReadLow (fifo.CPEnd - fifo.CPWritePointer + fifo.SafeCPReadPointer); + _rReturnValue = ReadLow (fifo.CPEnd - fifo.SafeCPReadPointer + fifo.CPWritePointer - fifo.CPBase + 32); else _rReturnValue = ReadLow (fifo.CPReadWriteDistance); DEBUG_LOG(COMMANDPROCESSOR, "read FIFO_RW_DISTANCE_LO : %04x", _rReturnValue); @@ -184,7 +185,7 @@ void Read16(u16& _rReturnValue, const u32 _Address) if(fifo.CPWritePointer >= fifo.SafeCPReadPointer) _rReturnValue = ReadHigh (fifo.CPWritePointer - fifo.SafeCPReadPointer); else - _rReturnValue = ReadHigh (fifo.CPEnd - fifo.CPWritePointer + fifo.SafeCPReadPointer); + _rReturnValue = ReadHigh (fifo.CPEnd - fifo.SafeCPReadPointer + fifo.CPWritePointer - fifo.CPBase + 32); else _rReturnValue = ReadHigh(fifo.CPReadWriteDistance); DEBUG_LOG(COMMANDPROCESSOR, "read FIFO_RW_DISTANCE_HI : %04x", _rReturnValue); @@ -437,11 +438,25 @@ void Write32(const u32 _Data, const u32 _Address) void STACKALIGN GatherPipeBursted() { + ProcessFifoEvents(); // if we aren't linked, we don't care about gather pipe data if (!m_CPCtrlReg.GPLinkEnable) { if (!IsOnThread()) RunGpu(); + else + { + // In multibuffer mode is not allowed write in the same fifo attached to the GPU. + // Fix Pokemon XD in DC mode. + if((ProcessorInterface::Fifo_CPUEnd == fifo.CPEnd) && (ProcessorInterface::Fifo_CPUBase == fifo.CPBase) + && fifo.CPReadWriteDistance > 0) + { + waitingForPEInterruptDisable = true; + ProcessFifoAllDistance(); + waitingForPEInterruptDisable = false; + } + + } return; } diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.h b/Source/Core/VideoCommon/Src/CommandProcessor.h index 440c900dc3..5d31453537 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.h +++ b/Source/Core/VideoCommon/Src/CommandProcessor.h @@ -35,7 +35,8 @@ extern volatile bool interruptSet; extern volatile bool interruptWaiting; extern volatile bool interruptTokenWaiting; extern volatile bool interruptFinishWaiting; - +extern volatile bool waitingForPEInterruptDisable; + // internal hardware addresses enum { diff --git a/Source/Core/VideoCommon/Src/PixelEngine.cpp b/Source/Core/VideoCommon/Src/PixelEngine.cpp index 38c85cc10c..e6dbdb8c26 100644 --- a/Source/Core/VideoCommon/Src/PixelEngine.cpp +++ b/Source/Core/VideoCommon/Src/PixelEngine.cpp @@ -462,7 +462,7 @@ void ResetSetToken() bool WaitingForPEInterrupt() { - return CommandProcessor::interruptFinishWaiting || CommandProcessor::interruptTokenWaiting || interruptSetFinish || interruptSetToken; + return !CommandProcessor::waitingForPEInterruptDisable && (CommandProcessor::interruptFinishWaiting || CommandProcessor::interruptTokenWaiting || interruptSetFinish || interruptSetToken); } void ResumeWaitingForPEInterrupt() From 418f46ea72828d828febf2a1eadfcb262e9a974d Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Mon, 19 Mar 2012 17:55:46 +1300 Subject: [PATCH 371/381] Fixed memory leak. And added braces to match the rest of the switch statement in FileIO. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 6 ++++++ Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp | 5 ++++- 2 files changed, 10 insertions(+), 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 6c1ab5baef..b552185f87 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -390,7 +390,13 @@ 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) + { g_FdMap[DeviceID] = pDevice; + } + else + { + delete pDevice; + } } } 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 f5a893012a..1f0b0d72cd 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 @@ -157,18 +157,21 @@ bool CWII_IPC_HLE_Device_FileIO::OpenFile() break; } case ISFS_OPEN_WRITE: + { m_pFileHandle.Open(m_Filename, "r+b"); break; - + } case ISFS_OPEN_RW: { m_pFileHandle.Open(m_Filename, "r+b"); break; } default: + { PanicAlertT("FileIO: Unknown open mode : 0x%02x", m_Mode); break; } + } return m_pFileHandle.IsOpen(); } From 281d7531a3d92036380b27e2dabda162e7289f87 Mon Sep 17 00:00:00 2001 From: skidau Date: Mon, 19 Mar 2012 21:51:26 +1100 Subject: [PATCH 372/381] Fixed a crash on exit by calling DefWindowProc after the WM_DESTORY message has been received. Patch by eddie.willett. Fixes issue 4588. Fixes issue 5285. --- Externals/wxWidgets/include/wx/msw/window.h | 2 +- Externals/wxWidgets/src/msw/window.cpp | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Externals/wxWidgets/include/wx/msw/window.h b/Externals/wxWidgets/include/wx/msw/window.h index c75ac55d33..b037268bd6 100644 --- a/Externals/wxWidgets/include/wx/msw/window.h +++ b/Externals/wxWidgets/include/wx/msw/window.h @@ -365,7 +365,7 @@ public: virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); // Calls an appropriate default window procedure - virtual WXLRESULT MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + virtual WXLRESULT MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam, bool callDefWindowProc = false); // message processing helpers diff --git a/Externals/wxWidgets/src/msw/window.cpp b/Externals/wxWidgets/src/msw/window.cpp index 4810bd68d7..00e68b2d2d 100644 --- a/Externals/wxWidgets/src/msw/window.cpp +++ b/Externals/wxWidgets/src/msw/window.cpp @@ -2234,9 +2234,9 @@ bool wxWindowMSW::DoPopupMenu(wxMenu *menu, int x, int y) // pre/post message processing // =========================================================================== -WXLRESULT wxWindowMSW::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) +WXLRESULT wxWindowMSW::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam, bool callDefWindowProc /* = false */) { - if ( m_oldWndProc ) + if (!callDefWindowProc && m_oldWndProc) return ::CallWindowProc(CASTWNDPROC m_oldWndProc, GetHwnd(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam); else return ::DefWindowProc(GetHwnd(), nMsg, wParam, lParam); @@ -2653,11 +2653,12 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l break; case WM_DESTROY: - // never set processed to true and *always* pass WM_DESTROY to - // DefWindowProc() as Windows may do some internal cleanup when - // processing it and failing to pass the message along may cause - // memory and resource leaks! + // *always* pass WM_DESTROY to DefWindowProc() as Windows may do + // some internal cleanup when processing it and failing to pass + // the message along may cause memory and resource leaks! (void)HandleDestroy(); + rc.result = MSWDefWindowProc(message, wParam, lParam, true); + processed = true; break; case WM_SIZE: From 14ea442382681567277e0cd0538d4537f434effe Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Tue, 20 Mar 2012 19:51:42 +1300 Subject: [PATCH 373/381] srawx fixed thanks to boo toe. --- Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Integer.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Integer.cpp index 572cb63861..379aaca48a 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Integer.cpp @@ -493,6 +493,9 @@ void JitIL::srawx(UGeckoInstruction inst) test = ibuild.EmitOr(val, mask2); test = ibuild.EmitICmpUgt(test, mask); ibuild.EmitStoreCarry(test); + + if (inst.Rc) + ComputeRC(ibuild, val); } void JitIL::srawix(UGeckoInstruction inst) From 5e2fd4520302bd6a7232772ea878894e2b7fed61 Mon Sep 17 00:00:00 2001 From: skidau Date: Tue, 20 Mar 2012 21:01:15 +1100 Subject: [PATCH 374/381] Merge fix --- Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 42 +++++++++++++++++++ .../Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp | 10 +++++ 2 files changed, 52 insertions(+) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index 15bd5ca18a..b43ed516dd 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -41,6 +41,10 @@ #include "JitAsm.h" #include "JitRegCache.h" #include "Jit64_Tables.h" +#include "HW/ProcessorInterface.h" +#if defined(_DEBUG) || defined(DEBUGFAST) +#include "PowerPCDisasm.h" +#endif using namespace Gen; using namespace PowerPC; @@ -572,6 +576,44 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc SetJumpTarget(b1); } + // Add an external exception check if the instruction writes to the FIFO. + if (jit->js.fifoWriteAddresses.find(ops[i].address) != jit->js.fifoWriteAddresses.end()) + { + gpr.Flush(FLUSH_ALL); + fpr.Flush(FLUSH_ALL); + + TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_ISI | EXCEPTION_PROGRAM | EXCEPTION_SYSCALL | EXCEPTION_FPU_UNAVAILABLE | EXCEPTION_DSI | EXCEPTION_ALIGNMENT | EXCEPTION_DECREMENTER)); + FixupBranch clearInt = J_CC(CC_NZ); + TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_EXTERNAL_INT)); + FixupBranch noExtException = J_CC(CC_Z); + TEST(32, M((void *)&PowerPC::ppcState.msr), Imm32(0x0008000)); + FixupBranch noExtIntEnable = J_CC(CC_Z); + TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP | ProcessorInterface::INT_CAUSE_PE_TOKEN | ProcessorInterface::INT_CAUSE_PE_FINISH)); + FixupBranch noCPInt = J_CC(CC_Z); + + MOV(32, M(&PC), Imm32(ops[i].address)); + WriteExceptionExit(); + + SetJumpTarget(noCPInt); + SetJumpTarget(noExtIntEnable); + SetJumpTarget(noExtException); + SetJumpTarget(clearInt); + } + + if (Core::g_CoreStartupParameter.bEnableDebugging && breakpoints.IsAddressBreakPoint(ops[i].address) && GetState() != CPU_STEPPING) + { + MOV(32, M(&PC), Imm32(ops[i].address)); + ABI_CallFunction(reinterpret_cast(&PowerPC::CheckBreakPoints)); + TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF)); + FixupBranch noBreakpoint = J_CC(CC_Z); + + gpr.Flush(FLUSH_ALL); + fpr.Flush(FLUSH_ALL); + + WriteExit(ops[i].address, 0); + SetJumpTarget(noBreakpoint); + } + Jit64Tables::CompileInstruction(ops[i]); if (js.memcheck && (opinfo->flags & FL_LOADSTORE)) diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp index 0c6fc41366..e079fb7896 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp @@ -652,6 +652,16 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc { ibuild.EmitFPExceptionCheckStart(ibuild.EmitIntConst(ops[i].address)); } + + if (jit->js.fifoWriteAddresses.find(js.compilerPC) != jit->js.fifoWriteAddresses.end()) + { + ibuild.EmitExtExceptionCheck(ibuild.EmitIntConst(ops[i].address)); + } + + if (Core::g_CoreStartupParameter.bEnableDebugging && breakpoints.IsAddressBreakPoint(ops[i].address) && GetState() != CPU_STEPPING) + { + ibuild.EmitBreakPointCheck(ibuild.EmitIntConst(ops[i].address)); + } JitILTables::CompileInstruction(ops[i]); From 0861f524d4480bb33a7de94029e5f35ad841c282 Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Tue, 20 Mar 2012 20:41:55 +0200 Subject: [PATCH 375/381] Gameini database update. About 142 files updated or added to the database. --- Data/User/GameConfig/G4FD69.ini | 9 +++++++-- Data/User/GameConfig/G4FE69.ini | 12 ++++++++---- Data/User/GameConfig/G4FF69.ini | 9 +++++++-- Data/User/GameConfig/G4FP69.ini | 9 +++++++-- Data/User/GameConfig/G6TP5G.ini | 1 + Data/User/GameConfig/GCZE69.ini | 9 ++++++--- Data/User/GameConfig/GCZP69.ini | 9 +++++++-- Data/User/GameConfig/GDGE7H.ini | 6 +++--- Data/User/GameConfig/GDGP78.ini | 6 +++--- Data/User/GameConfig/GEND69.ini | 4 ++-- Data/User/GameConfig/GENE69.ini | 4 ++-- Data/User/GameConfig/GENP69.ini | 4 ++-- Data/User/GameConfig/GENS69.ini | 4 ++-- Data/User/GameConfig/GF5E69.ini | 11 +++++++---- Data/User/GameConfig/GF6E69.ini | 12 ++++++++---- Data/User/GameConfig/GF6F69.ini | 9 +++++++-- Data/User/GameConfig/GFAD69.ini | 6 +++--- Data/User/GameConfig/GFAE69.ini | 6 +++--- Data/User/GameConfig/GFAP69.ini | 6 +++--- Data/User/GameConfig/GFAS69.ini | 6 +++--- Data/User/GameConfig/GFYE69.ini | 11 +++++++---- Data/User/GameConfig/GFYP69.ini | 5 ++--- Data/User/GameConfig/GG5E52.ini | 2 +- Data/User/GameConfig/GGYE41.ini | 2 -- Data/User/GameConfig/GGYP41.ini | 2 -- Data/User/GameConfig/GH7E5D.ini | 2 +- Data/User/GameConfig/GHCE4Q.ini | 8 ++++++-- Data/User/GameConfig/GHCF4Q.ini | 7 ++++++- Data/User/GameConfig/GIKE70.ini | 8 ++++++++ Data/User/GameConfig/GIKP70.ini | 1 + Data/User/GameConfig/GIZE52.ini | 4 ++-- Data/User/GameConfig/GJWE78.ini | 8 ++++++-- Data/User/GameConfig/GJZE52.ini | 2 +- Data/User/GameConfig/GK4E01.ini | 10 +++++++--- Data/User/GameConfig/GKBEAF.ini | 2 +- Data/User/GameConfig/GKBPAF.ini | 2 +- Data/User/GameConfig/GKLE69.ini | 12 +++++++++--- Data/User/GameConfig/GKLF69.ini | 12 +++++++++--- Data/User/GameConfig/GKLP69.ini | 7 +++---- Data/User/GameConfig/GKLS69.ini | 12 +++++++++--- Data/User/GameConfig/GLCE52.ini | 1 + Data/User/GameConfig/GLCF52.ini | 1 + Data/User/GameConfig/GM5E7D.ini | 5 ++--- Data/User/GameConfig/GM5F7D.ini | 5 ++--- Data/User/GameConfig/GM5P7D.ini | 6 ++---- Data/User/GameConfig/GNNE69.ini | 2 ++ Data/User/GameConfig/GOAE52.ini | 2 +- Data/User/GameConfig/GPOP8P.ini | 1 + Data/User/GameConfig/GPSP8P.ini | 1 + Data/User/GameConfig/GQTE4Q.ini | 7 +++++-- Data/User/GameConfig/GRYE41.ini | 18 ++++++++++++++++++ Data/User/GameConfig/GT3D52.ini | 4 ++-- Data/User/GameConfig/GT3E52.ini | 4 ++-- Data/User/GameConfig/GT3F52.ini | 4 ++-- Data/User/GameConfig/GT3P52.ini | 4 ++-- Data/User/GameConfig/GT7E41.ini | 3 +-- Data/User/GameConfig/GT7P41.ini | 3 ++- Data/User/GameConfig/GT7X41.ini | 3 ++- Data/User/GameConfig/GTYE69.ini | 4 ++-- Data/User/GameConfig/GTYP69.ini | 4 ++-- Data/User/GameConfig/GVKE52.ini | 8 ++++++-- Data/User/GameConfig/GWYE41.ini | 1 + Data/User/GameConfig/GXFE69.ini | 4 ++-- Data/User/GameConfig/GXFF69.ini | 4 ++-- Data/User/GameConfig/GXFP69.ini | 4 ++-- Data/User/GameConfig/GXXE01.ini | 1 - Data/User/GameConfig/GXXP01.ini | 2 -- Data/User/GameConfig/GYWD41.ini | 4 ++-- Data/User/GameConfig/GYWEE9.ini | 4 ++-- Data/User/GameConfig/GYWP41.ini | 4 ++-- Data/User/GameConfig/HACA01.ini | 1 + Data/User/GameConfig/R22E01.ini | 2 +- Data/User/GameConfig/R22J01.ini | 2 +- Data/User/GameConfig/R22P01.ini | 2 +- Data/User/GameConfig/R3OJ01.ini | 1 + Data/User/GameConfig/R3OP01.ini | 1 + Data/User/GameConfig/R5DE5G.ini | 4 +--- Data/User/GameConfig/R5IE4Q.ini | 1 + Data/User/GameConfig/R5IP4Q.ini | 1 + Data/User/GameConfig/R5IX4Q.ini | 1 + Data/User/GameConfig/R6YEXS.ini | 1 + Data/User/GameConfig/R6YPH3.ini | 1 + Data/User/GameConfig/R7XE69.ini | 21 +++++++++++++++++++++ Data/User/GameConfig/R7XJ13.ini | 21 +++++++++++++++++++++ Data/User/GameConfig/R7XP69.ini | 21 +++++++++++++++++++++ Data/User/GameConfig/RBWE01.ini | 4 ++-- Data/User/GameConfig/RBWJ01.ini | 12 +++++++++--- Data/User/GameConfig/RBWP01.ini | 12 +++++++++--- Data/User/GameConfig/RDSJAF.ini | 1 + Data/User/GameConfig/RDSPAF.ini | 1 + Data/User/GameConfig/RFCJGD.ini | 1 + Data/User/GameConfig/RFCPGD.ini | 1 + Data/User/GameConfig/RFFJGD.ini | 2 +- Data/User/GameConfig/RFFPGD.ini | 1 + Data/User/GameConfig/RFQP69.ini | 1 + Data/User/GameConfig/RIPJAF.ini | 1 + Data/User/GameConfig/RIPPAF.ini | 1 + Data/User/GameConfig/RIUJAF.ini | 1 + Data/User/GameConfig/RK2JEB.ini | 1 + Data/User/GameConfig/RK2P01.ini | 1 + Data/User/GameConfig/RKDJEB.ini | 1 + Data/User/GameConfig/RKDP01.ini | 1 + Data/User/GameConfig/RKDPEB.ini | 1 + Data/User/GameConfig/ROUJAF.ini | 1 + Data/User/GameConfig/RQ6EJJ.ini | 3 +-- Data/User/GameConfig/RQ6PKM.ini | 3 +-- Data/User/GameConfig/RQ6XKM.ini | 3 +-- Data/User/GameConfig/S2LE01.ini | 19 +++++++++++++++++++ Data/User/GameConfig/S2LJ01.ini | 19 +++++++++++++++++++ Data/User/GameConfig/S2LP01.ini | 19 +++++++++++++++++++ Data/User/GameConfig/S59E01.ini | 1 + Data/User/GameConfig/S59JC8.ini | 1 + Data/User/GameConfig/SAKPNS.ini | 1 + Data/User/GameConfig/SBDJ08.ini | 1 + Data/User/GameConfig/SBDK08.ini | 1 + Data/User/GameConfig/SBDP08.ini | 1 + Data/User/GameConfig/SC8E01.ini | 15 +++++++++++++++ Data/User/GameConfig/SC8J01.ini | 15 +++++++++++++++ Data/User/GameConfig/SC8P01.ini | 15 +++++++++++++++ Data/User/GameConfig/SE2P69.ini | 1 + Data/User/GameConfig/SEAE69.ini | 1 + Data/User/GameConfig/SEAJ13.ini | 1 + Data/User/GameConfig/SEAP69.ini | 1 + Data/User/GameConfig/SFWP69.ini | 1 + Data/User/GameConfig/SLSJ01.ini | 19 +++++++++++++++++++ Data/User/GameConfig/SLSP01.ini | 19 +++++++++++++++++++ Data/User/GameConfig/SMNE01.ini | 1 + Data/User/GameConfig/SMNJ01.ini | 1 + Data/User/GameConfig/SMNK01.ini | 1 + Data/User/GameConfig/SMNW01.ini | 1 + Data/User/GameConfig/SNDE20.ini | 17 +++++++++++++++++ Data/User/GameConfig/SNJP69.ini | 1 + Data/User/GameConfig/SOUE01.ini | 3 +++ Data/User/GameConfig/SOUJ01.ini | 3 +++ Data/User/GameConfig/SOUK01.ini | 3 +++ Data/User/GameConfig/SOUP01.ini | 3 +++ Data/User/GameConfig/SPTJEB.ini | 1 + Data/User/GameConfig/SUKE01.ini | 3 +-- Data/User/GameConfig/SUKJ01.ini | 2 +- Data/User/GameConfig/SUKP01.ini | 2 +- Data/User/GameConfig/SXCP52.ini | 1 + Data/User/GameConfig/WF4EGD.ini | 1 + 142 files changed, 548 insertions(+), 161 deletions(-) create mode 100644 Data/User/GameConfig/GRYE41.ini create mode 100644 Data/User/GameConfig/R7XE69.ini create mode 100644 Data/User/GameConfig/R7XJ13.ini create mode 100644 Data/User/GameConfig/R7XP69.ini create mode 100644 Data/User/GameConfig/S2LE01.ini create mode 100644 Data/User/GameConfig/S2LJ01.ini create mode 100644 Data/User/GameConfig/S2LP01.ini create mode 100644 Data/User/GameConfig/SC8E01.ini create mode 100644 Data/User/GameConfig/SC8J01.ini create mode 100644 Data/User/GameConfig/SC8P01.ini create mode 100644 Data/User/GameConfig/SLSJ01.ini create mode 100644 Data/User/GameConfig/SLSP01.ini create mode 100644 Data/User/GameConfig/SNDE20.ini diff --git a/Data/User/GameConfig/G4FD69.ini b/Data/User/GameConfig/G4FD69.ini index abc304e162..4de9d5c61d 100644 --- a/Data/User/GameConfig/G4FD69.ini +++ b/Data/User/GameConfig/G4FD69.ini @@ -1,11 +1,16 @@ # G4FD69 - FIFA 07 [Core] Values set here will override the main dolphin settings. -MMU = 1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU(r6932) +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/G4FE69.ini b/Data/User/GameConfig/G4FE69.ini index 2f08c09f90..f4b303cd32 100644 --- a/Data/User/GameConfig/G4FE69.ini +++ b/Data/User/GameConfig/G4FE69.ini @@ -1,12 +1,16 @@ # G4FE69 - FIFA 07 [Core] Values set here will override the main dolphin settings. -MMU = 1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU(r6932) +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/G4FF69.ini b/Data/User/GameConfig/G4FF69.ini index 6f94d10dc7..688bde8ea9 100644 --- a/Data/User/GameConfig/G4FF69.ini +++ b/Data/User/GameConfig/G4FF69.ini @@ -1,11 +1,16 @@ # G4FF69 - FIFA 07 [Core] Values set here will override the main dolphin settings. -MMU = 1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU(r6932) +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/G4FP69.ini b/Data/User/GameConfig/G4FP69.ini index 80743faa36..f4b303cd32 100644 --- a/Data/User/GameConfig/G4FP69.ini +++ b/Data/User/GameConfig/G4FP69.ini @@ -1,11 +1,16 @@ # G4FE69 - FIFA 07 [Core] Values set here will override the main dolphin settings. -MMU = 1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU(r6932) +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/G6TP5G.ini b/Data/User/GameConfig/G6TP5G.ini index 6f32916865..3850135202 100644 --- a/Data/User/GameConfig/G6TP5G.ini +++ b/Data/User/GameConfig/G6TP5G.ini @@ -16,3 +16,4 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/GCZE69.ini b/Data/User/GameConfig/GCZE69.ini index dd3f749849..d5b582c365 100644 --- a/Data/User/GameConfig/GCZE69.ini +++ b/Data/User/GameConfig/GCZE69.ini @@ -1,17 +1,20 @@ # GCZE69 - CATWOMAN [Core] Values set here will override the main dolphin settings. TLBHack = 1 -MMU = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Needs MMU and is slow (r6898) +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] SafeTextureCache = True SafeTextureCacheColorSamples = 512 [Video_Enhancements] - diff --git a/Data/User/GameConfig/GCZP69.ini b/Data/User/GameConfig/GCZP69.ini index 320db678f9..b04a026c61 100644 --- a/Data/User/GameConfig/GCZP69.ini +++ b/Data/User/GameConfig/GCZP69.ini @@ -1,15 +1,20 @@ # GCZP69 - CATWOMAN [Core] Values set here will override the main dolphin settings. TLBHack = 1 -MMU = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Needs MMU and is slow (r6898) +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] SafeTextureCache = True SafeTextureCacheColorSamples = 512 +[Video_Enhancements] diff --git a/Data/User/GameConfig/GDGE7H.ini b/Data/User/GameConfig/GDGE7H.ini index 60f3aefa3f..9228786a72 100644 --- a/Data/User/GameConfig/GDGE7H.ini +++ b/Data/User/GameConfig/GDGE7H.ini @@ -1,9 +1,9 @@ # GDGE7H - Dragon's Lair 3D [Core] Values set here will override the main dolphin settings. -MMU = 1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Needs MMU (very slow due to that). +EmulationStateId = 4 +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. [Video] diff --git a/Data/User/GameConfig/GDGP78.ini b/Data/User/GameConfig/GDGP78.ini index f425112d03..7ff92c8b6c 100644 --- a/Data/User/GameConfig/GDGP78.ini +++ b/Data/User/GameConfig/GDGP78.ini @@ -1,9 +1,9 @@ # GDGP78 - Dragon's Lair 3D [Core] Values set here will override the main dolphin settings. -MMU = 1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Needs MMU (very slow due to that). +EmulationStateId = 4 +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. [Video] diff --git a/Data/User/GameConfig/GEND69.ini b/Data/User/GameConfig/GEND69.ini index 43cb8e86e1..bae13d7b54 100644 --- a/Data/User/GameConfig/GEND69.ini +++ b/Data/User/GameConfig/GEND69.ini @@ -2,8 +2,8 @@ [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 = Needs LLE audio for proper sound. -EmulationStateId = 4 +EmulationIssues = Needs LLE audio for proper sound. Graphic glitches (depth issues). Fixed in zcomploc support Dolphin branch. +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/GENE69.ini b/Data/User/GameConfig/GENE69.ini index 6307e0268f..23f8b03271 100644 --- a/Data/User/GameConfig/GENE69.ini +++ b/Data/User/GameConfig/GENE69.ini @@ -2,8 +2,8 @@ [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 = Needs LLE audio for proper sound. -EmulationStateId = 4 +EmulationIssues = Needs LLE audio for proper sound. Graphic glitches (depth issues). Fixed in zcomploc support Dolphin branch. +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/GENP69.ini b/Data/User/GameConfig/GENP69.ini index be23957d70..5bf6674c6a 100644 --- a/Data/User/GameConfig/GENP69.ini +++ b/Data/User/GameConfig/GENP69.ini @@ -2,8 +2,8 @@ [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 = Needs LLE audio for proper sound. -EmulationStateId = 4 +EmulationIssues = Needs LLE audio for proper sound. Graphic glitches (depth issues). Fixed in zcomploc support Dolphin branch. +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/GENS69.ini b/Data/User/GameConfig/GENS69.ini index c0645ed29a..227aaddd6d 100644 --- a/Data/User/GameConfig/GENS69.ini +++ b/Data/User/GameConfig/GENS69.ini @@ -2,8 +2,8 @@ [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 = Needs LLE audio for proper sound. -EmulationStateId = 4 +EmulationIssues = Needs LLE audio for proper sound. Graphic glitches (depth issues). Fixed in zcomploc support Dolphin branch. +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/GF5E69.ini b/Data/User/GameConfig/GF5E69.ini index 40e4375018..79b7cf1fd5 100644 --- a/Data/User/GameConfig/GF5E69.ini +++ b/Data/User/GameConfig/GF5E69.ini @@ -1,13 +1,16 @@ # GF5E69 - FIFA Soccer 2005 [Core] Values set here will override the main dolphin settings. TLBHack = 1 -MMU = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU(r6932) -EmulationStateId = 3 +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/GF6E69.ini b/Data/User/GameConfig/GF6E69.ini index 037aeb7404..d812a5d154 100644 --- a/Data/User/GameConfig/GF6E69.ini +++ b/Data/User/GameConfig/GF6E69.ini @@ -1,12 +1,16 @@ # GF6E69 - FIFA 06 [Core] Values set here will override the main dolphin settings. -MMU = 1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU(r6932) +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/GF6F69.ini b/Data/User/GameConfig/GF6F69.ini index 19bc8b9072..2696bcb453 100644 --- a/Data/User/GameConfig/GF6F69.ini +++ b/Data/User/GameConfig/GF6F69.ini @@ -1,11 +1,16 @@ # GF6F69 - FIFA 06 [Core] Values set here will override the main dolphin settings. -MMU = 1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU(r6932) +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/GFAD69.ini b/Data/User/GameConfig/GFAD69.ini index 115f719d10..5abba727c5 100644 --- a/Data/User/GameConfig/GFAD69.ini +++ b/Data/User/GameConfig/GFAD69.ini @@ -1,9 +1,9 @@ # GFAD69 - FIFA 2003 [Core] Values set here will override the main dolphin settings. -MMU = 1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU. +EmulationStateId = 4 +EmulationIssues = Sound issues need LLE plugin and videos are messed up. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GFAE69.ini b/Data/User/GameConfig/GFAE69.ini index bfeae04974..f41893cbb3 100644 --- a/Data/User/GameConfig/GFAE69.ini +++ b/Data/User/GameConfig/GFAE69.ini @@ -1,9 +1,9 @@ # GFAE69 - FIFA 2003 [Core] Values set here will override the main dolphin settings. -MMU = 1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU. +EmulationStateId = 4 +EmulationIssues = Sound issues need LLE plugin and videos are messed up. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GFAP69.ini b/Data/User/GameConfig/GFAP69.ini index 3de799a41e..97426b2f38 100644 --- a/Data/User/GameConfig/GFAP69.ini +++ b/Data/User/GameConfig/GFAP69.ini @@ -1,9 +1,9 @@ # GFAP69 - FIFA 2003 [Core] Values set here will override the main dolphin settings. -MMU = 1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU. +EmulationStateId = 4 +EmulationIssues = Sound issues need LLE plugin and videos are messed up. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GFAS69.ini b/Data/User/GameConfig/GFAS69.ini index 003023a82c..1fd280f110 100644 --- a/Data/User/GameConfig/GFAS69.ini +++ b/Data/User/GameConfig/GFAS69.ini @@ -1,9 +1,9 @@ # GFAS69 - FIFA 2003 [Core] Values set here will override the main dolphin settings. -MMU = 1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU. +EmulationStateId = 4 +EmulationIssues = Sound issues need LLE plugin and videos are messed up. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GFYE69.ini b/Data/User/GameConfig/GFYE69.ini index 8289b3d2ac..91766a9a73 100644 --- a/Data/User/GameConfig/GFYE69.ini +++ b/Data/User/GameConfig/GFYE69.ini @@ -1,10 +1,9 @@ # GFYE69 - FIFA Street 2 [Core] Values set here will override the main dolphin settings. TLBHack = 1 -MMU = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU(r6932) +EmulationStateId = 4 +EmulationIssues = Sound issues need LLE plugin and videos are messed up. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. $Master Code @@ -35,8 +34,12 @@ $Away Team Low Trick Points 044349E8 00000000 [Video] ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = [Gecko] [Video_Settings] SafeTextureCache = True SafeTextureCacheColorSamples = 512 - diff --git a/Data/User/GameConfig/GFYP69.ini b/Data/User/GameConfig/GFYP69.ini index e65004851e..629148769d 100644 --- a/Data/User/GameConfig/GFYP69.ini +++ b/Data/User/GameConfig/GFYP69.ini @@ -1,10 +1,9 @@ # GFYP69 - FIFA Street 2 [Core] Values set here will override the main dolphin settings. TLBHack = 1 -MMU = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU(r6932) +EmulationStateId = 4 +EmulationIssues = Sound issues need LLE plugin and videos are messed up. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GG5E52.ini b/Data/User/GameConfig/GG5E52.ini index 32174bc73d..1b292d43b3 100644 --- a/Data/User/GameConfig/GG5E52.ini +++ b/Data/User/GameConfig/GG5E52.ini @@ -2,7 +2,7 @@ [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 = Needs Jitil to run. LLE audio fixes sound issues. +EmulationIssues = LLE audio fixes sound issues. EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. diff --git a/Data/User/GameConfig/GGYE41.ini b/Data/User/GameConfig/GGYE41.ini index 50fe9ee3e0..812eafb8e5 100644 --- a/Data/User/GameConfig/GGYE41.ini +++ b/Data/User/GameConfig/GGYE41.ini @@ -1,7 +1,6 @@ # GGYE41 - GR2GC [Core] Values set here will override the main dolphin settings. TLBHack = 1 -MMU = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 3 EmulationIssues = Needs Real XFB for videos to show up, lle for sound issues.(r6932) @@ -20,4 +19,3 @@ UseXFB = True UseRealXFB = True SafeTextureCache = True SafeTextureCacheColorSamples = 512 - diff --git a/Data/User/GameConfig/GGYP41.ini b/Data/User/GameConfig/GGYP41.ini index bf78a71214..0f49271a1c 100644 --- a/Data/User/GameConfig/GGYP41.ini +++ b/Data/User/GameConfig/GGYP41.ini @@ -1,7 +1,6 @@ # GGYP41 - GR2GC [Core] Values set here will override the main dolphin settings. TLBHack = 1 -MMU = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 3 EmulationIssues = Needs Real XFB for videos to show up, lle for sound issues.(r6932) @@ -20,4 +19,3 @@ UseXFB = True UseRealXFB = True SafeTextureCache = True SafeTextureCacheColorSamples = 512 - diff --git a/Data/User/GameConfig/GH7E5D.ini b/Data/User/GameConfig/GH7E5D.ini index 4ce4e822d5..c42570b689 100644 --- a/Data/User/GameConfig/GH7E5D.ini +++ b/Data/User/GameConfig/GH7E5D.ini @@ -1,6 +1,6 @@ # GH7E5D - Happy Feet [Core] Values set here will override the main dolphin settings. -MMU = 1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationIssues = EmulationStateId = 4 diff --git a/Data/User/GameConfig/GHCE4Q.ini b/Data/User/GameConfig/GHCE4Q.ini index 0762662a0d..28d4a87e1d 100644 --- a/Data/User/GameConfig/GHCE4Q.ini +++ b/Data/User/GameConfig/GHCE4Q.ini @@ -1,6 +1,6 @@ # GHCE4Q - Chicken Little [Core] Values set here will override the main dolphin settings. -MMU = 1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 EmulationIssues = @@ -8,5 +8,9 @@ EmulationIssues = [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/GHCF4Q.ini b/Data/User/GameConfig/GHCF4Q.ini index 8fa6ac1159..82d4668bd4 100644 --- a/Data/User/GameConfig/GHCF4Q.ini +++ b/Data/User/GameConfig/GHCF4Q.ini @@ -1,6 +1,6 @@ # GHCF4Q - Chicken Little [Core] Values set here will override the main dolphin settings. -MMU = 1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 EmulationIssues = @@ -8,4 +8,9 @@ EmulationIssues = [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/GIKE70.ini b/Data/User/GameConfig/GIKE70.ini index e3254eb0af..57e0ef7c0d 100644 --- a/Data/User/GameConfig/GIKE70.ini +++ b/Data/User/GameConfig/GIKE70.ini @@ -1,9 +1,17 @@ # GIKE70 - IKARUGA [EmuState] EmulationStateId = 5 +EmulationIssues = [Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = [OnFrame] [ActionReplay] [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 128 diff --git a/Data/User/GameConfig/GIKP70.ini b/Data/User/GameConfig/GIKP70.ini index 264ea3055d..d1ed2aa92f 100644 --- a/Data/User/GameConfig/GIKP70.ini +++ b/Data/User/GameConfig/GIKP70.ini @@ -7,3 +7,4 @@ EmulationStateId = 5 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 128 diff --git a/Data/User/GameConfig/GIZE52.ini b/Data/User/GameConfig/GIZE52.ini index c38ae6fb01..8eca4a073e 100644 --- a/Data/User/GameConfig/GIZE52.ini +++ b/Data/User/GameConfig/GIZE52.ini @@ -1,8 +1,8 @@ # GIZE52 - Ty3 [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 = Text is broken ingame. Fixed in tex-preload Dolphin branch. +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/GJWE78.ini b/Data/User/GameConfig/GJWE78.ini index d9f3ef79dd..1ae68295c5 100644 --- a/Data/User/GameConfig/GJWE78.ini +++ b/Data/User/GameConfig/GJWE78.ini @@ -1,6 +1,6 @@ # GJWE78 - Tak: The Great Juju Challenge [Core] Values set here will override the main dolphin settings. -MMU = 1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationIssues = EmulationStateId = 4 @@ -26,5 +26,9 @@ $Infinite Green Fruit 0444C434 4479C000 [Video] ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = [Gecko] - diff --git a/Data/User/GameConfig/GJZE52.ini b/Data/User/GameConfig/GJZE52.ini index b37df81b13..3a9b1eb46e 100644 --- a/Data/User/GameConfig/GJZE52.ini +++ b/Data/User/GameConfig/GJZE52.ini @@ -3,7 +3,7 @@ TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Needs Jitil to run. LLE audio fixes some sound issues. +EmulationIssues = LLE audio fixes some sound issues. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GK4E01.ini b/Data/User/GameConfig/GK4E01.ini index 4860de6eb9..db963e5f1d 100644 --- a/Data/User/GameConfig/GK4E01.ini +++ b/Data/User/GameConfig/GK4E01.ini @@ -3,8 +3,8 @@ #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 = +EmulationStateId = 4 +EmulationIssues = Graphic glitches (depth issues). Fixed in zcomploc support Dolphin branch. [OnFrame] [ActionReplay] $(M) @@ -51,5 +51,9 @@ $MILLIARDE Quick Level Up 042D55E0 000F423F [Video] ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = [Gecko] - diff --git a/Data/User/GameConfig/GKBEAF.ini b/Data/User/GameConfig/GKBEAF.ini index 9934a2ba80..6a41bc607d 100644 --- a/Data/User/GameConfig/GKBEAF.ini +++ b/Data/User/GameConfig/GKBEAF.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 = Graphic glitches (depth issues). Fixed in zcomploc support Dolphin branch. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GKBPAF.ini b/Data/User/GameConfig/GKBPAF.ini index 3e5a2cb6d0..61f2a5e442 100644 --- a/Data/User/GameConfig/GKBPAF.ini +++ b/Data/User/GameConfig/GKBPAF.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 = Graphic glitches (depth issues). Fixed in zcomploc support Dolphin branch. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GKLE69.ini b/Data/User/GameConfig/GKLE69.ini index 760bc023a3..1caa8234f5 100644 --- a/Data/User/GameConfig/GKLE69.ini +++ b/Data/User/GameConfig/GKLE69.ini @@ -1,13 +1,19 @@ # GKLE69 - The Lord of the Rings; The Return of the King [Core] Values set here will override the main dolphin settings. -MMU = 1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Needs MMU, and is very slow because of it (r6572) +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] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/GKLF69.ini b/Data/User/GameConfig/GKLF69.ini index f7e2ef20f2..c7fb5d7e19 100644 --- a/Data/User/GameConfig/GKLF69.ini +++ b/Data/User/GameConfig/GKLF69.ini @@ -1,13 +1,19 @@ # GKLF69 - The Lord of the Rings; The Return of the King [Core] Values set here will override the main dolphin settings. -MMU = 1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Needs MMU, and is very slow because of it (r6572) +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] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/GKLP69.ini b/Data/User/GameConfig/GKLP69.ini index 4c7302bfa3..69bc9a0e81 100644 --- a/Data/User/GameConfig/GKLP69.ini +++ b/Data/User/GameConfig/GKLP69.ini @@ -1,9 +1,9 @@ # GKLP69 - The Lord of the Rings; The Return of the King [Core] Values set here will override the main dolphin settings. -MMU = 1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Needs MMU, and is very slow because of it (r6572) +EmulationStateId = 4 +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -17,4 +17,3 @@ PH_ZFar = [Video_Settings] SafeTextureCache = True SafeTextureCacheColorSamples = 512 - diff --git a/Data/User/GameConfig/GKLS69.ini b/Data/User/GameConfig/GKLS69.ini index f34abbae8a..a71ab2f394 100644 --- a/Data/User/GameConfig/GKLS69.ini +++ b/Data/User/GameConfig/GKLS69.ini @@ -1,13 +1,19 @@ # GKLS69 - The Lord of the Rings; The Return of the King [Core] Values set here will override the main dolphin settings. -MMU = 1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Needs MMU, and is very slow because of it (r6572) +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] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/GLCE52.ini b/Data/User/GameConfig/GLCE52.ini index 2d296b4cc3..aaab149619 100644 --- a/Data/User/GameConfig/GLCE52.ini +++ b/Data/User/GameConfig/GLCE52.ini @@ -18,6 +18,7 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 DstAlphaPass = True [Video_Hacks] EFBCopyEnable = True diff --git a/Data/User/GameConfig/GLCF52.ini b/Data/User/GameConfig/GLCF52.ini index 8ba4333554..3858773a87 100644 --- a/Data/User/GameConfig/GLCF52.ini +++ b/Data/User/GameConfig/GLCF52.ini @@ -18,6 +18,7 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 DstAlphaPass = True [Video_Hacks] EFBCopyEnable = True diff --git a/Data/User/GameConfig/GM5E7D.ini b/Data/User/GameConfig/GM5E7D.ini index f7aa5f8eee..3e62c95886 100644 --- a/Data/User/GameConfig/GM5E7D.ini +++ b/Data/User/GameConfig/GM5E7D.ini @@ -3,7 +3,6 @@ SafeTextureCache = True SafeTextureCacheColorSamples = 512 [Core] -CPUThread = 0 [Video] ProjectionHack = 0 PH_SZNear = 0 @@ -12,8 +11,8 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [EmuState] -EmulationStateId = 3 -EmulationIssues = Needs single core or LLE audio to prevent random crashes(r7436). +EmulationStateId = 4 +EmulationIssues = [OnFrame] [ActionReplay] [Gecko] diff --git a/Data/User/GameConfig/GM5F7D.ini b/Data/User/GameConfig/GM5F7D.ini index 4c8b28f81e..cb53610824 100644 --- a/Data/User/GameConfig/GM5F7D.ini +++ b/Data/User/GameConfig/GM5F7D.ini @@ -3,7 +3,6 @@ SafeTextureCache = True SafeTextureCacheColorSamples = 512 [Core] -CPUThread = 0 [Video] ProjectionHack = 0 PH_SZNear = 0 @@ -12,8 +11,8 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [EmuState] -EmulationStateId = 3 -EmulationIssues = Needs single core or LLE audio to prevent random crashes(r7436). +EmulationStateId = 4 +EmulationIssues = [OnFrame] [ActionReplay] [Gecko] diff --git a/Data/User/GameConfig/GM5P7D.ini b/Data/User/GameConfig/GM5P7D.ini index 3d61a5be29..875550b1ba 100644 --- a/Data/User/GameConfig/GM5P7D.ini +++ b/Data/User/GameConfig/GM5P7D.ini @@ -3,7 +3,6 @@ SafeTextureCache = True SafeTextureCacheColorSamples = 512 [Core] -CPUThread = 0 [Video] ProjectionHack = 0 PH_SZNear = 0 @@ -12,9 +11,8 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [EmuState] -EmulationStateId = 3 -EmulationIssues = Needs single core or LLE audio to prevent random crashes(r7436). +EmulationStateId = 4 +EmulationIssues = [OnFrame] [ActionReplay] [Gecko] - diff --git a/Data/User/GameConfig/GNNE69.ini b/Data/User/GameConfig/GNNE69.ini index e089c40997..94365947db 100644 --- a/Data/User/GameConfig/GNNE69.ini +++ b/Data/User/GameConfig/GNNE69.ini @@ -10,3 +10,5 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 + diff --git a/Data/User/GameConfig/GOAE52.ini b/Data/User/GameConfig/GOAE52.ini index 8a3da2eb71..2d0371aa41 100644 --- a/Data/User/GameConfig/GOAE52.ini +++ b/Data/User/GameConfig/GOAE52.ini @@ -3,7 +3,7 @@ TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Needs Jitil to run. LLE audio fixes sound issues. +EmulationIssues = LLE audio fixes sound issues. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GPOP8P.ini b/Data/User/GameConfig/GPOP8P.ini index c6fe1f33e1..513c2487c3 100644 --- a/Data/User/GameConfig/GPOP8P.ini +++ b/Data/User/GameConfig/GPOP8P.ini @@ -63,4 +63,5 @@ PH_ZNear = PH_ZFar = [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 [Gecko] diff --git a/Data/User/GameConfig/GPSP8P.ini b/Data/User/GameConfig/GPSP8P.ini index 787743cc82..e20c7ce4f1 100644 --- a/Data/User/GameConfig/GPSP8P.ini +++ b/Data/User/GameConfig/GPSP8P.ini @@ -62,4 +62,5 @@ PH_ZNear = PH_ZFar = [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 [Gecko] diff --git a/Data/User/GameConfig/GQTE4Q.ini b/Data/User/GameConfig/GQTE4Q.ini index 2f34294dc2..79ec455449 100644 --- a/Data/User/GameConfig/GQTE4Q.ini +++ b/Data/User/GameConfig/GQTE4Q.ini @@ -1,6 +1,5 @@ # GQTE4Q - Meet the Robinsons [Core] Values set here will override the main dolphin settings. -MMU = 1 TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationIssues = @@ -9,5 +8,9 @@ EmulationStateId = 4 [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/GRYE41.ini b/Data/User/GameConfig/GRYE41.ini new file mode 100644 index 0000000000..02d48539b1 --- /dev/null +++ b/Data/User/GameConfig/GRYE41.ini @@ -0,0 +1,18 @@ +# GRYE41 - RAYMAN ARENA +[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/GT3D52.ini b/Data/User/GameConfig/GT3D52.ini index f50771d9b3..3719bb4ecd 100644 --- a/Data/User/GameConfig/GT3D52.ini +++ b/Data/User/GameConfig/GT3D52.ini @@ -1,8 +1,8 @@ # GT3D52 - Tony Hawk's Pro Skater 3 [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 = Neads real xfb for videos to display. +EmulationStateId = 3 +EmulationIssues = Needs real xfb for videos to display. Graphic glitches (depth issues). Fixed in zcomploc support Dolphin branch. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GT3E52.ini b/Data/User/GameConfig/GT3E52.ini index dbfe35663e..ff89fe601f 100644 --- a/Data/User/GameConfig/GT3E52.ini +++ b/Data/User/GameConfig/GT3E52.ini @@ -1,8 +1,8 @@ # GT3E52 - Tony Hawk's Pro Skater 3 [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 = Neads real xfb for videos to display. +EmulationStateId = 3 +EmulationIssues = Needs real xfb for videos to display. Graphic glitches (depth issues). Fixed in zcomploc support Dolphin branch. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GT3F52.ini b/Data/User/GameConfig/GT3F52.ini index 24d932371a..52b9fa5a23 100644 --- a/Data/User/GameConfig/GT3F52.ini +++ b/Data/User/GameConfig/GT3F52.ini @@ -1,8 +1,8 @@ # GT3F52 - Tony Hawk's Pro Skater 3 [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 = Neads real xfb for videos to display. +EmulationStateId = 3 +EmulationIssues = Needs real xfb for videos to display. Graphic glitches (depth issues). Fixed in zcomploc support Dolphin branch. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GT3P52.ini b/Data/User/GameConfig/GT3P52.ini index aa644f6659..85447e25f7 100644 --- a/Data/User/GameConfig/GT3P52.ini +++ b/Data/User/GameConfig/GT3P52.ini @@ -1,8 +1,8 @@ # GT3P52 - Tony Hawk's Pro Skater 3 [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 = Neads real xfb for videos to display. +EmulationStateId = 3 +EmulationIssues = Needs real xfb for videos to display. Graphic glitches (depth issues). Fixed in zcomploc support Dolphin branch. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GT7E41.ini b/Data/User/GameConfig/GT7E41.ini index 99426db64a..f52913c097 100644 --- a/Data/User/GameConfig/GT7E41.ini +++ b/Data/User/GameConfig/GT7E41.ini @@ -3,7 +3,7 @@ TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 3 -EmulationIssues = Goes ingame using Jitil, videos need real XFB to show up and loading screens show garbage(r6898) +EmulationIssues = Videos need real XFB to show up and loading screens show garbage. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -19,4 +19,3 @@ UseXFB = True UseRealXFB = True SafeTextureCache = True SafeTextureCacheColorSamples = 512 - diff --git a/Data/User/GameConfig/GT7P41.ini b/Data/User/GameConfig/GT7P41.ini index 13cb3250bc..1b85f7846d 100644 --- a/Data/User/GameConfig/GT7P41.ini +++ b/Data/User/GameConfig/GT7P41.ini @@ -3,7 +3,7 @@ TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 3 -EmulationIssues = Goes ingame using Jitil, videos need real XFB to show up and loading screens show garbage(r6898) +EmulationIssues = Videos need real XFB to show up and loading screens show garbage. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -18,3 +18,4 @@ PH_ZFar = UseXFB = True UseRealXFB = True SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/GT7X41.ini b/Data/User/GameConfig/GT7X41.ini index e8144424d3..7efc4af689 100644 --- a/Data/User/GameConfig/GT7X41.ini +++ b/Data/User/GameConfig/GT7X41.ini @@ -3,7 +3,7 @@ TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 3 -EmulationIssues = Goes ingame using Jitil, videos need real XFB to show up and loading screens show garbage(r6898) +EmulationIssues = Videos need real XFB to show up and loading screens show garbage. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -18,3 +18,4 @@ PH_ZFar = UseXFB = True UseRealXFB = True SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/GTYE69.ini b/Data/User/GameConfig/GTYE69.ini index 268b84cb93..4966a81ed7 100644 --- a/Data/User/GameConfig/GTYE69.ini +++ b/Data/User/GameConfig/GTYE69.ini @@ -1,8 +1,8 @@ # GTYE69 - TY the Tasmanian Tiger [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 = +EmulationStateId = 3 +EmulationIssues = Graphic glitches (depth issues). Fixed in zcomploc support Dolphin branch. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GTYP69.ini b/Data/User/GameConfig/GTYP69.ini index 91ee039579..34839fa08c 100644 --- a/Data/User/GameConfig/GTYP69.ini +++ b/Data/User/GameConfig/GTYP69.ini @@ -1,8 +1,8 @@ # GTYP69 - TY the Tasmanian Tiger [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 = +EmulationStateId = 3 +EmulationIssues = Graphic glitches (depth issues). Fixed in zcomploc support Dolphin branch. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GVKE52.ini b/Data/User/GameConfig/GVKE52.ini index c7269fd372..379960a872 100644 --- a/Data/User/GameConfig/GVKE52.ini +++ b/Data/User/GameConfig/GVKE52.ini @@ -3,10 +3,14 @@ TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Needs Jitil to run(r6871) +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/GWYE41.ini b/Data/User/GameConfig/GWYE41.ini index 9aa12b7bd6..770adfd1d1 100644 --- a/Data/User/GameConfig/GWYE41.ini +++ b/Data/User/GameConfig/GWYE41.ini @@ -18,3 +18,4 @@ PH_ZFar = UseXFB = True UseRealXFB = True SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/GXFE69.ini b/Data/User/GameConfig/GXFE69.ini index 8a70142f4a..d74632b761 100644 --- a/Data/User/GameConfig/GXFE69.ini +++ b/Data/User/GameConfig/GXFE69.ini @@ -1,9 +1,9 @@ # GXFE69 - FIFA Soccer 2004 [Core] Values set here will override the main dolphin settings. -MMU = 1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 3 -EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU.Use Opengl backend for less graphic glitches. +EmulationIssues = Sound issues need LLE plugin and videos are messed up. Unstable (crashes ingame). [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GXFF69.ini b/Data/User/GameConfig/GXFF69.ini index 22a7852666..10a4862537 100644 --- a/Data/User/GameConfig/GXFF69.ini +++ b/Data/User/GameConfig/GXFF69.ini @@ -1,9 +1,9 @@ # GXFF69 - FIFA Soccer 2004 [Core] Values set here will override the main dolphin settings. -MMU = 1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 3 -EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU.Use Opengl backend for less graphic glitches. +EmulationIssues = Sound issues need LLE plugin and videos are messed up. Unstable (crashes ingame). [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GXFP69.ini b/Data/User/GameConfig/GXFP69.ini index b6c9d1a977..ea3f4ead57 100644 --- a/Data/User/GameConfig/GXFP69.ini +++ b/Data/User/GameConfig/GXFP69.ini @@ -1,9 +1,9 @@ # GXFP69 - FIFA Soccer 2004 [Core] Values set here will override the main dolphin settings. -MMU = 1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 3 -EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU.Use Opengl backend for less graphic glitches. +EmulationIssues = Sound issues need LLE plugin and videos are messed up. Unstable (crashes ingame). [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GXXE01.ini b/Data/User/GameConfig/GXXE01.ini index a66e71accf..2f9cba55d5 100644 --- a/Data/User/GameConfig/GXXE01.ini +++ b/Data/User/GameConfig/GXXE01.ini @@ -1,6 +1,5 @@ # GXXE01 - POKeMON XD [Core] Values set here will override the main dolphin settings. -CPUThread = 0 BlockMerging = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 diff --git a/Data/User/GameConfig/GXXP01.ini b/Data/User/GameConfig/GXXP01.ini index 9d2a0435d5..925765d0d6 100644 --- a/Data/User/GameConfig/GXXP01.ini +++ b/Data/User/GameConfig/GXXP01.ini @@ -1,6 +1,5 @@ # GXXP01 - POKeMON XD [Core] Values set here will override the main dolphin settings. -CPUThread = 0 BlockMerging = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 @@ -19,4 +18,3 @@ PH_ZFar = EFBScale = 1 SafeTextureCache = True SafeTextureCacheColorSamples = 0 - diff --git a/Data/User/GameConfig/GYWD41.ini b/Data/User/GameConfig/GYWD41.ini index 2056d831a7..97437f947d 100644 --- a/Data/User/GameConfig/GYWD41.ini +++ b/Data/User/GameConfig/GYWD41.ini @@ -1,8 +1,8 @@ # GYWD41 - Harvest Moon: A Wonderful Life [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 = Text is broken ingame. Fixed in tex-preload dolphin branch. +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/GYWEE9.ini b/Data/User/GameConfig/GYWEE9.ini index 906558b987..c42f850e64 100644 --- a/Data/User/GameConfig/GYWEE9.ini +++ b/Data/User/GameConfig/GYWEE9.ini @@ -1,8 +1,8 @@ # GYWEE9 - Harvest Moon: A Wonderful Life [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 = Text is broken ingame. Fixed in tex-preload dolphin branch. +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/GYWP41.ini b/Data/User/GameConfig/GYWP41.ini index 35634452c2..49a4ba2f05 100644 --- a/Data/User/GameConfig/GYWP41.ini +++ b/Data/User/GameConfig/GYWP41.ini @@ -1,8 +1,8 @@ # GYWP41 - Harvest Moon: A Wonderful Life [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 = Text is broken ingame. Fixed in tex-preload dolphin branch. +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/HACA01.ini b/Data/User/GameConfig/HACA01.ini index d3a9f197b8..e1408bffbf 100644 --- a/Data/User/GameConfig/HACA01.ini +++ b/Data/User/GameConfig/HACA01.ini @@ -9,3 +9,4 @@ EmulationIssues = ProjectionHack = 0 [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/R22E01.ini b/Data/User/GameConfig/R22E01.ini index 8d992eb454..7b02c3ce0c 100644 --- a/Data/User/GameConfig/R22E01.ini +++ b/Data/User/GameConfig/R22E01.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 = Needs real wiimote and motion plus. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/R22J01.ini b/Data/User/GameConfig/R22J01.ini index cdf18e0b81..5f09707267 100644 --- a/Data/User/GameConfig/R22J01.ini +++ b/Data/User/GameConfig/R22J01.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 = Needs real wiimote and motion plus. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/R22P01.ini b/Data/User/GameConfig/R22P01.ini index 1a04cc43e1..fe8ae43998 100644 --- a/Data/User/GameConfig/R22P01.ini +++ b/Data/User/GameConfig/R22P01.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 = Needs real wiimote and motion plus. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/R3OJ01.ini b/Data/User/GameConfig/R3OJ01.ini index 2616b66fda..e4e7593424 100644 --- a/Data/User/GameConfig/R3OJ01.ini +++ b/Data/User/GameConfig/R3OJ01.ini @@ -15,3 +15,4 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/R3OP01.ini b/Data/User/GameConfig/R3OP01.ini index 11284c5749..e3cae1e700 100644 --- a/Data/User/GameConfig/R3OP01.ini +++ b/Data/User/GameConfig/R3OP01.ini @@ -15,3 +15,4 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/R5DE5G.ini b/Data/User/GameConfig/R5DE5G.ini index 0eaa856ab0..4d99e04a3c 100644 --- a/Data/User/GameConfig/R5DE5G.ini +++ b/Data/User/GameConfig/R5DE5G.ini @@ -3,7 +3,7 @@ SkipIdle = 0 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = +EmulationIssues = Idle skipping causes speed issues. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -15,7 +15,5 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Settings] -UseXFB = True -UseRealXFB = True [Video_Hacks] DlistCachingEnable = False diff --git a/Data/User/GameConfig/R5IE4Q.ini b/Data/User/GameConfig/R5IE4Q.ini index 3d7a37d075..afef7d58e5 100644 --- a/Data/User/GameConfig/R5IE4Q.ini +++ b/Data/User/GameConfig/R5IE4Q.ini @@ -15,5 +15,6 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 [Video_Enhancements] ForceFiltering = False diff --git a/Data/User/GameConfig/R5IP4Q.ini b/Data/User/GameConfig/R5IP4Q.ini index a891668910..34e1aaa9a5 100644 --- a/Data/User/GameConfig/R5IP4Q.ini +++ b/Data/User/GameConfig/R5IP4Q.ini @@ -15,5 +15,6 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 [Video_Enhancements] ForceFiltering = False diff --git a/Data/User/GameConfig/R5IX4Q.ini b/Data/User/GameConfig/R5IX4Q.ini index a4ea4ef22d..be7dc69ede 100644 --- a/Data/User/GameConfig/R5IX4Q.ini +++ b/Data/User/GameConfig/R5IX4Q.ini @@ -15,5 +15,6 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 [Video_Enhancements] ForceFiltering = False diff --git a/Data/User/GameConfig/R6YEXS.ini b/Data/User/GameConfig/R6YEXS.ini index 8624fff2d8..00c0ab4926 100644 --- a/Data/User/GameConfig/R6YEXS.ini +++ b/Data/User/GameConfig/R6YEXS.ini @@ -10,3 +10,4 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/R6YPH3.ini b/Data/User/GameConfig/R6YPH3.ini index cc17213f48..8802d053eb 100644 --- a/Data/User/GameConfig/R6YPH3.ini +++ b/Data/User/GameConfig/R6YPH3.ini @@ -10,3 +10,4 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/R7XE69.ini b/Data/User/GameConfig/R7XE69.ini new file mode 100644 index 0000000000..833b57ac39 --- /dev/null +++ b/Data/User/GameConfig/R7XE69.ini @@ -0,0 +1,21 @@ +# R7XE69 - Need for Speed: Nitro +[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 = Videos are messed up, 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] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/R7XJ13.ini b/Data/User/GameConfig/R7XJ13.ini new file mode 100644 index 0000000000..c017b2d31e --- /dev/null +++ b/Data/User/GameConfig/R7XJ13.ini @@ -0,0 +1,21 @@ +# R7XJ13 - Need for Speed: Nitro +[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 = Videos are messed up, 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] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/R7XP69.ini b/Data/User/GameConfig/R7XP69.ini new file mode 100644 index 0000000000..162ed64cc5 --- /dev/null +++ b/Data/User/GameConfig/R7XP69.ini @@ -0,0 +1,21 @@ +# R7XP69 - Need for Speed: Nitro +[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 = Videos are messed up, 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] +SafeTextureCache = True +SafeTextureCacheColorSamples = 512 +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/RBWE01.ini b/Data/User/GameConfig/RBWE01.ini index 3a8f5fc212..60b08e73c4 100644 --- a/Data/User/GameConfig/RBWE01.ini +++ b/Data/User/GameConfig/RBWE01.ini @@ -1,8 +1,8 @@ # 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 = 3 -EmulationIssues = Recent revs crash ingame, use an older rev like r6461 with watermark tightness set to 600. +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] diff --git a/Data/User/GameConfig/RBWJ01.ini b/Data/User/GameConfig/RBWJ01.ini index 0cfcdb0c24..8efad9729f 100644 --- a/Data/User/GameConfig/RBWJ01.ini +++ b/Data/User/GameConfig/RBWJ01.ini @@ -1,10 +1,16 @@ # 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 = 3 -EmulationIssues = Recent revs crash ingame, use an older rev like r6461 with watermark tightness set to 600. +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 -[Gecko] \ No newline at end of file +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Enhancements] diff --git a/Data/User/GameConfig/RBWP01.ini b/Data/User/GameConfig/RBWP01.ini index df90e22bfc..36b0b3bc98 100644 --- a/Data/User/GameConfig/RBWP01.ini +++ b/Data/User/GameConfig/RBWP01.ini @@ -1,10 +1,16 @@ # 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 = 3 -EmulationIssues = Recent revs crash ingame, use an older rev like r6461 with watermark tightness set to 600. +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 -[Gecko] \ No newline at end of file +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Enhancements] diff --git a/Data/User/GameConfig/RDSJAF.ini b/Data/User/GameConfig/RDSJAF.ini index 8b208019f3..aa06d850a3 100644 --- a/Data/User/GameConfig/RDSJAF.ini +++ b/Data/User/GameConfig/RDSJAF.ini @@ -10,3 +10,4 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RDSPAF.ini b/Data/User/GameConfig/RDSPAF.ini index 58cbbb496a..c120c82306 100644 --- a/Data/User/GameConfig/RDSPAF.ini +++ b/Data/User/GameConfig/RDSPAF.ini @@ -10,3 +10,4 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RFCJGD.ini b/Data/User/GameConfig/RFCJGD.ini index 8d65cff383..2677e1c3ce 100644 --- a/Data/User/GameConfig/RFCJGD.ini +++ b/Data/User/GameConfig/RFCJGD.ini @@ -10,3 +10,4 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RFCPGD.ini b/Data/User/GameConfig/RFCPGD.ini index 0a8daa4dbe..a4f4259842 100644 --- a/Data/User/GameConfig/RFCPGD.ini +++ b/Data/User/GameConfig/RFCPGD.ini @@ -9,3 +9,4 @@ EmulationIssues = Turn off "use panic handlers". Water glitches (r6521) [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RFFJGD.ini b/Data/User/GameConfig/RFFJGD.ini index 749f5e068f..dd5d213fb6 100644 --- a/Data/User/GameConfig/RFFJGD.ini +++ b/Data/User/GameConfig/RFFJGD.ini @@ -16,4 +16,4 @@ PH_ZFar = [Video_Settings] SafeTextureCache = True EFBScale = 2 - +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RFFPGD.ini b/Data/User/GameConfig/RFFPGD.ini index 9c24e2df88..c885e966e5 100644 --- a/Data/User/GameConfig/RFFPGD.ini +++ b/Data/User/GameConfig/RFFPGD.ini @@ -16,3 +16,4 @@ PH_ZFar = [Video_Settings] SafeTextureCache = True EFBScale = 2 +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RFQP69.ini b/Data/User/GameConfig/RFQP69.ini index ced45265c7..194f30e616 100644 --- a/Data/User/GameConfig/RFQP69.ini +++ b/Data/User/GameConfig/RFQP69.ini @@ -9,3 +9,4 @@ EmulationIssues = Hack = 3 [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RIPJAF.ini b/Data/User/GameConfig/RIPJAF.ini index 8daa461e7c..1e56628f9a 100644 --- a/Data/User/GameConfig/RIPJAF.ini +++ b/Data/User/GameConfig/RIPJAF.ini @@ -10,3 +10,4 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RIPPAF.ini b/Data/User/GameConfig/RIPPAF.ini index f0756110ea..d39623fbe7 100644 --- a/Data/User/GameConfig/RIPPAF.ini +++ b/Data/User/GameConfig/RIPPAF.ini @@ -10,3 +10,4 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RIUJAF.ini b/Data/User/GameConfig/RIUJAF.ini index c5dea403f9..95efb08eb3 100644 --- a/Data/User/GameConfig/RIUJAF.ini +++ b/Data/User/GameConfig/RIUJAF.ini @@ -10,3 +10,4 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RK2JEB.ini b/Data/User/GameConfig/RK2JEB.ini index 8016eac272..9623df720c 100644 --- a/Data/User/GameConfig/RK2JEB.ini +++ b/Data/User/GameConfig/RK2JEB.ini @@ -10,3 +10,4 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RK2P01.ini b/Data/User/GameConfig/RK2P01.ini index 9d8895d1d2..b0487fea0c 100644 --- a/Data/User/GameConfig/RK2P01.ini +++ b/Data/User/GameConfig/RK2P01.ini @@ -10,3 +10,4 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RKDJEB.ini b/Data/User/GameConfig/RKDJEB.ini index 1e475b1bc4..8f9ab80392 100644 --- a/Data/User/GameConfig/RKDJEB.ini +++ b/Data/User/GameConfig/RKDJEB.ini @@ -10,3 +10,4 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RKDP01.ini b/Data/User/GameConfig/RKDP01.ini index 5e430c75b9..5339b97e0f 100644 --- a/Data/User/GameConfig/RKDP01.ini +++ b/Data/User/GameConfig/RKDP01.ini @@ -8,4 +8,5 @@ EmulationIssues = [Video] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RKDPEB.ini b/Data/User/GameConfig/RKDPEB.ini index f6c8b3f8a2..e88be90b60 100644 --- a/Data/User/GameConfig/RKDPEB.ini +++ b/Data/User/GameConfig/RKDPEB.ini @@ -10,3 +10,4 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/ROUJAF.ini b/Data/User/GameConfig/ROUJAF.ini index 6300f9c9c0..885cb49d68 100644 --- a/Data/User/GameConfig/ROUJAF.ini +++ b/Data/User/GameConfig/ROUJAF.ini @@ -10,3 +10,4 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RQ6EJJ.ini b/Data/User/GameConfig/RQ6EJJ.ini index d9bcac7936..8edd965307 100644 --- a/Data/User/GameConfig/RQ6EJJ.ini +++ b/Data/User/GameConfig/RQ6EJJ.ini @@ -6,7 +6,6 @@ MaxAnisotropy = 0 SafeTextureCache = True SafeTextureCacheColorSamples = 128 [Core] -MMU = 1 BlockMerging = 1 [Video] ProjectionHack = 0 @@ -17,7 +16,7 @@ PH_ZNear = PH_ZFar = [EmuState] EmulationStateId = 4 -EmulationIssues = Use direct 3d 11 for less glitches. Slow, it needs mmu to not crash ingame(r7436). +EmulationIssues = Use direct 3d 11 for less glitches. [OnFrame] [ActionReplay] [Gecko] diff --git a/Data/User/GameConfig/RQ6PKM.ini b/Data/User/GameConfig/RQ6PKM.ini index cfc87e365d..fffd94e621 100644 --- a/Data/User/GameConfig/RQ6PKM.ini +++ b/Data/User/GameConfig/RQ6PKM.ini @@ -6,7 +6,6 @@ MaxAnisotropy = 0 SafeTextureCache = True SafeTextureCacheColorSamples = 128 [Core] -MMU = 1 BlockMerging = 1 [Video] ProjectionHack = 0 @@ -17,7 +16,7 @@ PH_ZNear = PH_ZFar = [EmuState] EmulationStateId = 4 -EmulationIssues = Use direct 3d 11 for less glitches. Slow, it needs mmu to not crash ingame(r7436). +EmulationIssues = Use direct 3d 11 for less glitches. [OnFrame] [ActionReplay] [Gecko] diff --git a/Data/User/GameConfig/RQ6XKM.ini b/Data/User/GameConfig/RQ6XKM.ini index b8e03b8b37..4799406dd8 100644 --- a/Data/User/GameConfig/RQ6XKM.ini +++ b/Data/User/GameConfig/RQ6XKM.ini @@ -6,7 +6,6 @@ MaxAnisotropy = 0 SafeTextureCache = True SafeTextureCacheColorSamples = 128 [Core] -MMU = 1 BlockMerging = 1 [Video] ProjectionHack = 0 @@ -17,7 +16,7 @@ PH_ZNear = PH_ZFar = [EmuState] EmulationStateId = 4 -EmulationIssues = Use direct 3d 11 for less glitches. Slow, it needs mmu to not crash ingame(r7436). +EmulationIssues = Use direct 3d 11 for less glitches. [OnFrame] [ActionReplay] [Gecko] diff --git a/Data/User/GameConfig/S2LE01.ini b/Data/User/GameConfig/S2LE01.ini new file mode 100644 index 0000000000..980e8e4a8e --- /dev/null +++ b/Data/User/GameConfig/S2LE01.ini @@ -0,0 +1,19 @@ +# S2LE01 - PokePark Wii2 +[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 to display photographs. +[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 diff --git a/Data/User/GameConfig/S2LJ01.ini b/Data/User/GameConfig/S2LJ01.ini new file mode 100644 index 0000000000..9fd8978873 --- /dev/null +++ b/Data/User/GameConfig/S2LJ01.ini @@ -0,0 +1,19 @@ +# S2LJ01 - PokePark Wii2 +[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 to display photographs. +[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 diff --git a/Data/User/GameConfig/S2LP01.ini b/Data/User/GameConfig/S2LP01.ini new file mode 100644 index 0000000000..da782c2d72 --- /dev/null +++ b/Data/User/GameConfig/S2LP01.ini @@ -0,0 +1,19 @@ +# S2LP01 - PokePark Wii2 +[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 to display photographs. +[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 diff --git a/Data/User/GameConfig/S59E01.ini b/Data/User/GameConfig/S59E01.ini index adac044e0c..4c34183639 100644 --- a/Data/User/GameConfig/S59E01.ini +++ b/Data/User/GameConfig/S59E01.ini @@ -10,3 +10,4 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/S59JC8.ini b/Data/User/GameConfig/S59JC8.ini index a35db392e7..4fffae6156 100644 --- a/Data/User/GameConfig/S59JC8.ini +++ b/Data/User/GameConfig/S59JC8.ini @@ -10,3 +10,4 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/SAKPNS.ini b/Data/User/GameConfig/SAKPNS.ini index e702bc182f..a0fae1312f 100644 --- a/Data/User/GameConfig/SAKPNS.ini +++ b/Data/User/GameConfig/SAKPNS.ini @@ -10,3 +10,4 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/SBDJ08.ini b/Data/User/GameConfig/SBDJ08.ini index a281b91c1a..56b7d2dae7 100644 --- a/Data/User/GameConfig/SBDJ08.ini +++ b/Data/User/GameConfig/SBDJ08.ini @@ -15,3 +15,4 @@ PH_ZFar = 0.5 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/SBDK08.ini b/Data/User/GameConfig/SBDK08.ini index d3166632f1..e76f702b2b 100644 --- a/Data/User/GameConfig/SBDK08.ini +++ b/Data/User/GameConfig/SBDK08.ini @@ -15,3 +15,4 @@ PH_ZFar = 0.5 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/SBDP08.ini b/Data/User/GameConfig/SBDP08.ini index 529c32a43a..24620fc1fd 100644 --- a/Data/User/GameConfig/SBDP08.ini +++ b/Data/User/GameConfig/SBDP08.ini @@ -15,3 +15,4 @@ PH_ZFar = 0.5 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/SC8E01.ini b/Data/User/GameConfig/SC8E01.ini new file mode 100644 index 0000000000..639f962a6c --- /dev/null +++ b/Data/User/GameConfig/SC8E01.ini @@ -0,0 +1,15 @@ +# SC8E01 - Wii Play: Motion +[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] diff --git a/Data/User/GameConfig/SC8J01.ini b/Data/User/GameConfig/SC8J01.ini new file mode 100644 index 0000000000..cc78b5632f --- /dev/null +++ b/Data/User/GameConfig/SC8J01.ini @@ -0,0 +1,15 @@ +# SC8J01 - Wii Play: Motion +[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] diff --git a/Data/User/GameConfig/SC8P01.ini b/Data/User/GameConfig/SC8P01.ini new file mode 100644 index 0000000000..bbc6c1f1b4 --- /dev/null +++ b/Data/User/GameConfig/SC8P01.ini @@ -0,0 +1,15 @@ +# SC8P01 - Wii Play: Motion +[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] diff --git a/Data/User/GameConfig/SE2P69.ini b/Data/User/GameConfig/SE2P69.ini index 54a3f18e16..84e558d6e8 100644 --- a/Data/User/GameConfig/SE2P69.ini +++ b/Data/User/GameConfig/SE2P69.ini @@ -10,5 +10,6 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 [Video_Enhancements] ForceFiltering = False diff --git a/Data/User/GameConfig/SEAE69.ini b/Data/User/GameConfig/SEAE69.ini index 67836c884d..36bcb3b758 100644 --- a/Data/User/GameConfig/SEAE69.ini +++ b/Data/User/GameConfig/SEAE69.ini @@ -10,5 +10,6 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 [Video_Enhancements] ForceFiltering = False diff --git a/Data/User/GameConfig/SEAJ13.ini b/Data/User/GameConfig/SEAJ13.ini index caa68320ca..db777d59a6 100644 --- a/Data/User/GameConfig/SEAJ13.ini +++ b/Data/User/GameConfig/SEAJ13.ini @@ -10,5 +10,6 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 [Video_Enhancements] ForceFiltering = False diff --git a/Data/User/GameConfig/SEAP69.ini b/Data/User/GameConfig/SEAP69.ini index 1310ccc94f..ac68fe2dfa 100644 --- a/Data/User/GameConfig/SEAP69.ini +++ b/Data/User/GameConfig/SEAP69.ini @@ -10,5 +10,6 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 [Video_Enhancements] ForceFiltering = False diff --git a/Data/User/GameConfig/SFWP69.ini b/Data/User/GameConfig/SFWP69.ini index 40eaf1269d..10a8358ca0 100644 --- a/Data/User/GameConfig/SFWP69.ini +++ b/Data/User/GameConfig/SFWP69.ini @@ -9,3 +9,4 @@ EmulationIssues = Lacks HLE Sound [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/SLSJ01.ini b/Data/User/GameConfig/SLSJ01.ini new file mode 100644 index 0000000000..cbf3e2e349 --- /dev/null +++ b/Data/User/GameConfig/SLSJ01.ini @@ -0,0 +1,19 @@ +# SLSJ01 - 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 = Direct 3d 9 backend has some depth glitches, use other backends 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] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True +EFBCopyCacheEnable = True diff --git a/Data/User/GameConfig/SLSP01.ini b/Data/User/GameConfig/SLSP01.ini new file mode 100644 index 0000000000..daa2b0f9af --- /dev/null +++ b/Data/User/GameConfig/SLSP01.ini @@ -0,0 +1,19 @@ +# SLSP01 - 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 = Direct 3d 9 backend has some depth glitches, use other backends 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] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True +EFBCopyCacheEnable = True diff --git a/Data/User/GameConfig/SMNE01.ini b/Data/User/GameConfig/SMNE01.ini index 9cda92dadd..6d3407b0b6 100644 --- a/Data/User/GameConfig/SMNE01.ini +++ b/Data/User/GameConfig/SMNE01.ini @@ -39,5 +39,6 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 [Video_Hacks] DlistCachingEnable = False diff --git a/Data/User/GameConfig/SMNJ01.ini b/Data/User/GameConfig/SMNJ01.ini index 7f1cfb06bf..f4da9a9516 100644 --- a/Data/User/GameConfig/SMNJ01.ini +++ b/Data/User/GameConfig/SMNJ01.ini @@ -15,5 +15,6 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 [Video_Hacks] DlistCachingEnable = False diff --git a/Data/User/GameConfig/SMNK01.ini b/Data/User/GameConfig/SMNK01.ini index 30238bcbd4..e1f74effaf 100644 --- a/Data/User/GameConfig/SMNK01.ini +++ b/Data/User/GameConfig/SMNK01.ini @@ -15,5 +15,6 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 [Video_Hacks] DlistCachingEnable = False diff --git a/Data/User/GameConfig/SMNW01.ini b/Data/User/GameConfig/SMNW01.ini index 0c6dfc2f57..7862bd2d40 100644 --- a/Data/User/GameConfig/SMNW01.ini +++ b/Data/User/GameConfig/SMNW01.ini @@ -15,5 +15,6 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 [Video_Hacks] DlistCachingEnable = False diff --git a/Data/User/GameConfig/SNDE20.ini b/Data/User/GameConfig/SNDE20.ini new file mode 100644 index 0000000000..012a3b2ceb --- /dev/null +++ b/Data/User/GameConfig/SNDE20.ini @@ -0,0 +1,17 @@ +# SNDE20 - Deal or No Deal +[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] +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/SNJP69.ini b/Data/User/GameConfig/SNJP69.ini index 5b87dc2614..92710604b0 100644 --- a/Data/User/GameConfig/SNJP69.ini +++ b/Data/User/GameConfig/SNJP69.ini @@ -10,4 +10,5 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/SOUE01.ini b/Data/User/GameConfig/SOUE01.ini index 3a17851101..3e80a50dd6 100644 --- a/Data/User/GameConfig/SOUE01.ini +++ b/Data/User/GameConfig/SOUE01.ini @@ -18,3 +18,6 @@ EFBAccessEnable = True DlistCachingEnable = False [Wii] DisableWiimoteSpeaker = 1 +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 128 diff --git a/Data/User/GameConfig/SOUJ01.ini b/Data/User/GameConfig/SOUJ01.ini index 67e67a1525..dafa18ad0d 100644 --- a/Data/User/GameConfig/SOUJ01.ini +++ b/Data/User/GameConfig/SOUJ01.ini @@ -18,3 +18,6 @@ EFBAccessEnable = True DlistCachingEnable = False [Wii] DisableWiimoteSpeaker = 1 +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 128 diff --git a/Data/User/GameConfig/SOUK01.ini b/Data/User/GameConfig/SOUK01.ini index f169b324bf..fa78c40356 100644 --- a/Data/User/GameConfig/SOUK01.ini +++ b/Data/User/GameConfig/SOUK01.ini @@ -18,3 +18,6 @@ EFBAccessEnable = True DlistCachingEnable = False [Wii] DisableWiimoteSpeaker = 1 +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 128 diff --git a/Data/User/GameConfig/SOUP01.ini b/Data/User/GameConfig/SOUP01.ini index 0e80a81656..849ef6c111 100644 --- a/Data/User/GameConfig/SOUP01.ini +++ b/Data/User/GameConfig/SOUP01.ini @@ -18,3 +18,6 @@ EFBAccessEnable = True DlistCachingEnable = False [Wii] DisableWiimoteSpeaker = 1 +[Video_Settings] +SafeTextureCache = True +SafeTextureCacheColorSamples = 128 diff --git a/Data/User/GameConfig/SPTJEB.ini b/Data/User/GameConfig/SPTJEB.ini index 3d223c0d5a..b660638831 100644 --- a/Data/User/GameConfig/SPTJEB.ini +++ b/Data/User/GameConfig/SPTJEB.ini @@ -10,3 +10,4 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/SUKE01.ini b/Data/User/GameConfig/SUKE01.ini index a4c7b22fd4..e8a9cdc79d 100644 --- a/Data/User/GameConfig/SUKE01.ini +++ b/Data/User/GameConfig/SUKE01.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 = Theater mode crashes, needs XFB for certain minigames. +EmulationIssues = Some minigames need XFB to work. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -18,4 +18,3 @@ UseXFB = True UseRealXFB = False SafeTextureCache = True SafeTextureCacheColorSamples = 128 - diff --git a/Data/User/GameConfig/SUKJ01.ini b/Data/User/GameConfig/SUKJ01.ini index a6cd7a1961..210f0a92f3 100644 --- a/Data/User/GameConfig/SUKJ01.ini +++ b/Data/User/GameConfig/SUKJ01.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 = Theater mode crashes, needs XFB for certain minigames. +EmulationIssues = Some minigames need XFB to work. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/SUKP01.ini b/Data/User/GameConfig/SUKP01.ini index 8ea6027097..61e2551da7 100644 --- a/Data/User/GameConfig/SUKP01.ini +++ b/Data/User/GameConfig/SUKP01.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 = Theater mode crashes, needs XFB for certain minigames. +EmulationIssues = Some minigames need XFB to work. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/SXCP52.ini b/Data/User/GameConfig/SXCP52.ini index 29bf6aab48..b3b8f10788 100644 --- a/Data/User/GameConfig/SXCP52.ini +++ b/Data/User/GameConfig/SXCP52.ini @@ -10,3 +10,4 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/WF4EGD.ini b/Data/User/GameConfig/WF4EGD.ini index 38e0f8875b..8fae5fc30d 100644 --- a/Data/User/GameConfig/WF4EGD.ini +++ b/Data/User/GameConfig/WF4EGD.ini @@ -10,3 +10,4 @@ ProjectionHack = 0 [Gecko] [Video_Settings] SafeTextureCache = True +SafeTextureCacheColorSamples = 512 From 6202714efdf66987e57846d3297a5972c8b75c38 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 20 Mar 2012 22:36:21 +0100 Subject: [PATCH 376/381] Fix some regressions from r3b38295cbd08. --- .../Core/VideoCommon/Src/TextureCacheBase.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index cc14499330..00ff9610be 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -172,8 +172,10 @@ void TextureCache::ClearRenderTargets() TexCache::iterator iter = textures.begin(), tcend = textures.end(); + for (; iter!=tcend; ++iter) - iter->second->type = TCET_NORMAL; + if (iter->second->type != TCET_EC_DYNAMIC) + iter->second->type = TCET_NORMAL; } TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, @@ -238,6 +240,9 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, // 2. a) For EFB copies, only the hash and the texture address need to match if (entry->IsEfbCopy() && tex_hash == entry->hash && address == entry->addr) { + if (entry->type != TCET_EC_VRAM) + entry->type = TCET_NORMAL; + // 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; } @@ -318,8 +323,8 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, entry->SetGeneralParameters(address, texture_size, full_format, entry->num_mipmaps); entry->SetDimensions(nativeW, nativeH, width, height); entry->hash = tex_hash; - if (g_ActiveConfig.bCopyEFBToTexture) entry->type = TCET_NORMAL; - else if (entry->IsEfbCopy()) entry->type = TCET_EC_DYNAMIC; + if (entry->IsEfbCopy() && !g_ActiveConfig.bCopyEFBToTexture) entry->type = TCET_EC_DYNAMIC; + else entry->type = TCET_NORMAL; // load texture entry->Load(width, height, expandedWidth, 0, (texLevels == 0)); @@ -647,8 +652,11 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat if ((entry->type == TCET_EC_VRAM && entry->virtual_width == scaled_tex_w && entry->virtual_height == scaled_tex_h) || (entry->type == TCET_EC_DYNAMIC && entry->native_width == tex_w && entry->native_height == tex_h)) { - scaled_tex_w = tex_w; - scaled_tex_h = tex_h; + if (entry->type == TCET_EC_DYNAMIC) + { + scaled_tex_w = tex_w; + scaled_tex_h = tex_h; + } } else { From 70b6c4280f72a1adaa7cefc7ab7cc7173e3c8e7f Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 21 Mar 2012 22:43:44 +0100 Subject: [PATCH 377/381] Compile with /fp:precise instead of /fp:fast in release mode on Windows /fp:fast was introducing FP precision problems, and mixing it with some /fp:precise code caused strange game behaviors, DSI exceptions and freezes. This commit should fix most of the issues introduced by 3.0-73 (r95517a97). Thanks to hatarumoroboshi@hotmail.com for tracking a lot of these Win32 bugs. Fixes issue 4906. Fixes issue 5138. Probably fixes (not tested) issue 5067. --- .../PowerPC/Interpreter/Interpreter_FloatingPoint.cpp | 10 +--------- Source/VSProps/CodeGen_Release.props | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp index 3b0ae602cd..1d6ea2e70d 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp @@ -42,10 +42,6 @@ using namespace MathUtil; void UpdateSSEState(); -#ifdef _MSC_VER -#pragma float_control(precise, on, push) -#endif - // Extremely rare - actually, never seen. // Star Wars : Rogue Leader spams that at some point :| void Interpreter::Helper_UpdateCR1(double _fValue) @@ -518,8 +514,4 @@ void Interpreter::fsqrtx(UGeckoInstruction _inst) rPS0(_inst.FD) = sqrt(b); UpdateFPRF(rPS0(_inst.FD)); if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD)); -} - -#ifdef _MSC_VER -#pragma float_control(pop) -#endif +} \ No newline at end of file diff --git a/Source/VSProps/CodeGen_Release.props b/Source/VSProps/CodeGen_Release.props index 74770b6910..2dd392b7a9 100644 --- a/Source/VSProps/CodeGen_Release.props +++ b/Source/VSProps/CodeGen_Release.props @@ -19,7 +19,7 @@ false _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) StreamingSIMDExtensions2 - Fast + Precise true From 15db05d7abd781d2a4ddcbeca57ff30a87b663f9 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Wed, 21 Mar 2012 14:53:50 -0700 Subject: [PATCH 378/381] I am very picky about my VS files... :D --- Source/VSProps/CodeGen_Release.props | 1 - 1 file changed, 1 deletion(-) diff --git a/Source/VSProps/CodeGen_Release.props b/Source/VSProps/CodeGen_Release.props index 2dd392b7a9..2b69dc0f63 100644 --- a/Source/VSProps/CodeGen_Release.props +++ b/Source/VSProps/CodeGen_Release.props @@ -19,7 +19,6 @@ false _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) StreamingSIMDExtensions2 - Precise true From dc1cde4581edae5dd95a8a31d8251e2e0bd88a7f Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Thu, 22 Mar 2012 17:25:43 +1300 Subject: [PATCH 379/381] Re-enabled stfs, was caused by fast fp, thanks delroth! --- Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp index 5b7baa28c0..93963513ee 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp @@ -100,8 +100,8 @@ static GekkoOPTemplate primarytable[] = {50, &Jit64::lfd}, //"lfd", OPTYPE_LOADFP, FL_IN_A}}, {51, &Jit64::Default}, //"lfdu", OPTYPE_LOADFP, FL_OUT_A | FL_IN_A}}, - {52, &Jit64::Default}, //"stfs", OPTYPE_STOREFP, FL_IN_A}}, - {53, &Jit64::Default}, //"stfsu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}}, + {52, &Jit64::stfs}, //"stfs", OPTYPE_STOREFP, FL_IN_A}}, + {53, &Jit64::stfs}, //"stfsu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}}, {54, &Jit64::stfd}, //"stfd", OPTYPE_STOREFP, FL_IN_A}}, {55, &Jit64::Default}, //"stfdu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}}, From 2d75d7a8be4f5487db9735ff1de010d57312fcd2 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Thu, 22 Mar 2012 21:15:05 +1300 Subject: [PATCH 380/381] Fixes issue 5278. Thanks to megazig for finding the bug :) --- Source/Core/DiscIO/Src/VolumeDirectory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/DiscIO/Src/VolumeDirectory.cpp b/Source/Core/DiscIO/Src/VolumeDirectory.cpp index 08188bac71..52e9f4389a 100644 --- a/Source/Core/DiscIO/Src/VolumeDirectory.cpp +++ b/Source/Core/DiscIO/Src/VolumeDirectory.cpp @@ -389,8 +389,8 @@ void CVolumeDirectory::BuildFST() // write FST size and location _dbg_assert_(DVDINTERFACE, m_diskHeader); Write32((u32)(FST_ADDRESS >> m_addressShift), 0x0424, m_diskHeader); - Write32((u32)m_fstSize, 0x0428, m_diskHeader); - Write32((u32)m_fstSize, 0x042c, m_diskHeader); + Write32((u32)(m_fstSize >> m_addressShift), 0x0428, m_diskHeader); + Write32((u32)(m_fstSize >> m_addressShift), 0x042c, m_diskHeader); } void CVolumeDirectory::WriteToBuffer(u64 _SrcStartAddress, u64 _SrcLength, u8* _Src, From d95e31af3f779bfa3141047e8b6275e1fd2e4bbb Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Thu, 22 Mar 2012 22:52:12 +1300 Subject: [PATCH 381/381] Fixes issue 4932 AGAIN :D --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 6 ++---- 1 file changed, 2 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 b552185f87..cd4f679db9 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -376,10 +376,8 @@ void ExecuteCommand(u32 _Address) else { WARN_LOG(WII_IPC_HLE, "Unimplemented device: %s", DeviceName.c_str()); - pDevice = GetDeviceByName(std::string("_Unimplemented_Device_")); - CmdSuccess = pDevice->Open(_Address, Mode); - g_FdMap[DeviceID] = pDevice; - Memory::Write_U32(DeviceID, _Address+4); + Memory::Write_U32(FS_ENOENT, _Address+4); + CmdSuccess = true; } } else

9n>UGH(g^7~s|#AU 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